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"
This commit is contained in:
l10n daemon script 2023-12-22 02:13:13 +00:00
parent d82d6667ea
commit 4d29b0f0ac
39 changed files with 57 additions and 7 deletions

View file

@ -72,6 +72,7 @@
"Description[uk]": "Верхня панель для мобільної Плазми",
"Description[x-test]": "xxTop panel for Plasma Mobilexx",
"Description[zh_CN]": "Plasma Mobile 的顶部面板",
"Description[zh_TW]": "Plasma 行動的頂部面板",
"Id": "org.kde.plasma.mobile.panel",
"License": "GPLv2+",
"Name": "Phone Panel",

View file

@ -72,6 +72,7 @@
"Description[uk]": "Панель навігації для мобільної Плазми",
"Description[x-test]": "xxNavigation panel for Plasma Mobilexx",
"Description[zh_CN]": "Plasma 移动版导航面板",
"Description[zh_TW]": "Plasma 行動的導覽面板",
"Id": "org.kde.plasma.mobile.taskpanel",
"License": "GPLv2+",
"Name": "Phone Task panel",
@ -111,7 +112,7 @@
"Name[uk]": "Панель завдань телефону",
"Name[x-test]": "xxPhone Task panelxx",
"Name[zh_CN]": "手机任务面板",
"Name[zh_TW]": "手機工作列"
"Name[zh_TW]": "手機工作列面板"
},
"X-Plasma-API-Minimum-Version": "6.0",
"X-Plasma-ContainmentType": "Panel"

View file

@ -96,6 +96,7 @@
"Name[uk]": "Стільниковий",
"Name[x-test]": "xxCellularxx",
"Name[zh_CN]": "蜂窝数据",
"Name[zh_TW]": "行動電話",
"ServiceTypes": [
"KPackage/GenericQML"
],

View file

@ -96,6 +96,7 @@
"Name[uk]": "Завершено",
"Name[x-test]": "xxFinishedxx",
"Name[zh_CN]": "完成",
"Name[zh_TW]": "已完成",
"ServiceTypes": [
"KPackage/GenericQML"
],

View file

@ -94,6 +94,7 @@
"Name[uk]": "Приготування",
"Name[x-test]": "xxPreparexx",
"Name[zh_CN]": "准备",
"Name[zh_TW]": "準備",
"ServiceTypes": [
"KPackage/GenericQML"
],

View file

@ -95,6 +95,7 @@
"Name[uk]": "Час",
"Name[x-test]": "xxTimexx",
"Name[zh_CN]": "时间",
"Name[zh_TW]": "時間",
"ServiceTypes": [
"KPackage/GenericQML"
],

View file

@ -96,6 +96,7 @@
"Name[uk]": "WiFi",
"Name[x-test]": "xxWiFixx",
"Name[zh_CN]": "WiFi",
"Name[zh_TW]": "WiFi",
"ServiceTypes": [
"KPackage/GenericQML"
],

View file

@ -29,6 +29,7 @@
"Description[uk]": "Керування стільниковими мережами",
"Description[x-test]": "xxManagement of cellular networksxx",
"Description[zh_CN]": "管理移动网络",
"Description[zh_TW]": "行動網路的管理",
"FormFactors": [
"handset",
"tablet",
@ -63,7 +64,8 @@
"Name[tr]": "Hücresel Ağ",
"Name[uk]": "Стільникова мережа",
"Name[x-test]": "xxCellular Networkxx",
"Name[zh_CN]": "移动网络"
"Name[zh_CN]": "移动网络",
"Name[zh_TW]": "行動網路"
},
"X-KDE-Keywords": "mobile,data,network",
"X-KDE-Keywords[az]": "mobile,data,network,verilənlər,şəbəkə,mobil",

View file

@ -61,6 +61,7 @@
"Description[uk]": "Хот-спот Wi-Fi",
"Description[x-test]": "xxWi-Fi Hotspotxx",
"Description[zh_CN]": "Wi-Fi 热点",
"Description[zh_TW]": "Wi-Fi 熱點",
"EnabledByDefault": true,
"FormFactors": [
"handset",
@ -99,6 +100,7 @@
"Name[uk]": "Точка доступу",
"Name[x-test]": "xxHotspotxx",
"Name[zh_CN]": "无线热点",
"Name[zh_TW]": "熱點",
"Website": "https://plasma-mobile.org/"
},
"X-KDE-System-Settings-Parent-Category": "network"

