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 0952e29f9b
commit 424eef1c19
  1. 1
      src/plugins/QuickCommands/konsole_quickcommands.json

@ -13,6 +13,7 @@
"Name[ko]": "빠른 명령",
"Name[nl]": "Snelle commando's",
"Name[pl]": "Szybkie polecenia",
"Name[pt_BR]": "Comandos rápidos",
"Name[ro]": "Comenzi rapide",
"Name[sl]": "Hitri ukazi",
"Name[sv]": "Snabbkommandon",

Loading…
Cancel
Save