diff options
| author | l10n daemon script <[email protected]> | 2015-05-31 10:13:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-31 10:13:13 +0000 |
| commit | 586252341ea69a60b64f404dd23ef93e59c1e16c (patch) | |
| tree | bfd5fff0b27bdddf74a438798e6c3f9f56590a5e /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | 0c7da668e724490b894b4d174b36d4be6002afc9 (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 70e422cf3..2f09e5dfe 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -11,6 +11,7 @@ Name[it]=Servizi di Dolphin Name[ja]=Dolphin サービス Name[ko]=Dolphin 서비스 Name[lt]=Dolphin tarnybos +Name[nb]=Dolphin-tjenester Name[nl]=Dolphin-services Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin @@ -50,6 +51,7 @@ Name[it]=Servizi Name[ja]=サービス Name[ko]=서비스 Name[lt]=Paslaugos +Name[nb]=Tjenester Name[nl]=Services Name[pl]=Usługi Name[pt]=Serviços |