Commit cf3f13c4 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 1960f105
Pipeline #113437 skipped
......@@ -90,7 +90,7 @@ Comment[tr]=Evrensel gör ve hisset teması seçin
Comment[uk]=Вибір загального вигляду і поведінки
Comment[vi]=Chọn cách nhìn và cảm toàn cục
Comment[x-test]=xxChoose global look and feelxx
Comment[zh_CN]=选择全局外观风格
Comment[zh_CN]=选择全局界面外观风格
X-KDE-Keywords=theme,look,feel,global theme,desktop,appearance,skin, global,presentation,themes,design,UI
X-KDE-Keywords[ar]=المظهر,السمة,الإحساس,السمة العامة,سطح المكتب,المظهر,الجلد,العرض ,السمات,التصميم,واجهة المستخدم
X-KDE-Keywords[az]=theme,look,feel,global theme,desktop,appearance,skin, global,presentation,themes,design,UI,mövzu,xarici görünüş,qlobal mövzu, iş masası,görünüş,örtük,qlobal,təqdimat,mövzu,dizayn,İİ
......@@ -118,5 +118,5 @@ X-KDE-Keywords[ta]=theme,look,feel,global theme,desktop,appearance,skin, global,
X-KDE-Keywords[uk]=theme,look,feel,global theme,desktop,appearance,skin, global,presentation,themes,design,UI,тема,вигляд,загальна тема,стільниця,вигляд,десктоп,шкірка,оболонка,скін,загальний,презентація,представлення,теми,дизайн,інтерфейс
X-KDE-Keywords[vi]=theme,look,feel,global theme,desktop,appearance,skin, global,presentation,themes,design,UI,chủ đề,nhìn,cảm,chủ đề toàn cục,bàn làm việc,diện mạo,da,toàn cục,thể hiện,thiết kế,giao diện người dùng
X-KDE-Keywords[x-test]=xxthemexx,xxlookxx,xxfeelxx,xxglobal themexx,xxdesktopxx,xxappearancexx,xxskinxx,xx globalxx,xxpresentationxx,xxthemesxx,xxdesignxx,xxUIxx
X-KDE-Keywords[zh_CN]=theme,look,feel,global theme,desktop,appearance,skin, global,presentation,themes,design,UI,主题,视觉效果,观,视效,全局主题,桌面,外观,桌面外观,皮肤,全局,呈现,表现,设计,界面,用户界面
X-KDE-Keywords[zh_CN]=theme,look,feel,global theme,desktop,appearance,skin, global,presentation,themes,design,UI,主题,视觉效果,界面外观,视效,全局主题,桌面,外观,桌面外观,皮肤,全局,呈现,表现,设计,界面,用户界面
Categories=Qt;KDE;X-KDE-settings-looknfeel;
......@@ -78,7 +78,7 @@ Comment[tr]=Evrensel gör ve hisset teması seçin
Comment[uk]=Вибір загального вигляду і поведінки
Comment[vi]=Chọn cách nhìn và cảm toàn cục
Comment[x-test]=xxChoose global look and feelxx
Comment[zh_CN]=选择全局外观风格
Comment[zh_CN]=选择全局界面外观风格
Icon=preferences-desktop-theme-style
Keywords=
Type=Service
......
......@@ -29,7 +29,7 @@ Comment[tg]=Насими нимторикӣ аз ҷониби KDE VDG
Comment[uk]=Сутінкова Breeze, автори — KDE VDG
Comment[vi]=Breeze Chạng vạng, do KDE VDG
Comment[x-test]=xxBreeze Twilight by the KDE VDGxx
Comment[zh_CN]=Breeze 微风薄暮,主题由 KDE VDG (视觉设计团队) 设计制作
Comment[zh_CN]=Breeze 微风阴阳主题由 KDE VDG (视觉设计团队) 设计制作
Name=Breeze Twilight
Name[ar]=نسيم الفجر
Name[az]=Breeze Toranlıq
......@@ -59,7 +59,7 @@ Name[tg]=Насими нимторикӣ
Name[uk]=Сутінкова Breeze
Name[vi]=Breeze Chạng vạng
Name[x-test]=xxBreeze Twilightxx
Name[zh_CN]=Breeze 微风薄暮
Name[zh_CN]=Breeze 微风阴阳
Type=Service
X-KDE-ServiceTypes=Plasma/LookAndFeel
......
......@@ -87,7 +87,7 @@ Keywords[tr]=Masaüstü;Çalışma Alanı;Görünüm;Görünüm ve Doku;Çık;Ki
Keywords[uk]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;стільниця;робочий простір;воркспейс;вигляд;вигляд і поведінка;вихід;вийти;заблокувати;замкнути;призупинити;вимкнути;приспати;
Keywords[vi]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;Bàn làm việc;Không gian làm việc;Diện mạo;Nhìn và Cảm;Đăng xuất;Khoá;Tạm ngừng;Tắt;Ngủ đông;
Keywords[x-test]=xxDesktopxx;xxWorkspacexx;xxAppearancexx;xxLook and Feelxx;xxLogoutxx;xxLockxx;xxSuspendxx;xxShutdownxx;xxHibernatexx;
Keywords[zh_CN]=桌面;工作空间;外观;观感;注销;锁定;待机;关机;休眠;
Keywords[zh_CN]=桌面;工作空间;外观;界面外观;观感;注销;锁定;待机;关机;休眠;
Keywords[zh_TW]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;
Name=Breeze
Name[ar]=نسيم
......
......@@ -54,7 +54,7 @@ Name[tr]=Bakın ve Hissedin
Name[uk]=Вигляд і поведінка
Name[vi]=Nhìn và Cảm
Name[x-test]=xxLook and Feelxx
Name[zh_CN]=观
Name[zh_CN]=界面外
Name[zh_TW]=外觀與感覺
Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure
......
Supports Markdown
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