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/kcmdolphinviewmodes.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.json') diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 35e4466cd..3bd1b82fc 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -3,6 +3,7 @@ "Description": "Configure file manager view modes", "Description[ar]": "اضبط أوضاع العرض في مدير الملفّات", "Description[az]": "Fayl meneceri baxış rejimlərini tənzimləyin", + "Description[be]": "Наладжванне рэжымаў выгляду кіраўніка файлаў", "Description[bg]": "Конфигуриране на режимите за изглед на файловия мениджър", "Description[ca@valencia]": "Configura els modes de vista del gestor de fitxers", "Description[ca]": "Configura els modes de vista del gestor de fitxers", @@ -42,6 +43,7 @@ "Name": "View Modes", "Name[ar]": "أوضاع المنظور", "Name[az]": "Baxış rejimləri", + "Name[be]": "Рэжым выгляду", "Name[bg]": "Режими на преглед", "Name[ca@valencia]": "Modes de vista", "Name[ca]": "Modes de vista", -- cgit v1.3