Commit 3fccec42 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 d825e73d
......@@ -19,6 +19,7 @@ Name[de]=HTML-Einstellungen
Name[el]=Ρυθμίσεις HTML
Name[en_GB]=HTML Settings
Name[es]=Preferencias de HTML
Name[eu]=HTML ezarpenak
Name[fi]=HTML-asetukset
Name[fr]=Paramètres de « HTML »
Name[ia]=Preferentias HTML
......@@ -44,6 +45,7 @@ Comment[de]=Schnelle Möglichkeit zur Änderung der HTML-Einstellungen
Comment[el]=Ένας γρήγορος τρόπος αλλαγής των ρυθμίσεων του HTML
Comment[en_GB]=A fast way to change the HTML settings
Comment[es]=Una forma rápida de cambiar las preferencias de HTML
Comment[eu]=HTML ezarpenak era azkarrean aldatzeko modua
Comment[fi]=Nopea tapa muuttaa HTML-asetuksia
Comment[fr]=Un moyen rapide pour modifier les paramètres de « HTML »
Comment[ia]=Un modo rapide de cambiar le preferentias de HTML
......
Supports Markdown
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