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-5.24
l10n daemon script 4 years ago
parent b427427ddd
commit c5c8a5a1c8
  1. 6
      runners/helprunner/helprunner.json

@ -4,10 +4,12 @@
{
"Email": "alexander.lohnau@gmx.de",
"Name": "Alexander Lohnau",
"Name[ar]": "Alexander Lohnau",
"Name[az]": "Alexander Lohnau",
"Name[ca]": "Alexander Lohnau",
"Name[es]": "Alexander Lohnau",
"Name[fr]": "Alexander Lohnau",
"Name[hu]": "Alexander Lohnau",
"Name[ia]": "Alexander Lohnau",
"Name[nl]": "Alexander Lohnau",
"Name[ru]": "Alexander Lohnau",
@ -18,10 +20,12 @@
}
],
"Description": "Shows help information about runners when typing \"?\" or \"help\"",
"Description[ar]": "تعرض معلومات المساعدة عن المشغلات عن كتابة \"؟\" أوس \"مساعدة\"",
"Description[az]": "\"?\" və ya \"help\" yazdıqda KRunner haqqında məlumatı göstərir",
"Description[ca]": "Mostra informació d'ajuda quan als executors en teclejar «?» o «ajuda»",
"Description[es]": "Muestra información de ayuda sobre los lanzadores cuando se escribe «?» o «ayuda»",
"Description[fr]": "Affiche des informations d'aide sur les lanceurs en saisissant « ? » ou « aide ».",
"Description[hu]": "Súgóinformációk megjelenítése az indítókról „?” vagy „súgó” gépelésekor",
"Description[ia]": "Monstra information de adjuta re executores quando on typa \"?\" o \"help\"",
"Description[nl]": "Toont help-informatie over runners bij typen van \"?\" of \"help\"",
"Description[sl]": "Prikaži informacije za pomoč o zagonih kadar vtipkate \"?\" ali \"help\"",
@ -31,10 +35,12 @@
"EnabledByDefault": true,
"Icon": "help-contextual",
"Name": "Help Runner",
"Name[ar]": "مساعدة المشغّل",
"Name[az]": "KRunner köməyi",
"Name[ca]": "Executor d'ajuda",
"Name[es]": "Ayuda sobre lanzador",
"Name[fr]": "Lanceur d'aide",
"Name[hu]": "Indítósúgó",
"Name[ia]": "Executor de adjuta",
"Name[nl]": "Help van Runner",
"Name[sl]": "Pomoč za Runner",

Loading…
Cancel
Save