┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphingeneral.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2022-04-27 01:46:00 +0000
committerl10n daemon script <[email protected]>2022-04-27 01:46:00 +0000
commit8076b54a2ce8c1253385c9ee3f24938bdbf4773c (patch)
treec47ef3ac02b0930e408540a2f729989902f044af /src/settings/kcm/kcmdolphingeneral.json
parent57c0c2db7e3d76d37b4fd6efc43bb3cd987949e7 (diff)
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"
Diffstat (limited to 'src/settings/kcm/kcmdolphingeneral.json')
-rw-r--r--src/settings/kcm/kcmdolphingeneral.json8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 64effdda9..c42d98ca7 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -4,19 +4,27 @@
"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[fr]": "Configurer les paramètres généraux pour le gestionnaire de fichiers",
"Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
+ "Description[sv]": "Anpassa filhanterarens allmänna inställningar",
+ "Description[ta]": "பொதுவான கோப்பு மேலாளி அமைப்புகளை அமையுங்கள்",
"Description[tr]": "Genel dosya yöneticisi ayarlarını yapılandır",
"Description[uk]": "Налаштувати загальні параметри менеджера файлів",
"Description[x-test]": "xxConfigure general file manager settingsxx",
+ "Description[zh_CN]": "配置文件管理器常规设置",
"Icon": "system-file-manager",
"Name": "General",
"Name[ca@valencia]": "General",
"Name[ca]": "General",
"Name[es]": "General",
+ "Name[fr]": "Général",
"Name[nl]": "Algemeen",
+ "Name[sv]": "Allmänt",
+ "Name[ta]": "பொதுவானவை",
"Name[tr]": "Genel",
"Name[uk]": "Загальне",
"Name[x-test]": "xxGeneralxx",
+ "Name[zh_CN]": "常规",
"ServiceTypes": [
"KCModule"
]