diff options
| author | l10n daemon script <[email protected]> | 2019-02-22 05:30:16 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-02-22 05:30:16 +0100 |
| commit | 33581c60c7f7df69ffcad5bda77e9b54e08ed14b (patch) | |
| tree | 61ce8dc8053ff28b019d6a23a36d03619b775ee8 /src/settings/kcm/kcmdolphinviewmodes.desktop | |
| parent | ed82cca0c0764030e3c33c603104b577b1ab4552 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 14f3e530e..9c29e403a 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -158,7 +158,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 file +Comment[id]=Konfigurasikan mode tampilan pengelola file Comment[it]=Configura le viste del gestore dei file Comment[ja]=ファイルマネージャの表示モードを設定します Comment[ko]=파일 관리자 보기 모드 설정 |