Commit e27d6880 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 f29c0457
......@@ -79,7 +79,7 @@ Name[uk]=Пейджер
Name[vi]=Pager
Name[wa]=Pager
Name[x-test]=xxPagerxx
Name[zh_CN]=分页
Name[zh_CN]=调度
Name[zh_TW]=虛擬桌面管理器
Comment=Switch between virtual desktops
Comment[ar]=بدّل بين أسطح المكتب الوهمية
......
......@@ -88,7 +88,7 @@ Comment[uz@cyrillic]=Қулайликлар
Comment[vi]=Hỗ trợ truy cập
Comment[wa]=Accessibilité
Comment[x-test]=xxAccessibilityxx
Comment[zh_CN]=辅助
Comment[zh_CN]=辅助功能
Comment[zh_TW]=無障礙輔助
[Event/modifierkey-latched]
......
......@@ -104,7 +104,7 @@ Name[vi]=Hỗ trợ truy cập
Name[wa]=Accessibilité
Name[xh]=Unikezelo
Name[x-test]=xxAccessibilityxx
Name[zh_CN]=辅助
Name[zh_CN]=辅助功能
Name[zh_TW]=無障礙輔助
Comment=Accessibility Options
......
......@@ -100,7 +100,7 @@ Name[vi]=Màu sắc
Name[wa]=Coleurs
Name[xh]=Imibala
Name[x-test]=xxColorsxx
Name[zh_CN]=颜色
Name[zh_CN]=色彩
Name[zh_TW]=顏色
Comment=Application Color Scheme
......
......@@ -96,6 +96,7 @@ Name[gl]=Tarro de mel
Name[id]=Honeycomb
Name[it]=Alveare
Name[nl]=Honingraat
Name[nn]=Bikube
Name[pt]=Favo de Mel
Name[ru]=Соты
Name[sk]=Medový plást
......
......@@ -97,6 +97,7 @@ Name[gl]=Noruega
Name[id]=Norway
Name[it]=Norvegia
Name[nl]=Noorwegen
Name[nn]=Noreg
Name[pt]=Noruega
Name[ru]=Норвегия
Name[sk]=Nórsko
......
......@@ -95,6 +95,7 @@ Name[gl]=Costa obsidiana
Name[id]=Obsidian Coast
Name[it]=Costa dell'ossidiana
Name[nl]=Obsidian Coast
Name[nn]=Obsidian-kyst
Name[pt]=Costa Obsidiana
Name[ru]=Обсидиан
Name[sk]=Obsidiánové pobrežie
......
......@@ -114,6 +114,7 @@ Name[gl]=Osíxeno
Name[id]=Oxygen
Name[it]=Oxygen
Name[nl]=Oxygen
Name[nn]=Oxygen
Name[pt]=Oxygen
Name[ru]=Oxygen
Name[sk]=Kyslík
......
......@@ -109,6 +109,7 @@ Name[gl]=Osíxeno frío
Name[id]=Oxygen Cold
Name[it]=Oxygen freddo
Name[nl]=Oxygen Cold
Name[nn]=Oxygen kald
Name[pt]=Oxygen Frio
Name[ru]=Oxygen (холодная)
Name[sk]=Studený kyslík
......
......@@ -95,6 +95,7 @@ Name[gl]=Ferro
Name[id]=Steel
Name[it]=Acciaio
Name[nl]=Steel
Name[nn]=Stål
Name[pt]=Aço
Name[ru]=Сталь
Name[sk]=Oceľ
......
......@@ -94,6 +94,7 @@ Name[gl]=Sopa de Wonton
Name[id]=Wonton Soup
Name[it]=Zuppa di Wonton
Name[nl]=Wonton Soup
Name[nn]=Wonton-suppe
Name[pt]=Sopa Wonton
Name[ru]=Суп с вонтонами
Name[sk]=Wonton Soup
......
......@@ -96,6 +96,7 @@ Name[gl]=Sion
Name[id]=Zion
Name[it]=Sion
Name[nl]=Zion
Name[nn]=Zion
Name[pt]=Zion
Name[ru]=Сион
Name[sk]=Zion
......
......@@ -96,6 +96,7 @@ Name[gl]=Sion (invertido)
Name[id]=Zion (Reversed)
Name[it]=Sion (invertito)
Name[nl]=Zion (omgekeerd)
Name[nn]=Zion (omvend)
Name[pt]=Zion (Invertido)
Name[ru]=Сион (инвертированная)
Name[sk]=Zion (Prevrátené)
......
......@@ -50,7 +50,7 @@ Name[sv]=Platser
Name[tr]=Konumlar
Name[uk]=МІсця
Name[x-test]=xxLocationsxx
Name[zh_CN]=位置
Name[zh_CN]=地点
Name[zh_TW]=位置
Comment=Location for Personal Files
......
......@@ -72,7 +72,7 @@ Name[uk]=Тема стільниці
Name[vi]=Sắc thái màn hình
Name[wa]=Tinme do scribanne
Name[x-test]=xxDesktop Themexx
Name[zh_CN]=桌面主题
Name[zh_CN]=Desktop Theme,桌面主题
Name[zh_TW]=桌面主題
Comment=Desktop Theme
Comment[ar]=سمة سطح المكتب
......@@ -118,7 +118,7 @@ Comment[sv]=Skrivbordstema
Comment[tr]=Masaüstü Teması
Comment[uk]=Тема стільниці
Comment[x-test]=xxDesktop Themexx
Comment[zh_CN]=桌面主题
Comment[zh_CN]=Desktop Theme,桌面主题
Comment[zh_TW]=桌面主題
X-KDE-Keywords=Desktop Theme
X-KDE-Keywords[ar]=سمة سطح المكتب
......
......@@ -61,7 +61,7 @@ Name[uk]=Тема стільниці
Name[vi]=Sắc thái màn hình
Name[wa]=Tinme do scribanne
Name[x-test]=xxDesktop Themexx
Name[zh_CN]=桌面主题
Name[zh_CN]=Desktop Theme,桌面主题
Name[zh_TW]=桌面主題
Comment=Desktop Theme
Comment[ar]=سمة سطح المكتب
......@@ -107,7 +107,7 @@ Comment[sv]=Skrivbordstema
Comment[tr]=Masaüstü Teması
Comment[uk]=Тема стільниці
Comment[x-test]=xxDesktop Themexx
Comment[zh_CN]=桌面主题
Comment[zh_CN]=Desktop Theme,桌面主题
Comment[zh_TW]=桌面主題
Icon=preferences-desktop-theme
Keywords=
......
......@@ -91,7 +91,7 @@ Name[uz@cyrillic]=Ҳис-туйғулар
Name[vi]=Hình biểu cảm
Name[wa]=Xhinêyes
Name[x-test]=xxEmoticonsxx
Name[zh_CN]=表情
Name[zh_CN]=表情符号
Name[zh_TW]=表情圖示
Comment=Emoticon Theme
Comment[ar]=سمة الوجوه التّعبيرية
......@@ -199,5 +199,5 @@ X-KDE-Keywords[uk]=емоційка,емоційки,смайлик,смайли
X-KDE-Keywords[vi]=Hình biểu cảm
X-KDE-Keywords[wa]=Xhinêyes
X-KDE-Keywords[x-test]=xxEmoticonsxx
X-KDE-Keywords[zh_CN]=Emoticons,表情
X-KDE-Keywords[zh_CN]=表情符号
X-KDE-Keywords[zh_TW]=Emoticons
......@@ -80,7 +80,7 @@ Name[uz@cyrillic]=Ҳис-туйғулар
Name[vi]=Hình biểu cảm
Name[wa]=Xhinêyes
Name[x-test]=xxEmoticonsxx
Name[zh_CN]=表情
Name[zh_CN]=表情符号
Name[zh_TW]=表情圖示
ProvidersUrl=https://download.kde.org/ocs/providers.xml
......
......@@ -66,7 +66,7 @@ Name[uk]=Рівень заряду
Name[vi]=Phần trăm sạc
Name[wa]=Åcintaedje di tcherdjaedje
Name[x-test]=xxCharge Percentxx
Name[zh_CN]=充电百分比
Name[zh_CN]=电量百分比
Name[zh_TW]=充電百分比
[Desktop Action chargeState]
......@@ -259,7 +259,7 @@ Name[uk]=Перезарядка
Name[vi]=Nạp lại được
Name[wa]=Ritcherdjåve
Name[x-test]=xxRechargeablexx
Name[zh_CN]=可充电
Name[zh_CN]=可重新充电
Name[zh_TW]=可重新充電
[Desktop Action type]
......@@ -333,7 +333,7 @@ Name[uk]=Тип
Name[vi]=Loại
Name[wa]=Sôre
Name[x-test]=xxTypexx
Name[zh_CN]=类型
Name[zh_CN]=文件系统
Name[zh_TW]=類型
[Desktop Entry]
......
......@@ -135,7 +135,7 @@ Name[ug]=ئاساسىي
Name[uk]=Головний
Name[wa]=Grand
Name[x-test]=xxMajorxx
Name[zh_CN]=主
Name[zh_CN]=主
Name[zh_TW]=主要
[Desktop Action minor]
......@@ -203,7 +203,7 @@ Name[ug]=قوشۇمچە
Name[uk]=Додатковий
Name[wa]=Pitit
Name[x-test]=xxMinorxx
Name[zh_CN]=从号
Name[zh_CN]=
Name[zh_TW]=次要
[Desktop Entry]
......
......@@ -280,7 +280,7 @@ Name[uk]=Місткість
Name[vi]=Dung lượng
Name[wa]=Capacité
Name[x-test]=xxCapacityxx
Name[zh_CN]=容量
Name[zh_CN]=能力
Name[zh_TW]=空間
[Desktop Action discType]
......@@ -496,7 +496,7 @@ Name[uk]=Ігнорується
Name[vi]=Bỏ qua
Name[wa]=Passé houte
Name[x-test]=xxIgnoredxx
Name[zh_CN]=忽略
Name[zh_CN]=忽略
Name[zh_TW]=忽略
[Desktop Action label]
......@@ -639,7 +639,7 @@ Name[uk]=Перезапис
Name[vi]=Ghi lại được
Name[wa]=Riscrijhåve
Name[x-test]=xxRewritablexx
Name[zh_CN]=可
Name[zh_CN]=可
Name[zh_TW]=可覆寫
[Desktop Action size]
......@@ -712,7 +712,7 @@ Name[uk]=Розмір
Name[vi]=Kích thước
Name[wa]=Grandeu
Name[x-test]=xxSizexx
Name[zh_CN]=大小
Name[zh_CN]=尺寸
Name[zh_TW]=大小
[Desktop Action usage]
......@@ -784,7 +784,7 @@ Name[uk]=Використання
Name[vi]=Sử dụng
Name[wa]=Eployaedje
Name[x-test]=xxUsagexx
Name[zh_CN]=已用量
Name[zh_CN]=用途
Name[zh_TW]=使用量
[Desktop Action uuid]
......
......@@ -68,7 +68,7 @@ Name[uk]=Шина
Name[vi]=Bus
Name[wa]=Bus
Name[x-test]=xxBusxx
Name[zh_CN]=总线
Name[zh_CN]=Bus
Name[zh_TW]=匯流排
[Desktop Action driveType]
......@@ -141,7 +141,7 @@ Name[uk]=Тип пристрою
Name[vi]=Kiểu trình điều khiển
Name[wa]=Sôre di lijheu
Name[x-test]=xxDrive Typexx
Name[zh_CN]=驱动类型
Name[zh_CN]=驱动类型
Name[zh_TW]=磁碟型態
[Desktop Action hotpluggable]
......@@ -208,7 +208,7 @@ Name[uk]=«Гаряче» з’єднання
Name[vi]=Tháo lắp nóng
Name[wa]=Hotplugåve
Name[x-test]=xxHotpluggablexx
Name[zh_CN]=热插拔
Name[zh_CN]=热插拔
Name[zh_TW]=可熱插拔
[Desktop Action readSpeed]
......@@ -425,7 +425,7 @@ Name[uk]=Розмір
Name[vi]=Kích thước
Name[wa]=Grandeu
Name[x-test]=xxSizexx
Name[zh_CN]=大小
Name[zh_CN]=尺寸
Name[zh_TW]=大小
[Desktop Action supportedMedia]
......
......@@ -275,7 +275,7 @@ Name[uk]=Номер
Name[vi]=Số
Name[wa]=Nombe
Name[x-test]=xxNumberxx
Name[zh_CN]=数
Name[zh_CN]=数
Name[zh_TW]=數字
[Desktop Entry]
......
......@@ -68,7 +68,7 @@ Name[uk]=Шина
Name[vi]=Bus
Name[wa]=Bus
Name[x-test]=xxBusxx
Name[zh_CN]=总线
Name[zh_CN]=Bus
Name[zh_TW]=匯流排
[Desktop Action driveType]
......@@ -141,7 +141,7 @@ Name[uk]=Тип пристрою
Name[vi]=Kiểu trình điều khiển
Name[wa]=Sôre di lijheu
Name[x-test]=xxDrive Typexx
Name[zh_CN]=驱动类型
Name[zh_CN]=驱动类型
Name[zh_TW]=磁碟型態
[Desktop Action hotpluggable]
......@@ -208,7 +208,7 @@ Name[uk]=«Гаряче» з’єднання
Name[vi]=Tháo lắp nóng
Name[wa]=Hotplugåve
Name[x-test]=xxHotpluggablexx
Name[zh_CN]=热插拔
Name[zh_CN]=热插拔
Name[zh_TW]=可熱插拔
[Desktop Action removable]
......@@ -354,7 +354,7 @@ Name[uk]=Розмір
Name[vi]=Kích thước
Name[wa]=Grandeu
Name[x-test]=xxSizexx
Name[zh_CN]=大小
Name[zh_CN]=尺寸
Name[zh_TW]=大小
[Desktop Entry]
......
......@@ -138,7 +138,7 @@ Name[uk]=Ігнорується
Name[vi]=Bỏ qua
Name[wa]=Passé houte
Name[x-test]=xxIgnoredxx
Name[zh_CN]=忽略
Name[zh_CN]=忽略
Name[zh_TW]=忽略
[Desktop Action label]
......@@ -283,7 +283,7 @@ Name[uk]=Розмір
Name[vi]=Kích thước
Name[wa]=Grandeu
Name[x-test]=xxSizexx
Name[zh_CN]=大小
Name[zh_CN]=尺寸
Name[zh_TW]=大小
[Desktop Action usage]
......@@ -355,7 +355,7 @@ Name[uk]=Використання
Name[vi]=Sử dụng
Name[wa]=Eployaedje
Name[x-test]=xxUsagexx
Name[zh_CN]=已用量
Name[zh_CN]=用途
Name[zh_TW]=使用量
[Desktop Action uuid]
......
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