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-04-04 02:38:04 +00:00
parent fe7a453ddd
commit bea89f08c1
15 changed files with 40 additions and 0 deletions

View file

@ -36,8 +36,10 @@
}
],
"Description": "Cellular initialstart module for Plasma Mobile",
"Description[ca@valencia]": "Mòdul de començament inicial del mòbil per a Plasma Mobile",
"Description[ca]": "Mòdul de començament inicial del mòbil per al Plasma Mobile",
"Description[ia]": "Modulo initialstart de Cellular per Plasma Mobile",
"Description[it]": "Modulo di avvio iniziale della rete cellulare per Plasma Mobile",
"Description[ka]": "Plasma Mobile-ის ფიჭური სწრაფი გაშვების მოდული",
"Description[nl]": "Initiële cellulaire startmodule voor Plasma Mobile",
"Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਸੈਲੂਲਰ ਸ਼ੁਰੂਆਤੀ ਮੋਡੀਊਲ",
@ -48,9 +50,11 @@
"Id": "org.kde.plasma.mobileinitialstart.cellular",
"License": "GPL-2.0+",
"Name": "Cellular",
"Name[ca@valencia]": "Mòbil",
"Name[ca]": "Mòbil",
"Name[es]": "Móvil",
"Name[ia]": "Cellular",
"Name[it]": "Rete cellulare",
"Name[ka]": "ფიჭური ქსელი",
"Name[nl]": "Cellulair",
"Name[pa]": "ਸੈਲੂਲਰ",

View file

@ -36,8 +36,10 @@
}
],
"Description": "Finished initialstart module for Plasma Mobile",
"Description[ca@valencia]": "Mòdul de començament inicial finalitzat per a Plasma Mobile",
"Description[ca]": "Mòdul de començament inicial finalitzat per al Plasma Mobile",
"Description[ia]": "Modulo initialstart terminate per Plasma Mobile",
"Description[it]": "Modulo di avvio iniziale completato per Plasma Mobile",
"Description[ka]": "Plasma Mobile-ის საწყისი გაშვების მოდულის მომზადება დასრულდა",
"Description[nl]": "Initiële cellulaire startmodule voor Plasma Mobile beëindigd",
"Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਸ਼ੁਰੂਆਤੀ ਮੋਡੀਊਲ ਪੂਰਾ ਹੋਇਆ",
@ -48,8 +50,10 @@
"Id": "org.kde.plasma.mobileinitialstart.finished",
"License": "GPL-2.0+",
"Name": "Finished",
"Name[ca@valencia]": "Finalitzat",
"Name[ca]": "Finalitzat",
"Name[ia]": "Terminate",
"Name[it]": "Finito",
"Name[ka]": "დასრულდა",
"Name[nl]": "Beëindigd",
"Name[pa]": "ਮੁਕੰਮਲ",

View file

@ -36,8 +36,10 @@
}
],
"Description": "Prepare initialstart module for Plasma Mobile",
"Description[ca@valencia]": "Mòdul de començament inicial de preparació per a Plasma Mobile",
"Description[ca]": "Mòdul de començament inicial de preparació per al Plasma Mobile",
"Description[ia]": "Prepara modulo initialstart per Plasma Mobile",
"Description[it]": "Modulo di avvio iniziale di preparazione per Plasma Mobile",
"Description[ka]": "Plasma Mobile-ის საწყისი გაშვების მომზადება",
"Description[nl]": "Initiële startmodule voor Plasma Mobile voorbereiden",
"Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਸ਼ੁਰੂਆਤੀ ਮੋਡੀਊਲ ਤਿਆਰ ਕਰੋ",
@ -48,8 +50,10 @@
"Id": "org.kde.plasma.mobileinitialstart.prepare",
"License": "GPL-2.0+",
"Name": "Prepare",
"Name[ca@valencia]": "Preparació",
"Name[ca]": "Preparació",
"Name[ia]": "Prepara...",
"Name[it]": "Prepara",
"Name[ka]": "მომზადება",
"Name[nl]": "Voorbereiden",
"Name[pa]": "ਤਿਆਰੀ",

