┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphinviewmodes.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2022-06-16 01:56:58 +0000
committerl10n daemon script <[email protected]>2022-06-16 01:56:58 +0000
commitebe3a111e68b14fd5e8e9a7b1764c5de4ef6e351 (patch)
tree034ba0560bff94eda80d0a532fae80c43cf83048 /src/settings/kcm/kcmdolphinviewmodes.json
parent8aa81a1dc7fa978d44d2c6397df270432df1506f (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, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 86a0191f8..513e92c32 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -5,6 +5,7 @@
"Description[az]": "Fayl meneceri baxış rejimlərini tənzimləyin",
"Description[ca@valencia]": "Configura els modes de vista del gestor de fitxers",
"Description[ca]": "Configura els modes de vista del gestor de fitxers",
+ "Description[de]": "Dateiverwaltungs-Ansichten einrichten",
"Description[es]": "Configurar los modos de vistas del gestor de archivos",
"Description[fr]": "Configurer les modes d'affichage du gestionnaire de fichiers",
"Description[ia]": "Configura le modos de vista del gerente de file",