diff options
| author | l10n daemon script <[email protected]> | 2020-09-01 10:13:23 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-01 10:13:23 +0200 |
| commit | 4b438da3cb4699d395565a0d5e71d7f7d77c945d (patch) | |
| tree | bf4b0a515ceb84fd7c365fe2a49dc49363dddb0d /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | d624af1091f78ea234050058b9df1e5c9e1d0592 (diff) | |
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"
Diffstat (limited to 'src/settings/kcm/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index ba8cdefde..752aa2ea5 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -31,6 +31,7 @@ Name[pa]=ਡਾਲਫਿਨ ਆਮ Name[pl]=Ustawienia Dolphina Name[pt]=Geral do Dolphin Name[pt_BR]=Geral do Dolphin +Name[ro]=Dolphin – Generale Name[ru]=Основные параметры Dolphin Name[se]=Dolphinoppalaččat Name[sk]=Všeobecný Dolphin @@ -137,6 +138,7 @@ Name[pa]=ਆਮ Name[pl]=Ogólne Name[pt]=Geral Name[pt_BR]=Geral +Name[ro]=Generale Name[ru]=Основное Name[sk]=Všeobecné Name[sl]=Splošno @@ -183,6 +185,7 @@ Comment[pa]=ਆਮ ਫਾਇਲ ਮੈਨੇਜਰ ਸੈਟਿੰਗ ਸੰਰ� Comment[pl]=Ustawienia ogólne zarządzania plikami Comment[pt]=Configurar as definições gerais do gestor de ficheiros Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos +Comment[ro]=Configurează opțiuni generale ale gestionarului de fișiere Comment[ru]=Настройка диспетчера файлов Comment[sk]=Všeobecné nastavenie správcu súborov Comment[sl]=Splošne nastavitve upravljalnika datotek @@ -230,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 |