Commit 6153cdb0 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 2a183739
......@@ -4,6 +4,7 @@ Name[ca]=akonadimailreader
......@@ -6,6 +6,7 @@
"Name[de]": "Text vergrößern",
"Name[es]": "Ampliar texto",
"Name[fi]": "Zoomaa tekstiä",
"Name[gl]": "Achegar o texto",
"Name[it]": "Ingrandisci testo",
"Name[nl]": "Tekst zoomen",
"Name[pl]": "Powiększ tekst",
......@@ -25,6 +25,14 @@ Name[sv]=Program Oktetström
Name[uk]=Потік вісімкових даних
Name[x-test]=xxApplication Octetstreamxx
Comment=A bodypart formatter plugin for text/calendar
Comment[ca]=Un connector formatador del cos per a text/calendari
Comment[de]=Ein Textinhalt-Formatierungsmodul für text/calender
Comment[gl]=Un engadido para formatar o corpo do texto/calendario
Comment[nl]=Een opmaakplug-in voor text/calendar
Comment[pt]=Um 'plugin' de formatação do conteúdo para o tipo 'text/calendar'
Comment[sv]=Ett insticksprogram för brevtextformatering av text/calendar
Comment[uk]=Додаток форматування для text/calendar
Comment[x-test]=xxA bodypart formatter plugin for text/calendarxx
......@@ -6,6 +6,7 @@
"Name[de]": "Adresse erweitern",
"Name[es]": "Expandir URL",
"Name[fi]": "Laajenna osoite",
"Name[gl]": "Expandir o URL",
"Name[it]": "Espandi URL",
"Name[nl]": "Expandeer URL",
"Name[pl]": "Rozwiń adres URL",
......@@ -6,6 +6,7 @@
"Name[de]": "Externes Skript",
"Name[es]": "Guion externo",
"Name[fi]": "Ulkoinen skripti",
"Name[gl]": "Script externo",
"Name[it]": "Script esterno",
"Name[nl]": "Extern script",
"Name[pl]": "Zewnętrzny skrypt",
......@@ -5,6 +5,7 @@
"Name[ca]": "No deixis rastre",
"Name[es]": "No rastrear",
"Name[fi]": "Älä seuraa",
"Name[gl]": "Non seguir",
"Name[it]": "Non tenere traccia",
"Name[nl]": "Niet volgen",
"Name[pl]": "Nie śledź",
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