Commit 0c9f7bcd 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 834789cb
......@@ -95,8 +95,8 @@ Name[zh_CN]=Konqueror
Name[zh_TW]=Konqueror
GenericName=Web Browser, File Manager and Viewer
GenericName[ast]=Restolador web, xestor de ficheros y visor
GenericName[ca]=Navegador web, gestor i visualitzador de fitxers
GenericName[ca@valencia]=Navegador web, gestor i visualitzador de fitxers
GenericName[ca]=Navegador web, gestor i visor de fitxers
GenericName[ca@valencia]=Navegador web, gestor i visor de fitxers
GenericName[cs]=Webový prohlížeč, správce souborů a prohlížeč dokumentů
GenericName[da]=Webbrowser, filhåndtering og fremviser
GenericName[de]=Webbrowser, Dateiverwaltung und Dokumentenbetrachter
......
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