Commit 5b1ef88c 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 4887ee28
......@@ -37,6 +37,7 @@ Comment[el]=Η ωραία μας υδρόγειος ως ταπετσαρία
Comment[en_GB]=Our beautiful globe as your wallpaper
Comment[es]=Nuestro bello globo como fondo de escritorio
Comment[et]=Meie kaunis maakera sinu taustapildina
Comment[fi]=Maapallo taustakuvanasi
Comment[fr]=Notre magnifique globe comme fond d'écran
Comment[gl]=O noso fermoso globo terráqueo como fondo de escritorio
Comment[it]=Il nostro bellissimo pianeta come sfondo
......
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