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/kcmdolphinservices.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/kcmdolphinservices.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 10e806a81..6eccee850 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -31,6 +31,7 @@ Name[pa]=ਡਾਲਫਿਨ ਸੇਵਾਵਾਂ Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin Name[pt_BR]=Serviços do Dolphin +Name[ro]=Dolphin – Servicii Name[ru]=Действия Dolphin Name[sk]=Služby Dolphinu Name[sl]=Dolphin - storitve @@ -89,6 +90,7 @@ Name[pa]=ਸੇਵਾਵਾਂ Name[pl]=Usługi Name[pt]=Serviços Name[pt_BR]=Serviços +Name[ro]=Servicii Name[ru]=Действия Name[sk]=Služby Name[sl]=Storitve @@ -182,6 +184,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 |