A S Alam · Bilal Elmoussaoui · Alexander Mikhaylenko · Fran Dieguez · Zander Brown · Alexander Mikhaylenko
--- a/NEWS
+++ b/NEWS
+=======================================
+GNOME Screenshot 40.0 - 20th March 2021
+=======================================
+
+- No changes since 40.rc
+
+========================================
+GNOME Screenshot 40.rc - 12th March 2021
+========================================
+
+- metainfo: add a launchable tag [Bilal Elmoussaoui]
+- Translation updates: Galician, Punjabi
+
 =============================================
 GNOME Screenshot 40.beta - 12th February 2021
 =============================================

--- a/data/org.gnome.Screenshot.metainfo.xml.in
+++ b/data/org.gnome.Screenshot.metainfo.xml.in
@@ -2,6 +2,7 @@
 <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop-application">
  <id>org.gnome.Screenshot.desktop</id>
+  <launchable type="desktop-id">org.gnome.Screenshot.desktop</launchable>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>GNOME Screenshot</name>
@@ -38,34 +39,22 @@
    <kudo>ModernToolkit</kudo>
  </kudos>
  <releases>
-    <release version="40.beta" type="development" date="2021-02-12" urgency="medium">
+    <release version="40.0" type="stable" date="2021-03-20" urgency="medium">
      <description>
        <p>Move sound effects to gnome-shell</p>
        <p>Focus the filename entry by default</p>
        <p>Remember delay for area screenshots</p>
        <p>Remove compulsory_for_desktop</p>
+        <p>metainfo: add a launchable tag</p>
        <p>Translation updates</p>
      </description>
    </release>
    <release version="3.38.0" type="stable" date="2020-09-10" urgency="medium">
-      <description>
-        <p>Translation updates.</p>
-      </description>
-    </release>
-    <release version="3.37.90" type="stable" date="2020-08-07" urgency="medium">
-      <description>
-        <p>Changes:</p>
-        <ul>
-          <li>Port to libhandy</li>
-          <li>Translation updates</li>
-        </ul>
-      </description>
-    </release>
-    <release version="3.37.1" type="stable" date="2020-04-25" urgency="medium">
      <description>
        <p>Changes:</p>
        <ul>
          <li>Completely redesign the UI</li>
+          <li>Port to libhandy</li>
          <li>Allow taking area screenshots with timeout</li>
          <li>Deprecate --include-border and --remove-border options</li>
          <li>Deprecate --border-effect option</li>

--- a/debian/changelog
+++ b/debian/changelog
-gnome-screenshot (40~beta-1ubuntu1) impish; urgency=medium
+gnome-screenshot (40.0-1ubuntu1) impish; urgency=medium

  * Merge with Debian. Remaining Ubuntu changes:
    - update_unity_list.patch:
      + Disable the Current Window .desktop Action since it doesn't work in
        the default Ubuntu desktop

