Commit cf263f5d 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 42a3cfd3
......@@ -25,7 +25,7 @@ Name[es]=Archivador web
Name[et]=Veebiarhiveerija
Name[eu]=Web artxibatzailea
Name[fi]=Web-arkistoija
Name[fr]=Archiveur Web
Name[fr]=Archiveur Internet
Name[ga]=Cartlannaí Gréasáin
Name[gl]=Arquivador web
Name[he]=ארכיוני רשת
......
......@@ -33,7 +33,7 @@ Name[et]=Java ja JavaScript
Name[eu]=Java eta JavaScript
Name[fa]=جاوا و جاوااسکریپت
Name[fi]=Java ja JavaScript
Name[fr]=Java & Javascript
Name[fr]=Java & JavaScript
Name[fy]=Java en JavaSkript
Name[ga]=Java agus JavaScript
Name[gl]=Java e JavaScript
......@@ -126,7 +126,7 @@ Comment[et]=Java ja JavaScripti käitumise seadistamine
Comment[eu]=Konfiguratu Java eta JavaScripten portaera
Comment[fa]=پیکربندی رفتار جاوا و جاوااسکریپت
Comment[fi]=Javan ja JavaScriptin toiminta-asetukset
Comment[fr]=Configuration du comportement de Java et Javascript
Comment[fr]=Configuration du comportement de Java et JavaScript
Comment[fy]=Hjir kinne jo it gedrach fan Java en JavaSkript ynstelle
Comment[ga]=Cumraigh oibriú Java agus JavaScript
Comment[gl]=Configura o comportamento de Java e JavaScript
......
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