Commit 912f6c57 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 d7443701
......@@ -4,6 +4,7 @@
"Name": "Bing",
"Name[ca]": "Bing",
"Name[cs]": "Bing",
"Name[de]": "Bing",
"Name[en_GB]": "Bing",
"Name[es]": "Bing",
"Name[et]": "Bing",
......
......@@ -3,6 +3,7 @@
"Icon": "",
"Name": "Earth Science (USRA)",
"Name[ca]": "Ciències de la Terra (USRA)",
"Name[de]": "Earth Science (USRA)",
"Name[en_GB]": "Earth Science (USRA)",
"Name[es]": "Ciencias de la Tierra (USRA)",
"Name[et]": "Earth Science (USRA)",
......
......@@ -4,6 +4,7 @@
"Name": "Flickr",
"Name[ca]": "Flickr",
"Name[cs]": "Flickr",
"Name[de]": "Flickr",
"Name[en_GB]": "Flickr",
"Name[es]": "Flickr",
"Name[et]": "Flickr",
......
......@@ -3,6 +3,7 @@
"Icon": "",
"Name": "Wikimedia Commons",
"Name[ca]": "Wikimedia Commons",
"Name[de]": "Wikimedia Commons",
"Name[en_GB]": "Wikimedia Commons",
"Name[es]": "Wikimedia Commons",
"Name[et]": "Wikimedia Commons",
......
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