diff options
| author | l10n daemon script <[email protected]> | 2018-04-03 07:12:29 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-03 07:12:29 +0200 |
| commit | f4e2593aa79cdc0483121507012b2045bf2e9703 (patch) | |
| tree | 0edd69eac7762c248bfa1e64195d35b5ad0273b7 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 4bd6e9fb1397373b6c113fc25f9b4e17764a1504 (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 300e01ae4..9075820d0 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 fail umum +Comment[id]=Konfigurasi setelan pengelola file 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 fail +X-KDE-Keywords[id]=pengelola file X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[ja]=ファイルマネージャ X-KDE-Keywords[ko]=파일 관리자 |