Commit 9ac9e0a1 authored by Script Kiddy's avatar Script Kiddy

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 2d0a13c9
......@@ -90,6 +90,8 @@ ForegroundVisited=100,74,155
Name=Honeycomb
Name[ca]=Honeycomb
Name[ca@valencia]=Honeycomb
Name[de]=Honigwabe
Name[gl]=Tarro de mel
Name[it]=Alveare
Name[nl]=Honingraat
Name[pt]=Favo de Mel
......
......@@ -91,6 +91,7 @@ Name=Norway
Name[ca]=Norway
Name[ca@valencia]=Norway
Name[de]=Norwegen
Name[gl]=Noruega
Name[it]=Norvegia
Name[nl]=Noorwegen
Name[pt]=Noruega
......
......@@ -89,6 +89,8 @@ ForegroundVisited=142,121,165
Name=Obsidian Coast
Name[ca]=Obsidian Coast
Name[ca@valencia]=Obsidian Coast
Name[de]=Obsidian-Küste
Name[gl]=Costa obsidiana
Name[it]=Costa dell'ossidiana
Name[nl]=Obsidian Coast
Name[pt]=Costa Obsidiana
......
......@@ -108,6 +108,7 @@ Name=Oxygen
Name[ca]=Oxygen
Name[ca@valencia]=Oxygen
Name[de]=Oxygen
Name[gl]=Osíxeno
Name[it]=Oxygen
Name[nl]=Oxygen
Name[pt]=Oxygen
......
......@@ -103,6 +103,8 @@ ForegroundVisited=150,111,232
Name=Oxygen Cold
Name[ca]=Oxygen Cold
Name[ca@valencia]=Oxygen Cold
Name[de]=Oxygen-Kalt
Name[gl]=Osíxeno frío
Name[it]=Oxygen freddo
Name[nl]=Oxygen Cold
Name[pt]=Oxygen Frio
......
......@@ -89,6 +89,8 @@ ForegroundVisited=100,74,155
Name=Steel
Name[ca]=Steel
Name[ca@valencia]=Steel
Name[de]=Stahl
Name[gl]=Ferro
Name[it]=Acciaio
Name[nl]=Steel
Name[pt]=Aço
......
......@@ -88,6 +88,8 @@ ForegroundVisited=64,128,255
Name=Wonton Soup
Name[ca]=Wonton Soup
Name[ca@valencia]=Wonton Soup
Name[de]=Wonton-Suppe
Name[gl]=Sopa de Wonton
Name[it]=Zuppa di Wonton
Name[nl]=Wonton Soup
Name[pt]=Sopa Wonton
......
......@@ -91,6 +91,7 @@ Name=Zion
Name[ca]=Zion
Name[ca@valencia]=Zion
Name[de]=Zion
Name[gl]=Sion
Name[it]=Sion
Name[nl]=Zion
Name[pt]=Zion
......
......@@ -91,6 +91,7 @@ Name=Zion (Reversed)
Name[ca]=Zion (invertit)
Name[ca@valencia]=Zion (invertit)
Name[de]=Zion (Invertiert)
Name[gl]=Sion (invertido)
Name[it]=Sion (invertito)
Name[nl]=Zion (omgekeerd)
Name[pt]=Zion (Invertido)
......
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