diff options
| author | l10n daemon script <[email protected]> | 2019-11-11 09:42:43 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-11-11 09:42:43 +0100 |
| commit | 3984e607bb4437a38af16e007f1c23fbcff7dfb2 (patch) | |
| tree | 3f19b3d4d36c0f3eed6d827b771dcde9842bc63c /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | d8f9ca49d333540796713a8842a1bea7622d0444 (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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 9dccea5ed..ea4dd15cf 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -21,6 +21,7 @@ Name[it]=Servizi di Dolphin Name[ja]=Dolphin サービス Name[ko]=Dolphin 서비스 Name[lt]=Dolphin paslaugos +Name[lv]=Dolphin servisi Name[ml]=ഡോള്ഫിന് സേവനങ്ങള് Name[nb]=Dolphin-tjenester Name[nl]=Dolphin-services @@ -77,6 +78,7 @@ Name[it]=Servizi Name[ja]=サービス Name[ko]=서비스 Name[lt]=Paslaugos +Name[lv]=Servisi Name[ml]=സേവനങ്ങള് Name[nb]=Tjenester Name[nl]=Services @@ -121,6 +123,7 @@ Comment[it]=Configura i servizi del gestore dei file Comment[ja]=ファイルマネージャのサービスを設定します Comment[ko]=파일 관리자 서비스 구성 Comment[lt]=Konfigūruoti failų tvarkytuvės paslaugas +Comment[lv]=Konfigurēt datņu pārvaldnieka servisus Comment[ml]=ഫയല് മാനേജർ സേവനങ്ങള് ക്രമീകരിയ്ക്കുക Comment[nb]=Sett opp tjenester i filbehandleren Comment[nl]=Bestandsbeheerderservices configureren @@ -166,6 +169,7 @@ X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=failų tvarkytuvė +X-KDE-Keywords[lv]=datņu pārvaldnieks X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder |