Commit c2760117 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 bcf0fd71
[Icon Theme]
Name=KDE Classic
Name[ar]=كدي الكلاسيكيّة
Name[ast]=KDE clásicu
Name[ca]=KDE clàssic
Name[cs]=Klasika KDE
Name[da]=KDE Classic
......@@ -35,6 +36,7 @@ Name[zh_CN]=KDE 经典
Name[zh_TW]=KDE 經典
Comment=The default cursor theme in KDE 2 and 3
Comment[ar]=سمة المؤشّر الافتراضيّة في كدي 2 و 3
Comment[ast]=El tema del mur por defeutu en KDE 2 y 3
Comment[ca]=El tema de cursor per defecte en el KDE 2 i 3
Comment[cs]=Výchozí motiv kurzorů pro KDE 2 a 3
Comment[da]=Standard markørtema i KDE 2 og 3
......
[Icon Theme]
Name=Oxygen Black
Name[ar]=أكسجين أسود
Name[ast]=Oxygen prietu
Name[ca]=Oxygen negre
Name[cs]=Oxygen - Černý
Name[da]=Oxygen Black
......@@ -32,6 +33,7 @@ Name[x-test]=xxOxygen Blackxx
Name[zh_CN]=Oxygen 黑
Name[zh_TW]=Oxygen 黑
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[ast]=Tema del mur Oxygen. ¡Oxixeniza'l to escritoriu!
Comment[ca]=Tema de ratolí Oxygen. Oxygenitza el teu escriptori!
Comment[da]=Oxygen musetema. Oxygenisér din desktop!
Comment[de]=Mausdesign für Oxygen.
......
[Icon Theme]
Name=Oxygen Blue
Name[ar]=أكسجين أزرق
Name[ast]=Oxygen azul
Name[ca]=Oxygen blau
Name[cs]=Oxygen - Modrý
Name[da]=Oxygen Blå
......@@ -32,6 +33,7 @@ Name[x-test]=xxOxygen Bluexx
Name[zh_CN]=Oxygen 蓝
Name[zh_TW]=Oxygen 藍
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[ast]=Tema del mur Oxygen. ¡Oxixeniza'l to escritoriu!
Comment[ca]=Tema de ratolí Oxygen. Oxygenitza el teu escriptori!
Comment[da]=Oxygen musetema. Oxygenisér din desktop!
Comment[de]=Mausdesign für Oxygen.
......
[Icon Theme]
Name=Oxygen White
Name[ar]=أكسجين أبيض
Name[ast]=Oxygen blancu
Name[ca]=Oxygen blanc
Name[cs]=Oxygen - Bílý
Name[da]=Oxygen Hvid
......@@ -33,6 +34,7 @@ Name[x-test]=xxOxygen Whitexx
Name[zh_CN]=Oxygen 白
Name[zh_TW]=Oxygen 白
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[ast]=Tema del mur Oxygen. ¡Oxixeniza'l to escritoriu!
Comment[ca]=Tema de ratolí Oxygen. Oxygenitza el teu escriptori!
Comment[da]=Oxygen musetema. Oxygenisér din desktop!
Comment[de]=Mausdesign für Oxygen.
......
[Icon Theme]
Name=Oxygen Yellow
Name[ar]=أكسجين أصفر
Name[ast]=Oxygen mariellu
Name[ca]=Oxygen groc
Name[cs]=Oxygen - Žlutý
Name[da]=Oxygen Gul
......@@ -32,6 +33,7 @@ Name[x-test]=xxOxygen Yellowxx
Name[zh_CN]=Oxygen 黄
Name[zh_TW]=Oxygen 黃
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[ast]=Tema del mur Oxygen. ¡Oxixeniza'l to escritoriu!
Comment[ca]=Tema de ratolí Oxygen. Oxygenitza el teu escriptori!
Comment[da]=Oxygen musetema. Oxygenisér din desktop!
Comment[de]=Mausdesign für Oxygen.
......
[Icon Theme]
Name=Oxygen Zion
Name[ast]=Oxygen zion
Name[ca]=Oxygen Zion
Name[da]=Oxygen Zion
Name[de]=Oxygen-Zion
......@@ -29,6 +30,7 @@ Name[x-test]=xxOxygen Zionxx
Name[zh_CN]=Oxygen Zion
Name[zh_TW]=Oxygen Zion
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[ast]=Tema del mur Oxygen. ¡Oxixeniza'l to escritoriu!
Comment[ca]=Tema de ratolí Oxygen. Oxygenitza el teu escriptori!
Comment[da]=Oxygen musetema. Oxygenisér din desktop!
Comment[de]=Mausdesign für Oxygen.
......
......@@ -10,6 +10,7 @@ X-KDE-ParentApp=kcontrol
X-KDE-Weight=60
Name=Window Decoration
Name[ast]=Decoración de ventanes
Name[ca]=Decoració de les finestres
Name[cs]=Dekorace oken
Name[de]=Fensterdekoration
......
......@@ -3,6 +3,7 @@ Name=Oxygen
Name[af]=Oxygen
Name[ar]=أكسجين
Name[as]=Oxygen
Name[ast]=Oxygen
Name[be]=Oxygen
Name[be@latin]=Oxygen
Name[bg]=Oxygen
......@@ -89,6 +90,7 @@ ConfigPage=kstyle_oxygen_config
Comment=Styling of the next generation desktop
Comment[af]=Stilering van die volgende generasie werkskerm
Comment[ar]=نمط جيل سطح المكتب القادم
Comment[ast]=Estilu de la siguiente xeneración d'escritorios
Comment[be]=Стыль працоўных сталоў наступнага пакалення
Comment[be@latin]=Styl nastupnaha pakaleńnia rabočaha stała
Comment[bg]=Стил за следващото поколение работни плотове
......
......@@ -4,6 +4,7 @@ Name=Oxygen
Name[af]=Oxygen
Name[ar]=أكسجين
Name[as]=Oxygen
Name[ast]=Oxygen
Name[be]=Oxygen
Name[be@latin]=Oxygen
Name[bg]=Oxygen
......@@ -90,6 +91,7 @@ Name[zh_TW]=Oxygen
Comment=Styling of the next generation desktop
Comment[af]=Stilering van die volgende generasie werkskerm
Comment[ar]=نمط جيل سطح المكتب القادم
Comment[ast]=Estilu de la siguiente xeneración d'escritorios
Comment[be]=Стыль працоўных сталоў наступнага пакалення
Comment[be@latin]=Styl nastupnaha pakaleńnia rabočaha stała
Comment[bg]=Стил за следващото поколение работни плотове
......
......@@ -72,6 +72,7 @@ Name=Oxygen
Name[af]=Oxygen
Name[ar]=أكسجين
Name[as]=Oxygen
Name[ast]=Oxygen
Name[be]=Oxygen
Name[be@latin]=Oxygen
Name[bg]=Oxygen
......
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