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/kcmdolphingeneral.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/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index c0faa31a2..64c00713b 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -159,7 +159,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 file umum +Comment[id]=Konfigurasikan setelan pengelola file umum Comment[it]=Configura le impostazioni generali del gestore dei file Comment[ja]=ファイルマネージャの全般的な設定を行います Comment[ko]=일반 파일 관리자 설정 |