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/kcmdolphinnavigation.desktop | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.desktop') diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index fd649b548..a6f3a4ddc 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -31,6 +31,7 @@ Name[pa]=ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ Name[pl]=Nawigacja Dolphina Name[pt]=Navegação do Dolphin Name[pt_BR]=Navegação do Dolphin +Name[ro]=Dolphin – Navigare Name[ru]=Навигация в Dolphin Name[se]=Dolphinnavigašuvdna Name[sk]=Navigácia Dolphinu @@ -136,6 +137,7 @@ Name[pa]=ਨੇਵੀਗੇਸ਼ਨ Name[pl]=Nawigacja Name[pt]=Navegação Name[pt_BR]=Navegação +Name[ro]=Navigare Name[ru]=Навигация Name[se]=Navigašuvdna Name[sk]=Navigácia @@ -231,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