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-03-15 02:29:39 +00:00
parent 21018b52b8
commit 73159a1862
10 changed files with 104 additions and 150 deletions

View file

@ -2,13 +2,27 @@
"Categories": "Qt;KDE;X-KDE-settings-system;",
"KPlugin": {
"Description": "Management of cellular networks",
"Description[ca@valencia]": "Gestió de xarxes de telefonia mòbil",
"Description[ca]": "Gestió de xarxes de telefonia mòbil",
"Description[en_GB]": "Management of cellular networks",
"Description[es]": "Gestión de redes móviles",
"Description[nl]": "Beheer van cellulaire netwerken",
"Description[tr]": "Hücresel ağların yönetimi",
"Description[x-test]": "xxManagement of cellular networksxx",
"FormFactors": [
"handset",
"tablet",
"mediacenter"
],
"Icon": "smartphone",
"Name": "Cellular Network"
"Name": "Cellular Network",
"Name[ca@valencia]": "Xarxa de telefonia mòbil",
"Name[ca]": "Xarxa de telefonia mòbil",
"Name[en_GB]": "Cellular Network",
"Name[es]": "Red móvil",
"Name[nl]": "Cellulair netwerk",
"Name[tr]": "Hücresel Ağ",
"Name[x-test]": "xxCellular Networkxx"
},
"X-KDE-Keywords": "mobile,data,network",
"X-KDE-Keywords[az]": "mobile,data,network,verilənlər,şəbəkə,mobil",

View file

