From 6b1a5a2779f404165fd1e0b117fdac6dbdf75cc5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 28 Aug 2024 01:32:24 +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 | 1 + 1 file changed, 1 insertion(+) (limited to 'src/settings/kcm/kcmdolphinviewmodes.json') diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index f02d99a09..7383193b9 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -12,6 +12,7 @@ "Name[da]": "Visningstilstande", "Name[de]": "Ansichts-Modi", "Name[el]": "Λειτουργίες Προβολής", + "Name[en_GB]": "View Modes", "Name[eo]": "Vidreĝimoj", "Name[es]": "Modos de vistas", "Name[et]": "Vaaterežiimid", -- cgit v1.3