diff options
| author | l10n daemon script <[email protected]> | 2015-06-16 13:31:20 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-16 13:31:20 +0000 |
| commit | a8a4981b2c58090c01cc96da933022909d6adf6b (patch) | |
| tree | 05b8a39ae915503b8fe9b63b00d399a415d642d4 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 1c1efb983c60ea57422317186047f744e23df114 (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/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index a2fdf3120..e277d52f8 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -7,6 +7,7 @@ Name[es]=Preferencias generales de Dolphin Name[fi]=Dolphin – yleiset Name[fr]=Dolphin général Name[gl]=Xerais de Dolphin +Name[ia]=Dolphin General Name[id]=Dolphin Umum Name[it]=Impostazioni generali di Dolphin Name[ja]=Dolphin 全般 @@ -39,6 +40,7 @@ Comment[es]=Este servicio permite configurar las preferencias generales de Dolph Comment[fi]=Tällä palvelulla voi muokata Dolphinin yleisasetuksia. Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphin. Comment[gl]=Este servizo permite configurar opcións xerais de Dolphin. +Comment[ia]=Iste servicio permitte configuration del preferentias general de Dolphin. Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin. Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin. Comment[ja]=Dolphin の全般的な設定を行います @@ -81,6 +83,7 @@ Name[es]=General Name[fi]=Yleiset Name[fr]=Général Name[gl]=Xerais +Name[ia]=General Name[id]=Umum Name[it]=Generale Name[ja]=全般 @@ -112,6 +115,7 @@ Comment[es]=Configurar las preferencias generales del gestor de archivos Comment[fi]=Tiedostonhallinnan yleisasetukset Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers Comment[gl]=Configurar opcións xerais de xestores de ficheiros. +Comment[ia]=Configura preferentias del gerente general de file Comment[id]=Konfigurasi pengaturan manajer berkas umum Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います @@ -142,6 +146,7 @@ X-KDE-Keywords[es]=gestor de archivos X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros +X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[id]=manajer berkas X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ko]=파일 관리자 |