Commit 48128750 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 7da7f0bb
......@@ -97,6 +97,7 @@ 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[cs]=Webový prohlížeč, správce souborů a prohlížeč dokumentů
GenericName[de]=Webbrowser, Dateiverwaltung und Dokumentenbetrachter
GenericName[en_GB]=Web Browser, File Manager and Viewer
GenericName[es]=Navegador web, gestor y visor de archivos
......
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