diff options
| author | l10n daemon script <[email protected]> | 2018-03-03 05:23:49 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-03-03 05:23:49 +0100 |
| commit | e46421bfeee7a2d4f8f61c24feee2758325e86a4 (patch) | |
| tree | 3005a0e4df2ad3ae3010b2a400e0bbe31b25e23a /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | b95cc59091f9b538f87b616b92e91d6aace0e1be (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index c05e5b1a1..6cbfe0c85 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -152,7 +152,7 @@ Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers Comment[gl]=Configurar opcións xerais de xestores de ficheiros. Comment[hu]=A fájlkezelő általános beállításainak módosítása Comment[ia]=Configura preferentias del gerente general de file -Comment[id]=Konfigurasi setelan pengelola berkas umum +Comment[id]=Konfigurasi setelan pengelola fail umum Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 @@ -195,7 +195,7 @@ X-KDE-Keywords[gl]=xestor de ficheiros X-KDE-Keywords[he]=מנהל קבצים X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file -X-KDE-Keywords[id]=pengelola berkas +X-KDE-Keywords[id]=pengelola fail X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 |