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"
wilder
l10n daemon script 4 years ago
parent 49f1357ac4
commit 26c678e290
  1. 1
      src/plugins/QuickCommands/konsole_quickcommands.json
  2. 1
      src/plugins/SSHManager/konsole_sshmanager.json

@ -3,6 +3,7 @@
"Name": "Quick Commands",
"Name[ar]": "الأوامر السريعة",
"Name[az]": "Sürətli əmrlər",
"Name[be]": "Хуткія загады",
"Name[bg]": "Бързи команди",
"Name[ca@valencia]": "Ordres ràpides",
"Name[ca]": "Ordres ràpides",

@ -3,6 +3,7 @@
"Name": "SSH Manager",
"Name[ar]": "مدير SSH",
"Name[az]": "SSH meneceri",
"Name[be]": "Кіраўнік SSH",
"Name[bg]": "Управление на SSH",
"Name[ca@valencia]": "Gestor de SSH",
"Name[ca]": "Gestor de SSH",

Loading…
Cancel
Save