Commit e65233c4 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 8438ebf2
......@@ -22,6 +22,7 @@
"Name[nn]": "Astronomi (NASA)",
"Name[pt]": "Astronomy (NASA)",
"Name[pt_BR]": "Astronomia (NASA)",
"Name[ro]": "Astronomie (NASA)",
"Name[ru]": "Астрономия (NASA)",
"Name[sk]": "Astronómia (NASA)",
"Name[sl]": "Astronomy (NASA)",
......
......@@ -23,6 +23,7 @@
"Name[nn]": "Bing",
"Name[pt]": "Bing",
"Name[pt_BR]": "Bing",
"Name[ro]": "Bing",
"Name[ru]": "Bing",
"Name[sk]": "Bing",
"Name[sl]": "Bing",
......
......@@ -22,6 +22,7 @@
"Name[nn]": "Geovitskap (USRA)",
"Name[pt]": "Earth Science (USRA)",
"Name[pt_BR]": "Earth Science (USRA)",
"Name[ro]": "Științele Pământului (USRA)",
"Name[ru]": "Изучение земли (USRA)",
"Name[sk]": "Veda o zemi (USRA)",
"Name[sl]": "Earth Science (USRA)",
......
......@@ -23,6 +23,7 @@
"Name[nn]": "Flickr",
"Name[pt]": "Flickr",
"Name[pt_BR]": "Flickr",
"Name[ro]": "Flickr",
"Name[ru]": "Flickr",
"Name[sk]": "Flickr",
"Name[sl]": "Flickr",
......
......@@ -25,6 +25,7 @@
"Name[pl]": "National Geographic",
"Name[pt]": "National Geographic",
"Name[pt_BR]": "National Geographic",
"Name[ro]": "National Geographic",
"Name[ru]": "National Geographic",
"Name[sk]": "National Geographic",
"Name[sl]": "National Geographic",
......
......@@ -22,6 +22,7 @@
"Name[nn]": "Vêrsatellitt (NOAA)",
"Name[pt]": "Weather Satellite (NOAA)",
"Name[pt_BR]": "Satélite meteorológico (NOAA)",
"Name[ro]": "Satelit meteorologic (NOAA)",
"Name[ru]": "Метеоспутник (NOAA)",
"Name[sk]": "Meteorologický satelit (NOAA)",
"Name[sl]": "Vremenski satelit (NOAA)",
......
......@@ -23,6 +23,7 @@
"Name[pl]": "Tapety Unsplash",
"Name[pt]": "Papéis de Parede Unsplash",
"Name[pt_BR]": "Papéis de parede do Unsplash",
"Name[ro]": "Tapete Unsplash",
"Name[ru]": "Обои с сайта Unsplash",
"Name[sk]": "Tapety Unsplash",
"Name[sl]": "Unsplash Wallpapers",
......
......@@ -22,6 +22,7 @@
"Name[nn]": "Wikimedia Commons",
"Name[pt]": "Wikimedia Commons",
"Name[pt_BR]": "Wikimedia Commons",
"Name[ro]": "Wikimedia Commons",
"Name[ru]": "Wikimedia Commons",
"Name[sk]": "Wikimedia Commons",
"Name[sl]": "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