Commit 54452560 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 561e46fa
......@@ -108,6 +108,7 @@ Name=Oxygen
Name[af]=Oxygen
Name[ar]=أكسجين
Name[as]=Oxygen
Name[az]=Oxygen
Name[be]=Oxygen
Name[be@latin]=Oxygen
Name[bg]=Oxygen
......
......@@ -101,6 +101,7 @@ ForegroundVisited=150,111,232
[General]
Name=Oxygen Cold
Name[az]=Oxygen Soyuq
Name[ca]=Oxygen Cold
Name[cs]=Oxygen Cold
Name[da]=Oxygen Cold
......
[Icon Theme]
Name=KDE Classic
Name[ar]=كدي الكلاسيكيّة
Name[az]=KDE Klassik
Name[ca]=KDE clàssic
Name[ca@valencia]=KDE clàssic
Name[cs]=Klasika KDE
......@@ -44,6 +45,7 @@ Name[zh_CN]=KDE 经典
Name[zh_TW]=KDE 經典
Comment=The default cursor theme in KDE 2 and 3
Comment[ar]=سمة المؤشّر الافتراضيّة في كدي 2 و 3
Comment[az]=KDE 2 və 3-ün standart kursor görünüşü
Comment[ca]=El tema de cursor predeterminat en el KDE 2 i 3
Comment[ca@valencia]=El tema de cursor per defecte en KDE 2 i 3
Comment[cs]=Výchozí motiv kurzorů pro KDE 2 a 3
......
[Icon Theme]
Name=Oxygen Black
Name[ar]=أكسجين أسود
Name[az]=Oxygen Qara
Name[ca]=Oxygen negre
Name[ca@valencia]=Oxygen negre
Name[cs]=Oxygen - Černý
......@@ -42,6 +43,7 @@ Name[x-test]=xxOxygen Blackxx
Name[zh_CN]=Oxygen 黑
Name[zh_TW]=Oxygen 黑
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[az]=Oxygen kursor görünüşü toplusu.
Comment[ca]=Tema Oxygen per al ratolí. Oxigena el teu escriptori!
Comment[ca@valencia]=Tema Oxygen per al ratolí. Oxygenitzeu el vostre escriptori.
Comment[da]=Oxygen musetema. Oxygenisér din desktop!
......
[Icon Theme]
Name=Oxygen Blue
Name[ar]=أكسجين أزرق
Name[az]=Oxygen Mavi
Name[ca]=Oxygen blau
Name[ca@valencia]=Oxygen blau
Name[cs]=Oxygen - Modrý
......@@ -42,6 +43,7 @@ Name[x-test]=xxOxygen Bluexx
Name[zh_CN]=Oxygen 蓝
Name[zh_TW]=Oxygen 藍
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[az]=Oxygen kursor görünüşü toplusu.
Comment[ca]=Tema Oxygen per al ratolí. Oxigena el teu escriptori!
Comment[ca@valencia]=Tema Oxygen per al ratolí. Oxygenitzeu el vostre escriptori.
Comment[da]=Oxygen musetema. Oxygenisér din desktop!
......
[Icon Theme]
Name=Oxygen White
Name[ar]=أكسجين أبيض
Name[az]=Oxygen Ağ
Name[ca]=Oxygen blanc
Name[ca@valencia]=Oxygen blanc
Name[cs]=Oxygen - Bílý
......@@ -42,6 +43,7 @@ Name[x-test]=xxOxygen Whitexx
Name[zh_CN]=氧气-白
Name[zh_TW]=Oxygen 白
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[az]=Oxygen kursor görünüşü toplusu.
Comment[ca]=Tema Oxygen per al ratolí. Oxigena el teu escriptori!
Comment[ca@valencia]=Tema Oxygen per al ratolí. Oxygenitzeu el vostre escriptori.
Comment[da]=Oxygen musetema. Oxygenisér din desktop!
......
[Icon Theme]
Name=Oxygen Yellow
Name[ar]=أكسجين أصفر
Name[az]=Oxygen Sarı
Name[ca]=Oxygen groc
Name[ca@valencia]=Oxygen groc
Name[cs]=Oxygen - Žlutý
......@@ -42,6 +43,7 @@ Name[x-test]=xxOxygen Yellowxx
Name[zh_CN]=Oxygen 黄
Name[zh_TW]=Oxygen 黃
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[az]=Oxygen kursor görünüşü toplusu.
Comment[ca]=Tema Oxygen per al ratolí. Oxigena el teu escriptori!
Comment[ca@valencia]=Tema Oxygen per al ratolí. Oxygenitzeu el vostre escriptori.
Comment[da]=Oxygen musetema. Oxygenisér din desktop!
......
[Icon Theme]
Name=Oxygen Zion
Name[az]=Oxygen Zion
Name[ca]=Oxygen Zion
Name[ca@valencia]=Oxygen Zion
Name[cs]=Oxygen Zion
......@@ -41,6 +42,7 @@ Name[x-test]=xxOxygen Zionxx
Name[zh_CN]=Oxygen Zion
Name[zh_TW]=Oxygen Zion
Comment=Oxygen mouse theme. Oxygenize your desktop!
Comment[az]=Oxygen kursor görünüşü toplusu.
Comment[ca]=Tema Oxygen per al ratolí. Oxigena el teu escriptori!
Comment[ca@valencia]=Tema Oxygen per al ratolí. Oxygenitzeu el vostre escriptori.
Comment[da]=Oxygen musetema. Oxygenisér din desktop!
......
......@@ -10,6 +10,7 @@ X-KDE-ParentApp=kcontrol
X-KDE-Weight=60
Name=Oxygen Window Decoration
Name[az]=Oxygen pəncərə dekorasiyası
Name[ca]=Decoració de les finestres Oxygen
Name[ca@valencia]=Decoració de les finestres Oxygen
Name[cs]=Dekorace oken Oxygen
......@@ -51,6 +52,7 @@ Name[x-test]=xxOxygen Window Decorationxx
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
Comment[ca]=Modifica l'aparença de les decoracions de les finestres
Comment[ca@valencia]=Modifica l'aparença de les decoracions de les finestres
Comment[cs]=Změnit vzhled dekorace oken
......@@ -90,6 +92,7 @@ Comment[x-test]=xxModify the appearance of window decorationsxx
Comment[zh_CN]=修改窗口装饰外观
Comment[zh_TW]=變更視窗裝飾的外觀
X-KDE-Keywords=oxygen,decoration
X-KDE-Keywords[az]=oxygen,dekorasiya
X-KDE-Keywords[ca]=oxygen,decoració
X-KDE-Keywords[ca@valencia]=oxygen,decoració
X-KDE-Keywords[cs]=oxygen,dekorace
......
......@@ -3,6 +3,7 @@
"Description": "Window decoration using the Oxygen visual style for the Plasma Desktop",
"Description[ar]": "زخرفة نوافذ تستخدم نمط «أكسجين» المرئيّ لسطح مكتب «بلازما»",
"Description[ast]": "Decoración pa ventanes qu'usa l'estilu visual Oxygen del escritoriu Plasma",
"Description[az]": "Pəncərə dekorasiyası, Plasma İş Masası üçün Oxygen vizual üslubundan istifadə edir",
"Description[ca@valencia]": "Decoració de les finestres que usa l'estil visual Oxygen per a l'escriptori de Plasma",
"Description[ca]": "Decoració de les finestres que usa l'estil visual Oxygen per a l'escriptori Plasma",
"Description[cs]": "Dekorace oken pro pracovní plochu Plasma využívající styl Oxygen",
......@@ -47,6 +48,7 @@
"Name": "Oxygen",
"Name[ar]": "أكسجين",
"Name[ast]": "Oxygen",
"Name[az]": "Oxygen",
"Name[ca@valencia]": "Oxygen",
"Name[ca]": "Oxygen",
"Name[cs]": "Oxygen",
......
......@@ -10,6 +10,7 @@ X-KDE-ParentApp=kcontrol
X-KDE-Weight=50
Name=Oxygen Widget Style
Name[az]=Oxygen vidjet üslubu
Name[ca]=Estil Oxygen per als ginys
Name[ca@valencia]=Estil dels ginys («widgets») Oxygen
Name[cs]=Styl widgetů Oxygen
......@@ -51,6 +52,7 @@ Name[zh_CN]=Oxygen 部件样式
Name[zh_TW]=Oxygen 元件樣式
Comment=Modify the appearance of widgets
Comment[ar]=عدّل مظهر الودجات
Comment[az]=Vidjetin görünüşünü dəyişmək
Comment[ca]=Modifica l'aparença dels ginys
Comment[ca@valencia]=Modifica l'aparença dels ginys («widgets»)
Comment[cs]=Změnit vzhled widgetů
......@@ -92,6 +94,7 @@ Comment[zh_TW]=變更元件外觀
X-KDE-Keywords=oxygen,widget,style
X-KDE-Keywords[ar]=أكسجين,ودجة,نمط
X-KDE-Keywords[az]=Oxygen vidjet üslubu
X-KDE-Keywords[ca]=oxygen,giny,estil
X-KDE-Keywords[ca@valencia]=oxygen,giny («widget»),estil
X-KDE-Keywords[cs]=oxygen,widget,styl
......
......@@ -3,6 +3,7 @@ Name=Oxygen
Name[af]=Oxygen
Name[ar]=أكسجين
Name[as]=Oxygen
Name[az]=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[az]=Yeni nəsil İş Masası üslubu
Comment[be]=Стыль працоўных сталоў наступнага пакалення
Comment[be@latin]=Styl nastupnaha pakaleńnia rabočaha stała
Comment[bg]=Стил за следващото поколение работни плотове
......
[Desktop Entry]
Comment=Oxygen Desktop Design Language
Comment[ar]=لغة تصميم سطح مكتب أكسجين
Comment[az]=Oxygen İş Masası görünüşü vasitəsi
Comment[bs]=Oxygen Desktop dizajnerski jezik
Comment[ca]=Llenguatge de disseny per a l'escriptori Oxygen
Comment[ca@valencia]=Llenguatge de disseny per a l'escriptori Oxygen
......@@ -46,6 +47,7 @@ Comment[zh_TW]=Oxygen 桌面設計語言
Encoding=UTF-8
Keywords=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;
Keywords[ar]=سطح المكتب;مساحة العمل;المظهر;المظهر والملمس;الخروج;القفل;التّعليق;الإطفاء;الإسبات;
Keywords[az]=iş masası;iş mühiti;iş mühiti;vizual təqdimat;çıxış;seansdan çıxış;kilidləmə;işi dayandırmaq;işin bitirilməsi;söndürmək;yuxu rejimi;gözləmə rejimi;
Keywords[ca]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació;
Keywords[ca@valencia]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Eixida;Bloqueig;Suspensió;Parada;Hibernació;
Keywords[da]=Skrivebord;Desktop;Arbejdsområde;Udseende;log ud;Lås;Suspendér;Nedlukning;dvale;
......@@ -88,6 +90,7 @@ Name=Oxygen
Name[af]=Oxygen
Name[ar]=أكسجين
Name[as]=Oxygen
Name[az]=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