Commit f2efae6d 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 5af911ee
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"Name[nn]": "Marco Martin", "Name[nn]": "Marco Martin",
"Name[pt]": "Marco Martin", "Name[pt]": "Marco Martin",
"Name[pt_BR]": "Marco Martin", "Name[pt_BR]": "Marco Martin",
"Name[ro]": "Marco Martin",
"Name[sk]": "Marco Martin", "Name[sk]": "Marco Martin",
"Name[sl]": "Marco Martin", "Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin", "Name[sv]": "Marco Martin",
...@@ -42,6 +43,7 @@ ...@@ -42,6 +43,7 @@
"Name[nn]": "Aaron Seigo", "Name[nn]": "Aaron Seigo",
"Name[pt]": "Aaron Seigo", "Name[pt]": "Aaron Seigo",
"Name[pt_BR]": "Aaron Seigo", "Name[pt_BR]": "Aaron Seigo",
"Name[ro]": "Aaron Seigo",
"Name[sk]": "Aaron Seigo", "Name[sk]": "Aaron Seigo",
"Name[sl]": "Aaron Seigo", "Name[sl]": "Aaron Seigo",
"Name[sv]": "Aaron Seigo", "Name[sv]": "Aaron Seigo",
...@@ -63,6 +65,7 @@ ...@@ -63,6 +65,7 @@
"Name[nn]": "Ansikt til KSysguard-sensoransikt", "Name[nn]": "Ansikt til KSysguard-sensoransikt",
"Name[pt]": "Cara do Sensor do KSysguard", "Name[pt]": "Cara do Sensor do KSysguard",
"Name[pt_BR]": "Face para o face do sensor KSysguard", "Name[pt_BR]": "Face para o face do sensor KSysguard",
"Name[ro]": "Față pentru „Fețe de senzori KSysguard”",
"Name[sk]": "Tvár pre senzor KSysguard", "Name[sk]": "Tvár pre senzor KSysguard",
"Name[sl]": "Obraz za obraz senzorja KSysguard", "Name[sl]": "Obraz za obraz senzorja KSysguard",
"Name[sv]": "Front för systemövervakaren", "Name[sv]": "Front för systemövervakaren",
......
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