From 05d565671295529adcad2376cc6002f96a0678ac Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 19 Oct 2019 09:16:12 +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" --- effects/thumbnailaside/thumbnailaside_config.desktop | 2 +- kcmkwin/kwineffects/kcm_kwin_effects.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 1 + kcmkwin/kwinoptions/kwinadvanced.desktop | 2 ++ kcmkwin/kwinoptions/kwinfocus.desktop | 2 ++ kcmkwin/kwinoptions/kwinmoving.desktop | 1 + kcmkwin/kwinoptions/kwinoptions.desktop | 1 + 7 files changed, 9 insertions(+), 1 deletion(-) diff --git a/effects/thumbnailaside/thumbnailaside_config.desktop b/effects/thumbnailaside/thumbnailaside_config.desktop index 849721e2fc..4642744e82 100644 --- a/effects/thumbnailaside/thumbnailaside_config.desktop +++ b/effects/thumbnailaside/thumbnailaside_config.desktop @@ -35,7 +35,7 @@ Name[hne]=चिनहा बाजू में Name[hr]=Pokrajnja sličica Name[hu]=Ablakbetekintő oldalt Name[ia]=Miniatura a parte -Name[id]=Gambar-mini Aside +Name[id]=Thumbnail Aside Name[is]=Smámynd til hliðar Name[it]=Miniature a fianco Name[ja]=サムネイルをわきに表示 diff --git a/kcmkwin/kwineffects/kcm_kwin_effects.desktop b/kcmkwin/kwineffects/kcm_kwin_effects.desktop index 2f5bcaddfb..4742a35c76 100644 --- a/kcmkwin/kwineffects/kcm_kwin_effects.desktop +++ b/kcmkwin/kwineffects/kcm_kwin_effects.desktop @@ -69,6 +69,7 @@ Comment[en_GB]=Configure compositor settings for desktop effects Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio Comment[fi]=Koostimen asetukset työpöytätehosteille Comment[gl]=Configurar o compositor para os efectos de escritorio +Comment[id]=Konfigurasikan pengaturan kompositor untuk efek desktop Comment[it]=Configura impostazioni del compositore per gli effetti del desktop Comment[ko]=데스크톱 효과에 사용되는 컴포지터 설정 Comment[nl]=Instellingen van compositor configureren voor bureaubladeffecten diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 9d4daea833..c40cac4a61 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -42,6 +42,7 @@ Comment[es]=Configurar las acciones del ratón para las ventanas y las barras de Comment[eu]=Konfiguratu saguaren ekintzak leihoekin eta titulu-barrekin Comment[fi]=Ikkunoiden ja otsikkopalkkien hiiritoimintojen asetukset Comment[gl]=Configurar as accións do rato para xanelas e barras de título +Comment[id]=Konfigurasikan aksi mouse untuk window dan bilah-judul Comment[it]=Configura azioni del mouse per finestre e barre del titolo Comment[ko]=창과 제목 표시줄 마우스 동작 설정 Comment[nl]=Muisacties voor vensters en titelbalken configureren diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index a88ed3390f..874d918387 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -41,6 +41,7 @@ Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas Comment[eu]=Konfiguratu leiho kudeaketa aukera aurreratuak Comment[fi]=Ikkunanhallinnan lisäasetukset Comment[gl]=Configurar as funcionalidades avanzadas da xestión de xanelas +Comment[id]=Konfigurasikan opsi pengelolaan window tingkat-lanjut Comment[it]=Configura opzioni avanzate della gestione delle finestre Comment[ko]=고급 창 관리자 기능 설정 Comment[nl]=Geavanceerde vensterbeheermogelijkheden configureren @@ -63,6 +64,7 @@ X-KDE-Keywords[es]=desplegar,extender,recoger,plegar,borde,pasada,bordes activos X-KDE-Keywords[eu]=zabaldu,zabaltzea,bildu,biltzea,gainetik pasatzea,ertz aktiboak,lauzatze,fitxak,leihoa,leihoen fitxak,leihoak lauza moduan,leihoen kokapena,leihoen jokabide aurreratua X-KDE-Keywords[fi]=rullauksen avaus,rullauksen avaaminen,rullaus,rullaaminen,kehys,leijunta,aktiiviset reunat,asettelu,välilehdet,ikkunavälilehdet,ikkunoiden ryhmittely,ikkunoiden asettelu,sijoittaminen,sijoittelu,ikkunoiden sijoittaminen,ikkunoiden sijoittelu,ikkunoiden lisäasetukset X-KDE-Keywords[gl]=dessombrar,dessombramento,sombra,bordo,beira,pasar,bordos activos,beiras activas,xanela,lapelas,agrupar xanelas, situación das xanelas,colocación,colocación das xanelas,comportamento avanzado das xanelas +X-KDE-Keywords[id]=tak berbayang,tak bayang,berbayang,batas,melayang,bingkai aktif,pengubinan,tab,pengetaban,window,pengetaban window,pengelompokan window,pengubinan window,penempatan,penempatan window,penempatan si window,perilaku tingkat-lanjut window X-KDE-Keywords[it]=arrotola,srotola,ombra,ombreggiatura,bordo,sovrapponi,bordi attivi,affiancamento,schede,navigazione a schede,finestre,finestre a schede,raggruppamento finestre,affiancamento finestre,posizionamento,posizionamento finestre,posizionamento delle finestre,comportamento avanzato delle finestre X-KDE-Keywords[ko]=unshade,unshading,shade,shading,border,hover,active borders,tiling,tabs,tabbing,window,window tabbing,window grouping,window tiling,placement,window placement,placement of windows,window advanced behavior,그림자,경계선,호버,지나다니기,타일,탭,창 탭,창 그룹,창 타일,창 위치,말아 올리기,풀어 내리기,배치,창 X-KDE-Keywords[nl]=verhelderen,verheldering,schaduw,verduistering,rand,boven zweven,actieve randen,schuin achter elkaar,tabbladen,met tabbladen werken,venster,vensterwisseling,verstergroepering,vensters schuin achter elkaar,plaatsing,vensterplaatsing,plaatsing van vensters,geavanceerd gedrag van vensters diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index 10bf7f7601..b868941a0b 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -39,6 +39,7 @@ Comment[es]=Configurar la política de activación de ventanas Comment[eu]=Konfiguratu leihoa aktibatzeko gidalerroak Comment[fi]=Ikkunoiden aktivointikäytännön asetukset Comment[gl]=Configurar a política de activación de xanelas +Comment[id]=Konfigurasikan kebijakan pengaktifan window Comment[it]=Configura criteri di attivazione delle finestre Comment[ko]=창 활성화 정책 설정 Comment[nl]=Vensteractiveringsbeleid configureren @@ -60,6 +61,7 @@ X-KDE-Keywords[es]=foco,auto levantar,levantar,clic para levantar,teclado,CDE,al X-KDE-Keywords[eu]=fokua,automatikoki igo,igo,egin klik igotzeko,teklatu,CDE,alt-tab,mahaigain guztiak,fokuak saguari jarraitzen dio,foku-prebentzioa,foku-lapurreta,fokuaren gidalerro,leihoen fokuaren portaera,leihoen pantailen portaera X-KDE-Keywords[fi]=kohdistus,sijoitus,automaattinen nosto,automaattinen nostaminen,nosta,nosta napsauttamalla,näppäimistö,alt-sarkain,kaikki työpöydät,kohdistus seuraa hiirtä,kohdistuksen esto,kohdistuksen varastaminen,kohdistustapa,ikkunoiden kohdistuksen toiminta,ikkunoiden näyttötoiminta X-KDE-Keywords[gl]=foco,erguer automaticamente,erguer,erguer ao premer,teclado,CDE,alt-tab,todo o escritorio,foco que segue o rato,prevención do foco,roubar o foco,política de foco,comportamento de foco de xanela,comportamento de pantalla de xanela +X-KDE-Keywords[id]=fokus,auto naik,naikkan,klik naikkan,keyboard,papan ketik,CDE,alt-tab,semua desktop,fokus mengikuti mouse,pencegahan fokus,pencurian fokus,kebijakan fokus,perilaku fokus window,perilaku layar window X-KDE-Keywords[it]=fuoco,avanzamento automatico,avanzamento,avanzamento con clic,tastiera,CDE,alt-tab,tutti i desktop,il fuoco segue il mouse,impedisci il fuoco,mantieni il fuoco,regole fuoco,comportamento fuoco finestra, comportamento schermo finestra X-KDE-Keywords[ko]=focus,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop,focus follows mouse,focus prevention,focus stealing,focus policy,window focus behavior,window screen behavior,초점,키보드,모든 데스크톱,초점,초점 훔치기,초점 훔치기 방지,초점 정책,창 초점 행동,창 화면 행동 X-KDE-Keywords[nl]=focus,automatisch omhoog komen,omhoog komen,omhoog komen bij klikken,toetsenbord,CDE,alt-tab,alle bureaubladen,focus volgt muis,voorkomen van focus,focus stelen,focusbeleid,focusgedrag in venster,gedrag van vensterscherm diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index 4b7c87b586..f9f4f3d61f 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -40,6 +40,7 @@ Comment[es]=Configurar las opciones del movimiento de las ventanas Comment[eu]=Konfiguratu leiho mugimenduaren aukerak Comment[fi]=Ikkunoiden siirtämisen asetukset Comment[gl]=Configurar o movemento das xanelas +Comment[id]=Konfigurasikan opsi pemindahan window Comment[it]=Configura opzioni di spostamento delle finestre Comment[ko]=창 이동 옵션 설정 Comment[nl]=Opties voor vensterverplaatsing configureren diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index 5881c7a787..268c0aa2c1 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -108,6 +108,7 @@ Comment[es]=Configurar las acciones y el comportamiento de las ventanas Comment[eu]=Konfiguratu leihoaren ekintzak eta jokabidea Comment[fi]=Ikkunatoimintojen asetukset Comment[gl]=Configurar o comportamento e as accións das xanelas +Comment[id]=Konfigurasikan perilaku dan aksi window Comment[it]=Configura azioni e comportamento delle finestre Comment[ko]=창 동작과 행동 설정 Comment[nl]=Vensteracties en gedrag configureren From 6789573d88f867269d564e76c6310d210c2f99f4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 20 Oct 2019 08:55:01 +0200 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" --- effects/frozenapp/package/metadata.desktop | 4 ++-- kwin.notifyrc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/effects/frozenapp/package/metadata.desktop b/effects/frozenapp/package/metadata.desktop index ac9d2f2edf..c01f94d96a 100644 --- a/effects/frozenapp/package/metadata.desktop +++ b/effects/frozenapp/package/metadata.desktop @@ -10,7 +10,7 @@ Name[es]=Desaturar las aplicaciones que no responden Name[eu]=Desasetu erantzuten ez duten aplikazioak Name[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa Name[fr]=Désature les applications qui ne répondent pas -Name[gl]=Reducir a saturación dos aplicativos que non responden +Name[gl]=Reducir a saturación das aplicacións que non responden Name[he]=מחשיך יישומים שאינם מגיבים Name[hu]=Nem válaszoló alkalmazások színtelenítése Name[id]=Desaturate Unresponsive Applications @@ -46,7 +46,7 @@ Comment[es]=Desaturar las ventanas de las aplicaciones que no responden (congela Comment[eu]=Desasetu erantzuten ez duten aplikazioen leihoak (izoztuak) Comment[fi]=Vähennä värikylläisyyttä sovelluksilta, jotka eivät vastaa (ovat jumittuneet) Comment[fr]=Désature les fenêtres des applications qui ne répondent pas (gelées) -Comment[gl]=Reducir a saturación das xanelas de aplicativos que non responden (que queradon conxelados). +Comment[gl]=Reducir a saturación das xanelas de aplicacións que non responden (conxeladas) Comment[he]=מחשיך חלונות של יישומים שאינם מגיבים (תקועים) Comment[hu]=Színteleníti a nem válaszoló, lefagyott alkalmazások ablakait Comment[id]=Window desaturasi dari aplikasi yang tidak responsif (beku) diff --git a/kwin.notifyrc b/kwin.notifyrc index 40c2858434..803ba0c3ff 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -146,7 +146,7 @@ Comment[fi]=Toinen sovellus vaati keskeyttämään koostamisen. Comment[fr]=Une autre application a demandé la suspension de la composition. Comment[fy]=In oare applikaasje hat frege om compositing út te stellen. Comment[ga]=Tá feidhmchlár eile ag iarraidh comhshuí a chur ar fionraí. -Comment[gl]=Outro aplicativo pediu que a suspensión da composición. +Comment[gl]=Outra aplicación pediu que a suspensión da composición. Comment[he]=יישום אחר ביקש להשהות את השזירה. Comment[hr]=Neka aplikacija je dala zahtjev za paziranjem miješanja. Comment[hu]=Egy másik alkalmazás a kompozit mód felfüggesztését kérte. From 982fefd38974667d818b0b91698db7defe62483a Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Tue, 22 Oct 2019 11:15:51 +0300 Subject: [PATCH 3/3] [aurorae] Fix visibility of Context Help button Summary: providesContextHelp is a property of DecoratedClient, not Decoration. BUG: 413145 FIXED-IN: 5.17.1 Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D24851 --- plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml b/plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml index 5d2968bafd..38b9ad584b 100644 --- a/plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml +++ b/plugins/kdecorations/aurorae/src/qml/AuroraeButton.qml @@ -206,7 +206,7 @@ DecorationButton { } } Component.onCompleted: { - if (buttonType == DecorationOptions.DecorationButtonQuickHelp && !decoration.providesContextHelp) { + if (buttonType == DecorationOptions.DecorationButtonQuickHelp && !decoration.client.providesContextHelp) { visible = false; } else { visible = buttonSvg.imagePath != "";