diff options
| author | l10n daemon script <[email protected]> | 2015-05-04 10:09:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-04 10:09:13 +0000 |
| commit | f1c5cd302ad382613edc0a1cb2c88bcb2a670b95 (patch) | |
| tree | ce9a944a91afa36aee45fbd19695eef720e7fb42 /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | ece6650ecd3af0eb450e28a9aadcb0f4dd26cb24 (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 bb4e7680c..f130b37ae 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -8,6 +8,7 @@ Name[fr]=Services de Dolphin Name[gl]=Servizos de Dolphin Name[id]=Layanan Dolphin Name[it]=Servizi di Dolphin +Name[ja]=Dolphin サービス Name[ko]=Dolphin 서비스 Name[nl]=Dolphin-services Name[pl]=Usługi Dolphina @@ -44,6 +45,7 @@ Name[fr]=Services Name[gl]=Servizos Name[id]=Layanan Name[it]=Servizi +Name[ja]=サービス Name[ko]=서비스 Name[nl]=Services Name[pl]=Usługi @@ -69,6 +71,7 @@ Comment[fr]=Configuration des services du gestionnaire de fichiers Comment[gl]=Configurar servizos de xestores de ficheiros. Comment[id]=Konfigurasi layanan manajer berkas Comment[it]=Configura i servizi del gestore dei file +Comment[ja]=ファイルマネージャのサービスを設定します Comment[ko]=파일 관리자 서비스 설정 Comment[nb]=Sett opp tjenester i filbehandleren Comment[nl]=Bestandsbeheerderservices configureren |