Commit e9060de9 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 d7b75dc5
......@@ -4,6 +4,7 @@
{
"Email": "mart@kde.org",
"Name": "Marco Martin",
"Name[ca@valencia]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
......@@ -28,6 +29,7 @@
{
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[ca@valencia]": "Aaron Seigo",
"Name[ca]": "Aaron Seigo",
"Name[cs]": "Aaron Seigo",
"Name[da]": "Aaron Seigo",
......@@ -53,6 +55,7 @@
],
"Id": "KSysguard/SensorFace",
"Name": "Face for the KSysguard Sensor Face",
"Name[ca@valencia]": "Cara per al sensor de cares del KSysguard",
"Name[ca]": "Cara per al sensor de cares del KSysguard",
"Name[en_GB]": "Face for the KSysguard Sensor Face",
"Name[es]": "Carátula para el sensor de KSysguard",
......
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