From 9eba031fbbe09fdf879e3361a65f173e343400eb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 2 Nov 2019 09:33:47 +0100 Subject: [PATCH 1/3] 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" --- applets/analog-clock/metadata.desktop | 2 +- applets/batterymonitor/package/metadata.desktop | 2 +- applets/devicenotifier/package/metadata.desktop | 2 +- applets/digital-clock/package/metadata.desktop | 2 +- applets/lock_logout/metadata.desktop | 6 +++--- applets/mediacontroller/metadata.desktop | 4 ++-- applets/notifications/package/metadata.desktop | 2 +- applets/panelspacer/metadata.desktop | 4 ++-- applets/systemmonitor/diskactivity/metadata.desktop | 4 ++-- applets/systemmonitor/diskusage/metadata.desktop | 4 ++-- applets/systemmonitor/memory/metadata.desktop | 4 ++-- applets/systemmonitor/net/metadata.desktop | 4 ++-- components/shellprivate/widgetexplorer/plasmoids.knsrc | 2 +- .../plasma-containmentactions-contextmenu.desktop | 2 +- .../paste/plasma-containmentactions-paste.desktop | 2 +- menu/desktop/kf5-games-arcade.directory | 2 +- menu/desktop/kf5-unknown.directory | 2 +- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/applets/analog-clock/metadata.desktop b/applets/analog-clock/metadata.desktop index 37d5ab4f6..42e842236 100644 --- a/applets/analog-clock/metadata.desktop +++ b/applets/analog-clock/metadata.desktop @@ -96,7 +96,7 @@ Comment[en_GB]=A clock with hands Comment[eo]=Horloĝo kun manoj Comment[es]=Un reloj con manecillas Comment[et]=Seieritega kell -Comment[eu]=Erloju orrazduna +Comment[eu]=Erloju orraztuna Comment[fi]=Viisarikello Comment[fr]=Une horloge à aiguilles Comment[fy]=In klok mei wizerplaat diff --git a/applets/batterymonitor/package/metadata.desktop b/applets/batterymonitor/package/metadata.desktop index 399e98701..5a3d8f32f 100644 --- a/applets/batterymonitor/package/metadata.desktop +++ b/applets/batterymonitor/package/metadata.desktop @@ -57,7 +57,7 @@ Comment[en_GB]=See the power status of your battery Comment[eo]=Montri energian staton de viaj baterioj Comment[es]=Mire el estado de potencia de su batería Comment[et]=Aku oleku näitaja -Comment[eu]=Ikus bateriaren energia-egoera +Comment[eu]=Ikusi zure bateriaren energia-egoera Comment[fi]=Näyttää akun virtatilanteen Comment[fr]=Voir le niveau d'énergie de votre batterie Comment[fy]=Besjoch de stroomtastân fan jo batterij diff --git a/applets/devicenotifier/package/metadata.desktop b/applets/devicenotifier/package/metadata.desktop index 2e6ada972..b0d17619f 100644 --- a/applets/devicenotifier/package/metadata.desktop +++ b/applets/devicenotifier/package/metadata.desktop @@ -90,7 +90,7 @@ Comment[en_GB]=Notifications and access for new devices Comment[eo]=Atentigoj kaj atingo por novaj aparatoj Comment[es]=Notificaciones y accesos de nuevos dispositivos Comment[et]=Uutest seadmetest teatamine ja nende kasutamine -Comment[eu]=Gailu berrien jakinarazpenak eta sarbideak +Comment[eu]=Jakinarazpenak eta gailu berrietara sarbidea Comment[fi]=Ilmoitukset ja pääsy uusille laitteille Comment[fr]=Notifications et accès aux nouveaux périphériques Comment[fy]=Notifikaasjes en tagong foar nije apparaten diff --git a/applets/digital-clock/package/metadata.desktop b/applets/digital-clock/package/metadata.desktop index d9099f213..c2be3818c 100644 --- a/applets/digital-clock/package/metadata.desktop +++ b/applets/digital-clock/package/metadata.desktop @@ -96,7 +96,7 @@ Comment[el]=Εμφάνιση της ώρας σε ψηφιακή μορφή Comment[en_GB]=Time displayed in a digital format Comment[es]=La hora mostrada en formato digital Comment[et]=Aja esitamine digitaalsel kujul -Comment[eu]=Ordua formatu digitalean bistaratua +Comment[eu]=Ordua formatu digitalean azaldua Comment[fi]=Aika näytettynä digitaalimuodossa Comment[fr]=L'heure au format numérique Comment[gl]=A hora mostrada nun formato dixital diff --git a/applets/lock_logout/metadata.desktop b/applets/lock_logout/metadata.desktop index ef2bbe234..d679958ad 100644 --- a/applets/lock_logout/metadata.desktop +++ b/applets/lock_logout/metadata.desktop @@ -18,7 +18,7 @@ Name[en_GB]=Lock/Logout Name[eo]=Ŝloso/adiaŭo Name[es]=Bloquear/Terminar Name[et]=Lukustamine/väljalogimine -Name[eu]=Blokeatu/Amaitu saioa +Name[eu]=Giltzatu/Saio-itxi Name[fi]=Lukitus/uloskirjautuminen Name[fr]=Verrouillage / Déconnexion Name[fy]=Beskoattelje/ôfmelde @@ -96,7 +96,7 @@ Comment[en_GB]=Lock the screen or log out Comment[eo]=Ŝlosi ekranon aŭ elsaluti Comment[es]=Bloquear el escritorio o salir Comment[et]=Ekraani lukustamine või väljalogimine -Comment[eu]=Blokeatu pantaila edo amaitu saioa +Comment[eu]=Giltzatu pantaila edo saioa itxi Comment[fi]=Lukitse näyttö tai kirjaudu ulos Comment[fr]=Verrouille l'écran ou se déconnecte Comment[fy]=Lit de brûker it skerm beskoattelje of de sesje slute @@ -163,7 +163,7 @@ Keywords[el]=Κλείδωμα;έξοδος;ύπνωση;νάρκη;εναλλα Keywords[en_GB]=Lock;Logout;Sleep;Hibernate;Switch User; Keywords[es]=Bloquear;Terminar la sesión;Dormir;Hibernar;Cambiar de usuario; Keywords[et]=Lukustamine;Väljalogimine;Uni;Talveuni;Kasutaja vahetamine; -Keywords[eu]=Giltzatu;blokeatu;saio-bukaera;lokartu;hibernatu;aldatu erabiltzailea; +Keywords[eu]=giltzatu;blokeatu;saio-itxi;egin lo;hibernatu;aldatu erabiltzailea; Keywords[fi]=Lukitse;kirjaudu ulos;valmiustila;lepotila;vaihda käyttäjää; Keywords[fr]=Verrouillage;Déconnexion;Hibernation;Changement d'utilisateur; Keywords[gl]=Trancar;saír;durmir;hibernar;cambiar de usuario; diff --git a/applets/mediacontroller/metadata.desktop b/applets/mediacontroller/metadata.desktop index 12991f2fb..67e20ba56 100644 --- a/applets/mediacontroller/metadata.desktop +++ b/applets/mediacontroller/metadata.desktop @@ -11,7 +11,7 @@ Name[el]=Αναπαραγωγέας πολυμέσων Name[en_GB]=Media Player Name[es]=Reproductor multimedia Name[et]=Meediamängija -Name[eu]=Multimedia-jotzailea +Name[eu]=Euskarri jotzailea Name[fi]=Mediasoitin Name[fr]=Lecteur multimédia Name[gl]=Reprodutor multimedia @@ -57,7 +57,7 @@ Comment[el]=Χειριστήρια αναπαραγωγέα πολυμέσων Comment[en_GB]=Media Player Controls Comment[es]=Controles del reproductor multimedia Comment[et]=Meediamängija juhtelemendid -Comment[eu]=Multimedia-jotzailearen kontrolak +Comment[eu]=Euskarri jotzaile kontrolak Comment[fi]=Mediasoittimen säätimet Comment[fr]=Contrôles du lecteur multimédia Comment[gl]=Controis do reprodutor multimedia diff --git a/applets/notifications/package/metadata.desktop b/applets/notifications/package/metadata.desktop index 998098f1f..3c427ee11 100644 --- a/applets/notifications/package/metadata.desktop +++ b/applets/notifications/package/metadata.desktop @@ -96,7 +96,7 @@ Comment[el]=Εμφανίζει ειδοποιήσεις και εργασίες Comment[en_GB]=Display notifications and jobs Comment[es]=Mostrar notificaciones y tareas Comment[et]=Märguannete ja tööde näitamine -Comment[eu]=Bistaratu jakinarazpenak eta lanak +Comment[eu]=Azaldu jakinarazpenak eta atazak Comment[fi]=Näyttää ilmoituksia ja töitä Comment[fr]=Affiche les notifications et les tâches Comment[ga]=Taispeáin fógraí agus jabanna diff --git a/applets/panelspacer/metadata.desktop b/applets/panelspacer/metadata.desktop index 4908e5047..9e7ea0765 100644 --- a/applets/panelspacer/metadata.desktop +++ b/applets/panelspacer/metadata.desktop @@ -13,7 +13,7 @@ Name[en_GB]=Panel Spacer Name[eo]=Spacigilo de Panelo Name[es]=Espaciador Name[et]=Paneeliruumi korraldaja -Name[eu]=Panel-bereizlea +Name[eu]=Paneleko bereizlea Name[fi]=Paneelivälilevy Name[fr]=Espaceur de tableau de bord Name[fy]=Paniel spaasje @@ -77,7 +77,7 @@ Comment[en_GB]=Reserve empty spaces within the panel. Comment[eo]=Rezervi malplenan spacon en la panelo. Comment[es]=Reservar espacios vacíos en el panel. Comment[et]=Tühja ruumi reserveerimine paneelil. -Comment[eu]=Erreserbatu panelaren barruko leku hutsak. +Comment[eu]=Gorde leku hutsak panel barruan. Comment[fi]=Varaa tyhjiä tiloja paneelin sisälle. Comment[fr]=Réserve des espaces vides dans le tableau de bord Comment[fy]=Romte yn paniel frijhâlde diff --git a/applets/systemmonitor/diskactivity/metadata.desktop b/applets/systemmonitor/diskactivity/metadata.desktop index b6bf1d82f..a3087e809 100644 --- a/applets/systemmonitor/diskactivity/metadata.desktop +++ b/applets/systemmonitor/diskactivity/metadata.desktop @@ -11,7 +11,7 @@ Name[el]=Επόπτης χρήσης του σκληρού δίσκου Name[en_GB]=Hard Disk I/O Monitor Name[es]=Monitor de E/S del disco duro Name[et]=Kõvaketta sisendi/väljundi jälgija -Name[eu]=Disko gogorreko S/I monitorea +Name[eu]=Disko zurrun S/I begiralea Name[fi]=Kiintolevyjen käyttöilmaisin Name[fr]=Surveillance des disques durs (E/S) Name[ga]=Monatóir I/A Diosca Crua @@ -63,7 +63,7 @@ Comment[el]=Μικροεφαρμογή που εποπτεύει τη ρυθμο Comment[en_GB]=An applet that monitors hard disk throughput and input/output Comment[es]=Una miniaplicación que monitoriza el rendimiento y la entrada/salida del disco duro Comment[et]=Kõvaketta läbilaset ja sisendit/väljundit jälgiv aplett -Comment[eu]=Disko gogorraren errendimendua eta sarrera/irteera kontrolatzen dituen miniaplikazio bat +Comment[eu]=Disko zurrunaren transferentzia tasa eraginkorra («throughput») eta sarrera/irteera gainbegiratzen dituen aplikaziotxo bat Comment[fi]=Tarkkailee levyjen suoritus­tehoa ja siirtomäärää Comment[fr]=Une applet surveillant l'activité des disques durs et de leurs entrées / sorties Comment[gl]=Un trebello que vixía o rendemento e a entrada e saída diff --git a/applets/systemmonitor/diskusage/metadata.desktop b/applets/systemmonitor/diskusage/metadata.desktop index 89b910ee6..d61d4829e 100644 --- a/applets/systemmonitor/diskusage/metadata.desktop +++ b/applets/systemmonitor/diskusage/metadata.desktop @@ -11,7 +11,7 @@ Name[el]=Χρήση χώρου σκληρού δίσκου Name[en_GB]=Hard Disk Space Usage Name[es]=Espacio usado en el disco duro Name[et]=Kõvaketta ruumikasutus -Name[eu]=Disko gogorreko lekuaren erabilera +Name[eu]=Disko zurruneko espazioaren erabilera Name[fi]=Kiintolevyjen tilankäyttö Name[fr]=Utilisation de l'espace des disques dur Name[gl]=Uso do espazo do disco duro @@ -62,7 +62,7 @@ Comment[el]=Μικροεφαρμογή που εποπτεύει την ποσο Comment[en_GB]=An applet that monitors hard disk space usage and percentage Comment[es]=Una miniaplicación que monitoriza el uso y porcentaje del espacio en disco duro Comment[et]=Kõvaketta ruumikasutust ja protsenti jälgiv aplett -Comment[eu]=Disko gogorreko lekuaren erabilera eta ehunekoa kontrolatzen dituen miniaplikazio bat +Comment[eu]=Disko zurruneko espazioaren erabilera eta ehunekoa gainbegiratzen dituen aplikaziotxo bat Comment[fi]=Näyttää levyjen tilan­käytön ja sen prosenttiosuuden Comment[fr]=Une applet surveillant l'utilisation de l'espace des disques durs et donnant des pourcentages Comment[gl]=Un trebello que vixía o espazo usado do disco duro e a porcentaxe diff --git a/applets/systemmonitor/memory/metadata.desktop b/applets/systemmonitor/memory/metadata.desktop index 24a41c59f..412e74acf 100644 --- a/applets/systemmonitor/memory/metadata.desktop +++ b/applets/systemmonitor/memory/metadata.desktop @@ -13,7 +13,7 @@ Name[en_GB]=Memory Status Name[eo]=Memora stato Name[es]=Estado de la memoria Name[et]=Mälu olek -Name[eu]=Memoria-egoera +Name[eu]=Memoria egoera Name[fi]=Muistin käyttö Name[fr]=État de la mémoire Name[ga]=Stádas Cuimhne @@ -76,7 +76,7 @@ Comment[en_GB]=A RAM usage monitor Comment[eo]=RAM uzada rigardilo Comment[es]=Monitor de uso de la RAM Comment[et]=RAM-i kasutuse jälgija -Comment[eu]=RAMaen erabileraren monitorea +Comment[eu]=RAM erabileraren begirale bat Comment[fi]=Näyttää muistin käytön Comment[fr]=Surveillance de l'usage de la mémoire vive Comment[fy]=In RAM brûkme monitor diff --git a/applets/systemmonitor/net/metadata.desktop b/applets/systemmonitor/net/metadata.desktop index 61eb7dac5..ffcb133ed 100644 --- a/applets/systemmonitor/net/metadata.desktop +++ b/applets/systemmonitor/net/metadata.desktop @@ -12,7 +12,7 @@ Name[el]=Επόπτης δικτύου Name[en_GB]=Network Monitor Name[es]=Monitor de red Name[et]=Võrgujälgija -Name[eu]=Sareko monitorea +Name[eu]=Sareko begiralea Name[fi]=Verkon käyttö Name[fr]=Surveillance du réseau Name[ga]=Monatóir an Líonra @@ -76,7 +76,7 @@ Comment[el]=Ένας επόπτης χρήσης του δικτύου Comment[en_GB]=A network usage monitor Comment[es]=Monitor de uso de la red Comment[et]=Võrgukasutuse jälgija -Comment[eu]=Sarearen erabileraren monitorea +Comment[eu]=Sare erabileraren begirale bat Comment[fi]=Näyttää verkon käytön Comment[fr]=Surveillance de l'usage réseau Comment[fy]=In netwurk brûkme monitor diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc index 651e2141c..aa116a074 100644 --- a/components/shellprivate/widgetexplorer/plasmoids.knsrc +++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc @@ -9,7 +9,7 @@ Name[de]=Plasma-Miniprogramme Name[el]=Γραφικά συστατικά Plasma Name[en_GB]=Plasma Widgets Name[es]=Elementos gráficos de Plasma -Name[eu]=Plasmaren trepetak +Name[eu]=Plasmako trepetak Name[fi]=Plasma-sovelmat Name[fr]=Composants graphiques Plasma Name[gl]=Trebellos de Plasma diff --git a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop index 1433dfb52..f78f200e9 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop +++ b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop @@ -80,7 +80,7 @@ Comment[en_GB]=The menu that normally shows on right-click Comment[eo]=La menuo videblas per dekstra musklako Comment[es]=El menú que se suele mostrar al hacer clic derecho Comment[et]=Tavaliselt hiire parema nupu klõpsuga avanev menüü -Comment[eu]=Eskuineko botoiaz klik eginda agertu ohi den menua +Comment[eu]=Eskuineko botoiarekin klik egitean agertu ohi den menua Comment[fi]=Valikko, joka tavallisesti näkyy hiiren kakkospainikkeella Comment[fr]=Le menu s'affichant normalement lors d'un clic droit Comment[fy]=It menu dat normaal mei rjochts klik ferskynt diff --git a/containmentactions/paste/plasma-containmentactions-paste.desktop b/containmentactions/paste/plasma-containmentactions-paste.desktop index 99dad397c..ee992a5ad 100644 --- a/containmentactions/paste/plasma-containmentactions-paste.desktop +++ b/containmentactions/paste/plasma-containmentactions-paste.desktop @@ -83,7 +83,7 @@ Comment[en_GB]=Creates a widget from the contents of the clipboard Comment[eo]=Krei fenestraĵon el la enhavo de la tondejo Comment[es]=Crea un elemento gráfico con los contenidos del portapapeles Comment[et]=Vidina loomine lõikepuhvri sisu põhjal -Comment[eu]=Trepeta bat sortzen du arbelaren edukiarekin +Comment[eu]=Trepeta bat sortzen du arbelaren edukitik Comment[fi]=Luo käyttöliittymäelementin leikepöydän sisällöstä Comment[fr]=Crée un composant graphique à partir du contenu du presse-papier Comment[fy]=Makket in widget fan de ynhâld fan in klamboerd diff --git a/menu/desktop/kf5-games-arcade.directory b/menu/desktop/kf5-games-arcade.directory index 04f9f74ce..5e3dff23b 100644 --- a/menu/desktop/kf5-games-arcade.directory +++ b/menu/desktop/kf5-games-arcade.directory @@ -22,7 +22,7 @@ Name[en_GB]=Arcade Name[eo]=Arkado Name[es]=Arcade Name[et]=Võitlusmängud -Name[eu]=Arkade-jokoak +Name[eu]=Arkupe Name[fa]=گذرگاه تاقدار Name[fi]=Pelihallipelit Name[fr]=Jeux d'arcade diff --git a/menu/desktop/kf5-unknown.directory b/menu/desktop/kf5-unknown.directory index 07328daec..87c8e5f8d 100644 --- a/menu/desktop/kf5-unknown.directory +++ b/menu/desktop/kf5-unknown.directory @@ -23,7 +23,7 @@ Name[en_GB]=Lost & Found Name[eo]=Perditaj kaj trovitaj Name[es]=Objetos perdidos Name[et]=Tundmatud -Name[eu]=Galdua & Aurkitua +Name[eu]=Galdutako gauzak Name[fa]=گم‌شده و یافته‌شده Name[fi]=Sekalaiset Name[fr]=Objets trouvés From a4c1331817648fb4ad1950347dcdcf698256f62b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 Nov 2019 09:12:50 +0100 Subject: [PATCH 2/3] 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" --- dataengines/weather/plasma-dataengine-weather.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataengines/weather/plasma-dataengine-weather.desktop b/dataengines/weather/plasma-dataengine-weather.desktop index 634eaeb8b..449ee8d0a 100644 --- a/dataengines/weather/plasma-dataengine-weather.desktop +++ b/dataengines/weather/plasma-dataengine-weather.desktop @@ -93,7 +93,7 @@ Comment[fi]=Säätietoja useasta lähteestä Comment[fr]=Données météorologiques depuis des sources multiples en ligne Comment[fy]=Waar gegevens fan ferskate ynternetboarnen Comment[ga]=Sonraí aimsire ó fhoinsí éagsúla ar líne -Comment[gl]=Información meteorolóxica de varias fontes en internet +Comment[gl]=Información meteorolóxica de varias fontes en Internet Comment[he]=מידע על מזג האוויר ממגוון מקורות מקוונים Comment[hi]=मोसम जानकारी अनेक ऑनलाईन स्रोतों से Comment[hr]=Podaci o vremenu iz raznih online izvora From 0ebdf83a2f9efd96b0c0a50dcd84aec5fb1ff3b2 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 5 Nov 2019 13:23:37 +0100 Subject: [PATCH 3/3] Make env in plasma-sourceenv.sh call portable Summary: This failed for me on FreeBSD where env doesn't support -0. Fall back to genv which does. Reviewers: fvogt, adridg, apol Reviewed By: fvogt, apol Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D25124 --- startkde/plasma-sourceenv.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/startkde/plasma-sourceenv.sh b/startkde/plasma-sourceenv.sh index b8a50aa0d..4a00f15f4 100644 --- a/startkde/plasma-sourceenv.sh +++ b/startkde/plasma-sourceenv.sh @@ -3,4 +3,5 @@ do . $i >/dev/null done -env -0 +# env may not support -0, fall back to GNU env +env -0 2>/dev/null || genv -0