From c88ce580e6ad720342e7efec2c7e24d8362b648c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 26 Apr 2022 01:43:17 +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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/settings/kcm/kcmdolphingeneral.json') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index fbfa4156a..64effdda9 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -1,8 +1,22 @@ { "KPlugin": { "Description": "Configure general file manager settings", + "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", + "Description[ca]": "Configura les opcions generals del gestor de fitxers", + "Description[es]": "Configurar las preferencias generales del gestor de archivos", + "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren", + "Description[tr]": "Genel dosya yöneticisi ayarlarını yapılandır", + "Description[uk]": "Налаштувати загальні параметри менеджера файлів", + "Description[x-test]": "xxConfigure general file manager settingsxx", "Icon": "system-file-manager", "Name": "General", + "Name[ca@valencia]": "General", + "Name[ca]": "General", + "Name[es]": "General", + "Name[nl]": "Algemeen", + "Name[tr]": "Genel", + "Name[uk]": "Загальне", + "Name[x-test]": "xxGeneralxx", "ServiceTypes": [ "KCModule" ] -- cgit v1.3.1