From c1783bce057041786efa068652348d472d6a5f18 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Fri, 18 Oct 2019 13:17:58 +0100 Subject: [PATCH 01/13] add includes needed for compiling with qt 5.13 --- dataengines/geolocation/location_ip.cpp | 1 + runners/windows/windowsrunner.cpp | 2 ++ runners/windows/windowsrunner.h | 1 + shell/shellcorona.cpp | 1 + 4 files changed, 5 insertions(+) diff --git a/dataengines/geolocation/location_ip.cpp b/dataengines/geolocation/location_ip.cpp index e3abd36be..4a815ddf6 100644 --- a/dataengines/geolocation/location_ip.cpp +++ b/dataengines/geolocation/location_ip.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include diff --git a/runners/windows/windowsrunner.cpp b/runners/windows/windowsrunner.cpp index 4075a292a..412089599 100644 --- a/runners/windows/windowsrunner.cpp +++ b/runners/windows/windowsrunner.cpp @@ -22,6 +22,8 @@ #include +#include +#include #include #include #include diff --git a/runners/windows/windowsrunner.h b/runners/windows/windowsrunner.h index 016b7c40f..2848d6dbf 100644 --- a/runners/windows/windowsrunner.h +++ b/runners/windows/windowsrunner.h @@ -21,6 +21,7 @@ #include +#include class KWindowInfo; class WindowsRunner : public Plasma::AbstractRunner diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp index 03101d828..fa5913e3f 100644 --- a/shell/shellcorona.cpp +++ b/shell/shellcorona.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include From 3db2f66cd0fff70458b1f89556467d1efd6e92e3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 23 Oct 2019 09:29:45 +0200 Subject: [PATCH 02/13] 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" --- runners/solid/plasma-runner-solid.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runners/solid/plasma-runner-solid.desktop b/runners/solid/plasma-runner-solid.desktop index da33e7d8e..e26acf090 100644 --- a/runners/solid/plasma-runner-solid.desktop +++ b/runners/solid/plasma-runner-solid.desktop @@ -94,7 +94,7 @@ Comment[he]=משמש לניהול התקנים נשלפים Comment[hr]=Upravlja uklonjivim uređajima Comment[hu]=Cserélhető eszközök kezelése Comment[ia]=Gere dispositivos removibile -Comment[id]=Kelola perangkat dapat dilepas +Comment[id]=Kelola perangkat dapat-dilepas Comment[is]=Sýsla með fjarlægjanleg tæki Comment[it]=Gestisce i dispositivi rimovibili Comment[ja]=リムーバブルデバイスを管理します From 12e5e9f82d8c3e5ae242a53cc3171db6adc6aff7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 24 Oct 2019 09:39:56 +0200 Subject: [PATCH 03/13] 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/systemmonitor/diskactivity/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applets/systemmonitor/diskactivity/metadata.desktop b/applets/systemmonitor/diskactivity/metadata.desktop index c494acfbc..3eeb992dc 100644 --- a/applets/systemmonitor/diskactivity/metadata.desktop +++ b/applets/systemmonitor/diskactivity/metadata.desktop @@ -70,7 +70,7 @@ Comment[gl]=Un trebello que vixía o rendemento e a entrada e saída Comment[he]=ישומון למעקב אחר מהירות הכתיבה והקריאה בכונן Comment[hu]=Egy kisalkalmazás, amely figyeli a merevlemez átvitelét és a bemenetet/kimenetet Comment[ia]=Un applet que que monitora le prestation (throughput) e ingresso/egresso de disco dur -Comment[id]=Sebuah applet yang memantau lalu-lalang dan intput/output hard disk +Comment[id]=Sebuah applet yang memantau lalu-lalang dan input/output hard disk Comment[is]=Smáforrit sem fylgist með afköstum harðra diska og ílagi/frálagi Comment[it]=Un'applet che controlla le prestazioni e l'uso del disco fisso Comment[ja]=ハードディスクのスループットと入力/出力を監視するアプレット From f566873049a98551449dc75222497d70ad13e0c6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 2 Nov 2019 10:03:53 +0100 Subject: [PATCH 04/13] 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 f0545c530..49ae6050c 100644 --- a/applets/analog-clock/metadata.desktop +++ b/applets/analog-clock/metadata.desktop @@ -97,7 +97,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 899cfa06f..48289cfb6 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 748851e61..64bd465b0 100644 --- a/applets/devicenotifier/package/metadata.desktop +++ b/applets/devicenotifier/package/metadata.desktop @@ -91,7 +91,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 4b1a8c0f6..431c728cf 100644 --- a/applets/digital-clock/package/metadata.desktop +++ b/applets/digital-clock/package/metadata.desktop @@ -97,7 +97,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 71664258c..0de7966f3 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 @@ -97,7 +97,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 @@ -165,7 +165,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 24410b2ef..ab0c6fc96 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 4897beac7..113af3f9a 100644 --- a/applets/notifications/package/metadata.desktop +++ b/applets/notifications/package/metadata.desktop @@ -97,7 +97,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 75f466218..2adf374d9 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 @@ -78,7 +78,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 3eeb992dc..e9c4f6c00 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 7ebffeea7..8d174418c 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 5cd75e5f9..8d3d9309f 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 @@ -77,7 +77,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 8a55d00c5..e66460f8c 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 @@ -77,7 +77,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 2e22a3cab..33f717619 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 0995a7ae5..371662d0f 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop +++ b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop @@ -81,7 +81,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 4c3356b15..8b492e417 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 dda5673af..deeaa0096 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 6b123d6fe..ac5e69b08 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 c754e51b762f565e843e8640000d9c0935f650ee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 4 Nov 2019 09:41:23 +0100 Subject: [PATCH 05/13] 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 8421ed754..89e9d6bbd 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 ad18e1e8dda013be6ed66bb62f26d700f688d956 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Nov 2019 09:31:00 +0100 Subject: [PATCH 06/13] 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/executable/plasma-dataengine-executable.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataengines/executable/plasma-dataengine-executable.desktop b/dataengines/executable/plasma-dataengine-executable.desktop index e1463099e..cb8921009 100644 --- a/dataengines/executable/plasma-dataengine-executable.desktop +++ b/dataengines/executable/plasma-dataengine-executable.desktop @@ -100,7 +100,7 @@ Comment[hne]=चलाय वाले डाटा इंजन चलाव Comment[hr]=Pokreni izvršive podatkovne mehanizme Comment[hu]=Adatkezelő futtatása Comment[ia]=Motor per exequer datos executabile -Comment[id]=Jalankan Mesin Data Yang Dapat-dilaksanakan +Comment[id]=Jalankan Mesin Data Yang Dapat Dieksekusi Comment[is]=Gagnavél fyrir keyrslu forrita Comment[it]=Motore di dati per esecuzione di comandi Comment[ja]=コマンド実行のデータエンジン From eecef65e5eaf93be8e1bbc049277862a8af452c6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 Dec 2019 09:27:16 +0100 Subject: [PATCH 07/13] 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/panelspacer/metadata.desktop | 2 +- dataengines/mouse/plasma-dataengine-mouse.desktop | 2 +- runners/kill/plasma-runner-kill.desktop | 2 +- runners/windowedwidgets/plasma-runner-windowedwidgets.desktop | 4 ++-- runners/windows/plasma-runner-windows.desktop | 2 +- .../lookandfeel/plasma-packagestructure-lookandfeel.desktop | 1 - templates/ion-dataengine/ion-dataengine.kdevtemplate | 4 ++-- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/applets/panelspacer/metadata.desktop b/applets/panelspacer/metadata.desktop index 2adf374d9..ea8304a16 100644 --- a/applets/panelspacer/metadata.desktop +++ b/applets/panelspacer/metadata.desktop @@ -23,7 +23,7 @@ Name[he]=מרווח לוח Name[hr]=Razmak na traci Name[hu]=Panelelválasztó Name[ia]=Spatiator de pannello -Name[id]=Peruang Panel +Name[id]=Panel Spacer Name[is]=Spjaldabil Name[it]=Spaziatore del pannello Name[ja]=パネルのスペーサー diff --git a/dataengines/mouse/plasma-dataengine-mouse.desktop b/dataengines/mouse/plasma-dataengine-mouse.desktop index 4ff2a25ae..cea697d24 100644 --- a/dataengines/mouse/plasma-dataengine-mouse.desktop +++ b/dataengines/mouse/plasma-dataengine-mouse.desktop @@ -27,7 +27,7 @@ Name[hne]=पाइन्टर स्थिति Name[hr]=Pozicija pokazivača miša Name[hu]=Egérpozíció Name[ia]=Position de punctator -Name[id]=Posisi Penunjuk +Name[id]=Posisi Pointer Name[is]=Staðsetning bendils Name[it]=Posizione del puntatore Name[ja]=マウスポインタの位置 diff --git a/runners/kill/plasma-runner-kill.desktop b/runners/kill/plasma-runner-kill.desktop index 022d8e9c1..806ee8179 100644 --- a/runners/kill/plasma-runner-kill.desktop +++ b/runners/kill/plasma-runner-kill.desktop @@ -92,7 +92,7 @@ Comment[he]=עצירת יישומים הפועלים כעת Comment[hr]=Zaustavi aplikacije koje su trenutno pokrenute Comment[hu]=Jelenleg futó alkalmazások leállítása Comment[ia]=Stoppa applicationes que il es currentemente executante -Comment[id]=Stop aplikasi yang saat ini tengah berjalan +Comment[id]=Menghentikan aplikasi yang saat ini tengah berjalan Comment[is]=Stöðva forrit sem eru keyrandi Comment[it]=Ferma le applicazioni attualmente in esecuzione Comment[ja]=実行中のアプリケーションを停止します diff --git a/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop b/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop index e2a531b19..486dae7a4 100644 --- a/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop +++ b/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop @@ -22,7 +22,7 @@ Name[hi]=विंडोज़ विडजेट Name[hr]=Widgeti u prozorima Name[hu]=Önálló widgetek Name[ia]=Widgets (elemento graphic) in le fenestra -Name[id]=Widget per-window-an +Name[id]=Windowed widgets Name[is]=Græjur í gluggum Name[it]=Oggetti a finestra Name[ja]=ウィンドウ化されたウィジェット @@ -83,7 +83,7 @@ Comment[he]=משמש למציאת ווידג׳טים של Plasma אשר ניתן Comment[hr]=Pronađi Plasma widgete koji se mogu pokrenuti kao zasebni prozori Comment[hu]=Megkeresi az önálló alkalmazásként futtatható Plasma-elemeket Comment[ia]=Trova widgets (elementos graphic) de plasma que on pote executar como fenestras sole -Comment[id]=Temukan widget Plasma yang dapat dijalankan sebagai window-window mandiri +Comment[id]=Temukan widget Plasma yang bisa berjalan sebagai window mandiri Comment[is]=Finnur Plasmagræjur sem hægt er að keyra sem sjálfstæð forrit Comment[it]=Trova i plasmoidi che possono essere eseguiti come finestre a sé Comment[ja]=スタンドアローンのウィンドウとして起動できる Plasma ウィジェットを検索します diff --git a/runners/windows/plasma-runner-windows.desktop b/runners/windows/plasma-runner-windows.desktop index 94435fc72..d1bf0f20e 100644 --- a/runners/windows/plasma-runner-windows.desktop +++ b/runners/windows/plasma-runner-windows.desktop @@ -29,7 +29,7 @@ Name[hi]=विंडोज़ Name[hr]=Prozori Name[hu]=Ablakok Name[ia]=Fenestras -Name[id]=Window +Name[id]=Windows Name[is]=Gluggar Name[it]=Finestre Name[ja]=ウィンドウ diff --git a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop index 82faf4a77..3d5e41d7c 100644 --- a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop +++ b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop @@ -19,7 +19,6 @@ Name[gl]=Aparencia e comportamento Name[he]=מראה ותחושה Name[hu]=Megjelenés Name[ia]=Semblantia -Name[id]=Nuansa dan Suasana Name[is]=Útlit og viðmót Name[it]=Aspetto Name[ja]=外観 diff --git a/templates/ion-dataengine/ion-dataengine.kdevtemplate b/templates/ion-dataengine/ion-dataengine.kdevtemplate index e7d810c74..22cac095e 100644 --- a/templates/ion-dataengine/ion-dataengine.kdevtemplate +++ b/templates/ion-dataengine/ion-dataengine.kdevtemplate @@ -15,7 +15,7 @@ Name[fi]=Plasma Weather Ion -tietomoottori Name[fr]=Moteur de données météo Plasma Ion Name[gl]=Motor de datos de Ion Weather para Plasma Name[hu]=Plasma Weather Ion adatmodul -Name[id]=MesinData Ion Cuaca Plasma +Name[id]=Plasma Weather Ion Dataengine Name[it]=Motore Ion di Plasma Weather Name[ko]=Plasma 날씨 Ion 데이터 엔진 Name[nl]=Plasma gegevensengine voor weersvoorspelling @@ -51,7 +51,7 @@ Comment[fi]=Plasma Weather -tietomoottorin erityinen Plasma-alitietomoottori, jo Comment[fr]=Un sous-moteur de données Plasma spécial pour le moteur de données météo Plasma, permettant l'accès à un fournisseur de service de données météorologiques Comment[gl]=Un motor de datos subordinado especial de Plasma para o motor de datos de meteorolóxicos de Plasma, que fornece acceso a un fornecedor de servizo de datos meteorolóxicos. Comment[hu]=Speciális Plasma al-adatmodul a Plasma Weather adatmodulhoz, amely hozzáférést biztosít egy időjárásadat-szolgáltatóhoz -Comment[id]=Sebuah sub-dataengine Plasma spesial untuk mesin-data Plasma Weather, menyediakan akses ke satu penyedia layanan data cuaca +Comment[id]=Sebuah sub-dataengine Plasma spesial untuk mesin-data Plasma Weather, menyediakan akses ke salahsatu penyedia layanan data cuaca Comment[it]=Uno speciale sotto-motore per il motore di dati Plasma Weather, che fornisce l'accesso a un provider di servizi dati meteo Comment[ko]=Plasma 날씨 데이터 엔진에 사용하는 Plasma 하위 데이터 엔진으로 하나의 데이터 서비스 공급자에게 접근할 수 있도록 함 Comment[nl]=Een speciale Plasma sub-dataengine voor de Plasma weer-dataengine, die toegang biedt tot een serviceprovider van weergegevens From 11ab07cd0f400c2467f99c14746fb13a264c0efd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 12 Dec 2019 09:59:48 +0100 Subject: [PATCH 08/13] 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" --- .../lookandfeel/plasma-packagestructure-lookandfeel.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop index 3d5e41d7c..be7c89fe2 100644 --- a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop +++ b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop @@ -19,6 +19,7 @@ Name[gl]=Aparencia e comportamento Name[he]=מראה ותחושה Name[hu]=Megjelenés Name[ia]=Semblantia +Name[id]=Look and Feel Name[is]=Útlit og viðmót Name[it]=Aspetto Name[ja]=外観 From 893d14d4ef0802b695bc20864eb0ea556c64b407 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 Jan 2020 10:48:10 +0100 Subject: [PATCH 09/13] 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" --- soliduiserver/soliduiserver.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soliduiserver/soliduiserver.desktop b/soliduiserver/soliduiserver.desktop index 04d642636..0a6b0c298 100644 --- a/soliduiserver/soliduiserver.desktop +++ b/soliduiserver/soliduiserver.desktop @@ -20,7 +20,7 @@ Name[et]=Riistvara tuvastamine Name[eu]=Hardware-detekzioa Name[fi]=Laitteiston tunnistus Name[fr]=Détection du matériel -Name[gl]=Detección do hardware +Name[gl]=Detección de soporte físico Name[he]=זיהוי חומרה Name[hu]=Hardverfelismerés Name[ia]=Relevamento de Hardware @@ -66,7 +66,7 @@ Comment[et]=Riistvarasündmuste kasutajaliides Comment[eu]=Hardware gertakarientzako erabiltzaile interfaze bat hornitzen du Comment[fi]=Tarjoaa käyttöliittymän laitteistotapahtumille Comment[fr]=Fournit une interface utilisateur pour les évènements matériels -Comment[gl]=Fornece unha interface de usuario para os eventos do hardware +Comment[gl]=Fornece unha interface de usuario para os eventos de soporte físico Comment[he]=מספק ממשק משתמש לארועי חומרה Comment[hu]=Felhasználói felületet biztosít a hardvereseményekhez Comment[ia]=Il forni un interface de usator pro eventos hardware From a5204bf369a9ae3ba63f77c66791cef9ee1913f8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 Jan 2020 10:18:25 +0100 Subject: [PATCH 10/13] 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/activitybar/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applets/activitybar/metadata.desktop b/applets/activitybar/metadata.desktop index 7595f8ca0..1f89b9e4b 100644 --- a/applets/activitybar/metadata.desktop +++ b/applets/activitybar/metadata.desktop @@ -91,7 +91,7 @@ Comment[fi]=Välilehtipalkki aktiviteettien vaihtamiseen Comment[fr]=Barre d'onglets permettant de changer d'activité Comment[fy]=Ljepper om tusken aktiviteiten te wikseljen Comment[ga]=Barra na gcluaisíní chun an ghníomhaíocht a mhalartú -Comment[gl]=Barra de lapelas para cambiar entre actividades +Comment[gl]=Barra de separadores para cambiar entre actividades Comment[gu]=ક્રિયાઓ બદલવા માટે ટેબ પટ્ટી Comment[he]=סרגל לשוניות למעבר בין פעילויות Comment[hi]=क्रिया स्विच करने के लिए टैबपट्टी From 19dc346f06b3cca0757b22c01916b68be09fe5aa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 19 Jan 2020 09:55:26 +0100 Subject: [PATCH 11/13] 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" --- plasma.desktop.cmake | 2 +- plasmawayland.desktop.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plasma.desktop.cmake b/plasma.desktop.cmake index bf155f411..7510a3ab8 100644 --- a/plasma.desktop.cmake +++ b/plasma.desktop.cmake @@ -24,7 +24,7 @@ Name[hu]=Plasma Name[id]=Plasma Name[is]=Plasma Name[it]=Plasma -Name[ja]=プラズマ +Name[ja]=Plasma Name[ko]=Plasma Name[lt]=Plasma Name[nb]=Plasma diff --git a/plasmawayland.desktop.cmake b/plasmawayland.desktop.cmake index 5d7db3060..21d8dd74c 100644 --- a/plasmawayland.desktop.cmake +++ b/plasmawayland.desktop.cmake @@ -23,7 +23,7 @@ Name[hu]=Plasma Name[id]=Plasma Name[is]=Plasma Name[it]=Plasma -Name[ja]=プラズマ +Name[ja]=Plasma Name[ko]=Plasma Name[lt]=Plasma Name[nb]=Plasma From 9d18ac6b97cc1031798b14d00e71f82045b680e3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 29 Jan 2020 09:58:06 +0100 Subject: [PATCH 12/13] 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" --- appmenu/appmenu.desktop | 2 +- .../plasma-containmentactions-switchdesktop.desktop | 4 ++-- runners/windows/plasma-runner-windows.desktop | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appmenu/appmenu.desktop b/appmenu/appmenu.desktop index 518f5785f..d05ec2470 100644 --- a/appmenu/appmenu.desktop +++ b/appmenu/appmenu.desktop @@ -73,7 +73,7 @@ Comment[is]=Miðlar forritavalmyndum á skjáborðið Comment[it]=Trasferisce al desktop i menu delle applicazioni Comment[ja]=アプリケーションメニューをデスクトップに転送します Comment[kk]=Қолданбаның мәзірін үстел бетіне тапсыру -Comment[ko]=프로그램 메뉴를 데스크톱으로 보내기 +Comment[ko]=프로그램 메뉴를 바탕 화면으로 보내기 Comment[lt]=Perkelia programos meniu į darbalaukį Comment[mr]=अनुप्रयोग मेन्यूचे डेस्कटॉपवर स्थानान्तरण Comment[nb]=Overfører programmets meny til skrivebordet diff --git a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop index 320c00e9a..4906c9b1b 100644 --- a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop +++ b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop @@ -33,7 +33,7 @@ Name[ja]=デスクトップを切り替え Name[kk]=Жұмыс үстелді ауыстыру Name[km]=ប្ដូរ​ផ្ទៃតុ Name[kn]=ಗಣಕತೆರೆಯನ್ನು ಬದಲಾಯಿಸು -Name[ko]=데스크톱 전환 +Name[ko]=바탕 화면 전환 Name[lt]=Pakeisti darbalaukį Name[lv]=Pārslēgt darbvirsmu Name[mk]=Смени раб. површина @@ -100,7 +100,7 @@ Comment[ja]=他の仮想デスクトップに切り替えます Comment[kk]=Басқа виртуалды үстелге ауысу Comment[km]=ប្ដូរ​ទៅ​ផ្ទៃតុ​និម្មិត​ផ្សេង​ទៀត Comment[kn]=ಮತ್ತೊಂದು ವಾಸ್ತವಪ್ರಾಯ ಗಣಕತೆರೆಗೆ ಬದಲಾಯಿಸು -Comment[ko]=다른 가상 데스크톱으로 전환합니다 +Comment[ko]=다른 가상 바탕 화면으로 전환합니다 Comment[lt]=Pereiti į kitą virtualų darbalaukį Comment[lv]=Pārslēgties uz citu virtuālo darbvirsmu Comment[mk]=Менување на друга виртуелна раб. површина diff --git a/runners/windows/plasma-runner-windows.desktop b/runners/windows/plasma-runner-windows.desktop index d1bf0f20e..0b9627ac4 100644 --- a/runners/windows/plasma-runner-windows.desktop +++ b/runners/windows/plasma-runner-windows.desktop @@ -100,7 +100,7 @@ Comment[ja]=ウィンドウとデスクトップの一覧表示と切り替え Comment[kk]=Бар терезе мен үстелдерді ұсынып оларға ауысу Comment[km]=រាយ​​បង្អួច និង​ផ្ទៃតុ​ ហើយ​ប្ដូរ​ពួកវា Comment[kn]=ವಿಂಡೊ ಹಾಗು ಗಣಕತೆರೆಗಳನ್ನು ಪಟ್ಟಿಮಾಡು ಹಾಗು ಅವುಗಳನ್ನು ಬದಲಾಯಿಸು -Comment[ko]=창 및 데스크톱 목록을 보여 주고 전환합니다 +Comment[ko]=창 및 바탕 화면 목록을 보여 주고 전환합니다 Comment[lt]=Išvardija langus ir darbalaukius su galimybe į juos pereiti Comment[lv]=Parāda logus un darbvirsmas un pārslēdz tos Comment[mk]=Приказ на прозорци и раб. површини и преминување меѓу нив From 7eaf278a7de60d55a2c61909fdfc93f4e551bf64 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Thu, 30 Jan 2020 10:43:36 +0100 Subject: [PATCH 13/13] Port plasma-workspace to autoconfig.kde.org As per Ben's request in https://mail.kde.org/pipermail/kde-frameworks-devel/2020-January/102543.html Differential Revision: https://phabricator.kde.org/D27021 --- components/shellprivate/widgetexplorer/plasmoids.knsrc | 2 +- wallpapers/image/wallpaper.knsrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc index 33f717619..79e2c9252 100644 --- a/components/shellprivate/widgetexplorer/plasmoids.knsrc +++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc @@ -39,7 +39,7 @@ Name[x-test]=xxPlasma Widgetsxx Name[zh_CN]=Plasma 部件 Name[zh_TW]=Plasma 元件 -ProvidersUrl=https://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Plasma 5 Plasmoid StandardResource=tmp InstallationCommand=kpackagetool5 --install %f --type Plasma/Applet diff --git a/wallpapers/image/wallpaper.knsrc b/wallpapers/image/wallpaper.knsrc index 5d8061a2e..39c843baa 100644 --- a/wallpapers/image/wallpaper.knsrc +++ b/wallpapers/image/wallpaper.knsrc @@ -38,7 +38,7 @@ Name[x-test]=xxWallpapersxx Name[zh_CN]=壁纸 Name[zh_TW]=桌布 -ProvidersUrl=https://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=KDE Wallpaper 800x600,KDE Wallpaper 1024x768,KDE Wallpaper 1280x1024,KDE Wallpaper 1440x900,KDE Wallpaper 1600x1200,KDE Wallpaper (other) StandardResource=wallpaper Uncompress=archive