View file

@ -29,6 +29,7 @@
"Description[uk]": "Версії програмного забезпечення",
"Description[x-test]": "xxSoftware Versionsxx",
"Description[zh_CN]": "软件版本",
"Description[zh_TW]": "軟體版本",
"FormFactors": [
"handset",
"tablet",
@ -64,7 +65,8 @@
"Name[tr]": "Bilgi",
"Name[uk]": "Інформація",
"Name[x-test]": "xxInformationxx",
"Name[zh_CN]": "信息"
"Name[zh_CN]": "信息",
"Name[zh_TW]": "通知"
},
"X-KDE-Keywords": "info, distro, system",
"X-KDE-Keywords[ast]": "info, información, systema",

View file

@ -29,6 +29,7 @@
"Description[uk]": "Налаштовування керування живленням",
"Description[x-test]": "xxConfigure power management settingsxx",
"Description[zh_CN]": "配置电源管理设置。",
"Description[zh_TW]": "設定電源管理",
"FormFactors": [
"handset",
"tablet",
@ -63,7 +64,8 @@
"Name[tr]": "Enerji",
"Name[uk]": "Живлення",
"Name[x-test]": "xxEnergyxx",
"Name[zh_CN]": "电量"
"Name[zh_CN]": "电量",
"Name[zh_TW]": "電源"
},
"X-KDE-Keywords": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver",
"X-KDE-Keywords[ast]": "videu,monitor,gráficos,dormir,dormición,bloquiar,bloquéu,curiapantalles,bloquiador de pantalla",

View file

@ -34,6 +34,7 @@ Name[tr]=Tarih ve Zaman Denetim Modülü
Name[uk]=Модуль керування датою і часом
Name[x-test]=xxDate and Time Control Modulexx
Name[zh_CN]=日期和时间控制模块
Name[zh_TW]=日期與時間控制模組
Icon=preferences-system-time
[org.kde.active.clockconfig.save]
@ -68,6 +69,7 @@ Name[tr]=Tarih ve saat ayarlarını kaydet
Name[uk]=Зберегти параметри дати/часу
Name[x-test]=xxSave the date/time settingsxx
Name[zh_CN]=保存日期/时间设置
Name[zh_TW]=儲存日期/時間設定
Description=System policies prevent you from saving the date/time settings.
Description[ar]=سياسات النّظام تمنعك من حفظ إعدادات التّاريخ/الوقت.
Description[ca]=Les polítiques del sistema impedeixen que deseu la configuració de la data i hora.
@ -99,4 +101,5 @@ Description[tr]=Sistem politikaları, tarih ve saat ayarlarını kaydetmenizi en
Description[uk]=Відповідно до загальносистемних правил, ви не можете зберігати параметри дати/часу.
Description[x-test]=xxSystem policies prevent you from saving the date/time settings.xx
Description[zh_CN]=系统安全策略不允许您保存日期/时间设置。
Description[zh_TW]=系統政策不允許您儲存日期/時間設定。
Policy=yes

View file

@ -29,6 +29,7 @@
"Description[uk]": "Часовий пояс, показ дати",
"Description[x-test]": "xxTimezone, Date Displayxx",
"Description[zh_CN]": "时区、日期显示",
"Description[zh_TW]": "時區、日期顯示",
"FormFactors": [
"handset",
"tablet",
@ -64,7 +65,8 @@
"Name[tr]": "Tarih ve Saat",
"Name[uk]": "Час і дата",
"Name[x-test]": "xxTime and Datexx",
"Name[zh_CN]": "时间和日期"
"Name[zh_CN]": "时间和日期",
"Name[zh_TW]": "時間與日期"
},
"X-KDE-Keywords": "theme, look, feel",
"X-KDE-Keywords[ast]": "estilu, aspeutu",

View file

@ -67,6 +67,7 @@
"Description[uk]": "Налаштування екранної клавіатури",
"Description[x-test]": "xxOn-Screen Keyboard configurationxx",
"Description[zh_CN]": "屏幕键盘配置",
"Description[zh_TW]": "螢幕上的虛擬鍵盤設定",
"FormFactors": [
"handset",
"tablet"
@ -101,6 +102,7 @@
"Name[uk]": "Екранна клавіатура",
"Name[x-test]": "xxOn-Screen Keyboardxx",
"Name[zh_CN]": "屏幕键盘",
"Name[zh_TW]": "螢幕上的虛擬鍵盤",
"Website": "https://plasma-mobile.org"
},
"X-KDE-Keywords": "onscreen,osk,virtualkeyboard,keyboard",

