From 6c65d06bcd4b34ef7a82203b3ba06b6c3604986b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Sep 2022 01:48:38 +0000 Subject: 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" --- src/settings/kcm/kcmdolphinviewmodes.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.json') diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index d6347b153..f16bbba6b 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -18,6 +18,7 @@ "Description[id]": "Konfigurasikan mode tampilan pengelola file", "Description[is]": "Stilla skoðunarhami í skráastjóra", "Description[it]": "Configura le viste del gestore dei file", + "Description[ka]": "ფაილების მმართველის ხედის რეჟიმების მორგება", "Description[ko]": "파일 관리자 보기 모드 설정", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", "Description[nn]": "Set opp visingsmodusane i filhandsamaren", @@ -61,6 +62,7 @@ "Name[is]": "Skoðunarhamir", "Name[it]": "Viste", "Name[ja]": "表示モード", + "Name[ka]": "ნახვის რეჟიმები", "Name[ko]": "보기 모드", "Name[lt]": "Rodinio veiksenos", "Name[lv]": "Skata režīmi", -- cgit v1.3