Commit 2d0a13c9 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 02ef57d3
......@@ -88,6 +88,14 @@ ForegroundVisited=100,74,155
[General]
Name=Honeycomb
Name[ca]=Honeycomb
Name[ca@valencia]=Honeycomb
Name[it]=Alveare
Name[nl]=Honingraat
Name[pt]=Favo de Mel
Name[uk]=Соти
Name[x-test]=xxHoneycombxx
Name[zh_TW]=Honeycomb
[WM]
activeBackground=227,170,0
......
......@@ -88,6 +88,15 @@ ForegroundVisited=100,74,155
[General]
Name=Norway
Name[ca]=Norway
Name[ca@valencia]=Norway
Name[de]=Norwegen
Name[it]=Norvegia
Name[nl]=Noorwegen
Name[pt]=Noruega
Name[uk]=Норвегія
Name[x-test]=xxNorwayxx
Name[zh_TW]=Norway
[WM]
activeBackground=29,135,205
......
......@@ -87,6 +87,14 @@ ForegroundVisited=142,121,165
[General]
Name=Obsidian Coast
Name[ca]=Obsidian Coast
Name[ca@valencia]=Obsidian Coast
Name[it]=Costa dell'ossidiana
Name[nl]=Obsidian Coast
Name[pt]=Costa Obsidiana
Name[uk]=Обсидіановий берег
Name[x-test]=xxObsidian Coastxx
Name[zh_TW]=Obsidian Coast
[WM]
activeBackground=19,47,80
......
......@@ -105,6 +105,15 @@ ForegroundVisited=150,111,232
[General]
ColorScheme=Oxygen
Name=Oxygen
Name[ca]=Oxygen
Name[ca@valencia]=Oxygen
Name[de]=Oxygen
Name[it]=Oxygen
Name[nl]=Oxygen
Name[pt]=Oxygen
Name[uk]=Oxygen
Name[x-test]=xxOxygenxx
Name[zh_TW]=Oxygen
shadeSortColumn=true
[KDE]
......
......@@ -101,6 +101,14 @@ ForegroundVisited=150,111,232
[General]
Name=Oxygen Cold
Name[ca]=Oxygen Cold
Name[ca@valencia]=Oxygen Cold
Name[it]=Oxygen freddo
Name[nl]=Oxygen Cold
Name[pt]=Oxygen Frio
Name[uk]=Холодна Oxygen
Name[x-test]=xxOxygen Coldxx
Name[zh_TW]=Oxygen Cold
[WM]
activeBackground=96,148,207
......
......@@ -87,6 +87,14 @@ ForegroundVisited=100,74,155
[General]
Name=Steel
Name[ca]=Steel
Name[ca@valencia]=Steel
Name[it]=Acciaio
Name[nl]=Steel
Name[pt]=Aço
Name[uk]=Сталь
Name[x-test]=xxSteelxx
Name[zh_TW]=Steel
[WM]
activeBackground=74,139,163
......
......@@ -86,6 +86,14 @@ ForegroundVisited=64,128,255
[General]
Name=Wonton Soup
Name[ca]=Wonton Soup
Name[ca@valencia]=Wonton Soup
Name[it]=Zuppa di Wonton
Name[nl]=Wonton Soup
Name[pt]=Sopa Wonton
Name[uk]=Суп із вонтонами
Name[x-test]=xxWonton Soupxx
Name[zh_TW]=Wonton Soup
[WM]
activeBackground=138,151,166
......
......@@ -88,6 +88,15 @@ ForegroundVisited=88,0,176
[General]
Name=Zion
Name[ca]=Zion
Name[ca@valencia]=Zion
Name[de]=Zion
Name[it]=Sion
Name[nl]=Zion
Name[pt]=Zion
Name[uk]=Сіон
Name[x-test]=xxZionxx
Name[zh_TW]=Zion
[WM]
activeBackground=176,193,255
......
......@@ -88,6 +88,15 @@ ForegroundVisited=192,128,255
[General]
Name=Zion (Reversed)
Name[ca]=Zion (invertit)
Name[ca@valencia]=Zion (invertit)
Name[de]=Zion (Invertiert)
Name[it]=Sion (invertito)
Name[nl]=Zion (omgekeerd)
Name[pt]=Zion (Invertido)
Name[uk]=Сіон (обернена)
Name[x-test]=xxZion (Reversed)xx
Name[zh_TW]=Zion (顏色反轉版)
[WM]
activeBackground=0,49,110
......
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