From e406bc197fc0116d7fd8bb62086b41c52417c948 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 7 Jun 2022 02:25:10 +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, 1 insertion(+), 1 deletion(-) (limited to 'src/settings/kcm/kcmdolphingeneral.json') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 11b41a7a1..1deb158cf 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -3,7 +3,7 @@ "Description": "Configure general file manager settings", "Description[ar]": "اضبط إعدادات مدير الملفّات العامّة", "Description[az]": "Əsas fayl meneceri ayarlarını tənzimləyin", - "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", + "Description[ca@valencia]": "Configura les opcions generals del gestor de fichers", "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", -- cgit v1.3