View file

@ -36,8 +36,10 @@
}
],
"Description": "Time initialstart module for Plasma Mobile",
"Description[ca@valencia]": "Mòdul de començament inicial de l'hora per a Plasma Mobile",
"Description[ca]": "Mòdul de començament inicial de l'hora per al Plasma Mobile",
"Description[ia]": "Modulo initialstar de tempore per Plasma Mobile",
"Description[it]": "Modulo di avvio iniziale dell'orario per Plasma Mobile",
"Description[ka]": "Plasma Mobile-ის საწყისი გაშვების მოდული",
"Description[nl]": "Tijd van initiële startmodule voor Plasma Mobile",
"Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਸਮਾਂ ਸ਼ੁਰੂਆਤੀ ਮੋਡੀਊਲ",
@ -48,8 +50,10 @@
"Id": "org.kde.plasma.mobileinitialstart.time",
"License": "GPL-2.0+",
"Name": "Time",
"Name[ca@valencia]": "Hora",
"Name[ca]": "Hora",
"Name[ia]": "Tempore",
"Name[it]": "Orario",
"Name[ka]": "დრო",
"Name[nl]": "Tijd",
"Name[pa]": "ਸਮਾਂ",

View file

@ -36,8 +36,10 @@
}
],
"Description": "WiFi initialstart module for Plasma Mobile",
"Description[ca@valencia]": "Mòdul de començament inicial de Wi-Fi per a Plasma Mobile",
"Description[ca]": "Mòdul de començament inicial de Wi-Fi per al Plasma Mobile",
"Description[ia]": "Modulo initialstart de WiFi per Plasma Mobile",
"Description[it]": "Modulo di avvio iniziale WiFi per Plasma Mobile",
"Description[ka]": "Plasma Mobile-ის WiFi-ის სწრაფი გაშვების მოდული",
"Description[nl]": "Initiële startmodule voor WiFi voor Plasma Mobile",
"Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਵਾਈ-ਫ਼ਾਈ ਸ਼ੁਰੂਆਤੀ ਮੋਡੀਊਲ",
@ -48,9 +50,11 @@
"Id": "org.kde.plasma.mobileinitialstart.wifi",
"License": "GPL-2.0+",
"Name": "WiFi",
"Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi",
"Name[es]": "Wifi",
"Name[ia]": "WiFi",
"Name[it]": "WiFi",
"Name[ka]": "WiFi",
"Name[nl]": "WiFi",
"Name[pa]": "ਵਾਈ-ਫਾਈ",

View file

@ -7,6 +7,7 @@
"Description[cs]": "Spravovat vaše mobilní sítě",
"Description[en_GB]": "Management of cellular networks",
"Description[es]": "Gestión de redes móviles",
"Description[fi]": "Matkapuhelinverkkojen hallinta",
"Description[fr]": "Gestion de réseaux cellulaires",
"Description[ia]": "Gestion de retes cellular",
"Description[it]": "Gestione delle reti cellulari",
@ -31,6 +32,7 @@
"Name[cs]": "Mobilní síť",
"Name[en_GB]": "Cellular Network",
"Name[es]": "Red móvil",
"Name[fi]": "Matkapuhelinverkko",
"Name[fr]": "Réseau cellulaire",
"Name[ia]": "Rete Cellular",
"Name[it]": "Rete cellulare",

View file

@ -9,6 +9,7 @@
"Name[cs]": "Tobias Fella",
"Name[en_GB]": "Tobias Fella",
"Name[es]": "Tobias Fella",
"Name[fi]": "Tobias Fella",
"Name[fr]": "Tobias Fella",
"Name[ia]": "Tobias Fella",
"Name[it]": "Tobias Fella",
@ -28,6 +29,7 @@
"Description[cs]": "Hotspot WiFi",
"Description[en_GB]": "Wi-Fi Hotspot",
"Description[es]": "Punto de acceso wifi",
"Description[fi]": "Langattomat tukiasemat",
"Description[fr]": "Points d'accès Wifi",
"Description[ia]": "Hotspots de Wi-Fi",
"Description[it]": "Hotspot Wi-Fi",

