┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphingeneral.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2023-02-12 02:02:18 +0000
committerl10n daemon script <[email protected]>2023-02-12 02:02:18 +0000
commitd185e218871f7fb8016291994564bf266dd5df70 (patch)
tree49ffdd0e941e5d07b1def7dd1d6a09fe436bad84 /src/settings/kcm/kcmdolphingeneral.json
parentf885d2f1be6c52be33008f4afe95291d82c3618f (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/kcmdolphingeneral.json')
-rw-r--r--src/settings/kcm/kcmdolphingeneral.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index c3c9bda9e..81b52a32c 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -12,6 +12,7 @@
"Description[de]": "Allgemeine Einstellungen an der Dateiverwaltung vornehmen",
"Description[el]": "Διαμόρφωση γενικών ρυθμίσεων διαχείρισης αρχείων",
"Description[en_GB]": "Configure general file manager settings",
+ "Description[eo]": "Agordi ĝeneralajn dosiermastrumajn metojn",
"Description[es]": "Configurar las preferencias generales del gestor de archivos",
"Description[eu]": "Konfiguratu fitxategi-kudeatzailearen ezarpen orokorrak",
"Description[fi]": "Tiedostonhallinnan yleisasetukset",
@@ -55,6 +56,7 @@
"Name[de]": "Allgemein",
"Name[el]": "Γενικά",
"Name[en_GB]": "General",
+ "Name[eo]": "Ĝenerala",
"Name[es]": "General",
"Name[eu]": "Orokorra",
"Name[fi]": "Perusasetukset",