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-05-08 02:24:47 +00:00
parent 6d22b48cc4
commit 9f6345c3f3
41 changed files with 64 additions and 0 deletions

View file

@ -7,6 +7,7 @@ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmamobile
Type=Application
DesktopNames=KDE
Name=Plasma Mobile
Name[ar]=بلازما الجوال
Name[az]=Plasma Mobil
Name[ca]=Plasma Mobile
Name[ca@valencia]=Plasma Mobile

View file

@ -5,6 +5,7 @@
{
"Email": "mart@kde.org",
"Name": "Marco Martin",
"Name[ar]": "ماركو مارتن",
"Name[az]": "Marco Martin",
"Name[ca@valencia]": "Marco Martin",
"Name[ca]": "Marco Martin",
@ -67,6 +68,7 @@
"Id": "org.kde.plasma.mobile.homescreen.folio",
"License": "GPLv2+",
"Name": "Folio",
"Name[ar]": "مطوية",
"Name[ca@valencia]": "Folio",
"Name[ca]": "Folio",
"Name[de]": "Folio",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -68,6 +69,7 @@
"Id": "org.kde.plasma.mobile.homescreen.halcyon",
"License": "GPLv2+",
"Name": "Halcyon",
"Name[ar]": "قيون",
"Name[az]": "Halcyon",
"Name[ca@valencia]": "Halcyon",
"Name[ca]": "Halcyon",

View file

@ -5,6 +5,7 @@
{
"Email": "mart@kde.org",
"Name": "Marco Martin",
"Name[ar]": "ماركو مارتن",
"Name[az]": "Marco Martin",
"Name[ca@valencia]": "Marco Martin",
"Name[ca]": "Marco Martin",

View file

@ -5,6 +5,7 @@
{
"Email": "mart@kde.org",
"Name": "Marco Martin",
"Name[ar]": "ماركو مارتن",
"Name[az]": "Marco Martin",
"Name[ca@valencia]": "Marco Martin",
"Name[ca]": "Marco Martin",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -58,6 +59,7 @@
"Id": "org.kde.plasma.mobileinitialstart.cellular",
"License": "GPL-2.0+",
"Name": "Cellular",
"Name[ar]": "هاتف خلوي",
"Name[ca@valencia]": "Mòbil",
"Name[ca]": "Mòbil",
"Name[cs]": "Mobilní",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -58,6 +59,7 @@
"Id": "org.kde.plasma.mobileinitialstart.finished",
"License": "GPL-2.0+",
"Name": "Finished",
"Name[ar]": "انتهى",
"Name[ca@valencia]": "Finalitzat",
"Name[ca]": "Finalitzat",
"Name[cs]": "Dokončeno",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -58,6 +59,7 @@
"Id": "org.kde.plasma.mobileinitialstart.time",
"License": "GPL-2.0+",
"Name": "Time",
"Name[ar]": "الوقت",
"Name[ca@valencia]": "Hora",
"Name[ca]": "Hora",
"Name[cs]": "Čas",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -58,6 +59,7 @@
"Id": "org.kde.plasma.mobileinitialstart.wifi",
"License": "GPL-2.0+",
"Name": "WiFi",
"Name[ar]": "الشبكة اللاسلكيّ",
"Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi",
"Name[de]": "Wi-Fi",

View file

@ -30,6 +30,7 @@
],
"Icon": "smartphone",
"Name": "Cellular Network",
"Name[ar]": "شبكة خليوية",
"Name[ca@valencia]": "Xarxa de telefonia mòbil",
"Name[ca]": "Xarxa de telefonia mòbil",
"Name[cs]": "Mobilní síť",

View file

@ -4,6 +4,7 @@
{
"Email": "fella@posteo.de",
"Name": "Tobias Fella",
"Name[ar]": "توبياس فلة",
"Name[ca@valencia]": "Tobias Fella",
"Name[ca]": "Tobias Fella",
"Name[cs]": "Tobias Fella",
@ -58,6 +59,7 @@
"Id": "kcm_mobile_hotspot",
"License": "GPL",
"Name": "Hotspot",
"Name[ar]": "هوت-سبوت",
"Name[ca@valencia]": "Punt d'accés",
"Name[ca]": "Punt d'accés",
"Name[cs]": "Hotspot",

View file

@ -30,6 +30,7 @@
],
"Icon": "dialog-information",
"Name": "Information",
"Name[ar]": "معلومات",
"Name[ca@valencia]": "Informació",
"Name[ca]": "Informació",
"Name[cs]": "Informace",

View file

@ -4,6 +4,7 @@
{
"Email": "espidev@gmail.com",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -74,6 +75,7 @@
"Icon": "preferences-desktop-plasma",
"License": "GPL",
"Name": "Shell",
"Name[ar]": "الصدَفة",
"Name[az]": "Örtük",
"Name[ca@valencia]": "Intèrpret d'ordres",
"Name[ca]": "Intèrpret d'ordres",

View file

@ -30,6 +30,7 @@
],
"Icon": "preferences-system-power-management",
"Name": "Energy",
"Name[ar]": "الطاقة",
"Name[ca@valencia]": "Energia",
"Name[ca]": "Energia",
"Name[cs]": "Energie",

View file

@ -4,6 +4,7 @@
[Domain]
Name=Date and Time Control Module
Name[ar]=وحدة التّحكّم بالتّاريخ والوقت
Name[ca]=Mòdul de control de la data i hora
Name[ca@valencia]=Mòdul de control de la data i hora
Name[cs]=Ovládací modul data a času
@ -31,6 +32,7 @@ Icon=preferences-system-time
[org.kde.active.clockconfig.save]
Name=Save the date/time settings
Name[ar]=احفظ إعدادات التّاريخ/الوقت
Name[ca]=Desa la configuració de la data i hora
Name[ca@valencia]=Guarda la configuració de la data i hora
Name[cs]=Uložit nastavení data a času
@ -55,6 +57,7 @@ Name[tr]=Tarih ve saat ayarlarını kaydet
Name[uk]=Зберегти параметри дати/часу
Name[x-test]=xxSave the date/time settingsxx
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.
Description[ca@valencia]=Les polítiques del sistema impedixen que guardeu la configuració de la data i hora.
Description[cs]=Nastavení systému vám znemožňuje uložit datum/čas.

View file

@ -30,6 +30,7 @@
],
"Icon": "preferences-system-time",
"Name": "Time and Date",
"Name[ar]": "الوقت والتّاريخ",
"Name[ca@valencia]": "Hora i data",
"Name[ca]": "Hora i data",
"Name[cs]": "Datum a čas",

View file

@ -3,6 +3,7 @@
"Authors": [
{
"Name": "Bhushan Shah",
"Name[ar]": "Bhushan Shah",
"Name[az]": "Bhushan Shah",
"Name[ca@valencia]": "Bhushan Shah",
"Name[ca]": "Bhushan Shah",

View file

@ -2,6 +2,7 @@
"Categories": "Qt;KDE;X-KDE-settings-system;",
"KPlugin": {
"Description": "Wireless network setting",
"Description[ar]": "إعدادات الشبكة اللاسلكية",
"Description[ca@valencia]": "Configureu la xarxa sense fil",
"Description[ca]": "Configuració de la xarxa sense fil",
"Description[cs]": "Nastavení bezdrátové sítě",
@ -30,6 +31,7 @@
],
"Icon": "network-wireless-symbolic",
"Name": "Wi-Fi",
"Name[ar]": "واي فاي",
"Name[az]": "Wi-Fi",
"Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi",

View file

@ -5,6 +5,7 @@
{
"Email": "plasma-mobile@kde.org",
"Name": "KDE Visual Design Group",
"Name[ar]": "مجموعة التصميم المرئي لكِيدِي",
"Name[ca@valencia]": "Grup de disseny visual de KDE",
"Name[ca]": "Grup de disseny visual de KDE",
"Name[cs]": "Skupina vizuálního návrhu KDE",

View file

@ -5,6 +5,7 @@
{
"Email": "bshah@kde.org",
"Name": "Bhushan Shah",
"Name[ar]": "Bhushan Shah",
"Name[az]": "Bhushan Shah",
"Name[ca@valencia]": "Bhushan Shah",
"Name[ca]": "Bhushan Shah",
@ -64,6 +65,7 @@
"Id": "org.kde.plasma.quicksetting.airplanemode",
"License": "GPL-2.0+",
"Name": "Airplane Mode",
"Name[ar]": "خارج نطاق التغطية",
"Name[az]": "Uçuş rejimi",
"Name[ca@valencia]": "Mode avió",
"Name[ca]": "Mode avió",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -64,6 +65,7 @@
"Id": "org.kde.plasma.quicksetting.audio",
"License": "GPL-2.0+",
"Name": "Audio",
"Name[ar]": "الصوت",
"Name[az]": "Səs",
"Name[ca@valencia]": "Àudio",
"Name[ca]": "Àudio",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -64,6 +65,7 @@
"Id": "org.kde.plasma.quicksetting.battery",
"License": "GPL-2.0+",
"Name": "Battery",
"Name[ar]": "البطارية",
"Name[az]": "Batareya",
"Name[ca@valencia]": "Bateria",
"Name[ca]": "Bateria",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -64,6 +65,7 @@
"Id": "org.kde.plasma.quicksetting.bluetooth",
"License": "GPL-2.0+",
"Name": "Bluetooth",
"Name[ar]": "بلوتوث",
"Name[az]": "Bluetooth",
"Name[ca@valencia]": "Bluetooth",
"Name[ca]": "Bluetooth",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -63,6 +64,7 @@
"Id": "org.kde.plasma.quicksetting.caffeine",
"License": "GPL",
"Name": "Caffeine",
"Name[ar]": "كافيين",
"Name[az]": "Caffeine",
"Name[ca@valencia]": "Caffeine",
"Name[ca]": "Caffeine",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -63,6 +64,7 @@
"Id": "org.kde.plasma.quicksetting.donotdisturb",
"License": "GPL",
"Name": "Do Not Disturb",
"Name[ar]": "لا تزعج",
"Name[ca@valencia]": "No destorbar",
"Name[ca]": "No destorbar",
"Name[cs]": "Nerušit",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -64,6 +65,7 @@
"Id": "org.kde.plasma.quicksetting.flashlight",
"License": "GPL-2.0+",
"Name": "Flashlight",
"Name[ar]": "مشعل كهربائي",
"Name[az]": "Fənər",
"Name[ca@valencia]": "Llum de flaix",
"Name[ca]": "Llum de flaix",

View file

@ -52,6 +52,7 @@
"Id": "org.kde.plasma.quicksetting.hotspot",
"License": "GPL-2.0+",
"Name": "Hotspot",
"Name[ar]": "هوت-سبوت",
"Name[ca@valencia]": "Punt d'accés",
"Name[ca]": "Punt d'accés",
"Name[cs]": "Hotspot",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",

View file

@ -5,6 +5,7 @@
{
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol",
"Name[ar]": "ألكس بول",
"Name[ast]": "Aleix Pol",
"Name[az]": "Aleix Pol",
"Name[ca@valencia]": "Aleix Pol",
@ -64,6 +65,7 @@
"Id": "org.kde.plasma.quicksetting.nightcolor",
"License": "GPL",
"Name": "Night Color",
"Name[ar]": "لون ليلي",
"Name[az]": "Gecə rəngi",
"Name[ca@valencia]": "Color de nit",
"Name[ca]": "Color de nit",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",

View file

@ -5,6 +5,7 @@
{
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol i Gonzalez",
"Name[ar]": "ألكس بول غنزالز",
"Name[az]": "Aleix Pol i Gonzalez",
"Name[ca@valencia]": "Aleix Pol i Gonzalez",
"Name[ca]": "Aleix Pol i Gonzalez",

View file

@ -4,6 +4,7 @@
[Global]
IconName=preferences-system-windows-effect-screenshot
Name=Plasma
Name[ar]=بلازما
Name[ast]=Plasma
Name[az]=Plasma
Name[ca]=Plasma

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -64,6 +65,7 @@
"Id": "org.kde.plasma.quicksetting.screenshot",
"License": "GPL-2.0+",
"Name": "Screenshot",
"Name[ar]": "لقطة شاشة",
"Name[az]": "Ekran şəkli",
"Name[ca@valencia]": "Captura de pantalla",
"Name[ca]": "Captura de pantalla",

View file

@ -4,6 +4,7 @@
[Global]
IconName=preferences-system-windows-effect-screenshot
Name=Plasma
Name[ar]=بلازما
Name[ast]=Plasma
Name[az]=Plasma
Name[ca]=Plasma

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -65,6 +66,7 @@
"Id": "org.kde.plasma.quicksetting.settingsapp",
"License": "GPL-2.0+",
"Name": "Settings",
"Name[ar]": "الإعدادات",
"Name[az]": "Ayarlar",
"Name[ca@valencia]": "Configuració",
"Name[ca]": "Configuració",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -65,6 +66,7 @@
"Id": "org.kde.plasma.quicksetting.wifi",
"License": "GPL-2.0+",
"Name": "Wi-Fi",
"Name[ar]": "واي فاي",
"Name[az]": "Wi-Fi",
"Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi",

View file

@ -5,6 +5,7 @@
{
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[ar]": "ديفين لين",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
@ -64,6 +65,7 @@
"Id": "org.kde.plasma.phoneshell",
"License": "GPLv2+",
"Name": "Plasma Mobile",
"Name[ar]": "بلازما الجوال",
"Name[ca@valencia]": "Plasma Mobile",
"Name[ca]": "Plasma Mobile",
"Name[cs]": "Plasma Mobile",