From b700c94d3eab387cfdef5aea5460fde5d2efa5bd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 18 May 2022 01:44:40 +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 8a4c602a1..9536dc751 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -7,6 +7,7 @@ "Description[ca]": "Configura les opcions generals del gestor de fitxers", "Description[es]": "Configurar las preferencias generales del gestor de archivos", "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", "Description[it]": "Configura le impostazioni generali del gestore dei file", "Description[ko]": "일반 파일 관리자 설정", @@ -32,6 +33,7 @@ "Name[cs]": "Obecné", "Name[es]": "General", "Name[fr]": "Général", + "Name[ia]": "General", "Name[id]": "Umum", "Name[it]": "Generale", "Name[ko]": "일반", -- cgit v1.3