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/kcmdolphinnavigation.desktop | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.desktop') diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index aa91f3094..81b93426e 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -80,6 +80,7 @@ Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie. Comment[pt]=Este serviço permite a configuração da navegação do Dolphin. Comment[pt_BR]=Este serviço permite configurar a navegação do Dolphin. +Comment[ro]=Acest serviciu permite configurarea navigării Dolphin. Comment[ru]=Эта служба позволяет настраивать навигацию в Dolphin Comment[sk]=Táto služba umožňuje nastavenie navigácie v Dolphine. Comment[sl]=Ta storitev omogoča spreminjanje nastavitev krmarjenja programa Dolphin. @@ -188,6 +189,7 @@ Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਨੇਵੀਗੇਸ਼ਨ ਸੰ Comment[pl]=Ustawienia nawigacji w zarządzaniu plikami Comment[pt]=Configurar a navegação do gestor de ficheiros Comment[pt_BR]=Configura a navegação do gerenciador de arquivos +Comment[ro]=Configurează navigarea cu gestionarul de fișiere Comment[ru]=Настройка навигации в диспетчере файлов Comment[se]=Heivet fiilagieđahallannavigašuvdna Comment[sk]=Nastavenie navigácie správcu súborov -- cgit v1.3