diff options
| author | l10n daemon script <[email protected]> | 2020-09-14 06:15:19 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-14 06:15:19 +0200 |
| commit | 1d47e9691330ad40113e3652ab2f158a25665ece (patch) | |
| tree | 7594ca25a09d8ec6f7c618322759486a709b5738 /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | 7d3e9f726b0cb4be651fc2f62ebf709288e30769 (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/kcmdolphinservices.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
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 |