Commit bd70a538 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 b7fbe4f2
......@@ -13,6 +13,7 @@ Name=Web Engine URL Interceptor Plugins
Name[ca]=Connectors motor web i interceptor de l'URL
Name[ca@valencia]=Connectors motor web i interceptor de l'URL
Name[de]=WebEngine-Module zum Abfangen von Adressen
Name[en_GB]=Web Engine URL Interceptor Plugins
Name[es]=Complementos del motor web para interceptar URL
Name[et]=Veebimootori URL-i tabamise plugin
Name[it]=Estensioni di Web Engine per la cattura di URL
......@@ -32,6 +33,7 @@ Comment=Configure Web Engine URL Interceptor Plugins
Comment[ca]=Configura els connectors motor web i interceptor de l'URL
Comment[ca@valencia]=Configura els connectors motor web i interceptor de l'URL
Comment[de]=WebEngine-Module zum Abfangen von Adressen einrichten
Comment[en_GB]=Configure Web Engine URL Interceptor Plugins
Comment[es]=Configurar los complementos del motor web para interceptar URL
Comment[et]=Veebimootori URL-i tabamise plugina seadistamine
Comment[it]=Configura estensioni di Web Engine per la cattura di URL
......
......@@ -200,6 +200,7 @@ Name[ca]=Missatge nou
Name[ca@valencia]=Missatge nou
Name[cs]=Nová zpráva
Name[de]=Neue Nachricht
Name[en_GB]=New Message
Name[es]=Mensaje nuevo
Name[et]=Uus kiri
Name[fi]=Uusi viesti
......@@ -225,6 +226,7 @@ Name[ca]=Comprova el correu
Name[ca@valencia]=Comprova el correu
Name[cs]=Zkontrolovat poštu
Name[de]=Nach E-Mail sehen
Name[en_GB]=Check Mail
Name[es]=Comprobar correo
Name[et]=E-posti kontrollimine
Name[fi]=Tarkista posti
......
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