- -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 24 Jun 2021 11:36:20 +0200
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 21 Oct 2021 16:31:29 +0200
+
+gnome-screenshot (40.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump debhelper-compat to 13
+  * debian/rules: Drop unneeded -Wl,--as-needed
+
+ -- Jeremy Bicha <jbicha@debian.org>  Thu, 19 Aug 2021 19:51:33 -0400

 gnome-screenshot (40~beta-1) experimental; urgency=medium


--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
 Build-Depends: appstream,
-               debhelper-compat (= 12),
+               debhelper-compat (= 13),
               dh-sequence-gnome,
               libglib2.0-dev (>= 2.35.1),
               libgtk-3-dev (>= 3.10.0),

--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: appstream,
-               debhelper-compat (= 12),
+               debhelper-compat (= 13),
               dh-sequence-gnome,
               libglib2.0-dev (>= 2.35.1),
               libgtk-3-dev (>= 3.10.0),

--- a/debian/rules
+++ b/debian/rules
 #!/usr/bin/make -f

 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs

 %:
 	dh $@
--- a/debian/watch
+++ b/debian/watch
 version=4
-https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
-	@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
+opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/" \
+https://download.gnome.org/sources/@PACKAGE@/cache.json \
+	\d+/@PACKAGE@-([\d.]+)@ARCHIVE_EXT@
--- a/meson.build
+++ b/meson.build
 project(
  'gnome-screenshot',
  'c',
-  version: '40.beta',
+  version: '40.0',
  license: 'GPLv2+',
  meson_version: '>= 0.50.0',
  default_options: [

--- a/org.gnome.Screenshot.json
+++ b/org.gnome.Screenshot.json
@@ -3,10 +3,7 @@
    "runtime" : "org.gnome.Platform",
    "runtime-version" : "master",
    "sdk" : "org.gnome.Sdk",
-    "command" : "gnome-screenshot",
-    "x-run-args" : [
-        "--interactive"
-    ],
+    "command" : "gnome-screenshot-interactive",
    "finish-args" : [
        "--share=ipc",
        "--socket=x11",
@@ -45,6 +42,23 @@
                }
            ]
        },
+        {
+            "name" : "gnome-screenshot-interactive",
+            "buildsystem" : "simple",
+            "build-commands" : [
+                "mkdir -p /app/bin/",
+                "install -m755 -pD gnome-screenshot-interactive /app/bin/gnome-screenshot-interactive"
+            ],
+            "sources" : [
+                {
+                    "type" : "script",
+                    "commands" : [
+                        "gnome-screenshot -i"
+                    ],
+                    "dest-filename" : "gnome-screenshot-interactive"
+                }
+            ]
+        },
        {
            "name" : "gnome-screenshot",
            "buildsystem" : "meson",

--- a/po/gl.po
+++ b/po/gl.po
@@ -3,6 +3,7 @@
 # Copyright (C) 1999 Ruben Lopez Gomez.
 # Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
 # colaborar connosco, podes atopar máis información en http://www.trasno.net
+#
 # Ruben Lopez Gomez <ryu@mundivia.es>, 1999. (logview from gnome-admin).
 # Jesús Bravo Álvarez <jba@pobox.com>, 2000-2001.
 # Ignacio Casal Quinteiro <adorador_del_heavy@hotmail.com>, 2004.
@@ -13,23 +14,21 @@
 # Antón Méixome <meixome@mancomun.org>, 2009.
 # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.
-# Fran Dieguez <frandieguez@gnome.org>, 2012-2020.
-#
+# Fran Dieguez <frandieguez@gnome.org>, 2012-2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils-master-po-gl-14799\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-screenshot/"
-"issues\n"
-"POT-Creation-Date: 2020-08-14 10:39+0000\n"
-"PO-Revision-Date: 2020-08-17 18:04+0200\n"
-"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
-"Language-Team: Galician <proxecto@trasno.gal>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-screenshot/issues\n"
+"POT-Creation-Date: 2021-02-11 18:55+0000\n"
+"PO-Revision-Date: 2021-02-24 20:45+0100\n"
+"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
+"Language-Team: Proxecto Trasno <proxecto@trasno.gal>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 3.36.0\n"
+"X-Generator: Gtranslator 3.38.0\n"
 "X-Project-Style: gnome\n"

 #: data/org.gnome.gnome-screenshot.gschema.xml:11
@@ -82,11 +81,11 @@ msgstr "Incluír o punteiro na captura de pantalla"

 #: data/org.gnome.gnome-screenshot.gschema.xml:36
 msgid "Include ICC Profile"
-msgstr "Incluír perfíl ICC"
+msgstr "Incluír perfil ICC"

 #: data/org.gnome.gnome-screenshot.gschema.xml:37
 msgid "Include the ICC profile of the target in the screenshot file"
-msgstr "Incluír o perfíl ICC do destino no ficheiro de captura de pantalla"
+msgstr "Incluír o perfil ICC do destino no ficheiro de captura de pantalla"

 #: data/org.gnome.gnome-screenshot.gschema.xml:41
 msgid "Default file type extension"
@@ -97,13 +96,13 @@ msgid "The default file type extension for screenshots."
 msgstr ""
 "A extensión do tipo de ficheiro predeterminado para as capturas de pantalla."

-#: data/org.gnome.Screenshot.desktop.in:3 src/screenshot-application.c:749
-#: src/screenshot-application.c:819
+#: data/org.gnome.Screenshot.desktop.in:3 src/screenshot-application.c:741
+#: src/screenshot-application.c:811
 msgid "Screenshot"
 msgstr "Captura de pantalla"

 #: data/org.gnome.Screenshot.desktop.in:4
-#: data/org.gnome.Screenshot.metainfo.xml.in:8 src/screenshot-application.c:750
+#: data/org.gnome.Screenshot.metainfo.xml.in:8 src/screenshot-application.c:742
 msgid "Save images of your screen or individual windows"
 msgstr "Gardar imaxes da súa pantalla ou de xanelas individuais"

@@ -132,7 +131,7 @@ msgid ""
 "screenshot directly into the GNOME clipboard and paste it into other "
 "applications."
 msgstr ""
-"Captura de pantalla de NGOME é unha utilidade sinxela que lle permite sacar "
+"Captura de pantalla de GNOME é unha utilidade sinxela que lle permite sacar "
 "imaxes da pantalla do seu computador. As capturar poden ser de toda a "
 "pantalla, dunha aplicación específica ou un área rectangular seleccionada. "
 "Tamén pode copiar as capturas feitas directamente no portapapeis de GNOME e "
@@ -167,7 +166,7 @@ msgstr "C_opiar no portapapeis"
 msgid "_Name:"
 msgstr "_Nome:"

-#: data/ui/screenshot-dialog.ui:110
+#: data/ui/screenshot-dialog.ui:111
 msgid "_Folder:"
 msgstr "_Cartafol:"

@@ -221,9 +220,8 @@ msgstr "Xa existe un ficheiro chamado «%s» en «%s»"
 msgid "Overwrite existing file?"
 msgstr "Sobrescribir o ficheiro existente?"

-#: src/screenshot-application.c:169 src/screenshot-application.c:178
-#: src/screenshot-application.c:428 src/screenshot-application.c:432
-#: src/screenshot-application.c:474 src/screenshot-application.c:477
+#: src/screenshot-application.c:169 src/screenshot-application.c:427
+#: src/screenshot-application.c:470
 msgid "Unable to capture a screenshot"
 msgstr "Non foi posíbel tomar unha captura de pantalla"

@@ -233,31 +231,27 @@ msgstr ""
 "Produciuse un erro ao crear o ficheiro. Seleccione outra localización e "
 "ténteo de novo."

-#: src/screenshot-application.c:429
+#: src/screenshot-application.c:428
 msgid "Error creating file"
 msgstr "Produciuse un erro ao crear o ficheiro"

-#: src/screenshot-application.c:440 src/screenshot-application.c:491
-msgid "Screenshot taken"
-msgstr "Captura de pantalla feita"
-
-#: src/screenshot-application.c:475
+#: src/screenshot-application.c:471
 msgid "All possible methods failed"
 msgstr "Fallaron todos os métodos posíbeis"

-#: src/screenshot-application.c:592
+#: src/screenshot-application.c:584
 msgid "Send the grab directly to the clipboard"
 msgstr "Enviar directamente o obtido ao portapapeis"

-#: src/screenshot-application.c:593
+#: src/screenshot-application.c:585
 msgid "Grab a window instead of the entire screen"
 msgstr "Capturar unha xanela en vez de toda a pantalla"

-#: src/screenshot-application.c:594
+#: src/screenshot-application.c:586
 msgid "Grab an area of the screen instead of the entire screen"
 msgstr "Capturar unha área da pantalla en vez de toda a pantalla"

-#: src/screenshot-application.c:595
+#: src/screenshot-application.c:587
 msgid ""
 "Include the window border with the screenshot. This option is deprecated and "
 "window border is always included"
@@ -265,7 +259,7 @@ msgstr ""
 "Incluír o borde da xanela nas capturas. Esta opción está obsoleta e o borde "
 "de xanela inclúese sempre"

-#: src/screenshot-application.c:596
+#: src/screenshot-application.c:588
 msgid ""
 "Remove the window border from the screenshot. This option is deprecated and "
 "window border is always included"
@@ -273,23 +267,20 @@ msgstr ""
 "Quitar o borde da xanela nas capturas. Esta opción está obsoleta e o borde "
 "de xanela inclúese sempre"

-#: src/screenshot-application.c:597
+#: src/screenshot-application.c:589
 msgid "Include the pointer with the screenshot"
 msgstr "Incluír o punteiro na captura de pantalla"

-#: src/screenshot-application.c:598
+#: src/screenshot-application.c:590
 msgid "Take screenshot after specified delay [in seconds]"
 msgstr ""
 "Facer a captura de pantalla despois do atraso especificado [en segundos]"

-#: src/screenshot-application.c:598
+#: src/screenshot-application.c:590
 msgid "seconds"
 msgstr "segundos"

-#: src/screenshot-application.c:599
-#| msgid ""
-#| "Effect to add to the border (shadow, border, vintage or none). Note: This "
-#| "option is deprecated and is assumed to be none"
+#: src/screenshot-application.c:591
 msgid ""
 "Effect to add to the border (‘shadow’, ‘border’, ‘vintage’ or ‘none’). Note: "
 "This option is deprecated and is assumed to be ‘none’"
@@ -297,27 +288,27 @@ msgstr ""
 "Efecto a engadir ao bordo («sombra», «bordo», «antigo» ou «ningún»). Nota: "
 "Esta opción está obsoleta e asúmese como «ningún»."

-#: src/screenshot-application.c:599
+#: src/screenshot-application.c:591
 msgid "effect"
 msgstr "efecto"

-#: src/screenshot-application.c:600
+#: src/screenshot-application.c:592
 msgid "Interactively set options"
 msgstr "Definir as opcións interactivamente"

-#: src/screenshot-application.c:601
+#: src/screenshot-application.c:593
 msgid "Save screenshot directly to this file"
 msgstr "Gardar a captura de pantalla directamente neste ficheiro"

-#: src/screenshot-application.c:601
+#: src/screenshot-application.c:593
 msgid "filename"
 msgstr "nome-de-ficheiro"

-#: src/screenshot-application.c:602
+#: src/screenshot-application.c:594
 msgid "Print version information and exit"
 msgstr "Mostrar información da versión e saír"

-#: src/screenshot-application.c:752
+#: src/screenshot-application.c:744
 msgid "translator-credits"
 msgstr ""
 "Fran Diéguez <frandieguez@gnome.org>, 2009-2020 \n"
@@ -332,7 +323,7 @@ msgstr ""
 "Proxecto Trasno - Tradución de software libre ao galego <proxecto@trasno."
 "net>, 1999-2012"

-#: src/screenshot-config.c:102
+#: src/screenshot-config.c:101
 msgid ""
 "Conflicting options: --window and --area should not be used at the same "
 "time.\n"
@@ -364,10 +355,13 @@ msgstr "Captura de pantalla de %s.%s.png"
 msgid "Screenshot from %s - %d.%s"
 msgstr "Captura de pantalla de %s - %d.%s.png"

-#: src/screenshot-utils.c:161
+#: src/screenshot-utils.c:127
 msgid "Error loading the help page"
 msgstr "Produciuse un erro ao cargar a páxina de axuda"

+#~ msgid "Screenshot taken"
+#~ msgstr "Captura de pantalla feita"
+
 #~ msgid "Include Border"
 #~ msgstr "Incluír bordo"


--- a/po/pa.po
+++ b/po/pa.po
--- a/src/screenshot-application.c
+++ b/src/screenshot-application.c
@@ -724,6 +724,7 @@ action_about (GSimpleAction *action,
    "Emmanuele Bassi",
    "Jonathan Blandford",
    "Cosimo Cecchi",
+    "Alexander Mikhaylenko",
    NULL
  };