View file

@ -7,6 +7,7 @@
"Description[cs]": "Verze softwaru",
"Description[en_GB]": "Software Versions",
"Description[es]": "Versiones de software",
"Description[fi]": "Ohjelmaversiot",
"Description[fr]": "Versions de logiciels",
"Description[ia]": "Versiones de software",
"Description[it]": "Versioni software",
@ -31,6 +32,7 @@
"Name[cs]": "Informace",
"Name[en_GB]": "Information",
"Name[es]": "Información",
"Name[fi]": "Tietoa",
"Name[fr]": "Informations",
"Name[ia]": "Information",
"Name[it]": "Informazioni",

View file

@ -7,6 +7,7 @@
"Description[cs]": "Konfigurace nastavení správy napájení",
"Description[en_GB]": "Configure power management settings",
"Description[es]": "Configurar las preferencias de la gestión de energía",
"Description[fi]": "Aseta virranhallinta",
"Description[fr]": "Configurer les paramètres de gestion de l'énergie",
"Description[ia]": "Configura preferentias de gestion de energia",
"Description[it]": "Configura le impostazioni di gestione energetica",
@ -31,6 +32,7 @@
"Name[cs]": "Energie",
"Name[en_GB]": "Energy",
"Name[es]": "Energía",
"Name[fi]": "Virta",
"Name[fr]": "Énergie",
"Name[ia]": "Energia",
"Name[it]": "Energia",

View file

@ -9,6 +9,7 @@ Name[ca@valencia]=Mòdul de control de la data i hora
Name[cs]=Ovládací modul data a času
Name[en_GB]=Date and Time Control Module
Name[es]=Módulo de control de fecha y hora
Name[fi]=Ajan ja päiväyksen hallintamoduuli
Name[fr]=Module de contrôle de la date et de l'heure
Name[ia]=Modulo de controlo de data e tempore
Name[it]=Modulo di controllo di data e ora
@ -30,6 +31,7 @@ Name[ca@valencia]=Guarda la configuració de la data i hora
Name[cs]=Uložit nastavení data a času
Name[en_GB]=Save the date/time settings
Name[es]=Guardar las preferencias de fecha y hora
Name[fi]=Tallenna päiväyksen ja ajan asetukset
Name[fr]=Enregistrer la configuration pour la date et l'heure
Name[ia]=Salveguarda le preferentias de data & tempore
Name[it]=Salva le impostazioni di data e ora
@ -48,6 +50,7 @@ Description[ca@valencia]=Les polítiques del sistema impedixen que guardeu la co
Description[cs]=Nastavení systému vám znemožňuje uložit datum/čas.
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[fi]=Järjestelmäkäytäntö estää sinua tallentamasta aika-asetuksia.
Description[fr]=La politique du système vous empêche denregistrer la configuration pour la date et l'heure.
Description[ia]=Le politicas de systema preveni te ex salveguardar le preferentias de tempore/data.
Description[it]=Le politiche del sistema ti impediscono di salvare le impostazioni di data e ora.

View file

@ -7,6 +7,7 @@
"Description[cs]": "Zobrazení data a časového pásma",
"Description[en_GB]": "Timezone, Date Display",
"Description[es]": "Zona horaria, visor de la fecha",
"Description[fi]": "Aikavyöhyke, Päivämääränäyttö",
"Description[fr]": "Affichage du fuseau horaire et de la date",
"Description[ia]": "Fuso horari, Monstrator de Data",
"Description[it]": "Fuso orario, visualizzazione della data",
@ -31,6 +32,7 @@
"Name[cs]": "Datum a čas",
"Name[en_GB]": "Time and Date",
"Name[es]": "Fecha y hora",
"Name[fi]": "Aika ja päiväys",
"Name[fr]": "Date et heure",
"Name[ia]": "Hora e data",
"Name[it]": "Ora e data",

