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/kcmdolphingeneral.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphingeneral.desktop') diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 0747ff430..49253cd9e 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -80,6 +80,7 @@ Comment[pa]=ਇਹ ਸਰਵਿਸ ਆਮ ਡਾਲਫਿਨ ਸੈਟਿੰਗ Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina. Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin. Comment[pt_BR]=Este serviço permite configurar as opções gerais do Dolphin. +Comment[ro]=Acest serviciu permite configurarea opțiunilor generale Dolphin. Comment[ru]=Эта служба позволяет настраивать основные параметры Dolphin Comment[sk]=Táto služba umožňuje všeobecné nastavenie Dolphinu. Comment[sl]=Ta storitev omogoča spreminjanje splošnih nastavitev programa Dolphin. -- cgit v1.3