Merge ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master

[Andrea Azzarone]

Merge with debian.

I had to revert changes to always show the save dialog in Ubuntu because that behaviour would conflict with the one specified in the "shortcuts" page in Gnome Control Center where it is explicitly mentioned that the shorcuts saves the screenshot in Pictures directly.

[Khurshid Alam (khurshid-alam)]

Why the save dialog was dropped? For a control center message ? Please see the discussion in the bug: https://bugs.launchpad.net/ubuntu/+source/gnome-screenshot/+bug/927952

We need headerbar patch in Unity. Without it the save window simply loses focus (another bug).

[Andrea Azzarone (azzar1)]

> Why the save dialog was dropped? For a control center message ? Please see the
> discussion in the bug: https://bugs.launchpad.net/ubuntu/+source/gnome-
> screenshot/+bug/927952

The save dialog was not dropped in unity. I tried to re-introduce it in gnome-shell but there are several issues:
- the strings in gnome-control-center
- in a gnome-shell session, when pressing "Print" the one taking the screenshot is gnome-settings-daemon using DIRECTLY the gnome-shell API. gnome-screenshot is not used anymore. This is has to be fixed in gnome-shell and/or in gnome-settings-daemon. I'm afraid it's too late for this cycle.

>
> We need headerbar patch in Unity. Without it the save window simply loses
> focus (another bug).

We no loger support Unity. Feel free to propose it and I'll be happy to review it.

[Sebastien Bacher (seb128)]

Thanks

review: Approve

diff --git a/NEWS b/NEWS
index 3726ea5..e2ffeb9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+GNOME Screenshot 3.30.0 - 3rd September 2018
+===========================================
+
+- Minor build system improvements [Emmanuele Bassi,
+  Jasper Lievisse Adriaanse, Piotr Drąg]
+- Fix grammar mistake in man page [Matthew Leeds]
+- Translation updates
+
 GNOME Screenshot 3.26.0 - 30th October 2017
 ===========================================
 
diff --git a/configure b/configure
 deleted file mode 100755
