┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphinviewmodes.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2024-06-28 01:27:14 +0000
committerl10n daemon script <[email protected]>2024-06-28 01:27:14 +0000
commit08347a59c0a442c42b6c97c692b6d4aabb2e70df (patch)
tree079bd612ebaee083b7d2109bf066e04564ff1d9d /src/settings/kcm/kcmdolphinviewmodes.json
parent3a54a369d9115fa66ed474c4eee3ef51b300db3c (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/kcmdolphinviewmodes.json')
-rw-r--r--src/settings/kcm/kcmdolphinviewmodes.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index abb2401a7..508bb908a 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -11,7 +11,6 @@
"Name[cs]": "Režimy pohledu",
"Name[da]": "Visningstilstande",
"Name[de]": "Ansichts-Modi",
- "Name[en_GB]": "View Modes",
"Name[eo]": "Vidreĝimoj",
"Name[es]": "Modos de vistas",
"Name[et]": "Vaaterežiimid",