Commit 79c73e17 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 98405ee6
......@@ -3,6 +3,7 @@ IconName=preferences-system-bluetooth
Comment=Tiny Music Player
Comment[ca]=Reproductor de música petit
Comment[ca@valencia]=Reproductor de música petit
Comment[cs]=Drobný přehrávač hudby
Comment[de]=Einfache Audio-Wiedergabe
Comment[es]=Reproductor de música mínimo
Comment[fr]=Lecteur de musique ultra compact
......@@ -19,6 +20,7 @@ Comment[x-test]=xxTiny Music Playerxx
Name=Babe
Name[ca]=Babe
Name[ca@valencia]=Babe
Name[cs]=Babe
Name[de]=Babe
Name[es]=Babe
Name[gl]=Babe
......@@ -37,6 +39,7 @@ Name[zh_TW]=Babe
Name=Babe...
Name[ca]=Babe...
Name[ca@valencia]=Babe...
Name[cs]=Babe...
Name[de]=Babe...
Name[es]=Babe...
Name[gl]=Babe…
......
......@@ -2,6 +2,7 @@
Name=Pix
Name[ca]=Pix
Name[ca@valencia]=Pix
Name[cs]=Pix
Name[de]=Pix
Name[es]=Pix
Name[gl]=Pix
......
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