Commit 426607bb 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 b0fb1b5a
......@@ -106,6 +106,7 @@ GenericName[et]=Veebilehitseja, failihaldur ja -näitaja
GenericName[eu]=Web arakatzailea, fitxategi kudeatzailea eta erakuslea
GenericName[fr]=Navigateur Web, gestionnaire de fichiers et visionneuse
GenericName[gl]=Navegador web, xestor de ficheiros e visor
GenericName[ia]=Navigator de Web, Gerente de File e Visor
GenericName[id]=Penampil Web, Pengelila File dan Penampil
GenericName[is]=Vafri, skráastjóri og skjalarýnir
GenericName[it]=Browser Web, gestore di file e visore
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