Commit 0723e84a 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 03f91819
......@@ -11,9 +11,21 @@ Comment[sv]=Mycket liten musikspelare
Comment[uk]=Маленький музичний програвач
Comment[x-test]=xxTiny Music Playerxx
Name=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
Name[nl]=vvave
Name[pt]=vvave
Name[uk]=vvave
Name[x-test]=xxvvavexx
[Event/Notify]
Name=vvave...
Name[ca]=vvave...
Name[ca@valencia]=vvave...
Name[nl]=vvave...
Name[pt]=vvave...
Name[uk]=vvave…
Name[x-test]=xxvvave...xx
Comment=Connection to device failed
Comment[ca]=Ha fallat la connexió amb el dispositiu
Comment[ca@valencia]=Ha fallat la connexió amb el dispositiu
......
[Desktop Entry]
Name=vvave
Name[ca]=vvave
Name[ca@valencia]=vvave
Name[nl]=vvave
Name[pt]=vvave
Name[uk]=vvave
Name[x-test]=xxvvavexx
Comment=Play your music collection
Comment[ca]=Reprodueix la vostra col·lecció de música
Comment[ca@valencia]=Reprodueix la vostra col·lecció de música
......
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