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/kcmdolphinviewmodes.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/kcmdolphinviewmodes.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index aaf251f7c..67e6ff39c 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -150,7 +150,7 @@ Comment[fr]=Configuration les modes d'affichage du gestionnaire de fichiers Comment[gl]=Configurar os modos de vista do xestor de ficheiros. Comment[hu]=A fájlkezelő nézetmódjainak beállítása Comment[ia]=Configura le modos de vista del gerente de file -Comment[id]=Konfigurasi mode tampilan pengelola fail +Comment[id]=Konfigurasi mode tampilan pengelola file Comment[it]=Configura le viste del gestore dei file Comment[ja]=ファイルマネージャの表示モードを設定します Comment[ko]=파일 관리자 보기 모드 설정 @@ -194,7 +194,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]=파일 관리자 |