diff options
| author | l10n daemon script <[email protected]> | 2015-12-08 10:05:01 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-12-08 10:05:01 +0000 |
| commit | c0d5537afb10f09aaa6b47a994e8f8024c1006b4 (patch) | |
| tree | 8487c351a74f6c737759ba63b609f1ad30aff821 /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | 9c432e6905c41193e0dff759ba5c61ac295e41ac (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 1e951222d..516cd48d7 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -19,6 +19,7 @@ Name[ko]=Dolphin 서비스 Name[lt]=Dolphin tarnybos Name[nb]=Dolphin-tjenester Name[nl]=Dolphin-services +Name[nn]=Dolphin-tenester Name[pa]=ਡਾਲਫਿਨ ਸੇਵਾਵਾਂ Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin @@ -68,6 +69,7 @@ Name[ko]=서비스 Name[lt]=Paslaugos Name[nb]=Tjenester Name[nl]=Services +Name[nn]=Tenester Name[pa]=ਸੇਵਾਵਾਂ Name[pl]=Usługi Name[pt]=Serviços |