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/kcmdolphinservices.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 0660fe587..5d96779a1 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -139,6 +139,7 @@ Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਦੀਆਂ ਸਰਵਿਸਾਂ Comment[pl]=Ustawienia usług zarządzania plikami Comment[pt]=Configurar os serviços do gestor de ficheiros Comment[pt_BR]=Configura os serviços do gerenciador de arquivos +Comment[ro]=Configurează serviciile gestionarului de fișiere Comment[ru]=Настройка действий в диспетчере файлов Comment[sk]=Nastavenie služieb správcu súborov Comment[sl]=Nastavitve storitev upravljalnika datotek -- cgit v1.3