Commit 280747f3 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 ea50133c
......@@ -5,6 +5,7 @@
#######################
Name=Lüv
Name[ca]=Lüv
Name[en_GB]=Lüv
Name[gl]=Lüv
Name[nl]=Lüv
Name[pt]=Lüv
......@@ -16,6 +17,7 @@ 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[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'.
......
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