Commit bf3b97e3 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 20acb141
......@@ -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[es]=Complementos del motor web para interceptar Url
Name[nl]=Plug-ins voor webengine voor interceptie van URL's
Name[pl]=Wtyczki interceptora Url WebEngine
Name[pt]='Plugins' de Intersecção de URL's do Motor Web
Name[pt_BR]=Plugins de interceptação de URLs do mecanismo Web
Name[sk]=Pluginy url interceptora webového enginu
......@@ -25,6 +26,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[es]=Configurar los complementos del motor web para interceptar Url
Comment[nl]=Plug-ins voor webengine voor interceptie van URL's instellen
Comment[pl]=Ustaw wtyczki interceptora url WebEngine
Comment[pt]=Configurar os 'Plugins' de Intersecção de URL's do Motor Web
Comment[pt_BR]=Configura os plugins de interceptação de URLs do mecanismo Web
Comment[sk]=Nastaviť pluginy url interceptora webového enginu
......@@ -36,6 +38,7 @@ X-KDE-Keywords[ca]=akregator, configura, arranjament, motor web, interceptor de
X-KDE-Keywords[ca@valencia]=akregator, configura, arranjament, motor web, interceptor de l'url
X-KDE-Keywords[es]=akregator, configurar, preferencias, motor-web, interceptador de url
X-KDE-Keywords[nl]=akregator, instellen, instellingen, webEngine, interceptie van URL's
X-KDE-Keywords[pl]=akregator, konfiguruj, ustawienia, webEngine, interceptor url
X-KDE-Keywords[pt]=akregator, configurar, configuração, motor Web, intersecção de URL's
X-KDE-Keywords[pt_BR]=akregator, configurar, configurações, mecanismo Web, interceptação de URLs
X-KDE-Keywords[sk]=akregator, nastaviť, nastavenia, webEngine, url interceptor
......
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