diff -Nru marco-1.24.1/.build.yml marco-1.24.2/.build.yml --- marco-1.24.1/.build.yml 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/.build.yml 2021-03-23 15:39:59.000000000 +0000 @@ -136,17 +136,6 @@ -enable-checker security.insecureAPI.strcpy"' before_scripts: - - cd ${START_DIR} - - '[ -f mate-common-1.24.1.tar.xz ] || curl -Ls -o mate-common-1.24.1.tar.xz https://github.com/mate-desktop/mate-common/releases/download/v1.24.1/mate-common-1.24.1.tar.xz' - - tar xf mate-common-1.24.1.tar.xz - - cd mate-common-1.24.1 - - if [ ${DISTRO_NAME} == "debian" -o ${DISTRO_NAME} == "ubuntu" ];then - - ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu - - else - - ./configure --prefix=/usr - - fi - - make - - make install build_scripts: - NOCONFIGURE=1 ./autogen.sh diff -Nru marco-1.24.1/configure.ac marco-1.24.2/configure.ac --- marco-1.24.1/configure.ac 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/configure.ac 2021-03-23 15:39:59.000000000 +0000 @@ -2,7 +2,7 @@ m4_define([marco_major_version], [1]) m4_define([marco_minor_version], [24]) -m4_define([marco_micro_version], [1]) +m4_define([marco_micro_version], [2]) m4_define([marco_version], [marco_major_version.marco_minor_version.marco_micro_version]) diff -Nru marco-1.24.1/debian/changelog marco-1.24.2/debian/changelog --- marco-1.24.1/debian/changelog 2021-01-21 20:56:34.000000000 +0000 +++ marco-1.24.2/debian/changelog 2021-03-27 00:18:13.000000000 +0000 @@ -1,10 +1,17 @@ -marco (1.24.1-2ubuntu0) hirsute; urgency=medium +marco (1.24.2-0ubuntu1) hirsute; urgency=medium + * New upstream maintenance release + + -- Martin Wimpress Sat, 27 Mar 2021 00:18:13 +0000 + +marco (1.24.1-2) unstable; urgency=medium + + [ Martin Wimpress ] * debian/patches: + Add 0001_no-shadows-for-side-tiled-windows.patch: Do not render shadows for side tiled windows. - -- Martin Wimpress Thu, 21 Jan 2021 20:56:34 +0000 + -- Mike Gabriel Tue, 02 Feb 2021 10:45:35 +0100 marco (1.24.1-1) unstable; urgency=medium diff -Nru marco-1.24.1/meson.build marco-1.24.2/meson.build --- marco-1.24.1/meson.build 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/meson.build 2021-03-23 15:39:59.000000000 +0000 @@ -1,6 +1,6 @@ project( 'marco', 'c', - version: '1.24.1', + version: '1.24.2', meson_version: '>=0.47.0', license: 'GPL2', default_options : [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11'], diff -Nru marco-1.24.1/NEWS marco-1.24.2/NEWS --- marco-1.24.1/NEWS 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/NEWS 2021-03-23 15:39:59.000000000 +0000 @@ -1,3 +1,10 @@ +### marco 1.24.2 + + * update translations + * compositor-xrender.c: Make sure tooltips are visible + * window: do not unfocus on new window. + * Do not call cairo paint on generate_pixmaps. + ### marco 1.24.1 * update translations diff -Nru marco-1.24.1/po/bg.po marco-1.24.2/po/bg.po --- marco-1.24.1/po/bg.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/bg.po 2021-03-23 15:39:59.000000000 +0000 @@ -5,7 +5,7 @@ # # Translators: # Замфир Йончев , 2020 -# Georgi Georgiev , 2020 +# Georgi Georgiev (Жоро) , 2020 # breaker loc , 2020 # Stefano Karapetsas , 2020 # Любомир Василев, 2020 diff -Nru marco-1.24.1/po/ca.po marco-1.24.2/po/ca.po --- marco-1.24.1/po/ca.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/ca.po 2021-03-23 15:39:59.000000000 +0000 @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Pere O. , 2020 +# Pere Orga , 2020 # Stefano Karapetsas , 2020 # Robert Antoni Buj Gelonch , 2020 # diff -Nru marco-1.24.1/po/el.po marco-1.24.2/po/el.po --- marco-1.24.1/po/el.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/el.po 2021-03-23 15:39:59.000000000 +0000 @@ -14,7 +14,7 @@ # Stefano Karapetsas , 2020 # Νίκος Κοντ. , 2020 # Alexandros Kapetanios , 2020 -# Angelos Chraniotis , 2020 +# Angel Chr. , 2020 # 437c9d6e19936ed69f57bed9e0fe4716, 2020 # msgid "" diff -Nru marco-1.24.1/po/fi.po marco-1.24.2/po/fi.po --- marco-1.24.1/po/fi.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/fi.po 2021-03-23 15:39:59.000000000 +0000 @@ -7,7 +7,7 @@ # Eslam Ali , 2020 # Ammuu5, 2020 # Lasse Liehu , 2020 -# Rauli L. , 2020 +# Rauli Laine , 2020 # nomen omen, 2020 # Stefano Karapetsas , 2020 # diff -Nru marco-1.24.1/po/fr.po marco-1.24.2/po/fr.po --- marco-1.24.1/po/fr.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/fr.po 2021-03-23 15:39:59.000000000 +0000 @@ -4,14 +4,15 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Tubuntu , 2020 +# Tubuntu, 2020 # clefebvre , 2020 # Charles Monzat , 2020 # mauron, 2020 # Stefano Karapetsas , 2020 # Étienne Deparis , 2020 # yoplait , 2020 -# Rox fr , 2020 +# roxfr , 2020 +# Yoan Mollard , 2020 # msgid "" msgstr "" @@ -19,7 +20,7 @@ "Report-Msgid-Bugs-To: https://github.com/mate-desktop/marco\n" "POT-Creation-Date: 2019-11-18 19:44+0100\n" "PO-Revision-Date: 2020-02-15 11:16+0000\n" -"Last-Translator: Rox fr , 2020\n" +"Last-Translator: Yoan Mollard , 2020\n" "Language-Team: French (https://www.transifex.com/mate/teams/13566/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,6 +35,7 @@ #: src/50-marco-desktop-key.xml.in:4 msgid "Show the panel's "Run Application" dialog box" msgstr "" +"Afficher la boîte de dialogue « Lancer une application » du tableau de bord" #: src/50-marco-desktop-key.xml.in:6 src/org.mate.marco.gschema.xml:629 msgid "Show the panel's main menu" diff -Nru marco-1.24.1/po/gl.po marco-1.24.2/po/gl.po --- marco-1.24.1/po/gl.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/gl.po 2021-03-23 15:39:59.000000000 +0000 @@ -6,8 +6,8 @@ # Translators: # Martin Wimpress , 2020 # André Rivero Castillo , 2020 -# Miguel Anxo Bouzada , 2020 # Stefano Karapetsas , 2020 +# Miguel Anxo Bouzada , 2021 # msgid "" msgstr "" @@ -15,7 +15,7 @@ "Report-Msgid-Bugs-To: https://github.com/mate-desktop/marco\n" "POT-Creation-Date: 2019-11-18 19:44+0100\n" "PO-Revision-Date: 2020-02-15 11:16+0000\n" -"Last-Translator: Stefano Karapetsas , 2020\n" +"Last-Translator: Miguel Anxo Bouzada , 2021\n" "Language-Team: Galician (https://www.transifex.com/mate/teams/13566/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -375,7 +375,7 @@ "Ao premer nunha xanela mentres se mantén premida esta tecla modificadora, " "fará que a xanela se mova (co botón esquerdo), se restaure (co botón " "central) ou que se amose o menú da xanela (co botón dereito). As operacións " -"esquerda e dereita poden ser intercambiadas usando a chave " +"esquerda e dereita poden ser intercambiadas usando a clave " "«resize_with_right_button». O modificador exprésase como «» ou " "«» por exemplo." @@ -490,28 +490,27 @@ " window manager and that they need to change this option back to true or " "live with the \"bug\" they requested." msgstr "" -"Poñer este axuste a «false» (falso) pode resultar nun comportamento erróneo," -" polo que recoméndaselle encarecidamente os usuarios que non o fagan. Moitas" -" accións (por exemplo premer na area dos clientes, mover ou redimensionar a " -"xanela) elevan a xanela coma un efecto secundario. Poñer este axuste a " -"«false» (falso), o que insistimos que está absolutamente desaconsellado, " -"desacoplará a elevación doutras accións de usuario e ignorará as peticións " -"de elevación xeradas por aplicacións. Véxase " -"http://bugzilla.gnome.org/show_bug.cgi?id=445447#c6. Incluso cando esta " -"opción estea posta como «false» (falso), as xanelas aínda poden ser elevadas" -" mediante unha pulsación co botón esquerdo ao premer a tecla «Alt» en " -"calquera sitio da xanela, mediante unha pulsación normal nas decoracións da " -"xanela, ou mediante mensaxes especiais dos paxinadores tales como as " +"Poñer este axuste a falso pode resultar nun comportamento erróneo, polo que " +"recoméndaselle encarecidamente os usuarios que non o fagan. Moitas accións " +"(por exemplo premer na area dos clientes, mover ou redimensionar a xanela) " +"elevan a xanela coma un efecto secundario. Poñer este axuste a falso, o que " +"insistimos que está absolutamente desaconsellado, desacoplará a elevación " +"doutras accións de usuario e ignorará as peticións de elevación xeradas por " +"aplicacións. Véxase http://bugzilla.gnome.org/show_bug.cgi?id=445447#c6. " +"Incluso cando esta opción estea posta como falso, as xanelas aínda poden ser" +" elevadas mediante unha pulsación co botón esquerdo ao premer a tecla «Alt» " +"en calquera sitio da xanela, mediante unha pulsación normal nas decoracións " +"da xanela, ou mediante mensaxes especiais dos paxinadores tales como as " "peticións dunha miniaplicación de lista de tarefas. Este axuste está " "normalmente desactivad0 co modo «click-to-focus» (premer para poñer en " "foco). Nótese que a lista de formas de elevar a xanela cando o modo " -"«raise_on_click» (erguer ao premer) é «false» (falso) non inclúe peticións " +"«raise_on_click» (erguer ao premer) é falso non inclúe peticións " "programáticas de aplicacións para elevar xanelas; tales peticións serán " "ignoradas sen importar a razón da petición. Se vostede é un desenvolvedor e " "ten algún usuario queixándose de que a súa aplicación non funciona con este " "axuste desactivado, sinálelle entón que a culpa é _súa_ por rachar o xestor " -"de xanelas e que debe reverter esta opción a «true» (verdadeiro) ou convivir" -" co fallo que sinala." +"de xanelas e que debe reverter esta opción a verdadeiro ou convivir co fallo" +" que sinala." #: src/org.mate.marco.gschema.xml:85 msgid "Action on title bar double-click" @@ -596,7 +595,7 @@ msgstr "" "Se se define como verdadeiro, e o modo de foco é «sloppy» ou «mouse», entón " "a xanela enfocada elevarase automaticamente após un atraso especificado na " -"chave «auto_raise_delay». Isto non está relacionado con premer nunha xanela " +"clave «auto_raise_delay». Isto non está relacionado con premer nunha xanela " "para elevala, nin con entrar nunha xanela durante unha operación de " "arrastrar e soltar." @@ -610,7 +609,7 @@ "delay is given in thousandths of a second." msgstr "" "O atraso antes de elevar unha xanela se «auto_raise» está configurado como " -"«true» (verdadeiro). O atraso está indicado en milésimas de segundo." +"verdadeiro. O atraso está indicado en milésimas de segundo." #: src/org.mate.marco.gschema.xml:110 msgid "Current theme" @@ -1164,9 +1163,9 @@ "that correspond to these commands. Pressing the keybinding for run_command_N" " will execute command_N." msgstr "" -"As chaves /apps/marco/global_keybindings/run_command_N definen as " +"As claves /apps/marco/global_keybindings/run_command_N definen as " "combinacións de teclas que corresponden a esas ordes. Ao premer a " -"combinación de teclas para run_command_N executarase o command_N." +"combinación de teclas para run_command_N executarase command_N." #: src/org.mate.marco.gschema.xml:722 msgid "The screenshot command" @@ -1177,7 +1176,7 @@ "The /apps/marco/global_keybindings/run_command_screenshot key defines a " "keybinding which causes the command specified by this setting to be invoked." msgstr "" -"A chave /apps/marco/global_keybindings/run_command_screenshot define unha " +"As claves /apps/marco/global_keybindings/run_command_screenshot define unha " "combinación de teclas que fai que se invoque a orde especificada por este " "axuste." @@ -1191,9 +1190,9 @@ " a keybinding which causes the command specified by this setting to be " "invoked." msgstr "" -"A chave /apps/marco/global_keybindings/run_command_window_screenshot define " -"unha combinación de teclas que fai que se invoque a orde especificada por " -"este axuste." +"As claves /apps/marco/global_keybindings/run_command_window_screenshot " +"define unha combinación de teclas que fai que se invoque a orde especificada" +" por este axuste." #: src/org.mate.marco.gschema.xml:750 msgid "Toggle whether a window will always be visible over other windows" @@ -1390,7 +1389,7 @@ #: src/core/prefs.c:641 src/core/prefs.c:794 #, c-format msgid "%d stored in GSettings key %s is out of range %d to %d\n" -msgstr "%d almacenado na chave GSettings %s está fóra do intervalo %d a %d\n" +msgstr "%d almacenado na clave GSettings %s está fóra do intervalo %d a %d\n" #: src/core/prefs.c:1088 msgid "" @@ -1404,7 +1403,7 @@ #, c-format msgid "Could not parse font description \"%s\" from GSettings key %s\n" msgstr "" -"Non foi posíbel analizar a descrición do tipo de letra «%s» da chave " +"Non foi posíbel analizar a descrición do tipo de letra «%s» da clave " "GSettings %s\n" #: src/core/prefs.c:1256 @@ -2482,7 +2481,7 @@ #: src/ui/theme-parser.c:3491 #, c-format msgid "Bad version specification '%s'" -msgstr "Especificación de versión incorrecta «%s»" +msgstr "Especificación defectuosa de versión «%s»" #: src/ui/theme-parser.c:3562 msgid "" diff -Nru marco-1.24.1/po/he.po marco-1.24.2/po/he.po --- marco-1.24.1/po/he.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/he.po 2021-03-23 15:39:59.000000000 +0000 @@ -4,11 +4,11 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Edward Sawyer , 2020 -# shy tzedaka , 2020 # בר בוכובזה , 2020 # Stefano Karapetsas , 2020 # Yaron Shahrabani , 2020 +# Omeritzics Games , 2020 +# shy tzedaka , 2020 # msgid "" msgstr "" @@ -16,7 +16,7 @@ "Report-Msgid-Bugs-To: https://github.com/mate-desktop/marco\n" "POT-Creation-Date: 2019-11-18 19:44+0100\n" "PO-Revision-Date: 2020-02-15 11:16+0000\n" -"Last-Translator: Yaron Shahrabani , 2020\n" +"Last-Translator: shy tzedaka , 2020\n" "Language-Team: Hebrew (https://www.transifex.com/mate/teams/13566/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +34,7 @@ #: src/50-marco-desktop-key.xml.in:6 src/org.mate.marco.gschema.xml:629 msgid "Show the panel's main menu" -msgstr "Show the panel's main menu" +msgstr "הצגת התפריט הראשי של הלוח" #: src/50-marco-desktop-key.xml.in:8 src/org.mate.marco.gschema.xml:639 msgid "Take a screenshot" @@ -1044,7 +1044,7 @@ #: src/org.mate.marco.gschema.xml:634 msgid "Show the panel's \"Run Application\" dialog box" -msgstr "הצג את תיבת \"הרצת יישום\" של הפאנל" +msgstr "הצגת דו־שיח \"הרצת יישום\" של הלוח" #: src/org.mate.marco.gschema.xml:662 src/org.mate.marco.gschema.xml:667 #: src/org.mate.marco.gschema.xml:672 src/org.mate.marco.gschema.xml:677 @@ -1569,7 +1569,7 @@ #: src/ui/frames.c:1359 msgid "Unroll Window" -msgstr "בטל גלילה" +msgstr "ביטול גלילה" #: src/ui/frames.c:1362 msgid "Keep Window On Top" @@ -1577,7 +1577,7 @@ #: src/ui/frames.c:1365 msgid "Remove Window From Top" -msgstr "בטל שמירת החלון גלוי" +msgstr "ביטול שמירת החלון גלוי" #: src/ui/frames.c:1368 msgid "Always On Visible Workspace" diff -Nru marco-1.24.1/po/ja.po marco-1.24.2/po/ja.po --- marco-1.24.1/po/ja.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/ja.po 2021-03-23 15:39:59.000000000 +0000 @@ -12,6 +12,7 @@ # ABE Tsunehiko, 2020 # Rockers , 2020 # Ikuru K , 2020 +# pivo thusr, 2020 # msgid "" msgstr "" @@ -19,7 +20,7 @@ "Report-Msgid-Bugs-To: https://github.com/mate-desktop/marco\n" "POT-Creation-Date: 2019-11-18 19:44+0100\n" "PO-Revision-Date: 2020-02-15 11:16+0000\n" -"Last-Translator: Ikuru K , 2020\n" +"Last-Translator: pivo thusr, 2020\n" "Language-Team: Japanese (https://www.transifex.com/mate/teams/13566/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2352,7 +2353,7 @@ #: src/ui/theme-viewer.c:256 msgid "_OK" -msgstr "" +msgstr "OK(_O)" #: src/ui/theme-viewer.c:268 msgid "This is a sample message in a sample dialog" diff -Nru marco-1.24.1/po/kn.po marco-1.24.2/po/kn.po --- marco-1.24.1/po/kn.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/kn.po 2021-03-23 15:39:59.000000000 +0000 @@ -6,6 +6,7 @@ # Translators: # karthik holla , 2020 # Stefano Karapetsas , 2020 +# Sai Vinoba , 2020 # msgid "" msgstr "" @@ -13,7 +14,7 @@ "Report-Msgid-Bugs-To: https://github.com/mate-desktop/marco\n" "POT-Creation-Date: 2019-11-18 19:44+0100\n" "PO-Revision-Date: 2020-02-15 11:16+0000\n" -"Last-Translator: Stefano Karapetsas , 2020\n" +"Last-Translator: Sai Vinoba , 2020\n" "Language-Team: Kannada (https://www.transifex.com/mate/teams/13566/kn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2471,7 +2472,7 @@ #: src/ui/theme-viewer.c:256 msgid "_OK" -msgstr "" +msgstr "ಸರಿ (_O)" #: src/ui/theme-viewer.c:268 msgid "This is a sample message in a sample dialog" diff -Nru marco-1.24.1/po/oc.po marco-1.24.2/po/oc.po --- marco-1.24.1/po/oc.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/oc.po 2021-03-23 15:39:59.000000000 +0000 @@ -672,8 +672,8 @@ "environments." msgstr "" "Activa una indicacion visuala quand una aplicacion o lo sistèma emet un bip " -"; util pels malentendents e per una utilizacion dins d'environaments " -"bruchoses." +"; util pels mal-entendents e per una utilizacion dins d'environaments " +"brusents." #: src/org.mate.marco.gschema.xml:141 msgid "System Bell is Audible" @@ -1234,15 +1234,15 @@ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" "marco %s\n" -"Copyright © 2001-%s Havoc Pennington, Red Hat, Inc., e autres.\n" +"Copyright (C) 2001-%s Havoc Pennington, Red Hat, Inc., e autres.\n" "Aquò es un logicial liure ; consultatz lo còde font per las\n" "condicions de còpia.\n" -"I a PAS CAP de garantia ; quitament pas de VALOR MERCANDA o\n" +"I a PAS CAP de garantida ; quitament pas de VALOR MERCANDA o\n" "d'ADEQÜACION A UN USATGE PARTICULAR.\n" #: src/core/main.c:270 msgid "Disable connection to session manager" -msgstr "Desactivar la connexion al gestionari de sesilhas" +msgstr "Desactivar la connexion al gestionari de sessions" #: src/core/main.c:276 msgid "Replace the running window manager with Marco" @@ -1380,7 +1380,7 @@ #: src/core/session.c:842 src/core/session.c:849 #, c-format msgid "Could not create directory '%s': %s\n" -msgstr "Impossible de crear lo repertòri '%s' : %s\n" +msgstr "Creacion impossibla del repertòri « %s » : %s\n" #: src/core/session.c:859 #, c-format @@ -1390,12 +1390,12 @@ #: src/core/session.c:999 #, c-format msgid "Error writing session file '%s': %s\n" -msgstr "Error al moment d'escriure lo fichièr de session '%s' : %s\n" +msgstr "Error al moment d'escriure lo fichièr de session « %s » : %s\n" #: src/core/session.c:1004 #, c-format msgid "Error closing session file '%s': %s\n" -msgstr "Error al moment de la tampadura del fichièr de sesilha « %s » : %s\n" +msgstr "Error al moment de la tampadura del fichièr de session « %s » : %s\n" #: src/core/session.c:1134 #, c-format @@ -1405,7 +1405,7 @@ #: src/core/session.c:1183 msgid " attribute seen but we already have the session ID" msgstr "" -"L'atribut es estat trobat, mas avèm ja l'ID de sesilha" +"L'atribut es estat trobat, mas avèm ja l'ID de session" #: src/core/session.c:1196 src/core/session.c:1271 src/core/session.c:1303 #: src/core/session.c:1375 src/core/session.c:1435 @@ -2066,7 +2066,7 @@ #: src/ui/theme.c:5462 #, c-format msgid "Failed to load theme \"%s\": %s\n" -msgstr "Impossible de cargar lo tèma \"%s\" : %s\n" +msgstr "Cargament impossible del tèma « %s » : %s\n" #: src/ui/theme.c:5594 src/ui/theme.c:5601 src/ui/theme.c:5608 #: src/ui/theme.c:5615 src/ui/theme.c:5622 @@ -2198,7 +2198,7 @@ #: src/ui/theme-parser.c:1284 #, c-format msgid "Unknown type \"%s\" on <%s> element" -msgstr "Tipe desconegut \"%s\" sul element <%s>" +msgstr "Tipe desconegut « %s » sul element <%s>" #: src/ui/theme-parser.c:1295 #, c-format @@ -2232,7 +2232,7 @@ #: src/ui/theme-parser.c:1470 #, c-format msgid "Distance \"%s\" is unknown" -msgstr "Distància \"%s\" desconeguda" +msgstr "Distància « %s » desconeguda" #: src/ui/theme-parser.c:1515 #, c-format @@ -2242,7 +2242,7 @@ #: src/ui/theme-parser.c:1577 #, c-format msgid "Border \"%s\" is unknown" -msgstr "La bordadura \"%s\" es desconeguda" +msgstr "La bordadura « %s » es desconeguda" #: src/ui/theme-parser.c:1888 #, c-format @@ -2312,7 +2312,7 @@ #: src/ui/theme-parser.c:2992 #, c-format msgid "Unknown function \"%s\" for button" -msgstr "Foncion \"%s\" desconeguda pel boton" +msgstr "Foncion « %s » desconeguda pel boton" #: src/ui/theme-parser.c:3002 #, c-format @@ -2323,7 +2323,7 @@ #: src/ui/theme-parser.c:3014 #, c-format msgid "Unknown state \"%s\" for button" -msgstr "Estat \"%s\" desconegut pel boton" +msgstr "Estat « %s » desconegut pel boton" #: src/ui/theme-parser.c:3022 #, c-format diff -Nru marco-1.24.1/po/pl.po marco-1.24.2/po/pl.po --- marco-1.24.1/po/pl.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/pl.po 2021-03-23 15:39:59.000000000 +0000 @@ -18,9 +18,10 @@ # Stefano Karapetsas , 2020 # Darek Witkowski, 2020 # Marcin Sedlak , 2020 -# pietrasagh , 2020 +# pietrasagh , 2020 # Dominik Adrian Grzywak, 2020 # Daniel Tokarzewski , 2020 +# No Ne, 2020 # msgid "" msgstr "" @@ -28,7 +29,7 @@ "Report-Msgid-Bugs-To: https://github.com/mate-desktop/marco\n" "POT-Creation-Date: 2019-11-18 19:44+0100\n" "PO-Revision-Date: 2020-02-15 11:16+0000\n" -"Last-Translator: Daniel Tokarzewski , 2020\n" +"Last-Translator: No Ne, 2020\n" "Language-Team: Polish (https://www.transifex.com/mate/teams/13566/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1316,7 +1317,7 @@ "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" "marco %s\n" -"Prawa autorskie (C) 2001-%s Havoc Pennington, Red Hat, Inc., oraz inni\n" +"Prawa autorskie (C) 2001-%s Havoc Pennington, Red Hat, Inc. oraz inni\n" "Niniejszy program jest wolnym oprogramowaniem, aby poznać warunki, pod\n" "jakimi dopuszczalne jest kopiowanie programu, zajrzyj do jego źródeł.\n" "Na program nie udziela się ŻADNYCH GWARANCJI, nawet domyślnej gwarancji\n" diff -Nru marco-1.24.1/po/pt.po marco-1.24.2/po/pt.po --- marco-1.24.1/po/pt.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/pt.po 2021-03-23 15:39:59.000000000 +0000 @@ -4,7 +4,6 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Hugo Carvalho , 2020 # Manel Tinoco , 2020 # Manuela Silva , 2020 # Sérgio Marques , 2020 @@ -13,6 +12,7 @@ # Rui , 2020 # Luis Filipe Teixeira , 2020 # José Vieira , 2020 +# Hugo Carvalho , 2020 # msgid "" msgstr "" @@ -20,7 +20,7 @@ "Report-Msgid-Bugs-To: https://github.com/mate-desktop/marco\n" "POT-Creation-Date: 2019-11-18 19:44+0100\n" "PO-Revision-Date: 2020-02-15 11:16+0000\n" -"Last-Translator: José Vieira , 2020\n" +"Last-Translator: Hugo Carvalho , 2020\n" "Language-Team: Portuguese (https://www.transifex.com/mate/teams/13566/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,11 +30,11 @@ #: src/50-marco-desktop-key.xml.in:2 msgid "Desktop" -msgstr "Ambiente de Trabalho" +msgstr "Ambiente de trabalho" #: src/50-marco-desktop-key.xml.in:4 msgid "Show the panel's "Run Application" dialog box" -msgstr "" +msgstr "Mostrar a caixa de diálogo "Executar aplicação" do painel" #: src/50-marco-desktop-key.xml.in:6 src/org.mate.marco.gschema.xml:629 msgid "Show the panel's main menu" diff -Nru marco-1.24.1/po/sv.po marco-1.24.2/po/sv.po --- marco-1.24.1/po/sv.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/sv.po 2021-03-23 15:39:59.000000000 +0000 @@ -9,7 +9,7 @@ # Kristoffer Grundström , 2020 # Patrik Nilsson , 2020 # Marcus Larborg, 2020 -# Jonatan Nyberg , 2020 +# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2020 # Jonas A, 2020 # Stefano Karapetsas , 2020 # Tobias Lekare , 2020 diff -Nru marco-1.24.1/po/uk.po marco-1.24.2/po/uk.po --- marco-1.24.1/po/uk.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/uk.po 2021-03-23 15:39:59.000000000 +0000 @@ -8,8 +8,8 @@ # Evolve32 , 2020 # Шаповалов Анатолій Романович , 2020 # Stefano Karapetsas , 2020 -# Микола Ткач , 2020 # Oleksii Khalikov , 2020 +# Микола Ткач , 2021 # msgid "" msgstr "" @@ -17,7 +17,7 @@ "Report-Msgid-Bugs-To: https://github.com/mate-desktop/marco\n" "POT-Creation-Date: 2019-11-18 19:44+0100\n" "PO-Revision-Date: 2020-02-15 11:16+0000\n" -"Last-Translator: Oleksii Khalikov , 2020\n" +"Last-Translator: Микола Ткач , 2021\n" "Language-Team: Ukrainian (https://www.transifex.com/mate/teams/13566/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -908,10 +908,11 @@ msgid "" "The popup window will be expanded to fit up to these many entries per row." msgstr "" +"Виринне вікно буде розширено, щоб відповідати цій кількості записів у рядку." #: src/org.mate.marco.gschema.xml:218 msgid "Expand the alt-tab popup window to fit longer window titles" -msgstr "" +msgstr "Розгорніть виринне вікно alt-tab, щоб вмістити довші заголовки вікон" #: src/org.mate.marco.gschema.xml:219 msgid "" diff -Nru marco-1.24.1/po/uz.po marco-1.24.2/po/uz.po --- marco-1.24.1/po/uz.po 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/po/uz.po 2021-03-23 15:39:59.000000000 +0000 @@ -5,7 +5,7 @@ # # Translators: # Stefano Karapetsas , 2020 -# muzaffar habibullayev , 2020 +# Muzaffar Habibullayev , 2020 # msgid "" msgstr "" @@ -13,7 +13,7 @@ "Report-Msgid-Bugs-To: https://github.com/mate-desktop/marco\n" "POT-Creation-Date: 2019-11-18 19:44+0100\n" "PO-Revision-Date: 2020-02-15 11:16+0000\n" -"Last-Translator: muzaffar habibullayev , 2020\n" +"Last-Translator: Muzaffar Habibullayev , 2020\n" "Language-Team: Uzbek (https://www.transifex.com/mate/teams/13566/uz/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -Nru marco-1.24.1/src/compositor/compositor-xrender.c marco-1.24.2/src/compositor/compositor-xrender.c --- marco-1.24.1/src/compositor/compositor-xrender.c 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/src/compositor/compositor-xrender.c 2021-03-23 15:39:59.000000000 +0000 @@ -41,6 +41,8 @@ #include "display.h" #include "../core/display-private.h" +#include "../core/screen-private.h" +#include "../core/workspace.h" #include "screen.h" #include "frame.h" #include "errors.h" @@ -48,6 +50,7 @@ #include "compositor-private.h" #include "compositor-xrender.h" #include "xprops.h" +#include "core.h" #include #include #include @@ -1856,6 +1859,87 @@ } static void +constrain_tooltip_onscreen (MetaDisplay *display, + MetaScreen *screen, + MetaCompWindow *cw, + Window id) +{ + MetaWorkspace *workspace; + MetaRectangle work_area, win_rect; + const MetaXineramaScreenInfo* xinerama; + gint new_x, new_y; + gint active_workspace_num; + + /* Why this is here: + * As of gtk 3.24, tooltips are positioned differently, and can end up off the + * screen in certain situations in hidpi. + * + * See: https://github.com/GNOME/gtk/commit/14d22cb3233e + * + * If the panel is too tall (around > 25 or so), tooltip positioning fails both + * tests in gdkwindowimpl.c (maybe_flip_position()) skipping repositioning of the + * tooltip inside the workarea. This only occurs on bottom panels. + * + * Since the calculations are based upon the monitor's workarea and the 'attach' + * (gdk) window's rectangle, there's no way to compensate for or fool gtk into + * displaying it correctly. So here, we do our own check and adjustment. */ + + active_workspace_num = meta_core_get_active_workspace (cw->attrs.screen); + + workspace = meta_screen_get_workspace_by_index (screen, + active_workspace_num); + + win_rect.x = cw->attrs.x; + win_rect.y = cw->attrs.y; + win_rect.width = cw->attrs.width; + win_rect.height = cw->attrs.height; + + xinerama = meta_screen_get_xinerama_for_rect (screen, + &win_rect); + + meta_workspace_get_work_area_for_xinerama (workspace, + xinerama->number, + &work_area); + + new_x = win_rect.x; + new_y = win_rect.y; + + /* Valid tooltip positions seem to cheat into the panel by a few pixels - maybe + * accounting for shadow margin. There's no reason the fix these, but they'd + * be caught here otherwise, so 10px of overshoot in the direction of the panel + * is allowed. The tooltips we're out to catch are the ones on the complete other + * side of the panel (off screren), so there won't be any confusion. */ + if (win_rect.y < work_area.y - 10) + { + new_y = work_area.y; + } + else if (win_rect.y + win_rect.height > work_area.y + work_area.height + 10) + { + new_y = (work_area.y + work_area.height - win_rect.height); + } + + if (win_rect.x < work_area.x - 10) + { + new_x = work_area.x; + } + else if (win_rect.x + win_rect.width > work_area.x + work_area.width + 10) + { + new_x = (work_area.x + work_area.width - win_rect.width); + } + + if (new_x != win_rect.x || new_y != win_rect.y) + { + if (DISPLAY_COMPOSITOR (display)->debug) + { + fprintf(stderr, "Constraining tooltip onscreen x:%d -> %d, y:%d -> %d\n", + win_rect.x,new_x, win_rect.y,new_y); + } + + XMoveWindow (display->xdisplay, cw->id, new_x, new_y); + } +} + +static void map_win (MetaDisplay *display, MetaScreen *screen, Window id) @@ -1866,6 +1950,11 @@ if (cw == NULL) return; + if (cw->type == META_COMP_WINDOW_TOOLTIP) + { + constrain_tooltip_onscreen (display, screen, cw, id); + } + /* The reason we deallocate this here and not in unmap is so that we will still have a valid pixmap for whenever the window is unmapped */ diff -Nru marco-1.24.1/src/core/window.c marco-1.24.2/src/core/window.c --- marco-1.24.1/src/core/window.c 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/src/core/window.c 2021-03-23 15:39:59.000000000 +0000 @@ -2175,23 +2175,7 @@ ( (!place_on_top_on_map && !takes_focus_on_map) || will_be_covered ) ) { - if (meta_window_is_ancestor_of_transient (focus_window, window)) - { - /* This happens for error dialogs or alerts; these need to remain on - * top, but it would be confusing to have its ancestor remain - * focused. - */ - meta_topic (META_DEBUG_STARTUP, - "The focus window %s is an ancestor of the newly mapped " - "window %s which isn't being focused. Unfocusing the " - "ancestor.\n", - focus_window->desc, window->desc); - - meta_display_focus_the_no_focus_window (window->display, - window->screen, - timestamp); - } - else + if (!meta_window_is_ancestor_of_transient (focus_window, window)) { needs_stacking_adjustment = TRUE; if (!window->placed) diff -Nru marco-1.24.1/src/ui/frames.c marco-1.24.2/src/ui/frames.c --- marco-1.24.1/src/ui/frames.c 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/src/ui/frames.c 2021-03-23 15:39:59.000000000 +0000 @@ -2282,8 +2282,6 @@ cr = cairo_create (result); cairo_translate (cr, -rect->x, -rect->y); - cairo_paint (cr); - meta_frames_paint_to_drawable (frames, frame, cr); cairo_destroy (cr); diff -Nru marco-1.24.1/.travis.yml marco-1.24.2/.travis.yml --- marco-1.24.1/.travis.yml 2020-08-04 17:00:07.000000000 +0000 +++ marco-1.24.2/.travis.yml 2021-03-23 15:39:59.000000000 +0000 @@ -42,7 +42,7 @@ condition: "${TRAVIS_TAG} =~ ^v.*$ && ${DISTRO} =~ ^fedora.*$" env: - - DISTRO="archlinux:latest" +# - DISTRO="archlinux:latest" - DISTRO="debian:testing" - DISTRO="fedora:latest" - - DISTRO="ubuntu:20.04" + - DISTRO="ubuntu:rolling"