View file

@ -30,6 +30,7 @@
"Description[uk]": "Налаштовування бездротової мережі",
"Description[x-test]": "xxWireless network settingxx",
"Description[zh_CN]": "无线网络设置",
"Description[zh_TW]": "無線網路設定",
"FormFactors": [
"handset",
"tablet",
@ -71,7 +72,8 @@
"Name[tr]": "Wi-Fi",
"Name[uk]": "Wi-Fi",
"Name[x-test]": "xxWi-Fixx",
"Name[zh_CN]": "Wi-Fi"
"Name[zh_CN]": "Wi-Fi",
"Name[zh_TW]": "Wi-Fi"
},
"X-KDE-Keywords": "wifi,network",
"X-KDE-Keywords[ar]": "واي فاي,شبكة",

View file

@ -54,7 +54,8 @@
"Name[tr]": "Taşınabilir Görev Değiştiricisi",
"Name[uk]": "Мобільний перемикач завдань",
"Name[x-test]": "xxMobile Task Switcherxx",
"Name[zh_CN]": "移动任务切换"
"Name[zh_CN]": "移动任务切换",
"Name[zh_TW]": "行動工作切換器"
},
"X-KWin-Border-Activate": true
}

View file

@ -87,6 +87,7 @@
"Name[uk]": "Збіжні вікна",
"Name[x-test]": "xxConvergent Windowsxx",
"Name[zh_CN]": "聚合窗口",
"Name[zh_TW]": "響應式視窗",
"Website": "https://invent.kde.org/plasma/plasma-mobile"
},
"X-Plasma-API": "declarativescript"

View file

@ -63,6 +63,7 @@
"Description[uk]": "Плазма для мобільних пристроїв",
"Description[x-test]": "xxPlasma for mobile devicesxx",
"Description[zh_CN]": "针对手机设备设计的 Plasma 环境",
"Description[zh_TW]": "適用於行動裝置的 Plasma",
"Id": "org.kde.breeze.mobile",
"License": "GPLv2+",
"Name": "Plasma Mobile Breeze",

View file

@ -111,6 +111,7 @@
"Name[uk]": "Режим польоту",
"Name[x-test]": "xxAirplane Modexx",
"Name[zh_CN]": "飞行模式",
"Name[zh_TW]": "飛航模式",
"Website": "https://kde.org"
}
}

View file

@ -108,6 +108,7 @@
"Name[uk]": "Звук",
"Name[x-test]": "xxAudioxx",
"Name[zh_CN]": "声音",
"Name[zh_TW]": "音效",
"Website": "https://kde.org"
}
}

View file

@ -108,6 +108,7 @@
"Name[uk]": "Акумулятор",
"Name[x-test]": "xxBatteryxx",
"Name[zh_CN]": "电池",
"Name[zh_TW]": "電池",
"Website": "https://kde.org"
}
}

View file

@ -109,6 +109,7 @@
"Name[uk]": "Bluetooth",
"Name[x-test]": "xxBluetoothxx",
"Name[zh_CN]": "蓝牙",
"Name[zh_TW]": "藍牙",
"Website": "https://kde.org"
}
}

View file

@ -106,6 +106,7 @@
"Name[uk]": "Кофеїн",
"Name[x-test]": "xxCaffeinexx",
"Name[zh_CN]": "保持亮屏",
"Name[zh_TW]": "咖啡因",
"Website": "https://kde.org"
}
}

View file

@ -96,6 +96,7 @@
"Name[uk]": "Швартований режим",
"Name[x-test]": "xxDocked Modexx",
"Name[zh_CN]": "停靠模式",
"Name[zh_TW]": "基座模式",
"Website": "https://kde.org"
}
}

View file

@ -104,6 +104,7 @@
"Name[uk]": "Не турбувати",
"Name[x-test]": "xxDo Not Disturbxx",
"Name[zh_CN]": "勿扰模式",
"Name[zh_TW]": "請勿打擾",
"Website": "https://kde.org"
}
}

View file

@ -108,6 +108,7 @@
"Name[uk]": "Спалах",
"Name[x-test]": "xxFlashlightxx",
"Name[zh_CN]": "手电筒",
"Name[zh_TW]": "手電筒",
"Website": "https://kde.org"
}
}

View file

