From 3fde6cbeb0b2df48a91870c74c4ef74462a82058 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 8 Nov 2023 09:18:27 +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 ++ src/settings/kcm/kcmdolphinviewmodes.json | 1 + 2 files changed, 3 insertions(+) (limited to 'src/settings') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 57fcaa3da..f168aadda 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -3,6 +3,7 @@ "Icon": "system-file-manager", "Name": "General", "Name[ar]": "عامّ", + "Name[ast]": "Xeneral", "Name[az]": "Əsas", "Name[be]": "Асноўныя", "Name[bg]": "Общи", @@ -18,6 +19,7 @@ "Name[fi]": "Perusasetukset", "Name[fr]": "Général", "Name[gl]": "Xeral", + "Name[he]": "כללי", "Name[hi]": "साधारण", "Name[ia]": "General", "Name[id]": "Umum", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 3ba03c5fa..abb2401a7 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -19,6 +19,7 @@ "Name[fi]": "Näkymät", "Name[fr]": "Modes d'affichage", "Name[gl]": "Modos de vista", + "Name[he]": "מצבי תצוגה", "Name[hi]": "दृश्य मोड्स", "Name[hu]": "Nézetmódok", "Name[ia]": "Modos de vista", -- cgit v1.3