index 5df660f..0000000
--- a/configure
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/bash
-# configure script adapter for Meson
-# Based on build-api: https://github.com/cgwalters/build-api
-# Copyright 2010, 2011, 2013 Colin Walters <[e-mail]>
-# Copyright 2016, 2017 Emmanuele Bassi
-# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
-
-# Build API variables:
-
-# Little helper function for reading args from the commandline.
-# it automatically handles -a b and -a=b variants, and returns 1 if
-# we need to shift $3.
-read_arg() {
-    # $1 = arg name
-    # $2 = arg value
-    # $3 = arg parameter
-    local rematch='^[^=]*=(.*)$'
-    if [[ $2 =~ $rematch ]]; then
-	read "$1" <<< "${BASH_REMATCH[1]}"
-    else
-	read "$1" <<< "$3"
-	# There is no way to shift our callers args, so
-	# return 1 to indicate they should do it instead.
-	return 1
-    fi
-}
-
-sanitycheck() {
-    # $1 = arg name
-    # $1 = arg command
-    # $2 = arg alternates
-    local cmd=$( which $2 2>/dev/null )
-
-    if [ -x "$cmd" ]; then
-        read "$1" <<< "$cmd"
-        return 0
-    fi
-
-    test -z $3 || {
-        for alt in $3; do
-            cmd=$( which $alt 2>/dev/null )
-
-            if [ -x "$cmd" ]; then
-                read "$1" <<< "$cmd"
-                return 0
-            fi
-        done
-    }
-
-    echo -e "\e[1;31mERROR\e[0m: Command '$2' not found"
-    exit 1
-}
-
-sanitycheck MESON 'meson'
-sanitycheck MESONTEST 'mesontest'
-sanitycheck NINJA 'ninja' 'ninja-build'
-
-while (($# > 0)); do
-    case "${1%%=*}" in
-	--prefix) read_arg prefix "$@" || shift;;
-	--bindir) read_arg bindir "$@" || shift;;
-	--sbindir) read_arg sbindir "$@" || shift;;
-	--libexecdir) read_arg libexecdir "$@" || shift;;
-	--datarootdir) read_arg datarootdir "$@" || shift;;
-	--datadir) read_arg datadir "$@" || shift;;
-	--sysconfdir) read_arg sysconfdir "$@" || shift;;
-	--libdir) read_arg libdir "$@" || shift;;
-	--mandir) read_arg mandir "$@" || shift;;
-	--includedir) read_arg includedir "$@" || shift;;
-	*) echo -e "\e[1;33mINFO\e[0m: Ignoring unknown option '$1'";;
-    esac
-    shift
-done
-
-# Defaults
-test -z ${prefix} && prefix="/usr/local"
-test -z ${bindir} && bindir=${prefix}/bin
-test -z ${sbindir} && sbindir=${prefix}/sbin
-test -z ${libexecdir} && libexecdir=${prefix}/bin
-test -z ${datarootdir} && datarootdir=${prefix}/share
-test -z ${datadir} && datadir=${datarootdir}
-test -z ${sysconfdir} && sysconfdir=${prefix}/etc
-test -z ${libdir} && libdir=${prefix}/lib
-test -z ${mandir} && mandir=${prefix}/share/man
-test -z ${includedir} && includedir=${prefix}/include
-
-# The source directory is the location of this file
-srcdir=$(dirname $0)
-
-# The build directory is the current location
-builddir=`pwd`
-
-# If we're calling this file from the source directory then
-# we automatically create a build directory and ensure that
-# both Meson and Ninja invocations are relative to that
-# location
-if [[ -f "${builddir}/meson.build" ]]; then
-  mkdir -p _build
-  builddir="${builddir}/_build"
-  NINJA_OPT="-C ${builddir}"
-fi
-
-# Wrapper Makefile for Ninja
-cat > Makefile <<END
-# Generated by configure; do not edit
-
-all:
-	CC="\$(CC)" CXX="\$(CXX)" ${NINJA} ${NINJA_OPT}
-
-install:
-	DESTDIR="\$(DESTDIR)" ${NINJA} ${NINJA_OPT} install
-
-check:
-	${MESONTEST} ${NINJA_OPT}
-END
-
-echo "Summary:"
-echo "  meson:....... ${MESON}"
-echo "  ninja:....... ${NINJA}"
-echo "  prefix:...... ${prefix}"
-echo "  bindir:...... ${bindir}"
-echo "  sbindir:..... ${sbindir}"
-echo "  libexecdir:.. ${libexecdir}"
-echo "  datarootdir:. ${datarootdir}"
-echo "  datadir:..... ${datadir}"
-echo "  sysconfdir:.. ${sysconfdir}"
-echo "  libdir:...... ${libdir}"
-echo "  mandir:...... ${mandir}"
-echo "  includedir:.. ${includedir}"
-
-exec ${MESON} \
-	--prefix=${prefix} \
-	--libdir=${libdir} \
-	--libexecdir=${libexecdir} \
-	--datadir=${datadir} \
-	--sysconfdir=${sysconfdir} \
-	--bindir=${bindir} \
-	--includedir=${includedir} \
-	--mandir=${mandir} \
-	${builddir} \
-	${srcdir}
-
-# vim: ai ts=8 noet sts=2 ft=sh
diff --git a/debian/changelog b/debian/changelog
index 63d0b30..b058d12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,60 @@
+gnome-screenshot (3.30.0-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with Debian. Remaining Ubuntu changes:
+    - 0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch:
+      + Fix flash breaking on GTK+ 3.16.
+    - unity.patch:
+      + When running in Unity don't use GNOME shell D-Bus interface and show
+        the save dialog by default.
+      + Drop changes to disable GtkHeaderBar in Unity.
+    - update_unity_list.patch:
+      + Disable the Current Window .desktop Action since it doesn't work in
+        the default Ubuntu desktop
+
+ -- Andrea Azzarone <[e-mail]>  Mon, 10 Sep 2018 12:28:40 +0200
+
+gnome-screenshot (3.30.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Sat, 08 Sep 2018 00:37:00 +0200
+
+gnome-screenshot (3.26.0-3) unstable; urgency=medium
+
+  * Update Vcs fields for migration to https://salsa.debian.org/
+  * Bump debhelper compat to 11
+
+ -- Jeremy Bicha <[e-mail]>  Mon, 22 Jan 2018 21:30:48 -0500
+
+gnome-screenshot (3.26.0-2) unstable; urgency=medium
+
+  * Update Vcs fields for conversion to git
+  * Add debian/gbp.conf
+  * Bump Standards-Version to 4.1.2
+
+ -- Jeremy Bicha <[e-mail]>  Fri, 15 Dec 2017 13:46:45 -0500
+
+gnome-screenshot (3.26.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.1.1
+
+ -- Michael Biebl <[e-mail]>  Wed, 01 Nov 2017 16:46:40 +0100
+
 gnome-screenshot (3.26.0-0ubuntu1) cosmic; urgency=medium
 
   * New upstream version
 
  -- Sebastien Bacher <[e-mail]>  Sat, 07 Jul 2018 16:57:33 +0200
 
+gnome-screenshot (3.25.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * Build with meson
+  * Bump Standards-Version to 4.1.0
+
+ -- Jeremy Bicha <[e-mail]>  Wed, 30 Aug 2017 11:27:58 -0400
+
 gnome-screenshot (3.25.0-0ubuntu2) artful; urgency=medium
 
   * Modify update_unity_list.patch:
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index d3182ce..9ed94ee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 # This file is autogenerated. DO NOT EDIT!
-# 
+#
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
 Source: gnome-screenshot
@@ -9,7 +9,7 @@ Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Michael Biebl <[e-mail]>, Sjoerd Simons <[e-mail]>
 Build-Depends: appstream,
-               debhelper (>= 10.3),
+               debhelper (>= 11),
                gnome-pkg-tools (>= 0.10),
                libglib2.0-dev (>= 2.35.1),
                libgtk-3-dev (>= 3.10.0),
@@ -17,7 +17,7 @@ Build-Depends: appstream,
                libxext-dev,
                libx11-dev,
                meson (>= 0.40.1)
-Standards-Version: 3.9.8
+Standards-Version: 4.1.2
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-screenshot
 XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-screenshot.git
 Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-screenshot
diff --git a/debian/control.in b/debian/control.in
index 35532ae..ac2c2fb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Build-Depends: appstream,
-               debhelper (>= 10.3),
+               debhelper (>= 11),
                gnome-pkg-tools (>= 0.10),
                libglib2.0-dev (>= 2.35.1),
                libgtk-3-dev (>= 3.10.0),
@@ -13,7 +13,7 @@ Build-Depends: appstream,
                libxext-dev,
                libx11-dev,
                meson (>= 0.40.1)
-Standards-Version: 3.9.8
+Standards-Version: 4.1.2
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-screenshot
 XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-screenshot.git
 Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-screenshot
diff --git a/debian/copyright b/debian/copyright
index f987e3d..e7d8cc8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,7 +18,7 @@ License: GPL-2+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ along with this program. If not, see <https://www.gnu.org/licenses/>
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/patches/0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch b/debian/patches/0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch
index 40f29c6..7ab8516 100644
--- a/debian/patches/0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch
+++ b/debian/patches/0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch
@@ -1,4 +1,3 @@
-From a846198d824cd8dd39d37d869607cdb2193dbd83 Mon Sep 17 00:00:00 2001
 From: Iain Lane <[e-mail]>
 Date: Mon, 8 Jun 2015 13:32:21 +0100
 Subject: [PATCH 1/2] cheese-flash: Don't set a GdkVisual: it makes the flash
@@ -37,6 +36,3 @@ index f60cd56..51155bd 100644
    /* Don't consume input */
    gtk_widget_realize (GTK_WIDGET (window));
  
--- 
-2.1.4
-
diff --git a/debian/patches/unity.patch b/debian/patches/unity.patch
index 63338ba..6e8155f 100644
--- a/debian/patches/unity.patch
+++ b/debian/patches/unity.patch
@@ -1,4 +1,3 @@
-From 2daf2aab3435c4867a4e8265ff53af2c2747ce29 Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
 Date: Thu, 4 Dec 2014 14:30:34 +1300
 Subject: [PATCH] Adjust when running under Unity.
@@ -7,18 +6,16 @@ Don't use GtkHeaderBar.
 Show the save dialog by default.
 Don't try and use the GNOME Shell D-Bus interface.
 ---
- src/screenshot-application.c        |  4 ++--
- src/screenshot-config.c             | 21 +++++++++++++++++++++
- src/screenshot-config.h             |  1 +
- src/screenshot-dialog.c             | 21 +++++++++++++++++++++
- src/screenshot-interactive-dialog.c |  9 +++++++++
- src/screenshot-utils.c              |  4 ++++
- 6 files changed, 58 insertions(+), 2 deletions(-)
+ src/screenshot-application.c |  4 ++--
+ src/screenshot-config.c      | 21 +++++++++++++++++++++
+ src/screenshot-config.h      |  1 +
+ src/screenshot-utils.c       |  4 ++++
+ 4 files changed, 28 insertions(+), 2 deletions(-)
 
-Index: gnome-screenshot-3.26.0/src/screenshot-application.c
-===================================================================
---- gnome-screenshot-3.26.0.orig/src/screenshot-application.c
-+++ gnome-screenshot-3.26.0/src/screenshot-application.c
+diff --git a/src/screenshot-application.c b/src/screenshot-application.c
+index 672c9ce..aa87f41 100644
+--- a/src/screenshot-application.c
++++ b/src/screenshot-application.c
 @@ -135,7 +135,7 @@ static void
  save_pixbuf_handle_error (ScreenshotApplication *self,
                            GError *error)
@@ -28,7 +25,7 @@ Index: gnome-screenshot-3.26.0/src/screenshot-application.c
      {
        ScreenshotDialog *dialog = self->priv->dialog;
  
-@@ -477,7 +477,7 @@ build_filename_ready_cb (GObject *source
+@@ -477,7 +477,7 @@ build_filename_ready_cb (GObject *source,
  
    screenshot_play_sound_effect ("screen-capture", _("Screenshot taken"));
  
@@ -37,11 +34,11 @@ Index: gnome-screenshot-3.26.0/src/screenshot-application.c
      {
        self->priv->dialog = screenshot_dialog_new (self->priv->screenshot,
                                                    self->priv->save_uri,
-Index: gnome-screenshot-3.26.0/src/screenshot-config.c
-===================================================================
---- gnome-screenshot-3.26.0.orig/src/screenshot-config.c
-+++ gnome-screenshot-3.26.0/src/screenshot-config.c
-@@ -171,3 +171,24 @@ screenshot_config_parse_command_line (gb
+diff --git a/src/screenshot-config.c b/src/screenshot-config.c
+index c095f24..1d0fb4b 100644
+--- a/src/screenshot-config.c
++++ b/src/screenshot-config.c
+@@ -171,3 +171,24 @@ screenshot_config_parse_command_line (gboolean clipboard_arg,
  
    return TRUE;
  }
@@ -66,11 +63,11 @@ Index: gnome-screenshot-3.26.0/src/screenshot-config.c
 +
 +  return in_list;
 +}
-Index: gnome-screenshot-3.26.0/src/screenshot-config.h
-===================================================================
---- gnome-screenshot-3.26.0.orig/src/screenshot-config.h
-+++ gnome-screenshot-3.26.0/src/screenshot-config.h
-@@ -62,6 +62,7 @@ gboolean	screenshot_config_parse_command
+diff --git a/src/screenshot-config.h b/src/screenshot-config.h
+index ff7e473..312415f 100644
+--- a/src/screenshot-config.h
++++ b/src/screenshot-config.h
+@@ -62,6 +62,7 @@ gboolean	screenshot_config_parse_command_line	(gboolean clipboard_arg,
  							 guint delay_arg,
  							 gboolean interactive_arg,
  							 const gchar *file_arg);
@@ -78,100 +75,11 @@ Index: gnome-screenshot-3.26.0/src/screenshot-config.h
  
  G_END_DECLS
  
-Index: gnome-screenshot-3.26.0/src/screenshot-dialog.c
-===================================================================
---- gnome-screenshot-3.26.0.orig/src/screenshot-dialog.c
-+++ gnome-screenshot-3.26.0/src/screenshot-dialog.c
-@@ -230,6 +230,31 @@ screenshot_dialog_new (GdkPixbuf
-   g_assert (res != 0);
- 
-   dialog->dialog = GTK_WIDGET (gtk_builder_get_object (ui, "toplevel"));
-+  if (in_desktop ("Unity"))
-+    {
-+      GtkWidget *grid, *button_box;
-+
-+      gtk_window_set_titlebar (GTK_WINDOW (dialog->dialog), NULL);
-+
-+      grid = GTK_WIDGET (gtk_builder_get_object (ui, "grid1"));
-+      button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-+      gtk_widget_show (button_box);
-+      gtk_grid_attach (GTK_GRID (grid), button_box, 0, 2, 3, 1);
-+
-+      dialog->copy_button = gtk_button_new_with_mnemonic (_("C_opy to Clipboard"));
-+      gtk_widget_show (dialog->copy_button);
-+      gtk_container_add (GTK_CONTAINER (button_box), dialog->copy_button);
-+
-+      dialog->save_button = gtk_widget_new (GTK_TYPE_BUTTON,
-+              "label", _("_Save"),
-+              "use-underline", TRUE,
-+              "can-default", TRUE,
-+              NULL);
-+      gtk_window_set_default (GTK_WINDOW (dialog->dialog), dialog->save_button);
-+
-+      gtk_widget_show (dialog->save_button);
-+      gtk_container_add (GTK_CONTAINER (button_box), dialog->save_button);
-+    }
-   gtk_window_set_application (GTK_WINDOW (dialog->dialog), GTK_APPLICATION (g_application_get_default ()));
-   gtk_widget_realize (dialog->dialog);
-   g_signal_connect (dialog->dialog, "key-press-event",
-@@ -241,9 +266,11 @@ screenshot_dialog_new (GdkPixbuf
-   gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget), current_folder);
-   gtk_entry_set_text (GTK_ENTRY (dialog->filename_entry), current_name);
- 
--  dialog->save_button = GTK_WIDGET (gtk_builder_get_object (ui, "save_button"));
-+  if (!dialog->save_button)
-+    dialog->save_button = GTK_WIDGET (gtk_builder_get_object (ui, "save_button"));
-   g_signal_connect (dialog->save_button, "clicked", G_CALLBACK (button_clicked), dialog);
--  dialog->copy_button = GTK_WIDGET (gtk_builder_get_object (ui, "copy_button"));
-+  if (!dialog->copy_button)
-+    dialog->copy_button = GTK_WIDGET (gtk_builder_get_object (ui, "copy_button"));
-   g_signal_connect (dialog->copy_button, "clicked", G_CALLBACK (button_clicked), dialog);
-   dialog->back_button = GTK_WIDGET (gtk_builder_get_object (ui, "back_button"));
-   g_signal_connect (dialog->back_button, "clicked", G_CALLBACK (button_clicked), dialog);
-Index: gnome-screenshot-3.26.0/src/screenshot-interactive-dialog.c
-===================================================================
---- gnome-screenshot-3.26.0.orig/src/screenshot-interactive-dialog.c
-+++ gnome-screenshot-3.26.0/src/screenshot-interactive-dialog.c
-@@ -446,10 +446,14 @@ screenshot_interactive_dialog_new (Captu
- 
-   dialog = gtk_application_window_new (GTK_APPLICATION (g_application_get_default ()));
- 
-+  if (!in_desktop ("Unity")) {
-   header_bar = gtk_header_bar_new ();
-   gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header_bar), TRUE);
-   gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (header_bar), "menu");
-   gtk_window_set_titlebar (GTK_WINDOW (dialog), header_bar);
-+  }
-+  else
-+    header_bar = NULL;
- 
-   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-   gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
-@@ -476,7 +480,11 @@ screenshot_interactive_dialog_new (Captu
-   data->user_data = user_data;
-   g_signal_connect (button, "clicked", G_CALLBACK (capture_button_clicked_cb), data);
-   gtk_size_group_add_widget (size_group, button);
-+  if (header_bar)
-   gtk_header_bar_pack_end (GTK_HEADER_BAR (header_bar), button);
-+  else
-+    gtk_container_add (GTK_CONTAINER (button_box), button);
-+
-   gtk_widget_set_can_default (button, TRUE);
-   gtk_widget_grab_default (button);
-   g_signal_connect (dialog, "key-press-event",
-@@ -486,6 +494,7 @@ screenshot_interactive_dialog_new (Captu
-   button = gtk_button_new_with_mnemonic (_("_Cancel"));
-   gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
-   gtk_size_group_add_widget (size_group, button);
-+  if (header_bar)
-   gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar), button);
-   g_signal_connect_swapped (button, "clicked",
-                             G_CALLBACK (gtk_widget_destroy), dialog);
-Index: gnome-screenshot-3.26.0/src/screenshot-utils.c
-===================================================================
---- gnome-screenshot-3.26.0.orig/src/screenshot-utils.c
-+++ gnome-screenshot-3.26.0/src/screenshot-utils.c
-@@ -631,6 +631,9 @@ screenshot_get_pixbuf (GdkRectangle *rec
+diff --git a/src/screenshot-utils.c b/src/screenshot-utils.c
+index fb2166d..7a819df 100644
+--- a/src/screenshot-utils.c
++++ b/src/screenshot-utils.c
+@@ -631,6 +631,9 @@ screenshot_get_pixbuf (GdkRectangle *rectangle)
                                       filename);
      }
  
@@ -181,7 +89,7 @@ Index: gnome-screenshot-3.26.0/src/screenshot-utils.c
    connection = g_application_get_dbus_connection (g_application_get_default ());
    g_dbus_connection_call_sync (connection,
                                 "org.gnome.Shell.Screenshot",
-@@ -660,6 +663,7 @@ screenshot_get_pixbuf (GdkRectangle *rec
+@@ -660,6 +663,7 @@ screenshot_get_pixbuf (GdkRectangle *rectangle)
  
        screenshot = screenshot_fallback_get_pixbuf (rectangle);
      }
diff --git a/debian/patches/update_unity_list.patch b/debian/patches/update_unity_list.patch
index d3ffef5..70b50fc 100644
--- a/debian/patches/update_unity_list.patch
+++ b/debian/patches/update_unity_list.patch
@@ -1,12 +1,16 @@
-Description: Add quicklist area-shot option
+From: Ubuntu Developers <[e-mail]>
+Date: Fri, 7 Sep 2018 17:27:22 +0200
+Subject: Add quicklist area-shot option
 
 ---
- src/org.gnome.Screenshot.desktop.in |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ src/org.gnome.Screenshot.desktop.in | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
+diff --git a/src/org.gnome.Screenshot.desktop.in b/src/org.gnome.Screenshot.desktop.in
+index 73b4d02..4e2643b 100644
 --- a/src/org.gnome.Screenshot.desktop.in
 +++ b/src/org.gnome.Screenshot.desktop.in
-@@ -12,7 +12,9 @@ NotShowIn=KDE;
+@@ -14,7 +14,9 @@ NotShowIn=KDE;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-utils
  X-GNOME-Bugzilla-Component=screenshot
@@ -17,7 +21,7 @@ Description: Add quicklist area-shot option
  DBusActivatable=true
  
  [Desktop Action screen-shot]
-@@ -22,3 +22,7 @@ Exec=gnome-screenshot
+@@ -24,3 +26,7 @@ Exec=gnome-screenshot
  [Desktop Action window-shot]
  Name=Take a Screenshot of the Current Window
  Exec=gnome-screenshot -w
diff --git a/debian/rules b/debian/rules
index 8a1c123..0552714 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
-
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
 
 %:
 	dh $@ --with gnome --buildsystem=meson
diff --git a/meson.build b/meson.build
index eb437d8..b42c345 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-screenshot', 'c',
-        version: '3.26.0',
+        version: '3.30.0',
         license: 'GPLv2+',
         meson_version: '>= 0.40.1',
         default_options: [
diff --git a/po/Makevars b/po/Makevars
 deleted file mode 100644
index 1452c4e..0000000
--- a/po/Makevars
+++ /dev/null
@@ -1,78 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = GNOME Screenshot authors
-
-# This tells whether or not to prepend "GNU " prefix to the package
-# name that gets inserted into the header of the $(DOMAIN).pot file.
-# Possible values are "yes", "no", or empty.  If it is empty, try to
-# detect it automatically by scanning the files in $(top_srcdir) for
-# "GNU packagename" string.
-PACKAGE_GNU = no
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-screenshot&keywords=I18N+L10N&component=general
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
-# context.  Possible values are "yes" and "no".  Set this to yes if the
-# package uses functions taking also a message context, like pgettext(), or
-# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = no
-
-# These options get passed to msgmerge.
-# Useful options are in particular:
-#   --previous            to keep previous msgids of translated messages,
-#   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed.  Possible values are "yes" and "no".  Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = yes
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = yes
diff --git a/po/af.po b/po/af.po
index a480ff6..689e0b6 100644
--- a/po/af.po
+++ b/po/af.po
@@ -2,338 +2,420 @@
 # Copyright (C) 2010 gnome-utils's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-utils package.
 # F Wolff <[e-mail]>, 2010, 2013.
+# Pieter Schoeman <[e-mail]>, 2017.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "screenshot&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-07-18 11:24+0000\n"
-"PO-Revision-Date: 2013-09-24 13:34+0200\n"
-"Last-Translator: F Wolff <[e-mail]>\n"
-"Language-Team: [e-mail]\n"
+"POT-Creation-Date: 2018-01-17 20:24+0000\n"
+"PO-Revision-Date: 2018-02-06 18:31+0200\n"
+"Last-Translator: Pieter Schalk Schoeman <[e-mail]>\n"
+"Language-Team: Afrikaans <[e-mail]>\n"
 "Language: af\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: Virtaal 0.7.1\n"
+"X-Generator: Poedit 2.0.3\n"
 "X-Project-Style: gnome\n"
 
-#: ../src/gnome-screenshot.desktop.in.h:1 ../src/screenshot-application.c:777
-msgid "Screenshot"
-msgstr "Skermskoot"
-
-#: ../src/gnome-screenshot.desktop.in.h:2 ../src/screenshot-application.c:778
-msgid "Save images of your screen or individual windows"
-msgstr "Stoor beelde van die skerm of individuele vensters"
-
-#: ../src/gnome-screenshot.desktop.in.h:3
-msgid "snapshot;capture;print;"
-msgstr "skermskoot;kiekie;snapshot;capture;print;"
-
-#: ../src/gnome-screenshot.desktop.in.h:4
-msgid "Take a Screenshot of the Whole Screen"
-msgstr "Neem 'n skoot van die hele skerm"
-
-#: ../src/gnome-screenshot.desktop.in.h:5
-msgid "Take a Screenshot of the Current Window"
-msgstr "Neem 'n skoot van die huidige venster"
-
-#: ../src/screenshot-app-menu.ui.h:1
-msgid "About Screenshot"
-msgstr "Aangaande Skermskoot"
-
-#: ../src/screenshot-app-menu.ui.h:2
-msgid "Help"
-msgstr "Hulp"
-
-#: ../src/screenshot-app-menu.ui.h:3
-msgid "Quit"
-msgstr "Sluit af"
-
-#: ../src/screenshot-dialog.ui.h:1
-msgid "Save Screenshot"
-msgstr "Stoor skermskoot"
-
-#: ../src/screenshot-dialog.ui.h:2
-msgid "_Name:"
-msgstr "_Naam:"
-
-#: ../src/screenshot-dialog.ui.h:3
-msgid "Save in _folder:"
-msgstr "Stoor in 'n _gids:"
-
-#: ../src/screenshot-dialog.ui.h:4
-msgid "C_opy to Clipboard"
-msgstr "K_opieer na die knipbord"
-
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:1
+#: src/org.gnome.gnome-screenshot.gschema.xml:11
 msgid "Window-specific screenshot (deprecated)"
-msgstr ""
+msgstr "Venster spesifieke skermskoot (afgekeur)"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:2
+#: src/org.gnome.gnome-screenshot.gschema.xml:12
 msgid ""
 "Grab just the current window, rather than the whole desktop. This key has "
 "been deprecated and it is no longer in use."
 msgstr ""
+"Gryp slegs die huidige venster, eerder as die hele werkskerm. Die sleutel is "
+"afgekeur en is nie meer in gebruik nie."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3
+#: src/org.gnome.gnome-screenshot.gschema.xml:16
 msgid "Screenshot delay"
-msgstr ""
+msgstr "Skermskootvertraging"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:4
+#: src/org.gnome.gnome-screenshot.gschema.xml:17
 msgid "The number of seconds to wait before taking the screenshot."
-msgstr ""
+msgstr "Die aantal sekondes om te wag voor die skermskoot geneem word."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:5
+#: src/org.gnome.gnome-screenshot.gschema.xml:21
 msgid "Screenshot directory"
-msgstr ""
+msgstr "Skermskoot gids"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:6
+#: src/org.gnome.gnome-screenshot.gschema.xml:22
 msgid "The directory where the screenshots will be saved by default."
-msgstr ""
+msgstr "Die gids waar die skermskoot by verstek gestoor word."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:7
+#: src/org.gnome.gnome-screenshot.gschema.xml:26
 msgid "Last save directory"
-msgstr ""
+msgstr "Gids waar die vorige skermskoot gestoor is"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:8
+#: src/org.gnome.gnome-screenshot.gschema.xml:27
 msgid "The last directory a screenshot was saved in interactive mode."
-msgstr ""
+msgstr "Gids waar die vorige skermskoot, in interaktiewe modus, gestoor is."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:9
+#: src/org.gnome.gnome-screenshot.gschema.xml:31
 msgid "Include Border"
-msgstr ""
+msgstr "Sluit vensterraam in"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:10
+#: src/org.gnome.gnome-screenshot.gschema.xml:32
 msgid "Include the window manager border along with the screenshot"
-msgstr ""
+msgstr "Sluit die vensterraa bestuurder raam met die skermskoot in"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:11
+#: src/org.gnome.gnome-screenshot.gschema.xml:36
 msgid "Include Pointer"
-msgstr ""
+msgstr "Sluit wyser In"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:12
+#: src/org.gnome.gnome-screenshot.gschema.xml:37
 msgid "Include the pointer in the screenshot"
-msgstr ""
+msgstr "Sluit die wyser in die skermskoot in"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:13
+#: src/org.gnome.gnome-screenshot.gschema.xml:41
 msgid "Include ICC Profile"
 msgstr "Sluit ICC-profiel in"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:14
+#: src/org.gnome.gnome-screenshot.gschema.xml:42
 msgid "Include the ICC profile of the target in the screenshot file"
 msgstr "Sluit die ICC-profiel van die teiken in by die skermskootlêer"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:15
+#: src/org.gnome.gnome-screenshot.gschema.xml:46
 msgid "Border Effect"
-msgstr ""
+msgstr "Vensterraam effek"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:16
+#: src/org.gnome.gnome-screenshot.gschema.xml:47
 msgid ""
-"Effect to add to the outside of a border. Possible values are \"shadow\", "
-"\"none\", and \"border\"."
+"Effect to add to the outside of a border. Possible values are “shadow”, "
+"“none”, and “border”."
 msgstr ""
+"Effek om buite die vensterraam aan te bring. Moontlike waardes is \"skaduwee"
+"\", \"geen\" en \"raam\"."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:17
+#: src/org.gnome.gnome-screenshot.gschema.xml:51
 msgid "Default file type extension"
-msgstr ""
+msgstr "Verstek lêertipe uitbreiding"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:18
+#: src/org.gnome.gnome-screenshot.gschema.xml:52
 msgid "The default file type extension for screenshots."
+msgstr "Die verstek lêertipe uitbreiding vir skermskote."
+
+#: src/org.gnome.Screenshot.desktop.in:3 src/screenshot-application.c:770
+#: src/screenshot-application.c:838
+msgid "Screenshot"
+msgstr "Skermskoot"
+
+#: src/org.gnome.Screenshot.desktop.in:4
+#: src/org.gnome.Screenshot.metainfo.xml.in:8 src/screenshot-application.c:771
+msgid "Save images of your screen or individual windows"
+msgstr "Stoor beelde van die skerm of individuele vensters"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: src/org.gnome.Screenshot.desktop.in:6
+msgid "snapshot;capture;print;screenshot;"
+msgstr "kiekie;opname;druk;skermskoot;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: src/org.gnome.Screenshot.desktop.in:11
+msgid "applets-screenshooter"
+msgstr "applets-screenshooter"
+
+#: src/org.gnome.Screenshot.desktop.in:22
+msgid "Take a Screenshot of the Whole Screen"
+msgstr "Neem 'n skoot van die hele skerm"
+
+#: src/org.gnome.Screenshot.desktop.in:26
+msgid "Take a Screenshot of the Current Window"
+msgstr "Neem 'n skoot van die huidige venster"
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:7
+msgid "GNOME Screenshot"
+msgstr "GNOME Skermskoot"
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:10
+msgid ""
+"GNOME Screenshot is a simple utility that lets you take pictures of your "
+"computer screen. Screenshots can be of your whole screen, any specific "
+"application, or a selected rectangular area. You can also copy the captured "
+"screenshot directly into the GNOME clipboard and paste it into other "
+"applications."
 msgstr ""
+"GNOME Skermskoot is 'n eenvoudige program waarmee jy foto's van jou "
+"rekenaarskerm kan neem. Skermskote kan van jou hele skerm, enige spesifieke "
+"toepassing, of 'n geselekteerde reghoekige area wees. U kan ook die "
+"afgeneemde skermskoot direk in die GNOME-knipbord kopieer en dit in ander "
+"toepassings plak."
 
-#: ../src/screenshot-application.c:144
+#: src/org.gnome.Screenshot.metainfo.xml.in:17
+msgid ""
+"GNOME Screenshot allows you to take screenshots even when it’s not open: "
+"just press the PrtSc button on your keyboard, and a snapshot of your whole "
+"screen will be saved to your Pictures folder. Hold Alt while pressing PrtSc "
+"and you will get a screenshot of only the currently selected window."
+msgstr ""
+"Met GNOME Skermskoot kan u skermskote neem, selfs al is dit nie oop is nie: "
+"druk net die PrtSc-knoppie op u sleutelbord en 'n foto van u hele skerm sal "
+"in u Prente-lêergids gestoor word. Hou Alt terwyl jy PrtSc druk en jy sal 'n "
+"skermskoot van slegs die huidige geselekteerde venster kry."
+
+#: src/screenshot-app-menu.ui:6
+msgid "Help"
+msgstr "Hulp"
+
+#: src/screenshot-app-menu.ui:10
+msgid "About"
+msgstr "Aangaande"
+
+#: src/screenshot-app-menu.ui:14
+msgid "Quit"
+msgstr "Sluit af"
+
+#: src/screenshot-application.c:151
 #, c-format
-msgid "A file named \"%s\" already exists in \"%s\""
+msgid "A file named “%s” already exists in “%s”"
 msgstr "'n Lêer genaamd \"%s\" bestaan reeds in \"%s\""
 
-#: ../src/screenshot-application.c:151
+#: src/screenshot-application.c:158
 msgid "Overwrite existing file?"
 msgstr "Oorskryf bestaande lêer?"
 
-#: ../src/screenshot-application.c:172 ../src/screenshot-application.c:181
-#: ../src/screenshot-application.c:461 ../src/screenshot-application.c:465
-#: ../src/screenshot-application.c:505 ../src/screenshot-application.c:508
+#: src/screenshot-application.c:180 src/screenshot-application.c:189
+#: src/screenshot-application.c:466 src/screenshot-application.c:470
+#: src/screenshot-application.c:510 src/screenshot-application.c:513
 msgid "Unable to capture a screenshot"
 msgstr "Kan nie 'n skermskoot neem nie"
 
-#: ../src/screenshot-application.c:173
+#: src/screenshot-application.c:181
 msgid "Error creating file. Please choose another location and retry."
 msgstr "Kan nie lêer skep nie. Kies gerus 'n ander ligging en probeer weer."
 
-#: ../src/screenshot-application.c:462
+#: src/screenshot-application.c:467
 msgid "Error creating file"
 msgstr "Kan nie lêer skep nie"
 
-#: ../src/screenshot-application.c:473 ../src/screenshot-application.c:538
+#: src/screenshot-application.c:478 src/screenshot-application.c:546
 msgid "Screenshot taken"
 msgstr "Skermskoot geneem"
 
-#: ../src/screenshot-application.c:506
+#: src/screenshot-application.c:511
 msgid "All possible methods failed"
 msgstr "Alle moontlike metodes het misluk"
 
-#: ../src/screenshot-application.c:639
+#: src/screenshot-application.c:634
 msgid "Send the grab directly to the clipboard"
 msgstr "Stuur die prentjie direk na die knipbord"
 
-#: ../src/screenshot-application.c:640
+#: src/screenshot-application.c:635
 msgid "Grab a window instead of the entire screen"
 msgstr "Gryp 'n venster en plaas van die hele skerm"
 
-#: ../src/screenshot-application.c:641
+#: src/screenshot-application.c:636
 msgid "Grab an area of the screen instead of the entire screen"
 msgstr "Gryp 'n area van die skerm in plaas van die hele skerm"
 
-#: ../src/screenshot-application.c:642
+#: src/screenshot-application.c:637
 msgid "Include the window border with the screenshot"
 msgstr "Sluit die vensterraam in by die skermskoot"
 
-#: ../src/screenshot-application.c:643
+#: src/screenshot-application.c:638
 msgid "Remove the window border from the screenshot"
 msgstr "Verwyder die vensterraam uit die skermskoot"
 
-#: ../src/screenshot-application.c:644
+#: src/screenshot-application.c:639
 msgid "Include the pointer with the screenshot"
 msgstr "Sluit die muiswyser in by die skermskoot"
 
-#: ../src/screenshot-application.c:645
+#: src/screenshot-application.c:640
 msgid "Take screenshot after specified delay [in seconds]"
 msgstr "Neem 'n skermskoot na 'n gespesifiseerde wagtyd [in sekondes]"
 
 #. translators: this is the last part of the "grab after a
 #. * delay of <spin button> seconds".
 #.
-#: ../src/screenshot-application.c:645
-#: ../src/screenshot-interactive-dialog.c:415
+#: src/screenshot-application.c:640 src/screenshot-interactive-dialog.c:415
 msgid "seconds"
 msgstr "sekondes"
 
-#: ../src/screenshot-application.c:646
-msgid "Effect to add to the border (shadow, border or none)"
-msgstr "Effek om by die vensterraam te voeg (shadow, border of none)"
+#: src/screenshot-application.c:641
+msgid "Effect to add to the border (shadow, border, vintage or none)"
+msgstr "Effek om by die vensterraam te voeg (skadu, vensterraam of geen)"
 
-#: ../src/screenshot-application.c:646
+#: src/screenshot-application.c:641
 msgid "effect"
 msgstr "effek"
 
-#: ../src/screenshot-application.c:647
+#: src/screenshot-application.c:642
 msgid "Interactively set options"
 msgstr "Stel keuses interaktief"
 
-#: ../src/screenshot-application.c:648
+#: src/screenshot-application.c:643
 msgid "Save screenshot directly to this file"
 msgstr "Stoor skermskoot direk na dié lêer"
 
-#: ../src/screenshot-application.c:648
+#: src/screenshot-application.c:643
 msgid "filename"
 msgstr "lêernaam"
 
-#: ../src/screenshot-application.c:662
-msgid "Take a picture of the screen"
-msgstr "Neem 'n foto van die skerm"
+#: src/screenshot-application.c:644
+msgid "Print version information and exit"
+msgstr "Druk weergawe-inligting en sluit af"
 
-#: ../src/screenshot-application.c:780
+#: src/screenshot-application.c:773
 msgid "translator-credits"
-msgstr "Friedel Wolff"
+msgstr ""
+"Friedel Wolff\n"
+"Pieter Schoeman"
 
-#: ../src/screenshot-config.c:59
-#, c-format
+#: src/screenshot-config.c:117
 msgid ""
 "Conflicting options: --window and --area should not be used at the same "
 "time.\n"
 msgstr ""
-"Konflik van keuses: --window en --area mag nie gelyktydig gebruik word nie.\n"
+"Konflik van keuses: --venster en --area mag nie gelyktydig gebruik word "
+"nie.\n"
 
-#: ../src/screenshot-config.c:66
-#, c-format
+#: src/screenshot-config.c:124
 msgid ""
 "Conflicting options: --area and --delay should not be used at the same "
 "time.\n"
-msgstr "Konflik van keuses: --area en --delay moet nie gelyktydig gebruik word nie.\n"
+msgstr ""
+"Konflik van keuses: --area en --vertraging moet nie gelyktydig gebruik word "
+"nie.\n"
 
-#: ../src/screenshot-dialog.c:309
+#: src/screenshot-dialog.c:319
 msgid "Screenshot.png"
 msgstr "Skermskoot.png"
 
-#. translators: this is the name of the file that gets made up
-#. * with the screenshot if the entire screen is taken
-#: ../src/screenshot-filename-builder.c:145
+#: src/screenshot-dialog.ui:7
+msgid "Save Screenshot"
+msgstr "Stoor skermskoot"
+
+#: src/screenshot-dialog.ui:17
+msgid "Back"
+msgstr "Terug"
+
+#: src/screenshot-dialog.ui:38
+msgid "C_opy to Clipboard"
+msgstr "K_opieer na die knipbord"
+
+#: src/screenshot-dialog.ui:50
+msgid "_Save"
+msgstr "_Stoor"
+
+#: src/screenshot-dialog.ui:110
+msgid "_Name:"
+msgstr "_Naam:"
+
+#: src/screenshot-dialog.ui:127
+msgid "Save in _folder:"
+msgstr "Stoor in 'n _gids:"
+
+#. translators: this is the name of the file that gets made up with the
+#. * screenshot if the entire screen is taken. The first placeholder is a
+#. * timestamp (e.g. "2017-05-21 12-24-03"); the second placeholder is the
+#. * file format (e.g. "png").
+#.
+#: src/screenshot-filename-builder.c:147
 #, c-format
 msgid "Screenshot from %s.%s"
 msgstr "Skermskoot op %s.%s"
 
-#. translators: this is the name of the file that gets
-#. * made up with the screenshot if the entire screen is
-#. * taken
-#: ../src/screenshot-filename-builder.c:152
+#. translators: this is the name of the file that gets made up with the
+#. * screenshot if the entire screen is taken and the simpler filename
+#. * already exists. The first and second placeholders are a timestamp and
+#. * a counter to make it unique (e.g. "2017-05-21 12-24-03 - 2"); the third
+#. * placeholder is the file format (e.g. "png").
+#.
+#: src/screenshot-filename-builder.c:157
 #, c-format
 msgid "Screenshot from %s - %d.%s"
 msgstr "Skermskoot op %s - %d.%s"
 
-#: ../src/screenshot-interactive-dialog.c:154
+#. Translators:
+#. * these are the names of the effects available which will be
+#. * displayed inside a combo box in interactive mode for the user
+#. * to chooser.
+#.
+#: src/screenshot-interactive-dialog.c:157
 msgid "None"
 msgstr "Geen"
 
-#: ../src/screenshot-interactive-dialog.c:155
+#: src/screenshot-interactive-dialog.c:158
 msgid "Drop shadow"
 msgstr "Val-skaduwee"
 
-#: ../src/screenshot-interactive-dialog.c:156
+#: src/screenshot-interactive-dialog.c:159
 msgid "Border"
 msgstr "Raam"
 
+#: src/screenshot-interactive-dialog.c:160
+msgid "Vintage"
+msgstr "Vintage"
+
 #. * Include pointer *
-#: ../src/screenshot-interactive-dialog.c:260
+#: src/screenshot-interactive-dialog.c:264
 msgid "Include _pointer"
 msgstr "Sluit _wyser in"
 
 #. * Include window border *
-#: ../src/screenshot-interactive-dialog.c:270
+#: src/screenshot-interactive-dialog.c:274
 msgid "Include the window _border"
 msgstr "Sluit vensterraa_m in"
 
-#: ../src/screenshot-interactive-dialog.c:287
+#: src/screenshot-interactive-dialog.c:291
 msgid "Apply _effect:"
 msgstr "Pas _effek toe:"
 
-#: ../src/screenshot-interactive-dialog.c:349
+#: src/screenshot-interactive-dialog.c:348
 msgid "Grab the whole sc_reen"
 msgstr "G_ryp die hele skerm"
 
-#: ../src/screenshot-interactive-dialog.c:363
+#: src/screenshot-interactive-dialog.c:362
 msgid "Grab the current _window"
 msgstr "Gryp die huidige _venster"
 
-#: ../src/screenshot-interactive-dialog.c:375
+#: src/screenshot-interactive-dialog.c:374
 msgid "Select _area to grab"
 msgstr "Merk 'n _area om te gryp"
 
 #. translators: this is the first part of the "grab after a
 #. * delay of <spin button> seconds".
 #.
-#: ../src/screenshot-interactive-dialog.c:395
+#: src/screenshot-interactive-dialog.c:394
 msgid "Grab after a _delay of"
 msgstr "Gryp na 'n wagty_d van"
 
-#: ../src/screenshot-interactive-dialog.c:448
-#: ../src/screenshot-interactive-dialog.c:458
+#: src/screenshot-interactive-dialog.c:465
 msgid "Take Screenshot"
 msgstr "Neem skermskoot"
 
-#: ../src/screenshot-interactive-dialog.c:459
+#: src/screenshot-interactive-dialog.c:466
 msgid "Effects"
 msgstr "Effekte"
 
-#: ../src/screenshot-interactive-dialog.c:479
+#: src/screenshot-interactive-dialog.c:479
+msgid "_Help"
+msgstr "_Hulp"
+
+#: src/screenshot-interactive-dialog.c:488
 msgid "Take _Screenshot"
 msgstr "Neem _skermskoot"
 
-#: ../src/screenshot-utils.c:724
+#: src/screenshot-interactive-dialog.c:505
+msgid "_Cancel"
+msgstr "_Kanselleer"
+
+#: src/screenshot-utils.c:725
 msgid "Error loading the help page"
 msgstr "Fout met laai van hulpblad"
 
+#~ msgid "About Screenshot"
+#~ msgstr "Aangaande Skermskoot"
+
+#~ msgid "Take a picture of the screen"
+#~ msgstr "Neem 'n foto van die skerm"
+
 #~ msgid "Error while saving screenshot"
 #~ msgstr "Fout met stoor van skermskoot"
 
diff --git a/po/el.po b/po/el.po
index 1443d94..814dc82 100644
--- a/po/el.po
+++ b/po/el.po
@@ -35,8 +35,8 @@ msgstr ""
 "Project-Id-Version: gnome-utils.gnome-2-26\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "screenshot&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-09-05 21:19+0000\n"
-"PO-Revision-Date: 2017-09-09 13:39+0200\n"
+"POT-Creation-Date: 2017-07-31 10:14+0000\n"
+"PO-Revision-Date: 2017-09-01 22:38+0200\n"
 "Last-Translator: Efstathios Iosifidis <[e-mail]>\n"
 "Language-Team: Ελληνικά <[e-mail]>\n"
 "Language: el\n"
diff --git a/po/fa.po b/po/fa.po
index 4e4c2a6..297dc2a 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -124,7 +124,7 @@ msgstr "snapshot;capture;print;گرفتن;چاپ;عکس‌صفحه;"
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: src/org.gnome.Screenshot.desktop.in:11
 msgid "applets-screenshooter"
-msgstr "ذخیرهٔ عکس‌صفحه"
+msgstr "applets-screenshooter"
 
 #: src/org.gnome.Screenshot.desktop.in:22
 msgid "Take a Screenshot of the Whole Screen"
diff --git a/po/fr.po b/po/fr.po
index 2362aa5..1013f9a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -26,7 +26,7 @@ msgstr ""
 "Project-Id-Version: gnome-utils HEAD\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "screenshot&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-09-05 21:19+0000\n"
+"POT-Creation-Date: 2017-09-08 09:43+0000\n"
 "PO-Revision-Date: 2017-09-08 16:20+0200\n"
 "Last-Translator: Charles Monzat <[e-mail]>\n"
 "Language-Team: français <[e-mail]>\n"
@@ -356,7 +356,7 @@ msgstr "Enregistrer dans le _dossier :"
 #: src/screenshot-filename-builder.c:147
 #, c-format
 msgid "Screenshot from %s.%s"
-msgstr "Capture du %s.%s"
+msgstr "Capture d’écran du %s.%s"
 
 #. translators: this is the name of the file that gets made up with the
 #. * screenshot if the entire screen is taken and the simpler filename
@@ -367,7 +367,7 @@ msgstr "Capture du %s.%s"
 #: src/screenshot-filename-builder.c:157
 #, c-format
 msgid "Screenshot from %s - %d.%s"
-msgstr "Capture du %s - %d.%s"
+msgstr "Capture d’écran du %s - %d.%s"
 
 #. Translators:
 #. * these are the names of the effects available which will be
diff --git a/po/gd.po b/po/gd.po
index d605066..3b5ef32 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the gnome-screenshot package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 # alasdair caimbeul <[e-mail]>, 2013.
-# GunChleoc <[e-mail]>, 2014, 2016, 2017.
+# GunChleoc <[e-mail]>, 2014, 2016, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-screenshot\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product"
 "=gnome-screenshot&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-22 20:27+0000\n"
-"PO-Revision-Date: 2017-03-07 09:19+0100\n"
+"POT-Creation-Date: 2017-09-05 21:19+0000\n"
+"PO-Revision-Date: 2018-03-02 10:42+0100\n"
 "Last-Translator: GunChleoc <[e-mail]>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -23,281 +23,274 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-09-19 08:01+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../src/org.gnome.Screenshot.desktop.in.h:1
-#: ../src/screenshot-application.c:767
-msgid "Screenshot"
-msgstr "Glacadh-sgrìn"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:2
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:2
-#: ../src/screenshot-application.c:768
-msgid "Save images of your screen or individual windows"
-msgstr "Sàbhail dealbhan dhen sgrìn agad no de dh'uinneagan fa leth"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:3
-msgid "snapshot;capture;print;screenshot;"
-msgstr "snapshot;capture;print;screenshot;glacadh;clò-bhualadh;glacadh-sgrìn;"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:4
-msgid "Take a Screenshot of the Whole Screen"
-msgstr "Tog glacadh-sgrìn dhen sgrìn air fad"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:5
-msgid "Take a Screenshot of the Current Window"
-msgstr "Tog glacadh-sgrìn dhen uinneag làithreach"
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:1
-msgid "GNOME Screenshot"
-msgstr "Glacadh-sgrìn GNOME"
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:3
-msgid ""
-"GNOME Screenshot is a simple utility that lets you take pictures of your "
-"computer screen. Screenshots can be of your whole screen, any specific "
-"application, or a selected rectangular area. You can also copy the captured "
-"screenshot directly into the GNOME clipboard and paste it into other "
-"applications."
-msgstr ""
-"'S e goireas simplidh a th' ann an glacadh-sgrìn GNOME a leigeas leat "
-"dealbhan a thogail de sgrìn a' choimpiutair agad. Togaidh tu glacadh-sgrìn "
-"dhen sgrìn air fad, de dh'aplacaid shònraichte no de raon ceart-cheàrnach a "
-"thagh thu. 'S urrainn dhut lethbhreac dhen ghlacadh-sgrìn a chur ann an stòr-"
-"bhòrd GNOME sa bhad 's a chur ann an aplacaidean eile."
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:4
-msgid ""
-"GNOME Screenshot allows you to take screenshots even when it's not open: "
-"just press the PrtSc button on your keyboard, and a snapshot of your whole "
-"screen will be saved to your Pictures folder. Hold Alt while pressing PrtSc "
-"and you will get a screenshot of only the currently selected window."
-msgstr ""
-"Leigidh glacadh-sgrìn GNOME leat glacaidhean-sgrìn a thogail fiù mur eil e "
-"fosgailte: cha leig thu leas ach brùthadh air a' phutan PrtSc air a' mheur-"
-"chlàr agad agus thèid glacadh dhen sgrìn air fad agad a chur ann am pasgan "
-"nan Dealbhan agad. Cum sìos Alt fhad 's a tha thu a' brùthadh PrtSc gus nach "
-"faigh thu glacadh ach dhen uinneag air a thaghadh aig an àm."
-
-#: ../src/screenshot-app-menu.ui.h:1
-msgid "Help"
-msgstr "Cobhair"
-
-#: ../src/screenshot-app-menu.ui.h:2
-msgid "About"
-msgstr "Mu dhèidhinn"
-
-#: ../src/screenshot-app-menu.ui.h:3
-msgid "Quit"
-msgstr "Fàg an-seo"
-
-#: ../src/screenshot-dialog.ui.h:1
-msgid "Save Screenshot"
-msgstr "Sàbhail an glacadh-sgrìn"
-
-#: ../src/screenshot-dialog.ui.h:2
-msgid "C_opy to Clipboard"
-msgstr "Cuir l_ethbhreac dheth air an stòr-bhòrd"
-
-#: ../src/screenshot-dialog.ui.h:3
-msgid "_Save"
-msgstr "_Sàbhail"
-
-#: ../src/screenshot-dialog.ui.h:4
-msgid "_Name:"
-msgstr "Ai_nm:"
-
-#: ../src/screenshot-dialog.ui.h:5
-msgid "Save in _folder:"
-msgstr "Sàbhail sa _phasgan:"
-
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:1
+#: src/org.gnome.gnome-screenshot.gschema.xml:11
 msgid "Window-specific screenshot (deprecated)"
 msgstr ""
-"Glacadh-sgrìn a tha gu sònraichte do dh'uinneag (cha mholar seo tuilleadh)"
+"Glacadh-sgrìn a tha gu sònraichte do dh’uinneag (cha mholar seo tuilleadh)"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:2
+#: src/org.gnome.gnome-screenshot.gschema.xml:12
 msgid ""
 "Grab just the current window, rather than the whole desktop. This key has "
 "been deprecated and it is no longer in use."
 msgstr ""
 "Na glac ach an uinneag làithreach seach an deasg air fad. Cha mholar "
-"cleachdadh na h-iuchrach seo tuilleadh is chan eilear 'ga chleachdadh "
+"cleachdadh na h-iuchrach seo tuilleadh is chan eilear ’ga chleachdadh "
 "tuilleadh."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:3
+#: src/org.gnome.gnome-screenshot.gschema.xml:16
 msgid "Screenshot delay"
-msgstr "An dàil air a' ghlacadh-sgrìn"
+msgstr "An dàil air a’ ghlacadh-sgrìn"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:4
+#: src/org.gnome.gnome-screenshot.gschema.xml:17
 msgid "The number of seconds to wait before taking the screenshot."
 msgstr ""
 "Uiread a dhiogan a nithear feitheamh mus dèid an glacadh-sgrìn a dhèanamh."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:5
+#: src/org.gnome.gnome-screenshot.gschema.xml:21
 msgid "Screenshot directory"
 msgstr "Pasgan nan glacaidhean-sgrìn"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:6
+#: src/org.gnome.gnome-screenshot.gschema.xml:22
 msgid "The directory where the screenshots will be saved by default."
 msgstr "Am pasgan san dèid na glacaidhean-sgrìn a shàbhaladh a ghnàth."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:7
+#: src/org.gnome.gnome-screenshot.gschema.xml:26
 msgid "Last save directory"
 msgstr "Am pasgan sàbhalaidh mu dheireadh"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:8
+#: src/org.gnome.gnome-screenshot.gschema.xml:27
 msgid "The last directory a screenshot was saved in interactive mode."
 msgstr ""
 "Am pasgan mu dheireadh a chaidh glacadh-sgrìn a shàbhaladh ann nuair a bha "
 "thu sa mhodh eadar-ghnìomhach."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:9
+#: src/org.gnome.gnome-screenshot.gschema.xml:31
 msgid "Include Border"
 msgstr "Gabh a-steach an t-iomall"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:10
+#: src/org.gnome.gnome-screenshot.gschema.xml:32
 msgid "Include the window manager border along with the screenshot"
 msgstr "Gabh a-steach iomall manaidsear na h-uinneige sa ghlacadh-sgrìn"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:11
+#: src/org.gnome.gnome-screenshot.gschema.xml:36
 msgid "Include Pointer"
 msgstr "Gabh a-steach an tomhaire"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:12
+#: src/org.gnome.gnome-screenshot.gschema.xml:37
 msgid "Include the pointer in the screenshot"
 msgstr "Gabh a-steach an tomhaire sa ghlacadh-sgrìn"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:13
+#: src/org.gnome.gnome-screenshot.gschema.xml:41
 msgid "Include ICC Profile"
-msgstr "Gabh a-steach a' phròifil ICC"
+msgstr "Gabh a-steach a’ phròifil ICC"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:14
+#: src/org.gnome.gnome-screenshot.gschema.xml:42
 msgid "Include the ICC profile of the target in the screenshot file"
-msgstr ""
-"Gabh a-steach pròifil ICC na targaide ann am faidhle a' ghlacaidh-sgrìn"
+msgstr "Gabh a-steach pròifil ICC na targaide ann am faidhle a’ ghlacaidh-sgrìn"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:15
+#: src/org.gnome.gnome-screenshot.gschema.xml:46
 msgid "Border Effect"
 msgstr "Èifeachd an iomaill"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:16
+#: src/org.gnome.gnome-screenshot.gschema.xml:47
+#| msgid ""
+#| "Effect to add to the outside of a border. Possible values are \"shadow\", "
+#| "\"none\", and \"border\"."
 msgid ""
-"Effect to add to the outside of a border. Possible values are \"shadow\", "
-"\"none\", and \"border\"."
+"Effect to add to the outside of a border. Possible values are “shadow”, "
+"“none”, and “border”."
 msgstr ""
-"An èifeachd a thèid a chur ri taobh a-muigh an iomaill. Tha \"shadow\", "
-"\"none\" agus \"border\" 'nan luachan ceadaichte."
+"An èifeachd a thèid a chur ri taobh a-muigh an iomaill. Tha “shadow”, “none” "
+"agus “border” ’nan luachan ceadaichte."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:17
+#: src/org.gnome.gnome-screenshot.gschema.xml:51
 msgid "Default file type extension"
 msgstr "Leudachan bunaiteach an t-seòrsa faidhle "
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:18
+#: src/org.gnome.gnome-screenshot.gschema.xml:52
 msgid "The default file type extension for screenshots."
 msgstr "Leudachan bunaiteach an t-seòrsa faidhle airson glacaidhean-sgrìn."
 
-#: ../src/screenshot-application.c:145
+#: src/org.gnome.Screenshot.desktop.in:3 src/screenshot-application.c:770
+#: src/screenshot-application.c:838
+msgid "Screenshot"
+msgstr "Glacadh-sgrìn"
+
+#: src/org.gnome.Screenshot.desktop.in:4
+#: src/org.gnome.Screenshot.metainfo.xml.in:8 src/screenshot-application.c:771
+msgid "Save images of your screen or individual windows"
+msgstr "Sàbhail dealbhan dhen sgrìn agad no de dh’uinneagan fa leth"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: src/org.gnome.Screenshot.desktop.in:6
+msgid "snapshot;capture;print;screenshot;"
+msgstr "snapshot;capture;print;screenshot;glacadh;clò-bhualadh;glacadh-sgrìn;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: src/org.gnome.Screenshot.desktop.in:11
+#| msgid "Save Screenshot"
+msgid "applets-screenshooter"
+msgstr "applets-screenshooter"
+
+#: src/org.gnome.Screenshot.desktop.in:22
+msgid "Take a Screenshot of the Whole Screen"
+msgstr "Tog glacadh-sgrìn dhen sgrìn air fad"
+
+#: src/org.gnome.Screenshot.desktop.in:26
+msgid "Take a Screenshot of the Current Window"
+msgstr "Tog glacadh-sgrìn dhen uinneag làithreach"
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:7
+msgid "GNOME Screenshot"
+msgstr "Glacadh-sgrìn GNOME"
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:10
+msgid ""
+"GNOME Screenshot is a simple utility that lets you take pictures of your "
+"computer screen. Screenshots can be of your whole screen, any specific "
+"application, or a selected rectangular area. You can also copy the captured "
+"screenshot directly into the GNOME clipboard and paste it into other "
+"applications."
+msgstr ""
+"’S e goireas simplidh a th’ ann an glacadh-sgrìn GNOME a leigeas leat "
+"dealbhan a thogail de sgrìn a’ choimpiutair agad. Togaidh tu glacadh-sgrìn "
+"dhen sgrìn air fad, de dh’aplacaid shònraichte no de raon ceart-cheàrnach a "
+"thagh thu. ’S urrainn dhut lethbhreac dhen ghlacadh-sgrìn a chur ann an "
+"stòr-bhòrd GNOME sa bhad ’s a chur ann an aplacaidean eile."
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:17
+#| msgid ""
+#| "GNOME Screenshot allows you to take screenshots even when it's not open: "
+#| "just press the PrtSc button on your keyboard, and a snapshot of your "
+#| "whole screen will be saved to your Pictures folder. Hold Alt while "
+#| "pressing PrtSc and you will get a screenshot of only the currently "
+#| "selected window."
+msgid ""
+"GNOME Screenshot allows you to take screenshots even when it’s not open: "
+"just press the PrtSc button on your keyboard, and a snapshot of your whole "
+"screen will be saved to your Pictures folder. Hold Alt while pressing PrtSc "
+"and you will get a screenshot of only the currently selected window."
+msgstr ""
+"Leigidh glacadh-sgrìn GNOME leat glacaidhean-sgrìn a thogail fiù mur eil e "
+"fosgailte: cha leig thu leas ach brùthadh air a’ phutan PrtSc air a’ mheur-"
+"chlàr agad agus thèid glacadh dhen sgrìn air fad agad a chur ann am pasgan "
+"nan Dealbhan agad. Cum sìos Alt fhad ’s a tha thu a’ brùthadh PrtSc gus nach "
+"faigh thu glacadh ach dhen uinneag air a thaghadh aig an àm."
+
+#: src/screenshot-app-menu.ui:6
+msgid "Help"
+msgstr "Cobhair"
+
+#: src/screenshot-app-menu.ui:10
+msgid "About"
+msgstr "Mu dhèidhinn"
+
+#: src/screenshot-app-menu.ui:14
+msgid "Quit"
+msgstr "Fàg an-seo"
+
+#: src/screenshot-application.c:151
 #, c-format
-msgid "A file named \"%s\" already exists in \"%s\""
-msgstr "Tha faidhle air a bheil \"%s\" ann an \"%s\" mu thràth"
+#| msgid "A file named \"%s\" already exists in \"%s\""
+msgid "A file named “%s” already exists in “%s”"
+msgstr "Tha faidhle air a bheil “%s” ann an “%s” mu thràth"
 
-#: ../src/screenshot-application.c:152
+#: src/screenshot-application.c:158
 msgid "Overwrite existing file?"
 msgstr "A bheil thu airson sgrìobhadh thairis an an fhaidhle làithreach?"
 
-#: ../src/screenshot-application.c:174 ../src/screenshot-application.c:183
-#: ../src/screenshot-application.c:463 ../src/screenshot-application.c:467
-#: ../src/screenshot-application.c:507 ../src/screenshot-application.c:510
+#: src/screenshot-application.c:180 src/screenshot-application.c:189
+#: src/screenshot-application.c:466 src/screenshot-application.c:470
+#: src/screenshot-application.c:510 src/screenshot-application.c:513
 msgid "Unable to capture a screenshot"
 msgstr "Chan urrainn dhuinn glacadh-sgrìn a dhèanamh"
 
-#: ../src/screenshot-application.c:175
+#: src/screenshot-application.c:181
 msgid "Error creating file. Please choose another location and retry."
 msgstr ""
-"Thachair mearachd nuair a bha sinn a' cruthachadh an fhaidhle. Tagh ionad "
+"Thachair mearachd nuair a bha sinn a’ cruthachadh an fhaidhle. Tagh ionad "
 "eile agus feuch ris a-rithist."
 
-#: ../src/screenshot-application.c:464
+#: src/screenshot-application.c:467
 msgid "Error creating file"
-msgstr "Mearachd a' cruthachadh an fhaidhle."
+msgstr "Mearachd a’ cruthachadh an fhaidhle."
 
-#: ../src/screenshot-application.c:475 ../src/screenshot-application.c:543
+#: src/screenshot-application.c:478 src/screenshot-application.c:546
 msgid "Screenshot taken"
 msgstr "Chaidh an glacadh-sgrìn a thogail"
 
-#: ../src/screenshot-application.c:508
+#: src/screenshot-application.c:511
 msgid "All possible methods failed"
-msgstr "Dh'fhàillig na h-uile dòigh a tha ri làimh"
+msgstr "Dh’fhàillig na h-uile dòigh a tha ri làimh"
 
-#: ../src/screenshot-application.c:631
+#: src/screenshot-application.c:634
 msgid "Send the grab directly to the clipboard"
 msgstr "Cuir an glacadh air an stòr-bhòrd sa bhad"
 
-#: ../src/screenshot-application.c:632
+#: src/screenshot-application.c:635
 msgid "Grab a window instead of the entire screen"
 msgstr "Glac uinneag seach an sgrìn air fad"
 
-#: ../src/screenshot-application.c:633
+#: src/screenshot-application.c:636
 msgid "Grab an area of the screen instead of the entire screen"
 msgstr "Glac earrann dhen sgrìn seach an sgrìn air fad"
 
-#: ../src/screenshot-application.c:634
+#: src/screenshot-application.c:637
 msgid "Include the window border with the screenshot"
 msgstr "Gabh a-steach iomall na h-uinneige san ghlacadh-sgrìn"
 
-#: ../src/screenshot-application.c:635
+#: src/screenshot-application.c:638
 msgid "Remove the window border from the screenshot"
 msgstr "Thòir air falbh iomall na h-uinneige on ghlacadh-sgrìn"
 
-#: ../src/screenshot-application.c:636
+#: src/screenshot-application.c:639
 msgid "Include the pointer with the screenshot"
 msgstr "Gabh a-steach an tomhaire sa ghlacadh-sgrìn"
 
-#: ../src/screenshot-application.c:637
+#: src/screenshot-application.c:640
 msgid "Take screenshot after specified delay [in seconds]"
 msgstr "Tog glacadh-sgrìn an dèidh dàil shònraichte [ann an diogan]"
 
 #. translators: this is the last part of the "grab after a
 #. * delay of <spin button> seconds".
 #.
-#: ../src/screenshot-application.c:637
-#: ../src/screenshot-interactive-dialog.c:414
+#: src/screenshot-application.c:640 src/screenshot-interactive-dialog.c:415
 msgid "seconds"
 msgstr "diogan"
 
-#: ../src/screenshot-application.c:638
+#: src/screenshot-application.c:641
 msgid "Effect to add to the border (shadow, border, vintage or none)"
 msgstr ""
 "An èifeachd a thèid a chur ris an iomall (shadow, border, vintage no none)"
 
-#: ../src/screenshot-application.c:638
+#: src/screenshot-application.c:641
 msgid "effect"
 msgstr "èifeachd"
 
-#: ../src/screenshot-application.c:639
+#: src/screenshot-application.c:642
 msgid "Interactively set options"
 msgstr "Roghainnean a thèid a shuidheachadh air dòigh eadar-ghnìomhach"
 
-#: ../src/screenshot-application.c:640
+#: src/screenshot-application.c:643
 msgid "Save screenshot directly to this file"
 msgstr "Sàbhail an glacadh-sgrìn san fhaidle seo fhèin"
 
-#: ../src/screenshot-application.c:640
+#: src/screenshot-application.c:643
 msgid "filename"
 msgstr "ainm an fhaidhle"
 
-#: ../src/screenshot-application.c:641
+#: src/screenshot-application.c:644
 msgid "Print version information and exit"
 msgstr "Clò-bhuail fiosrachadh an tionndaidh is fàg an-seo"
 
-#: ../src/screenshot-application.c:770
+#: src/screenshot-application.c:773
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Akerbeltz https://launchpad.net/~fios\n"
 "  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
 
-#: ../src/screenshot-config.c:116
-#, c-format
+#: src/screenshot-config.c:117
 msgid ""
 "Conflicting options: --window and --area should not be used at the same "
 "time.\n"
@@ -305,8 +298,7 @@ msgstr ""
 "Roghainnean ann an còmhstri: Cha bu chòir dhut --window agus --area a "
 "chleachdadh aig an aon àm.\n"
 
-#: ../src/screenshot-config.c:123
-#, c-format
+#: src/screenshot-config.c:124
 msgid ""
 "Conflicting options: --area and --delay should not be used at the same "
 "time.\n"
@@ -314,97 +306,132 @@ msgstr ""
 "Roghainnean ann an còmhstri: Cha bu chòir dhut --area agus --delay a "
 "chleachdadh aig an aon àm.\n"
 
-#: ../src/screenshot-dialog.c:312
+#: src/screenshot-dialog.c:319
 msgid "Screenshot.png"
 msgstr "Glacadh-sgrìn.png"
 
-#. translators: this is the name of the file that gets made up
-#. * with the screenshot if the entire screen is taken
-#: ../src/screenshot-filename-builder.c:143
+#: src/screenshot-dialog.ui:7
+msgid "Save Screenshot"
+msgstr "Sàbhail an glacadh-sgrìn"
+
+#: src/screenshot-dialog.ui:17
+msgid "Back"
+msgstr "Air ais"
+
+#: src/screenshot-dialog.ui:38
+msgid "C_opy to Clipboard"
+msgstr "Cuir l_ethbhreac dheth air an stòr-bhòrd"
+
+#: src/screenshot-dialog.ui:50
+msgid "_Save"
+msgstr "_Sàbhail"
+
+#: src/screenshot-dialog.ui:110
+msgid "_Name:"
+msgstr "Ai_nm:"
+
+#: src/screenshot-dialog.ui:127
+msgid "Save in _folder:"
+msgstr "Sàbhail sa _phasgan:"
+
+#. translators: this is the name of the file that gets made up with the
+#. * screenshot if the entire screen is taken. The first placeholder is a
+#. * timestamp (e.g. "2017-05-21 12-24-03"); the second placeholder is the
+#. * file format (e.g. "png").
+#.
+#: src/screenshot-filename-builder.c:147
 #, c-format
 msgid "Screenshot from %s.%s"
 msgstr "Glacadh-sgrìn o %s.%s"
 
-#. translators: this is the name of the file that gets
-#. * made up with the screenshot if the entire screen is
-#. * taken
-#: ../src/screenshot-filename-builder.c:150
+#. translators: this is the name of the file that gets made up with the
+#. * screenshot if the entire screen is taken and the simpler filename
+#. * already exists. The first and second placeholders are a timestamp and
+#. * a counter to make it unique (e.g. "2017-05-21 12-24-03 - 2"); the third
+#. * placeholder is the file format (e.g. "png").
+#.
+#: src/screenshot-filename-builder.c:157
 #, c-format
 msgid "Screenshot from %s - %d.%s"
 msgstr "Glacadh-sgrìn o %s - %d.%s"
 
-#: ../src/screenshot-interactive-dialog.c:156
+#. Translators:
+#. * these are the names of the effects available which will be
+#. * displayed inside a combo box in interactive mode for the user
+#. * to chooser.
+#.
+#: src/screenshot-interactive-dialog.c:157
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../src/screenshot-interactive-dialog.c:157
+#: src/screenshot-interactive-dialog.c:158
 msgid "Drop shadow"
 msgstr "Sgàil tuiteim"
 
-#: ../src/screenshot-interactive-dialog.c:158
+#: src/screenshot-interactive-dialog.c:159
 msgid "Border"
 msgstr "Iomall"
 
-#: ../src/screenshot-interactive-dialog.c:159
+#: src/screenshot-interactive-dialog.c:160
 msgid "Vintage"
 msgstr "Vintage"
 
 #. * Include pointer *
-#: ../src/screenshot-interactive-dialog.c:263
+#: src/screenshot-interactive-dialog.c:264
 msgid "Include _pointer"
 msgstr "Gabh a-steach an _tomhaire"
 
 #. * Include window border *
-#: ../src/screenshot-interactive-dialog.c:273
+#: src/screenshot-interactive-dialog.c:274
 msgid "Include the window _border"
 msgstr "Ga_bh a-steach iomall na h-uineige"
 
-#: ../src/screenshot-interactive-dialog.c:290
+#: src/screenshot-interactive-dialog.c:291
 msgid "Apply _effect:"
 msgstr "Cuir an èif_eachd an gnìomh:"
 
-#: ../src/screenshot-interactive-dialog.c:347
+#: src/screenshot-interactive-dialog.c:348
 msgid "Grab the whole sc_reen"
 msgstr "Glac an sg_rìn air fad"
 
-#: ../src/screenshot-interactive-dialog.c:361
+#: src/screenshot-interactive-dialog.c:362
 msgid "Grab the current _window"
 msgstr "Glac an _uinneag làithreach"
 
-#: ../src/screenshot-interactive-dialog.c:373
+#: src/screenshot-interactive-dialog.c:374
 msgid "Select _area to grab"
 msgstr "T_agh earrann a thèid a ghlacadh"
 
 #. translators: this is the first part of the "grab after a
 #. * delay of <spin button> seconds".
 #.
-#: ../src/screenshot-interactive-dialog.c:393
+#: src/screenshot-interactive-dialog.c:394
 msgid "Grab after a _delay of"
 msgstr "Glac an dèidh _dàil"
 
-#: ../src/screenshot-interactive-dialog.c:464
+#: src/screenshot-interactive-dialog.c:465
 msgid "Take Screenshot"
 msgstr "Tog glacadh-sgrìn"
 
-#: ../src/screenshot-interactive-dialog.c:465
+#: src/screenshot-interactive-dialog.c:466
 msgid "Effects"
 msgstr "Èifeachdan"
 
-#: ../src/screenshot-interactive-dialog.c:478
+#: src/screenshot-interactive-dialog.c:479
 msgid "_Help"
 msgstr "Cob_hair"
 
-#: ../src/screenshot-interactive-dialog.c:487
+#: src/screenshot-interactive-dialog.c:488
 msgid "Take _Screenshot"
 msgstr "Tog glacadh-_sgrìn"
 
-#: ../src/screenshot-interactive-dialog.c:504
+#: src/screenshot-interactive-dialog.c:505
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: ../src/screenshot-utils.c:724
+#: src/screenshot-utils.c:725
 msgid "Error loading the help page"
-msgstr "Mearachd a' luchdadh duilleag na cobharach"
+msgstr "Mearachd a’ luchdadh duilleag na cobharach"
 
 #~ msgid "Take a picture of the screen"
 #~ msgstr "Tog dealbh dhen sgrìn"
diff --git a/po/hr.po b/po/hr.po
index 1c06201..8c7cce2 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,8 +6,8 @@ msgstr ""
 "Project-Id-Version: gnome-utils 0\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "screenshot&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-08-03 20:00+0000\n"
-"PO-Revision-Date: 2017-08-23 17:52+0200\n"
+"POT-Creation-Date: 2018-02-20 23:00+0000\n"
+"PO-Revision-Date: 2018-03-07 15:15+0100\n"
 "Last-Translator: gogo <[e-mail]>\n"
 "Language-Team: Croatian <[e-mail]>\n"
 "Language: hr\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2016-09-22 11:30+0000\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: src/org.gnome.gnome-screenshot.gschema.xml:11
 msgid "Window-specific screenshot (deprecated)"
@@ -156,7 +156,7 @@ msgstr ""
 
 #: src/screenshot-app-menu.ui:6
 msgid "Help"
-msgstr "Pomoć"
+msgstr "Priručnik"
 
 #: src/screenshot-app-menu.ui:10
 msgid "About"
@@ -385,23 +385,19 @@ msgstr "Uslikaj odabrano _područje zaslona"
 msgid "Grab after a _delay of"
 msgstr "Uslikaj nakon _odgode od"
 
-#: src/screenshot-interactive-dialog.c:465
+#: src/screenshot-interactive-dialog.c:464
 msgid "Take Screenshot"
 msgstr "Uslikaj prikaz zaslona"
 
-#: src/screenshot-interactive-dialog.c:466
+#: src/screenshot-interactive-dialog.c:465
 msgid "Effects"
 msgstr "Efekti"
 
-#: src/screenshot-interactive-dialog.c:479
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: src/screenshot-interactive-dialog.c:488
+#: src/screenshot-interactive-dialog.c:469
 msgid "Take _Screenshot"
 msgstr "_Uslikaj sliku zaslona"
 
-#: src/screenshot-interactive-dialog.c:505
+#: src/screenshot-interactive-dialog.c:486
 msgid "_Cancel"
 msgstr "_Odustani"
 
@@ -409,5 +405,8 @@ msgstr "_Odustani"
 msgid "Error loading the help page"
 msgstr "Greška pri učitavanju stranice pomoći"
 
+#~ msgid "_Help"
+#~ msgstr "_Pomoć"
+
 #~ msgid "Take a Screenshot of a Selected Area"
 #~ msgstr "Uslikajte odabrano područje"
diff --git a/po/nb.po b/po/nb.po
index aab222a..68afff1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,15 +1,15 @@
 # Norwegian bokmål translation of gnome-screenshot.
 # Copyright (C) 1999-2005 Free Software Foundation, Inc.
 #
-# Kjartan Maraas <[e-mail]>, 1999-2016.
+# Kjartan Maraas <[e-mail]>, 1999-2017.
 # Terance Edward Sola <[e-mail]>, 2005.
 # Torstein Adolf Winterseth <[e-mail]>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-screenshot 3.23.x\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-21 08:14+0100\n"
-"PO-Revision-Date: 2016-11-21 08:15+0100\n"
+"Project-Id-Version: gnome-screenshot 3.26.x\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-screenshot&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-05 21:19+0000\n"
+"PO-Revision-Date: 2017-11-08 20:04+0100\n"
 "Last-Translator: Åka Sikrom <[e-mail]>\n"
 "Language-Team: Norwegian bokmål <[e-mail]>\n"
 "Language: nb\n"
@@ -19,94 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../src/org.gnome.Screenshot.desktop.in.h:1
-#: ../src/screenshot-application.c:767
-msgid "Screenshot"
-msgstr "Skjermbilde"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:2
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:2
-#: ../src/screenshot-application.c:768
-msgid "Save images of your screen or individual windows"
-msgstr "Lagre bilder av innholdet på skjermen eller i individuelle vinduer"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:3
-msgid "snapshot;capture;print;screenshot;"
-msgstr "skjermbilde;opptak;utskrift;skjermdump;"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:4
-msgid "Take a Screenshot of the Whole Screen"
-msgstr "Ta bilde av hele skjermen"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:5
-msgid "Take a Screenshot of the Current Window"
-msgstr "Ta bilde av aktivt vindu"
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:1
-msgid "GNOME Screenshot"
-msgstr "GNOME Skjermbilde"
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:3
-msgid ""
-"GNOME Screenshot is a simple utility that lets you take pictures of your "
-"computer screen. Screenshots can be of your whole screen, any specific "
-"application, or a selected rectangular area. You can also copy the captured "
-"screenshot directly into the GNOME clipboard and paste it into other "
-"applications."
-msgstr ""
-"GNOME skjermbilde er et enkelt verktøy som lar deg ta bilder av skjermen på "
-"datamaskinen. Du kan ta bilder av hele skjermen, et program, eller et "
-"utvalgt firkantet område. Du kan også kopiere et skjermbilde direkte til "
-"utklippstavlen og lime det inn i andre programmer."
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:4
-msgid ""
-"GNOME Screenshot allows you to take screenshots even when it’s not open: "
-"just press the PrtSc button on your keyboard, and a snapshot of your whole "
-"screen will be saved to your Pictures folder. Hold Alt while pressing PrtSc "
-"and you will get a screenshot of only the currently selected window."
-msgstr ""
-"Du kan ta skjermbilder selv når GNOME skjermbilde ikke er åpent. Trykk på "
-"PrtSc-tasten for å lagre et bilde av hele skjermen i Bilder-mappen. Hvis du "
-"holder nede Alt samtidig, får du et skjermbilde av aktivt vindu."
-
-#: ../src/screenshot-app-menu.ui.h:1
-msgid "Help"
-msgstr "Hjelp"
-
-#: ../src/screenshot-app-menu.ui.h:2
-msgid "About"
-msgstr "Om"
-
-#: ../src/screenshot-app-menu.ui.h:3
-msgid "Quit"
-msgstr "Avslutt"
-
-#: ../src/screenshot-dialog.ui.h:1
-msgid "Save Screenshot"
-msgstr "Lagre skjermbilde"
-
-#: ../src/screenshot-dialog.ui.h:2
-msgid "C_opy to Clipboard"
-msgstr "K_opier til utklippstavlen"
-
-#: ../src/screenshot-dialog.ui.h:3
-msgid "_Save"
-msgstr "_Lagre"
-
-#: ../src/screenshot-dialog.ui.h:4
-msgid "_Name:"
-msgstr "_Navn:"
-
-#: ../src/screenshot-dialog.ui.h:5
-msgid "Save in _folder:"
-msgstr "Lagre i _mappe:"
-
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:1
+#: src/org.gnome.gnome-screenshot.gschema.xml:11
 msgid "Window-specific screenshot (deprecated)"
 msgstr "Vindusspesifikt skjermbilde (utgått)"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:2
+#: src/org.gnome.gnome-screenshot.gschema.xml:12
 msgid ""
 "Grab just the current window, rather than the whole desktop. This key has "
 "been deprecated and it is no longer in use."
@@ -114,59 +31,59 @@ msgstr ""
 "Bare ta bilde av aktivt vindu i stedet for hele skrivebordet. Denne nøkkelen "
 "er utgått og er ikke lenger i bruk."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:3
+#: src/org.gnome.gnome-screenshot.gschema.xml:16
 msgid "Screenshot delay"
 msgstr "Skjermbilde-forsineksle"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:4
+#: src/org.gnome.gnome-screenshot.gschema.xml:17
 msgid "The number of seconds to wait before taking the screenshot."
 msgstr "Antall sekunders pause før skjermbildet tas."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:5
+#: src/org.gnome.gnome-screenshot.gschema.xml:21
 msgid "Screenshot directory"
 msgstr "Mappe for skjermbilder"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:6
+#: src/org.gnome.gnome-screenshot.gschema.xml:22
 msgid "The directory where the screenshots will be saved by default."
 msgstr "Mappe hvor skjermbiler blir lagret som standard."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:7
+#: src/org.gnome.gnome-screenshot.gschema.xml:26
 msgid "Last save directory"
 msgstr "Mappe for siste lagring"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:8
+#: src/org.gnome.gnome-screenshot.gschema.xml:27
 msgid "The last directory a screenshot was saved in interactive mode."
 msgstr "Mappe hvor forrige skjermbilde ble lagret i interaktiv modus."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:9
+#: src/org.gnome.gnome-screenshot.gschema.xml:31
 msgid "Include Border"
 msgstr "Ta med kant"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:10
+#: src/org.gnome.gnome-screenshot.gschema.xml:32
 msgid "Include the window manager border along with the screenshot"
 msgstr "Ta med vindushåndtererens kant på skjermbildet"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:11
+#: src/org.gnome.gnome-screenshot.gschema.xml:36
 msgid "Include Pointer"
 msgstr "Ta med peker"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:12
+#: src/org.gnome.gnome-screenshot.gschema.xml:37
 msgid "Include the pointer in the screenshot"
 msgstr "Ta med peker på skjermbildet"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:13
+#: src/org.gnome.gnome-screenshot.gschema.xml:41
 msgid "Include ICC Profile"
 msgstr "Ta med ICC-profil"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:14
+#: src/org.gnome.gnome-screenshot.gschema.xml:42
 msgid "Include the ICC profile of the target in the screenshot file"
 msgstr "Ta med ICC-profil for mål i skjermbildefil"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:15
+#: src/org.gnome.gnome-screenshot.gschema.xml:46
 msgid "Border Effect"
 msgstr "Effekt for kant"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:16
+#: src/org.gnome.gnome-screenshot.gschema.xml:47
 msgid ""
 "Effect to add to the outside of a border. Possible values are “shadow”, "
 "“none”, and “border”."
@@ -174,213 +91,313 @@ msgstr ""
 "Effekt som skal legges til på utsiden av kanten. Mulige verdier er «shadow», "
 "«none» og «border»."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:17
+#: src/org.gnome.gnome-screenshot.gschema.xml:51
 msgid "Default file type extension"
 msgstr "Forvalgt tiltype"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:18
+#: src/org.gnome.gnome-screenshot.gschema.xml:52
 msgid "The default file type extension for screenshots."
 msgstr "Forvalgt filtype for skjermbilder."
 
-#: ../src/screenshot-application.c:145
+#: src/org.gnome.Screenshot.desktop.in:3 src/screenshot-application.c:770
+#: src/screenshot-application.c:838
+msgid "Screenshot"
+msgstr "Skjermbilde"
+
+#: src/org.gnome.Screenshot.desktop.in:4
+#: src/org.gnome.Screenshot.metainfo.xml.in:8 src/screenshot-application.c:771
+msgid "Save images of your screen or individual windows"
+msgstr "Lagre bilder av innholdet på skjermen eller i individuelle vinduer"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: src/org.gnome.Screenshot.desktop.in:6
+msgid "snapshot;capture;print;screenshot;"
+msgstr "skjermbilde;opptak;utskrift;skjermdump;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: src/org.gnome.Screenshot.desktop.in:11
+msgid "applets-screenshooter"
+msgstr "applets-screenshooter"
+
+#: src/org.gnome.Screenshot.desktop.in:22
+msgid "Take a Screenshot of the Whole Screen"
+msgstr "Ta bilde av hele skjermen"
+
+#: src/org.gnome.Screenshot.desktop.in:26
+msgid "Take a Screenshot of the Current Window"
+msgstr "Ta bilde av aktivt vindu"
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:7
+msgid "GNOME Screenshot"
+msgstr "GNOME Skjermbilde"
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:10
+msgid ""
+"GNOME Screenshot is a simple utility that lets you take pictures of your "
+"computer screen. Screenshots can be of your whole screen, any specific "
+"application, or a selected rectangular area. You can also copy the captured "
+"screenshot directly into the GNOME clipboard and paste it into other "
+"applications."
+msgstr ""
+"GNOME skjermbilde er et enkelt verktøy som lar deg ta bilder av skjermen på "
+"datamaskinen. Du kan ta bilder av hele skjermen, et program, eller et "
+"utvalgt firkantet område. Du kan også kopiere et skjermbilde direkte til "
+"utklippstavlen og lime det inn i andre programmer."
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:17
+msgid ""
+"GNOME Screenshot allows you to take screenshots even when it’s not open: "
+"just press the PrtSc button on your keyboard, and a snapshot of your whole "
+"screen will be saved to your Pictures folder. Hold Alt while pressing PrtSc "
+"and you will get a screenshot of only the currently selected window."
+msgstr ""
+"Du kan ta skjermbilder selv når GNOME skjermbilde ikke er åpent. Trykk på "
+"PrtSc-tasten for å lagre et bilde av hele skjermen i Bilder-mappen. Hvis du "
+"holder nede Alt samtidig, får du et skjermbilde av aktivt vindu."
+
+#: src/screenshot-app-menu.ui:6
+msgid "Help"
+msgstr "Hjelp"
+
+#: src/screenshot-app-menu.ui:10
+msgid "About"
+msgstr "Om"
+
+#: src/screenshot-app-menu.ui:14
+msgid "Quit"
+msgstr "Avslutt"
+
+#: src/screenshot-application.c:151
 #, c-format
 msgid "A file named “%s” already exists in “%s”"
 msgstr "Det finnes allerede en fil med navnet«%s» i «%s»"
 
-#: ../src/screenshot-application.c:152
+#: src/screenshot-application.c:158
 msgid "Overwrite existing file?"
 msgstr "Vil du overskrive filen som finnes allerede?"
 
-#: ../src/screenshot-application.c:174 ../src/screenshot-application.c:183
-#: ../src/screenshot-application.c:463 ../src/screenshot-application.c:467
-#: ../src/screenshot-application.c:507 ../src/screenshot-application.c:510
+#: src/screenshot-application.c:180 src/screenshot-application.c:189
+#: src/screenshot-application.c:466 src/screenshot-application.c:470
+#: src/screenshot-application.c:510 src/screenshot-application.c:513
 msgid "Unable to capture a screenshot"
 msgstr "Klarte ikke å utføre skjermdump"
 
-#: ../src/screenshot-application.c:175
+#: src/screenshot-application.c:181
 msgid "Error creating file. Please choose another location and retry."
 msgstr ""
 "Feil ved oppretting av fil. Vennligst velg en annen lokasjon og prøv igjen."
 
-#: ../src/screenshot-application.c:464
+#: src/screenshot-application.c:467
 msgid "Error creating file"
 msgstr "Feil ved oppretting av fil"
 
-#: ../src/screenshot-application.c:475 ../src/screenshot-application.c:543
+#: src/screenshot-application.c:478 src/screenshot-application.c:546
 msgid "Screenshot taken"
 msgstr "Skjermbilde tatt"
 
-#: ../src/screenshot-application.c:508
+#: src/screenshot-application.c:511
 msgid "All possible methods failed"
 msgstr "Alle mulige metoder feilet"
 
-#: ../src/screenshot-application.c:631
+#: src/screenshot-application.c:634
 msgid "Send the grab directly to the clipboard"
 msgstr "Send bilde direkte til utklippstavle"
 
-#: ../src/screenshot-application.c:632
+#: src/screenshot-application.c:635
 msgid "Grab a window instead of the entire screen"
 msgstr "Ta bilde av et vindu, i stedet for hele skjermen"
 
-#: ../src/screenshot-application.c:633
+#: src/screenshot-application.c:636
 msgid "Grab an area of the screen instead of the entire screen"
 msgstr "Ta bilde av en del av skjermen, i stedet for hele skjermen"
 
-#: ../src/screenshot-application.c:634
+#: src/screenshot-application.c:637
 msgid "Include the window border with the screenshot"
 msgstr "Ta med vinduskant på skjermbildet"
 
-#: ../src/screenshot-application.c:635
+#: src/screenshot-application.c:638
 msgid "Remove the window border from the screenshot"
 msgstr "Fjern vinduskant fra skjermbildet"
 
-#: ../src/screenshot-application.c:636
+#: src/screenshot-application.c:639
 msgid "Include the pointer with the screenshot"
 msgstr "Ta med peker på skjermbildet"
 
-#: ../src/screenshot-application.c:637
+#: src/screenshot-application.c:640
 msgid "Take screenshot after specified delay [in seconds]"
 msgstr "Ta skjermbilde etter valgt forsinkelse (i sekunder)"
 
 #. translators: this is the last part of the "grab after a
 #. * delay of <spin button> seconds".
 #.
-#: ../src/screenshot-application.c:637
-#: ../src/screenshot-interactive-dialog.c:414
+#: src/screenshot-application.c:640 src/screenshot-interactive-dialog.c:415
 msgid "seconds"
 msgstr "sekunder"
 
-#: ../src/screenshot-application.c:638
+#: src/screenshot-application.c:641
 msgid "Effect to add to the border (shadow, border, vintage or none)"
 msgstr ""
 "Effekt som skal brukes på vinduskanten (skygge, kant, gammel eller ingen)"
 
-#: ../src/screenshot-application.c:638
+#: src/screenshot-application.c:641
 msgid "effect"
 msgstr "effekt"
 
-#: ../src/screenshot-application.c:639
+#: src/screenshot-application.c:642
 msgid "Interactively set options"
 msgstr "Spør etter alternativer"
 
-#: ../src/screenshot-application.c:640
+#: src/screenshot-application.c:643
 msgid "Save screenshot directly to this file"
 msgstr "Lagre skjermbilde direkte i denne filen"
 
-#: ../src/screenshot-application.c:640
+#: src/screenshot-application.c:643
 msgid "filename"
 msgstr "filnavn"
 
-#: ../src/screenshot-application.c:641
+#: src/screenshot-application.c:644
 msgid "Print version information and exit"
 msgstr "Skriv versjonsinformasjon og avslutt"
 
-#: ../src/screenshot-application.c:770
+#: src/screenshot-application.c:773
 msgid "translator-credits"
 msgstr "Kjartan Maraas <[e-mail]>"
 
-#: ../src/screenshot-config.c:116
-#, c-format
+#: src/screenshot-config.c:117
 msgid ""
 "Conflicting options: --window and --area should not be used at the same "
 "time.\n"
 msgstr "Du kan ikke bruke valgene «--window» og «--area» samtidig.\n"
 
-#: ../src/screenshot-config.c:123
-#, c-format
+#: src/screenshot-config.c:124
 msgid ""
 "Conflicting options: --area and --delay should not be used at the same "
 "time.\n"
 msgstr "Du kan ikke bruke valgene «--area» og «--delay» samtidig.\n"
 
-#: ../src/screenshot-dialog.c:312
+#: src/screenshot-dialog.c:319
 msgid "Screenshot.png"
 msgstr "Skjermbilde.png"
 
-#. translators: this is the name of the file that gets made up
-#. * with the screenshot if the entire screen is taken
-#: ../src/screenshot-filename-builder.c:143
+#: src/screenshot-dialog.ui:7
+msgid "Save Screenshot"
+msgstr "Lagre skjermbilde"
+
+#: src/screenshot-dialog.ui:17
+msgid "Back"
+msgstr "Tilbake"
+
+#: src/screenshot-dialog.ui:38
+msgid "C_opy to Clipboard"
+msgstr "K_opier til utklippstavlen"
+
+#: src/screenshot-dialog.ui:50
+msgid "_Save"
+msgstr "_Lagre"
+
+#: src/screenshot-dialog.ui:110
+msgid "_Name:"
+msgstr "_Navn:"
+
+#: src/screenshot-dialog.ui:127
+msgid "Save in _folder:"
+msgstr "Lagre i _mappe:"
+
+#. translators: this is the name of the file that gets made up with the
+#. * screenshot if the entire screen is taken. The first placeholder is a
+#. * timestamp (e.g. "2017-05-21 12-24-03"); the second placeholder is the
+#. * file format (e.g. "png").
+#.
+#: src/screenshot-filename-builder.c:147
 #, c-format
 msgid "Screenshot from %s.%s"
 msgstr "Skjermbilde fra %s.%s"
 
-#. translators: this is the name of the file that gets
-#. * made up with the screenshot if the entire screen is
-#. * taken
-#: ../src/screenshot-filename-builder.c:150
+#. translators: this is the name of the file that gets made up with the
+#. * screenshot if the entire screen is taken and the simpler filename
+#. * already exists. The first and second placeholders are a timestamp and
+#. * a counter to make it unique (e.g. "2017-05-21 12-24-03 - 2"); the third
+#. * placeholder is the file format (e.g. "png").
+#.
+#: src/screenshot-filename-builder.c:157
 #, c-format
 msgid "Screenshot from %s - %d.%s"
 msgstr "Skjermbilde fra %s - %d.%s"
 
-#: ../src/screenshot-interactive-dialog.c:156
+#. Translators:
+#. * these are the names of the effects available which will be
+#. * displayed inside a combo box in interactive mode for the user
+#. * to chooser.
+#.
+#: src/screenshot-interactive-dialog.c:157
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/screenshot-interactive-dialog.c:157
+#: src/screenshot-interactive-dialog.c:158
 msgid "Drop shadow"
 msgstr "Skygge"
 
-#: ../src/screenshot-interactive-dialog.c:158
+#: src/screenshot-interactive-dialog.c:159
 msgid "Border"
 msgstr "Kant"
 
-#: ../src/screenshot-interactive-dialog.c:159
+#: src/screenshot-interactive-dialog.c:160
 msgid "Vintage"
 msgstr "Gammel"
 
 #. * Include pointer *
-#: ../src/screenshot-interactive-dialog.c:263
+#: src/screenshot-interactive-dialog.c:264
 msgid "Include _pointer"
 msgstr "Ta med _peker"
 
 #. * Include window border *
-#: ../src/screenshot-interactive-dialog.c:273
+#: src/screenshot-interactive-dialog.c:274
 msgid "Include the window _border"
 msgstr "Ta med vin_dukant"
 
-#: ../src/screenshot-interactive-dialog.c:290
+#: src/screenshot-interactive-dialog.c:291
 msgid "Apply _effect:"
 msgstr "Bruk _effekt:"
 
-#: ../src/screenshot-interactive-dialog.c:347
+#: src/screenshot-interactive-dialog.c:348
 msgid "Grab the whole sc_reen"
 msgstr "Ta bilde av hele skje_rmen"
 
-#: ../src/screenshot-interactive-dialog.c:361
+#: src/screenshot-interactive-dialog.c:362
 msgid "Grab the current _window"
 msgstr "Ta bilde av aktivt _vindu"
 
-#: ../src/screenshot-interactive-dialog.c:373
+#: src/screenshot-interactive-dialog.c:374
 msgid "Select _area to grab"
 msgstr "Velg _område som skal tas bilde av"
 
 #. translators: this is the first part of the "grab after a
 #. * delay of <spin button> seconds".
 #.
-#: ../src/screenshot-interactive-dialog.c:393
+#: src/screenshot-interactive-dialog.c:394
 msgid "Grab after a _delay of"
 msgstr "T_a skjermbilde etter"
 
-#: ../src/screenshot-interactive-dialog.c:464
+#: src/screenshot-interactive-dialog.c:465
 msgid "Take Screenshot"
 msgstr "Ta skjermbilde"
 
-#: ../src/screenshot-interactive-dialog.c:465
+#: src/screenshot-interactive-dialog.c:466
 msgid "Effects"
 msgstr "Effekter"
 
-#: ../src/screenshot-interactive-dialog.c:478
+#: src/screenshot-interactive-dialog.c:479
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/screenshot-interactive-dialog.c:487
+#: src/screenshot-interactive-dialog.c:488
 msgid "Take _Screenshot"
 msgstr "Ta _skjermbilde"
 
-#: ../src/screenshot-interactive-dialog.c:504
+#: src/screenshot-interactive-dialog.c:505
 msgid "_Cancel"
 msgstr "A_vbryt"
 
-#: ../src/screenshot-utils.c:724
+#: src/screenshot-utils.c:725
 msgid "Error loading the help page"
 msgstr "Feil under lasting av hjelpeside"
diff --git a/po/nl.po b/po/nl.po
index fd0a622..23281c1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,18 +12,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils.master.nl\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-s"
-"creenshot&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-09-05 21:23+0000\n"
-"PO-Revision-Date: 2017-09-11 18:01+0100\n"
-"Last-Translator: Hannie Dumoleyn <[e-mail]>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"screenshot&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-12-01 15:43+0000\n"
+"PO-Revision-Date: 2017-12-19 22:35+0100\n"
+"Last-Translator: Justin van Steijn <[e-mail]>\n"
 "Language-Team: Dutch <[e-mail]>\n"
 "Language: nl\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: Lokalize 2.0\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Project-Style: gnome\n"
 
 #: src/org.gnome.gnome-screenshot.gschema.xml:11
@@ -92,15 +92,12 @@ msgstr "Vensterrand-effect"
 
 # valschaduw, geen en donkere lijn
 #: src/org.gnome.gnome-screenshot.gschema.xml:47
-#| msgid ""
-#| "Effect to add to the outside of a border. Possible values are \"shadow\", "
-#| "\"none\", and \"border\"."
 msgid ""
 "Effect to add to the outside of a border. Possible values are “shadow”, "
 "“none”, and “border”."
 msgstr ""
-"Effect dat aan de buitenkant van een venster wordt toegevoegd. Mogelijke"
-" waarden zijn ‘schaduw’, ‘geen’, en ‘rand’."
+"Effect dat aan de buitenkant van een venster wordt toegevoegd. Mogelijke "
+"waarden zijn ‘schaduw’, ‘geen’, en ‘rand’."
 
 #: src/org.gnome.gnome-screenshot.gschema.xml:51
 msgid "Default file type extension"
@@ -127,7 +124,6 @@ msgstr "momentopname;vastleggen;afdrukken;schermafdruk;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: src/org.gnome.Screenshot.desktop.in:11
-#| msgid "Save Screenshot"
 msgid "applets-screenshooter"
 msgstr "applets-screenshooter"
 
@@ -158,12 +154,6 @@ msgstr ""
 "deze in andere toepassingen plakken."
 
 #: src/org.gnome.Screenshot.metainfo.xml.in:17
-#| msgid ""
-#| "GNOME Screenshot allows you to take screenshots even when it's not open: "
-#| "just press the PrtSc button on your keyboard, and a snapshot of your "
-#| "whole screen will be saved to your Pictures folder. Hold Alt while "
-#| "pressing PrtSc and you will get a screenshot of only the currently "
-#| "selected window."
 msgid ""
 "GNOME Screenshot allows you to take screenshots even when it’s not open: "
 "just press the PrtSc button on your keyboard, and a snapshot of your whole "
@@ -190,7 +180,6 @@ msgstr "Afsluiten"
 
 #: src/screenshot-application.c:151
 #, c-format
-#| msgid "A file named \"%s\" already exists in \"%s\""
 msgid "A file named “%s” already exists in “%s”"
 msgstr "Er bestaat al een bestand ‘%s’ in ‘%s’"
 
@@ -294,7 +283,7 @@ msgstr ""
 "Hannie Dumoleyn\n"
 "Rachid BM\n"
 "\n"
-"Kijk voor meer info op http://nl.gnome.org/"
+"Meer info over Gnome-NL http://nl.gnome.org/"
 
 #: src/screenshot-config.c:117
 msgid ""
@@ -410,7 +399,7 @@ msgstr "Huidige _venster"
 
 #: src/screenshot-interactive-dialog.c:374
 msgid "Select _area to grab"
-msgstr " _Gebied selecteren"
+msgstr "_Gebied selecteren"
 
 # 'grab' kan veilig weggelaten worden
 #. translators: this is the first part of the "grab after a
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8a1c793..92e3581 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,14 +20,14 @@
 # André Gondim <In memoriam>, 2011.
 # Enrico Nicoletto <[e-mail]>, 2012, 2014.
 # Fábio Nogueira <[e-mail]>, 2014.
-# Rafael Fontenelle <[e-mail]>, 2013, 2014, 2016, 2017.
+# Rafael Fontenelle <[e-mail]>, 2013, 2014, 2016, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-screenshot\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "screenshot&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-07-31 10:14+0000\n"
-"PO-Revision-Date: 2017-09-03 13:13-0200\n"
+"POT-Creation-Date: 2017-09-05 21:19+0000\n"
+"PO-Revision-Date: 2018-07-13 16:14-0200\n"
 "Last-Translator: Rafael Fontenelle <[e-mail]>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
 "Language: pt_BR\n"
@@ -135,7 +135,6 @@ msgstr "captura de tela;captura;capturar;screenshot;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: src/org.gnome.Screenshot.desktop.in:11
-#| msgid "Save Screenshot"
 msgid "applets-screenshooter"
 msgstr "applets-screenshooter"
 
@@ -259,7 +258,7 @@ msgstr "segundos"
 
 #: src/screenshot-application.c:641
 msgid "Effect to add to the border (shadow, border, vintage or none)"
-msgstr "Efeito para adicionar à borda (sombra, bordar, retrô ou nenhum)"
+msgstr "Efeito para adicionar à borda (sombra, borda, retrô ou nenhum)"
 
 #: src/screenshot-application.c:641
 msgid "effect"
@@ -382,7 +381,7 @@ msgstr "Sombra projetada"
 
 #: src/screenshot-interactive-dialog.c:159
 msgid "Border"
-msgstr "Bordar"
+msgstr "Borda"
 
 # Adotei a tradução de Retrô pois o efeito do "vintage filter" é o de tornar algo atual (a captura de tela) em uma coloração que parece antiga, o que coincide com a definição de retrô (imitação de estilo antigo). --Enrico
 #: src/screenshot-interactive-dialog.c:160
diff --git a/po/ro.po b/po/ro.po
index b1f56fa..8ef8613 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,14 +8,14 @@
 # Adi Roiban https://launchpad.net/~adiroiban, 2008, 2009
 # Lucian Adrian Grijincu <[e-mail]>, 2009, 2011.
 # Bogdan Mințoi <[e-mail]>, 2014.
-# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2015.
+# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2015, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-utils.gnome-2-14.ro\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "screenshot&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-06-22 07:55+0000\n"
-"PO-Revision-Date: 2015-06-22 18:52+0200\n"
+"POT-Creation-Date: 2018-02-20 23:00+0000\n"
+"PO-Revision-Date: 2018-03-25 14:25+0200\n"
 "Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
 "Language: ro\n"
@@ -27,97 +27,11 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../src/org.gnome.Screenshot.desktop.in.h:1
-#: ../src/screenshot-application.c:767
-msgid "Screenshot"
-msgstr "Captură de ecran"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:2
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:2
-#: ../src/screenshot-application.c:768
-msgid "Save images of your screen or individual windows"
-msgstr "Salvează imagini ale ecranului sau ale unor ferestre individuale"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:3
-msgid "snapshot;capture;print;screenshot;"
-msgstr "snapshot;capture;print;screenshot;captură;"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:4
-msgid "Take a Screenshot of the Whole Screen"
-msgstr "Realizează o captură a întregului ecran"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:5
-msgid "Take a Screenshot of the Current Window"
-msgstr "Realizează o captură a ferestrei curente"
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:1
-msgid "GNOME Screenshot"
-msgstr "Captură de ecran GNOME"
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:3
-msgid ""
-"GNOME Screenshot is a simple utility that lets you take pictures of your "
-"computer screen. Screenshots can be of your whole screen, any specific "
-"application, or a selected rectangular area. You can also copy the captured "
-"screenshot directly into the GNOME clipboard and paste it into other "
-"applications."
-msgstr ""
-"Captură de ecran GNOME este un utilitar simplu ce vă permite să capturați "
-"ecranul calculatorului personal. Capturile de ecran pot conține întregul "
-"ecran, orice aplicație specifică, sau o suprafață dreptunghiulară selectată. "
-"De asemenea aveți posibilitatea să copiați captura de ecran direct în "
-"clipboardul GNOME și să o folosiți ulterior în alte aplicații."
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:4
-msgid ""
-"GNOME Screenshot allows you to take screenshots even when it's not open: "
-"just press the PrtSc button on your keyboard, and a snapshot of your whole "
-"screen will be saved to your Pictures folder. Hold Alt while pressing PrtSc "
-"and you will get a screenshot of only the currently selected window."
-msgstr ""
-"Captură de ecran GNOME vă permite să capturați ecranul chiar și atunci când "
-"nu este deschis: pur și simplu apăsați tasta Print Screen de pe tastatură, "
-"și un instantaneu al întregului ecran va fi salvat în dosarul Fotografii. "
-"Țineți apăsată tasta Alt în timp ce apăsați PrtSc și veți obține o imagine a "
-"ferestrei selectate."
-
-#: ../src/screenshot-app-menu.ui.h:1
-msgid "Help"
-msgstr "Ajutor"
-
-#: ../src/screenshot-app-menu.ui.h:2
-msgid "About"
-msgstr "Despre"
-
-#: ../src/screenshot-app-menu.ui.h:3
-msgid "Quit"
-msgstr "Ieșire"
-
-#: ../src/screenshot-dialog.ui.h:1
-msgid "Save Screenshot"
-msgstr "Salvează captura de ecran"
-
-#: ../src/screenshot-dialog.ui.h:2
-msgid "C_opy to Clipboard"
-msgstr "C_opiază în clipboard"
-
-#: ../src/screenshot-dialog.ui.h:3
-msgid "_Save"
-msgstr "_Salvează"
-
-#: ../src/screenshot-dialog.ui.h:4
-msgid "_Name:"
-msgstr "_Nume:"
-
-#: ../src/screenshot-dialog.ui.h:5
-msgid "Save in _folder:"
-msgstr "Salvează în _dosar:"
-
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:1
+#: src/org.gnome.gnome-screenshot.gschema.xml:11
 msgid "Window-specific screenshot (deprecated)"
 msgstr "Captură ecran specifică ferestrei (învechit)"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:2
+#: src/org.gnome.gnome-screenshot.gschema.xml:12
 msgid ""
 "Grab just the current window, rather than the whole desktop. This key has "
 "been deprecated and it is no longer in use."
@@ -125,281 +39,392 @@ msgstr ""
 "Capturează doar fereastra curentă, nu tot ecranul. Această tastă este "
 "învechită și nu mai este folosită."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:3
+#: src/org.gnome.gnome-screenshot.gschema.xml:16
 msgid "Screenshot delay"
 msgstr "Întârziere captură ecran"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:4
+#: src/org.gnome.gnome-screenshot.gschema.xml:17
 msgid "The number of seconds to wait before taking the screenshot."
 msgstr "Numărul de secunde de așteptat înainde de a captura ecranul."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:5
+#: src/org.gnome.gnome-screenshot.gschema.xml:21
 msgid "Screenshot directory"
 msgstr "Dosar pentru capturi"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:6
+#: src/org.gnome.gnome-screenshot.gschema.xml:22
 msgid "The directory where the screenshots will be saved by default."
 msgstr "Dosarul unde capturile vor fi salvate în mod implicit."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:7
+#: src/org.gnome.gnome-screenshot.gschema.xml:26
 msgid "Last save directory"
 msgstr "Ultimul dosar pentru salvare"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:8
+#: src/org.gnome.gnome-screenshot.gschema.xml:27
 msgid "The last directory a screenshot was saved in interactive mode."
 msgstr ""
 "Ultimul dosar în care o captură de ecran a fost salvată în mod interactiv."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:9
+#: src/org.gnome.gnome-screenshot.gschema.xml:31
 msgid "Include Border"
 msgstr "Include contur"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:10
+#: src/org.gnome.gnome-screenshot.gschema.xml:32
 msgid "Include the window manager border along with the screenshot"
 msgstr "Include conturul administratorului de ferestre în captura de ecran"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:11
+#: src/org.gnome.gnome-screenshot.gschema.xml:36
 msgid "Include Pointer"
 msgstr "Include cursor"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:12
+#: src/org.gnome.gnome-screenshot.gschema.xml:37
 msgid "Include the pointer in the screenshot"
 msgstr "Include cursorul în captura de ecran"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:13
+#: src/org.gnome.gnome-screenshot.gschema.xml:41
 msgid "Include ICC Profile"
 msgstr "Include profil ICC"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:14
+#: src/org.gnome.gnome-screenshot.gschema.xml:42
 msgid "Include the ICC profile of the target in the screenshot file"
 msgstr "Include profilul ICC al țintei în fișierul capturii de ecran"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:15
+#: src/org.gnome.gnome-screenshot.gschema.xml:46
 msgid "Border Effect"
 msgstr "Efect contur"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:16
+#: src/org.gnome.gnome-screenshot.gschema.xml:47
+#| msgid ""
+#| "Effect to add to the outside of a border. Possible values are \"shadow\", "
+#| "\"none\", and \"border\"."
 msgid ""
-"Effect to add to the outside of a border. Possible values are \"shadow\", "
-"\"none\", and \"border\"."
+"Effect to add to the outside of a border. Possible values are “shadow”, "
+"“none”, and “border”."
 msgstr ""
 "Efect adăugat conturului. Valori posibile sunt „shadow”, „none” și „border”."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:17
+#: src/org.gnome.gnome-screenshot.gschema.xml:51
 msgid "Default file type extension"
 msgstr "Tip implicit de extensie a fișierului"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.in.h:18
+#: src/org.gnome.gnome-screenshot.gschema.xml:52
 msgid "The default file type extension for screenshots."
 msgstr "Tipul implicit de extensie a fișierului pentru capturi de ecran."
 
-#: ../src/screenshot-application.c:145
+#: src/org.gnome.Screenshot.desktop.in:3 src/screenshot-application.c:770
+#: src/screenshot-application.c:838
+msgid "Screenshot"
+msgstr "Captură de ecran"
+
+#: src/org.gnome.Screenshot.desktop.in:4
+#: src/org.gnome.Screenshot.metainfo.xml.in:8 src/screenshot-application.c:771
+msgid "Save images of your screen or individual windows"
+msgstr "Salvează imagini ale ecranului sau ale unor ferestre individuale"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: src/org.gnome.Screenshot.desktop.in:6
+msgid "snapshot;capture;print;screenshot;"
+msgstr "snapshot;capture;print;screenshot;captură;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: src/org.gnome.Screenshot.desktop.in:11
+#| msgid "Save Screenshot"
+msgid "applets-screenshooter"
+msgstr "applets-screenshooter"
+
+#: src/org.gnome.Screenshot.desktop.in:22
+msgid "Take a Screenshot of the Whole Screen"
+msgstr "Realizează o captură a întregului ecran"
+
+#: src/org.gnome.Screenshot.desktop.in:26
+msgid "Take a Screenshot of the Current Window"
+msgstr "Realizează o captură a ferestrei curente"
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:7
+msgid "GNOME Screenshot"
+msgstr "Captură de ecran GNOME"
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:10
+msgid ""
+"GNOME Screenshot is a simple utility that lets you take pictures of your "
+"computer screen. Screenshots can be of your whole screen, any specific "
+"application, or a selected rectangular area. You can also copy the captured "
+"screenshot directly into the GNOME clipboard and paste it into other "
+"applications."
+msgstr ""
+"Captură de ecran GNOME este un utilitar simplu ce vă permite să capturați "
+"ecranul calculatorului personal. Capturile de ecran pot conține întregul "
+"ecran, orice aplicație specifică, sau o suprafață dreptunghiulară selectată. "
+"De asemenea aveți posibilitatea să copiați captura de ecran direct în "
+"clipboardul GNOME și să o folosiți ulterior în alte aplicații."
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:17
+#| msgid ""
+#| "GNOME Screenshot allows you to take screenshots even when it's not open: "
+#| "just press the PrtSc button on your keyboard, and a snapshot of your "
+#| "whole screen will be saved to your Pictures folder. Hold Alt while "
+#| "pressing PrtSc and you will get a screenshot of only the currently "
+#| "selected window."
+msgid ""
+"GNOME Screenshot allows you to take screenshots even when it’s not open: "
+"just press the PrtSc button on your keyboard, and a snapshot of your whole "
+"screen will be saved to your Pictures folder. Hold Alt while pressing PrtSc "
+"and you will get a screenshot of only the currently selected window."
+msgstr ""
+"Captură de ecran GNOME vă permite să capturați ecranul chiar și atunci când "
+"nu este deschis: pur și simplu apăsați tasta Print Screen de pe tastatură, "
+"și un instantaneu al întregului ecran va fi salvat în dosarul Fotografii. "
+"Țineți apăsată tasta Alt în timp ce apăsați PrtSc și veți obține o imagine a "
+"ferestrei selectate."
+
+#: src/screenshot-app-menu.ui:6
+msgid "Help"
+msgstr "Ajutor"
+
+#: src/screenshot-app-menu.ui:10
+msgid "About"
+msgstr "Despre"
+
+#: src/screenshot-app-menu.ui:14
+msgid "Quit"
+msgstr "Ieșire"
+
+#: src/screenshot-application.c:151
 #, c-format
-msgid "A file named \"%s\" already exists in \"%s\""
+#| msgid "A file named \"%s\" already exists in \"%s\""
+msgid "A file named “%s” already exists in “%s”"
 msgstr "Un fișier denumit „%s” există deja în „%s”"
 
-#: ../src/screenshot-application.c:152
+#: src/screenshot-application.c:158
 msgid "Overwrite existing file?"
 msgstr "Suprascrieți fișierul existent?"
 
-#: ../src/screenshot-application.c:174 ../src/screenshot-application.c:183
-#: ../src/screenshot-application.c:463 ../src/screenshot-application.c:467
-#: ../src/screenshot-application.c:507 ../src/screenshot-application.c:510
+#: src/screenshot-application.c:180 src/screenshot-application.c:189
+#: src/screenshot-application.c:466 src/screenshot-application.c:470
+#: src/screenshot-application.c:510 src/screenshot-application.c:513
 msgid "Unable to capture a screenshot"
 msgstr "Nu s-a putut obține o captură de ecran"
 
-#: ../src/screenshot-application.c:175
+#: src/screenshot-application.c:181
 msgid "Error creating file. Please choose another location and retry."
 msgstr ""
 "A apărut o eroare la crearea fișierului. Alegeți o altă locație și "
 "reîncercați."
 
-#: ../src/screenshot-application.c:464
+#: src/screenshot-application.c:467
 msgid "Error creating file"
 msgstr "A apărut o eroare la crearea fișierului"
 
-#: ../src/screenshot-application.c:475 ../src/screenshot-application.c:543
+#: src/screenshot-application.c:478 src/screenshot-application.c:546
 msgid "Screenshot taken"
 msgstr "Captură reușită de ecran"
 
-#: ../src/screenshot-application.c:508
+#: src/screenshot-application.c:511
 msgid "All possible methods failed"
 msgstr "Toate metodele posibile au eșuat"
 
-#: ../src/screenshot-application.c:631
+#: src/screenshot-application.c:634
 msgid "Send the grab directly to the clipboard"
 msgstr "Trimite captura direct la clipboard"
 
-#: ../src/screenshot-application.c:632
+#: src/screenshot-application.c:635
 msgid "Grab a window instead of the entire screen"
 msgstr "Capturează o fereastră în locul întregului ecran"
 
-#: ../src/screenshot-application.c:633
+#: src/screenshot-application.c:636
 msgid "Grab an area of the screen instead of the entire screen"
 msgstr "Capturează o zonă din ecran în locul întregului ecran"
 
-#: ../src/screenshot-application.c:634
+#: src/screenshot-application.c:637
 msgid "Include the window border with the screenshot"
 msgstr "Include și chenarul ferestrei în captura de ecran"
 
-#: ../src/screenshot-application.c:635
+#: src/screenshot-application.c:638
 msgid "Remove the window border from the screenshot"
 msgstr "Șterge conturul ferestrei din captura de ecran"
 
-#: ../src/screenshot-application.c:636
+#: src/screenshot-application.c:639
 msgid "Include the pointer with the screenshot"
 msgstr "Include cursorul în captura de ecran"
 
-#: ../src/screenshot-application.c:637
+#: src/screenshot-application.c:640
 msgid "Take screenshot after specified delay [in seconds]"
 msgstr "Realizează captura de ecran după întârzierea specificată (în secunde)"
 
 #. translators: this is the last part of the "grab after a
 #. * delay of <spin button> seconds".
 #.
-#: ../src/screenshot-application.c:637
-#: ../src/screenshot-interactive-dialog.c:413
+#: src/screenshot-application.c:640 src/screenshot-interactive-dialog.c:415
 msgid "seconds"
 msgstr "secunde"
 
-#: ../src/screenshot-application.c:638
+#: src/screenshot-application.c:641
 msgid "Effect to add to the border (shadow, border, vintage or none)"
 msgstr "Efect de adăugat conturului (umbră, contur, de epocă sau nimic)"
 
-#: ../src/screenshot-application.c:638
+#: src/screenshot-application.c:641
 msgid "effect"
 msgstr "efect"
 
-#: ../src/screenshot-application.c:639
+#: src/screenshot-application.c:642
 msgid "Interactively set options"
 msgstr "Definire opțiuni interactiv"
 
-#: ../src/screenshot-application.c:640
+#: src/screenshot-application.c:643
 msgid "Save screenshot directly to this file"
 msgstr "Salvează captura de ecran direct în acest fișier"
 
-#: ../src/screenshot-application.c:640
+#: src/screenshot-application.c:643
 msgid "filename"
 msgstr "numefișier"
 
-#: ../src/screenshot-application.c:641
+#: src/screenshot-application.c:644
 msgid "Print version information and exit"
 msgstr "Afișează informații despre versiune și iese"
 
-#: ../src/screenshot-application.c:770
+#: src/screenshot-application.c:773
 msgid "translator-credits"
 msgstr "Bogdan Mințoi<[e-mail]>,2014"
 
-#: ../src/screenshot-config.c:116
-#, c-format
+#: src/screenshot-config.c:117
 msgid ""
 "Conflicting options: --window and --area should not be used at the same "
 "time.\n"
 msgstr ""
 "Opțiuni în conflict: --window și --area nu ar trebui folosite simultan.\n"
 
-#: ../src/screenshot-config.c:123
-#, c-format
+#: src/screenshot-config.c:124
 msgid ""
 "Conflicting options: --area and --delay should not be used at the same "
 "time.\n"
 msgstr ""
 "Opțiuni în conflict: --area și --delay nu ar trebui folosite simultan.\n"
 
-#: ../src/screenshot-dialog.c:314
+#: src/screenshot-dialog.c:319
 msgid "Screenshot.png"
 msgstr "Captură-de-ecran.png"
 
-#. translators: this is the name of the file that gets made up
-#. * with the screenshot if the entire screen is taken
-#: ../src/screenshot-filename-builder.c:143
+#: src/screenshot-dialog.ui:7
+msgid "Save Screenshot"
+msgstr "Salvează captura de ecran"
+
+#: src/screenshot-dialog.ui:17
+msgid "Back"
+msgstr "Înapoi"
+
+#: src/screenshot-dialog.ui:38
+msgid "C_opy to Clipboard"
+msgstr "C_opiază în clipboard"
+
+#: src/screenshot-dialog.ui:50
+msgid "_Save"
+msgstr "_Salvează"
+
+#: src/screenshot-dialog.ui:110
+msgid "_Name:"
+msgstr "_Nume:"
+
+#: src/screenshot-dialog.ui:127
+msgid "Save in _folder:"
+msgstr "Salvează în _dosar:"
+
+#. translators: this is the name of the file that gets made up with the
+#. * screenshot if the entire screen is taken. The first placeholder is a
+#. * timestamp (e.g. "2017-05-21 12-24-03"); the second placeholder is the
+#. * file format (e.g. "png").
+#.
+#: src/screenshot-filename-builder.c:147
 #, c-format
-#| msgid "Screenshot-from-%s.%s"
 msgid "Screenshot from %s.%s"
 msgstr "Captură de ecran din %s.%s"
 
-#. translators: this is the name of the file that gets
-#. * made up with the screenshot if the entire screen is
-#. * taken
-#: ../src/screenshot-filename-builder.c:150
+#. translators: this is the name of the file that gets made up with the
+#. * screenshot if the entire screen is taken and the simpler filename
+#. * already exists. The first and second placeholders are a timestamp and
+#. * a counter to make it unique (e.g. "2017-05-21 12-24-03 - 2"); the third
+#. * placeholder is the file format (e.g. "png").
+#.
+#: src/screenshot-filename-builder.c:157
 #, c-format
-#| msgid "Screenshot-from-%s-%d.%s"
 msgid "Screenshot from %s - %d.%s"
 msgstr "Captură de ecran din %s - %d.%s"
 
-#: ../src/screenshot-interactive-dialog.c:156
+#. Translators:
+#. * these are the names of the effects available which will be
+#. * displayed inside a combo box in interactive mode for the user
+#. * to chooser.
+#.
+#: src/screenshot-interactive-dialog.c:157
 msgid "None"
 msgstr "Nimic"
 
-#: ../src/screenshot-interactive-dialog.c:157
+#: src/screenshot-interactive-dialog.c:158
 msgid "Drop shadow"
 msgstr "Umbră"
 
-#: ../src/screenshot-interactive-dialog.c:158
+#: src/screenshot-interactive-dialog.c:159
 msgid "Border"
 msgstr "Contur"
 
-#: ../src/screenshot-interactive-dialog.c:159
+#: src/screenshot-interactive-dialog.c:160
 msgid "Vintage"
 msgstr "De epocă"
 
 #. * Include pointer *
-#: ../src/screenshot-interactive-dialog.c:262
+#: src/screenshot-interactive-dialog.c:264
 msgid "Include _pointer"
 msgstr "_Include cursor"
 
 #. * Include window border *
-#: ../src/screenshot-interactive-dialog.c:272
+#: src/screenshot-interactive-dialog.c:274
 msgid "Include the window _border"
 msgstr "Include conturul fere_strei"
 
-#: ../src/screenshot-interactive-dialog.c:289
+#: src/screenshot-interactive-dialog.c:291
 msgid "Apply _effect:"
 msgstr "Aplică _efect:"
 
-#: ../src/screenshot-interactive-dialog.c:346
+#: src/screenshot-interactive-dialog.c:348
 msgid "Grab the whole sc_reen"
 msgstr "Capturează tot _ecranul"
 
-#: ../src/screenshot-interactive-dialog.c:360
+#: src/screenshot-interactive-dialog.c:362
 msgid "Grab the current _window"
 msgstr "Capturează fereas_tra curentă"
 
-#: ../src/screenshot-interactive-dialog.c:372
+#: src/screenshot-interactive-dialog.c:374
 msgid "Select _area to grab"
 msgstr "Alegeți _zona de captură"
 
 #. translators: this is the first part of the "grab after a
 #. * delay of <spin button> seconds".
 #.
-#: ../src/screenshot-interactive-dialog.c:392
+#: src/screenshot-interactive-dialog.c:394
 msgid "Grab after a _delay of"
 msgstr "Capturează după o întârziere _de"
 
-#: ../src/screenshot-interactive-dialog.c:463
+#: src/screenshot-interactive-dialog.c:464
 msgid "Take Screenshot"
 msgstr "Salvează o captură de ecran"
 
-#: ../src/screenshot-interactive-dialog.c:464
+#: src/screenshot-interactive-dialog.c:465
 msgid "Effects"
 msgstr "Efecte"
 
-#: ../src/screenshot-interactive-dialog.c:477
-msgid "_Help"
-msgstr "_Ajutor"
-
-#: ../src/screenshot-interactive-dialog.c:486
+#: src/screenshot-interactive-dialog.c:469
 msgid "Take _Screenshot"
 msgstr "_Captură ecran"
 
-#: ../src/screenshot-interactive-dialog.c:503
+#: src/screenshot-interactive-dialog.c:486
 msgid "_Cancel"
 msgstr "_Anulează"
 
-#: ../src/screenshot-utils.c:724
+#: src/screenshot-utils.c:725
 msgid "Error loading the help page"
 msgstr "Eroare la încărcarea paginii de ajutor"
 
+#~ msgid "_Help"
+#~ msgstr "_Ajutor"
+
 #~ msgid "Error while saving screenshot"
 #~ msgstr "Eroare la salvarea capturii de ecran"
 
diff --git a/po/ru.po b/po/ru.po
index a96ba14..1ff5743 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,9 +20,9 @@ msgstr ""
 "Project-Id-Version: gnome-utils trunk\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "screenshot&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-23 22:57+0000\n"
-"PO-Revision-Date: 2017-03-14 21:26+0400\n"
-"Last-Translator: Yuri Myasoedov <[e-mail]>\n"
+"POT-Creation-Date: 2018-02-20 23:00+0000\n"
+"PO-Revision-Date: 2018-03-13 22:15+0300\n"
+"Last-Translator: Stas Solovey <[e-mail]>\n"
 "Language-Team: Русский <[e-mail]>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -31,97 +31,13 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "10<=4 && (n%100<10 || n%100>=20) ? 1: 2);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.0.6\n"
 
-#: ../src/org.gnome.Screenshot.desktop.in.h:1
-#: ../src/screenshot-application.c:767
-msgid "Screenshot"
-msgstr "Снимок экрана"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:2
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:2
-#: ../src/screenshot-application.c:768
-msgid "Save images of your screen or individual windows"
-msgstr "Сохранить изображение с экрана или отдельных окон"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:3
-msgid "snapshot;capture;print;screenshot;"
-msgstr "снимок;захват;печать;скриншот;"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:4
-msgid "Take a Screenshot of the Whole Screen"
-msgstr "Сделать снимок всего экрана"
-
-#: ../src/org.gnome.Screenshot.desktop.in.h:5
-msgid "Take a Screenshot of the Current Window"
-msgstr "Сделать снимок текущего окна"
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:1
-msgid "GNOME Screenshot"
-msgstr "Снимок экрана GNOME"
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:3
-msgid ""
-"GNOME Screenshot is a simple utility that lets you take pictures of your "
-"computer screen. Screenshots can be of your whole screen, any specific "
-"application, or a selected rectangular area. You can also copy the captured "
-"screenshot directly into the GNOME clipboard and paste it into other "
-"applications."
-msgstr ""
-"Снимок экрана GNOME — это простое приложение, с помощью которого можно "
-"делать снимки экрана с вашего компьютера. Это может быть снимок всего "
-"экрана, конкретного приложения или выделенной прямоугольной области. "
-"Сделанные снимки можно копировать в другие приложения через буфер обмена."
-
-#: ../src/org.gnome.Screenshot.appdata.xml.in.h:4
-msgid ""
-"GNOME Screenshot allows you to take screenshots even when it’s not open: "
-"just press the PrtSc button on your keyboard, and a snapshot of your whole "
-"screen will be saved to your Pictures folder. Hold Alt while pressing PrtSc "
-"and you will get a screenshot of only the currently selected window."
-msgstr ""
-"С помощью приложения «Снимок экрана GNOME» можно делать снимки, не открывая "
-"само приложение. Просто нажмите клавишу PrtScrn на клавиатуре, и снимок "
-"экрана будет сохранён в папку «Изображения». Чтобы сделать снимок текущего "
-"окна, нажмите PrtScrn, удерживая клавишу Alt."
-
-#: ../src/screenshot-app-menu.ui.h:1
-msgid "Help"
-msgstr "Справка"
-
-#: ../src/screenshot-app-menu.ui.h:2
-msgid "About"
-msgstr "О приложении"
-
-#: ../src/screenshot-app-menu.ui.h:3
-msgid "Quit"
-msgstr "Завершить"
-
-#: ../src/screenshot-dialog.ui.h:1
-msgid "Save Screenshot"
-msgstr "Сохранить снимок экрана"
-
-#: ../src/screenshot-dialog.ui.h:2
-msgid "C_opy to Clipboard"
-msgstr "К_опировать в буфер обмена"
-
-#: ../src/screenshot-dialog.ui.h:3
-msgid "_Save"
-msgstr "_Сохранить"
-
-#: ../src/screenshot-dialog.ui.h:4
-msgid "_Name:"
-msgstr "_Имя:"
-
-#: ../src/screenshot-dialog.ui.h:5
-msgid "Save in _folder:"
-msgstr "Сохранить в _папке:"
-
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:1
+#: src/org.gnome.gnome-screenshot.gschema.xml:11
 msgid "Window-specific screenshot (deprecated)"
 msgstr "Делать снимок текущего окна (устарел)"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:2
+#: src/org.gnome.gnome-screenshot.gschema.xml:12
 msgid ""
 "Grab just the current window, rather than the whole desktop. This key has "
 "been deprecated and it is no longer in use."
@@ -129,60 +45,60 @@ msgstr ""
 "Снимать только текущее окно, а не весь рабочий стол. Этот ключ устарел и "
 "больше не используется."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:3
+#: src/org.gnome.gnome-screenshot.gschema.xml:16
 msgid "Screenshot delay"
 msgstr "Задержка снимка экрана"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:4
+#: src/org.gnome.gnome-screenshot.gschema.xml:17
 msgid "The number of seconds to wait before taking the screenshot."
 msgstr "Задержка в секундах перед созданием снимка экрана."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:5
+#: src/org.gnome.gnome-screenshot.gschema.xml:21
 msgid "Screenshot directory"
 msgstr "Каталог для снимков экрана"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:6
+#: src/org.gnome.gnome-screenshot.gschema.xml:22
 msgid "The directory where the screenshots will be saved by default."
 msgstr "Каталог по умолчанию для сохранения снимков экрана."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:7
+#: src/org.gnome.gnome-screenshot.gschema.xml:26
 msgid "Last save directory"
 msgstr "Последний каталог для сохранения"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:8
+#: src/org.gnome.gnome-screenshot.gschema.xml:27
 msgid "The last directory a screenshot was saved in interactive mode."
 msgstr ""
 "Каталог, в который последний раз сохранялся снимок в интерактивном режиме."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:9
+#: src/org.gnome.gnome-screenshot.gschema.xml:31
 msgid "Include Border"
 msgstr "Добавить рамку"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:10
+#: src/org.gnome.gnome-screenshot.gschema.xml:32
 msgid "Include the window manager border along with the screenshot"
 msgstr "Добавить рамку окна в снимок"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:11
+#: src/org.gnome.gnome-screenshot.gschema.xml:36
 msgid "Include Pointer"
 msgstr "Добавить указатель"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:12
+#: src/org.gnome.gnome-screenshot.gschema.xml:37
 msgid "Include the pointer in the screenshot"
 msgstr "Добавить указатель мыши в снимок экрана"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:13
+#: src/org.gnome.gnome-screenshot.gschema.xml:41
 msgid "Include ICC Profile"
 msgstr "Добавить профиль ICC"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:14
+#: src/org.gnome.gnome-screenshot.gschema.xml:42
 msgid "Include the ICC profile of the target in the screenshot file"
 msgstr "Добавить целевой профиль ICC в файл снимка экрана"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:15
+#: src/org.gnome.gnome-screenshot.gschema.xml:46
 msgid "Border Effect"
 msgstr "Эффект рамки"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:16
+#: src/org.gnome.gnome-screenshot.gschema.xml:47
 msgid ""
 "Effect to add to the outside of a border. Possible values are “shadow”, "
 "“none”, and “border”."
@@ -190,115 +106,182 @@ msgstr ""
 "Эффект, добавляемый вокруг рамки. Возможные значения: «shadow», «none» и "
 "«border»."
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:17
+#: src/org.gnome.gnome-screenshot.gschema.xml:51
 msgid "Default file type extension"
 msgstr "Тип расширения файла по умолчанию"
 
-#: ../src/org.gnome.gnome-screenshot.gschema.xml.h:18
+#: src/org.gnome.gnome-screenshot.gschema.xml:52
 msgid "The default file type extension for screenshots."
 msgstr "Тип расширения файла снимка экрана по умолчанию."
 
-#: ../src/screenshot-application.c:145
+#: src/org.gnome.Screenshot.desktop.in:3 src/screenshot-application.c:770
+#: src/screenshot-application.c:838
+msgid "Screenshot"
+msgstr "Снимок экрана"
+
+#: src/org.gnome.Screenshot.desktop.in:4
+#: src/org.gnome.Screenshot.metainfo.xml.in:8 src/screenshot-application.c:771
+msgid "Save images of your screen or individual windows"
+msgstr "Сохранить изображение с экрана или отдельных окон"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: src/org.gnome.Screenshot.desktop.in:6
+msgid "snapshot;capture;print;screenshot;"
+msgstr "снимок;захват;печать;скриншот;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: src/org.gnome.Screenshot.desktop.in:11
+msgid "applets-screenshooter"
+msgstr "applets-screenshooter"
+
+#: src/org.gnome.Screenshot.desktop.in:22
+msgid "Take a Screenshot of the Whole Screen"
+msgstr "Сделать снимок всего экрана"
+
+#: src/org.gnome.Screenshot.desktop.in:26
+msgid "Take a Screenshot of the Current Window"
+msgstr "Сделать снимок текущего окна"
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:7
+msgid "GNOME Screenshot"
+msgstr "Снимок экрана GNOME"
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:10
+msgid ""
+"GNOME Screenshot is a simple utility that lets you take pictures of your "
+"computer screen. Screenshots can be of your whole screen, any specific "
+"application, or a selected rectangular area. You can also copy the captured "
+"screenshot directly into the GNOME clipboard and paste it into other "
+"applications."
+msgstr ""
+"Снимок экрана GNOME — это простое приложение, с помощью которого можно "
+"делать снимки экрана с вашего компьютера. Это может быть снимок всего "
+"экрана, конкретного приложения или выделенной прямоугольной области. "
+"Сделанные снимки можно копировать в другие приложения через буфер обмена."
+
+#: src/org.gnome.Screenshot.metainfo.xml.in:17
+msgid ""
+"GNOME Screenshot allows you to take screenshots even when it’s not open: "
+"just press the PrtSc button on your keyboard, and a snapshot of your whole "
+"screen will be saved to your Pictures folder. Hold Alt while pressing PrtSc "
+"and you will get a screenshot of only the currently selected window."
+msgstr ""
+"С помощью приложения «Снимок экрана GNOME» можно делать снимки, не открывая "
+"само приложение. Просто нажмите клавишу PrtScrn на клавиатуре, и снимок "
+"экрана будет сохранён в папку «Изображения». Чтобы сделать снимок текущего "
+"окна, нажмите PrtScrn, удерживая клавишу Alt."
+
+#: src/screenshot-app-menu.ui:6
+msgid "Help"
+msgstr "Справка"
+
+#: src/screenshot-app-menu.ui:10
+msgid "About"
+msgstr "О приложении"
+
+#: src/screenshot-app-menu.ui:14
+msgid "Quit"
+msgstr "Завершить"
+
+#: src/screenshot-application.c:151
 #, c-format
 msgid "A file named “%s” already exists in “%s”"
 msgstr "Файл с именем «%s» уже существует в «%s»"
 
-#: ../src/screenshot-application.c:152
+#: src/screenshot-application.c:158
 msgid "Overwrite existing file?"
 msgstr "Перезаписать существующий файл?"
 
-#: ../src/screenshot-application.c:174 ../src/screenshot-application.c:183
-#: ../src/screenshot-application.c:463 ../src/screenshot-application.c:467
-#: ../src/screenshot-application.c:507 ../src/screenshot-application.c:510
+#: src/screenshot-application.c:180 src/screenshot-application.c:189
+#: src/screenshot-application.c:466 src/screenshot-application.c:470
+#: src/screenshot-application.c:510 src/screenshot-application.c:513
 msgid "Unable to capture a screenshot"
 msgstr "Не удалось сделать снимок экрана"
 
-#: ../src/screenshot-application.c:175
+#: src/screenshot-application.c:181
 msgid "Error creating file. Please choose another location and retry."
 msgstr ""
 "Ошибка создания файла. Выберите другое местоположение и повторите попытку."
 
-#: ../src/screenshot-application.c:464
+#: src/screenshot-application.c:467
 msgid "Error creating file"
 msgstr "Ошибка создания файла"
 
-#: ../src/screenshot-application.c:475 ../src/screenshot-application.c:543
+#: src/screenshot-application.c:478 src/screenshot-application.c:546
 msgid "Screenshot taken"
 msgstr "Снимок экрана сделан"
 
-#: ../src/screenshot-application.c:508
+#: src/screenshot-application.c:511
 msgid "All possible methods failed"
 msgstr "Все доступные способы завершились неудачно"
 
-#: ../src/screenshot-application.c:631
+#: src/screenshot-application.c:634
 msgid "Send the grab directly to the clipboard"
 msgstr "Отправить снимок в буфер обмена"
 
-#: ../src/screenshot-application.c:632
+#: src/screenshot-application.c:635
 msgid "Grab a window instead of the entire screen"
 msgstr "Захватить окно, а не весь экран"
 
-#: ../src/screenshot-application.c:633
+#: src/screenshot-application.c:636
 msgid "Grab an area of the screen instead of the entire screen"
 msgstr "Захватить область экрана, а не весь экран"
 
-#: ../src/screenshot-application.c:634
+#: src/screenshot-application.c:637
 msgid "Include the window border with the screenshot"
 msgstr "Добавить рамку окна в снимок"
 
-#: ../src/screenshot-application.c:635
+#: src/screenshot-application.c:638
 msgid "Remove the window border from the screenshot"
 msgstr "Убрать рамку окна из снимка"
 
-#: ../src/screenshot-application.c:636
+#: src/screenshot-application.c:639
 msgid "Include the pointer with the screenshot"
 msgstr "Показывать указатель мыши на снимке экрана"
 
-#: ../src/screenshot-application.c:637
+#: src/screenshot-application.c:640
 msgid "Take screenshot after specified delay [in seconds]"
 msgstr "Сделать снимок через указанное время [в секундах]"
 
 #. translators: this is the last part of the "grab after a
 #. * delay of <spin button> seconds".
 #.
-#: ../src/screenshot-application.c:637
-#: ../src/screenshot-interactive-dialog.c:414
+#: src/screenshot-application.c:640 src/screenshot-interactive-dialog.c:415
 msgid "seconds"
 msgstr "секунд"
 
-#: ../src/screenshot-application.c:638
+#: src/screenshot-application.c:641
 msgid "Effect to add to the border (shadow, border, vintage or none)"
 msgstr "Эффект, добавляемый к рамке окна (тень, рамка, винтаж или без эффекта)"
 
-#: ../src/screenshot-application.c:638
+#: src/screenshot-application.c:641
 msgid "effect"
 msgstr "эффект"
 
-#: ../src/screenshot-application.c:639
+#: src/screenshot-application.c:642
 msgid "Interactively set options"
 msgstr "Указать параметры"
 
-#: ../src/screenshot-application.c:640
+#: src/screenshot-application.c:643
 msgid "Save screenshot directly to this file"
 msgstr "Сохранить снимок экрана в этот файл"
 
-#: ../src/screenshot-application.c:640
+#: src/screenshot-application.c:643
 msgid "filename"
 msgstr "имя_файла"
 
-#: ../src/screenshot-application.c:641
+#: src/screenshot-application.c:644
 msgid "Print version information and exit"
 msgstr "Показать информацию о версии и выйти"
 
-#: ../src/screenshot-application.c:770
+#: src/screenshot-application.c:773
 msgid "translator-credits"
 msgstr ""
 "Алексей Кабанов <[e-mail]>, 2012.\n"
 "Юрий Мясоедов <[e-mail]>, 2012-2014.\n"
-"Станислав Соловей <[e-mail]>, 2013-2015."
+"Станислав Соловей <[e-mail]>, 2013-2018."
 
-#: ../src/screenshot-config.c:116
-#, c-format
+#: src/screenshot-config.c:117
 msgid ""
 "Conflicting options: --window and --area should not be used at the same "
 "time.\n"
@@ -306,29 +289,58 @@ msgstr ""
 "Несовместимые параметры: нельзя одновременно использовать --window и --"
 "area.\n"
 
-#: ../src/screenshot-config.c:123
-#, c-format
+#: src/screenshot-config.c:124
 msgid ""
 "Conflicting options: --area and --delay should not be used at the same "
 "time.\n"
 msgstr ""
 "Несовместимые параметры: нельзя одновременно использовать --area и --delay.\n"
 
-#: ../src/screenshot-dialog.c:312
+#: src/screenshot-dialog.c:319
 msgid "Screenshot.png"
 msgstr "Снимок экрана.png"
 
-#. translators: this is the name of the file that gets made up
-#. * with the screenshot if the entire screen is taken
-#: ../src/screenshot-filename-builder.c:143
+#: src/screenshot-dialog.ui:7
+msgid "Save Screenshot"
+msgstr "Сохранить снимок экрана"
+
+#: src/screenshot-dialog.ui:17
+msgid "Back"
+msgstr "Назад"
+
+#: src/screenshot-dialog.ui:38
+msgid "C_opy to Clipboard"
+msgstr "К_опировать в буфер обмена"
+
+#: src/screenshot-dialog.ui:50
+msgid "_Save"
+msgstr "_Сохранить"
+
+#: src/screenshot-dialog.ui:110
+msgid "_Name:"
+msgstr "_Имя:"
+
+#: src/screenshot-dialog.ui:127
+msgid "Save in _folder:"
+msgstr "Сохранить в _папке:"
+
+#. translators: this is the name of the file that gets made up with the
+#. * screenshot if the entire screen is taken. The first placeholder is a
+#. * timestamp (e.g. "2017-05-21 12-24-03"); the second placeholder is the
+#. * file format (e.g. "png").
+#.
+#: src/screenshot-filename-builder.c:147
 #, c-format
 msgid "Screenshot from %s.%s"
 msgstr "Снимок экрана от %s.%s"
 
-#. translators: this is the name of the file that gets
-#. * made up with the screenshot if the entire screen is
-#. * taken
-#: ../src/screenshot-filename-builder.c:150
+#. translators: this is the name of the file that gets made up with the
+#. * screenshot if the entire screen is taken and the simpler filename
+#. * already exists. The first and second placeholders are a timestamp and
+#. * a counter to make it unique (e.g. "2017-05-21 12-24-03 - 2"); the third
+#. * placeholder is the file format (e.g. "png").
+#.
+#: src/screenshot-filename-builder.c:157
 #, c-format
 msgid "Screenshot from %s - %d.%s"
 msgstr "Снимок экрана от %s - %d.%s"
@@ -338,75 +350,74 @@ msgstr "Снимок экрана от %s - %d.%s"
 #. * displayed inside a combo box in interactive mode for the user
 #. * to chooser.
 #.
-#: ../src/screenshot-interactive-dialog.c:156
+#: src/screenshot-interactive-dialog.c:157
 msgid "None"
 msgstr "Нет"
 
-#: ../src/screenshot-interactive-dialog.c:157
+#: src/screenshot-interactive-dialog.c:158
 msgid "Drop shadow"
 msgstr "Отбрасывать тень"
 
-#: ../src/screenshot-interactive-dialog.c:158
+#: src/screenshot-interactive-dialog.c:159
 msgid "Border"
 msgstr "Рамка"
 
-#: ../src/screenshot-interactive-dialog.c:159
+#: src/screenshot-interactive-dialog.c:160
 msgid "Vintage"
 msgstr "Винтаж"
 
 #. * Include pointer *
-#: ../src/screenshot-interactive-dialog.c:263
+#: src/screenshot-interactive-dialog.c:264
 msgid "Include _pointer"
 msgstr "Включить _указатель"
 
 #. * Include window border *
-#: ../src/screenshot-interactive-dialog.c:273
+#: src/screenshot-interactive-dialog.c:274
 msgid "Include the window _border"
 msgstr "Включить ра_мку окна"
 
-#: ../src/screenshot-interactive-dialog.c:290
+#: src/screenshot-interactive-dialog.c:291
 msgid "Apply _effect:"
 msgstr "Применить _эффект:"
 
-#: ../src/screenshot-interactive-dialog.c:347
+#: src/screenshot-interactive-dialog.c:348
 msgid "Grab the whole sc_reen"
 msgstr "Захватить весь _экран"
 
-#: ../src/screenshot-interactive-dialog.c:361
+#: src/screenshot-interactive-dialog.c:362
 msgid "Grab the current _window"
 msgstr "Захватить текущее _окно"
 
-#: ../src/screenshot-interactive-dialog.c:373
+#: src/screenshot-interactive-dialog.c:374
 msgid "Select _area to grab"
 msgstr "Выбрать _область захвата"
 
 #. translators: this is the first part of the "grab after a
 #. * delay of <spin button> seconds".
 #.
-#: ../src/screenshot-interactive-dialog.c:393
+#: src/screenshot-interactive-dialog.c:394
 msgid "Grab after a _delay of"
 msgstr "Захватить после _задержки"
 
-#: ../src/screenshot-interactive-dialog.c:464
+#: src/screenshot-interactive-dialog.c:464
 msgid "Take Screenshot"
 msgstr "Сделать снимок экрана"
 
-#: ../src/screenshot-interactive-dialog.c:465
+#: src/screenshot-interactive-dialog.c:465
 msgid "Effects"
 msgstr "Эффекты"
 
-#: ../src/screenshot-interactive-dialog.c:478
-msgid "_Help"
-msgstr "_Справка"
-
-#: ../src/screenshot-interactive-dialog.c:487
+#: src/screenshot-interactive-dialog.c:469
 msgid "Take _Screenshot"
 msgstr "Сделать _снимок экрана"
 
-#: ../src/screenshot-interactive-dialog.c:504
+#: src/screenshot-interactive-dialog.c:486
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: ../src/screenshot-utils.c:724
+#: src/screenshot-utils.c:725
 msgid "Error loading the help page"
 msgstr "При загрузке страницы справки произошла ошибка"
+
+#~ msgid "_Help"
+#~ msgstr "_Справка"
diff --git a/po/sl.po b/po/sl.po
index 352d742..d99a430 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@
 # Copyright (C) 2000-2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-screenshot package.
 #
-# Matej Urbančič <[e-mail]>, 2011–2017.
+# Matej Urbančič <[e-mail]>, 2011–2018.
 #
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "screenshot&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2017-07-31 16:35+0200\n"
-"PO-Revision-Date: 2017-07-31 16:35+0200\n"
+"PO-Revision-Date: 2018-03-26 22:35+0200\n"
 "Last-Translator: Matej Urbančič <[e-mail]>\n"
 "Language-Team: Slovenian GNOME Translation Team <[e-mail]>\n"
 "Language: sl_SI\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: src/org.gnome.gnome-screenshot.gschema.xml:11
 msgid "Window-specific screenshot (deprecated)"
@@ -56,7 +56,7 @@ msgstr "Zadnja mapa za shranjevanje"
 
 #: src/org.gnome.gnome-screenshot.gschema.xml:27
 msgid "The last directory a screenshot was saved in interactive mode."
-msgstr "Mapa v katero je bila shranjena slika ob zadnjem shranjevanju."
+msgstr "Mapa, v katero je bila shranjena slika ob zadnjem shranjevanju."
 
 #: src/org.gnome.gnome-screenshot.gschema.xml:31
 msgid "Include Border"
@@ -68,7 +68,7 @@ msgstr "Vključi robove okenskega upravljalnika skupaj z zaslonsko sliko"
 
 #: src/org.gnome.gnome-screenshot.gschema.xml:36
 msgid "Include Pointer"
-msgstr "Vključi kazalnik"
+msgstr "Vključi kazalko"
 
 #: src/org.gnome.gnome-screenshot.gschema.xml:37
 msgid "Include the pointer in the screenshot"
@@ -115,7 +115,7 @@ msgstr "Zajemanje slik zaslona ali posameznih oken"
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: src/org.gnome.Screenshot.desktop.in:6
 msgid "snapshot;capture;print;screenshot;"
-msgstr "zajemanje;zajeto;zajem;natisni;zaslonska slika;"
+msgstr "zajemanje;zajeto;zajem;natisni;zaslonska slika;screenshot;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: src/org.gnome.Screenshot.desktop.in:11
@@ -143,7 +143,7 @@ msgid ""
 "applications."
 msgstr ""
 "Program Zajemalnik slik za GNOME je enostavno orodje za zajemanje zaslonskih "
-"slik. Omogoča zajemanje celotnega  zaslona, dejavnih oken ali poljubno "
+"slik. Omogoča zajemanje celotnega zaslona, dejavnih oken ali poljubno "
 "pravokotno ploskev na zaslonu. Sliko je mogoče zajeti v odložišče ali pa "
 "shraniti na disk."
 
@@ -156,8 +156,8 @@ msgid ""
 msgstr ""
 "Program GNOME Zajemalnik zaslonskih slik omogoča zajemanje vsebine zaslona "
 "tudi, če ni zagnan. Pritisniti je treba zgolj tipko PrtSc na tipkovnici in "
-"slica celotnega zaslona bo shranjena v mapo Slik. Če pritisnete tudi tipko "
-"Alt, bo shranjeno le trenutno dejavno okno."
+"slika celotnega zaslona bo shranjena v mapo s slikami. Če pritisnete tudi "
+"tipko Alt, bo shranjeno le trenutno dejavno okno."
 
 #: src/screenshot-app-menu.ui:6
 msgid "Help"
@@ -174,7 +174,7 @@ msgstr "Končaj"
 #: src/screenshot-application.c:151
 #, c-format
 msgid "A file named “%s” already exists in “%s”"
-msgstr "Datoteka z imenom »%s« že obstaja v mapi »%s«"
+msgstr "Datoteka z imenom »%s« v mapi »%s« že obstaja."
 
 #: src/screenshot-application.c:158
 msgid "Overwrite existing file?"
@@ -205,15 +205,15 @@ msgstr "Vsi podprti načni so spodleteli."
 
 #: src/screenshot-application.c:634
 msgid "Send the grab directly to the clipboard"
-msgstr "Pošlji zajete podatke neposredno v odložišče"
+msgstr "Pošiljanje zajete podatke neposredno v odložišče"
 
 #: src/screenshot-application.c:635
 msgid "Grab a window instead of the entire screen"
-msgstr "Zajemi okno namesto celotnega zaslona"
+msgstr "Zajem okna namesto celotnega zaslona"
 
 #: src/screenshot-application.c:636
 msgid "Grab an area of the screen instead of the entire screen"
-msgstr "Zajemi območje zaslona namesto celotnega zaslona"
+msgstr "Zajem določenega območja zaslona namesto celotnega zaslona"
 
 #: src/screenshot-application.c:637
 msgid "Include the window border with the screenshot"
@@ -221,15 +221,15 @@ msgstr "V zaslonsko sliko vključi tudi robove okna"
 
 #: src/screenshot-application.c:638
 msgid "Remove the window border from the screenshot"
-msgstr "Iz zaslonske slike odstrani robove okna"
+msgstr "Na zaslonski sliki obreži robove okna"
 
 #: src/screenshot-application.c:639
 msgid "Include the pointer with the screenshot"
-msgstr "V zaslonsko sliko vključi tudi kazalnik"
+msgstr "V zaslonsko sliko vključi tudi kazalko"
 
 #: src/screenshot-application.c:640
 msgid "Take screenshot after specified delay [in seconds]"
-msgstr "Zajemi zaslonsko sliko po navedenem zamiku [v sekundah]"
+msgstr "Zajem zaslonske slike po navedenem zamiku [v sekundah]"
 
 #. translators: this is the last part of the "grab after a
 #. * delay of <spin button> seconds".
@@ -240,7 +240,7 @@ msgstr "sekund"
 
 #: src/screenshot-application.c:641
 msgid "Effect to add to the border (shadow, border, vintage or none)"
-msgstr "Učinki za dodajanje robovom (senca, rob, staranje in brez)"
+msgstr "Učinek za dodajanje (senca, dodatni rob, postaranje in brez učinka)"
 
 #: src/screenshot-application.c:641
 msgid "effect"
@@ -248,7 +248,7 @@ msgstr "učinek"
 
 #: src/screenshot-application.c:642
 msgid "Interactively set options"
-msgstr "Interaktivna določanje možnosti"
+msgstr "Interaktivno določanje možnosti"
 
 #: src/screenshot-application.c:643
 msgid "Save screenshot directly to this file"
@@ -271,15 +271,14 @@ msgid ""
 "Conflicting options: --window and --area should not be used at the same "
 "time.\n"
 msgstr ""
-"Možnosti v sporu: zastavic --window in --area ni mogoče uporabljati "
-"sočasno.\n"
+"Možnosti v sporu: zastavic --window in --area ni mogoče uporabiti sočasno.\n"
 
 #: src/screenshot-config.c:124
 msgid ""
 "Conflicting options: --area and --delay should not be used at the same "
 "time.\n"
 msgstr ""
-"Možnosti v sporu: zastavic --area in --delay ni mogoče uporabljati sočasno.\n"
+"Možnosti v sporu: zastavic --area in --delay ni mogoče uporabiti sočasno.\n"
 
 #: src/screenshot-dialog.c:319
 msgid "Screenshot.png"
@@ -328,7 +327,7 @@ msgstr "Zaslonska slika %s.%s"
 #: src/screenshot-filename-builder.c:157
 #, c-format
 msgid "Screenshot from %s - %d.%s"
-msgstr "Zaslonska slika %s - %d.%s"
+msgstr "Zaslonska slika %s – %d.%s"
 
 #. Translators:
 #. * these are the names of the effects available which will be
@@ -345,16 +344,16 @@ msgstr "Senčenje"
 
 #: src/screenshot-interactive-dialog.c:159
 msgid "Border"
-msgstr "Obroba"
+msgstr "Obroba slike"
 
 #: src/screenshot-interactive-dialog.c:160
 msgid "Vintage"
-msgstr "Staranje"
+msgstr "Postaran videz"
 
 #. * Include pointer *
 #: src/screenshot-interactive-dialog.c:264
 msgid "Include _pointer"
-msgstr "Vključi _kazalnik"
+msgstr "Vključi _kazalko"
 
 #. * Include window border *
 #: src/screenshot-interactive-dialog.c:274
@@ -367,7 +366,7 @@ msgstr "Uporabi _učinek:"
 
 #: src/screenshot-interactive-dialog.c:348
 msgid "Grab the whole sc_reen"
-msgstr "Zajemi celotni _zaslon"
+msgstr "Zajemi celoten _zaslon"
 
 #: src/screenshot-interactive-dialog.c:362
 msgid "Grab the current _window"
diff --git a/src/gnome-screenshot.1 b/src/gnome-screenshot.1
index ad82dd0..4a91e30 100644
--- a/src/gnome-screenshot.1
+++ b/src/gnome-screenshot.1
@@ -7,7 +7,7 @@ gnome-screenshot \- capture the screen, a window, or an user-defined area and sa
 .SH "DESCRIPTION"
 .PP
 \fBgnome-screenshot\fR is a GNOME utility for taking
-screenshots of the entire screen, a window or an user-defined area of the screen, with optional beautifying
+screenshots of the entire screen, a window or a user-defined area of the screen, with optional beautifying
 border effects.
 .SH "OPTIONS"
 .TP
diff --git a/src/meson.build b/src/meson.build
index 8fe9855..1fc6b1b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -57,7 +57,7 @@ install_data('org.gnome.gnome-screenshot.gschema.xml',
              install_dir: gnome_screenshot_schemadir)
 
 install_data('gnome-screenshot.1',
-             install_dir: join_paths(gnome_screenshot_datadir, 'man', 'man1'))
+             install_dir: join_paths(get_option('mandir'), 'man1'))
 
 install_data('gnome-screenshot.convert',
              install_dir: join_paths(gnome_screenshot_datadir, 'GConf', 'gsettings'))