@ -3,75 +3,11 @@
"Authors": [
{
"Email": "fella@posteo.de",
"Name": "Tobias Fella",
"Name[ar]": "Tobias Fella",
"Name[az]": "Tobias Fella",
"Name[bg]": "Tobias Fella",
"Name[ca@valencia]": "Tobias Fella",
"Name[ca]": "Tobias Fella",
"Name[cs]": "Tobias Fella",
"Name[de]": "Tobias Fella",
"Name[en_GB]": "Tobias Fella",
"Name[es]": "Tobias Fella",
"Name[eu]": "Tobias Fella",
"Name[fi]": "Tobias Fella",
"Name[fr]": "Tobias Fella",
"Name[hu]": "Tobias Fella",
"Name[ia]": "Tobias Fella",
"Name[is]": "Tobias Fella",
"Name[it]": "Tobias Fella",
"Name[ka]": "Tobias Fella",
"Name[ko]": "Tobias Fella",
"Name[lt]": "Tobias Fella",
"Name[nl]": "Tobias Fella",
"Name[nn]": "Tobias Fella",
"Name[pl]": "Tobias Fella",
"Name[pt]": "Tobias Fella",
"Name[pt_BR]": "Tobias Fella",
"Name[ro]": "Tobias Fella",
"Name[ru]": "Tobias Fella",
"Name[sk]": "Tobias Fella",
"Name[sl]": "Tobias Fella",
"Name[sv]": "Tobias Fella",
"Name[ta]": "டோபியாஸ் ஃபெல்லா",
"Name[tr]": "Tobias Fella",
"Name[uk]": "Tobias Fella",
"Name[x-test]": "xxTobias Fellaxx",
"Name[zh_CN]": "Tobias Fella",
"Name[zh_TW]": "Tobias Fella"
"Name": "Tobias Fella"
}
],
"Category": "System Information",
"Description": "Wi-Fi Hotspot",
"Description[az]": "Wi-Fi qoşulma nöqtəsi",
"Description[bg]": "Wi-Fi точка за достъп",
"Description[ca@valencia]": "Punt d'accés Wi-Fi",
"Description[ca]": "Punt d'accés Wi-Fi",
"Description[cs]": "Hotspot WiFi",
"Description[de]": "Wi-Fi-Hotspot",
"Description[en_GB]": "WiFi Hotspot",
"Description[es]": "Puntos de acceso wifi",
"Description[eu]": "Wi-Fi berogunea",
"Description[fi]": "Langattomat tukiasemat",
"Description[fr]": "Point d'accès Wifi",
"Description[ia]": "Hotspots de Wi-Fi",
"Description[it]": "Hotspot Wi-Fi",
"Description[ka]": "Wi-Fi ჰოტსპოტი",
"Description[ko]": "Wi-Fi 핫스팟",
"Description[lt]": "Belaidis (Wi-Fi) prieigos taškas",
"Description[nl]": "Wi-Fi-hotspot",
"Description[nn]": "Trådlaussone",
"Description[pl]": "Hotspot Wi-Fi",
"Description[pt]": "Ponto de Acesso Wi-Fi",
"Description[ru]": "Точки доступа Wi-Fi",
"Description[sk]": "Prístupový bod Wi-Fi",
"Description[sl]": "Vroča točka Wi-Fi",
"Description[ta]": "அருகலை ஹாட்ஸ்பாட்டு",
"Description[tr]": "Wi-Fi Kişisel Erişim Noktası",
"Description[uk]": "Хот-спот Wi-Fi",
"Description[x-test]": "xxWi-Fi Hotspotxx",
"Description[zh_CN]": "Wi-Fi 热点",
"Description[zh_TW]": "Wi-Fi 熱點",
"EnabledByDefault": true,
"FormFactors": [
"handset",
@ -82,46 +18,22 @@
"Id": "kcm_mobile_hotspot",
"License": "GPL",
"Name": "Hotspot",
"Name[ar]": "نقطة فعالة",
"Name[az]": "Qoşulma nöqtəsi",
"Name[bg]": "Точка за достъп",
"Name[ca@valencia]": "Punt d'accés",
"Name[ca]": "Punt d'accés",
"Name[cs]": "Hotspot",
"Name[da]": "Internetdeling",
"Name[de]": "Hotspot",
"Name[en_GB]": "Hotspot",
"Name[es]": "Punto de acceso",
"Name[et]": "Pääsupunkt",
"Name[eu]": "Berogunea",
"Name[fi]": "Tukiasema",
"Name[fr]": "Point d'accès",
"Name[hsb]": "Hotspot",
"Name[hu]": "Hotspot",
"Name[ia]": "Hotspot",
"Name[id]": "Hotspot",
"Name[is]": "Aðgangsstaður",
"Name[fr]": "Points d'accès",
"Name[it]": "Hotspot",
"Name[ka]": "ჰოტსპოტი",
"Name[ko]": "핫스팟",
"Name[lt]": "Prieigos taškas",
"Name[nl]": "Hotspot",
"Name[nn]": "Trådlaussone",
"Name[pa]": "ਹਾਟਸਪਾਟ",
"Name[pl]": "Hotspot",
"Name[pt]": "Ponto de Acesso",
"Name[pt_BR]": "Ponto de acesso",
"Name[ro]": "Hotspot",
"Name[ru]": "Точка доступа Wi-Fi",
"Name[sk]": "Prístupový bod",
"Name[sl]": "Vroča točka",
"Name[sv]": "Accesspunkt",
"Name[ta]": "ஹாட்ஸ்பாட்",
"Name[tr]": "Kişisel Erişim Noktası",
"Name[uk]": "Хот-спот",
"Name[tr]": "Erişim Noktası",
"Name[uk]": "Точка доступу",
"Name[x-test]": "xxHotspotxx",
"Name[zh_CN]": "热点",
"Name[zh_TW]": "熱點",
"ServiceTypes": [
"KCModule"
],

View file

@ -2,13 +2,27 @@
"Categories": "Qt;KDE;X-KDE-settings-system;",
"KPlugin": {
"Description": "Software Versions",
"Description[ca@valencia]": "Versions de programari",
"Description[ca]": "Versions de programari",
"Description[en_GB]": "Software Versions",
"Description[es]": "Versiones de software",
"Description[nl]": "Softwareversies",
"Description[tr]": "Yazılım Sürümleri",
"Description[x-test]": "xxSoftware Versionsxx",
"FormFactors": [
"handset",
"tablet",
"mediacenter"
],
"Icon": "dialog-information",
"Name": "Information"
"Name": "Information",
"Name[ca@valencia]": "Informació",
"Name[ca]": "Informació",
"Name[en_GB]": "Information",
"Name[es]": "Información",
"Name[nl]": "Informatie",
"Name[tr]": "Bilgi",
"Name[x-test]": "xxInformationxx"
},
"X-KDE-Keywords": "info, distro, system",
"X-KDE-Keywords[ast]": "info, información, systema",

View file

@ -2,13 +2,27 @@
"Categories": "Qt;KDE;X-KDE-settings-system;",
"KPlugin": {
"Description": "Configure power management settings",
"Description[ca@valencia]": "Configureu els paràmetres de gestió de l'energia",
"Description[ca]": "Configuració dels paràmetres de gestió d'energia",
"Description[en_GB]": "Configure power management settings",
"Description[es]": "Configurar las preferencias de la gestión de energía",
"Description[nl]": "Energie-instellingen configureren",
"Description[tr]": "Güç yönetimi ayarlarını yapılandır",
"Description[x-test]": "xxConfigure power management settingsxx",
"FormFactors": [
"handset",
"tablet",
"mediacenter"
],
"Icon": "preferences-system-power-management",
"Name": "Energy"
"Name": "Energy",
"Name[ca@valencia]": "Energia",
"Name[ca]": "Energia",
"Name[en_GB]": "Energy",
"Name[es]": "Energía",
"Name[nl]": "Energie",
"Name[tr]": "Enerji",
"Name[x-test]": "xxEnergyxx"
},
"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

@ -4,9 +4,30 @@
[Domain]
Name=Date and Time Control Module
Name[ca]=Mòdul de control de la data i hora
Name[ca@valencia]=Mòdul de control de la data i hora
Name[en_GB]=Date and Time Control Module
Name[es]=Módulo de control de fecha y hora
Name[nl]=Controlemodule van datum en tijd
Name[tr]=Tarih ve Saat Denetim Modülü
Name[x-test]=xxDate and Time Control Modulexx
Icon=preferences-system-time
[org.kde.active.clockconfig.save]
Name=Save the date/time settings
Name[ca]=Desa la configuració de la data i hora
Name[ca@valencia]=Guarda la configuració de la data i hora
Name[en_GB]=Save the date/time settings
Name[es]=Guardar las preferencias de fecha y hora
Name[nl]=Datum- en tijdinstellingen opslaan
Name[tr]=Tarih ve saat ayarlarını kaydet
Name[x-test]=xxSave the date/time settingsxx
Description=System policies prevent you from saving the date/time settings.
Description[ca]=Les polítiques del sistema impedeixen que deseu la configuració de la data i hora.
Description[ca@valencia]=Les polítiques del sistema impedixen que guardeu la configuració de la data i hora.
Description[en_GB]=System policies prevent you from saving the date/time settings.
Description[es]=Las políticas del sistema le impiden guardar las preferencias de fecha y hora.
Description[nl]=Systeembeleid voorkwam dat u de datum- en tijdinstellingen kon opslaan.
Description[tr]=Sistem politikaları, tarih ve saat ayarlarını kaydetmenizi engelliyor.
Description[x-test]=xxSystem policies prevent you from saving the date/time settings.xx
Policy=yes

View file

@ -2,13 +2,27 @@
"Categories": "Qt;KDE;X-KDE-settings-system;",
"KPlugin": {
"Description": "Timezone, Date Display",
"Description[ca@valencia]": "Zona horària, Mostra la data",
"Description[ca]": "Zona horària, Mostra la data",
"Description[en_GB]": "Timezone, Date Display",
"Description[es]": "Zona horaria, visor de la fecha",
"Description[nl]": "Tijdzone, datumweergave",
"Description[tr]": "Zaman Dilimi; Tarih Gösterimi",
"Description[x-test]": "xxTimezone, Date Displayxx",
"FormFactors": [
"handset",
"tablet",
"mediacenter"
],
"Icon": "preferences-system-time",
"Name": "Time and Date"
"Name": "Time and Date",
"Name[ca@valencia]": "Hora i data",
"Name[ca]": "Hora i data",
"Name[en_GB]": "Time and Date",
"Name[es]": "Fecha y hora",
"Name[nl]": "Tijd en datum",
"Name[tr]": "Tarih ve Saat",
"Name[x-test]": "xxTime and Datexx"
},
"X-KDE-Keywords": "theme, look, feel",
"X-KDE-Keywords[ast]": "estilu, aspeutu",

View file

@ -34,6 +34,13 @@
}
],
"Description": "On-Screen Keyboard configuration",
"Description[ca@valencia]": "Configureu el teclat en pantalla",
"Description[ca]": "Configuració del teclat en pantalla",
"Description[en_GB]": "On-Screen Keyboard configuration",
"Description[es]": "Configuración del teclado en pantalla",
"Description[nl]": "Configuratie van toetsenbord op het scherm",
"Description[tr]": "Ekran Klavyesi yapılandırması",
"Description[x-test]": "xxOn-Screen Keyboard configurationxx",
"FormFactors": [
"handset",
"tablet"
@ -41,6 +48,13 @@
"Icon": "input-keyboard",
"License": "GPL",
"Name": "On-Screen Keyboard",
"Name[ca@valencia]": "Teclat en pantalla",
"Name[ca]": "Teclat en pantalla",
"Name[en_GB]": "On-Screen Keyboard",
"Name[es]": "Teclado en pantalla",
"Name[nl]": "Toetsenbord op scherm",
"Name[tr]": "Ekran Klavyesi",
"Name[x-test]": "xxOn-Screen Keyboardxx",
"Version": "1.0",
"Website": "https://plasma-mobile.org"
},

