From 7fdd9f22d8cef4d07576336bd7c50fc0f31fd849 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 Jul 2022 01:53:09 +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/kcmdolphingeneral.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphingeneral.json') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 954fb1f72..2ad978142 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -9,6 +9,7 @@ "Description[cs]": "Obecné nastavení správce souborů", "Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen", "Description[es]": "Configurar las preferencias generales del gestor de archivos", + "Description[fi]": "Tiedostonhallinnan yleisasetukset", "Description[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers", "Description[ia]": "Configura preferentias del gerente general de file", "Description[id]": "Konfigurasikan pengaturan pengelola file umum", @@ -39,6 +40,7 @@ "Name[cs]": "Obecné", "Name[de]": "Allgemein", "Name[es]": "General", + "Name[fi]": "Perusasetukset", "Name[fr]": "Général", "Name[ia]": "General", "Name[id]": "Umum", -- cgit v1.3.1