From 65c2d95a7dca988f0ead00e105b8aad0c57732f7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 14 Sep 2020 09:58: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 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.desktop') diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index b09bf0e94..f79aae390 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -80,6 +80,7 @@ Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਝਲਕ ਮੋਡ ਦੀ Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina. Comment[pt]=Este serviço permite a configuração dos modos de visualização do Dolphin. Comment[pt_BR]=Este serviço permite configurar os modos de exibição do Dolphin. +Comment[ro]=Acest serviciu permite configurarea regimurilor de vizualizare Dolphin. Comment[ru]=Эта служба позволяет настраивать режимы просмотра папок в Dolphin Comment[sk]=Táto služba umožňuje nastavenie režimov zobrazenia Dolphinu. Comment[sl]=Ta storitev omogoča spreminjanje nastavitev načinov prikaza programa Dolphin. @@ -187,6 +188,7 @@ Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਝਲਕ ਮੋਡ ਸੰਰਚਨ Comment[pl]=Ustawienia trybów widoku zarządzania plikami Comment[pt]=Configurar os modos de visualização do gestor de ficheiros Comment[pt_BR]=Configura os modos de exibição do gerenciador de arquivos +Comment[ro]=Configurează regimurile de vizualizare ale gestionarului de fișiere Comment[ru]=Настройка режимов просмотра папок в диспетчере файлов Comment[se]=Heivet fiilagieđahalli čájehanmodusat Comment[sk]=Nastavenie režimov zobrazenia správcu súborov -- cgit v1.3