From 4b438da3cb4699d395565a0d5e71d7f7d77c945d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 1 Sep 2020 10:13:23 +0200 Subject: SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/settings/kcm/kcmdolphinviewmodes.desktop | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.desktop') diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index b5ea5d047..ec35fa692 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -31,6 +31,7 @@ Name[pa]=ਡਾਲਫਿਨ ਝਲਕ ਢੰਗ Name[pl]=Tryby widoku Dolphina Name[pt]=Modos de Visualização do Dolphin Name[pt_BR]=Modos de exibição do Dolphin +Name[ro]=Dolphin – Regimuri de vizualizare Name[ru]=Режимы просмотра папок в Dolphin Name[se]=Dolphin čájehanmodusat Name[sk]=Režimy zobrazenia Dolphinu @@ -135,6 +136,7 @@ Name[pa]=ਵੇਖਣ ਢੰਗ Name[pl]=Tryby widoku Name[pt]=Modos de Visualização Name[pt_BR]=Modos de exibição +Name[ro]=Moduri de vizualizare Name[ru]=Режимы просмотра Name[se]=Čájehanmodusat Name[sk]=Režimy zobrazenia @@ -230,6 +232,7 @@ X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos +X-KDE-Keywords[ro]=gestionar de fișiere X-KDE-Keywords[ru]=диспетчер файлов X-KDE-Keywords[sk]=správca súborov X-KDE-Keywords[sl]=upravljalnik datotek -- cgit v1.3