From 1a8be1544d791e098256cfa5e2ab045e44d42320 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 30 Apr 2022 01:42:27 +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 125158e14..2fcdd7f7b 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -6,7 +6,9 @@ "Description[ca]": "Configura els modes de vista del gestor de fitxers", "Description[es]": "Configurar los modos de vistas del gestor de archivos", "Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers", + "Description[it]": "Configura le viste del gestore dei file", "Description[nl]": "Bestandsbeheerderweergavemodussen configureren", + "Description[sl]": "Postavi načine prikaza upravljalnika datotek", "Description[sv]": "Anpassa filhanterarens visningslägen", "Description[ta]": "கோப்பு உலாவியின் காட்சிமுறைகளை அமையுங்கள்", "Description[tr]": "Dosya yöneticisi görünüm kiplerini yapılandır", -- cgit v1.3