Commit d9edbe05 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 56cbde37
......@@ -46,7 +46,7 @@ Name[x-test]=xxBreezexx
Name[zh_CN]=微风
Name[zh_TW]=Breeze
Comment=Breeze by the KDE VDG
Comment[ca]=Brisa, creat per la comunitat VDG del KDE
Comment[ca]=Brisa, creat pel VDG del KDE
Comment[ca@valencia]=Brisa per a VDG de KDE
Comment[cs]=Breeze od KDE VDG
Comment[da]=Breeze af KDE's visuelle designgruppe
......
......@@ -46,7 +46,7 @@ Name[x-test]=xxBreezexx
Name[zh_CN]=微风
Name[zh_TW]=Breeze
Comment=Breeze by the KDE VDG
Comment[ca]=Brisa, creat per la comunitat VDG del KDE
Comment[ca]=Brisa, creat pel VDG del KDE
Comment[ca@valencia]=Brisa per a VDG de KDE
Comment[cs]=Breeze od KDE VDG
Comment[da]=Breeze af KDE's visuelle designgruppe
......
......@@ -33,7 +33,7 @@ Name[x-test]=xxBreeze Lightxx
Name[zh_CN]=亮色微风
Name[zh_TW]=Breeze Light
Comment=Breeze Light by the KDE VDG
Comment[ca]=Brisa clara, creat per la comunitat VDG del KDE
Comment[ca]=Brisa clara, creat pel VDG del KDE
Comment[ca@valencia]=Brisa clara per al VDG de KDE
Comment[cs]=Breeze Light od KDE VDG
Comment[da]=Breeze Light af KDE's visuelle designgruppe
......
......@@ -33,7 +33,7 @@ Name[x-test]=xxBreeze Lightxx
Name[zh_CN]=亮色微风
Name[zh_TW]=Breeze Light
Comment=Breeze Light by the KDE VDG
Comment[ca]=Brisa clara, creat per la comunitat VDG del KDE
Comment[ca]=Brisa clara, creat pel VDG del KDE
Comment[ca@valencia]=Brisa clara per al VDG de KDE
Comment[cs]=Breeze Light od KDE VDG
Comment[da]=Breeze Light af KDE's visuelle designgruppe
......
[Desktop Entry]
Comment=Breeze Dark by the KDE VDG
Comment[ca]=Brisa fosca, creat per la comunitat VDG del KDE
Comment[ca]=Brisa fosca, creat pel VDG del KDE
Comment[ca@valencia]=Brisa fosca per a VDG de KDE
Comment[cs]=Breeze Dark od KDE VDG
Comment[da]=Breeze Dark af KDE's visuelle designgruppe
......
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