Commit 9551c416 authored by Script Kiddy's avatar Script Kiddy

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"
parent 4d29ea38
......@@ -5,6 +5,7 @@
"Description[ca@valencia]": "Este connector permet generar un URL més curt.",
"Description[ca]": "Aquest connector permet generar un URL més curt.",
"Description[es]": "Este complemento le permite generar un URL corto.",
"Description[fi]": "Tällä liitännäisellä voit luoda lyhyen verkko-osoitteen.",
"Description[fr]": "Ce module permet de générer une URL réduite.",
"Description[it]": "Questa estensione permette di generare un URL abbreviato.",
"Description[nl]": "Deze plug-in stelt u in staat een kortere URL te genereren.",
......@@ -25,6 +26,7 @@
"Name[ca@valencia]": "Inserció d'un URL curt",
"Name[ca]": "Inserció d'un URL curt",
"Name[es]": "Insertar URL corto",
"Name[fi]": "Lisää lyhyt verkko-osoite",
"Name[fr]": "Insérer l'URL réduite",
"Name[it]": "Inserisci URL abbreviato",
"Name[nl]": "Ingekort URL-adres invoegen",
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment