Commit 458d196d authored by Script Kiddy's avatar Script Kiddy
Browse files

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 9f8b4163
......@@ -189,7 +189,7 @@ Name[uz@cyrillic]=Oxygen
Name[vi]=Oxygen
Name[wa]=Ocsidjinne
Name[x-test]=xxOxygenxx
Name[zh_CN]=Oxygen
Name[zh_CN]=Oxygen 轻氧
Name[zh_TW]=Oxygen
shadeSortColumn=true
......
......@@ -133,7 +133,7 @@ Name[sv]=Oxygen kall
Name[tg]=Оксигени тиллоӣ
Name[uk]=Холодна Oxygen
Name[x-test]=xxOxygen Coldxx
Name[zh_CN]=Oxygen 冷色
Name[zh_CN]=Oxygen 轻氧冷色
Name[zh_TW]=Oxygen 冷色調
[WM]
......
......@@ -40,7 +40,7 @@ Name[tg]=Оксигени сиёҳ
Name[tr]=Oxygen Siyahı
Name[uk]=Чорна Oxygen
Name[x-test]=xxOxygen Blackxx
Name[zh_CN]=Oxygen
Name[zh_CN]=Oxygen 轻氧黑曜
Name[zh_TW]=Oxygen 黑
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[az]=Oxygen kursor görünüşü toplusu.
......@@ -81,5 +81,5 @@ Comment[tg]=Мавзӯи муши Оксиген. Мизи кории худро
Comment[tr]=Oxygen fare teması. Masaüstünüzü Oxygenleştirin!
Comment[uk]=Тема вказівників миші Oxygen. Додайте кисню вашій стільниці!
Comment[x-test]=xxOxygen mouse theme. Oxygenize your desktop!xx
Comment[zh_CN]=Oxygen 鼠标主题。Oxygen 化您的桌面!
Comment[zh_CN]=Oxygen 轻氧鼠标主题,让您的桌面呼吸轻氧。
Comment[zh_TW]=Oxygen 滑鼠主題。
......@@ -40,7 +40,7 @@ Name[tg]=Оксигени осмонӣ
Name[tr]=Oxygen Mavisi
Name[uk]=Синя Oxygen
Name[x-test]=xxOxygen Bluexx
Name[zh_CN]=Oxygen 蓝
Name[zh_CN]=Oxygen 轻氧冰
Name[zh_TW]=Oxygen 藍
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[az]=Oxygen kursor görünüşü toplusu.
......@@ -81,5 +81,5 @@ Comment[tg]=Мавзӯи муши Оксиген. Мизи кории худро
Comment[tr]=Oxygen fare teması. Masaüstünüzü Oxygenleştirin!
Comment[uk]=Тема вказівників миші Oxygen. Додайте кисню вашій стільниці!
Comment[x-test]=xxOxygen mouse theme. Oxygenize your desktop!xx
Comment[zh_CN]=Oxygen 鼠标主题。Oxygen 化您的桌面!
Comment[zh_CN]=Oxygen 轻氧鼠标主题,让您的桌面呼吸轻氧。
Comment[zh_TW]=Oxygen 滑鼠主題。
......@@ -40,7 +40,7 @@ Name[tg]=Оксигени сафед
Name[tr]=Oxygen Beyazı
Name[uk]=Біла Oxygen
Name[x-test]=xxOxygen Whitexx
Name[zh_CN]=氧气-
Name[zh_CN]=Oxygen 轻氧雪
Name[zh_TW]=Oxygen 白
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[az]=Oxygen kursor görünüşü toplusu.
......@@ -81,5 +81,5 @@ Comment[tg]=Мавзӯи муши Оксиген. Мизи кории худро
Comment[tr]=Oxygen fare teması. Masaüstünüzü Oxygenleştirin!
Comment[uk]=Тема вказівників миші Oxygen. Додайте кисню вашій стільниці!
Comment[x-test]=xxOxygen mouse theme. Oxygenize your desktop!xx
Comment[zh_CN]=Oxygen 鼠标主题。Oxygen 化您的桌面!
Comment[zh_CN]=Oxygen 轻氧鼠标主题,让您的桌面呼吸轻氧。
Comment[zh_TW]=Oxygen 滑鼠主題。
......@@ -40,7 +40,7 @@ Name[tg]=Оксигени зард
Name[tr]=Oxygen Sarısı
Name[uk]=Жовта Oxygen
Name[x-test]=xxOxygen Yellowxx
Name[zh_CN]=Oxygen 黄
Name[zh_CN]=Oxygen 轻氧花
Name[zh_TW]=Oxygen 黃
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[az]=Oxygen kursor görünüşü toplusu.
......@@ -81,5 +81,5 @@ Comment[tg]=Мавзӯи муши Оксиген. Мизи кории худро
Comment[tr]=Oxygen fare teması. Masaüstünüzü Oxygenleştirin!
Comment[uk]=Тема вказівників миші Oxygen. Додайте кисню вашій стільниці!
Comment[x-test]=xxOxygen mouse theme. Oxygenize your desktop!xx
Comment[zh_CN]=Oxygen 鼠标主题。Oxygen 化您的桌面!
Comment[zh_CN]=Oxygen 轻氧鼠标主题,让您的桌面呼吸轻氧。
Comment[zh_TW]=Oxygen 滑鼠主題。
......@@ -39,7 +39,7 @@ Name[tg]=Оксигени Сион
Name[tr]=Oxygen Zion
Name[uk]=Oxygen Zion
Name[x-test]=xxOxygen Zionxx
Name[zh_CN]=Oxygen Zion
Name[zh_CN]=Oxygen 轻氧紫苑
Name[zh_TW]=Oxygen Zion
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[az]=Oxygen kursor görünüşü toplusu.
......@@ -80,5 +80,5 @@ Comment[tg]=Мавзӯи муши Оксиген. Мизи кории худро
Comment[tr]=Oxygen fare teması. Masaüstünüzü Oxygenleştirin!
Comment[uk]=Тема вказівників миші Oxygen. Додайте кисню вашій стільниці!
Comment[x-test]=xxOxygen mouse theme. Oxygenize your desktop!xx
Comment[zh_CN]=Oxygen 鼠标主题。Oxygen 化您的桌面!
Comment[zh_CN]=Oxygen 轻氧鼠标主题,让您的桌面呼吸轻氧。
Comment[zh_TW]=Oxygen 滑鼠主題。
......@@ -49,7 +49,7 @@ Name[tg]=Ороиши равзанаи Оксиген
Name[tr]=Oxygen Pencere Dekorasyonu
Name[uk]=Декорації вікон Oxygen
Name[x-test]=xxOxygen Window Decorationxx
Name[zh_CN]=Oxygen 窗口装饰
Name[zh_CN]=Oxygen 轻氧窗口装饰
Name[zh_TW]=Oxygen 視窗裝飾
Comment=Modify the appearance of window decorations
Comment[az]=Pəncərə dekorasiyalarının görünüşün dəyişmək
......@@ -130,5 +130,5 @@ X-KDE-Keywords[sv]=oxygen,dekoration
X-KDE-Keywords[tr]=oxygen,dekorasyon
X-KDE-Keywords[uk]=oxygen,decoration,декорація,обрамлення
X-KDE-Keywords[x-test]=xxoxygenxx,xxdecorationxx
X-KDE-Keywords[zh_CN]=oxygen,decoration,装饰
X-KDE-Keywords[zh_CN]=oxygen,decoration,轻氧,装饰
X-KDE-Keywords[zh_TW]=oxygen,decoration
......@@ -42,7 +42,7 @@
"Description[tr]": "Plasma Masaüstü için Oxygen görsel biçemini kullanan pencere dekorasyonu",
"Description[uk]": "Обрамлення вікон з використанням візуального стилю Oxygen для стільничного середовища Плазми",
"Description[x-test]": "xxWindow decoration using the Oxygen visual style for the Plasma Desktopxx",
"Description[zh_CN]": "窗口装饰使用等离子桌面 Oxygen 视觉主题",
"Description[zh_CN]": "为 Plasma 桌面环境设计的 Oxygen 轻氧窗口装饰风格",
"Description[zh_TW]": "使用 Plasma 桌面 Oxygen 視覺樣式的視窗裝飾",
"Id": "org.kde.oxygen",
"Name": "Oxygen",
......@@ -87,7 +87,7 @@
"Name[tr]": "Oxygen",
"Name[uk]": "Oxygen",
"Name[x-test]": "xxOxygenxx",
"Name[zh_CN]": "Oxygen",
"Name[zh_CN]": "Oxygen 轻氧",
"Name[zh_TW]": "Oxygen",
"ServiceTypes": [
"org.kde.kdecoration2"
......
......@@ -48,7 +48,7 @@ Name[sv]=Oxygen stil för grafiska komponenter
Name[tr]=Oxygen Programcık Biçimi
Name[uk]=Стиль віджетів Oxygen
Name[x-test]=xxOxygen Widget Stylexx
Name[zh_CN]=Oxygen 部件样式
Name[zh_CN]=Oxygen 轻氧部件风格
Name[zh_TW]=Oxygen 元件樣式
Comment=Modify the appearance of widgets
Comment[ar]=عدّل مظهر الودجات
......@@ -132,5 +132,5 @@ X-KDE-Keywords[sv]=oxygen,grafisk komponent,stil
X-KDE-Keywords[tr]=oxygen,parçacık,biçem
X-KDE-Keywords[uk]=oxygen,widget,style,оксиген,кисень,віджет,стиль
X-KDE-Keywords[x-test]=xxoxygenxx,xxwidgetxx,xxstylexx
X-KDE-Keywords[zh_CN]=oxygen,widget,style,部件,样式
X-KDE-Keywords[zh_CN]=oxygen,widget,style,轻氧,部件,样式
X-KDE-Keywords[zh_TW]=oxygen,widget,style
......@@ -84,7 +84,7 @@ Name[uz@cyrillic]=Oxygen
Name[vi]=Oxygen
Name[wa]=Ocsidjinne
Name[x-test]=xxOxygenxx
Name[zh_CN]=Oxygen
Name[zh_CN]=Oxygen 轻氧
Name[zh_TW]=Oxygen
ConfigPage=kstyle_oxygen_config
Comment=Styling of the next generation desktop
......@@ -166,7 +166,7 @@ Comment[uk]=Стиль стільниці наступного поколінн
Comment[vi]=Kiểu dáng của bàn làm việc thế hệ tiếp theo
Comment[wa]=Stîle del novele djermêye di scribannes
Comment[x-test]=xxStyling of the next generation desktopxx
Comment[zh_CN]=一代桌面的风格
Comment[zh_CN]=一代桌面的风格
Comment[zh_TW]=下一代桌面的樣式
[KDE]
WidgetStyle=Oxygen
......@@ -42,7 +42,7 @@ Comment[sv]=Oxygen skrivbordskonstruktionsspråk
Comment[tr]=Oxygen Masaüstü Tasarım Dili
Comment[uk]=Мова компонування стільниці Oxygen
Comment[x-test]=xxOxygen Desktop Design Languagexx
Comment[zh_CN]=Oxygen 桌面设计语言
Comment[zh_CN]=Oxygen 轻氧桌面设计语言
Comment[zh_TW]=Oxygen 桌面設計語言
Encoding=UTF-8
Keywords=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;
......@@ -171,7 +171,7 @@ Name[uz@cyrillic]=Oxygen
Name[vi]=Oxygen
Name[wa]=Ocsidjinne
Name[x-test]=xxOxygenxx
Name[zh_CN]=Oxygen
Name[zh_CN]=Oxygen 轻氧
Name[zh_TW]=Oxygen
Type=Service
......
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