Commit 5b09cb7d 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 d1d91226
......@@ -67,6 +67,7 @@
"Name[es]": "Carátula para el sensor de KSysguard",
"Name[et]": "KSysguardi sensorite välimus",
"Name[eu]": "KSysguard sentsoreen «aurpegirako» «aurpegia»",
"Name[fi]": "Ulkoasu KSysguardin anturille",
"Name[fr]": "Visage pour le senseur de visage de KSysguard",
"Name[it]": "Aspetto dei sensori di KSysguard",
"Name[ko]": "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