Commit 9ac8f7e1 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 775a7096
......@@ -14,6 +14,7 @@ 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[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
Name[nl]=Plug-ins voor webengine voor interceptie van URL's
Name[pl]=Wtyczki interceptora URL WebEngine
......@@ -32,6 +33,7 @@ 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[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
Comment[nl]=Plug-ins voor webengine voor interceptie van URL's instellen
Comment[pl]=Ustaw wtyczki interceptora URL WebEngine
......@@ -51,6 +53,7 @@ X-KDE-Keywords[ca@valencia]=akregator, configura, arranjament, motor web, interc
X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,webEngine,adressen abfangen
X-KDE-Keywords[en_GB]=akregator, configure, settings, webEngine, url interceptor
X-KDE-Keywords[es]=akregator, configurar, preferencias, motor-web, interceptador de url
X-KDE-Keywords[et]=akregator, seadistamine, seadistused, veebimootor, URL-i tabaja
X-KDE-Keywords[gl]=akregator, configurar, configuración, motor web, interceptor de URL
X-KDE-Keywords[it]=akregator, configurazione, impostazioni, webEngine, cattura di URL
X-KDE-Keywords[nl]=akregator, instellen, instellingen, webEngine, interceptie van URL's
......
......@@ -201,6 +201,7 @@ Name[ca@valencia]=Missatge nou
Name[cs]=Nová zpráva
Name[de]=Neue Nachricht
Name[es]=Mensaje nuevo
Name[et]=Uus kiri
Name[fi]=Uusi viesti
Name[it]=Nuovo messaggio
Name[nl]=Nieuw bericht
......@@ -225,6 +226,7 @@ Name[ca@valencia]=Comprova el correu
Name[cs]=Zkontrolovat poštu
Name[de]=Nach E-Mail sehen
Name[es]=Comprobar correo
Name[et]=E-posti kontrollimine
Name[fi]=Tarkista posti
Name[it]=Controlla posta
Name[nl]=E-mail controleren
......
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