Commit 9af3e74d 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 6ce74acf
......@@ -188,7 +188,7 @@ Name[en_GB]=Directory does not exist
Name[es]=El directorio no existe
Name[et]=Kataloogi ei ole olemas
Name[fi]=Kansiota ei ole olemassa
Name[fr]=Le répertoire n'existe pas
Name[fr]=Le dossier n'existe pas
Name[gl]=O directorio non existe
Name[hu]=A könyvtár nem létezik
Name[ia]=Le directorio non existe
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