View file

@ -39,6 +39,7 @@
"Description[cs]": "Nastavení klávesnice na obrazovce",
"Description[en_GB]": "On-Screen Keyboard configuration",
"Description[es]": "Configuración del teclado en pantalla",
"Description[fi]": "Näyttönäppäimistön asetukset",
"Description[fr]": "Configuration du clavier en incrustation vidéo",
"Description[ia]": "Configuration de Claviero sur le schermo",
"Description[it]": "Configurazione della tastiera su schermo",
@ -63,6 +64,7 @@
"Name[cs]": "Klávesnice na obrazovce",
"Name[en_GB]": "On-Screen Keyboard",
"Name[es]": "Teclado en pantalla",
"Name[fi]": "Näyttönäppäimistö",
"Name[fr]": "Clavier en incrustation vidéo",
"Name[ia]": "Claviero sur schermo",
"Name[it]": "Tastiera su schermo",

View file

@ -7,6 +7,7 @@
"Description[cs]": "Nastavení bezdrátové sítě",
"Description[en_GB]": "Wireless network setting",
"Description[es]": "Preferencias de la red inalámbrica",
"Description[fi]": "Langattoman verkon asetukset",
"Description[fr]": "Configuration des réseaux sans fil",
"Description[ia]": "Preferentia de rete sin cablos",
"Description[it]": "Impostazioni rete senza fili",

View file

@ -6,6 +6,7 @@
"Description[ca]": "Us permet canviar entre les tasques diferents en execució amb una interfície mòbil.",
"Description[en_GB]": "Allows you to switch between running tasks with a mobile interface.",
"Description[es]": "Le permite cambiar entre tareas en ejecución con una interfaz móvil.",
"Description[fi]": "Mahdollistaa mobiilikäyttöliittymässä vaihdon tehtävästä toiseen.",
"Description[fr]": "Vous permet de basculer entre des tâches en exécution avec une interface pour périphérique mobile.",
"Description[ia]": "Te permitte commutar inter cargas executante con un interfaciemobile.",
"Description[it]": "Consente di passare da un'attività in esecuzione all'altra con un'interfaccia mobile.",
@ -25,6 +26,7 @@
"Name[ca]": "Commutador de tasques del mòbil",
"Name[en_GB]": "Mobile Task Switcher",
"Name[es]": "Selector de tareas móvil",
"Name[fi]": "Mobiilitehtävänvaihto",
"Name[fr]": "Commutateur de tâches pour périphérique mobile",
"Name[ia]": "Commutator de carga Mobile",
"Name[it]": "Selettore delle attività mobile",

View file

@ -42,6 +42,7 @@
"Description[es]": "Ajuste rápido para cambiar el modo acoplado para Plasma Mobile",
"Description[fr]": "Configuration rapide pour basculer ou non en mode en dock pour Plasma Mobile",
"Description[ia]": "Preferentia rapide a commutar modo de bassino (dockd) per Plasma Mobile",
"Description[it]": "Impostazione rapida per attivare o disattivare la modalità ancorata per Plasma Mobile",
"Description[ka]": "Plasma Mobile-ის დოკის რეჟიმის პარამეტრის გადართვა",
"Description[nl]": "Snelle instelling om modus vastgezet om te schakelen voor Plasma Mobile",
"Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਡੌਕ ਬਦਲਣ ਢੰਗ ਲਈ ਫ਼ੌਰੀ ਸੈਟਿੰਗ",
@ -59,6 +60,7 @@
"Name[es]": "Modo acoplado",
"Name[fr]": "Mode en dock",
"Name[ia]": "Modo de bassino (Docked)",
"Name[it]": "Modalità ancorata",
"Name[ka]": "დოკის რეჟიმი",
"Name[nl]": "Modus vastgezet",
"Name[pa]": "ਡੌਕ ਕਰਨ ਢੰਗ",