Commit 8b4daa55 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 280747f3
......@@ -19,6 +19,7 @@ Name[en_GB]=vvave
Name[gl]=vvave
Name[nl]=vvave
Name[pt]=vvave
Name[sv]=vvave
Name[uk]=vvave
Name[x-test]=xxvvavexx
......@@ -31,6 +32,7 @@ Name[en_GB]=vvave...
Name[gl]=vvave…
Name[nl]=vvave...
Name[pt]=vvave...
Name[sv]=vvave...
Name[uk]=vvave…
Name[x-test]=xxvvave...xx
Comment=Connection to device failed
......
......@@ -5,10 +5,12 @@
#######################
Name=Lüv
Name[ca]=Lüv
Name[ca@valencia]=Lüv
Name[en_GB]=Lüv
Name[gl]=Lüv
Name[nl]=Lüv
Name[pt]=Lüv
Name[sv]=Lüv
Name[uk]=Lüv
Name[x-test]=xxLüvxx
......@@ -17,10 +19,12 @@ Name[x-test]=xxLüvxx
#################
Comment=Lüv is an icon theme for freedesktop environments.
Comment[ca]=Lüv és un tema d'icones per als entorns «freedesktop».
Comment[ca@valencia]=Lüv és un tema d'icones per als entorns «freedesktop».
Comment[en_GB]=Lüv is an icon theme for freedesktop environments.
Comment[gl]=Lüv é un tema de iconas para ambientes de freedesktop.
Comment[nl]=Lüv is een pictogramthema voor freedesktop-omgevingen.
Comment[pt]=O Lüv é um tema de ícones para os ambientes do 'freedesktop'.
Comment[sv]=Lüv är ett ikontema för freedesktop-miljöer.
Comment[uk]=Lüv — тема піктограм для середовищ freedesktop.
Comment[x-test]=xxLüv is an icon theme for freedesktop environments.xx
......
......@@ -7,6 +7,7 @@ Name[en_GB]=vvave
Name[gl]=vvave
Name[nl]=vvave
Name[pt]=vvave
Name[sv]=vvave
Name[uk]=vvave
Name[x-test]=xxvvavexx
Comment=Play your music collection
......
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