Christian Persch · Christian Persch · Christian Persch · Christian Persch · Christian Persch · Christian Persch
--- a/README.md
+++ b/README.md
@@ -68,14 +68,6 @@ you should also pass `--reconfigure` option to it.
 (i.e. `sudo ninja -C _build install`) if installing to system directories. Use a
 user-writable directory as `--prefix` instead to avoid that.

-* You may need to set the gsettings schema path so that gnome-terminal can find
-its schemas. E.g. use
-```
-$ export GSETTINGS_SCHEMA_DIR=/some/where/share/glib-2.0/schemas
-```
-and if you skipped the `ninja install` step, you need to create the
-gsettings schema cache yourself.
-
 * Since GNOME Terminal uses a D-Bus activated server, you cannot simply run
 the self-built gnome-terminal directly. Instead, you need to start the new `gnome-terminal-server` directly using
 ```

--- a/debian/changelog
+++ b/debian/changelog
+gnome-terminal (3.46.1-2ubuntu1) kinetic; urgency=medium
+
+  * Merge with debian, remaining changes:
+    + gnome-terminal.wrap, debian/rules:
+      - Add a wrapper script to restore command line compatibility.
+    + debian/control.in:
+      - gnome-terminal depends on python3, python3-gi and gir1.2-glib-2.0 for
+        the wrapper script.
+      - add a build dependency on gettext to match the use of the i18n meson
+        module
+    + Add 0001-Restore-transparency.patch:
+      - Restore transparency support
+    + Add 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch:
+      - Add CSS names and style classes so we can theme things more easily.
+    + Add 0001-screen-window-Extra-padding-around-transparent-termi.patch:
+      - Fix transparency on Wayland. Patch by Owen Taylor, via Debarshi Ray @
+        Fedora
+    + Add 52_support_apturl.patch:
+      - Support apt: urls.
+    + Add 60_add_lp_handler.patch:
+      - Add a handler for launchpad bug URLs.
+    + Add scrollbar-background-theming.patch:
+      - Draw background under the scrollbar that matches the actual terminal
+        background color. This allows proper theming.
+    + Add screen-Use-clean-env-when-creating-new-tab.patch:
+      - Fix environment variables on opening new tab via the "Open in
+        Terminal" right click menu in Nautilus. (LP: #1922839)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Mon, 19 Sep 2022 15:10:04 -0400
+
+gnome-terminal (3.46.1-2) unstable; urgency=medium
+
+  * Cherry-pick patch to fix preferences app install location
+  * Cherry-pick patch to fix name & icon for preferences app
+  * Cherry-pick patch to fix --profile (Closes: #1020240)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 18 Sep 2022 14:15:14 -0400
+
+gnome-terminal (3.46.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/control.in: Bump minimum VTE to 0.70.0
+  * Drop nautilus patches: applied in new release
+  * debian/gnome-terminal.install: Install standalone preferences app
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 18 Sep 2022 07:37:58 -0400
+
 gnome-terminal (3.45.90-1ubuntu1) kinetic; urgency=medium

  * Merge with debian, remaining changes:
@@ -27,7 +74,7 @@ gnome-terminal (3.45.90-1ubuntu1) kinetic; urgency=medium
        Terminal" right click menu in Nautilus. (LP: #1922839)

 -- Jesús Soto <jesus.soto@canonical.com>  Wed, 17 Aug 2022 09:47:18 -0500
- 
+
 gnome-terminal (3.45.90-1) experimental; urgency=medium

  * New upstream release

--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: debhelper-compat (= 13),
               libgtk-3-dev (>= 3.22.27),
               libnautilus-extension-dev (>= 43~beta.1),
               libpcre2-dev (>= 10.00),
-               libvte-2.91-dev (>= 0.68.0),
+               libvte-2.91-dev (>= 0.70.0),
               libx11-dev,
               meson (>= 0.49.0),
               uuid-dev,

--- a/debian/control.in
+++ b/debian/control.in
@@ -18,7 +18,7 @@ Build-Depends: debhelper-compat (= 13),
               libgtk-3-dev (>= 3.22.27),
               libnautilus-extension-dev (>= 43~beta.1),
               libpcre2-dev (>= 10.00),
-               libvte-2.91-dev (>= 0.68.0),
+               libvte-2.91-dev (>= 0.70.0),
               libx11-dev,
               meson (>= 0.49.0),
               uuid-dev,

--- a/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch
+++ b/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch
@@ -9,10 +9,10 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=712628
 1 file changed, 66 insertions(+)

 diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
-index 505ad46..773560b 100644
+index 9e3ad0e..7b1da98 100644
 --- a/src/terminal-screen.cc
 +++ b/src/terminal-screen.cc
-@@ -354,6 +354,63 @@ terminal_screen_clear_exec_data (TerminalScreen *screen,
+@@ -358,6 +358,63 @@ terminal_screen_clear_exec_data (TerminalScreen *screen,
 
 G_DEFINE_TYPE (TerminalScreen, terminal_screen, VTE_TYPE_TERMINAL)
 
@@ -76,7 +76,7 @@ index 505ad46..773560b 100644
 static void
 free_tag_data (TagData *tagdata)
 {
-@@ -1825,12 +1882,21 @@ terminal_screen_button_press (GtkWidget      *widget,
+@@ -1830,12 +1887,21 @@ terminal_screen_button_press (GtkWidget      *widget,
 char *
 terminal_screen_get_current_dir (TerminalScreen *screen)
 {

--- a/debian/patches/build-Fix-nautilus-extension-install-directory.patch
+++ b/debian/patches/build-Fix-nautilus-extension-install-directory.patch
-From: Christian Persch <chpe@src.gnome.org>
-Date: Wed, 10 Aug 2022 18:37:26 +0200
-Subject: build: Fix nautilus extension install directory
-
-(cherry picked from commit f0b0354f59def21c4cf077dd6b87ba711b21e4a5)
---
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index e81aaa7..dbc4819 100644
--- a/meson.build
-+++ b/meson.build
-@@ -85,7 +85,7 @@ gt_schemadir = gt_datadir / 'glib-2.0' / 'schemas'
- 
- gt_searchproviderdir = gt_datadir / 'gnome-shell' / 'search-providers'
- 
-gt_nautilusextensiondir = gt_libdir / 'nautilus' / 'extensions-3.0'
-+gt_nautilusextensiondir = gt_libdir / 'nautilus' / 'extensions-4'
- 
- gt_dbusinterfacedir = gt_datadir / 'dbus-1' / 'interfaces'
- gt_dbusservicedir   = gt_datadir / 'dbus-1' / 'services'
--- a/debian/patches/build-Update-nautilus-extension-build-req.patch
+++ b/debian/patches/build-Update-nautilus-extension-build-req.patch
-From: Christian Persch <chpe@src.gnome.org>
-Date: Wed, 10 Aug 2022 18:12:39 +0200
-Subject: build: Update nautilus extension build req
-
-With the nautilus gtk4 port, the pkg-config name has changed.
-
-(cherry picked from commit 699ad74e98cf0d757798fdc0eeed53dd13207ea3)
---
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 03e6196..e81aaa7 100644
--- a/meson.build
-+++ b/meson.build
-@@ -56,7 +56,7 @@ gtk_min_req_version          = '3.18'
- gtk_max_allowed_version      = '3.24'
- 
- dconf_req_version            = '0.14.0'
-libnautilus_ext_req_version  = '3.28.0'
-+libnautilus_ext_req_version  = '43'
- pcre2_req_version            = '10.00'
- schemas_req_version          = '0.1.0'
- 
-@@ -333,7 +333,7 @@ schemas_dep   = dependency('gsettings-desktop-schemas',
- uuid_dep      = dependency('uuid')
- 
- if get_option('nautilus_extension')
-  libnautilus_extension_dep = dependency('libnautilus-extension', version: '>=' + libnautilus_ext_req_version,)
-+  libnautilus_extension_dep = dependency('libnautilus-extension-4', version: '>=' + libnautilus_ext_req_version,)
- else
-   libnautilus_extension_dep = dependency('', required: false,)
- endif
--- a/debian/patches/client-Use-verified-schema.patch
+++ b/debian/patches/client-Use-verified-schema.patch
+From: Christian Persch <chpe@src.gnome.org>
+Date: Sun, 18 Sep 2022 19:19:27 +0200
+Subject: client: Use verified schema
+
+... and pass the correct schema source when creating the profile list.
+
+(cherry picked from commit 640f2078656d953f661cef2f8ea4f3539cdb7d4d)
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7930
+(cherry picked from commit b19b82be2b6d4a6a45f654bede864629d3247abe)
+---
+ src/terminal-options.cc        | 25 +++++++++++++++++++++----
+ src/terminal-options.hh        |  2 ++
+ src/terminal-settings-list.cc  |  4 +---
+ src/terminal-settings-utils.cc |  8 ++++++--
+ src/terminal-settings-utils.hh |  1 -
+ 5 files changed, 30 insertions(+), 10 deletions(-)
+
+diff --git a/src/terminal-options.cc b/src/terminal-options.cc
+index e2e562d..9e672f5 100644
+--- a/src/terminal-options.cc
+++ b/src/terminal-options.cc
+@@ -38,6 +38,7 @@
+ #include "terminal-util.hh"
+ #include "terminal-version.hh"
+ #include "terminal-libgsystem.hh"
+#include "terminal-settings-utils.hh"
+ 
+ static int verbosity = 1;
+ 
+@@ -107,11 +108,23 @@ terminal_log_writer (GLogLevelFlags log_level,
+ 
+ static GOptionContext *get_goption_context (TerminalOptions *options);
+ 
+static void
+terminal_options_ensure_schema_source(TerminalOptions* options)
+{
+  if (options->schema_source)
+    return;
+
+  options->schema_source = terminal_g_settings_schema_source_get_default();
+}
+
+ static TerminalSettingsList *
+ terminal_options_ensure_profiles_list (TerminalOptions *options)
+ {
+-  if (options->profiles_list == nullptr)
+-    options->profiles_list = terminal_profiles_list_new(nullptr, nullptr);
+  if (options->profiles_list == nullptr) {
+    terminal_options_ensure_schema_source(options);
+    options->profiles_list = terminal_profiles_list_new(nullptr /* default backend */,
+                                                        options->schema_source);
+  }
+ 
+   return options->profiles_list;
+ }
+@@ -1264,8 +1277,11 @@ terminal_options_merge_config (TerminalOptions *options,
+ void
+ terminal_options_ensure_window (TerminalOptions *options)
+ {
+-  gs_unref_object GSettings *global_settings =
+-    g_settings_new (TERMINAL_SETTING_SCHEMA);
+  terminal_options_ensure_schema_source(options);
+  gs_unref_object auto global_settings =
+    terminal_g_settings_new(nullptr, // default backend
+                            options->schema_source,
+                            TERMINAL_SETTING_SCHEMA);
+ 
+   gs_free char *mode_str = g_settings_get_string (global_settings,
+                                                   TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY);
+@@ -1304,6 +1320,7 @@ terminal_options_free (TerminalOptions *options)
+   g_free (options->sm_config_prefix);
+ 
+   g_clear_object (&options->profiles_list);
+  g_clear_pointer (&options->schema_source, g_settings_schema_source_unref);
+ 
+   g_free (options);
+ }
+diff --git a/src/terminal-options.hh b/src/terminal-options.hh
+index 60adebb..fe88361 100644
+--- a/src/terminal-options.hh
+++ b/src/terminal-options.hh
+@@ -25,6 +25,7 @@
+ #include <glib.h>
+ #include <stdio.h>
+ 
+#include <gio/gio.h>
+ #include <gio/gunixfdlist.h>
+ 
+ #include "terminal-profiles-list.hh"
+@@ -63,6 +64,7 @@ enum
+ 
+ typedef struct
+ {
+  GSettingsSchemaSource* schema_source; /* may be nullptr */
+   TerminalSettingsList *profiles_list; /* may be nullptr */
+ 
+   gboolean print_environment;
+diff --git a/src/terminal-settings-list.cc b/src/terminal-settings-list.cc
+index 40b9a98..f0db40d 100644
+--- a/src/terminal-settings-list.cc
+++ b/src/terminal-settings-list.cc
+@@ -468,9 +468,7 @@ terminal_settings_list_constructed (GObject *object)
+ 
+   g_object_get(object, "backend", &list->settings_backend, nullptr);
+   g_assert(list->settings_backend);
+-
+-  if (list->schema_source == nullptr)
+-    list->schema_source = g_settings_schema_source_get_default();
+  g_assert(list->schema_source);
+ 
+   g_assert (list->schema_source != nullptr);
+   g_assert (list->child_schema_id != nullptr);
+diff --git a/src/terminal-settings-utils.cc b/src/terminal-settings-utils.cc
+index 60e7a9a..494a257 100644
+--- a/src/terminal-settings-utils.cc
+++ b/src/terminal-settings-utils.cc
+@@ -18,6 +18,8 @@
+ #include "config.h"
+ #define G_SETTINGS_ENABLE_BACKEND
+ 
+#include <gio/gsettingsbackend.h>
+
+ #include "terminal-settings-utils.hh"
+ #include "terminal-client-utils.hh"
+ #include "terminal-debug.hh"
+@@ -217,6 +219,8 @@ terminal_g_settings_backend_erase_path(GSettingsBackend* backend,
+   return r;
+ }
+ 
+#endif /* TERMINAL_SERVER || TERMINAL_PREFERENCES */
+
+ #define TERMINAL_SCHEMA_VERIFIER_ERROR (g_quark_from_static_string("TerminalSchemaVerifier"))
+ 
+ typedef enum {
+@@ -558,6 +562,8 @@ terminal_g_settings_schema_source_get_default(void)
+                                               TERM_LIBEXECDIR,
+ #elif defined(TERMINAL_PREFERENCES)
+                                               TERM_LIBEXECDIR,
+#elif defined(TERMINAL_CLIENT)
+                                              TERM_BINDIR,
+ #else
+ #error Need to define installed location
+ #endif
+@@ -593,8 +599,6 @@ terminal_g_settings_schema_source_get_default(void)
+   return g_settings_schema_source_ref(default_source);
+ }
+ 
+-#endif /* TERMINAL_SERVER || TERMINAL_PREFERENCES */
+-
+ // BEGIN copied from glib/gio/gsettingsbackend.c
+ 
+ /*
+diff --git a/src/terminal-settings-utils.hh b/src/terminal-settings-utils.hh
+index 9079485..8a20042 100644
+--- a/src/terminal-settings-utils.hh
+++ b/src/terminal-settings-utils.hh
+@@ -18,7 +18,6 @@
+ #pragma once
+ 
+ #include <gio/gio.h>
+-#include <gio/gsettingsbackend.h>
+ 
+ GSettings* terminal_g_settings_new (GSettingsBackend* backend,
+                                     GSettingsSchemaSource* source,
--- a/debian/patches/nautilus-Don-t-include-gdk-headers-in-the-nautilus-extens.patch
+++ b/debian/patches/nautilus-Don-t-include-gdk-headers-in-the-nautilus-extens.patch
-From: Christian Persch <chpe@src.gnome.org>
-Date: Mon, 15 Aug 2022 20:56:17 +0200
-Subject: nautilus: Don't include gdk headers in the nautilus extension
-
-https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7916
-(cherry picked from commit 388d8d2c1ed87c6dcf60e22c2da1482b9cbafd5d)
---
- src/meson.build              | 1 +
- src/terminal-client-utils.cc | 6 ++++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/src/meson.build b/src/meson.build
-index 99f47f8..9727127 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -358,6 +358,7 @@ if get_option('nautilus_extension')
-   ]
- 
-   nautilus_cxxflags = glib_version_cxxflags + [
-+    '-DTERMINAL_NAUTILUS',
-     '-DTERM_LOCALEDIR="@0@"'.format(gt_prefix / gt_localedir),
-   ]
- 
-diff --git a/src/terminal-client-utils.cc b/src/terminal-client-utils.cc
-index acd1719..9158d65 100644
--- a/src/terminal-client-utils.cc
-+++ b/src/terminal-client-utils.cc
-@@ -29,10 +29,12 @@
- 
- #include <gio/gio.h>
- 
-+#ifndef TERMINAL_NAUTILUS
- #include <gdk/gdk.h>
- #if defined(TERMINAL_COMPILATION) && defined(GDK_WINDOWING_X11)
- #include <gdk/gdkx.h>
- #endif
-+#endif
- 
- /**
-  * terminal_client_append_create_instance_options:
-@@ -268,6 +270,8 @@ terminal_client_append_exec_options (GVariantBuilder *builder,
-   }
- }
- 
-+#ifndef TERMINAL_NAUTILUS
-+
- /**
-  * terminal_client_get_fallback_startup_id:
-  *
-@@ -333,6 +337,8 @@ out:
-   return nullptr;
- }
- 
-+#endif /* !TERMINAL_NAUTILUS */
-+
- GSettings*
- terminal_g_settings_new_with_path (GSettingsSchemaSource* source,
-                                    char const* schema_id,
--- a/debian/patches/nautilus-Try-to-fix-the-build-with-nautilus-43.patch
+++ b/debian/patches/nautilus-Try-to-fix-the-build-with-nautilus-43.patch
-From: Christian Persch <chpe@src.gnome.org>
-Date: Tue, 16 Aug 2022 23:19:34 +0200
-Subject: nautilus: Try to fix the build with nautilus 43
-
-Remove all use of gtk/gdk from the nautilus extension.
-
-https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7916
-(cherry picked from commit 7946c7fc0f0ea24c9501667e965a355c388a2da9)
---
- src/terminal-nautilus.cc | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/terminal-nautilus.cc b/src/terminal-nautilus.cc
-index 4b4bbd8..9a3ea78 100644
--- a/src/terminal-nautilus.cc
-+++ b/src/terminal-nautilus.cc
-@@ -22,7 +22,6 @@
- #include <glib.h>
- #include <glib/gi18n-lib.h>
- #include <gio/gio.h>
-#include <gtk/gtk.h>
- 
- /* Work around https://gitlab.gnome.org/GNOME/nautilus/-/issues/1884 */
- extern "C" {
-@@ -325,7 +324,7 @@ create_terminal (ExecData *data /* transfer full */)
-   g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
- 
-   terminal_client_append_create_instance_options (&builder,
-                                                  gdk_display_get_name (gdk_display_get_default ()),
-+                                                  nullptr, // display name. FIXMEgtk4?
-                                                   startup_id,
-                                                   nullptr /* geometry */,
-                                                   nullptr /* role */,
-@@ -461,11 +460,7 @@ terminal_nautilus_menu_item_activate (NautilusMenuItem *item)
- 
-   data = g_new (ExecData, 1);
-   data->nautilus = (TerminalNautilus*)g_object_ref (nautilus);
-#if GTK_CHECK_VERSION (4, 0, 0)
-  data->timestamp = GDK_CURRENT_TIME; /* FIXMEgtk4 */
-#else
-  data->timestamp = gtk_get_current_event_time ();
-#endif
-+  data->timestamp = 0; // GDK_CURRENT_TIME
-   data->path = path;
-   data->uri = uri;
-   data->info = info;
-@@ -587,7 +582,6 @@ terminal_nautilus_menu_item_new (TerminalNautilus *nautilus,
- 
- static GList *
- terminal_nautilus_get_background_items (NautilusMenuProvider *provider,
-                                        GtkWidget            *window,
-                                         NautilusFileInfo     *file_info)
- {
-   TerminalNautilus *nautilus = TERMINAL_NAUTILUS (provider);
-@@ -636,7 +630,6 @@ terminal_nautilus_get_background_items (NautilusMenuProvider *provider,
- 
- static GList *
- terminal_nautilus_get_file_items (NautilusMenuProvider *provider,
-                                  GtkWidget            *window,
-                                   GList                *files)
- {
-   TerminalNautilus *nautilus = TERMINAL_NAUTILUS (provider);
--- a/debian/patches/prefs-Add-NoDisplay-desktop-file-for-the-prefs-binary.patch
+++ b/debian/patches/prefs-Add-NoDisplay-desktop-file-for-the-prefs-binary.patch
+From: Christian Persch <chpe@src.gnome.org>
+Date: Sun, 18 Sep 2022 18:49:49 +0200
+Subject: prefs: Add NoDisplay desktop file for the prefs binary
+
+Backported from master but modified not to include new translatable
+strings.
+
+https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7928
+(cherry picked from commit f767de5de87fd9452758d1ad015a3cb6f932b00a)
+(cherry picked from commit 11424208e8ffd426c5f6a66b05d6ff78d8c78a86)
+---
+ data/meson.build                               | 10 ++++++++++
+ data/org.gnome.Terminal.Preferences.desktop.in | 14 ++++++++++++++
+ po/POTFILES.in                                 |  1 +
+ 3 files changed, 25 insertions(+)
+ create mode 100644 data/org.gnome.Terminal.Preferences.desktop.in
+
+diff --git a/data/meson.build b/data/meson.build
+index e0bcbb9..1eda205 100644
+--- a/data/meson.build
+++ b/data/meson.build
+@@ -46,6 +46,16 @@ i18n.merge_file(
+   install_dir: desktopdatadir,
+ )
+ 
+i18n.merge_file(
+  input: gt_dns_name + '.Preferences.desktop.in',
+  install: true,
+  install_dir: desktopdatadir,
+  install_tag: 'runtime',
+  output: '@BASENAME@',
+  po_dir: po_dir,
+  type: 'desktop',
+)
+
+ meson.add_install_script(
+   'meson_desktopfile.py',
+   desktopdatadir,
+diff --git a/data/org.gnome.Terminal.Preferences.desktop.in b/data/org.gnome.Terminal.Preferences.desktop.in
+new file mode 100644
+index 0000000..5a57bdf
+--- /dev/null
+++ b/data/org.gnome.Terminal.Preferences.desktop.in
+@@ -0,0 +1,14 @@
+[Desktop Entry]
+Categories=GNOME;GTK;System;TerminalEmulator;
+Comment=Use the command line
+DBusActivatable=false
+Exec=gnome-terminal --preferences
+Icon=org.gnome.Terminal
+Keywords=shell;prompt;command;commandline;cmd;
+Name=Preferences
+NoDisplay=true
+SingleMainWindow=true
+StartupNotify=true
+StartupWMClass=Gnome-terminal
+TryExec=gnome-terminal
+Type=Application
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 561f5a9..1c67396 100644
+--- a/po/POTFILES.in
+++ b/po/POTFILES.in
+@@ -1,6 +1,7 @@
+ # List of source files containing translatable strings.
+ # Please keep this file sorted alphabetically.
+ data/org.gnome.Terminal.desktop.in
+data/org.gnome.Terminal.Preferences.desktop.in
+ data/org.gnome.Terminal.metainfo.xml.in
+ data/org.gnome.Terminal.Nautilus.metainfo.xml.in
+ src/org.gnome.Terminal.gschema.xml
--- a/debian/patches/prefs-Move-prefs-binary-to-libexecdir.patch
+++ b/debian/patches/prefs-Move-prefs-binary-to-libexecdir.patch
+From: Christian Persch <chpe@src.gnome.org>
+Date: Sun, 18 Sep 2022 16:04:46 +0200
+Subject: prefs: Move prefs binary to libexecdir
+
+For FHS compliance, move the prefs binary from pkglibdir to libexecdir.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7927
+(cherry picked from commit d69297f003c519b0cdb06d4115a6539297793910)
+(cherry picked from commit 5c0167980b9f35b4148d410c12cc49ecf307b664)
+---
+ src/meson.build                | 2 +-
+ src/terminal-prefs-process.cc  | 2 +-
+ src/terminal-settings-utils.cc | 2 +-
+ src/terminal.cc                | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 726c4cd..41a215f 100644
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -337,7 +337,7 @@ prefs_main = executable(
+   include_directories: prefs_main_incs,
+   dependencies: prefs_main_deps,
+   install: true,
+-  install_dir: gt_prefix / gt_pkglibdir,
+  install_dir: gt_prefix / gt_libexecdir,
+   sources: prefs_main_sources,
+ )
+ 
+diff --git a/src/terminal-prefs-process.cc b/src/terminal-prefs-process.cc
+index e06b17f..a19386f 100644
+--- a/src/terminal-prefs-process.cc
+++ b/src/terminal-prefs-process.cc
+@@ -255,7 +255,7 @@ terminal_prefs_process_initable_init(GInitable* initable,
+   socket_fds[1] = -1;
+ 
+   gs_free auto exe = terminal_client_get_file_uninstalled(TERM_LIBEXECDIR,
+-                                                          TERM_PKGLIBDIR,
+                                                          TERM_LIBEXECDIR,
+                                                           TERMINAL_PREFERENCES_BINARY_NAME,
+                                                           G_FILE_TEST_IS_EXECUTABLE);
+ 
+diff --git a/src/terminal-settings-utils.cc b/src/terminal-settings-utils.cc
+index f64d9cc..60e7a9a 100644
+--- a/src/terminal-settings-utils.cc
+++ b/src/terminal-settings-utils.cc
+@@ -557,7 +557,7 @@ terminal_g_settings_schema_source_get_default(void)
+ #if defined(TERMINAL_SERVER)
+                                               TERM_LIBEXECDIR,
+ #elif defined(TERMINAL_PREFERENCES)
+-                                              TERM_PKGLIBDIR,
+                                              TERM_LIBEXECDIR,
+ #else
+ #error Need to define installed location
+ #endif
+diff --git a/src/terminal.cc b/src/terminal.cc
+index ea1836e..ce6060f 100644
+--- a/src/terminal.cc
+++ b/src/terminal.cc
+@@ -385,7 +385,7 @@ handle_show_preferences(TerminalOptions *options,
+   // If that isn't possible, launch the prefs binary directly
+   auto launcher = g_subprocess_launcher_new(GSubprocessFlags(0));
+   gs_free auto exe = terminal_client_get_file_uninstalled(TERM_BINDIR,
+-                                                          TERM_PKGLIBDIR,
+                                                          TERM_LIBEXECDIR,
+                                                           TERMINAL_PREFERENCES_BINARY_NAME,
+                                                           G_FILE_TEST_IS_EXECUTABLE);
+   char *argv[2] = {exe, nullptr};
--- a/debian/patches/series
+++ b/debian/patches/series
 01_onlyshowin.patch
 Provide-fallback-for-reading-current-directory-if-OS.patch
-build-Update-nautilus-extension-build-req.patch
-build-Fix-nautilus-extension-install-directory.patch
-nautilus-Don-t-include-gdk-headers-in-the-nautilus-extens.patch
-nautilus-Try-to-fix-the-build-with-nautilus-43.patch
+prefs-Move-prefs-binary-to-libexecdir.patch
+prefs-Add-NoDisplay-desktop-file-for-the-prefs-binary.patch
+client-Use-verified-schema.patch
 0001-Restore-transparency.patch
 0001-Add-style-classes-and-CSS-names-to-some-of-our-widge.patch
 0001-screen-window-Extra-padding-around-transparent-termi.patch

--- a/debian/watch
+++ b/debian/watch
 version=4
 https://gitlab.gnome.org/GNOME/@PACKAGE@/tags \
-	.*/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
+	.*/@PACKAGE@-([\d][02468.]+[\d]+)@ARCHIVE_EXT@
--- a/meson.build
+++ b/meson.build
@@ -27,7 +27,7 @@ project(
    'GFDL-1.3-only',                # the appstream data
  ],
  meson_version: '>= 0.49.0',
-  version: '3.45.90',
+  version: '3.46.1',
 )

 # Naming
@@ -45,7 +45,7 @@ clangxx_req_version       = '3.3'
 # Requirements

 vte_req                      = 'vte-2.91'
-vte_req_version              = '0.67.90'
+vte_req_version              = '0.70.0'

 glib_req_version             = '2.52.0'
 glib_min_req_version         = '2.52'
@@ -55,8 +55,7 @@ gtk_req_version              = '3.22.27'
 gtk_min_req_version          = '3.18'
 gtk_max_allowed_version      = '3.24'

-dconf_req_version            = '0.14.0'
-libnautilus_ext_req_version  = '3.28.0'
+libnautilus_ext_req_version  = '43'
 pcre2_req_version            = '10.00'
 schemas_req_version          = '0.1.0'

@@ -71,6 +70,7 @@ gt_micro_version = version_split[2].to_int()

 # Directories

+gt_bindir     = get_option('bindir')
 gt_datadir    = get_option('datadir')
 gt_includedir = get_option('includedir')
 gt_libdir     = get_option('libdir')
@@ -85,7 +85,7 @@ gt_schemadir = gt_datadir / 'glib-2.0' / 'schemas'

 gt_searchproviderdir = gt_datadir / 'gnome-shell' / 'search-providers'

-gt_nautilusextensiondir = gt_libdir / 'nautilus' / 'extensions-3.0'
+gt_nautilusextensiondir = gt_libdir / 'nautilus' / 'extensions-4'

 gt_dbusinterfacedir = gt_datadir / 'dbus-1' / 'interfaces'
 gt_dbusservicedir   = gt_datadir / 'dbus-1' / 'services'
@@ -168,12 +168,19 @@ libc_feature_defines = [
  ['_XOPEN_SOURCE_EXTENDED', '1'],
 ]

-if host_machine.system() == 'freebsd'
+system = host_machine.system()
+
+if system == 'freebsd'
  # Defining _POSIX_C_SOURCE above makes freebsd not expose some functionality
  # that's hidden behind __BSD_VISIBLE.  Not defininy any of the above however
  # makes it expose verything.

  libc_feature_defines = []
+
+elif system == 'netbsd'
+  libc_feature_defines += [
+    '_NETBSD_SOURCE',
+  ]
 endif

 foreach f: libc_feature_defines
@@ -200,6 +207,14 @@ gtk_version_cxxflags = [

 version_cxxflags = glib_version_cxxflags + gtk_version_cxxflags

+# Asserts must not be disabled
+
+assert(get_option('b_ndebug') == 'false', 'assertions may not be disabled')
+
+# LTO very much NOT supported
+
+assert(get_option('b_lto') == false, 'LTO not supported')
+
 # Compiler flags

 compiler_flags_common = [
@@ -321,7 +336,6 @@ add_project_arguments(global_cxxflags, language: 'cpp')

 vte_dep       = dependency(vte_req,        version: '>=' + vte_req_version)

-dconf_dep     = dependency('dconf',        version: '>=' + dconf_req_version)
 gio_dep       = dependency('gio-2.0',      version: '>=' + glib_req_version)
 gio_unix_dep  = dependency('gio-unix-2.0', version: '>=' + glib_req_version)
 glib_dep      = dependency('glib-2.0',     version: '>=' + glib_req_version)
@@ -333,7 +347,7 @@ schemas_dep   = dependency('gsettings-desktop-schemas',
 uuid_dep      = dependency('uuid')

 if get_option('nautilus_extension')
-  libnautilus_extension_dep = dependency('libnautilus-extension', version: '>=' + libnautilus_ext_req_version,)
+  libnautilus_extension_dep = dependency('libnautilus-extension-4', version: '>=' + libnautilus_ext_req_version,)
 else
  libnautilus_extension_dep = dependency('', required: false,)
 endif

--- a/po/POTFILES.in
+++ b/po/POTFILES.in
-data/org.gnome.Terminal.Nautilus.metainfo.xml.in
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
 data/org.gnome.Terminal.desktop.in
 data/org.gnome.Terminal.metainfo.xml.in
+data/org.gnome.Terminal.Nautilus.metainfo.xml.in
 src/org.gnome.Terminal.gschema.xml
 src/preferences.ui
+src/prefs-main.cc
 src/profile-editor.cc
 src/search-popover.ui
 src/server.cc
@@ -19,6 +22,7 @@ src/terminal-notebook-menu.ui
 src/terminal-notebook.cc
 src/terminal-options.cc
 src/terminal-prefs.cc
+src/terminal-prefs-process.cc
 src/terminal-screen.cc
 src/terminal-search-popover.cc
 src/terminal-tab-label.cc

--- a/po/ab.po
+++ b/po/ab.po
@@ -3,7 +3,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-terminal/issues\n"
 "POT-Creation-Date: 2022-07-07 18:13+0000\n"
 "Last-Translator: Нанба Наала <naala-nanba@rambler.ru>\n"
-"Language-Team: Abkhazian <ab@li.org>\n"
+"Language-Team: Abkhazian <daniel.abzakh@gmail.com>\n"
 "Language: ab\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -683,7 +683,7 @@ msgstr ""

 #: src/org.gnome.Terminal.gschema.xml:664
 msgid "Whether the shell integration is enabled"
-msgstr ""
+msgstr "Иаҿакума ахарԥа адҵара"

 #: src/org.gnome.Terminal.gschema.xml:669
 msgid "Whether to ask for confirmation before closing a terminal"
@@ -766,7 +766,7 @@ msgstr ""
 #. Cursor shape
 #: src/preferences.ui:123
 msgid "Block"
-msgstr ""
+msgstr "Аидкыла"

 #. Cursor shape
 #: src/preferences.ui:126
@@ -786,7 +786,7 @@ msgstr ""
 #. Cursor blink mode
 #: src/preferences.ui:143
 msgid "Enabled"
-msgstr ""
+msgstr "Иаҿакуп"

 #. Cursor blink mode
 #: src/preferences.ui:146
@@ -813,7 +813,7 @@ msgstr ""
 #. Preserve working directory
 #: src/preferences.ui:166 src/preferences.ui:276
 msgid "Always"
-msgstr ""
+msgstr "Еснагь"

 #. When terminal commands set their own titles
 #: src/preferences.ui:177
@@ -924,7 +924,7 @@ msgstr "Амениу ахь анеиразы иласу арыд  _аҿакра(

 #: src/preferences.ui:398
 msgid "Theme _variant:"
-msgstr ""
+msgstr "_Атема авариант:"

 #: src/preferences.ui:430
 msgid "Open _new terminals in:"
@@ -1204,7 +1204,7 @@ msgstr ""

 #: src/profile-editor.cc:173
 msgid "White on black"
-msgstr ""
+msgstr "Ашкәакәа аиқәаҵәа аҟны"

 #. Translators: "GNOME" is the name of a colour scheme, "light" can be translated
 #: src/profile-editor.cc:178
@@ -1303,7 +1303,7 @@ msgstr ""
 #: src/profile-editor.cc:760 src/profile-editor.cc:773
 #: src/profile-editor.cc:782 src/profile-editor.cc:801
 msgid "Arabic"
-msgstr "Арабтәи"
+msgstr "Арабтә"

 #: src/profile-editor.cc:764
 msgid "Nordic"
@@ -1371,7 +1371,7 @@ msgstr ""
 #. Translators: Appears as: [numeric entry] × height
 #: src/profile-editor.cc:1017
 msgid "height"
-msgstr ""
+msgstr "Аҳаракыра"

 #: src/profile-editor.cc:1065
 #, c-format
@@ -1541,7 +1541,7 @@ msgstr ""

 #: src/terminal-accels.cc:230 src/terminal-menubar.ui.in:93
 msgid "View"
-msgstr ""
+msgstr "Аԥшра"

 #: src/terminal-accels.cc:231 src/terminal-menubar.ui.in:122
 msgid "Search"
@@ -1718,7 +1718,7 @@ msgstr ""

 #: src/terminal-menubar.ui.in:92
 msgid "_View"
-msgstr ""
+msgstr "_Аԥшра"

 #: src/terminal-menubar.ui.in:96 src/terminal-window.cc:1823
 msgid "Show _Menubar"
@@ -1835,7 +1835,7 @@ msgstr ""
 #: src/terminal-options.cc:413
 #, c-format
 msgid "Argument to “%s” is not a valid command: %s"
-msgstr ""
+msgstr "Аҵаҵӷәы «%s» азы изин змоу дҵаӡам : %s"

 #: src/terminal-options.cc:586
 msgid "Two roles given for one window"

--- a/po/he.po
+++ b/po/he.po
@@ -3,22 +3,23 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
 # Gil 'Dolfin' Osher <dolfin@rpg.org.il>, 2002,2003
-# Yosef Or Boczko <yoseforb@gmail.com>, 2013-2021.
+# Yosef Or Boczko <yoseforb@gmail.com>, 2013-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-terminal.HEAD.he\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-terminal/issues\n"
-"POT-Creation-Date: 2021-07-31 12:57+0000\n"
-"PO-Revision-Date: 2021-08-07 19:36+0300\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: Hebrew <yoseforb@gmail.com>\n"
+"POT-Creation-Date: 2022-09-06 17:18+0000\n"
+"PO-Revision-Date: 2022-09-11 07:14+0300\n"
+"Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
+"Language-Team: Hebrew <>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n>2||n==0) ? 1 : 2;\n"
-"X-Generator: Poedit 3.0\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==2 ? 1 : n>10 && n%10==0 ? "
+"2 : 3)\n"
+"X-Generator: Gtranslator 40.0\n"

 #: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:35
 msgid "org.gnome.Terminal.Nautilus"
@@ -75,10 +76,10 @@ msgid "gnome-terminal"
 msgstr "gnome-terminal"

 #: data/org.gnome.Terminal.desktop.in:3
-#: data/org.gnome.Terminal.metainfo.xml.in:38 src/server.cc:150
+#: data/org.gnome.Terminal.metainfo.xml.in:38 src/server.cc:152
 #: src/terminal-accels.cc:232 src/terminal-menubar.ui.in:144
-#: src/terminal-tab-label.cc:81 src/terminal-window.cc:1894
-#: src/terminal-window.cc:2160 src/terminal-window.cc:2443 src/terminal.cc:570
+#: src/terminal-tab-label.cc:81 src/terminal-window.cc:1901
+#: src/terminal-window.cc:2167 src/terminal-window.cc:2450 src/terminal.cc:570
 msgid "Terminal"
 msgstr "מסוף"

@@ -91,10 +92,6 @@ msgstr "שימוש בשורת הפקודה"
 msgid "shell;prompt;command;commandline;cmd;"
 msgstr "מעטפת;פקודה;שורת פקודה;שורה;מסך שחור;חלון דוס;cmd;"

-#: data/org.gnome.Terminal.desktop.in:8
-msgid "org.gnome.Terminal"
-msgstr "org.gnome.Terminal"
-
 #: data/org.gnome.Terminal.desktop.in:17 src/terminal-accels.cc:127
 msgid "New Window"
 msgstr "חלון חדש"
@@ -159,11 +156,11 @@ msgstr "SearchProvider"
 msgid "UserDocs"
 msgstr "UserDocs"

-#. Translators: Keep single quote please!
+#. Translators: This needs to be parsed as a GVariant string, so keep the regular single quotes around the string as-is, and do not add extra quotes.
 #: src/org.gnome.Terminal.gschema.xml:133
 msgctxt "visible-name"
 msgid "'Unnamed'"
-msgstr "‚ללא שם’"
+msgstr "'ללא שם'"

 #: src/org.gnome.Terminal.gschema.xml:134
 msgid "Human-readable name of the profile"
@@ -1324,144 +1321,134 @@ msgstr "‏Solarized כהה"
 msgid "Error parsing command: %s"
 msgstr "שגיאה בפענוח הפקודה: %s"

-#: src/profile-editor.cc:744
-msgid "Armenian"
-msgstr "ארמנית"
-
-#: src/profile-editor.cc:745 src/profile-editor.cc:746
-#: src/profile-editor.cc:750
+#: src/profile-editor.cc:744 src/profile-editor.cc:745
+#: src/profile-editor.cc:749
 msgid "Chinese Traditional"
 msgstr "סינית מסורתית"

-#: src/profile-editor.cc:747
+#: src/profile-editor.cc:746
 msgid "Cyrillic/Russian"
 msgstr "קירילית/רוסית"

-#: src/profile-editor.cc:748 src/profile-editor.cc:761
-#: src/profile-editor.cc:791
+#: src/profile-editor.cc:747 src/profile-editor.cc:786
 msgid "Japanese"
 msgstr "יפנית"

-#: src/profile-editor.cc:749 src/profile-editor.cc:762
-#: src/profile-editor.cc:793
+#: src/profile-editor.cc:748 src/profile-editor.cc:788
 msgid "Korean"
 msgstr "קוריאנית"

-#: src/profile-editor.cc:751 src/profile-editor.cc:752
-#: src/profile-editor.cc:753
+#: src/profile-editor.cc:750 src/profile-editor.cc:751
+#: src/profile-editor.cc:752
 msgid "Chinese Simplified"
 msgstr "סינית פשוטה"

-#: src/profile-editor.cc:754
-msgid "Georgian"
-msgstr "גרוזינית"
-
-#: src/profile-editor.cc:755 src/profile-editor.cc:763
-#: src/profile-editor.cc:767 src/profile-editor.cc:787
-#: src/profile-editor.cc:797
+#: src/profile-editor.cc:753 src/profile-editor.cc:759
+#: src/profile-editor.cc:763 src/profile-editor.cc:782
+#: src/profile-editor.cc:792
 msgid "Western"
 msgstr "מערבי"

-#: src/profile-editor.cc:756 src/profile-editor.cc:769
-#: src/profile-editor.cc:783 src/profile-editor.cc:795
+#: src/profile-editor.cc:754 src/profile-editor.cc:765
+#: src/profile-editor.cc:778 src/profile-editor.cc:790
 msgid "Central European"
 msgstr "מרכז אירופאי"

-#: src/profile-editor.cc:757 src/profile-editor.cc:772
-#: src/profile-editor.cc:778 src/profile-editor.cc:779
-#: src/profile-editor.cc:781 src/profile-editor.cc:796
+#: src/profile-editor.cc:755 src/profile-editor.cc:768
+#: src/profile-editor.cc:774 src/profile-editor.cc:776
+#: src/profile-editor.cc:791
 msgid "Cyrillic"
 msgstr "קירילית"

-#: src/profile-editor.cc:758 src/profile-editor.cc:777
-#: src/profile-editor.cc:789 src/profile-editor.cc:799
+#: src/profile-editor.cc:756 src/profile-editor.cc:773
+#: src/profile-editor.cc:784 src/profile-editor.cc:794
 msgid "Turkish"
 msgstr "טורקית"

-#: src/profile-editor.cc:759 src/profile-editor.cc:776
-#: src/profile-editor.cc:786 src/profile-editor.cc:800
+#: src/profile-editor.cc:757 src/profile-editor.cc:772
+#: src/profile-editor.cc:781 src/profile-editor.cc:795
 msgid "Hebrew"
 msgstr "עברית"

-#: src/profile-editor.cc:760 src/profile-editor.cc:773
-#: src/profile-editor.cc:782 src/profile-editor.cc:801
+#: src/profile-editor.cc:758 src/profile-editor.cc:769
+#: src/profile-editor.cc:777 src/profile-editor.cc:796
 msgid "Arabic"
 msgstr "ערבית"

-#: src/profile-editor.cc:764
+#: src/profile-editor.cc:760
 msgid "Nordic"
 msgstr "נורדית"

-#: src/profile-editor.cc:765 src/profile-editor.cc:771
-#: src/profile-editor.cc:802
+#: src/profile-editor.cc:761 src/profile-editor.cc:767
+#: src/profile-editor.cc:797
 msgid "Baltic"
 msgstr "בלטית"

-#: src/profile-editor.cc:766
+#: src/profile-editor.cc:762
 msgid "Celtic"
 msgstr "קלטית"

-#: src/profile-editor.cc:768 src/profile-editor.cc:788
+#: src/profile-editor.cc:764 src/profile-editor.cc:783
 msgid "Romanian"
 msgstr "רומנית"

-#: src/profile-editor.cc:770
+#: src/profile-editor.cc:766
 msgid "South European"
 msgstr "דרום אירופאי"

-#: src/profile-editor.cc:774 src/profile-editor.cc:785
-#: src/profile-editor.cc:798
+#: src/profile-editor.cc:770 src/profile-editor.cc:780
+#: src/profile-editor.cc:793
 msgid "Greek"
 msgstr "יוונית"

-#: src/profile-editor.cc:775
+#: src/profile-editor.cc:771
 msgid "Hebrew Visual"
 msgstr "עברית ויזואלית"

-#: src/profile-editor.cc:780 src/profile-editor.cc:790
+#: src/profile-editor.cc:775 src/profile-editor.cc:785
 msgid "Cyrillic/Ukrainian"
 msgstr "קירילית/אוקראינית"

-#: src/profile-editor.cc:784
+#: src/profile-editor.cc:779
 msgid "Croatian"
 msgstr "קרואטית"

-#: src/profile-editor.cc:792
+#: src/profile-editor.cc:787
 msgid "Thai"
 msgstr "תאי"

-#: src/profile-editor.cc:794 src/profile-editor.cc:810
+#: src/profile-editor.cc:789 src/profile-editor.cc:805
 msgid "Unicode"
 msgstr "יוניקוד"

-#: src/profile-editor.cc:803
+#: src/profile-editor.cc:798
 msgid "Vietnamese"
 msgstr "וייטנאמית"

-#: src/profile-editor.cc:811
+#: src/profile-editor.cc:806
 msgid "Legacy CJK Encodings"
 msgstr "קידודי השפות הסיניות, יפניות וקוריאניות"

-#: src/profile-editor.cc:812
+#: src/profile-editor.cc:807
 msgid "Obsolete Encodings"
 msgstr "קידודים מיושנים"

 #. Translators: Appears as: [numeric entry] × width
-#: src/profile-editor.cc:1012
+#: src/profile-editor.cc:1011
 msgid "width"
 msgstr "רוחב"

 #. Translators: Appears as: [numeric entry] × height
-#: src/profile-editor.cc:1017
+#: src/profile-editor.cc:1016
 msgid "height"
 msgstr "גובה"

-#: src/profile-editor.cc:1065
+#: src/profile-editor.cc:1064
 #, c-format
 msgid "Choose Palette Color %u"
 msgstr "בחירת צבע ערכת הצבעים %u"

-#: src/profile-editor.cc:1069
+#: src/profile-editor.cc:1068
 #, c-format
 msgid "Palette entry %u"
 msgstr "רשומה %u בערכת הצבעים"
@@ -1659,16 +1646,16 @@ msgstr "_מקש קיצור"
 msgid "New Terminal"
 msgstr "מסוף חדש"

-#: src/terminal-app.cc:518 src/terminal-window.cc:1795
+#: src/terminal-app.cc:518 src/terminal-window.cc:1802
 msgid "New _Terminal"
 msgstr "מסוף _חדש"

-#: src/terminal-app.cc:520 src/terminal-window.cc:1804
+#: src/terminal-app.cc:520 src/terminal-window.cc:1811
 msgid "New _Tab"
 msgstr "_לשונית חדשה"

 #: src/terminal-app.cc:521 src/terminal-headermenu.ui:39
-#: src/terminal-window.cc:1800
+#: src/terminal-window.cc:1807
 msgid "New _Window"
 msgstr "_חלון חדש"

@@ -1693,7 +1680,7 @@ msgid "_Full Screen"
 msgstr "_מסך מלא"

 #: src/terminal-headermenu.ui:50 src/terminal-menubar.ui.in:155
-#: src/terminal-window.cc:1776
+#: src/terminal-window.cc:1783
 msgid "Read-_Only"
 msgstr "קריאה _בלבד"

@@ -1734,8 +1721,8 @@ msgstr "‏_4. ‎132×43"
 msgid "_Inspector"
 msgstr "_מפקח"

-#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1540
-#: src/terminal-window.cc:1788
+#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1538
+#: src/terminal-window.cc:1795
 msgid "_Preferences"
 msgstr "ה_עדפות"

@@ -1775,19 +1762,19 @@ msgstr "_סגירת החלון"
 msgid "_Edit"
 msgstr "ע_ריכה"

-#: src/terminal-menubar.ui.in:59 src/terminal-window.cc:1766
+#: src/terminal-menubar.ui.in:59 src/terminal-window.cc:1773
 msgid "_Copy"
 msgstr "_העתקה"

-#: src/terminal-menubar.ui.in:64 src/terminal-window.cc:1767
+#: src/terminal-menubar.ui.in:64 src/terminal-window.cc:1774
 msgid "Copy as _HTML"
 msgstr "העתקה כ־_HTML"

-#: src/terminal-menubar.ui.in:69 src/terminal-window.cc:1768
+#: src/terminal-menubar.ui.in:69 src/terminal-window.cc:1775
 msgid "_Paste"
 msgstr "ה_דבקה"

-#: src/terminal-menubar.ui.in:73 src/terminal-window.cc:1770
+#: src/terminal-menubar.ui.in:73 src/terminal-window.cc:1777
 msgid "Paste as _Filenames"
 msgstr "הדבקה כ_שמות קבצים"

@@ -1803,7 +1790,7 @@ msgstr "_העדפות"
 msgid "_View"
 msgstr "_תצוגה"

-#: src/terminal-menubar.ui.in:96 src/terminal-window.cc:1816
+#: src/terminal-menubar.ui.in:96 src/terminal-window.cc:1823
 msgid "Show _Menubar"
 msgstr "הצגת _סרגל התפריטים"

@@ -1863,35 +1850,35 @@ msgstr "_ניתוק המסוף"
 msgid "_Contents"
 msgstr "_תכנים"

-#: src/terminal-nautilus.cc:537
+#: src/terminal-nautilus.cc:539
 msgid "Open in _Remote Terminal"
 msgstr "פתיחה במסוף מ_רוחק"

-#: src/terminal-nautilus.cc:539
+#: src/terminal-nautilus.cc:541
 msgid "Open in _Local Terminal"
 msgstr "פתיחה במסוף מ_קומי"

-#: src/terminal-nautilus.cc:543 src/terminal-nautilus.cc:554
+#: src/terminal-nautilus.cc:545 src/terminal-nautilus.cc:556
 msgid "Open the currently selected folder in a terminal"
 msgstr "פתיחת התיקייה הנבחרת במסוף"

-#: src/terminal-nautilus.cc:545 src/terminal-nautilus.cc:556
+#: src/terminal-nautilus.cc:547 src/terminal-nautilus.cc:558
 msgid "Open the currently open folder in a terminal"
 msgstr "פתיחת התיקייה הפתוחה הנוכחית במסוף"

-#: src/terminal-nautilus.cc:551
+#: src/terminal-nautilus.cc:553
 msgid "Open in T_erminal"
 msgstr "פתיחה במ_סוף"

-#: src/terminal-nautilus.cc:561
+#: src/terminal-nautilus.cc:563
 msgid "Open T_erminal"
 msgstr "פתיחת מ_סוף"

-#: src/terminal-nautilus.cc:562
+#: src/terminal-nautilus.cc:564
 msgid "Open a terminal"
 msgstr "פתיחת מסוף"

-#: src/terminal-notebook-menu.ui:43 src/terminal-window.cc:3253
+#: src/terminal-notebook-menu.ui:43 src/terminal-window.cc:3261
 msgid "C_lose Terminal"
 msgstr "_סגירת המסוף"

@@ -2235,29 +2222,29 @@ msgstr "מקשי קיצור"
 msgid "Profiles"
 msgstr "פרופילים"

-#: src/terminal-screen.cc:1425
+#: src/terminal-screen.cc:1405
 msgid "No command supplied nor shell requested"
 msgstr "לא סופקה פקודה או שהתבקשה מעטפת"

-#: src/terminal-screen.cc:1541 src/terminal-screen.cc:1888
+#: src/terminal-screen.cc:1539 src/terminal-screen.cc:1886
 msgid "_Relaunch"
 msgstr "טעינה _מחדש"

-#: src/terminal-screen.cc:1544
+#: src/terminal-screen.cc:1542
 msgid "There was an error creating the child process for this terminal"
 msgstr "ארעה שגיאה ביצירת תהליך בן במסוף זה"

-#: src/terminal-screen.cc:1892
+#: src/terminal-screen.cc:1890
 #, c-format
 msgid "The child process exited normally with status %d."
 msgstr "תהליך הצאצא הסתיים כרגיל עם מצב %d."

-#: src/terminal-screen.cc:1895
+#: src/terminal-screen.cc:1893
 #, c-format
 msgid "The child process was aborted by signal %d."
 msgstr "תהליך הצאצא בוטל עם האות %d."

-#: src/terminal-screen.cc:1898
+#: src/terminal-screen.cc:1896
 msgid "The child process was aborted."
 msgstr "תהליך הצאצא בוטל."

@@ -2341,84 +2328,84 @@ msgstr ""
 msgid "“file” scheme with remote hostname not supported"
 msgstr "“file” scheme with remote hostname not supported"

-#: src/terminal-window.cc:463
+#: src/terminal-window.cc:473
 msgid "Could not save contents"
 msgstr "לא ניתן לשמור את התכנים"

-#: src/terminal-window.cc:483
+#: src/terminal-window.cc:493
 msgid "Save as…"
 msgstr "שמירה בשם…"

-#: src/terminal-window.cc:486
+#: src/terminal-window.cc:496
 msgid "_Cancel"
 msgstr "_ביטול"

-#: src/terminal-window.cc:487
+#: src/terminal-window.cc:497
 msgid "_Save"
 msgstr "_שמירה"

-#: src/terminal-window.cc:1705
+#: src/terminal-window.cc:1712
 msgid "Open _Hyperlink"
 msgstr "פתיחת _כתובת הקישור"

-#: src/terminal-window.cc:1706
+#: src/terminal-window.cc:1713
 msgid "Copy Hyperlink _Address"
 msgstr "ה_עתקת כתובת הקישור"

-#: src/terminal-window.cc:1716
+#: src/terminal-window.cc:1723
 msgid "Send Mail _To…"
 msgstr "שליחת _דוא״ל אל…"

-#: src/terminal-window.cc:1717
+#: src/terminal-window.cc:1724
 msgid "Copy Mail _Address"
 msgstr "העתקת כתוב_ת דוא״ל"

-#: src/terminal-window.cc:1720
+#: src/terminal-window.cc:1727
 msgid "Call _To…"
 msgstr "ה_תקשרות אל…"

-#: src/terminal-window.cc:1721
+#: src/terminal-window.cc:1728
 msgid "Copy Call _Address "
 msgstr "העתקת כתוב_ת ההתקשרות "

-#: src/terminal-window.cc:1726
+#: src/terminal-window.cc:1733
 msgid "_Open Link"
 msgstr "_פתיחת קישור"

-#: src/terminal-window.cc:1727
+#: src/terminal-window.cc:1734
 msgid "Copy _Link"
 msgstr "העתקת _קישור"

-#: src/terminal-window.cc:1783
+#: src/terminal-window.cc:1790
 msgid "P_rofiles"
 msgstr "פרופי_לים"

-#: src/terminal-window.cc:1818
+#: src/terminal-window.cc:1825
 msgid "L_eave Full Screen"
 msgstr "י_ציאה ממסך מלא"

-#: src/terminal-window.cc:3240
+#: src/terminal-window.cc:3248
 msgid "Close this window?"
 msgstr "האם לסגור חלון זה?"

-#: src/terminal-window.cc:3240
+#: src/terminal-window.cc:3248
 msgid "Close this terminal?"
 msgstr "האם לסגור מסוף זה?"

-#: src/terminal-window.cc:3244
+#: src/terminal-window.cc:3252
 msgid ""
 "There are still processes running in some terminals in this window. Closing "
 "the window will kill all of them."
 msgstr ""
 "עדיין ישנם תהליכים הפעילים דרך כמה מסופים בחלון זה. סגירת החלון תחסל את כולם."

-#: src/terminal-window.cc:3248
+#: src/terminal-window.cc:3256
 msgid ""
 "There is still a process running in this terminal. Closing the terminal will "
 "kill it."
 msgstr "עדיין ישנו תהליך הפעיל דרך מסוף זה. סגירת המסוף תחסל אותו."

-#: src/terminal-window.cc:3253
+#: src/terminal-window.cc:3261
 msgid "C_lose Window"
 msgstr "סגירת ה_חלון"

@@ -2427,6 +2414,15 @@ msgstr "סגירת ה_חלון"
 msgid "Failed to parse arguments: %s\n"
 msgstr "Failed to parse arguments: %s\n"

+#~ msgid "org.gnome.Terminal"
+#~ msgstr "org.gnome.Terminal"
+
+#~ msgid "Armenian"
+#~ msgstr "ארמנית"
+
+#~ msgid "Georgian"
+#~ msgstr "גרוזינית"
+
 #~ msgid "Verbose output"
 #~ msgstr "Verbose output"

@@ -3510,14 +3506,14 @@ msgstr "Failed to parse arguments: %s\n"
 #~ "considered the correct setting for the Backspace key."

 #~ msgid ""
-#~ "Sets what code the delete key generates. Possible values are \"ascii-del"
-#~ "\" for the ASCII DEL character, \"control-h\" for Control-H (AKA the "
+#~ "Sets what code the delete key generates. Possible values are \"ascii-"
+#~ "del\" for the ASCII DEL character, \"control-h\" for Control-H (AKA the "
 #~ "ASCII BS character), \"escape-sequence\" for the escape sequence "
 #~ "typically bound to backspace or delete. \"escape-sequence\" is normally "
 #~ "considered the correct setting for the Delete key."
 #~ msgstr ""
-#~ "Sets what code the delete key generates. Possible values are \"ascii-del"
-#~ "\" for the ASCII DEL character, \"control-h\" for Control-H (AKA the "
+#~ "Sets what code the delete key generates. Possible values are \"ascii-"
+#~ "del\" for the ASCII DEL character, \"control-h\" for Control-H (AKA the "
 #~ "ASCII BS character), \"escape-sequence\" for the escape sequence "
 #~ "typically bound to backspace or delete. \"escape-sequence\" is normally "
 #~ "considered the correct setting for the Delete key."
@@ -3539,20 +3535,22 @@ msgstr "Failed to parse arguments: %s\n"
 #~ "a vertical line cursor, or \"underline\" to use an underline cursor."

 #~ msgid ""
-#~ "Type of terminal background. May be \"solid\" for a solid color, \"image"
-#~ "\" for an image, or \"transparent\" for either real transparency if a "
-#~ "compositing window manager is running, or pseudo-transparency otherwise."
+#~ "Type of terminal background. May be \"solid\" for a solid color, "
+#~ "\"image\" for an image, or \"transparent\" for either real transparency "
+#~ "if a compositing window manager is running, or pseudo-transparency "
+#~ "otherwise."
 #~ msgstr ""
-#~ "Type of terminal background. May be \"solid\" for a solid color, \"image"
-#~ "\" for an image, or \"transparent\" for either real transparency if a "
-#~ "compositing window manager is running, or pseudo-transparency otherwise."
+#~ "Type of terminal background. May be \"solid\" for a solid color, "
+#~ "\"image\" for an image, or \"transparent\" for either real transparency "
+#~ "if a compositing window manager is running, or pseudo-transparency "
+#~ "otherwise."

 #~ msgid ""
-#~ "Where to put the terminal scrollbar. Possibilities are \"left\", \"right"
-#~ "\", and \"hidden\"."
+#~ "Where to put the terminal scrollbar. Possibilities are \"left\", "
+#~ "\"right\", and \"hidden\"."
 #~ msgstr ""
-#~ "Where to put the terminal scrollbar. Possibilities are \"left\", \"right"
-#~ "\", and \"hidden\"."
+#~ "Where to put the terminal scrollbar. Possibilities are \"left\", "
+#~ "\"right\", and \"hidden\"."

 #~ msgid ""
 #~ "Whether to ask for confirmation when closing a terminal window which has "

--- a/po/hr.po
+++ b/po/hr.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-terminal 0\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-terminal/issues\n"
-"POT-Creation-Date: 2021-11-07 19:19+0000\n"
-"PO-Revision-Date: 2021-11-12 13:02+0100\n"
+"POT-Creation-Date: 2022-09-06 17:18+0000\n"
+"PO-Revision-Date: 2022-09-10 16:21+0200\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2016-09-15 11:20+0000\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.1.1\n"

 #: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:35
 msgid "org.gnome.Terminal.Nautilus"
@@ -71,7 +71,7 @@ msgid "gnome-terminal"
 msgstr "gnome-terminal"

 #: data/org.gnome.Terminal.desktop.in:3
-#: data/org.gnome.Terminal.metainfo.xml.in:38 src/server.cc:150
+#: data/org.gnome.Terminal.metainfo.xml.in:38 src/server.cc:152
 #: src/terminal-accels.cc:232 src/terminal-menubar.ui.in:144
 #: src/terminal-tab-label.cc:81 src/terminal-window.cc:1901
 #: src/terminal-window.cc:2167 src/terminal-window.cc:2450 src/terminal.cc:570
@@ -87,10 +87,6 @@ msgstr "Koristite naredbeni redak"
 msgid "shell;prompt;command;commandline;cmd;"
 msgstr "ljuska;prompt;naredba;naredbeni redak;cmd;"

-#: data/org.gnome.Terminal.desktop.in:8
-msgid "org.gnome.Terminal"
-msgstr "org.gnome.Terminal"
-
 #: data/org.gnome.Terminal.desktop.in:17 src/terminal-accels.cc:127
 msgid "New Window"
 msgstr "Novi prozor"
@@ -158,7 +154,7 @@ msgstr "Pružatelj usluge pretrage"
 msgid "UserDocs"
 msgstr "Korisnička dokumentacija"

-#. Translators: Keep single quote please!
+#. Translators: This needs to be parsed as a GVariant string, so keep the regular single quotes around the string as-is, and do not add extra quotes.
 #: src/org.gnome.Terminal.gschema.xml:133
 msgctxt "visible-name"
 msgid "'Unnamed'"
@@ -334,7 +330,7 @@ msgstr "Treba li omogućiti SIXEL slike"

 #: src/org.gnome.Terminal.gschema.xml:210
 msgid "If true, SIXEL sequences are parsed and images are rendered."
-msgstr "Ako je odabrano, SIXEL slijedovi su obrađeni i slike su prikazane"
+msgstr "Ako je odabrano, SIXEL slijedovi su obrađeni i slike su prikazane."

 #: src/org.gnome.Terminal.gschema.xml:214
 msgid "Whether bold is also bright"
@@ -1335,144 +1331,134 @@ msgstr "Osunčano tamno"
 msgid "Error parsing command: %s"
 msgstr "Greška obrade naredbe: %s"

-#: src/profile-editor.cc:744
-msgid "Armenian"
-msgstr "Armenski"
-
-#: src/profile-editor.cc:745 src/profile-editor.cc:746
-#: src/profile-editor.cc:750
+#: src/profile-editor.cc:744 src/profile-editor.cc:745
+#: src/profile-editor.cc:749
 msgid "Chinese Traditional"
 msgstr "Kineski tradicionalni"

-#: src/profile-editor.cc:747
+#: src/profile-editor.cc:746
 msgid "Cyrillic/Russian"
 msgstr "Ćirilica/Ruski"

-#: src/profile-editor.cc:748 src/profile-editor.cc:761
-#: src/profile-editor.cc:791
+#: src/profile-editor.cc:747 src/profile-editor.cc:786
 msgid "Japanese"
 msgstr "Japanski"

-#: src/profile-editor.cc:749 src/profile-editor.cc:762
-#: src/profile-editor.cc:793
+#: src/profile-editor.cc:748 src/profile-editor.cc:788
 msgid "Korean"
 msgstr "Korejski"

-#: src/profile-editor.cc:751 src/profile-editor.cc:752
-#: src/profile-editor.cc:753
+#: src/profile-editor.cc:750 src/profile-editor.cc:751
+#: src/profile-editor.cc:752
 msgid "Chinese Simplified"
 msgstr "Kineski pojednostavljeni"

-#: src/profile-editor.cc:754
-msgid "Georgian"
-msgstr "Gruzijski"
-
-#: src/profile-editor.cc:755 src/profile-editor.cc:763
-#: src/profile-editor.cc:767 src/profile-editor.cc:787
-#: src/profile-editor.cc:797
+#: src/profile-editor.cc:753 src/profile-editor.cc:759
+#: src/profile-editor.cc:763 src/profile-editor.cc:782
+#: src/profile-editor.cc:792
 msgid "Western"
 msgstr "Zapadni"

-#: src/profile-editor.cc:756 src/profile-editor.cc:769
-#: src/profile-editor.cc:783 src/profile-editor.cc:795
+#: src/profile-editor.cc:754 src/profile-editor.cc:765
+#: src/profile-editor.cc:778 src/profile-editor.cc:790
 msgid "Central European"
 msgstr "Srednjo europski"

-#: src/profile-editor.cc:757 src/profile-editor.cc:772
-#: src/profile-editor.cc:778 src/profile-editor.cc:779
-#: src/profile-editor.cc:781 src/profile-editor.cc:796
+#: src/profile-editor.cc:755 src/profile-editor.cc:768
+#: src/profile-editor.cc:774 src/profile-editor.cc:776
+#: src/profile-editor.cc:791
 msgid "Cyrillic"
 msgstr "Ćirilica"

-#: src/profile-editor.cc:758 src/profile-editor.cc:777
-#: src/profile-editor.cc:789 src/profile-editor.cc:799
+#: src/profile-editor.cc:756 src/profile-editor.cc:773
+#: src/profile-editor.cc:784 src/profile-editor.cc:794
 msgid "Turkish"
 msgstr "Turski"

-#: src/profile-editor.cc:759 src/profile-editor.cc:776
-#: src/profile-editor.cc:786 src/profile-editor.cc:800
+#: src/profile-editor.cc:757 src/profile-editor.cc:772
+#: src/profile-editor.cc:781 src/profile-editor.cc:795
 msgid "Hebrew"
 msgstr "Hebrejski"

-#: src/profile-editor.cc:760 src/profile-editor.cc:773
-#: src/profile-editor.cc:782 src/profile-editor.cc:801
+#: src/profile-editor.cc:758 src/profile-editor.cc:769
+#: src/profile-editor.cc:777 src/profile-editor.cc:796
 msgid "Arabic"
 msgstr "Arapski"

-#: src/profile-editor.cc:764
+#: src/profile-editor.cc:760
 msgid "Nordic"
 msgstr "Nordijski"

-#: src/profile-editor.cc:765 src/profile-editor.cc:771
-#: src/profile-editor.cc:802
+#: src/profile-editor.cc:761 src/profile-editor.cc:767
+#: src/profile-editor.cc:797
 msgid "Baltic"
 msgstr "Baltički"

-#: src/profile-editor.cc:766
+#: src/profile-editor.cc:762
 msgid "Celtic"
 msgstr "Keltski"

-#: src/profile-editor.cc:768 src/profile-editor.cc:788
+#: src/profile-editor.cc:764 src/profile-editor.cc:783
 msgid "Romanian"
 msgstr "Rumunjski"

-#: src/profile-editor.cc:770
+#: src/profile-editor.cc:766
 msgid "South European"
 msgstr "Južno europski"

-#: src/profile-editor.cc:774 src/profile-editor.cc:785
-#: src/profile-editor.cc:798
+#: src/profile-editor.cc:770 src/profile-editor.cc:780
+#: src/profile-editor.cc:793
 msgid "Greek"
 msgstr "Grčki"

-#: src/profile-editor.cc:775
+#: src/profile-editor.cc:771
 msgid "Hebrew Visual"
 msgstr "Hebrejski vizualni"

-#: src/profile-editor.cc:780 src/profile-editor.cc:790
+#: src/profile-editor.cc:775 src/profile-editor.cc:785
 msgid "Cyrillic/Ukrainian"
 msgstr "Ćirilica/Ukrajinski"

-#: src/profile-editor.cc:784
+#: src/profile-editor.cc:779
 msgid "Croatian"
 msgstr "Hrvatski"

-#: src/profile-editor.cc:792
+#: src/profile-editor.cc:787
 msgid "Thai"
 msgstr "Tajlandski"

-#: src/profile-editor.cc:794 src/profile-editor.cc:810
+#: src/profile-editor.cc:789 src/profile-editor.cc:805
 msgid "Unicode"
 msgstr "Unikôdni"

-#: src/profile-editor.cc:803
+#: src/profile-editor.cc:798
 msgid "Vietnamese"
 msgstr "Vijetnamski"

-#: src/profile-editor.cc:811
+#: src/profile-editor.cc:806
 msgid "Legacy CJK Encodings"
 msgstr "Zastarjelo CJK kôdiranje"

-#: src/profile-editor.cc:812
+#: src/profile-editor.cc:807
 msgid "Obsolete Encodings"
 msgstr "Zastarjelo kôdiranje"

 #. Translators: Appears as: [numeric entry] × width
-#: src/profile-editor.cc:1012
+#: src/profile-editor.cc:1011
 msgid "width"
 msgstr "širina"

 #. Translators: Appears as: [numeric entry] × height
-#: src/profile-editor.cc:1017
+#: src/profile-editor.cc:1016
 msgid "height"
 msgstr "visina"

-#: src/profile-editor.cc:1065
+#: src/profile-editor.cc:1064
 #, c-format
 msgid "Choose Palette Color %u"
 msgstr "Odaberi paletu boje %u"

-#: src/profile-editor.cc:1069
+#: src/profile-editor.cc:1068
 #, c-format
 msgid "Palette entry %u"
 msgstr "Stavka palete %u"
@@ -1503,7 +1489,7 @@ msgstr "Podud_araj samo cijele riječi"

 #: src/search-popover.ui:204
 msgid "Match as _regular expression"
-msgstr "Podudaranje s _običnim izrazom"
+msgstr "Podudaraj s _običnim izrazom"

 #: src/search-popover.ui:222
 msgid "_Wrap around"
@@ -1647,7 +1633,7 @@ msgstr "Kartice"

 #: src/terminal-accels.cc:234 src/terminal-menubar.ui.in:228
 msgid "Help"
-msgstr "Pomoć"
+msgstr "Priručnik"

 #: src/terminal-accels.cc:235 src/terminal-prefs.cc:646
 msgid "Global"
@@ -1745,7 +1731,7 @@ msgstr "_4. 132×43"
 msgid "_Inspector"
 msgstr "_Nadzornik"

-#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1513
+#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1538
 #: src/terminal-window.cc:1795
 msgid "_Preferences"
 msgstr "_Osobitosti"
@@ -1874,31 +1860,31 @@ msgstr "_Otkvači terminal"
 msgid "_Contents"
 msgstr "_Priručnik"

-#: src/terminal-nautilus.cc:536
+#: src/terminal-nautilus.cc:539
 msgid "Open in _Remote Terminal"
 msgstr "Otvori u _udaljenom terminalu"

-#: src/terminal-nautilus.cc:538
+#: src/terminal-nautilus.cc:541
 msgid "Open in _Local Terminal"
 msgstr "Otvori u _lokalnom terminalu"

-#: src/terminal-nautilus.cc:542 src/terminal-nautilus.cc:553
+#: src/terminal-nautilus.cc:545 src/terminal-nautilus.cc:556
 msgid "Open the currently selected folder in a terminal"
 msgstr "Otvori trenutno odabranu mapu u terminalu"

-#: src/terminal-nautilus.cc:544 src/terminal-nautilus.cc:555
+#: src/terminal-nautilus.cc:547 src/terminal-nautilus.cc:558
 msgid "Open the currently open folder in a terminal"
 msgstr "Otvori trenutno otvorenu mapu u terminalu"

-#: src/terminal-nautilus.cc:550
+#: src/terminal-nautilus.cc:553
 msgid "Open in T_erminal"
 msgstr "Otvori u t_erminalu"

-#: src/terminal-nautilus.cc:560
+#: src/terminal-nautilus.cc:563
 msgid "Open T_erminal"
 msgstr "Otvori t_erminal"

-#: src/terminal-nautilus.cc:561
+#: src/terminal-nautilus.cc:564
 msgid "Open a terminal"
 msgstr "Otvori terminal"

@@ -2245,30 +2231,30 @@ msgstr "Prečaci"
 msgid "Profiles"
 msgstr "Profili"

-#: src/terminal-screen.cc:1398
+#: src/terminal-screen.cc:1405
 msgid "No command supplied nor shell requested"
 msgstr "Nema isporučene naredbe ili zahtjevane ljuske"

-#: src/terminal-screen.cc:1514 src/terminal-screen.cc:1861
+#: src/terminal-screen.cc:1539 src/terminal-screen.cc:1886
 msgid "_Relaunch"
 msgstr "_Pokreni ponovno"

-#: src/terminal-screen.cc:1517
+#: src/terminal-screen.cc:1542
 msgid "There was an error creating the child process for this terminal"
 msgstr ""
 "Došlo je do greške prilikom stvaranja podređenog procesa za ovaj terminal"

-#: src/terminal-screen.cc:1865
+#: src/terminal-screen.cc:1890
 #, c-format
 msgid "The child process exited normally with status %d."
 msgstr "Podproces se normalno okončao sa stanjem %d."

-#: src/terminal-screen.cc:1868
+#: src/terminal-screen.cc:1893
 #, c-format
 msgid "The child process was aborted by signal %d."
 msgstr "Podređeni proces je prekinuo signal %d."

-#: src/terminal-screen.cc:1871
+#: src/terminal-screen.cc:1896
 msgid "The child process was aborted."
 msgstr "Podređeni proces je prekinut."

@@ -2447,6 +2433,15 @@ msgstr "_Zatvori prozor"
 msgid "Failed to parse arguments: %s\n"
 msgstr "Greška u obradi argumenata: %s\n"

+#~ msgid "org.gnome.Terminal"
+#~ msgstr "org.gnome.Terminal"
+
+#~ msgid "Armenian"
+#~ msgstr "Armenski"
+
+#~ msgid "Georgian"
+#~ msgstr "Gruzijski"
+
 #~ msgid "Whether to allow bold text"
 #~ msgstr "Treba li dopustiti podebljani tekst"


--- a/po/ne.po
+++ b/po/ne.po