From 4f1d8fef9216d6ae7b5b9bd1fa5523103ccf419a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 6 Nov 2022 01:51:33 +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 e77f4906d..7f330f398 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -16,6 +16,7 @@ "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", "Description[ia]": "Configura le modos de vista del gerente de file", "Description[id]": "Konfigurasikan mode tampilan pengelola file", + "Description[ie]": "Configurar li modes de vise del gerente de files", "Description[is]": "Stilla skoðunarhami í skráastjóra", "Description[it]": "Configura le viste del gestore dei file", "Description[ka]": "ფაილების მმართველის ხედის რეჟიმების მორგება", @@ -58,6 +59,7 @@ "Name[hu]": "Nézetmódok", "Name[ia]": "Modos de vista", "Name[id]": "Mode Tampilan", + "Name[ie]": "Modes de vise", "Name[is]": "Skoðunarhamir", "Name[it]": "Viste", "Name[ja]": "表示モード", -- cgit v1.3