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/kcmdolphingeneral.desktop | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/settings/kcm/kcmdolphingeneral.desktop') diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index ba8cdefde..752aa2ea5 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -31,6 +31,7 @@ Name[pa]=ਡਾਲਫਿਨ ਆਮ Name[pl]=Ustawienia Dolphina Name[pt]=Geral do Dolphin Name[pt_BR]=Geral do Dolphin +Name[ro]=Dolphin – Generale Name[ru]=Основные параметры Dolphin Name[se]=Dolphinoppalaččat Name[sk]=Všeobecný Dolphin @@ -137,6 +138,7 @@ Name[pa]=ਆਮ Name[pl]=Ogólne Name[pt]=Geral Name[pt_BR]=Geral +Name[ro]=Generale Name[ru]=Основное Name[sk]=Všeobecné Name[sl]=Splošno @@ -183,6 +185,7 @@ Comment[pa]=ਆਮ ਫਾਇਲ ਮੈਨੇਜਰ ਸੈਟਿੰਗ ਸੰਰ Comment[pl]=Ustawienia ogólne zarządzania plikami Comment[pt]=Configurar as definições gerais do gestor de ficheiros Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos +Comment[ro]=Configurează opțiuni generale ale gestionarului de fișiere Comment[ru]=Настройка диспетчера файлов Comment[sk]=Všeobecné nastavenie správcu súborov Comment[sl]=Splošne nastavitve upravljalnika datotek @@ -230,6 +233,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.1