From df11f2f168911c3d350216ddb013daac94b9fde4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 28 Dec 2022 02:03:50 +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 cd62ec23f..9d9902e8c 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -3,6 +3,7 @@ "Description": "Configure general file manager settings", "Description[ar]": "اضبط إعدادات مدير الملفّات العامّة", "Description[az]": "Əsas fayl meneceri ayarlarını tənzimləyin", + "Description[be]": "Асноўныя налады кіраўніка файлаў", "Description[bg]": "Конфигуриране на общите настройки на файловия мениджър", "Description[ca@valencia]": "Configura les opcions generals del gestor de fitxers", "Description[ca]": "Configura les opcions generals del gestor de fitxers", @@ -42,6 +43,7 @@ "Name": "General", "Name[ar]": "عامّ", "Name[az]": "Əsas", + "Name[be]": "Асноўныя", "Name[bg]": "Общи", "Name[ca@valencia]": "General", "Name[ca]": "General", -- cgit v1.3.1