Commit 2aa494d6 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 d84062fe
......@@ -97,6 +97,7 @@ Name[it]=Alveare
Name[nl]=Honingraat
Name[pt]=Favo de Mel
Name[ru]=Соты
Name[sk]=Medový plást
Name[sv]=Bikaka
Name[uk]=Соти
Name[x-test]=xxHoneycombxx
......
......@@ -98,6 +98,7 @@ Name[it]=Norvegia
Name[nl]=Noorwegen
Name[pt]=Noruega
Name[ru]=Норвегия
Name[sk]=Nórsko
Name[sv]=Norge
Name[uk]=Норвегія
Name[x-test]=xxNorwayxx
......
......@@ -96,6 +96,7 @@ Name[it]=Costa dell'ossidiana
Name[nl]=Obsidian Coast
Name[pt]=Costa Obsidiana
Name[ru]=Обсидиан
Name[sk]=Obsidiánové pobrežie
Name[sv]=Obsidiankust
Name[uk]=Обсидіановий берег
Name[x-test]=xxObsidian Coastxx
......
......@@ -115,6 +115,7 @@ Name[it]=Oxygen
Name[nl]=Oxygen
Name[pt]=Oxygen
Name[ru]=Oxygen
Name[sk]=Kyslík
Name[sv]=Syre
Name[uk]=Oxygen
Name[x-test]=xxOxygenxx
......
......@@ -110,6 +110,7 @@ Name[it]=Oxygen freddo
Name[nl]=Oxygen Cold
Name[pt]=Oxygen Frio
Name[ru]=Oxygen (холодная)
Name[sk]=Studený kyslík
Name[sv]=Kallt syre
Name[uk]=Холодна Oxygen
Name[x-test]=xxOxygen Coldxx
......
......@@ -96,6 +96,7 @@ Name[it]=Acciaio
Name[nl]=Steel
Name[pt]=Aço
Name[ru]=Сталь
Name[sk]=Oceľ
Name[sv]=Stål
Name[uk]=Сталь
Name[x-test]=xxSteelxx
......
......@@ -95,6 +95,7 @@ Name[it]=Zuppa di Wonton
Name[nl]=Wonton Soup
Name[pt]=Sopa Wonton
Name[ru]=Суп с вонтонами
Name[sk]=Wonton Soup
Name[sv]=Wontonsoppa
Name[uk]=Суп із вонтонами
Name[x-test]=xxWonton Soupxx
......
......@@ -97,6 +97,7 @@ Name[it]=Sion
Name[nl]=Zion
Name[pt]=Zion
Name[ru]=Сион
Name[sk]=Zion
Name[sv]=Zion
Name[uk]=Сіон
Name[x-test]=xxZionxx
......
......@@ -97,6 +97,7 @@ Name[it]=Sion (invertito)
Name[nl]=Zion (omgekeerd)
Name[pt]=Zion (Invertido)
Name[ru]=Сион (инвертированная)
Name[sk]=Zion (Prevrátené)
Name[sv]=Zion (omvänd)
Name[uk]=Сіон (обернена)
Name[x-test]=xxZion (Reversed)xx
......
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