Commit 226cbd27 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 40b9e34c
......@@ -100,6 +100,7 @@ Name[ru]=Соты
Name[sv]=Bikaka
Name[uk]=Соти
Name[x-test]=xxHoneycombxx
Name[zh_CN]=蜂窝
Name[zh_TW]=Honeycomb
[WM]
......
......@@ -100,6 +100,7 @@ Name[ru]=Норвегия
Name[sv]=Norge
Name[uk]=Норвегія
Name[x-test]=xxNorwayxx
Name[zh_CN]=挪威
Name[zh_TW]=Norway
[WM]
......
......@@ -99,6 +99,7 @@ Name[ru]=Обсидиан
Name[sv]=Obsidiankust
Name[uk]=Обсидіановий берег
Name[x-test]=xxObsidian Coastxx
Name[zh_CN]=黑曜石海岸
Name[zh_TW]=Obsidian Coast
[WM]
......
......@@ -117,6 +117,7 @@ Name[ru]=Oxygen
Name[sv]=Syre
Name[uk]=Oxygen
Name[x-test]=xxOxygenxx
Name[zh_CN]=氧气
Name[zh_TW]=Oxygen
shadeSortColumn=true
......
......@@ -113,6 +113,7 @@ Name[ru]=Oxygen (холодная)
Name[sv]=Kallt syre
Name[uk]=Холодна Oxygen
Name[x-test]=xxOxygen Coldxx
Name[zh_CN]=氧气冷色
Name[zh_TW]=Oxygen Cold
[WM]
......
......@@ -99,6 +99,7 @@ Name[ru]=Сталь
Name[sv]=Stål
Name[uk]=Сталь
Name[x-test]=xxSteelxx
Name[zh_CN]=钢铁
Name[zh_TW]=Steel
[WM]
......
......@@ -98,6 +98,7 @@ Name[ru]=Суп с вонтонами
Name[sv]=Wontonsoppa
Name[uk]=Суп із вонтонами
Name[x-test]=xxWonton Soupxx
Name[zh_CN]=旺顿汤
Name[zh_TW]=Wonton Soup
[WM]
......
......@@ -100,6 +100,7 @@ Name[ru]=Сион
Name[sv]=Zion
Name[uk]=Сіон
Name[x-test]=xxZionxx
Name[zh_CN]=锡安
Name[zh_TW]=Zion
[WM]
......
......@@ -100,6 +100,7 @@ Name[ru]=Сион (инвертированная)
Name[sv]=Zion (omvänd)
Name[uk]=Сіон (обернена)
Name[x-test]=xxZion (Reversed)xx
Name[zh_CN]=锡安 (反色)
Name[zh_TW]=Zion (顏色反轉版)
[WM]
......
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