View file

@ -2,41 +2,6 @@
"Categories": "Qt;KDE;X-KDE-settings-system;",
"KPlugin": {
"Description": "Wireless network setting",
"Description[ar]": "إعدادات الشبكة اللاسلكية",
"Description[az]": "Naqilsiz şəbəkə ayarları",
"Description[bg]": "Настройки на безжична мрежа",
"Description[ca@valencia]": "Configureu la xarxa sense fil",
"Description[ca]": "Configuració de la xarxa sense fil",
"Description[cs]": "Nastavení bezdrátové sítě",
"Description[de]": "Einstellungen für drahtloses Netzwerk",
"Description[en_GB]": "Wireless network setting",
"Description[es]": "Preferencias de la red inalámbrica",
"Description[eu]": "Haririk gabeko sare ezarpena",
"Description[fi]": "Langattoman verkon asetukset",
"Description[fr]": "Paramètre de réseau sans fil",
"Description[hu]": "Vezeték nélküli hálózati beállítások",
"Description[ia]": "Preferentia de rete sin cablos",
"Description[is]": "Stillingar þráðlauss nets",
"Description[it]": "Impostazioni rete senza fili",
"Description[ka]": "უსადენო ქსელის მორგება",
"Description[ko]": "무선 네트워크 설정",
"Description[lt]": "Belaidžio tinklo nuostata",
"Description[nl]": "Instelling van draadloos netwerk",
"Description[nn]": "Innstilling for trådlaust nettverk",
"Description[pl]": "Ustawienia sieci bezprzewodowej",
"Description[pt]": "Configuração da rede sem-fios",
"Description[pt_BR]": "Configurações da rede sem fio",
"Description[ro]": "Configurare rețea fără fir",
"Description[ru]": "Параметры беспроводного соединения",
"Description[sk]": "Nastavenia bezdrôtovej siete",
"Description[sl]": "Nastavitve brezžičnega omrežja",
"Description[sv]": "Trådlös nätverksinställning",
"Description[ta]": "கம்பியில்லா பிணையத்திற்கான அமைப்பு",
"Description[tr]": "Kablosuz ağ ayarı",
"Description[uk]": "Налаштовування бездротової мережі",
"Description[x-test]": "xxWireless network settingxx",
"Description[zh_CN]": "无线网络设置",
"Description[zh_TW]": "無線網路設定",
"FormFactors": [
"handset",
"tablet",
@ -44,34 +9,24 @@
],
"Icon": "network-wireless-symbolic",
"Name": "Wi-Fi",
"Name[ar]": "واي فاي",
"Name[az]": "Wi-Fi",
"Name[bg]": "Wi-Fi",
"Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi",
"Name[cs]": "Wi-Fi",
"Name[da]": "Wi-fi",
"Name[de]": "Wi-Fi",
"Name[de]": "WLAN",
"Name[en_GB]": "Wi-Fi",
"Name[es]": "Wifi",
"Name[et]": "Wi-Fi",
"Name[eu]": "Wi-Fi",
"Name[fi]": "Langaton verkko",
"Name[fr]": "Wi-Fi",
"Name[gl]": "Sen fíos",
"Name[hsb]": "Wi-Fi",
"Name[hu]": "Wi-Fi",
"Name[ia]": "Wi-Fi",
"Name[id]": "Wi-Fi",
"Name[is]": "Þráðlaust Wi-Fi",
"Name[it]": "Wi-fi",
"Name[it]": "Wi-Fi",
"Name[ka]": "Wi-Fi",
"Name[ko]": "Wi-Fi",
"Name[lt]": "Belaidis (Wi-Fi)",
"Name[ml]": "വൈ-ഫൈ",
"Name[nl]": "Wi-Fi",
"Name[nn]": "Wi-Fi",
"Name[pa]": "Wi-Fi",
"Name[pa]": "ਵਾਈ-ਫਾਈ",
"Name[pl]": "Wi-Fi",
"Name[pt]": "Wi-Fi",
"Name[pt_BR]": "Wi-Fi",
@ -79,14 +34,11 @@
"Name[ru]": "Wi-Fi",
"Name[sk]": "Wi-Fi",
"Name[sl]": "Wi-Fi",
"Name[sv]": "WIFI",
"Name[ta]": "அருகலை",
"Name[tg]": "Wi-Fi",
"Name[sv]": "Wifi",
"Name[tr]": "Wi-Fi",
"Name[uk]": "Wi-Fi",
"Name[x-test]": "xxWi-Fixx",
"Name[zh_CN]": "Wi-Fi",
"Name[zh_TW]": "Wi-Fi",
"ServiceTypes": [
"KCModule"
]

View file

@ -9,4 +9,3 @@
},
"X-KWin-Border-Activate": true
}

View file

@ -84,7 +84,7 @@
"Name[ru]": "Включение и отключение виртуальной клавиатуры",
"Name[sl]": "Preklop navidezne tipkovnice",
"Name[sv]": "Visa eller dölj virtuellt tangentbord",
"Name[tr]": "Sanal Klavye Geçişi",
"Name[tr]": "Sanal Klavye Aç/Kapat",
"Name[uk]": "Перемикання віртуальної клавіатури",
"Name[x-test]": "xxVirtual Keyboard Togglexx",
"Name[zh_CN]": "虚拟键盘开关",