Commit 6385b043 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 66e05cb9
......@@ -91,10 +91,12 @@ Name=Honeycomb
Name[ca]=Honeycomb
Name[ca@valencia]=Honeycomb
Name[de]=Honigwabe
Name[es]=Panal
Name[gl]=Tarro de mel
Name[it]=Alveare
Name[nl]=Honingraat
Name[pt]=Favo de Mel
Name[sv]=Bikaka
Name[uk]=Соти
Name[x-test]=xxHoneycombxx
Name[zh_TW]=Honeycomb
......
......@@ -91,10 +91,12 @@ Name=Norway
Name[ca]=Norway
Name[ca@valencia]=Norway
Name[de]=Norwegen
Name[es]=Noruega
Name[gl]=Noruega
Name[it]=Norvegia
Name[nl]=Noorwegen
Name[pt]=Noruega
Name[sv]=Norge
Name[uk]=Норвегія
Name[x-test]=xxNorwayxx
Name[zh_TW]=Norway
......
......@@ -90,10 +90,12 @@ Name=Obsidian Coast
Name[ca]=Obsidian Coast
Name[ca@valencia]=Obsidian Coast
Name[de]=Obsidian-Küste
Name[es]=Costa de obsidiana
Name[gl]=Costa obsidiana
Name[it]=Costa dell'ossidiana
Name[nl]=Obsidian Coast
Name[pt]=Costa Obsidiana
Name[sv]=Obsidiankust
Name[uk]=Обсидіановий берег
Name[x-test]=xxObsidian Coastxx
Name[zh_TW]=Obsidian Coast
......
......@@ -108,10 +108,12 @@ Name=Oxygen
Name[ca]=Oxygen
Name[ca@valencia]=Oxygen
Name[de]=Oxygen
Name[es]=Oxígeno
Name[gl]=Osíxeno
Name[it]=Oxygen
Name[nl]=Oxygen
Name[pt]=Oxygen
Name[sv]=Syre
Name[uk]=Oxygen
Name[x-test]=xxOxygenxx
Name[zh_TW]=Oxygen
......
......@@ -104,10 +104,12 @@ Name=Oxygen Cold
Name[ca]=Oxygen Cold
Name[ca@valencia]=Oxygen Cold
Name[de]=Oxygen-Kalt
Name[es]=Oxígeno frío
Name[gl]=Osíxeno frío
Name[it]=Oxygen freddo
Name[nl]=Oxygen Cold
Name[pt]=Oxygen Frio
Name[sv]=Kallt syre
Name[uk]=Холодна Oxygen
Name[x-test]=xxOxygen Coldxx
Name[zh_TW]=Oxygen Cold
......
......@@ -90,10 +90,12 @@ Name=Steel
Name[ca]=Steel
Name[ca@valencia]=Steel
Name[de]=Stahl
Name[es]=Acero
Name[gl]=Ferro
Name[it]=Acciaio
Name[nl]=Steel
Name[pt]=Aço
Name[sv]=Stål
Name[uk]=Сталь
Name[x-test]=xxSteelxx
Name[zh_TW]=Steel
......
......@@ -89,10 +89,12 @@ Name=Wonton Soup
Name[ca]=Wonton Soup
Name[ca@valencia]=Wonton Soup
Name[de]=Wonton-Suppe
Name[es]=Sopa wantán
Name[gl]=Sopa de Wonton
Name[it]=Zuppa di Wonton
Name[nl]=Wonton Soup
Name[pt]=Sopa Wonton
Name[sv]=Wontonsoppa
Name[uk]=Суп із вонтонами
Name[x-test]=xxWonton Soupxx
Name[zh_TW]=Wonton Soup
......
......@@ -91,10 +91,12 @@ Name=Zion
Name[ca]=Zion
Name[ca@valencia]=Zion
Name[de]=Zion
Name[es]=Sion
Name[gl]=Sion
Name[it]=Sion
Name[nl]=Zion
Name[pt]=Zion
Name[sv]=Zion
Name[uk]=Сіон
Name[x-test]=xxZionxx
Name[zh_TW]=Zion
......
......@@ -91,10 +91,12 @@ Name=Zion (Reversed)
Name[ca]=Zion (invertit)
Name[ca@valencia]=Zion (invertit)
Name[de]=Zion (Invertiert)
Name[es]=Sion (invertido)
Name[gl]=Sion (invertido)
Name[it]=Sion (invertito)
Name[nl]=Zion (omgekeerd)
Name[pt]=Zion (Invertido)
Name[sv]=Zion (omvänd)
Name[uk]=Сіон (обернена)
Name[x-test]=xxZion (Reversed)xx
Name[zh_TW]=Zion (顏色反轉版)
......
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