From 680032c2226515093b74251652c8b733151acfb9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Apr 2018 05:24:11 +0200 Subject: [PATCH] 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" --- app/latte-layouts.knsrc | 1 + app/lattedock.notifyrc | 7 +++++++ app/org.kde.latte-dock.desktop.cmake | 3 +++ applets/separator/metadata.desktop.cmake | 3 +++ applets/separator/package/metadata.desktop | 3 +++ applets/spacer/metadata.desktop.cmake | 3 +++ applets/spacer/package/metadata.desktop | 3 +++ containment/metadata.desktop.cmake | 2 ++ containment/package/metadata.desktop | 2 ++ .../plasma-containmentactions-lattecontextmenu.desktop | 2 ++ kwin_scripts/activatelattelaunchermenu/metadata.desktop | 2 ++ plasmoid/metadata.desktop.cmake | 2 ++ plasmoid/package/metadata.desktop | 2 ++ shell/metadata.desktop.cmake | 3 +++ shell/package/metadata.desktop | 3 +++ 15 files changed, 41 insertions(+) diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc index 77180f742..8c09bc762 100644 --- a/app/latte-layouts.knsrc +++ b/app/latte-layouts.knsrc @@ -7,6 +7,7 @@ Name[de]=Latte-Profile Name[en_GB]=Latte Layouts Name[es]=Distribuciones de Latte Name[fi]=Latte-asettelut +Name[gl]=Disposicións de Latte Name[it]=Disposizioni di Latte Name[nl]=Latte-indelingen Name[pl]=Układy Latte diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index 108bb3b44..070106a82 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -9,6 +9,7 @@ Name[el]=Πίνακας Latte Name[en_GB]=Latte Dock Name[es]=Latte Dock Name[fi]=Latte-telakka +Name[gl]=Doca Latte Name[it]=Latte Dock Name[nl]=Latte Dock Name[pl]=Dok Latte @@ -27,6 +28,7 @@ Comment[el]=Πίνακας Latte Comment[en_GB]=Latte Dock Comment[es]=Latte Dock Comment[fi]=Latte-telakka +Comment[gl]=Doca Latte. Comment[it]=Latte Dock Comment[nl]=Latte Dock Comment[pl]=Dok Latte @@ -48,6 +50,7 @@ Name[el]=Επιτυχής εισαγωγή διαμόρφωσης Name[en_GB]=Configuration imported successfully Name[es]=Configuración importada exitosamente Name[fi]=Asetusten tuonti onnistui +Name[gl]=A configuración importouse correctamente. Name[it]=Configurazione importata correttamente Name[nl]=Configuration met succes geïmporteerd Name[pl]=Pomyślnie zaimportowano ustawienia @@ -70,6 +73,7 @@ Name[el]=Αποτυχία εξαγωγής διαμόρφωσης Name[en_GB]=Failed to import configuration Name[es]=Error al importar la configuración Name[fi]=Asetusten tuonti epäonnistui +Name[gl]=Non se puido importar a configuración. Name[it]=Impossibile importare la configurazione Name[nl]=Configuratie importeren is mislukt Name[pl]=Nie udało się zaimportować ustawień @@ -92,6 +96,7 @@ Name[el]=Επιτυχής εξαγωγή διαμόρφωσης Name[en_GB]=Configuration exported successfully Name[es]=Configuración exportada exitosamente Name[fi]=Asetusten vienti onnistui +Name[gl]=A configuración exportouse correctamente. Name[it]=Configurazione esportata correttamente Name[nl]=Configuration met succes geëxporteerd Name[pl]=Pomyślnie wyeksportowano ustawienia @@ -114,6 +119,7 @@ Name[el]=Αποτυχία εξαγωγής διαμόρφωσης Name[en_GB]=Failed to export configuration Name[es]=Error al exportar la configuración Name[fi]=Asetusten vienti epäonnistui +Name[gl]=Non se puido exportar a configuración. Name[it]=Impossibile esportare la configurazione Name[nl]=Configuratie exporteren is mislukt Name[pl]=Nie udało się wyeksportować ustawień @@ -135,6 +141,7 @@ Name[el]=Εναλλαγή στο προφίλ Name[en_GB]=Switch to layout Name[es]=Cambiar a distribución Name[fi]=Vaihda asetteluun +Name[gl]=Cambiar á disposición Name[it]=Passa alla disposizione Name[nl]=Naar indeling omschakelen Name[pl]=Przełącz układ diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake index 220ba7310..89b27d9e6 100644 --- a/app/org.kde.latte-dock.desktop.cmake +++ b/app/org.kde.latte-dock.desktop.cmake @@ -10,6 +10,7 @@ Name[el]=Latte Name[en_GB]=Latte Name[es]=Latte Name[fi]=Latte +Name[gl]=Latte Name[it]=Latte Name[nl]=Latte Name[pl]=Latte @@ -28,6 +29,7 @@ Comment[el]=Πίνακες για όλον τον κόσμο Comment[en_GB]=Dock for the masses Comment[es]=Un dock para las masas Comment[fi]=Telakka massoille +Comment[gl]=Doca para as masas. Comment[it]=Area di aggancio per le masse Comment[nl]=Dock voor de massa Comment[pl]=Dok dla mas @@ -47,6 +49,7 @@ GenericName[el]=Πίνακας GenericName[en_GB]=Dock GenericName[es]=Dock GenericName[fi]=Telakka +GenericName[gl]=Doca GenericName[it]=Aggancio GenericName[nl]=Dock GenericName[pl]=Dok diff --git a/applets/separator/metadata.desktop.cmake b/applets/separator/metadata.desktop.cmake index a52c43ea8..e124c5f67 100644 --- a/applets/separator/metadata.desktop.cmake +++ b/applets/separator/metadata.desktop.cmake @@ -11,6 +11,7 @@ Name[en_GB]=Separator Name[es]=Separador Name[fi]=Erotin Name[fr]=Séparateur +Name[gl]=Separador Name[it]=Separatore Name[nl]=Scheidingshulpmiddel Name[pl]=Oddzielacz @@ -30,6 +31,7 @@ Comment[el]=Για όλες τις εργασίες διαχωρισμού σα Comment[en_GB]=For all your separation tasks Comment[es]=Para todas sus tareas de separación Comment[fi]=Kaikkiin erotustehtäviisi +Comment[gl]=Para todas as súas tarefas de separación. Comment[it]=Per tutti i tuoi processi di separazione Comment[nl]=Voor al uw scheidingstaken Comment[pl]=Dla wszystkich twoich oddzielonych zadań @@ -51,6 +53,7 @@ Keywords[el]=διαχωριστικό Keywords[en_GB]=separator Keywords[es]=separador Keywords[fi]=erotin +Keywords[gl]=separador Keywords[it]=separatore Keywords[nl]=scheiding Keywords[pl]=oddzielacz diff --git a/applets/separator/package/metadata.desktop b/applets/separator/package/metadata.desktop index a52c43ea8..e124c5f67 100644 --- a/applets/separator/package/metadata.desktop +++ b/applets/separator/package/metadata.desktop @@ -11,6 +11,7 @@ Name[en_GB]=Separator Name[es]=Separador Name[fi]=Erotin Name[fr]=Séparateur +Name[gl]=Separador Name[it]=Separatore Name[nl]=Scheidingshulpmiddel Name[pl]=Oddzielacz @@ -30,6 +31,7 @@ Comment[el]=Για όλες τις εργασίες διαχωρισμού σα Comment[en_GB]=For all your separation tasks Comment[es]=Para todas sus tareas de separación Comment[fi]=Kaikkiin erotustehtäviisi +Comment[gl]=Para todas as súas tarefas de separación. Comment[it]=Per tutti i tuoi processi di separazione Comment[nl]=Voor al uw scheidingstaken Comment[pl]=Dla wszystkich twoich oddzielonych zadań @@ -51,6 +53,7 @@ Keywords[el]=διαχωριστικό Keywords[en_GB]=separator Keywords[es]=separador Keywords[fi]=erotin +Keywords[gl]=separador Keywords[it]=separatore Keywords[nl]=scheiding Keywords[pl]=oddzielacz diff --git a/applets/spacer/metadata.desktop.cmake b/applets/spacer/metadata.desktop.cmake index a6d292f2a..2e26951a0 100644 --- a/applets/spacer/metadata.desktop.cmake +++ b/applets/spacer/metadata.desktop.cmake @@ -8,6 +8,7 @@ Name[el]=Διαχωριστικό Latte Name[en_GB]=Latte Dock Spacer Name[es]=Separador de Latte Dock Name[fi]=Latte-telakkavälistin +Name[gl]=Espazador da doca Latte Name[it]=Spaziatore Latte Dock Name[nl]=Latte Dock paneelscheider Name[pl]=Wypełniacz doku Latte @@ -25,6 +26,7 @@ Comment[el]=Διατηρεί κενούς χώρους μέσα στον πίν Comment[en_GB]=Reserve empty spaces within the dock. Comment[es]=Reservar espacios en blanco en el dock. Comment[fi]=Varaa tyhjiä tiloja telakkaan. +Comment[gl]=Reserva espazos baleiros na doca. Comment[it]=Riserva spazi vuoti all'interno dell'area di aggancio. Comment[nl]=Reserveer lege ruimte in het dok. Comment[pl]=Zajmij puste powierzchnie w doku. @@ -46,6 +48,7 @@ Keywords[el]=κενό Keywords[en_GB]=spacer Keywords[es]=separador Keywords[fi]=välistin +Keywords[gl]=espazador Keywords[it]=spaziatore Keywords[nl]=paneelscheider Keywords[pl]=wypełniacz diff --git a/applets/spacer/package/metadata.desktop b/applets/spacer/package/metadata.desktop index a6d292f2a..2e26951a0 100644 --- a/applets/spacer/package/metadata.desktop +++ b/applets/spacer/package/metadata.desktop @@ -8,6 +8,7 @@ Name[el]=Διαχωριστικό Latte Name[en_GB]=Latte Dock Spacer Name[es]=Separador de Latte Dock Name[fi]=Latte-telakkavälistin +Name[gl]=Espazador da doca Latte Name[it]=Spaziatore Latte Dock Name[nl]=Latte Dock paneelscheider Name[pl]=Wypełniacz doku Latte @@ -25,6 +26,7 @@ Comment[el]=Διατηρεί κενούς χώρους μέσα στον πίν Comment[en_GB]=Reserve empty spaces within the dock. Comment[es]=Reservar espacios en blanco en el dock. Comment[fi]=Varaa tyhjiä tiloja telakkaan. +Comment[gl]=Reserva espazos baleiros na doca. Comment[it]=Riserva spazi vuoti all'interno dell'area di aggancio. Comment[nl]=Reserveer lege ruimte in het dok. Comment[pl]=Zajmij puste powierzchnie w doku. @@ -46,6 +48,7 @@ Keywords[el]=κενό Keywords[en_GB]=spacer Keywords[es]=separador Keywords[fi]=välistin +Keywords[gl]=espazador Keywords[it]=spaziatore Keywords[nl]=paneelscheider Keywords[pl]=wypełniacz diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake index 66d59a565..8f1c3f12f 100644 --- a/containment/metadata.desktop.cmake +++ b/containment/metadata.desktop.cmake @@ -11,6 +11,7 @@ Name[el]=Latte Name[en_GB]=Latte Name[es]=Latte Name[fi]=Latte +Name[gl]=Latte Name[it]=Latte Name[nl]=Latte Name[pl]=Latte @@ -28,6 +29,7 @@ Comment[de]=Containment für Latte-Dock Comment[el]=Περιέκτης της εφαρμογής Latte Comment[en_GB]=Containment provided for the Latte Dock Comment[es]=Contención proporcionada para Latte Dock +Comment[gl]=Contedor fornecido para a doca Latte. Comment[it]=Contenitore fornito per Latte Dock Comment[nl]=Container geleverd voor de Latte Dock Comment[pl]=Pojemnik dla doku Latte diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop index de4350594..74cac86b3 100644 --- a/containment/package/metadata.desktop +++ b/containment/package/metadata.desktop @@ -11,6 +11,7 @@ Name[el]=Latte Name[en_GB]=Latte Name[es]=Latte Name[fi]=Latte +Name[gl]=Latte Name[it]=Latte Name[nl]=Latte Name[pl]=Latte @@ -28,6 +29,7 @@ Comment[de]=Containment für Latte-Dock Comment[el]=Περιέκτης της εφαρμογής Latte Comment[en_GB]=Containment provided for the Latte Dock Comment[es]=Contención proporcionada para Latte Dock +Comment[gl]=Contedor fornecido para a doca Latte. Comment[it]=Contenitore fornito per Latte Dock Comment[nl]=Container geleverd voor de Latte Dock Comment[pl]=Pojemnik dla doku Latte diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop index 731792485..e3a914c5a 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Menú estàndard del Latte Name[de]=Standard-Latte-Menü Name[en_GB]=Standard Latte Menu Name[es]=Menú estándar de Latte +Name[gl]=Menú estándar de Latte Name[it]=Menu standard di Latte Name[nl]=Standaard menu van Latte Name[pt]=Menu Normal do Latte @@ -19,6 +20,7 @@ Comment[ca@valencia]=El menú Latte que es mostra normalment amb un clic del bot Comment[de]=Das Latte-Menü, das normalerweise mit der rechten Maustaste angezeigt wird Comment[en_GB]=The latte menu that normally shows on right-click Comment[es]=Este es el menú de Latte que normalmente se muestra tras un clic derecho +Comment[gl]=O menú de Latte que adoita mostrarse ao premer co botón secundario. Comment[it]=Il menu di Latte che normalmente viene mostrato al clic destro Comment[nl]=Het menu van latte dat normaal getoond wordt bij rechtsklikken Comment[pt]=O menu do Latte que normalmente aparece com o botão direito do rato diff --git a/kwin_scripts/activatelattelaunchermenu/metadata.desktop b/kwin_scripts/activatelattelaunchermenu/metadata.desktop index 66d55d17b..237813c2d 100644 --- a/kwin_scripts/activatelattelaunchermenu/metadata.desktop +++ b/kwin_scripts/activatelattelaunchermenu/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Activa el menú del llançador del Latte Name[de]=Latte-Anwendungsmenü öffnen Name[en_GB]=Activate Latte Launcher Menu Name[es]=Activar menú de lanzadores de Latte +Name[gl]=Activar o menú iniciador de Latte Name[it]=Attiva il menu del lanciatore di Latte Name[nl]=Latte-startprogramma activeren Name[pt]=Activar o Menu de Lançamento do Latte @@ -18,6 +19,7 @@ Comment[ca@valencia]=Activa el menú del llançador del Latte des de la vora de Comment[de]=Latte-Anwendungsmenü über eine Bildschirmecke öffnen Comment[en_GB]=Activate Latte Launcher Menu from screen edge Comment[es]=Activar menú de lanzadores de Latte desde el borde de la pantalla +Comment[gl]=Activar o menú iniciador de Latte desde unha esquina da pantalla. Comment[it]=Attiva il menu del lanciatore di Latte dal bordo dello schermo Comment[nl]=Latte-startprogramma activeren vanaf de schermrand Comment[pt]=Activar o Menu de Lançamento do Latte no extremo do ecrã diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake index 9d8e126b9..3e14b955f 100644 --- a/plasmoid/metadata.desktop.cmake +++ b/plasmoid/metadata.desktop.cmake @@ -8,6 +8,7 @@ Name[el]=Πρόσθετο Latte Name[en_GB]=Latte Plasmoid Name[es]=Plasmoide Latte Name[fi]=Latte-sovelma +Name[gl]=Plasmoide de Latte Name[it]=Plasmoide Latte Name[nl]=Latte-plasmoid Name[pl]=Plazmoid Latte @@ -25,6 +26,7 @@ Comment[el]=Πρόσθετο της εφαρμογής Latte Comment[en_GB]=Plasmoid from the Latte Dock Comment[es]=Plasmoide de Latte Dock Comment[fi]=Latte-telakan sovelma +Comment[gl]=Plasmoide da doca Latte. Comment[it]=Plasmoide da Latte Dock Comment[nl]=Plasmoid uit de Latte Dock Comment[pl]=Plazmoid dla doku Latte diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index 11cdb882d..d8112b2d5 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -8,6 +8,7 @@ Name[el]=Πρόσθετο Latte Name[en_GB]=Latte Plasmoid Name[es]=Plasmoide Latte Name[fi]=Latte-sovelma +Name[gl]=Plasmoide de Latte Name[it]=Plasmoide Latte Name[nl]=Latte-plasmoid Name[pl]=Plazmoid Latte @@ -25,6 +26,7 @@ Comment[el]=Πρόσθετο της εφαρμογής Latte Comment[en_GB]=Plasmoid from the Latte Dock Comment[es]=Plasmoide de Latte Dock Comment[fi]=Latte-telakan sovelma +Comment[gl]=Plasmoide da doca Latte. Comment[it]=Plasmoide da Latte Dock Comment[nl]=Plasmoid uit de Latte Dock Comment[pl]=Plazmoid dla doku Latte diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake index 52475fa13..bc20fa421 100644 --- a/shell/metadata.desktop.cmake +++ b/shell/metadata.desktop.cmake @@ -8,6 +8,7 @@ Name[de]=Latte-Shell Name[el]=Κέλυφος Latte Name[en_GB]=Latte Shell Name[es]=Consola de Latte +Name[gl]=Intérprete de ordes de Latte Name[it]=shell Latte Name[nl]=Latte-shell Name[pl]=Powłoka Latte @@ -25,6 +26,7 @@ Comment[de]=Shell für Latte-Dock Comment[el]=Κέλυφος που παρέχεται από την εφαρμογή Latte Comment[en_GB]=Shell provided for the Latte Dock Comment[es]=Shell proporcionada para Latte Dock +Comment[gl]=Intérprete de ordes fornecido para a doca Latte. Comment[it]=Shell fornita per Latte Dock Comment[nl]=Shell geleverd voor de Latte Dock Comment[pl]=Powłoka dla doku Latte @@ -42,6 +44,7 @@ Keywords[de]=Shell Keywords[el]=κέλυφος Keywords[en_GB]=shell Keywords[es]=consola +Keywords[gl]=intérprete de ordes Keywords[it]=shell Keywords[nl]=shell Keywords[pl]=powłoka diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop index 2086bf79b..2fe06d5f9 100644 --- a/shell/package/metadata.desktop +++ b/shell/package/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Latte-Shell Name[el]=Κέλυφος Latte Name[en_GB]=Latte Shell Name[es]=Consola de Latte +Name[gl]=Intérprete de ordes de Latte Name[it]=shell Latte Name[nl]=Latte-shell Name[pl]=Powłoka Latte @@ -25,6 +26,7 @@ Comment[de]=Shell für Latte-Dock Comment[el]=Κέλυφος που παρέχεται από την εφαρμογή Latte Comment[en_GB]=Shell provided for the Latte Dock Comment[es]=Shell proporcionada para Latte Dock +Comment[gl]=Intérprete de ordes fornecido para a doca Latte. Comment[it]=Shell fornita per Latte Dock Comment[nl]=Shell geleverd voor de Latte Dock Comment[pl]=Powłoka dla doku Latte @@ -42,6 +44,7 @@ Keywords[de]=Shell Keywords[el]=κέλυφος Keywords[en_GB]=shell Keywords[es]=consola +Keywords[gl]=intérprete de ordes Keywords[it]=shell Keywords[nl]=shell Keywords[pl]=powłoka