From d1385ff985ca8ab969b3bcb71d8676c14f86068a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 16 Jun 2020 08:17:54 +0200 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/systemmonitor/coreusage/metadata.desktop | 2 ++ applets/systemmonitor/cpu/metadata.desktop | 2 ++ applets/systemmonitor/diskactivity/metadata.desktop | 1 + applets/systemmonitor/diskusage/metadata.desktop | 2 ++ applets/systemmonitor/memory/metadata.desktop | 2 ++ applets/systemmonitor/net/metadata.desktop | 2 ++ applets/systemmonitor/systemmonitor/package/metadata.desktop | 2 ++ 7 files changed, 13 insertions(+) diff --git a/applets/systemmonitor/coreusage/metadata.desktop b/applets/systemmonitor/coreusage/metadata.desktop index 98761cb5c..eb1687924 100644 --- a/applets/systemmonitor/coreusage/metadata.desktop +++ b/applets/systemmonitor/coreusage/metadata.desktop @@ -7,6 +7,7 @@ Name[et]=Iga tuuma kasutus Name[eu]=Nukleoen banakako erabilera Name[fr]=Utilisation de chaque coeur Name[it]=Utilizzo del singolo core +Name[ko]=개별 코어 사용량 Name[nl]=Individueel gebruik van kernen Name[nn]=Einskildkjerne-bruk Name[pt]=Carga dos Núcleos Individuais @@ -25,6 +26,7 @@ Comment[et]=Süsteemi jälgija vidin, mis näitab iga protsessorituuma kasutust Comment[eu]=PUZeko nukleoen banakako erabilera erakusten duen sistema gainbegiratzeko trepeta Comment[fr]=Composant graphique de surveillance du système, affichant l'utilisation de chaque coeur du processeur Comment[it]=Oggetto di monitoraggio del sistema che mostra l'utilizzo dei singoli core del processore +Comment[ko]=개별 CPU 코어 사용량을 표시하는 시스템 모니터 위젯 Comment[nl]=Systeemmonitorwidget die gebruik toont van individuele CPU-kernen Comment[nn]=Systemovervakings­element som viser av einskilde prosessorkjernar Comment[pt]=Elemento de monitorização do sistema que mostra a carga individual de cada núcleo do CPU diff --git a/applets/systemmonitor/cpu/metadata.desktop b/applets/systemmonitor/cpu/metadata.desktop index 894cd044f..a131406e6 100644 --- a/applets/systemmonitor/cpu/metadata.desktop +++ b/applets/systemmonitor/cpu/metadata.desktop @@ -8,6 +8,7 @@ Name[et]=Protsessori kogukasutus Name[eu]=PUZ erabileraren guztizkoa Name[fr]=Utilisation globale du processeur Name[it]=Utilizzo totale CPU +Name[ko]=총 CPU 사용량 Name[nl]=Totaal CPU-gebruik Name[nn]=Total prosessorlast Name[pt]=Carga Total do CPU @@ -26,6 +27,7 @@ Comment[et]=Süsteemi jälgija vidin, mis näitab protsessori kogukasutust Comment[eu]=PUZ erabileraren guztizkoa erakusten duen sistema gainbegiratzeko trepeta Comment[fr]=Composant graphique de surveillance du système, affichant l'utilisation globale du processeur Comment[it]=Oggetto di monitoraggio del sistema che mostra l'utilizzo totale del processo +Comment[ko]=총 CPU 사용량을 표시하는 시스템 모니터 위젯 Comment[nl]=Systeemmonitorwidget die het totale gebruik toont de CPU toont Comment[nn]=Systemovervakings­element som viser total prosessorlast Comment[pt]=Elemento de monitorização do sistema que mostra a carga total do CPU diff --git a/applets/systemmonitor/diskactivity/metadata.desktop b/applets/systemmonitor/diskactivity/metadata.desktop index 31d1ecbf2..37c6b9adb 100644 --- a/applets/systemmonitor/diskactivity/metadata.desktop +++ b/applets/systemmonitor/diskactivity/metadata.desktop @@ -9,6 +9,7 @@ Name[eu]=Disko zurruneko jarduera Name[fr]=Activité des disques durs Name[ia]=Activitate del disco dur Name[it]=Attività disco fisso +Name[ko]=하드디스크 활동 Name[nl]=Activiteit van de vaste schijf Name[nn]=Harddiskaktivitet Name[pt]=Actividade do Disco Rígido diff --git a/applets/systemmonitor/diskusage/metadata.desktop b/applets/systemmonitor/diskusage/metadata.desktop index 11fff0d9c..14d109731 100644 --- a/applets/systemmonitor/diskusage/metadata.desktop +++ b/applets/systemmonitor/diskusage/metadata.desktop @@ -9,6 +9,7 @@ Name[eu]=Diskoaren erabilera Name[fr]=Utilisation des disques Name[ia]=Uso de disco Name[it]=Utilizzo disco +Name[ko]=디스크 사용량 Name[nl]=Schijfgebruik Name[nn]=Diskbruk Name[pt]=Utilização do Disco @@ -27,6 +28,7 @@ Comment[et]=Süsteemi jälgija vidin, mis näitab juurpartitsiooni kasutust Comment[eu]=Erro partizioko erabilera erakusten duen sistema gainbegiratzeko trepeta Comment[fr]=Composant graphique de surveillance du système, affichant l'utilisation de la partition « Système » Comment[it]=Oggetto di monitoraggio del sistema che mostra l'utilizzo della partizione radice +Comment[ko]=루트 파티션 사용량을 표시하는 시스템 모니터 위젯 Comment[nl]=Systeemmonitorwidget die het totale gebruik toont van de root-partitie Comment[nn]=Systemovervakings­element som viser bruk av rotpartisjonen Comment[pt]=Elemento de monitorização do sistema que mostra a utilização da partição de raiz diff --git a/applets/systemmonitor/memory/metadata.desktop b/applets/systemmonitor/memory/metadata.desktop index c4870b99c..539dcda8c 100644 --- a/applets/systemmonitor/memory/metadata.desktop +++ b/applets/systemmonitor/memory/metadata.desktop @@ -9,6 +9,7 @@ Name[eu]=Memoria erabilera Name[fr]=Utilisation de la mémoire Name[ia]=Uso de Memoria Name[it]=Utilizzo memoria +Name[ko]=메모리 사용량 Name[nl]=Geheugengebruik Name[nn]=Minnebruk Name[pt]=Utilização da Memória @@ -27,6 +28,7 @@ Comment[et]=Süsteemi jälgija vidin, mis näitab füüsilise mälu kasutust Comment[eu]=Memoria fisikoaren erabilera erakusten duen sistema gainbegiratzeko trepeta Comment[fr]=Composant graphique de surveillance du système, affichant l'utilisation de la mémoire physique Comment[it]=Oggetto di monitoraggio del sistema che mostra l'utilizzo della memoria fisica +Comment[ko]=물리적 메모리 사용량을 표시하는 시스템 모니터 위젯 Comment[nl]=Systeemmonitorwidget die het gebruik van fysiek geheugen toont Comment[nn]=Systemovervakings­element som viser bruk av fysisk minne Comment[pt]=Elemento de monitorização do sistema que mostra a utilização da memória física diff --git a/applets/systemmonitor/net/metadata.desktop b/applets/systemmonitor/net/metadata.desktop index 881dcf2ad..ba1c5ca41 100644 --- a/applets/systemmonitor/net/metadata.desktop +++ b/applets/systemmonitor/net/metadata.desktop @@ -9,6 +9,7 @@ Name[eu]=Sareko abiadura Name[fr]=Débit du réseau Name[ia]=Velocitate de Rete Name[it]=Velocità di rete +Name[ko]=네트워크 속도 Name[nl]=Netwerksnelheid Name[nn]=Nettverksfart Name[pt]=Velocidade da rede @@ -27,6 +28,7 @@ Comment[et]=Süsteemi jälgija vidin, mis näitab alla- ja üleslaadimise kiirus Comment[eu]=Zama-jaisteko eta -igotzeko datuen emaria erakusten duen sistema gainbegiratzeko trepeta Comment[fr]=Composant graphique de surveillance du système, affichant le débit de transfert montant /descendant de données Comment[it]=Oggetto di monitoraggio del sistema che mostra la velocità di trasferimento e ricezione dei dati +Comment[ko]=데이터 다운로드 및 업로드 전송률을 표시하는 시스템 모니터 위젯 Comment[nl]=Systeemmonitorwidget die gegevenssnelheid van down- en uploaden toont Comment[nn]=Systemovervakings­element som viser ned- og opplastingsratar Comment[pt]=Elemento de monitorização do sistema que mostra a taxa de dados recebidos e enviados diff --git a/applets/systemmonitor/systemmonitor/package/metadata.desktop b/applets/systemmonitor/systemmonitor/package/metadata.desktop index 186f0bce6..1169d136f 100644 --- a/applets/systemmonitor/systemmonitor/package/metadata.desktop +++ b/applets/systemmonitor/systemmonitor/package/metadata.desktop @@ -10,6 +10,7 @@ Name[eu]=Sistema gainbegiratzeko sentsorea Name[fr]=Senseur de surveillance du système Name[ia]=Sensor de Monitor de systema Name[it]=Sensore Monitor di sistema +Name[ko]=시스템 모니터 센서 Name[nl]=Systeemmonitorsensor Name[nn]=Systemovervakingssensor Name[pt]=Sensor de monitorização do sistema @@ -28,6 +29,7 @@ Comment[et]=Süsteemi jälgija sensori seadistatava diagrammi näitamine Comment[eu]=Sistema gainbegiratzeko sentsore baten diagrama konfiguragarri bat azaltzen du Comment[fr]=Affiche un graphique configurable du senseur de surveillance du système Comment[it]=Visualizza un grafico configurabile di un sensore di monitoraggio del sistema +Comment[ko]=설정 가능한 시스템 모니터 센서 차트 표시 Comment[nl]=Toont een te configureren grafiek van een systeemmonitorsensor Comment[nn]=Vis eit tilpassbart diagram for ein systemovervakingssensor Comment[pt]=Mostra um gráfico configurável de um sensor de monitorização do sistema From 1faa79c380000396ed4425d7f6292ae161c7bed2 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 16 Jun 2020 13:31:34 +0100 Subject: [PATCH 2/3] Update version number for 5.19.1 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df2f4330b..62f720eeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-workspace) -set(PROJECT_VERSION "5.19.0") +set(PROJECT_VERSION "5.19.1") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.14.0") From 24fae256453aafa4aa5a9dc8b3c108df9bf00b56 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Thu, 11 Jun 2020 11:25:39 -0600 Subject: [PATCH 3/3] [lock screen] Stop timer when interacting with media controls Otherwise you can click on some media buttons to control the playback and then the UI will abruptly disappear. BUG: 422707 FIXED-IN: 5.19.1 --- lookandfeel/contents/lockscreen/MediaControls.qml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lookandfeel/contents/lockscreen/MediaControls.qml b/lookandfeel/contents/lockscreen/MediaControls.qml index d981153fe..df313e64f 100644 --- a/lookandfeel/contents/lockscreen/MediaControls.qml +++ b/lookandfeel/contents/lockscreen/MediaControls.qml @@ -138,7 +138,10 @@ Item { PlasmaComponents.ToolButton { enabled: mpris2Source.canGoBack iconName: LayoutMirroring.enabled ? "media-skip-forward" : "media-skip-backward" - onClicked: mpris2Source.goPrevious() + onClicked: { + fadeoutTimer.running = false + mpris2Source.goPrevious() + } visible: mpris2Source.canGoBack || mpris2Source.canGoNext Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Previous track") } @@ -147,14 +150,20 @@ Item { Layout.fillHeight: true Layout.preferredWidth: height // make this button bigger iconName: mpris2Source.playing ? "media-playback-pause" : "media-playback-start" - onClicked: mpris2Source.playPause() + onClicked: { + fadeoutTimer.running = false + mpris2Source.playPause() + } Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Play or Pause media") } PlasmaComponents.ToolButton { enabled: mpris2Source.canGoNext iconName: LayoutMirroring.enabled ? "media-skip-backward" : "media-skip-forward" - onClicked: mpris2Source.goNext() + onClicked: { + fadeoutTimer.running = false + mpris2Source.goNext() + } visible: mpris2Source.canGoBack || mpris2Source.canGoNext Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Next track") }