@ -92,6 +92,7 @@
"Name[uk]": "Точка доступу",
"Name[x-test]": "xxHotspotxx",
"Name[zh_CN]": "无线热点",
"Name[zh_TW]": "熱點",
"Website": "https://kde.org"
}
}

View file

@ -104,6 +104,7 @@
"Name[uk]": "Перемикання віртуальної клавіатури",
"Name[x-test]": "xxVirtual Keyboard Togglexx",
"Name[zh_CN]": "虚拟键盘开关",
"Name[zh_TW]": "虛擬鍵盤切換",
"Website": "https://kde.org"
}
}

View file

@ -107,6 +107,7 @@
"Name[uk]": "Мобільні дані",
"Name[x-test]": "xxMobile Dataxx",
"Name[zh_CN]": "移动数据",
"Name[zh_TW]": "行動資料",
"Website": "https://kde.org"
}
}

View file

@ -110,6 +110,7 @@
"Name[uk]": "Нічні кольори",
"Name[x-test]": "xxNight Colorxx",
"Name[zh_CN]": "夜间颜色",
"Name[zh_TW]": "夜色",
"Website": "https://kde.org"
}
}

View file

@ -105,6 +105,7 @@
"Name[uk]": "Меню живлення",
"Name[x-test]": "xxPower Menuxx",
"Name[zh_CN]": "电源菜单",
"Name[zh_TW]": "電源選單",
"Website": "https://kde.org"
}
}

View file

@ -103,6 +103,7 @@
"Name[uk]": "Запис з екрана",
"Name[x-test]": "xxRecord Screenxx",
"Name[zh_CN]": "屏幕录像",
"Name[zh_TW]": "錄製螢幕",
"Website": "https://kde.org"
}
}

View file

@ -82,6 +82,7 @@ Name[tr]=Yakalanan
Name[uk]=Захоплено
Name[x-test]=xxCapturedxx
Name[zh_CN]=已捕获
Name[zh_TW]=已擷取
Comment=Captured
Comment[az]=Şəkli çəkildi
Comment[ca]=Capturat
@ -119,4 +120,5 @@ Comment[tr]=Yakalanan
Comment[uk]=Захоплено
Comment[x-test]=xxCapturedxx
Comment[zh_CN]=已捕获
Comment[zh_TW]=已擷取
Action=Popup

View file

@ -107,6 +107,7 @@
"Name[uk]": "Реалізовано обертання зображення на екрані",
"Name[x-test]": "xxScreen rotationxx",
"Name[zh_CN]": "屏幕旋转",
"Name[zh_TW]": "螢幕旋轉",
"Website": "https://kde.org"
}
}

View file

@ -108,6 +108,7 @@
"Name[uk]": "Знімок вікна",
"Name[x-test]": "xxScreenshotxx",
"Name[zh_CN]": "屏幕截图",
"Name[zh_TW]": "螢幕截圖",
"Website": "https://kde.org"
}
}

View file

@ -82,6 +82,7 @@ Name[tr]=Yakalanan
Name[uk]=Захоплено
Name[x-test]=xxCapturedxx
Name[zh_CN]=已捕获
Name[zh_TW]=已擷取
Comment=Captured
Comment[az]=Şəkli çəkildi
Comment[ca]=Capturat
@ -119,4 +120,5 @@ Comment[tr]=Yakalanan
Comment[uk]=Захоплено
Comment[x-test]=xxCapturedxx
Comment[zh_CN]=已捕获
Comment[zh_TW]=已擷取
Action=Popup

View file

@ -110,6 +110,7 @@
"Name[uk]": "Параметри",
"Name[x-test]": "xxSettingsxx",
"Name[zh_CN]": "设置",
"Name[zh_TW]": "設定",
"Website": "https://kde.org"
}
}

View file

@ -109,6 +109,7 @@
"Name[uk]": "Wi-Fi",
"Name[x-test]": "xxWi-Fixx",
"Name[zh_CN]": "Wi-Fi",
"Name[zh_TW]": "Wi-Fi",
"Website": "https://kde.org"
}
}

View file

@ -105,6 +105,7 @@
"Name[uk]": "Мобільна Плазма",
"Name[x-test]": "xxPlasma Mobilexx",
"Name[zh_CN]": "Plasma Mobile",
"Name[zh_TW]": "Plasma 行動",
"Website": "https://plasma-mobile.org"
},
"X-Plasma-FallbackPackage": "org.kde.plasma.nano"