3.24.26

2021-02-23 09:31:37 -05:00
43 changed files with 2921 additions and 5080 deletions
@@ -1,53 +1,3 @@
-Overview of Changes in GTK+ 3.24.28
-===================================
-
-* Input:
- - Improve dead key handling
-
-* CSS:
- - Fix rendering of scaled text shadows
-
-* Wayland:
- - Fix matching of accelerators with multiple layouts
-
-* X11:
- - Trap errors from the COW
-
-* Build:
- - Make gtk3-update-icon-cache output reproducible
-
-* Translation updates:
- Serbian
-
-
-Overview of Changes in GTK+ 3.24.27
-===================================
-
-* Input: Ensure preedit-start and preedit-end
-  are emitted properly
-
-* GtkScrolledWindow:
- - Revert a change that broke touch scrolling
-
-* Theme:
- - Fix a problem with size changes in SSD decorations
-   that caused mutter crashes
- - Use transparent black for window border in the dark theme
-
-* Windows:
- - Memory leak fixes
- - Fix unresponsive windows after tablet input
- - Add support for wheel and rotation axes
-
-* Translation updates:
- Belarusian
- German
- Kazakh
- Korean
- Latvian
- Turkish
-
-
 Overview of Changes in GTK+ 3.24.26
 ===================================

@@ -10,8 +10,8 @@

 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [28])
-m4_define([gtk_interface_age], [24])
+m4_define([gtk_micro_version], [26])
+m4_define([gtk_interface_age], [22])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -20,8 +20,12 @@ Getting help with GTK+
 <title>Filing a bug report or feature request</title>

 <para>
-If you encounter a bug, misfeature, or missing feature in GTK, please
-file a bug report on <ulink url="https://gitlab.gnome.org/GNOME/gtk/issues">GitLab</ulink>.
+If you encounter a bug, misfeature, or missing feature in GTK+, please
+file a bug report on 
+<ulink url="https://bugzilla.gnome.org">https://bugzilla.gnome.org</ulink>.
+We'd also appreciate reports of incomplete or misleading information in 
+the GTK+ documentation; file those against the "docs" component of the "gtk+"
+product in Bugzilla.
 </para>

 <para>
@@ -33,38 +37,103 @@ discussed, we'll add a note to that effect in the report.

 <para>
 The bug tracker should definitely be used for feature requests, it's
-not only for bugs. We track all GTK development in GitLab, so it's
-the way to be sure the GTK developers won't forget about an issue.
-</para>
-
-<para>
-Just make sure that any issue filed is actionable, and contains clear
-instructions on how to reproduce an issue, and the conditions to close
-the bug report or feature request. Non-actionable, or user support
-questions will be directed to Discourse.
+not only for bugs. We track all GTK+ development in Bugzilla, so it's
+the way to be sure the GTK+ developers won't forget about an issue.
 </para>

 </refsect1>

 <refsect1>
-<title>Contributing</title>
+<title>Submitting Patches</title>

 <para>
-Please, follow the instructions outlined in the
-<ulink url="https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md">Contribution Guide</ulink> available in the GTK
-source code repository.
+If you develop a bugfix or enhancement for GTK+, please file that in
+Bugzilla as well. Bugzilla allows you to attach files; please attach a
+patch generated by the <command>diff</command> utility, using the 
+<option>-u</option> option to make the patch more readable. All patches 
+must be offered under the terms of the GNU LGPL license, so be sure you 
+are authorized to give us the patch under those terms.
+</para>
+
+<para>
+If you want to discuss your patch before or after developing it, mail 
+<ulink url="mailto:gtk-devel-list@gnome.org">gtk-devel-list@gnome.org</ulink>. 
+But be sure to file the Bugzilla report as well; if the patch is only on the 
+list and not in Bugzilla, it's likely to slip through the cracks.
 </para>

 </refsect1>

 <refsect1>
-<title>User support</title>
+<title>Mailing lists</title>

 <para>
-If you have questions about building, using, or contributing to GTK, please
-open a topic on <ulink url="https://discourse.gnome.org/tag/gtk">Discourse</ulink>.
+There are several mailing lists dedicated to GTK+ and related
+libraries. Discussion of GLib, Pango, and ATK in addition to GTK+
+proper is welcome on these lists. You can subscribe or view the
+archives of these lists on 
+<ulink url="https://mail.gnome.org">http://mail.gnome.org</ulink>.
+If you aren't subscribed to the list, any message you post to
+the list will be held for manual moderation, which might take
+some days to happen.      
+</para>
+
+<para>
+<variablelist>
+
+<varlistentry>
+<term><ulink url="mailto:gtk-list@gnome.org">gtk-list@gnome.org</ulink></term>
+<listitem><para>
+gtk-list covers general GTK+ topics; questions about using GTK+ in programs,
+GTK+ from a user standpoint, announcements of GTK+-related projects
+such as themes or GTK+ modules would all be on-topic. The bulk of the
+traffic consists of GTK+ programming questions.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><ulink url="mailto:gtk-app-devel-list@gnome.org">gtk-app-devel-list@gnome.org</ulink></term> 
+<listitem><para>
+gtk-app-devel-list covers writing applications in GTK+. It's narrower
+in scope than gtk-list, but the two lists overlap quite a
+bit. gtk-app-devel-list is a good place to ask questions about GTK+
+programming.  </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><ulink url="mailto:gtk-devel-list@gnome.org">gtk-devel-list@gnome.org</ulink></term>
+<listitem><para>
+gtk-devel-list is for discussion of work on GTK+ itself, it is 
+<emphasis>not</emphasis> for
+asking questions about how to use GTK+ in applications. gtk-devel-list 
+is appropriate for discussion of patches, bugs, proposed features, 
+and so on.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><ulink url="mailto:gtk-i18n-list@gnome.org">gtk-i18n-list@gnome.org</ulink></term>
+<listitem><para>
+gtk-i18n-list is for discussion of internationalization in GTK+; 
+Pango is the main focus of the list. Questions about the details of 
+using Pango, and discussion of proposed Pango patches or features, are
+all on topic.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><ulink url="mailto:gtk-doc-list@gnome.org">gtk-doc-list@gnome.org</ulink></term>
+<listitem><para>
+gtk-doc-list is for discussion of the <application>gtk-doc</application> 
+documentation system (used to document GTK+), and for work on the GTK+ 
+documentation.
+</para></listitem>
+</varlistentry>
+
+</variablelist>
 </para>

 </refsect1>

+
 </refentry>
@@ -2195,7 +2195,6 @@ deliver_key_event (GdkWaylandSeat *seat,
  struct xkb_keymap *xkb_keymap;
  GdkKeymap *keymap;
  xkb_keysym_t sym;
-  int layout;
  guint delay, interval, timeout;
  gint64 begin_time, now;

@@ -2208,7 +2207,6 @@ deliver_key_event (GdkWaylandSeat *seat,
  xkb_keymap = _gdk_wayland_keymap_get_xkb_keymap (keymap);

  sym = xkb_state_key_get_one_sym (xkb_state, key);
-  layout = xkb_state_key_get_layout (xkb_state, key);
  if (sym == XKB_KEY_NoSymbol)
    return;

@@ -2222,7 +2220,7 @@ deliver_key_event (GdkWaylandSeat *seat,
  gdk_event_set_seat (event, GDK_SEAT (seat));
  event->key.time = time_;
  event->key.state = device_get_modifiers (seat->master_pointer);
-  event->key.group = layout;
+  event->key.group = 0;
  event->key.hardware_keycode = key;
  gdk_event_set_scancode (event, key);
  event->key.keyval = sym;
@@ -150,18 +150,7 @@ gdk_device_win32_query_state (GdkDevice        *device,

  if (child_window)
    {
-      if (window == gdk_screen_get_root_window (screen))
-        {
-          /* Always use WindowFromPoint when searching from the root window.
-          *  Only WindowFromPoint is able to look through transparent
-          *  layered windows.
-          */
-          hwndc = GetAncestor (WindowFromPoint (point), GA_ROOT);
-        }
-      else
-        {
-          hwndc = ChildWindowFromPoint (hwnd, point);
-        }
+      hwndc = ChildWindowFromPoint (hwnd, point);

      if (hwndc && hwndc != hwnd)
        *child_window = gdk_win32_handle_table_lookup (hwndc);
@@ -212,46 +201,71 @@ _gdk_device_win32_window_at_position (GdkDevice       *device,
  GdkWindow *window = NULL;
  GdkWindowImplWin32 *impl = NULL;
  POINT screen_pt, client_pt;
-  HWND hwnd;
+  HWND hwnd, hwndc;
  RECT rect;

-  if (!GetCursorPos (&screen_pt))
-    return NULL;
-
-  hwnd = WindowFromPoint (screen_pt);
+  GetCursorPos (&screen_pt);

  if (get_toplevel)
    {
-      /* Use WindowFromPoint instead of ChildWindowFromPoint(Ex).
-      *  Only WindowFromPoint is able to look through transparent
-      *  layered windows.
-      */
-      hwnd = GetAncestor (hwnd, GA_ROOT);
+      /* Only consider visible children of the desktop to avoid the various
+       * non-visible windows you often find on a running Windows box. These
+       * might overlap our windows and cause our walk to fail. As we assume
+       * WindowFromPoint() can find our windows, we follow similar logic
+       * here, and ignore invisible and disabled windows.
+       */
+      hwnd = GetDesktopWindow ();
+      do {
+        window = gdk_win32_handle_table_lookup (hwnd);
+
+        if (window != NULL &&
+            GDK_WINDOW_TYPE (window) != GDK_WINDOW_ROOT &&
+            GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
+          break;
+
+        screen_to_client (hwnd, screen_pt, &client_pt);
+        hwndc = ChildWindowFromPointEx (hwnd, client_pt, CWP_SKIPDISABLED  |
+                                                         CWP_SKIPINVISIBLE);
+
+	/* Verify that we're really inside the client area of the window */
+	if (hwndc != hwnd)
+	  {
+	    GetClientRect (hwndc, &rect);
+	    screen_to_client (hwndc, screen_pt, &client_pt);
+	    if (!PtInRect (&rect, client_pt))
+	      hwndc = hwnd;
+	  }
+
+      } while (hwndc != hwnd && (hwnd = hwndc, 1));
+
    }
-
-  /* Verify that we're really inside the client area of the window */
-  GetClientRect (hwnd, &rect);
-  screen_to_client (hwnd, screen_pt, &client_pt);
-  if (!PtInRect (&rect, client_pt))
-    hwnd = NULL;
-
-  if (!get_toplevel && hwnd == NULL)
+  else
    {
-      /* If we didn't hit any window, return the root window */
-      /* note that the root window ain't a toplevel window */
-      window = gdk_get_default_root_window ();
-      impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
+      hwnd = WindowFromPoint (screen_pt);

-      if (win_x)
-        *win_x = (screen_pt.x + _gdk_offset_x) / impl->window_scale;
-      if (win_y)
-        *win_y = (screen_pt.y + _gdk_offset_y) / impl->window_scale;
+      /* Verify that we're really inside the client area of the window */
+      GetClientRect (hwnd, &rect);
+      screen_to_client (hwnd, screen_pt, &client_pt);
+      if (!PtInRect (&rect, client_pt))
+	hwnd = NULL;

-      return window;
+      /* If we didn't hit any window at that point, return the desktop */
+      if (hwnd == NULL)
+        {
+          window = gdk_get_default_root_window ();
+          impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
+
+          if (win_x)
+            *win_x = (screen_pt.x + _gdk_offset_x) / impl->window_scale;
+          if (win_y)
+            *win_y = (screen_pt.y + _gdk_offset_y) / impl->window_scale;
+
+          return window;
+        }
+
+      window = gdk_win32_handle_table_lookup (hwnd);
    }

-  window = gdk_win32_handle_table_lookup (hwnd);
-
  if (window && (win_x || win_y))
    {
      impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
@@ -49,8 +49,8 @@ struct _GdkDeviceWintab
  UINT cursor;
  /* The cursor's CSR_PKTDATA */
  WTPKT pktdata;
-  /* Azimuth, altitude and twist axis */
-  AXIS orientation_axes[3];
+  /* Azimuth and altitude axis */
+  AXIS orientation_axes[2];
 };

 struct _GdkDeviceWintabClass
@@ -34,7 +34,7 @@

 #define WINTAB32_DLL "Wintab32.dll"

-#define PACKETDATA (PK_CONTEXT | PK_CURSOR | PK_BUTTONS | PK_X | PK_Y  | PK_NORMAL_PRESSURE | PK_ORIENTATION | PK_TANGENT_PRESSURE)
+#define PACKETDATA (PK_CONTEXT | PK_CURSOR | PK_BUTTONS | PK_X | PK_Y  | PK_NORMAL_PRESSURE | PK_ORIENTATION)
 /* We want everything in absolute mode */
 #define PACKETMODE (0)
 #include <pktdef.h>
@@ -70,10 +70,6 @@ static gboolean default_display_opened = FALSE;

 G_DEFINE_TYPE (GdkDeviceManagerWin32, gdk_device_manager_win32, GDK_TYPE_DEVICE_MANAGER)

-static GdkDeviceWintab *gdk_device_manager_find_wintab_device (GdkDeviceManagerWin32 *, HCTX, UINT);
-UINT _wintab_recognize_new_cursors (GdkDeviceManagerWin32 *, HCTX);
-int _gdk_find_wintab_device_index (HCTX);
-
 static GdkDevice *
 create_pointer (GdkDeviceManager *device_manager,
 		GType g_type,
@@ -359,15 +355,18 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
  GdkDisplay *display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (device_manager));
  GdkWindow *root = gdk_screen_get_root_window (gdk_display_get_default_screen (display));
  static gboolean wintab_initialized = FALSE;
+  GdkDeviceWintab *device;
  GdkWindowAttr wa;
  WORD specversion;
  HCTX *hctx;
-  UINT ndevices, ncursors;
-  UINT devix;
-  AXIS axis_x, axis_y;
-  int i;
-  wchar_t devname[100];
-  gchar *devname_utf8;
+  UINT ndevices, ncursors, ncsrtypes, firstcsr, hardware;
+  BOOL active;
+  DWORD physid;
+  AXIS axis_x, axis_y, axis_npressure, axis_or[3];
+  UINT devix, cursorix;
+  int i, num_axes = 0;
+  wchar_t devname[100], csrname[100];
+  gchar *devname_utf8, *csrname_utf8, *device_name;
  BOOL defcontext_done;
  HMODULE wintab32;
  char *wintab32_dll_path;
@@ -466,8 +465,13 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
 #ifdef DEBUG_WINTAB
      GDK_NOTE (INPUT, (g_print("Device %u: %s\n", devix, devname_utf8)));
 #endif
+      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_NCSRTYPES, &ncsrtypes);
+      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_FIRSTCSR, &firstcsr);
+      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_HARDWARE, &hardware);
      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_X, &axis_x);
      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_Y, &axis_y);
+      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_NPRESSURE, &axis_npressure);
+      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_ORIENTATION, axis_or);

      defcontext_done = FALSE;
      if (HIBYTE (specversion) > 1 || LOBYTE (specversion) >= 1)
@@ -540,219 +544,137 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
        }
      if (!i)
        GDK_NOTE (INPUT, g_print("Whoops, no queue size could be set\n"));
-
-      /* Get the cursors that Wintab is currently aware of */
-      _wintab_recognize_new_cursors(device_manager, *hctx);
-    }
-}
-
-UINT
-_wintab_recognize_new_cursors (GdkDeviceManagerWin32 *device_manager,
-                               HCTX                  hctx)
-{
-  GdkDisplay *display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (device_manager));
-  int devix;
-  wchar_t devname[100], csrname[100];
-  gchar *devname_utf8, *csrname_utf8, *device_name;
-  UINT ncsrtypes, firstcsr, cursorix;
-  BOOL active;
-  DWORD physid;
-  AXIS axis_x, axis_y, axis_npressure, axis_or[3], axis_tpressure;
-  GdkDeviceWintab *device;
-  LOGCONTEXT lc;
-  int num_axes;
-  UINT num_new_cursors = 0;
-
-  devix = _gdk_find_wintab_device_index(hctx);
-  if (devix == -1)
-    return num_new_cursors;
-    
-  (*p_WTInfoW) (WTI_DEVICES + devix, DVC_NAME, devname);
-  devname_utf8 = g_utf16_to_utf8 (devname, -1, NULL, NULL, NULL);
+      for (cursorix = firstcsr; cursorix < firstcsr + ncsrtypes; cursorix++)
+        {
 #ifdef DEBUG_WINTAB
-  GDK_NOTE (INPUT, (g_print("Finding cursors for device %u: %s\n", devix, devname_utf8)));
+          GDK_NOTE (INPUT, (g_print("Cursor %u:\n", cursorix), print_cursor (cursorix)));
 #endif
+          active = FALSE;
+          (*p_WTInfoA) (WTI_CURSORS + cursorix, CSR_ACTIVE, &active);
+          if (!active)
+            continue;

-  (*p_WTInfoA) (WTI_DEVICES + devix, DVC_FIRSTCSR, &firstcsr);
-  (*p_WTInfoA) (WTI_DEVICES + devix, DVC_NCSRTYPES, &ncsrtypes);
-  for (cursorix = firstcsr; cursorix < firstcsr + ncsrtypes; cursorix++)
-    {
-#ifdef DEBUG_WINTAB
-      GDK_NOTE (INPUT, (g_print("Cursor %u:\n", cursorix), print_cursor (cursorix)));
-#endif
-      /* Skip cursors that are already known to us */
-      if (gdk_device_manager_find_wintab_device(device_manager, hctx, cursorix) != NULL)
-        continue;
-        
-      active = FALSE;
-      (*p_WTInfoA) (WTI_CURSORS + cursorix, CSR_ACTIVE, &active);
-      if (!active)
-        continue;
-
-      /* Wacom tablets iterate through all possible cursors,
-       * even if the cursor's presence has not been recognized.
-       * Unrecognized cursors have a physid of zero and are ignored. 
-       * Recognized cursors have a non-zero physid and we create a 
-       * Wintab device object for each of them.
-       */
-      (*p_WTInfoA) (WTI_CURSORS + cursorix, CSR_PHYSID, &physid);
-      if (wcscmp (devname, L"WACOM Tablet") == 0 && physid == 0)
-        continue;
-
-      if (!(*p_WTGetA) (hctx, &lc))
-        {
-          g_warning ("wintab_recognize_new_cursors: Failed to retrieve device LOGCONTEXT");
-          continue;
-        }
-
-      /* Create a Wintab device for this cursor */
-      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_X, &axis_x);
-      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_Y, &axis_y);
-      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_NPRESSURE, &axis_npressure);
-      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_ORIENTATION, axis_or);
-      (*p_WTInfoA) (WTI_DEVICES + devix, DVC_TPRESSURE, &axis_tpressure);
-      (*p_WTInfoW) (WTI_CURSORS + cursorix, CSR_NAME, csrname);
-      csrname_utf8 = g_utf16_to_utf8 (csrname, -1, NULL, NULL, NULL);
-      device_name = g_strconcat (devname_utf8, " ", csrname_utf8, NULL);
-      g_free (csrname_utf8);
-
-      device = g_object_new (GDK_TYPE_DEVICE_WINTAB,
-                              "name", device_name,
-                              "type", GDK_DEVICE_TYPE_FLOATING,
-                              "input-source", GDK_SOURCE_PEN,
-                              "input-mode", GDK_MODE_SCREEN,
-                              "has-cursor", lc.lcOptions & CXO_SYSTEM,
-                              "display", display,
-                              "device-manager", device_manager,
-                              NULL);
-
-      device->sends_core = lc.lcOptions & CXO_SYSTEM;
-      if (device->sends_core)
-        {
-          _gdk_device_set_associated_device (device_manager->system_pointer, GDK_DEVICE (device));
-          _gdk_device_add_slave (device_manager->core_pointer, GDK_DEVICE (device));
-        }
-
-      device->hctx = hctx;
-      device->cursor = cursorix;
-      (*p_WTInfoA) (WTI_CURSORS + cursorix, CSR_PKTDATA, &device->pktdata);
-      num_axes = 0;
-
-      if (device->pktdata & PK_X)
-        {
-          _gdk_device_add_axis (GDK_DEVICE (device),
-                                GDK_NONE,
-                                GDK_AXIS_X,
-                                axis_x.axMin,
-                                axis_x.axMax,
-                                axis_x.axResolution / 65535);
-          num_axes++;
-        }
-
-      if (device->pktdata & PK_Y)
-        {
-          _gdk_device_add_axis (GDK_DEVICE (device),
-                                GDK_NONE,
-                                GDK_AXIS_Y,
-                                axis_y.axMin,
-                                axis_y.axMax,
-                                axis_y.axResolution / 65535);
-          num_axes++;
-        }
-
-      if (device->pktdata & PK_NORMAL_PRESSURE)
-        {
-          _gdk_device_add_axis (GDK_DEVICE (device),
-                                GDK_NONE,
-                                GDK_AXIS_PRESSURE,
-                                axis_npressure.axMin,
-                                axis_npressure.axMax,
-                                axis_npressure.axResolution / 65535);
-          num_axes++;
-        }
-
-      if (device->pktdata & PK_ORIENTATION)
-        {
-          if (device->pktdata & PK_TANGENT_PRESSURE) /* If we have a wheel, disable the twist axis */
-            axis_or[2].axResolution = 0;
-
-          device->orientation_axes[0] = axis_or[0];
-          device->orientation_axes[1] = axis_or[1];
-          device->orientation_axes[2] = axis_or[2];
-
-          /* Wintab gives us azimuth and altitude, which
-           * we convert to x and y tilt in the -1000..1000 range
+          /* Wacom tablets seem to report cursors corresponding to
+           * nonexistent pens or pucks. At least my ArtPad II reports
+           * six cursors: a puck, pressure stylus and eraser stylus,
+           * and then the same three again. I only have a
+           * pressure-sensitive pen. The puck instances, and the
+           * second instances of the styluses report physid zero. So
+           * at least for Wacom, skip cursors with physid zero.
           */
-          _gdk_device_add_axis (GDK_DEVICE (device),
-                                GDK_NONE,
-                                GDK_AXIS_XTILT,
-                                -1000,
-                                1000,
-                                1000);
+          (*p_WTInfoA) (WTI_CURSORS + cursorix, CSR_PHYSID, &physid);
+          if (wcscmp (devname, L"WACOM Tablet") == 0 && physid == 0)
+            continue;

-          _gdk_device_add_axis (GDK_DEVICE (device),
-                                GDK_NONE,
-                                GDK_AXIS_YTILT,
-                                -1000,
-                                1000,
-                                1000);
-          num_axes += 2;
+          (*p_WTInfoW) (WTI_CURSORS + cursorix, CSR_NAME, csrname);
+          csrname_utf8 = g_utf16_to_utf8 (csrname, -1, NULL, NULL, NULL);
+          device_name = g_strconcat (devname_utf8, " ", csrname_utf8, NULL);

-          if (axis_or[2].axResolution != 0) /* If twist is present */
+          device = g_object_new (GDK_TYPE_DEVICE_WINTAB,
+                                 "name", device_name,
+                                 "type", GDK_DEVICE_TYPE_FLOATING,
+                                 "input-source", GDK_SOURCE_PEN,
+                                 "input-mode", GDK_MODE_SCREEN,
+                                 "has-cursor", lc.lcOptions & CXO_SYSTEM,
+                                 "display", display,
+                                 "device-manager", device_manager,
+                                 NULL);
+
+	  device->sends_core = lc.lcOptions & CXO_SYSTEM;
+	  if (device->sends_core)
+	    {
+	      _gdk_device_set_associated_device (device_manager->system_pointer, GDK_DEVICE (device));
+	      _gdk_device_add_slave (device_manager->core_pointer, GDK_DEVICE (device));
+	    }
+
+          g_free (csrname_utf8);
+
+          device->hctx = *hctx;
+          device->cursor = cursorix;
+          (*p_WTInfoA) (WTI_CURSORS + cursorix, CSR_PKTDATA, &device->pktdata);
+
+          if (device->pktdata & PK_X)
            {
-              /* Wacom's Wintab driver returns the rotation
-               * of an Art Pen as the orientation twist value.
-               * We're using GDK_AXIS_WHEEL as it's actually
-               * called Wheel/Rotation to the user.
-               * axMin and axMax are back to front on purpose. If you put them
-               * the "correct" way round, rotation will be flipped!
-               */
-               _gdk_device_add_axis (GDK_DEVICE (device),
-                                     GDK_NONE,
-                                     GDK_AXIS_WHEEL,
-                                     axis_or[2].axMax,
-                                     axis_or[2].axMin,
-                                     axis_or[2].axResolution / 65535);
+              _gdk_device_add_axis (GDK_DEVICE (device),
+                                    GDK_NONE,
+                                    GDK_AXIS_X,
+                                    axis_x.axMin,
+                                    axis_x.axMax,
+                                    axis_x.axResolution / 65535);
              num_axes++;
            }
-        }

-      if (device->pktdata & PK_TANGENT_PRESSURE)
-        {
-          /* This is the finger wheel on a Wacom Airbrush
-           */
-          _gdk_device_add_axis (GDK_DEVICE (device),
-                                GDK_NONE,
-                                GDK_AXIS_WHEEL,
-                                axis_tpressure.axMin,
-                                axis_tpressure.axMax,
-                                axis_tpressure.axResolution / 65535);
-          num_axes++;
-        }
+          if (device->pktdata & PK_Y)
+            {
+              _gdk_device_add_axis (GDK_DEVICE (device),
+                                    GDK_NONE,
+                                    GDK_AXIS_Y,
+                                    axis_y.axMin,
+                                    axis_y.axMax,
+                                    axis_y.axResolution / 65535);
+              num_axes++;
+            }

-      device->last_axis_data = g_new (gint, num_axes);

-      GDK_NOTE (INPUT, g_print ("device: (%u) %s axes: %d\n",
-                                cursorix,
-                                device_name,
-                                num_axes));
+          if (device->pktdata & PK_NORMAL_PRESSURE)
+            {
+              _gdk_device_add_axis (GDK_DEVICE (device),
+                                    GDK_NONE,
+                                    GDK_AXIS_PRESSURE,
+                                    axis_npressure.axMin,
+                                    axis_npressure.axMax,
+                                    axis_npressure.axResolution / 65535);
+              num_axes++;
+            }
+
+          if (device->pktdata & PK_ORIENTATION)
+            {
+              device->orientation_axes[0] = axis_or[0];
+              device->orientation_axes[1] = axis_or[1];
+
+              /* Wintab gives us azimuth and altitude, which
+               * we convert to x and y tilt in the -1000..1000 range
+               */
+              _gdk_device_add_axis (GDK_DEVICE (device),
+                                    GDK_NONE,
+                                    GDK_AXIS_XTILT,
+                                    -1000,
+                                    1000,
+                                    1000);
+
+              _gdk_device_add_axis (GDK_DEVICE (device),
+                                    GDK_NONE,
+                                    GDK_AXIS_YTILT,
+                                    -1000,
+                                    1000,
+                                    1000);
+              num_axes += 2;
+            }
+
+          device->last_axis_data = g_new (gint, num_axes);
+
+          GDK_NOTE (INPUT, g_print ("device: (%u) %s axes: %d\n",
+                                    cursorix,
+                                    device_name,
+                                    num_axes));

 #if 0
-      for (i = 0; i < gdkdev->info.num_axes; i++)
-        GDK_NOTE (INPUT, g_print ("... axis %d: %d--%d@%d\n",
-                                  i,
-                                  gdkdev->axes[i].min_value,
-                                  gdkdev->axes[i].max_value,
-                                  gdkdev->axes[i].resolution));
+          for (i = 0; i < gdkdev->info.num_axes; i++)
+            GDK_NOTE (INPUT, g_print ("... axis %d: %d--%d@%d\n",
+                                      i,
+                                      gdkdev->axes[i].min_value,
+                                      gdkdev->axes[i].max_value,
+                                      gdkdev->axes[i].resolution));
 #endif

-      device_manager->wintab_devices = g_list_append (device_manager->wintab_devices,
-                                                      device);
-      num_new_cursors++;
-      g_free (device_name);
+          device_manager->wintab_devices = g_list_append (device_manager->wintab_devices,
+                                                          device);
+
+          g_free (device_name);
+        }
+
+      g_free (devname_utf8);
    }
-  g_free (devname_utf8);
-  return num_new_cursors;
 }

 /* Only initialize Wintab after the default display is set for
@@ -946,36 +868,29 @@ decode_tilt (gint   *axis_data,
   * sensible tilts will need both, so only add the GDK tilt axes
   * if both wintab axes are going to be well-behaved in use.
   */
-  if (axes == NULL)
-    return;
-
-  if ((axes[0].axResolution == 0) ||
+  if ((axes == NULL) ||
+      (axes[0].axResolution == 0) ||
      (axes[1].axResolution == 0))
    {
      axis_data[0] = 0;
      axis_data[1] = 0;
-    }
-  else
-    {
-      /*
-       * Tested with a Wacom Intuos 5 touch M (PTH-650) + Wacom drivers 6.3.18-5.
-       * Wintab's reference angle leads gdk's by 90 degrees.
-       */
-      az = TWOPI * packet->pkOrientation.orAzimuth /
-        (axes[0].axResolution / 65536.);
-      az -= G_PI / 2;
-      el = TWOPI * packet->pkOrientation.orAltitude /
-        (axes[1].axResolution / 65536.);
-
-      /* X tilt */
-      axis_data[0] = cos (az) * cos (el) * 1000;
-      /* Y tilt */
-      axis_data[1] = sin (az) * cos (el) * 1000;
+      return;
    }

-  /* Twist (Rotation) if present */
-  if (axes[2].axResolution != 0)
-    axis_data[2] = packet->pkOrientation.orTwist;
+  /*
+   * Tested with a Wacom Intuos 5 touch M (PTH-650) + Wacom drivers 6.3.18-5.
+   * Wintab's reference angle leads gdk's by 90 degrees.
+   */
+  az = TWOPI * packet->pkOrientation.orAzimuth /
+    (axes[0].axResolution / 65536.);
+  az -= G_PI / 2;
+  el = TWOPI * packet->pkOrientation.orAltitude /
+    (axes[1].axResolution / 65536.);
+
+  /* X tilt */
+  axis_data[0] = cos (az) * cos (el) * 1000;
+  /* Y tilt */
+  axis_data[1] = sin (az) * cos (el) * 1000;
 }

 /*
@@ -1003,31 +918,6 @@ get_modifier_key_state (void)
  return state;
 }

-int
-_gdk_find_wintab_device_index (HCTX hctx)
-{
-  GList *tmp_list;
-  int devix;
-
-  /* Find the index of the Wintab driver's input device (probably zero) */
-  if (!wintab_contexts)
-    return -1; /* No tablet devices found or Wintab not initialized yet */
-  
-  tmp_list = wintab_contexts;
-  devix = 0;
-  while (tmp_list)
-    {
-      if ((*(HCTX *) (tmp_list->data)) == hctx)
-        return devix;
-      else
-        {
-          devix++;
-          tmp_list = tmp_list->next;
-        }
-    }
-  return -1;
-}
-
 static GdkDeviceWintab *
 gdk_device_manager_find_wintab_device (GdkDeviceManagerWin32 *device_manager,
                                       HCTX                   hctx,
@@ -1183,18 +1073,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS;
        {
          decode_tilt (source_device->last_axis_data + num_axes,
                       source_device->orientation_axes, &packet);
-          /* we could have 3 axes if twist is present */
-          if (source_device->orientation_axes[2].axResolution == 0)
-            {
-              num_axes += 2;
-            }
-          else
-            {
-              num_axes += 3;
-            }
+          num_axes += 2;
        }
-      if (source_device->pktdata & PK_TANGENT_PRESSURE)
-        source_device->last_axis_data[num_axes++] = packet.pkTangentPressure;

      translated_buttons = button_map[packet.pkButtons & 0x07] | (packet.pkButtons & ~0x07);

@@ -1341,31 +1221,21 @@ G_GNUC_END_IGNORE_DEPRECATIONS;

    case WT_CSRCHANGE:
      if (device_manager->dev_entered_proximity > 0)
-        device_manager->dev_entered_proximity -= 1;
+	device_manager->dev_entered_proximity -= 1;

-      if ((source_device = 
-        gdk_device_manager_find_wintab_device (device_manager,
-								                                (HCTX) msg->lParam,
-								                                packet.pkCursor)) == NULL)
-        {
-          /* Check for new cursors and try again */
-          if (_wintab_recognize_new_cursors(device_manager,
-                                            (HCTX) msg->lParam) == 0)
-              return FALSE;
-          if ((source_device =
-            gdk_device_manager_find_wintab_device (device_manager,
-                                                    (HCTX) msg->lParam,
-                                                    packet.pkCursor)) == NULL)
-            return FALSE;
-        }
+      if ((source_device = gdk_device_manager_find_wintab_device (device_manager,
+								  (HCTX) msg->lParam,
+								  packet.pkCursor)) == NULL)
+	return FALSE;

      if (source_device->sends_core &&
-	        gdk_device_get_mode (GDK_DEVICE (source_device)) != GDK_MODE_DISABLED)
-	      {
-	        _gdk_device_virtual_set_active (device_manager->core_pointer,
-					                                GDK_DEVICE (source_device));
-	        _gdk_input_ignore_core += 1;
-	      }
+	  gdk_device_get_mode (GDK_DEVICE (source_device)) != GDK_MODE_DISABLED)
+	{
+	  _gdk_device_virtual_set_active (device_manager->core_pointer,
+					  GDK_DEVICE (source_device));
+	  _gdk_input_ignore_core += 1;
+	}
+
      return FALSE;

    case WT_PROXIMITY:
@@ -1838,7 +1838,7 @@ generate_button_event (GdkEventType      type,
                       GdkWindow        *window,
                       MSG              *msg)
 {
-  GdkEvent *event;
+  GdkEvent *event = gdk_event_new (type);
  GdkDeviceManagerWin32 *device_manager;
  GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (window->impl);

@@ -1847,7 +1847,6 @@ generate_button_event (GdkEventType      type,

  device_manager = GDK_DEVICE_MANAGER_WIN32 (gdk_display_get_device_manager (gdk_display_get_default ()));

-  event = gdk_event_new (type);
  event->button.window = window;
  event->button.time = _gdk_win32_get_next_tick (msg->time);
  event->button.x = current_x = (gint16) GET_X_LPARAM (msg->lParam) / impl->window_scale;
@@ -3742,11 +3741,7 @@ gdk_event_translate (MSG  *msg,
      GDK_NOTE (EVENTS, g_print (" %s thread: %" G_GINT64_FORMAT,
 				 msg->wParam ? "YES" : "NO",
 				 (gint64) msg->lParam));
-      
-      // Clear graphics tablet state
-      _gdk_input_ignore_core = 0;
      break;
-      
    case WM_NCHITTEST:
      /* TODO: pass all messages to DwmDefWindowProc() first! */
      return_val = handle_nchittest (msg->hwnd, window,
@@ -634,14 +634,12 @@ gdk_window_cache_new (GdkScreen *screen)
   */
  if (gdk_screen_is_composited (screen))
    {
-      gdk_x11_display_error_trap_push (GDK_X11_SCREEN (screen)->display);
      cow = XCompositeGetOverlayWindow (xdisplay, GDK_WINDOW_XID (root_window));
      gdk_window_cache_add (result, cow, 0, 0, 
 			    gdk_x11_screen_get_width (screen) * GDK_X11_SCREEN(screen)->window_scale, 
 			    gdk_x11_screen_get_height (screen) * GDK_X11_SCREEN(screen)->window_scale, 
 			    TRUE);
      XCompositeReleaseOverlayWindow (xdisplay, GDK_WINDOW_XID (root_window));
-      gdk_x11_display_error_trap_pop_ignored (GDK_X11_SCREEN (screen)->display);
    }
 #endif

@@ -1741,7 +1741,7 @@ EXTRA_DIST +=                   \
 	$(gesture_sources)	\
 	$(theme_sources)	\
 	$(gsettings_SCHEMAS)	\
-	compose/compose-parse.py	\
+	compose-parse.py	\
 	emoji/convert-emoji.c	\
 	emoji/emoji.json	\
 	emoji/emoji1.json	\
@@ -1749,8 +1749,7 @@ EXTRA_DIST +=                   \
 	deprecated/Makefile.inc	\
 	glade/README.glade	\
 	glade/gtk-private-widgets.xml \
-	compose/gtk-compose-lookaside.txt \
-	compose/gtk-compose-remove.txt \
+	gtk-compose-lookaside.txt \
 	inspector/Makefile.inc	\
 	libgtk3.manifest.in	\
 	gtk-win32.rc.body.in	\
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # compose-parse.py, version 1.4
@@ -26,7 +26,6 @@ URL_KEYSYMSTXT = "http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt"
 URL_GDKKEYSYMSH = "http://git.gnome.org/browse/gtk%2B/plain/gdk/gdkkeysyms.h"
 URL_UNICODEDATATXT = 'http://www.unicode.org/Public/6.0.0/ucd/UnicodeData.txt'
 FILENAME_COMPOSE_SUPPLEMENTARY = 'gtk-compose-lookaside.txt'
-FILENAME_COMPOSE_NEGATIVE_SUPPLEMENTARY = 'gtk-compose-remove.txt'

 # We currently support keysyms of size 2; once upstream xorg gets sorted, 
 # we might produce some tables with size 2 and some with size 4.
@@ -449,18 +448,6 @@ xorg_compose_sequences_raw = []
 for seq in composefile.readlines():
        xorg_compose_sequences_raw.append(seq)

-try:
-        composefile_lookaside = open(FILENAME_COMPOSE_NEGATIVE_SUPPLEMENTARY, 'r')
-        for seq in composefile_lookaside.readlines():
-                xorg_compose_sequences_raw.remove(seq)
-except IOError, (errno, strerror):
-        if opt_verbose:
-                print "I/O error(%s): %s" % (errno, strerror)
-                print "Did not find negative lookaside compose file. Continuing..."
-except:
-        print "Unexpected error: ", sys.exc_info()[0]
-        sys.exit(-1)
-
 try:
        composefile_lookaside = open(FILENAME_COMPOSE_SUPPLEMENTARY, 'r')
        for seq in composefile_lookaside.readlines():
@@ -1,14 +0,0 @@
-<dead_tilde> <dead_tilde>        	: "~"   asciitilde # TILDE
-<dead_acute> <space>             	: "'"   apostrophe # APOSTROPHE
-<dead_acute> <dead_acute>        	: "´"   acute # ACUTE ACCENT
-<dead_grave> <dead_grave>        	: "`"   grave # GRAVE ACCENT
-<dead_abovering> <dead_abovering> 	: "°"   degree # DEGREE SIGN
-<dead_macron> <dead_macron>      	: "¯"   macron # MACRON
-<dead_breve> <dead_breve>        	: "˘"   breve # BREVE
-<dead_abovedot> <dead_abovedot>  	: "˙"   abovedot # DOT ABOVE
-<dead_diaeresis> <dead_diaeresis> 	: "¨"   diaeresis # DIAERESIS
-<dead_doubleacute> <dead_doubleacute> 	: "˝"   U2dd # DOUBLE ACUTE ACCENT
-<dead_caron> <dead_caron>        	: "ˇ"   caron # CARON
-<dead_cedilla> <dead_cedilla>    	: "¸"   cedilla # CEDILLA
-<dead_ogonek> <dead_ogonek>      	: "˛"   ogonek # OGONEK
-<dead_iota> <dead_iota>          	: "ͺ"   U37a # GREEK YPOGEGRAMMENI
@@ -403,7 +403,3 @@
 <Multi_key> <Greek_omicron> <apostrophe> 			: "ό" U03CC
 <Multi_key> <Greek_upsilon> <apostrophe> 			: "ύ" U03CD
 <Multi_key> <Greek_omega> <apostrophe> 			: "ώ" U03CE
-
-# This sequence matches our handling of dead keys better.
-# We remove the xorg sequence that maps this to '
-<dead_acute> <space> : "´" acute # ACUTE ACCENT
@@ -1190,12 +1190,6 @@ gtk_check_algorithmically (const guint16 *compose_buffer,

  for (i = 0; i < n_compose && IS_DEAD_KEY (compose_buffer[i]); i++)
    ;
-
-  /* Allow at most 2 dead keys */
-  if (i > 2)
-    return FALSE;
-
-  /* Can't combine if there's no base character */
  if (i == n_compose)
    return TRUE;

@@ -485,9 +485,7 @@ make_blurred_pango_surface (cairo_t           *existing_cr,
                                                x_scale * (ink_rect.width + 2 * clip_radius),
                                                y_scale * (ink_rect.height + 2 * clip_radius));
  cairo_surface_set_device_scale (surface, x_scale, y_scale);
-  cairo_surface_set_device_offset (surface,
-                                   x_scale * (-ink_rect.x + clip_radius),
-                                   y_scale * (-ink_rect.y + clip_radius));
+  cairo_surface_set_device_offset (surface, -ink_rect.x + clip_radius, -ink_rect.y + clip_radius);
  cr = cairo_create (surface);
  cairo_move_to (cr, 0, 0);
  _gtk_pango_fill_layout (cr, layout);
@@ -65,7 +65,6 @@ struct _GtkIMContextSimplePrivate
  int            tentative_match_len;

  guint          in_hex_sequence : 1;
-  guint          in_compose_sequence : 1;
  guint          modifiers_dropped : 1;
 };

@@ -303,21 +302,13 @@ gtk_im_context_simple_commit_string (GtkIMContextSimple *context_simple,
                                     const char         *str)
 {
  GtkIMContextSimplePrivate *priv = context_simple->priv;
+  priv->in_hex_sequence = FALSE;
+  g_string_set_size (priv->tentative_match, 0);
+  priv->tentative_match_len = 0;
+  priv->compose_buffer[0] = 0;

-  if (priv->in_hex_sequence ||
-      priv->tentative_match_len > 0 ||
-      priv->compose_buffer[0] != 0)
-    {
-      g_string_set_size (priv->tentative_match, 0);
-      priv->tentative_match_len = 0;
-      priv->in_compose_sequence = FALSE;
-      priv->in_hex_sequence = FALSE;
-      priv->compose_buffer[0] = 0;
-
-      g_signal_emit_by_name (context_simple, "preedit-changed");
-      g_signal_emit_by_name (context_simple, "preedit-end");
-    }
-
+  g_signal_emit_by_name (context_simple, "preedit-changed");
+  g_signal_emit_by_name (context_simple, "preedit-end");
  g_signal_emit_by_name (context_simple, "commit", str);
 }

@@ -422,79 +413,6 @@ beep_window (GdkWindow *window)
    gdk_window_beep (window);
 }

-static inline gboolean
-is_dead_key (guint keysym)
-{
-  return GDK_KEY_dead_grave <= keysym && keysym <= GDK_KEY_dead_greek;
-}
-
-static gunichar
-dead_key_to_unicode (guint     keysym,
-                     gboolean *need_space)
-{
-  /* Sadly, not all the dead keysyms have spacing mark equivalents
-   * in Unicode. For those that don't, we use space + the non-spacing
-   * mark as an approximation
-   */
-  switch (keysym)
-    {
-#define CASE(keysym, unicode, sp) \
-    case GDK_KEY_dead_##keysym: *need_space = sp; return unicode;
-
-    CASE (grave, 0x60, 0);
-    CASE (acute, 0xb4, 0);
-    CASE (circumflex, 0x5e, 0);
-    CASE (tilde, 0x7e, 0);
-    CASE (macron, 0xaf, 0);
-    CASE (breve, 0x2d8, 0);
-    CASE (abovedot, 0x307, 1);
-    CASE (diaeresis, 0xa8, 0);
-    CASE (abovering, 0x2da, 0);
-    CASE (hook, 0x2c0, 0);
-    CASE (doubleacute, 0x2dd, 0);
-    CASE (caron, 0x2c7, 0);
-    CASE (cedilla, 0xb8, 0);
-    CASE (ogonek, 0x2db, 0);
-    CASE (iota, 0x37a, 0);
-    CASE (voiced_sound, 0x3099, 1);
-    CASE (semivoiced_sound, 0x309a, 1);
-    CASE (belowdot, 0x323, 1);
-    CASE (horn, 0x31b, 1);
-    CASE (stroke, 0x335, 1);
-    CASE (abovecomma, 0x2bc, 0);
-    CASE (abovereversedcomma, 0x2bd, 1);
-    CASE (doublegrave, 0x30f, 1);
-    CASE (belowring, 0x2f3, 0);
-    CASE (belowmacron, 0x2cd, 0);
-    CASE (belowcircumflex, 0x32d, 1);
-    CASE (belowtilde, 0x330, 1);
-    CASE (belowbreve, 0x32e, 1);
-    CASE (belowdiaeresis, 0x324, 1);
-    CASE (invertedbreve, 0x32f, 1);
-    CASE (belowcomma, 0x326, 1);
-    CASE (lowline, 0x5f, 0);
-    CASE (aboveverticalline, 0x2c8, 0);
-    CASE (belowverticalline, 0x2cc, 0);
-    CASE (longsolidusoverlay, 0x338, 1);
-    CASE (a, 0x363, 1);
-    CASE (A, 0x363, 1);
-    CASE (e, 0x364, 1);
-    CASE (E, 0x364, 1);
-    CASE (i, 0x365, 1);
-    CASE (I, 0x365, 1);
-    CASE (o, 0x366, 1);
-    CASE (O, 0x366, 1);
-    CASE (u, 0x367, 1);
-    CASE (U, 0x367, 1);
-    CASE (small_schwa, 0x1dea, 1);
-    CASE (capital_schwa, 0x1dea, 1);
-#undef CASE
-    default:
-      *need_space = FALSE;
-      return gdk_keyval_to_unicode (keysym);
-    }
-}
-
 static gboolean
 no_sequence_matches (GtkIMContextSimple *context_simple,
                     int                 n_compose,
@@ -505,9 +423,7 @@ no_sequence_matches (GtkIMContextSimple *context_simple,
  gunichar ch;

  context = GTK_IM_CONTEXT (context_simple);
-
-  priv->in_compose_sequence = FALSE;
-
+  
  /* No compose sequences found, check first if we have a partial
   * match pending.
   */
@@ -539,65 +455,6 @@ no_sequence_matches (GtkIMContextSimple *context_simple,
    }
  else
    {
-      int i;
-
-      for (i = 0; i < n_compose && is_dead_key (priv->compose_buffer[i]); i++)
-        ;
-
-      if (n_compose > 1 && i >= n_compose - 1)
-        {
-          gboolean need_space;
-          GString *s;
-
-          s = g_string_new ("");
-
-          if (i == n_compose - 1)
-            {
-              /* dead keys are never *really* dead */
-              for (int j = 0; j < i; j++)
-                {
-                  ch = dead_key_to_unicode (priv->compose_buffer[j], &need_space);
-                  if (ch)
-                    {
-                      if (need_space)
-                        g_string_append_c (s, ' ');
-                      g_string_append_unichar (s, ch);
-                    }
-                }
-
-              ch = gdk_keyval_to_unicode (priv->compose_buffer[i]);
-              if (ch != 0 && ch != ' ' && !g_unichar_iscntrl (ch))
-                g_string_append_unichar (s, ch);
-
-              gtk_im_context_simple_commit_string (context_simple, s->str);
-            }
-          else
-            {
-              ch = dead_key_to_unicode (priv->compose_buffer[0], &need_space);
-              if (ch)
-                {
-                  if (need_space)
-                    g_string_append_c (s, ' ');
-                  g_string_append_unichar (s, ch);
-                }
-
-              gtk_im_context_simple_commit_string (context_simple, s->str);
-
-              for (i = 1; i < n_compose; i++)
-                priv->compose_buffer[i - 1] = priv->compose_buffer[i];
-              priv->compose_buffer[n_compose - 1] = 0;
-
-              priv->in_compose_sequence = TRUE;
-
-              g_signal_emit_by_name (context, "preedit-start");
-              g_signal_emit_by_name (context, "preedit-changed");
-            }
-
-          g_string_free (s, TRUE);
-
-          return TRUE;
-        }
-
      priv->compose_buffer[0] = 0;
      if (n_compose > 1)		/* Invalid sequence */
 	{
@@ -804,7 +661,7 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,

      if (!priv->in_hex_sequence)
        g_signal_emit_by_name (context_simple, "preedit-end");
-
+      
      return TRUE;
    }

@@ -856,6 +713,7 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
      return TRUE;
    }
  
+  /* Then, check for compose sequences */
  if (priv->in_hex_sequence)
    {
      if (hex_keyval && n_compose < 6)
@@ -898,8 +756,6 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
                  char *str = g_strdup (priv->tentative_match->str);
 		  gtk_im_context_simple_commit_string (context_simple, str);
                  g_free (str);
-
-                  return TRUE;
 		}
 	      else
 		{
@@ -922,7 +778,7 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
 	  return TRUE;
        }
    }
-  else /* Then, check for compose sequences */
+  else
    {
      gboolean success = FALSE;
      GString *output;
@@ -939,12 +795,6 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
                                       &compose_finish, &compose_match,
                                       output))
            {
-              if (!priv->in_compose_sequence)
-                {
-                  priv->in_compose_sequence = TRUE;
-                  g_signal_emit_by_name (context_simple, "preedit-start");
-                }
-
              if (compose_finish)
                {
                  if (compose_match)
@@ -979,12 +829,6 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
                                           &compose_finish, &compose_match,
                                           &output_char))
        {
-          if (!priv->in_compose_sequence)
-            {
-              priv->in_compose_sequence = TRUE;
-              g_signal_emit_by_name (context_simple, "preedit-start");
-            }
-
          if (compose_finish)
            {
              if (compose_match)
@@ -1006,17 +850,8 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,

      if (gtk_check_algorithmically (priv->compose_buffer, n_compose, &output_char))
        {
-          if (!priv->in_compose_sequence)
-            {
-              priv->in_compose_sequence = TRUE;
-              g_signal_emit_by_name (context_simple, "preedit-start");
-            }
-
          if (output_char)
            gtk_im_context_simple_commit_char (context_simple, output_char);
-          else
-            g_signal_emit_by_name (context_simple, "preedit-changed");
-
          return TRUE;
        }
    }
@@ -1063,48 +898,106 @@ gtk_im_context_simple_get_preedit_string (GtkIMContext   *context,
      for (i = 0; priv->compose_buffer[i]; i++)
        g_string_append_unichar (s, gdk_keyval_to_unicode (priv->compose_buffer[i]));
    }
-  else if (priv->in_compose_sequence)
+  else if (priv->tentative_match->len > 0 && priv->compose_buffer[0] != 0)
    {
-      if (priv->tentative_match_len > 0 && priv->compose_buffer[0] != 0)
+       g_string_append (s, priv->tentative_match->str);
+    }
+  else
+    {
+      for (i = 0; priv->compose_buffer[i]; i++)
        {
-           g_string_append (s, priv->tentative_match->str);
-        }
-      else
-        {
-          for (i = 0; priv->compose_buffer[i]; i++)
+          if (priv->compose_buffer[i] == GDK_KEY_Multi_key)
            {
-              if (priv->compose_buffer[i] == GDK_KEY_Multi_key)
+              /* We only show the Compose key visibly when it is the
+               * only glyph in the preedit, or when it occurs in the
+               * middle of the sequence. Sadly, the official character,
+               * U+2384, COMPOSITION SYMBOL, is bit too distracting, so
+               * we use U+00B7, MIDDLE DOT.
+               */
+              if (priv->compose_buffer[1] == 0 || i > 0)
+                g_string_append (s, "·");
+            }
+          else
+            {
+              gunichar ch;
+              gboolean need_space;
+
+              if (GDK_KEY_dead_grave <= priv->compose_buffer[i] && priv->compose_buffer[i] <= GDK_KEY_dead_greek)
                {
-                  /* We only show the Compose key visibly when it is the
-                   * only glyph in the preedit, or when it occurs in the
-                   * middle of the sequence. Sadly, the official character,
-                   * U+2384, COMPOSITION SYMBOL, is bit too distracting, so
-                   * we use U+00B7, MIDDLE DOT.
+                  /* Sadly, not all the dead keysyms have spacing mark equivalents
+                   * in Unicode. For those that don't, we use space + the non-spacing
+                   * mark as an approximation
                   */
-                  if (priv->compose_buffer[1] == 0 || i > 0)
-                    g_string_append (s, "·");
+                  switch (priv->compose_buffer[i])
+                    {
+#define CASE(keysym, unicode, sp) \
+                    case GDK_KEY_dead_##keysym: ch = unicode; need_space = sp; break
+
+                    CASE (grave, 0x60, 0);
+                    CASE (acute, 0xb4, 0);
+                    CASE (circumflex, 0x5e, 0);
+                    CASE (tilde, 0x7e, 0);
+                    CASE (macron, 0xaf, 0);
+                    CASE (breve, 0x2d8, 0);
+                    CASE (abovedot, 0x307, 1);
+                    CASE (diaeresis, 0xa8, 0);
+                    CASE (abovering, 0x2da, 0);
+                    CASE (hook, 0x2c0, 0);
+                    CASE (doubleacute, 0x2dd, 0);
+                    CASE (caron, 0x2c7, 0);
+                    CASE (cedilla, 0xb8, 0);
+                    CASE (ogonek, 0x2db, 0);
+                    CASE (iota, 0x37a, 0);
+                    CASE (voiced_sound, 0x3099, 1);
+                    CASE (semivoiced_sound, 0x309a, 1);
+                    CASE (belowdot, 0x323, 1);
+                    CASE (horn, 0x31b, 1);
+                    CASE (stroke, 0x335, 1);
+                    CASE (abovecomma, 0x2bc, 0);
+                    CASE (abovereversedcomma, 0x2bd, 1);
+                    CASE (doublegrave, 0x30f, 1);
+                    CASE (belowring, 0x2f3, 0);
+                    CASE (belowmacron, 0x2cd, 0);
+                    CASE (belowcircumflex, 0x32d, 1);
+                    CASE (belowtilde, 0x330, 1);
+                    CASE (belowbreve, 0x32e, 1);
+                    CASE (belowdiaeresis, 0x324, 1);
+                    CASE (invertedbreve, 0x32f, 1);
+                    CASE (belowcomma, 0x326, 1);
+                    CASE (lowline, 0x5f, 0);
+                    CASE (aboveverticalline, 0x2c8, 0);
+                    CASE (belowverticalline, 0x2cc, 0);
+                    CASE (longsolidusoverlay, 0x338, 1);
+                    CASE (a, 0x363, 1);
+                    CASE (A, 0x363, 1);
+                    CASE (e, 0x364, 1);
+                    CASE (E, 0x364, 1);
+                    CASE (i, 0x365, 1);
+                    CASE (I, 0x365, 1);
+                    CASE (o, 0x366, 1);
+                    CASE (O, 0x366, 1);
+                    CASE (u, 0x367, 1);
+                    CASE (U, 0x367, 1);
+                    CASE (small_schwa, 0x1dea, 1);
+                    CASE (capital_schwa, 0x1dea, 1);
+#undef CASE
+                    default:
+                      need_space = FALSE;
+                      ch = gdk_keyval_to_unicode (priv->compose_buffer[i]);
+                      break;
+                    }
+                  if (ch)
+                    {
+                      if (need_space)
+                        g_string_append_c (s, ' ');
+                      g_string_append_unichar (s, ch);
+                    }
                }
              else
                {
-                  gunichar ch;
-                  gboolean need_space;
-
-                  if (is_dead_key (priv->compose_buffer[i]))
-                    {
-                      ch = dead_key_to_unicode (priv->compose_buffer[i], &need_space);
-                      if (ch)
-                        {
-                          if (need_space)
-                            g_string_append_c (s, ' ');
-                          g_string_append_unichar (s, ch);
-                        }
-                    }
-                  else
-                    {
-                      ch = gdk_keyval_to_unicode (priv->compose_buffer[i]);
-                      if (ch)
-                        g_string_append_unichar (s, ch);
-                    }
+                  ch = gdk_keyval_to_unicode (priv->compose_buffer[i]);
+                  if (ch)
+                    g_string_append_unichar (s, ch);
                }
            }
        }
@@ -66,35 +66,35 @@

 static const guint16 gtk_compose_seqs_compact[] = {
 GDK_KEY_Greek_accentdieresis, 180, 184, 184, 184, 184, 
-GDK_KEY_dead_grave, 184, 244, 331, 543, 543, 
-GDK_KEY_dead_acute, 543, 605, 701, 977, 977, 
-GDK_KEY_dead_circumflex, 977, 1101, 1101, 1301, 1301, 
-GDK_KEY_dead_tilde, 1301, 1383, 1446, 1586, 1586, 
-GDK_KEY_dead_macron, 1586, 1630, 1648, 1720, 1720, 
-GDK_KEY_dead_breve, 1720, 1768, 1768, 1792, 1792, 
-GDK_KEY_dead_abovedot, 1792, 1820, 1823, 1859, 1859, 
-GDK_KEY_dead_diaeresis, 1859, 1945, 1957, 1981, 1981, 
-GDK_KEY_dead_abovering, 1981, 1989, 1989, 1989, 1989, 
-GDK_KEY_dead_doubleacute, 1989, 1997, 1997, 1997, 1997, 
-GDK_KEY_dead_caron, 1997, 2037, 2037, 2045, 2045, 
-GDK_KEY_dead_cedilla, 2045, 2055, 2061, 2061, 2061, 
-GDK_KEY_dead_ogonek, 2061, 2069, 2069, 2069, 2069, 
-GDK_KEY_dead_iota, 2069, 2089, 2188, 2620, 3280, 
-GDK_KEY_dead_voiced_sound, 3280, 3326, 3326, 3326, 3326, 
-GDK_KEY_dead_semivoiced_sound, 3326, 3336, 3336, 3336, 3336, 
-GDK_KEY_dead_belowdot, 3336, 3352, 3352, 3368, 3368, 
-GDK_KEY_dead_hook, 3368, 3446, 3449, 3505, 3505, 
-GDK_KEY_dead_horn, 3505, 3515, 3515, 3515, 3515, 
-GDK_KEY_dead_stroke, 3515, 3603, 3615, 3615, 3615, 
-GDK_KEY_dead_psili, 3615, 3643, 3643, 3643, 3643, 
-GDK_KEY_dead_dasia, 3643, 3675, 3675, 3675, 3675, 
-GDK_KEY_dead_belowring, 3675, 3677, 3677, 3677, 3677, 
-GDK_KEY_dead_belowtilde, 3677, 3679, 3679, 3679, 3679, 
-GDK_KEY_dead_belowdiaeresis, 3679, 3679, 3682, 3682, 3682, 
-GDK_KEY_dead_belowcomma, 3682, 3696, 3696, 3696, 3696, 
-GDK_KEY_dead_currency, 3696, 3794, 3800, 3800, 3800, 
-GDK_KEY_dead_greek, 3800, 3902, 3926, 3926, 3926, 
-GDK_KEY_Multi_key, 3926, 3926, 10637, 14345, 16220, 
+GDK_KEY_dead_grave, 184, 246, 333, 545, 545, 
+GDK_KEY_dead_acute, 545, 609, 705, 981, 981, 
+GDK_KEY_dead_circumflex, 981, 1105, 1105, 1305, 1305, 
+GDK_KEY_dead_tilde, 1305, 1389, 1452, 1592, 1592, 
+GDK_KEY_dead_macron, 1592, 1638, 1656, 1728, 1728, 
+GDK_KEY_dead_breve, 1728, 1778, 1778, 1802, 1802, 
+GDK_KEY_dead_abovedot, 1802, 1832, 1835, 1871, 1871, 
+GDK_KEY_dead_diaeresis, 1871, 1959, 1971, 1995, 1995, 
+GDK_KEY_dead_abovering, 1995, 2005, 2005, 2005, 2005, 
+GDK_KEY_dead_doubleacute, 2005, 2015, 2015, 2015, 2015, 
+GDK_KEY_dead_caron, 2015, 2057, 2057, 2065, 2065, 
+GDK_KEY_dead_cedilla, 2065, 2077, 2083, 2083, 2083, 
+GDK_KEY_dead_ogonek, 2083, 2093, 2093, 2093, 2093, 
+GDK_KEY_dead_iota, 2093, 2115, 2214, 2646, 3306, 
+GDK_KEY_dead_voiced_sound, 3306, 3352, 3352, 3352, 3352, 
+GDK_KEY_dead_semivoiced_sound, 3352, 3362, 3362, 3362, 3362, 
+GDK_KEY_dead_belowdot, 3362, 3378, 3378, 3394, 3394, 
+GDK_KEY_dead_hook, 3394, 3472, 3475, 3531, 3531, 
+GDK_KEY_dead_horn, 3531, 3541, 3541, 3541, 3541, 
+GDK_KEY_dead_stroke, 3541, 3629, 3641, 3641, 3641, 
+GDK_KEY_dead_psili, 3641, 3669, 3669, 3669, 3669, 
+GDK_KEY_dead_dasia, 3669, 3701, 3701, 3701, 3701, 
+GDK_KEY_dead_belowring, 3701, 3703, 3703, 3703, 3703, 
+GDK_KEY_dead_belowtilde, 3703, 3705, 3705, 3705, 3705, 
+GDK_KEY_dead_belowdiaeresis, 3705, 3705, 3708, 3708, 3708, 
+GDK_KEY_dead_belowcomma, 3708, 3722, 3722, 3722, 3722, 
+GDK_KEY_dead_currency, 3722, 3820, 3826, 3826, 3826, 
+GDK_KEY_dead_greek, 3826, 3928, 3952, 3952, 3952, 
+GDK_KEY_Multi_key, 3952, 3952, 10348, 14044, 15919, 
 GDK_KEY_Greek_iota, 0x0390, 
 GDK_KEY_Greek_upsilon, 0x03B0, 
 GDK_KEY_space, 0x0060, 
@@ -127,6 +127,7 @@ GDK_KEY_Greek_iota, 0x1F76,
 GDK_KEY_Greek_omicron, 0x1F78, 
 GDK_KEY_Greek_upsilon, 0x1F7A, 
 GDK_KEY_Greek_omega, 0x1F7C, 
+GDK_KEY_dead_grave, 0x0060, 
 GDK_KEY_dead_diaeresis, GDK_KEY_Greek_iota, 0x1FD2, 
 GDK_KEY_dead_diaeresis, GDK_KEY_Greek_upsilon, 0x1FE2, 
 GDK_KEY_dead_psili, GDK_KEY_Greek_ALPHA, 0x1F0A, 
@@ -209,7 +210,7 @@ GDK_KEY_Multi_key, GDK_KEY_macron, GDK_KEY_E, 0x1E14,
 GDK_KEY_Multi_key, GDK_KEY_macron, GDK_KEY_O, 0x1E50, 
 GDK_KEY_Multi_key, GDK_KEY_macron, GDK_KEY_e, 0x1E15, 
 GDK_KEY_Multi_key, GDK_KEY_macron, GDK_KEY_o, 0x1E51, 
-GDK_KEY_space, 0x00B4, 
+GDK_KEY_space, 0x0027, 
 GDK_KEY_V, 0x01D7, 
 GDK_KEY_v, 0x01D8, 
 GDK_KEY_nobreakspace, 0x0301, 
@@ -240,6 +241,7 @@ GDK_KEY_Greek_iota, 0x03AF,
 GDK_KEY_Greek_omicron, 0x03CC, 
 GDK_KEY_Greek_upsilon, 0x03CD, 
 GDK_KEY_Greek_omega, 0x03CE, 
+GDK_KEY_dead_acute, 0x00B4, 
 GDK_KEY_dead_diaeresis, GDK_KEY_space, 0x0385, 
 GDK_KEY_dead_diaeresis, GDK_KEY_Greek_iota, 0x0390, 
 GDK_KEY_dead_diaeresis, GDK_KEY_Greek_upsilon, 0x03B0, 
@@ -494,6 +496,7 @@ GDK_KEY_Greek_omega, 0x1FF6,
 0x1F61, 0x1F67, 
 0x1F68, 0x1F6E, 
 0x1F69, 0x1F6F, 
+GDK_KEY_dead_tilde, 0x007E, 
 GDK_KEY_dead_diaeresis, GDK_KEY_Greek_iota, 0x1FD7, 
 GDK_KEY_dead_diaeresis, GDK_KEY_Greek_upsilon, 0x1FE7, 
 GDK_KEY_dead_psili, GDK_KEY_Greek_ALPHA, 0x1F0E, 
@@ -572,6 +575,7 @@ GDK_KEY_Greek_UPSILON, 0x1FE9,
 GDK_KEY_Greek_alpha, 0x1FB1, 
 GDK_KEY_Greek_iota, 0x1FD1, 
 GDK_KEY_Greek_upsilon, 0x1FE1, 
+GDK_KEY_dead_macron, 0x00AF, 
 GDK_KEY_dead_greek, GDK_KEY_A, 0x1FB9, 
 GDK_KEY_dead_greek, GDK_KEY_I, 0x1FD9, 
 GDK_KEY_dead_greek, GDK_KEY_U, 0x1FE9, 
@@ -620,6 +624,7 @@ GDK_KEY_Greek_UPSILON, 0x1FE8,
 GDK_KEY_Greek_alpha, 0x1FB0, 
 GDK_KEY_Greek_iota, 0x1FD0, 
 GDK_KEY_Greek_upsilon, 0x1FE0, 
+GDK_KEY_dead_breve, 0x02D8, 
 GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_A, 0x1EB6, 
 GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_a, 0x1EB7, 
 GDK_KEY_Multi_key, GDK_KEY_comma, GDK_KEY_E, 0x1E1C, 
@@ -640,6 +645,7 @@ GDK_KEY_Amacron, 0x01E0,
 GDK_KEY_Omacron, 0x0230, 
 GDK_KEY_amacron, 0x01E1, 
 GDK_KEY_omacron, 0x0231, 
+GDK_KEY_dead_abovedot, 0x02D9, 
 GDK_KEY_dead_stroke, GDK_KEY_j, 0x025F, 
 GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_S, 0x1E68, 
 GDK_KEY_Multi_key, GDK_KEY_exclam, GDK_KEY_s, 0x1E69, 
@@ -693,6 +699,7 @@ GDK_KEY_Greek_IOTA, 0x03AA,
 GDK_KEY_Greek_UPSILON, 0x03AB, 
 GDK_KEY_Greek_iota, 0x03CA, 
 GDK_KEY_Greek_upsilon, 0x03CB, 
+GDK_KEY_dead_diaeresis, 0x00A8, 
 GDK_KEY_dead_acute, GDK_KEY_space, 0x0385, 
 GDK_KEY_dead_acute, GDK_KEY_Greek_iota, 0x0390, 
 GDK_KEY_dead_acute, GDK_KEY_Greek_upsilon, 0x03B0, 
@@ -707,10 +714,12 @@ GDK_KEY_space, 0x00B0,
 GDK_KEY_nobreakspace, 0x030A, 
 GDK_KEY_Aacute, 0x01FA, 
 GDK_KEY_aacute, 0x01FB, 
+GDK_KEY_dead_abovering, 0x00B0, 
 GDK_KEY_space, 0x02DD, 
 GDK_KEY_nobreakspace, 0x030B, 
 GDK_KEY_Cyrillic_u, 0x04F3, 
 GDK_KEY_Cyrillic_U, 0x04F2, 
+GDK_KEY_dead_doubleacute, 0x02DD, 
 GDK_KEY_space, 0x02C7, 
 GDK_KEY_parenleft, 0x208D, 
 GDK_KEY_parenright, 0x208E, 
@@ -731,6 +740,7 @@ GDK_KEY_V, 0x01D9,
 GDK_KEY_v, 0x01DA, 
 GDK_KEY_nobreakspace, 0x030C, 
 0x01F2, 0x01C5, 
+GDK_KEY_dead_caron, 0x02C7, 
 GDK_KEY_Multi_key, GDK_KEY_quotedbl, GDK_KEY_U, 0x01D9, 
 GDK_KEY_Multi_key, GDK_KEY_quotedbl, GDK_KEY_u, 0x01DA, 
 GDK_KEY_space, 0x00B8, 
@@ -738,12 +748,14 @@ GDK_KEY_nobreakspace, 0x0327,
 GDK_KEY_cent, 0x20B5, 
 GDK_KEY_Cacute, 0x1E08, 
 GDK_KEY_cacute, 0x1E09, 
+GDK_KEY_dead_cedilla, 0x00B8, 
 GDK_KEY_dead_currency, GDK_KEY_C, 0x20B5, 
 GDK_KEY_dead_currency, GDK_KEY_c, 0x20B5, 
 GDK_KEY_space, 0x02DB, 
 GDK_KEY_nobreakspace, 0x0328, 
 GDK_KEY_Omacron, 0x01EC, 
 GDK_KEY_omacron, 0x01ED, 
+GDK_KEY_dead_ogonek, 0x02DB, 
 GDK_KEY_space, 0x037A, 
 GDK_KEY_Greek_alphaaccent, 0x1FB4, 
 GDK_KEY_Greek_etaaccent, 0x1FC4, 
@@ -754,6 +766,7 @@ GDK_KEY_Greek_OMEGA, 0x1FFC,
 GDK_KEY_Greek_alpha, 0x1FB3, 
 GDK_KEY_Greek_eta, 0x1FC3, 
 GDK_KEY_Greek_omega, 0x1FF3, 
+GDK_KEY_dead_iota, 0x037A, 
 GDK_KEY_dead_grave, GDK_KEY_Greek_alpha, 0x1FB2, 
 GDK_KEY_dead_grave, GDK_KEY_Greek_eta, 0x1FC2, 
 GDK_KEY_dead_grave, GDK_KEY_Greek_omega, 0x1FF2, 
@@ -1348,7 +1361,6 @@ GDK_KEY_exclam, GDK_KEY_L, 0x1E36,
 GDK_KEY_exclam, GDK_KEY_M, 0x1E42, 
 GDK_KEY_exclam, GDK_KEY_N, 0x1E46, 
 GDK_KEY_exclam, GDK_KEY_O, 0x1ECC, 
-GDK_KEY_exclam, GDK_KEY_P, 0x00B6, 
 GDK_KEY_exclam, GDK_KEY_R, 0x1E5A, 
 GDK_KEY_exclam, GDK_KEY_S, 0x1E62, 
 GDK_KEY_exclam, GDK_KEY_T, 0x1E6C, 
@@ -1369,7 +1381,6 @@ GDK_KEY_exclam, GDK_KEY_l, 0x1E37,
 GDK_KEY_exclam, GDK_KEY_m, 0x1E43, 
 GDK_KEY_exclam, GDK_KEY_n, 0x1E47, 
 GDK_KEY_exclam, GDK_KEY_o, 0x1ECD, 
-GDK_KEY_exclam, GDK_KEY_p, 0x00B6, 
 GDK_KEY_exclam, GDK_KEY_r, 0x1E5B, 
 GDK_KEY_exclam, GDK_KEY_s, 0x1E63, 
 GDK_KEY_exclam, GDK_KEY_t, 0x1E6D, 
@@ -1565,12 +1576,6 @@ GDK_KEY_apostrophe, 0x2395, 0x235E,
 GDK_KEY_parenleft, GDK_KEY_space, 0x02D8, 
 GDK_KEY_parenleft, GDK_KEY_parenleft, 0x005B, 
 GDK_KEY_parenleft, GDK_KEY_minus, 0x007B, 
-GDK_KEY_parenleft, GDK_KEY_A, 0x0102, 
-GDK_KEY_parenleft, GDK_KEY_G, 0x011E, 
-GDK_KEY_parenleft, GDK_KEY_a, 0x0103, 
-GDK_KEY_parenleft, GDK_KEY_c, 0x00A9, 
-GDK_KEY_parenleft, GDK_KEY_g, 0x011F, 
-GDK_KEY_parenleft, GDK_KEY_r, 0x00AE, 
 GDK_KEY_parenleft, GDK_KEY_Greek_ALPHA, 0x1F09, 
 GDK_KEY_parenleft, GDK_KEY_Greek_EPSILON, 0x1F19, 
 GDK_KEY_parenleft, GDK_KEY_Greek_ETA, 0x1F29, 
@@ -1659,13 +1664,12 @@ GDK_KEY_minus, GDK_KEY_comma, 0x00AC,
 GDK_KEY_minus, GDK_KEY_slash, 0x233F, 
 GDK_KEY_minus, GDK_KEY_colon, 0x00F7, 
 GDK_KEY_minus, GDK_KEY_greater, 0x2192, 
-GDK_KEY_minus, GDK_KEY_A, 0x00C3, 
+GDK_KEY_minus, GDK_KEY_A, 0x0100, 
 GDK_KEY_minus, GDK_KEY_D, 0x0110, 
 GDK_KEY_minus, GDK_KEY_E, 0x0112, 
 GDK_KEY_minus, GDK_KEY_I, 0x012A, 
 GDK_KEY_minus, GDK_KEY_L, 0x00A3, 
-GDK_KEY_minus, GDK_KEY_N, 0x00D1, 
-GDK_KEY_minus, GDK_KEY_O, 0x00D5, 
+GDK_KEY_minus, GDK_KEY_O, 0x014C, 
 GDK_KEY_minus, GDK_KEY_U, 0x016A, 
 GDK_KEY_minus, GDK_KEY_Y, 0x00A5, 
 GDK_KEY_minus, GDK_KEY_backslash, 0x2340, 
@@ -1675,7 +1679,6 @@ GDK_KEY_minus, GDK_KEY_d, 0x0111,
 GDK_KEY_minus, GDK_KEY_e, 0x0113, 
 GDK_KEY_minus, GDK_KEY_i, 0x012B, 
 GDK_KEY_minus, GDK_KEY_l, 0x00A3, 
-GDK_KEY_minus, GDK_KEY_n, 0x00F1, 
 GDK_KEY_minus, GDK_KEY_o, 0x014D, 
 GDK_KEY_minus, GDK_KEY_u, 0x016B, 
 GDK_KEY_minus, GDK_KEY_y, 0x00A5, 
@@ -1749,7 +1752,6 @@ GDK_KEY_slash, GDK_KEY_I, 0x0197,
 GDK_KEY_slash, GDK_KEY_L, 0x0141, 
 GDK_KEY_slash, GDK_KEY_O, 0x00D8, 
 GDK_KEY_slash, GDK_KEY_T, 0x0166, 
-GDK_KEY_slash, GDK_KEY_U, 0x00B5, 
 GDK_KEY_slash, GDK_KEY_Z, 0x01B5, 
 GDK_KEY_slash, GDK_KEY_asciicircum, 0x007C, 
 GDK_KEY_slash, GDK_KEY_b, 0x0180, 
@@ -1778,13 +1780,6 @@ GDK_KEY_slash, 0x2194, 0x21AE,
 GDK_KEY_slash, 0x2395, 0x2341, 
 GDK_KEY_0, GDK_KEY_asterisk, 0x00B0, 
 GDK_KEY_0, GDK_KEY_3, 0x2189, 
-GDK_KEY_0, GDK_KEY_C, 0x00A9, 
-GDK_KEY_0, GDK_KEY_S, 0x00A7, 
-GDK_KEY_0, GDK_KEY_X, 0x00A4, 
-GDK_KEY_0, GDK_KEY_asciicircum, 0x00B0, 
-GDK_KEY_0, GDK_KEY_c, 0x00A9, 
-GDK_KEY_0, GDK_KEY_s, 0x00A7, 
-GDK_KEY_0, GDK_KEY_x, 0x00A4, 
 GDK_KEY_0, GDK_KEY_asciitilde, 0x236C, 
 GDK_KEY_1, GDK_KEY_2, 0x00BD, 
 GDK_KEY_1, GDK_KEY_3, 0x2153, 
@@ -1794,20 +1789,14 @@ GDK_KEY_1, GDK_KEY_6, 0x2159,
 GDK_KEY_1, GDK_KEY_7, 0x2150, 
 GDK_KEY_1, GDK_KEY_8, 0x215B, 
 GDK_KEY_1, GDK_KEY_9, 0x2151, 
-GDK_KEY_1, GDK_KEY_S, 0x00B9, 
 GDK_KEY_1, GDK_KEY_asciicircum, 0x00B9, 
-GDK_KEY_1, GDK_KEY_s, 0x00B9, 
 GDK_KEY_2, GDK_KEY_3, 0x2154, 
 GDK_KEY_2, GDK_KEY_5, 0x2156, 
-GDK_KEY_2, GDK_KEY_S, 0x00B2, 
 GDK_KEY_2, GDK_KEY_asciicircum, 0x00B2, 
-GDK_KEY_2, GDK_KEY_s, 0x00B2, 
 GDK_KEY_3, GDK_KEY_4, 0x00BE, 
 GDK_KEY_3, GDK_KEY_5, 0x2157, 
 GDK_KEY_3, GDK_KEY_8, 0x215C, 
-GDK_KEY_3, GDK_KEY_S, 0x00B3, 
 GDK_KEY_3, GDK_KEY_asciicircum, 0x00B3, 
-GDK_KEY_3, GDK_KEY_s, 0x00B3, 
 GDK_KEY_4, GDK_KEY_5, 0x2158, 
 GDK_KEY_5, GDK_KEY_6, 0x215A, 
 GDK_KEY_5, GDK_KEY_8, 0x215D, 
@@ -1870,8 +1859,6 @@ GDK_KEY_equal, GDK_KEY_E, 0x20AC,
 GDK_KEY_equal, GDK_KEY_L, 0x20A4, 
 GDK_KEY_equal, GDK_KEY_N, 0x20A6, 
 GDK_KEY_equal, GDK_KEY_O, 0x0150, 
-GDK_KEY_equal, GDK_KEY_P, 0x20BD, 
-GDK_KEY_equal, GDK_KEY_R, 0x20B9, 
 GDK_KEY_equal, GDK_KEY_U, 0x0170, 
 GDK_KEY_equal, GDK_KEY_W, 0x20A9, 
 GDK_KEY_equal, GDK_KEY_Y, 0x00A5, 
@@ -1879,19 +1866,14 @@ GDK_KEY_equal, GDK_KEY_underscore, 0x2261,
 GDK_KEY_equal, GDK_KEY_c, 0x20AC, 
 GDK_KEY_equal, GDK_KEY_d, 0x20AB, 
 GDK_KEY_equal, GDK_KEY_e, 0x20AC, 
-GDK_KEY_equal, GDK_KEY_l, 0x00A3, 
 GDK_KEY_equal, GDK_KEY_o, 0x0151, 
-GDK_KEY_equal, GDK_KEY_p, 0x20BD, 
-GDK_KEY_equal, GDK_KEY_r, 0x20B9, 
 GDK_KEY_equal, GDK_KEY_u, 0x0171, 
 GDK_KEY_equal, GDK_KEY_y, 0x00A5, 
 GDK_KEY_equal, 0x0338, 0x2260, 
 GDK_KEY_equal, GDK_KEY_Cyrillic_u, 0x04F3, 
-GDK_KEY_equal, GDK_KEY_Cyrillic_ze, 0x20BD, 
 GDK_KEY_equal, GDK_KEY_Cyrillic_IE, 0x20AC, 
 GDK_KEY_equal, GDK_KEY_Cyrillic_ES, 0x20AC, 
 GDK_KEY_equal, GDK_KEY_Cyrillic_U, 0x04F2, 
-GDK_KEY_equal, GDK_KEY_Cyrillic_ZE, 0x20BD, 
 GDK_KEY_equal, 0x2395, 0x2338, 
 GDK_KEY_greater, GDK_KEY_space, 0x005E, 
 GDK_KEY_greater, GDK_KEY_quotedbl, 0x201D, 
@@ -1941,14 +1923,14 @@ GDK_KEY_A, GDK_KEY_apostrophe, 0x00C1,
 GDK_KEY_A, GDK_KEY_parenleft, 0x0102, 
 GDK_KEY_A, GDK_KEY_asterisk, 0x00C5, 
 GDK_KEY_A, GDK_KEY_comma, 0x0104, 
-GDK_KEY_A, GDK_KEY_minus, 0x00C3, 
+GDK_KEY_A, GDK_KEY_minus, 0x0100, 
 GDK_KEY_A, GDK_KEY_semicolon, 0x0104, 
 GDK_KEY_A, GDK_KEY_greater, 0x00C2, 
 GDK_KEY_A, GDK_KEY_A, 0x00C5, 
 GDK_KEY_A, GDK_KEY_E, 0x00C6, 
 GDK_KEY_A, GDK_KEY_T, 0x0040, 
 GDK_KEY_A, GDK_KEY_asciicircum, 0x00C2, 
-GDK_KEY_A, GDK_KEY_underscore, 0x00AA, 
+GDK_KEY_A, GDK_KEY_underscore, 0x0100, 
 GDK_KEY_A, GDK_KEY_grave, 0x00C0, 
 GDK_KEY_A, GDK_KEY_asciitilde, 0x00C3, 
 GDK_KEY_A, GDK_KEY_diaeresis, 0x00C4, 
@@ -1958,7 +1940,6 @@ GDK_KEY_C, GDK_KEY_apostrophe, 0x0106,
 GDK_KEY_C, GDK_KEY_comma, 0x00C7, 
 GDK_KEY_C, GDK_KEY_period, 0x010A, 
 GDK_KEY_C, GDK_KEY_slash, 0x20A1, 
-GDK_KEY_C, GDK_KEY_0, 0x00A9, 
 GDK_KEY_C, GDK_KEY_less, 0x010C, 
 GDK_KEY_C, GDK_KEY_equal, 0x20AC, 
 GDK_KEY_C, GDK_KEY_E, 0x20A0, 
@@ -1992,9 +1973,7 @@ GDK_KEY_F, GDK_KEY_r, 0x20A3,
 GDK_KEY_G, GDK_KEY_parenleft, 0x011E, 
 GDK_KEY_G, GDK_KEY_comma, 0x0122, 
 GDK_KEY_G, GDK_KEY_period, 0x0120, 
-GDK_KEY_G, GDK_KEY_T, 0x003E, 
 GDK_KEY_G, GDK_KEY_U, 0x011E, 
-GDK_KEY_G, GDK_KEY_u, 0x011E, 
 GDK_KEY_G, GDK_KEY_breve, 0x011E, 
 GDK_KEY_H, GDK_KEY_comma, 0x1E28, 
 GDK_KEY_I, GDK_KEY_quotedbl, 0x00CF, 
@@ -2018,13 +1997,11 @@ GDK_KEY_L, GDK_KEY_comma, 0x013B,
 GDK_KEY_L, GDK_KEY_minus, 0x00A3, 
 GDK_KEY_L, GDK_KEY_slash, 0x0141, 
 GDK_KEY_L, GDK_KEY_less, 0x013D, 
-GDK_KEY_L, GDK_KEY_equal, 0x00A3, 
-GDK_KEY_L, GDK_KEY_T, 0x003C, 
+GDK_KEY_L, GDK_KEY_equal, 0x20A4, 
 GDK_KEY_L, GDK_KEY_V, 0x007C, 
 GDK_KEY_M, GDK_KEY_period, 0x1E40, 
 GDK_KEY_N, GDK_KEY_apostrophe, 0x0143, 
 GDK_KEY_N, GDK_KEY_comma, 0x0145, 
-GDK_KEY_N, GDK_KEY_minus, 0x00D1, 
 GDK_KEY_N, GDK_KEY_less, 0x0147, 
 GDK_KEY_N, GDK_KEY_equal, 0x20A6, 
 GDK_KEY_N, GDK_KEY_G, 0x014A, 
@@ -2034,7 +2011,7 @@ GDK_KEY_N, GDK_KEY_asciitilde, 0x00D1,
 GDK_KEY_O, GDK_KEY_quotedbl, 0x00D6, 
 GDK_KEY_O, GDK_KEY_apostrophe, 0x00D3, 
 GDK_KEY_O, GDK_KEY_comma, 0x01EA, 
-GDK_KEY_O, GDK_KEY_minus, 0x00D5, 
+GDK_KEY_O, GDK_KEY_minus, 0x014C, 
 GDK_KEY_O, GDK_KEY_slash, 0x00D8, 
 GDK_KEY_O, GDK_KEY_semicolon, 0x01EA, 
 GDK_KEY_O, GDK_KEY_greater, 0x00D4, 
@@ -2045,7 +2022,7 @@ GDK_KEY_O, GDK_KEY_R, 0x00AE,
 GDK_KEY_O, GDK_KEY_S, 0x00A7, 
 GDK_KEY_O, GDK_KEY_X, 0x00A4, 
 GDK_KEY_O, GDK_KEY_asciicircum, 0x00D4, 
-GDK_KEY_O, GDK_KEY_underscore, 0x00BA, 
+GDK_KEY_O, GDK_KEY_underscore, 0x014C, 
 GDK_KEY_O, GDK_KEY_grave, 0x00D2, 
 GDK_KEY_O, GDK_KEY_c, 0x00A9, 
 GDK_KEY_O, GDK_KEY_r, 0x00AE, 
@@ -2055,31 +2032,23 @@ GDK_KEY_O, GDK_KEY_diaeresis, 0x00D6,
 GDK_KEY_O, GDK_KEY_acute, 0x00D3, 
 GDK_KEY_P, GDK_KEY_exclam, 0x00B6, 
 GDK_KEY_P, GDK_KEY_period, 0x1E56, 
-GDK_KEY_P, GDK_KEY_equal, 0x20BD, 
 GDK_KEY_P, GDK_KEY_P, 0x00B6, 
 GDK_KEY_P, GDK_KEY_t, 0x20A7, 
 GDK_KEY_R, GDK_KEY_apostrophe, 0x0154, 
 GDK_KEY_R, GDK_KEY_comma, 0x0156, 
 GDK_KEY_R, GDK_KEY_less, 0x0158, 
-GDK_KEY_R, GDK_KEY_equal, 0x20B9, 
 GDK_KEY_R, GDK_KEY_O, 0x00AE, 
-GDK_KEY_R, GDK_KEY_o, 0x00AE, 
 GDK_KEY_R, GDK_KEY_s, 0x20A8, 
 GDK_KEY_S, GDK_KEY_exclam, 0x00A7, 
 GDK_KEY_S, GDK_KEY_apostrophe, 0x015A, 
 GDK_KEY_S, GDK_KEY_comma, 0x015E, 
 GDK_KEY_S, GDK_KEY_period, 0x1E60, 
-GDK_KEY_S, GDK_KEY_0, 0x00A7, 
-GDK_KEY_S, GDK_KEY_1, 0x00B9, 
-GDK_KEY_S, GDK_KEY_2, 0x00B2, 
-GDK_KEY_S, GDK_KEY_3, 0x00B3, 
 GDK_KEY_S, GDK_KEY_semicolon, 0x0218, 
 GDK_KEY_S, GDK_KEY_less, 0x0160, 
 GDK_KEY_S, GDK_KEY_M, 0x2120, 
 GDK_KEY_S, GDK_KEY_O, 0x00A7, 
 GDK_KEY_S, GDK_KEY_S, 0x1E9E, 
 GDK_KEY_S, GDK_KEY_m, 0x2120, 
-GDK_KEY_S, GDK_KEY_cedilla, 0x015E, 
 GDK_KEY_T, GDK_KEY_comma, 0x0162, 
 GDK_KEY_T, GDK_KEY_minus, 0x0166, 
 GDK_KEY_T, GDK_KEY_period, 0x1E6A, 
@@ -2094,7 +2063,6 @@ GDK_KEY_U, GDK_KEY_apostrophe, 0x00DA,
 GDK_KEY_U, GDK_KEY_asterisk, 0x016E, 
 GDK_KEY_U, GDK_KEY_comma, 0x0172, 
 GDK_KEY_U, GDK_KEY_minus, 0x016A, 
-GDK_KEY_U, GDK_KEY_slash, 0x00B5, 
 GDK_KEY_U, GDK_KEY_semicolon, 0x0172, 
 GDK_KEY_U, GDK_KEY_greater, 0x00DB, 
 GDK_KEY_U, GDK_KEY_A, 0x0102, 
@@ -2138,7 +2106,6 @@ GDK_KEY_U, 0x1EA1, 0x1EB7,
 GDK_KEY_V, GDK_KEY_L, 0x007C, 
 GDK_KEY_W, GDK_KEY_equal, 0x20A9, 
 GDK_KEY_W, GDK_KEY_asciicircum, 0x0174, 
-GDK_KEY_X, GDK_KEY_0, 0x00A4, 
 GDK_KEY_X, GDK_KEY_O, 0x00A4, 
 GDK_KEY_X, GDK_KEY_o, 0x00A4, 
 GDK_KEY_Y, GDK_KEY_quotedbl, 0x0178, 
@@ -2187,7 +2154,6 @@ GDK_KEY_asciicircum, GDK_KEY_U, 0x00DB,
 GDK_KEY_asciicircum, GDK_KEY_W, 0x0174, 
 GDK_KEY_asciicircum, GDK_KEY_Y, 0x0176, 
 GDK_KEY_asciicircum, GDK_KEY_Z, 0x1E90, 
-GDK_KEY_asciicircum, GDK_KEY_underscore, 0x00AF, 
 GDK_KEY_asciicircum, GDK_KEY_a, 0x00E2, 
 GDK_KEY_asciicircum, GDK_KEY_c, 0x0109, 
 GDK_KEY_asciicircum, GDK_KEY_e, 0x00EA, 
@@ -2201,7 +2167,6 @@ GDK_KEY_asciicircum, GDK_KEY_u, 0x00FB,
 GDK_KEY_asciicircum, GDK_KEY_w, 0x0175, 
 GDK_KEY_asciicircum, GDK_KEY_y, 0x0177, 
 GDK_KEY_asciicircum, GDK_KEY_z, 0x1E91, 
-GDK_KEY_asciicircum, GDK_KEY_bar, 0x2191, 
 GDK_KEY_asciicircum, 0x1EA0, 0x1EAC, 
 GDK_KEY_asciicircum, 0x1EA1, 0x1EAD, 
 GDK_KEY_asciicircum, 0x1EB8, 0x1EC6, 
@@ -2412,7 +2377,7 @@ GDK_KEY_a, GDK_KEY_minus, 0x0101,
 GDK_KEY_a, GDK_KEY_semicolon, 0x0105, 
 GDK_KEY_a, GDK_KEY_greater, 0x00E2, 
 GDK_KEY_a, GDK_KEY_asciicircum, 0x00E2, 
-GDK_KEY_a, GDK_KEY_underscore, 0x00AA, 
+GDK_KEY_a, GDK_KEY_underscore, 0x0101, 
 GDK_KEY_a, GDK_KEY_grave, 0x00E0, 
 GDK_KEY_a, GDK_KEY_a, 0x00E5, 
 GDK_KEY_a, GDK_KEY_e, 0x00E6, 
@@ -2456,7 +2421,6 @@ GDK_KEY_c, GDK_KEY_apostrophe, 0x0107,
 GDK_KEY_c, GDK_KEY_comma, 0x00E7, 
 GDK_KEY_c, GDK_KEY_period, 0x010B, 
 GDK_KEY_c, GDK_KEY_slash, 0x00A2, 
-GDK_KEY_c, GDK_KEY_0, 0x00A9, 
 GDK_KEY_c, GDK_KEY_less, 0x010D, 
 GDK_KEY_c, GDK_KEY_equal, 0x20AC, 
 GDK_KEY_c, GDK_KEY_A, 0x01CD, 
@@ -2527,8 +2491,6 @@ GDK_KEY_g, GDK_KEY_parenleft, 0x011F,
 GDK_KEY_g, GDK_KEY_comma, 0x0123, 
 GDK_KEY_g, GDK_KEY_period, 0x0121, 
 GDK_KEY_g, GDK_KEY_U, 0x011F, 
-GDK_KEY_g, GDK_KEY_t, 0x003E, 
-GDK_KEY_g, GDK_KEY_u, 0x011F, 
 GDK_KEY_g, GDK_KEY_breve, 0x011F, 
 GDK_KEY_h, GDK_KEY_comma, 0x1E29, 
 GDK_KEY_i, GDK_KEY_quotedbl, 0x00EF, 
@@ -2552,15 +2514,12 @@ GDK_KEY_l, GDK_KEY_comma, 0x013C,
 GDK_KEY_l, GDK_KEY_minus, 0x00A3, 
 GDK_KEY_l, GDK_KEY_slash, 0x0142, 
 GDK_KEY_l, GDK_KEY_less, 0x013E, 
-GDK_KEY_l, GDK_KEY_equal, 0x00A3, 
-GDK_KEY_l, GDK_KEY_t, 0x003C, 
 GDK_KEY_l, GDK_KEY_v, 0x007C, 
 GDK_KEY_m, GDK_KEY_period, 0x1E41, 
 GDK_KEY_m, GDK_KEY_slash, 0x20A5, 
 GDK_KEY_m, GDK_KEY_u, 0x00B5, 
 GDK_KEY_n, GDK_KEY_apostrophe, 0x0144, 
 GDK_KEY_n, GDK_KEY_comma, 0x0146, 
-GDK_KEY_n, GDK_KEY_minus, 0x00F1, 
 GDK_KEY_n, GDK_KEY_less, 0x0148, 
 GDK_KEY_n, GDK_KEY_g, 0x014B, 
 GDK_KEY_n, GDK_KEY_asciitilde, 0x00F1, 
@@ -2577,7 +2536,7 @@ GDK_KEY_o, GDK_KEY_R, 0x00AE,
 GDK_KEY_o, GDK_KEY_U, 0x016E, 
 GDK_KEY_o, GDK_KEY_X, 0x00A4, 
 GDK_KEY_o, GDK_KEY_asciicircum, 0x00F4, 
-GDK_KEY_o, GDK_KEY_underscore, 0x00BA, 
+GDK_KEY_o, GDK_KEY_underscore, 0x014D, 
 GDK_KEY_o, GDK_KEY_grave, 0x00F2, 
 GDK_KEY_o, GDK_KEY_a, 0x00E5, 
 GDK_KEY_o, GDK_KEY_c, 0x00A9, 
@@ -2594,19 +2553,13 @@ GDK_KEY_o, GDK_KEY_diaeresis, 0x00F6,
 GDK_KEY_o, GDK_KEY_acute, 0x00F3, 
 GDK_KEY_p, GDK_KEY_exclam, 0x00B6, 
 GDK_KEY_p, GDK_KEY_period, 0x1E57, 
-GDK_KEY_p, GDK_KEY_equal, 0x20BD, 
 GDK_KEY_r, GDK_KEY_apostrophe, 0x0155, 
 GDK_KEY_r, GDK_KEY_comma, 0x0157, 
 GDK_KEY_r, GDK_KEY_less, 0x0159, 
-GDK_KEY_r, GDK_KEY_equal, 0x20B9, 
 GDK_KEY_s, GDK_KEY_exclam, 0x00A7, 
 GDK_KEY_s, GDK_KEY_apostrophe, 0x015B, 
 GDK_KEY_s, GDK_KEY_comma, 0x015F, 
 GDK_KEY_s, GDK_KEY_period, 0x1E61, 
-GDK_KEY_s, GDK_KEY_0, 0x00A7, 
-GDK_KEY_s, GDK_KEY_1, 0x00B9, 
-GDK_KEY_s, GDK_KEY_2, 0x00B2, 
-GDK_KEY_s, GDK_KEY_3, 0x00B3, 
 GDK_KEY_s, GDK_KEY_semicolon, 0x0219, 
 GDK_KEY_s, GDK_KEY_less, 0x0161, 
 GDK_KEY_s, GDK_KEY_M, 0x2120, 
@@ -2632,59 +2585,20 @@ GDK_KEY_u, GDK_KEY_slash, 0x00B5,
 GDK_KEY_u, GDK_KEY_semicolon, 0x0173, 
 GDK_KEY_u, GDK_KEY_greater, 0x00FB, 
 GDK_KEY_u, GDK_KEY_A, 0x0102, 
-GDK_KEY_u, GDK_KEY_E, 0x0114, 
-GDK_KEY_u, GDK_KEY_G, 0x011E, 
-GDK_KEY_u, GDK_KEY_I, 0x012C, 
-GDK_KEY_u, GDK_KEY_O, 0x014E, 
 GDK_KEY_u, GDK_KEY_U, 0x016C, 
 GDK_KEY_u, GDK_KEY_asciicircum, 0x00FB, 
 GDK_KEY_u, GDK_KEY_underscore, 0x016B, 
 GDK_KEY_u, GDK_KEY_grave, 0x00F9, 
 GDK_KEY_u, GDK_KEY_a, 0x0103, 
-GDK_KEY_u, GDK_KEY_e, 0x0115, 
-GDK_KEY_u, GDK_KEY_g, 0x011F, 
-GDK_KEY_u, GDK_KEY_i, 0x012D, 
-GDK_KEY_u, GDK_KEY_o, 0x014F, 
 GDK_KEY_u, GDK_KEY_u, 0x016D, 
 GDK_KEY_u, GDK_KEY_asciitilde, 0x0169, 
 GDK_KEY_u, GDK_KEY_diaeresis, 0x00FC, 
 GDK_KEY_u, GDK_KEY_acute, 0x00FA, 
 GDK_KEY_v, GDK_KEY_slash, 0x221A, 
-GDK_KEY_v, GDK_KEY_A, 0x01CD, 
-GDK_KEY_v, GDK_KEY_C, 0x010C, 
-GDK_KEY_v, GDK_KEY_D, 0x010E, 
-GDK_KEY_v, GDK_KEY_E, 0x011A, 
-GDK_KEY_v, GDK_KEY_G, 0x01E6, 
-GDK_KEY_v, GDK_KEY_H, 0x021E, 
-GDK_KEY_v, GDK_KEY_I, 0x01CF, 
-GDK_KEY_v, GDK_KEY_K, 0x01E8, 
-GDK_KEY_v, GDK_KEY_N, 0x0147, 
-GDK_KEY_v, GDK_KEY_O, 0x01D1, 
-GDK_KEY_v, GDK_KEY_R, 0x0158, 
-GDK_KEY_v, GDK_KEY_S, 0x0160, 
-GDK_KEY_v, GDK_KEY_T, 0x0164, 
-GDK_KEY_v, GDK_KEY_U, 0x01D3, 
 GDK_KEY_v, GDK_KEY_Z, 0x017D, 
-GDK_KEY_v, GDK_KEY_a, 0x01CE, 
-GDK_KEY_v, GDK_KEY_c, 0x010D, 
-GDK_KEY_v, GDK_KEY_d, 0x010F, 
-GDK_KEY_v, GDK_KEY_e, 0x011B, 
-GDK_KEY_v, GDK_KEY_g, 0x01E7, 
-GDK_KEY_v, GDK_KEY_h, 0x021F, 
-GDK_KEY_v, GDK_KEY_i, 0x01D0, 
-GDK_KEY_v, GDK_KEY_j, 0x01F0, 
-GDK_KEY_v, GDK_KEY_k, 0x01E9, 
 GDK_KEY_v, GDK_KEY_l, 0x007C, 
-GDK_KEY_v, GDK_KEY_n, 0x0148, 
-GDK_KEY_v, GDK_KEY_o, 0x01D2, 
-GDK_KEY_v, GDK_KEY_r, 0x0159, 
-GDK_KEY_v, GDK_KEY_s, 0x0161, 
-GDK_KEY_v, GDK_KEY_t, 0x0165, 
-GDK_KEY_v, GDK_KEY_u, 0x01D4, 
 GDK_KEY_v, GDK_KEY_z, 0x017E, 
-GDK_KEY_v, GDK_KEY_bar, 0x2193, 
 GDK_KEY_w, GDK_KEY_asciicircum, 0x0175, 
-GDK_KEY_x, GDK_KEY_0, 0x00A4, 
 GDK_KEY_x, GDK_KEY_O, 0x00A4, 
 GDK_KEY_x, GDK_KEY_o, 0x00A4, 
 GDK_KEY_x, GDK_KEY_x, 0x00D7, 
@@ -2700,9 +2614,7 @@ GDK_KEY_z, GDK_KEY_period, 0x017C,
 GDK_KEY_z, GDK_KEY_less, 0x017E, 
 GDK_KEY_braceleft, GDK_KEY_braceright, 0x2205, 
 GDK_KEY_bar, GDK_KEY_C, 0x00A2, 
-GDK_KEY_bar, GDK_KEY_asciicircum, 0x2191, 
 GDK_KEY_bar, GDK_KEY_c, 0x00A2, 
-GDK_KEY_bar, GDK_KEY_v, 0x2193, 
 GDK_KEY_bar, GDK_KEY_asciitilde, 0x236D, 
 GDK_KEY_bar, 0x2190, 0x2345, 
 GDK_KEY_bar, 0x2192, 0x2346, 
@@ -2730,7 +2642,6 @@ GDK_KEY_asciitilde, GDK_KEY_u, 0x0169,
 GDK_KEY_asciitilde, GDK_KEY_v, 0x1E7D, 
 GDK_KEY_asciitilde, GDK_KEY_y, 0x1EF9, 
 GDK_KEY_asciitilde, GDK_KEY_bar, 0x236D, 
-GDK_KEY_asciitilde, GDK_KEY_asciitilde, 0x2248, 
 GDK_KEY_asciitilde, GDK_KEY_diaeresis, 0x2368, 
 GDK_KEY_asciitilde, GDK_KEY_Acircumflex, 0x1EAA, 
 GDK_KEY_asciitilde, GDK_KEY_Ecircumflex, 0x1EC4, 
@@ -3016,12 +2927,10 @@ GDK_KEY_breve, GDK_KEY_g, 0x011F,
 0x0654, 0x06D5, 0x06C0, 
 0x0655, GDK_KEY_Arabic_alef, 0x0625, 
 GDK_KEY_Cyrillic_pe, GDK_KEY_Cyrillic_a, 0x00A7, 
-GDK_KEY_Cyrillic_ze, GDK_KEY_equal, 0x20BD, 
 GDK_KEY_Cyrillic_IE, GDK_KEY_equal, 0x20AC, 
 GDK_KEY_Cyrillic_EN, GDK_KEY_Cyrillic_o, 0x2116, 
 GDK_KEY_Cyrillic_EN, GDK_KEY_Cyrillic_O, 0x2116, 
 GDK_KEY_Cyrillic_ES, GDK_KEY_equal, 0x20AC, 
-GDK_KEY_Cyrillic_ZE, GDK_KEY_equal, 0x20BD, 
 GDK_KEY_Greek_ALPHA, GDK_KEY_apostrophe, 0x0386, 
 GDK_KEY_Greek_EPSILON, GDK_KEY_apostrophe, 0x0388, 
 GDK_KEY_Greek_ETA, GDK_KEY_apostrophe, 0x0389, 
@@ -3035,7 +2944,6 @@ GDK_KEY_Greek_alpha, GDK_KEY_apostrophe, 0x03AC,
 GDK_KEY_Greek_epsilon, GDK_KEY_apostrophe, 0x03AD, 
 GDK_KEY_Greek_eta, GDK_KEY_apostrophe, 0x03AE, 
 GDK_KEY_Greek_iota, GDK_KEY_quotedbl, 0x03CA, 
-GDK_KEY_Greek_iota, GDK_KEY_apostrophe, 0x03AF, 
 GDK_KEY_Greek_iota, GDK_KEY_Greek_alphaaccent, 0x1FB4, 
 GDK_KEY_Greek_iota, GDK_KEY_Greek_etaaccent, 0x1FC4, 
 GDK_KEY_Greek_iota, GDK_KEY_Greek_omegaaccent, 0x1FF4, 
@@ -3569,9 +3477,6 @@ GDK_KEY_exclam, GDK_KEY_dead_horn, GDK_KEY_O, 0x1EE2,
 GDK_KEY_exclam, GDK_KEY_dead_horn, GDK_KEY_U, 0x1EF0, 
 GDK_KEY_exclam, GDK_KEY_dead_horn, GDK_KEY_o, 0x1EE3, 
 GDK_KEY_exclam, GDK_KEY_dead_horn, GDK_KEY_u, 0x1EF1, 
-GDK_KEY_quotedbl, GDK_KEY_apostrophe, GDK_KEY_space, 0x0385, 
-GDK_KEY_quotedbl, GDK_KEY_apostrophe, GDK_KEY_Greek_iota, 0x0390, 
-GDK_KEY_quotedbl, GDK_KEY_apostrophe, GDK_KEY_Greek_upsilon, 0x03B0, 
 GDK_KEY_quotedbl, GDK_KEY_underscore, GDK_KEY_U, 0x1E7A, 
 GDK_KEY_quotedbl, GDK_KEY_underscore, GDK_KEY_u, 0x1E7B, 
 GDK_KEY_quotedbl, GDK_KEY_asciitilde, GDK_KEY_O, 0x1E4E, 
@@ -6755,11 +6755,6 @@ emit_activate_link (GtkLabel     *label,
  GtkStateFlags state;

  g_signal_emit (label, signals[ACTIVATE_LINK], 0, link->uri, &handled);
-
-  /* signal handler might have invalidated the layout */
-  if (!priv->layout)
-    return;
-
  if (handled && priv->track_links && !link->visited &&
      priv->select_info && priv->select_info->links)
    {
@@ -1005,7 +1005,9 @@ scrolled_window_drag_update_cb (GtkScrolledWindow *scrolled_window,
  GtkScrolledWindowPrivate *priv = scrolled_window->priv;
  GtkAdjustment *hadjustment;
  GtkAdjustment *vadjustment;
-  gdouble dx, dy;
+  GtkScrollable *child;
+  GtkBorder border;
+  double dx, dy, scale, size;

  gtk_scrolled_window_invalidate_overshoot (scrolled_window);

@@ -1018,10 +1020,25 @@ scrolled_window_drag_update_cb (GtkScrolledWindow *scrolled_window,
                                      GTK_EVENT_SEQUENCE_CLAIMED);
    }

+  child = GTK_SCROLLABLE (gtk_bin_get_child (GTK_BIN (scrolled_window)));
+
  hadjustment = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar));
  if (hadjustment && may_hscroll (scrolled_window))
    {
-      dx = priv->drag_start_x - offset_x;
+      if (child && gtk_widget_get_visible (child))
+        {
+          size = gtk_widget_get_allocated_width (GTK_WIDGET (child));
+          if (gtk_scrollable_get_border (child, &border))
+            size -= border.left + border.right;
+
+          scale = gtk_adjustment_get_page_size (hadjustment) / size;
+        }
+      else
+        {
+          scale = 1.0;
+        }
+
+      dx = priv->drag_start_x - offset_x * scale;
      _gtk_scrolled_window_set_adjustment_value (scrolled_window,
                                                 hadjustment, dx);
    }
@@ -1029,7 +1046,20 @@ scrolled_window_drag_update_cb (GtkScrolledWindow *scrolled_window,
  vadjustment = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar));
  if (vadjustment && may_vscroll (scrolled_window))
    {
-      dy = priv->drag_start_y - offset_y;
+      if (child && gtk_widget_get_visible (child))
+        {
+          size = gtk_widget_get_allocated_height (GTK_WIDGET (child));
+          if (gtk_scrollable_get_border (child, &border))
+            size -= border.top + border.bottom;
+
+          scale = gtk_adjustment_get_page_size (vadjustment) / size;
+        }
+      else
+        {
+          scale = 1.0;
+        }
+
+      dy = priv->drag_start_y - offset_y * scale;
      _gtk_scrolled_window_set_adjustment_value (scrolled_window,
                                                 vadjustment, dy);
    }
@@ -2324,7 +2324,7 @@ popover.background {
  }

  .csd & {
-    $_popover_border: if($variant=='light', transparentize(black, 0.77), transparentize(black, 0.25));
+    $_popover_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1));

    background-clip: padding-box;
    border-color: $_popover_border;
@@ -4556,8 +4556,8 @@ decoration {

  // this needs to be transparent
  // see bug #722563
-  $_wm_border: if($variant=='light', transparentize(black, 0.77), transparentize(black, 0.25));
-  $_wm_border_backdrop: if($variant=='light', transparentize(black, 0.82), transparentize(black, 0.25));
+  $_wm_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1));
+  $_wm_border_backdrop: if($variant=='light', transparentize(black, 0.82), transparentize($borders_color, 0.1));

  box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
              0 0 0 1px $_wm_border; //doing borders with box-shadow
@@ -4598,9 +4598,7 @@ decoration {
  .popup & { box-shadow: none; }

  // server-side decorations as used by mutter
-  // just doing borders, wm draws actual shadows
-  .ssd & { box-shadow: 0 0 0 1px $_wm_border; }
-  .ssd &:backdrop { box-shadow: 0 0 0 1px $_wm_border_backdrop; }
+  .ssd & { box-shadow: 0 0 0 1px $_wm_border; } //just doing borders, wm draws actual shadows

  .csd.popup & {
    border-radius: $menu_radius;
@@ -822,7 +822,7 @@ popover.background { padding: 2px; background-color: #353535; box-shadow: 0 1px

 .csd popover.background, popover.background { border: 1px solid #1b1b1b; border-radius: 9px; }

-.csd popover.background { background-clip: padding-box; border-color: rgba(0, 0, 0, 0.75); }
+.csd popover.background { background-clip: padding-box; border-color: rgba(27, 27, 27, 0.9); }

 popover.background:backdrop { background-color: #353535; box-shadow: none; }

@@ -1834,27 +1834,25 @@ colorchooser .popover.osd { border-radius: 5px; }
 .scale-popup button:hover { background-color: rgba(238, 238, 236, 0.1); border-radius: 5px; }

 /********************** Window Decorations * */
-decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.75); margin: 10px; }
+decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(27, 27, 27, 0.9); margin: 10px; }

-decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.75); transition: 200ms ease-out; }
+decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 27, 27, 0.9); transition: 200ms ease-out; }

 .maximized decoration, .fullscreen decoration { border-radius: 0; box-shadow: none; }

-.tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75), 0 0 0 20px transparent; }
+.tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9), 0 0 0 20px transparent; }

-.tiled decoration:backdrop, .tiled-top decoration:backdrop, .tiled-right decoration:backdrop, .tiled-bottom decoration:backdrop, .tiled-left decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75), 0 0 0 20px transparent; }
+.tiled decoration:backdrop, .tiled-top decoration:backdrop, .tiled-right decoration:backdrop, .tiled-bottom decoration:backdrop, .tiled-left decoration:backdrop { box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9), 0 0 0 20px transparent; }

 .popup decoration { box-shadow: none; }

-.ssd decoration { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75); }
+.ssd decoration { box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9); }

-.ssd decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75); }
-
-.csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.65); }
+.csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 27, 27, 0.8); }

 tooltip.csd decoration { border-radius: 5px; box-shadow: none; }

-messagedialog.csd decoration { border-radius: 8px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.65); }
+messagedialog.csd decoration { border-radius: 8px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 27, 27, 0.8); }

 .solid-csd decoration { margin: 0; padding: 4px; background-color: #1b1b1b; border: solid 1px #1b1b1b; border-radius: 0; box-shadow: inset 0 0 0 3px #2d2d2d, inset 0 1px rgba(238, 238, 236, 0.07); }

@@ -1864,8 +1864,6 @@ decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(

 .ssd decoration { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }

-.ssd decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); }
-
 .csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }

 tooltip.csd decoration { border-radius: 5px; box-shadow: none; }
@@ -902,7 +902,7 @@ popover.background { padding: 2px; background-color: #353535; box-shadow: 0 1px

 .csd popover.background, popover.background { border: 1px solid #686868; border-radius: 9px; }

-.csd popover.background { background-clip: padding-box; border-color: rgba(0, 0, 0, 0.75); }
+.csd popover.background { background-clip: padding-box; border-color: rgba(104, 104, 104, 0.9); }

 popover.background:backdrop { background-color: #353535; box-shadow: none; }

@@ -1914,27 +1914,25 @@ colorchooser .popover.osd { border-radius: 5px; }
 .scale-popup button:hover { background-color: rgba(243, 243, 241, 0.1); border-radius: 5px; }

 /********************** Window Decorations * */
-decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.75); margin: 10px; }
+decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(104, 104, 104, 0.9); margin: 10px; }

-decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.75); transition: 200ms ease-out; }
+decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(104, 104, 104, 0.9); transition: 200ms ease-out; }

 .maximized decoration, .fullscreen decoration { border-radius: 0; box-shadow: none; }

-.tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75), 0 0 0 20px transparent; }
+.tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: 0 0 0 1px rgba(104, 104, 104, 0.9), 0 0 0 20px transparent; }

-.tiled decoration:backdrop, .tiled-top decoration:backdrop, .tiled-right decoration:backdrop, .tiled-bottom decoration:backdrop, .tiled-left decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75), 0 0 0 20px transparent; }
+.tiled decoration:backdrop, .tiled-top decoration:backdrop, .tiled-right decoration:backdrop, .tiled-bottom decoration:backdrop, .tiled-left decoration:backdrop { box-shadow: 0 0 0 1px rgba(104, 104, 104, 0.9), 0 0 0 20px transparent; }

 .popup decoration { box-shadow: none; }

-.ssd decoration { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75); }
+.ssd decoration { box-shadow: 0 0 0 1px rgba(104, 104, 104, 0.9); }

-.ssd decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.75); }
-
-.csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.65); }
+.csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(104, 104, 104, 0.8); }

 tooltip.csd decoration { border-radius: 5px; box-shadow: none; }

-messagedialog.csd decoration { border-radius: 8px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.65); }
+messagedialog.csd decoration { border-radius: 8px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(104, 104, 104, 0.8); }

 .solid-csd decoration { margin: 0; padding: 4px; background-color: #686868; border: solid 1px #686868; border-radius: 0; box-shadow: inset 0 0 0 3px #2d2d2d, inset 0 1px rgba(238, 238, 236, 0.07); }

@@ -1944,8 +1944,6 @@ decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(

 .ssd decoration { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }

-.ssd decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); }
-
 .csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }

 tooltip.csd decoration { border-radius: 5px; box-shadow: none; }
@@ -600,7 +600,6 @@ scan_directory (const gchar *base_path,
 {
  GHashTable *dir_hash;
  GDir *dir;
-  GList *list = NULL, *iterator = NULL;
  const gchar *name;
  gchar *dir_path;
  gboolean dir_added = FALSE;
@@ -618,13 +617,6 @@ scan_directory (const gchar *base_path,

  while ((name = g_dir_read_name (dir)))
    {
-      list = g_list_prepend (list, g_strdup (name));
-    }
-  list = g_list_sort (list, (GCompareFunc) strcmp);
-  for (iterator = list; iterator; iterator = iterator->next)
-    {
-      name = iterator->data;
-
      gchar *path;
      gboolean retval;
      int flags = 0;
@@ -703,7 +695,6 @@ scan_directory (const gchar *base_path,
      g_free (path);
    }

-  g_list_free_full (list, g_free);
  g_dir_close (dir);

  /* Move dir into the big file hash */
@@ -1,5 +1,5 @@
 project('gtk+-3.0', 'c',
-        version: '3.24.28',
+        version: '3.24.26',
        default_options: [
          'buildtype=debugoptimized',
          'warning_level=1'
@@ -52,7 +52,7 @@ gtk_version       = meson.project_version()
 gtk_major_version = gtk_version.split('.')[0].to_int()
 gtk_minor_version = gtk_version.split('.')[1].to_int()
 gtk_micro_version = gtk_version.split('.')[2].to_int()
-gtk_interface_age = 24
+gtk_interface_age = 22
 add_project_arguments('-DGTK_VERSION="@0@"'.format(meson.project_version()), language: 'c')

 add_project_arguments('-D_GNU_SOURCE', language: 'c')
@@ -18,22 +18,22 @@
 # Hendrik Knackstedt <hendrik.knackstedt@t-online.de>, 2011.
 # Christian Kirbach <christian.kirbach@gmail.com>, 2009-2013.
 # Benjamin Steinwender <b@stbe.at>, 2014.
-# Tim Sabsch <tim@sabsch.com>, 2018-2021.
+# Tim Sabsch <tim@sabsch.com>, 2018-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GTK+ master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-06 19:27+0000\n"
-"PO-Revision-Date: 2021-03-06 21:58+0100\n"
-"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
+"POT-Creation-Date: 2020-07-26 19:37+0000\n"
+"PO-Revision-Date: 2020-08-05 05:15+0200\n"
+"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\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: Poedit 2.4.2\n"
+"X-Generator: Poedit 2.3.1\n"

 #: gdk/gdkapplaunchcontext.c:127 gdk/gdkcursor.c:139 gdk/gdkdevicemanager.c:185
 #: gdk/gdkglcontext.c:317 gdk/gdkseat.c:202 gdk/gdkseat.c:203
@@ -894,7 +894,7 @@ msgstr "Der Bildschirm, auf dem dieses Statussymbol angezeigt werden soll"
 msgid "Whether the status icon is visible"
 msgstr "Legt fest, ob das Statussymbol sichtbar sein soll"

-#: gtk/deprecated/gtkstatusicon.c:330 gtk/gtkplug.c:198
+#: gtk/deprecated/gtkstatusicon.c:330 gtk/gtkplug.c:196
 msgid "Embedded"
 msgstr "Eingebettet"

@@ -2926,7 +2926,7 @@ msgstr "Soll ausreichender Platz für jede Zeile im Modell angefordert werden?"
 msgid "Indicator Size"
 msgstr "Indikatorgröße"

-#: gtk/gtkcheckbutton.c:249 gtk/gtkexpander.c:413
+#: gtk/gtkcheckbutton.c:249 gtk/gtkexpander.c:406
 msgid "Indicator Spacing"
 msgstr "Indikatorabstand"

@@ -3004,7 +3004,7 @@ msgstr "Aktuelle Farbe als GdkRGBA"
 msgid "Whether alpha should be shown"
 msgstr "Sollen Transparenzbereiche angezeigt werden?"

-#: gtk/gtkcolorchooserdialog.c:213 gtk/gtkcolorchooserwidget.c:695
+#: gtk/gtkcolorchooserdialog.c:213 gtk/gtkcolorchooserwidget.c:704
 msgid "Show editor"
 msgstr "Editor anzeigen"

@@ -3901,20 +3901,20 @@ msgstr ""
 "Ein Widget, das anstatt der üblichen Ausklapperbeschriftung angezeigt werden "
 "soll"

-#: gtk/gtkexpander.c:366
+#: gtk/gtkexpander.c:359
 msgid "Label fill"
 msgstr "Füllung der Beschriftung"

-#: gtk/gtkexpander.c:367
+#: gtk/gtkexpander.c:360
 msgid "Whether the label widget should fill all available horizontal space"
 msgstr ""
 "Soll das Beschriftungs-Widget allen verfügbaren horizontalen Platz belegen?"

-#: gtk/gtkexpander.c:382
+#: gtk/gtkexpander.c:375
 msgid "Resize toplevel"
 msgstr "Größenänderungsmodus"

-#: gtk/gtkexpander.c:383
+#: gtk/gtkexpander.c:376
 msgid ""
 "Whether the expander will resize the toplevel window upon expanding and "
 "collapsing"
@@ -3922,15 +3922,15 @@ msgstr ""
 "Legt fest, ob der Expander die Größe des Fensters der obersten Ebene beim "
 "Aus- und Einklappen anpasst"

-#: gtk/gtkexpander.c:396 gtk/gtktoolitemgroup.c:1674 gtk/gtktreeview.c:1234
+#: gtk/gtkexpander.c:389 gtk/gtktoolitemgroup.c:1674 gtk/gtktreeview.c:1234
 msgid "Expander Size"
 msgstr "Ausklappergröße"

-#: gtk/gtkexpander.c:397 gtk/gtktoolitemgroup.c:1675 gtk/gtktreeview.c:1235
+#: gtk/gtkexpander.c:390 gtk/gtktoolitemgroup.c:1675 gtk/gtktreeview.c:1235
 msgid "Size of the expander arrow"
 msgstr "Größe des Ausklapppfeils"

-#: gtk/gtkexpander.c:414
+#: gtk/gtkexpander.c:407
 msgid "Spacing around expander arrow"
 msgstr "Freiraum um Ausklapppfeil"

@@ -3968,7 +3968,7 @@ msgstr ""
 "Der momentan zum Auswählen der anzuzeigenden Dateien zu verwendende Filter"

 #: gtk/gtkfilechooser.c:388 gtk/gtkplacessidebar.c:4836
-#: gtk/gtkplacesview.c:2336
+#: gtk/gtkplacesview.c:2322
 msgid "Local Only"
 msgstr "Nur lokal"

@@ -5733,11 +5733,11 @@ msgstr "Zu wählender Ort"
 msgid "The location to highlight in the sidebar"
 msgstr "Der in der Seitenleiste hervorzuhebende Ort"

-#: gtk/gtkplacessidebar.c:4805 gtk/gtkplacesview.c:2357
+#: gtk/gtkplacessidebar.c:4805 gtk/gtkplacesview.c:2343
 msgid "Open Flags"
 msgstr "Offene Schalter"

-#: gtk/gtkplacessidebar.c:4806 gtk/gtkplacesview.c:2358
+#: gtk/gtkplacessidebar.c:4806 gtk/gtkplacesview.c:2344
 msgid ""
 "Modes in which the calling application can open locations selected in the "
 "sidebar"
@@ -5788,7 +5788,7 @@ msgstr ""
 "Legt fest, ob die Seitenleiste einen eingebauten Link zur manuellen "
 "Ortsangabe enthält"

-#: gtk/gtkplacessidebar.c:4837 gtk/gtkplacesview.c:2337
+#: gtk/gtkplacessidebar.c:4837 gtk/gtkplacesview.c:2323
 msgid "Whether the sidebar only includes local files"
 msgstr "Legt fest, ob die Seitenleiste nur lokale Dateien enthalten soll"

@@ -5811,15 +5811,15 @@ msgid "Whether the sidebar includes an item to show external locations"
 msgstr ""
 "Legt fest, ob die Seitenleiste ein Objekt zum Anzeigen externer Orte enthält"

-# Ich bin mir recht sicher, dass hier das Anführungszeichen in der Originalübersetzung falsch ist und hinter "Starred" stehen sollte. Es geht hier darum, ob eine Seitenleiste das Item "Starred" enthalten soll
 #: gtk/gtkplacessidebar.c:4854
 msgid "Show “Starred Location”"
-msgstr "»Favoriten« anzeigen"
+msgstr "»Mit Stern markierten Ort« anzeigen"

 #: gtk/gtkplacessidebar.c:4855
 msgid "Whether the sidebar includes an item to show starred files"
 msgstr ""
-"Legt fest, ob die Seitenleiste ein Objekt zum Anzeigen der Favoriten enthält"
+"Legt fest, ob die Seitenleiste ein Objekt zum Anzeigen mit Stern markierter "
+"Orte enthält"

 # GTK+ Ereignisse
 #: gtk/gtkplacessidebar.c:4871
@@ -5828,19 +5828,19 @@ msgstr ""
 "Legt fest, ob ::populate-popup für Einblendfenster gesendet werden soll, die "
 "keine Menüs sind"

-#: gtk/gtkplacesview.c:2343
+#: gtk/gtkplacesview.c:2329
 msgid "Loading"
 msgstr "Laden"

-#: gtk/gtkplacesview.c:2344
+#: gtk/gtkplacesview.c:2330
 msgid "Whether the view is loading locations"
 msgstr "Gibt an, ob die Ansicht Orte lädt"

-#: gtk/gtkplacesview.c:2350
+#: gtk/gtkplacesview.c:2336
 msgid "Fetching networks"
 msgstr "Netzwerke werden eingelesen"

-#: gtk/gtkplacesview.c:2351
+#: gtk/gtkplacesview.c:2337
 msgid "Whether the view is fetching networks"
 msgstr "Gibt an, ob die Ansicht Netzwerke einliest"

@@ -5896,15 +5896,15 @@ msgstr "Die Datei, die durch die Zeile dargestellt wird, falls vorhanden"
 msgid "Whether the row represents a network location"
 msgstr "Gibt an, ob die Zeile einen Netzwerkort darstellt"

-#: gtk/gtkplug.c:199
+#: gtk/gtkplug.c:197
 msgid "Whether the plug is embedded"
 msgstr "Legt fest, ob der Plug eingebettet ist"

-#: gtk/gtkplug.c:213
+#: gtk/gtkplug.c:211
 msgid "Socket Window"
 msgstr "Socket-Fenster"

-#: gtk/gtkplug.c:214
+#: gtk/gtkplug.c:212
 msgid "The window of the socket the plug is embedded in"
 msgstr "Das Fenster des Sockets, in den der Plug eingebettet ist"

@@ -6757,51 +6757,51 @@ msgstr ""
 "Einen zweiten Vorwärtspfeil am gegenüber liegenden Ende der Bildlaufleiste "
 "anzeigen"

-#: gtk/gtkscrolledwindow.c:567
+#: gtk/gtkscrolledwindow.c:569
 msgid "Horizontal Adjustment"
 msgstr "Horizontale Stellgröße"

-#: gtk/gtkscrolledwindow.c:568
+#: gtk/gtkscrolledwindow.c:570
 msgid "The GtkAdjustment for the horizontal position"
 msgstr "Das GtkAdjustment für die horizontale Position"

-#: gtk/gtkscrolledwindow.c:574
+#: gtk/gtkscrolledwindow.c:576
 msgid "Vertical Adjustment"
 msgstr "Vertikale Stellgröße"

-#: gtk/gtkscrolledwindow.c:575
+#: gtk/gtkscrolledwindow.c:577
 msgid "The GtkAdjustment for the vertical position"
 msgstr "Das GtkAdjustment für die vertikale Position"

-#: gtk/gtkscrolledwindow.c:581
+#: gtk/gtkscrolledwindow.c:583
 msgid "Horizontal Scrollbar Policy"
 msgstr "Horizontale Bildlaufleistenrichtlinie"

-#: gtk/gtkscrolledwindow.c:582
+#: gtk/gtkscrolledwindow.c:584
 msgid "When the horizontal scrollbar is displayed"
 msgstr "Wann soll die horizontale Bildlaufleiste angezeigt werden?"

-#: gtk/gtkscrolledwindow.c:589
+#: gtk/gtkscrolledwindow.c:591
 msgid "Vertical Scrollbar Policy"
 msgstr "Vertikale Bildlaufleistenrichtlinie"

-#: gtk/gtkscrolledwindow.c:590
+#: gtk/gtkscrolledwindow.c:592
 msgid "When the vertical scrollbar is displayed"
 msgstr "Wann soll die vertikale Bildlaufleiste angezeigt werden?"

-#: gtk/gtkscrolledwindow.c:597
+#: gtk/gtkscrolledwindow.c:599
 msgid "Window Placement"
 msgstr "Fensterplatzierung"

-#: gtk/gtkscrolledwindow.c:598
+#: gtk/gtkscrolledwindow.c:600
 msgid "Where the contents are located with respect to the scrollbars."
 msgstr "Wo soll der Inhalt im Verhältnis zu den Bildlaufleisten liegen."

-#: gtk/gtkscrolledwindow.c:616
+#: gtk/gtkscrolledwindow.c:618
 msgid "Window Placement Set"
 msgstr "Fensterplatzierung aktiviert"

-#: gtk/gtkscrolledwindow.c:617
+#: gtk/gtkscrolledwindow.c:619
 msgid ""
 "Whether \"window-placement\" should be used to determine the location of the "
 "contents with respect to the scrollbars."
@@ -6809,87 +6809,87 @@ msgstr ""
 "Legt fest, ob »window-placement« verwendet wird um die Position des Inhalts "
 "im Verhältnis zu den Bildlaufleisten zu bestimmen."

-#: gtk/gtkscrolledwindow.c:623 gtk/gtkspinbutton.c:455
+#: gtk/gtkscrolledwindow.c:625 gtk/gtkspinbutton.c:455
 msgid "Shadow Type"
 msgstr "Schattentyp"

-#: gtk/gtkscrolledwindow.c:624
+#: gtk/gtkscrolledwindow.c:626
 msgid "Style of bevel around the contents"
 msgstr "Der Stil der Fase um den Inhalt"

-#: gtk/gtkscrolledwindow.c:640
+#: gtk/gtkscrolledwindow.c:642
 msgid "Scrollbars within bevel"
 msgstr "Bildlaufleisten innerhalb der Fase"

-#: gtk/gtkscrolledwindow.c:641
+#: gtk/gtkscrolledwindow.c:643
 msgid "Place scrollbars within the scrolled window's bevel"
 msgstr "Bildlaufleisten innerhalb der Fase des Fensters platzieren"

-#: gtk/gtkscrolledwindow.c:647
+#: gtk/gtkscrolledwindow.c:649
 msgid "Scrollbar spacing"
 msgstr "Abstand der Bildlaufleisten"

-#: gtk/gtkscrolledwindow.c:648
+#: gtk/gtkscrolledwindow.c:650
 msgid "Number of pixels between the scrollbars and the scrolled window"
 msgstr ""
 "Die Anzahl der Pixel zwischen den Bildlaufleisten und dem verschobenen "
 "Fenster"

-#: gtk/gtkscrolledwindow.c:663
+#: gtk/gtkscrolledwindow.c:665
 msgid "Minimum Content Width"
 msgstr "Minimale Breite des Inhalts"

-#: gtk/gtkscrolledwindow.c:664
+#: gtk/gtkscrolledwindow.c:666
 msgid "The minimum width that the scrolled window will allocate to its content"
 msgstr "Die minimale Breite, die das rollbare Fenster seinem Inhalt zuweist"

-#: gtk/gtkscrolledwindow.c:677
+#: gtk/gtkscrolledwindow.c:679
 msgid "Minimum Content Height"
 msgstr "Minimale Höhe des Inhalts"

-#: gtk/gtkscrolledwindow.c:678
+#: gtk/gtkscrolledwindow.c:680
 msgid ""
 "The minimum height that the scrolled window will allocate to its content"
 msgstr "Die minimale Höhe, die das rollbare Fenster seinem Inhalt zuweist"

-#: gtk/gtkscrolledwindow.c:692
+#: gtk/gtkscrolledwindow.c:694
 msgid "Kinetic Scrolling"
 msgstr "Kinetisches Rollen"

-#: gtk/gtkscrolledwindow.c:693
+#: gtk/gtkscrolledwindow.c:695
 msgid "Kinetic scrolling mode."
 msgstr "Kinetischer Rollmodus."

-#: gtk/gtkscrolledwindow.c:712
+#: gtk/gtkscrolledwindow.c:714
 msgid "Overlay Scrolling"
 msgstr "Überlagerndes Rollen"

-#: gtk/gtkscrolledwindow.c:713
+#: gtk/gtkscrolledwindow.c:715
 msgid "Overlay scrolling mode"
 msgstr "Überlagernder Rollmodus"

-#: gtk/gtkscrolledwindow.c:726
+#: gtk/gtkscrolledwindow.c:728
 msgid "Maximum Content Width"
 msgstr "Maximale Breite des Inhalts"

-#: gtk/gtkscrolledwindow.c:727
+#: gtk/gtkscrolledwindow.c:729
 msgid "The maximum width that the scrolled window will allocate to its content"
 msgstr "Die maximale Breite, die das rollbare Fenster seinem Inhalt zuweist"

-#: gtk/gtkscrolledwindow.c:740
+#: gtk/gtkscrolledwindow.c:742
 msgid "Maximum Content Height"
 msgstr "Maximale Höhe des Inhalts"

-#: gtk/gtkscrolledwindow.c:741
+#: gtk/gtkscrolledwindow.c:743
 msgid ""
 "The maximum height that the scrolled window will allocate to its content"
 msgstr "Die maximale Höhe, die das rollbare Fenster seinem Inhalt zuweist"

-#: gtk/gtkscrolledwindow.c:758 gtk/gtkscrolledwindow.c:759
+#: gtk/gtkscrolledwindow.c:760 gtk/gtkscrolledwindow.c:761
 msgid "Propagate Natural Width"
 msgstr "Übertragung der natürlichen Breite"

-#: gtk/gtkscrolledwindow.c:776 gtk/gtkscrolledwindow.c:777
+#: gtk/gtkscrolledwindow.c:778 gtk/gtkscrolledwindow.c:779
 msgid "Propagate Natural Height"
 msgstr "Übertragung der natürlichen Höhe"

@@ -34,8 +34,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GTK+ master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-05 23:04+0000\n"
-"PO-Revision-Date: 2021-03-06 18:49+0100\n"
+"POT-Creation-Date: 2020-10-30 02:24+0000\n"
+"PO-Revision-Date: 2020-11-01 15:00+0100\n"
 "Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -43,7 +43,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Poedit 2.4.1\n"

 #: gdk/broadway/gdkbroadway-server.c:144
 #, c-format
@@ -99,7 +99,7 @@ msgstr "Zu übergebende GDK-Fehlerdiagnoseoptionen"
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
-#: gdk/gdk.c:241 gdk/gdk.c:244 gtk/gtkmain.c:469 gtk/gtkmain.c:472
+#: gdk/gdk.c:241 gdk/gdk.c:244 gtk/gtkmain.c:471 gtk/gtkmain.c:474
 msgid "FLAGS"
 msgstr "OPTIONEN"

@@ -498,19 +498,19 @@ msgid "Unable to create a GL pixel format"
 msgstr "GL-Pixelformat kann nicht angelegt werden"

 #: gdk/quartz/gdkglcontext-quartz.c:133 gdk/wayland/gdkglcontext-wayland.c:208
-#: gdk/win32/gdkglcontext-win32.c:1089 gdk/win32/gdkglcontext-win32.c:1129
+#: gdk/win32/gdkglcontext-win32.c:1072 gdk/win32/gdkglcontext-win32.c:1112
 #: gdk/x11/gdkglcontext-x11.c:724 gdk/x11/gdkglcontext-x11.c:774
 msgid "Unable to create a GL context"
 msgstr "GL-Kontext kann nicht erstellt werden"

 #: gdk/wayland/gdkglcontext-wayland.c:418
-#: gdk/wayland/gdkglcontext-wayland.c:428 gdk/win32/gdkglcontext-win32.c:927
-#: gdk/win32/gdkglcontext-win32.c:937 gdk/win32/gdkglcontext-win32.c:1054
+#: gdk/wayland/gdkglcontext-wayland.c:428 gdk/win32/gdkglcontext-win32.c:910
+#: gdk/win32/gdkglcontext-win32.c:920 gdk/win32/gdkglcontext-win32.c:1037
 #: gdk/x11/gdkglcontext-x11.c:975
 msgid "No available configurations for the given pixel format"
 msgstr "Es sind keine Einstellungen für das angegebene Pixelformat vorhanden"

-#: gdk/wayland/gdkglcontext-wayland.c:468 gdk/win32/gdkglcontext-win32.c:1196
+#: gdk/wayland/gdkglcontext-wayland.c:468 gdk/win32/gdkglcontext-win32.c:1179
 #: gdk/x11/gdkglcontext-x11.c:1281
 msgid "No GL implementation is available"
 msgstr "Es ist keine GL-Implementierung verfügbar"
@@ -2976,40 +2976,40 @@ msgstr ""
 "Bitte kontaktieren Sie Ihren Systemadministrator für Hilfe."

 #. Description of --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:462
+#: gtk/gtkmain.c:464
 msgid "Load additional GTK+ modules"
 msgstr "Zusätzliche GTK+-Module laden"

 #. Placeholder in --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:463
+#: gtk/gtkmain.c:465
 msgid "MODULES"
 msgstr "MODULE"

 #. Description of --g-fatal-warnings in --help output
-#: gtk/gtkmain.c:465
+#: gtk/gtkmain.c:467
 msgid "Make all warnings fatal"
 msgstr "Alle Warnungen als fatal betrachten"

 #. Description of --gtk-debug=FLAGS in --help output
-#: gtk/gtkmain.c:468
+#: gtk/gtkmain.c:470
 msgid "GTK+ debugging flags to set"
 msgstr "Zu übergebende GTK+-Fehlerdiagnoseoptionen"

 #. Description of --gtk-no-debug=FLAGS in --help output
-#: gtk/gtkmain.c:471
+#: gtk/gtkmain.c:473
 msgid "GTK+ debugging flags to unset"
 msgstr "Nicht zu übergebende GTK+-Fehlerdiagnoseoptionen"

-#: gtk/gtkmain.c:811 gtk/gtkmain.c:1005
+#: gtk/gtkmain.c:810 gtk/gtkmain.c:1004
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "Anzeige kann nicht geöffnet werden: %s"

-#: gtk/gtkmain.c:923
+#: gtk/gtkmain.c:922
 msgid "GTK+ Options"
 msgstr "GTK+-Optionen"

-#: gtk/gtkmain.c:923
+#: gtk/gtkmain.c:922
 msgid "Show GTK+ Options"
 msgstr "GTK+-Optionen anzeigen"

@@ -3018,7 +3018,7 @@ msgstr "GTK+-Optionen anzeigen"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: gtk/gtkmain.c:1276
+#: gtk/gtkmain.c:1275
 msgid "default:LTR"
 msgstr "default:LTR"

@@ -3195,7 +3195,7 @@ msgstr "Zuletzt verwendete Dateien"

 #: gtk/gtkplacessidebar.c:1082
 msgid "Starred"
-msgstr "Favoriten"
+msgstr "Mit Stern markiert"

 #. TODO: Rename to 'Starred files'
 #: gtk/gtkplacessidebar.c:1085
@@ -3615,7 +3615,7 @@ msgstr "Kein Papier mehr"

 #. Translators: this is a printer status.
 #: gtk/gtkprintoperation-win32.c:635
-#: modules/printbackends/cups/gtkprintbackendcups.c:2672
+#: modules/printbackends/cups/gtkprintbackendcups.c:2624
 msgid "Paused"
 msgstr "Pausiert"

@@ -3683,42 +3683,42 @@ msgstr "Informationen über Drucker werden geholt …"
 #. * multiple pages on a sheet when printing
 #.
 #: gtk/gtkprintunixdialog.c:3120
-#: modules/printbackends/cups/gtkprintbackendcups.c:5698
+#: modules/printbackends/cups/gtkprintbackendcups.c:5493
 msgid "Left to right, top to bottom"
 msgstr "Links nach rechts, oben nach unten"

 #: gtk/gtkprintunixdialog.c:3120
-#: modules/printbackends/cups/gtkprintbackendcups.c:5698
+#: modules/printbackends/cups/gtkprintbackendcups.c:5493
 msgid "Left to right, bottom to top"
 msgstr "Links nach rechts, unten nach oben"

 #: gtk/gtkprintunixdialog.c:3121
-#: modules/printbackends/cups/gtkprintbackendcups.c:5699
+#: modules/printbackends/cups/gtkprintbackendcups.c:5494
 msgid "Right to left, top to bottom"
 msgstr "Rechts nach links, oben nach unten"

 #: gtk/gtkprintunixdialog.c:3121
-#: modules/printbackends/cups/gtkprintbackendcups.c:5699
+#: modules/printbackends/cups/gtkprintbackendcups.c:5494
 msgid "Right to left, bottom to top"
 msgstr "Rechts nach links, unten nach oben"

 #: gtk/gtkprintunixdialog.c:3122
-#: modules/printbackends/cups/gtkprintbackendcups.c:5700
+#: modules/printbackends/cups/gtkprintbackendcups.c:5495
 msgid "Top to bottom, left to right"
 msgstr "Oben nach unten, links nach rechts"

 #: gtk/gtkprintunixdialog.c:3122
-#: modules/printbackends/cups/gtkprintbackendcups.c:5700
+#: modules/printbackends/cups/gtkprintbackendcups.c:5495
 msgid "Top to bottom, right to left"
 msgstr "Oben nach unten, rechts nach links"

 #: gtk/gtkprintunixdialog.c:3123
-#: modules/printbackends/cups/gtkprintbackendcups.c:5701
+#: modules/printbackends/cups/gtkprintbackendcups.c:5496
 msgid "Bottom to top, left to right"
 msgstr "Unten nach oben, links nach rechts"

 #: gtk/gtkprintunixdialog.c:3123
-#: modules/printbackends/cups/gtkprintbackendcups.c:5701
+#: modules/printbackends/cups/gtkprintbackendcups.c:5496
 msgid "Bottom to top, right to left"
 msgstr "Unten nach oben, rechts nach links"

@@ -7870,399 +7870,399 @@ msgstr "Verschollen"
 msgid "Pages per _sheet:"
 msgstr "Seiten pro _Blatt:"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1153
-#: modules/printbackends/cups/gtkprintbackendcups.c:1462
+#: modules/printbackends/cups/gtkprintbackendcups.c:1129
+#: modules/printbackends/cups/gtkprintbackendcups.c:1438
 msgid "Username:"
 msgstr "Benutzername:"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1154
-#: modules/printbackends/cups/gtkprintbackendcups.c:1471
+#: modules/printbackends/cups/gtkprintbackendcups.c:1130
+#: modules/printbackends/cups/gtkprintbackendcups.c:1447
 msgid "Password:"
 msgstr "Passwort:"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1193
-#: modules/printbackends/cups/gtkprintbackendcups.c:1484
+#: modules/printbackends/cups/gtkprintbackendcups.c:1169
+#: modules/printbackends/cups/gtkprintbackendcups.c:1460
 #, c-format
 msgid "Authentication is required to print document “%s” on printer %s"
 msgstr "Das Drucken des Dokuments »%s« auf Drucker %s erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1195
+#: modules/printbackends/cups/gtkprintbackendcups.c:1171
 #, c-format
 msgid "Authentication is required to print a document on %s"
 msgstr "Das Drucken eines Dokuments auf %s erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1199
+#: modules/printbackends/cups/gtkprintbackendcups.c:1175
 #, c-format
 msgid "Authentication is required to get attributes of job “%s”"
 msgstr ""
 "Das Auslesen von Attributen des Druckauftrags »%s« erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1201
+#: modules/printbackends/cups/gtkprintbackendcups.c:1177
 msgid "Authentication is required to get attributes of a job"
 msgstr "Das Auslesen von Attributen eines Druckauftrags erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1205
+#: modules/printbackends/cups/gtkprintbackendcups.c:1181
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
 msgstr "Das Auslesen von Attributen des Druckers %s erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1207
+#: modules/printbackends/cups/gtkprintbackendcups.c:1183
 msgid "Authentication is required to get attributes of a printer"
 msgstr "Das Auslesen von Attributen eines Druckers erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1210
+#: modules/printbackends/cups/gtkprintbackendcups.c:1186
 #, c-format
 msgid "Authentication is required to get default printer of %s"
 msgstr "Das Feststellen des Vorgabedruckers auf %s erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1213
+#: modules/printbackends/cups/gtkprintbackendcups.c:1189
 #, c-format
 msgid "Authentication is required to get printers from %s"
 msgstr "Das Auslesen von Druckern auf %s erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1218
+#: modules/printbackends/cups/gtkprintbackendcups.c:1194
 #, c-format
 msgid "Authentication is required to get a file from %s"
 msgstr "Der Zugriff auf eine Datei von %s erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1220
+#: modules/printbackends/cups/gtkprintbackendcups.c:1196
 #, c-format
 msgid "Authentication is required on %s"
 msgstr "Der Zugriff auf %s erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1456
+#: modules/printbackends/cups/gtkprintbackendcups.c:1432
 msgid "Domain:"
 msgstr "Domäne:"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1486
+#: modules/printbackends/cups/gtkprintbackendcups.c:1462
 #, c-format
 msgid "Authentication is required to print document “%s”"
 msgstr "Das Drucken des Dokuments »%s« erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1491
+#: modules/printbackends/cups/gtkprintbackendcups.c:1467
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
 msgstr "Das Drucken dieses Dokuments auf Drucker %s erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:1493
+#: modules/printbackends/cups/gtkprintbackendcups.c:1469
 msgid "Authentication is required to print this document"
 msgstr "Das Drucken dieses Dokuments erfordert Legitimation"

-#: modules/printbackends/cups/gtkprintbackendcups.c:2601
+#: modules/printbackends/cups/gtkprintbackendcups.c:2553
 #, c-format
 msgid "Printer “%s” is low on toner."
 msgstr "Drucker »%s« hat nur noch wenig Toner."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2605
+#: modules/printbackends/cups/gtkprintbackendcups.c:2557
 #, c-format
 msgid "Printer “%s” has no toner left."
 msgstr "Drucker »%s« hat keinen Toner mehr."

 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:2610
+#: modules/printbackends/cups/gtkprintbackendcups.c:2562
 #, c-format
 msgid "Printer “%s” is low on developer."
 msgstr "Drucker »%s« hat nur noch wenig Entwickler."

 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:2615
+#: modules/printbackends/cups/gtkprintbackendcups.c:2567
 #, c-format
 msgid "Printer “%s” is out of developer."
 msgstr "Drucker »%s« hat keinen Entwickler mehr."

 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:2620
+#: modules/printbackends/cups/gtkprintbackendcups.c:2572
 #, c-format
 msgid "Printer “%s” is low on at least one marker supply."
 msgstr ""
 "Drucker »%s« hat nur noch wenig Farbe in mindestens einem Farbbehälter."

 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:2625
+#: modules/printbackends/cups/gtkprintbackendcups.c:2577
 #, c-format
 msgid "Printer “%s” is out of at least one marker supply."
 msgstr "Drucker »%s« hat keine Farbe mehr in mindestens einem Farbbehälter."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2629
+#: modules/printbackends/cups/gtkprintbackendcups.c:2581
 #, c-format
 msgid "The cover is open on printer “%s”."
 msgstr "Die Abdeckung des Druckers »%s« ist offen."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2633
+#: modules/printbackends/cups/gtkprintbackendcups.c:2585
 #, c-format
 msgid "The door is open on printer “%s”."
 msgstr "Die Klappe des Druckers »%s« ist offen."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2637
+#: modules/printbackends/cups/gtkprintbackendcups.c:2589
 #, c-format
 msgid "Printer “%s” is low on paper."
 msgstr "Der Drucker »%s« hat nur noch wenig Papier."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2641
+#: modules/printbackends/cups/gtkprintbackendcups.c:2593
 #, c-format
 msgid "Printer “%s” is out of paper."
 msgstr "Der Drucker »%s« hat kein Papier mehr."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2645
+#: modules/printbackends/cups/gtkprintbackendcups.c:2597
 #, c-format
 msgid "Printer “%s” is currently offline."
 msgstr "Der Drucker »%s« ist momentan nicht betriebsbereit."

-#: modules/printbackends/cups/gtkprintbackendcups.c:2649
+#: modules/printbackends/cups/gtkprintbackendcups.c:2601
 #, c-format
 msgid "There is a problem on printer “%s”."
 msgstr "Es besteht ein Problem mit dem Drucker »%s«."

 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2669
+#: modules/printbackends/cups/gtkprintbackendcups.c:2621
 msgid "Paused; Rejecting Jobs"
 msgstr "Pausiert; Aufträge werden abgewiesen"

 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2675
+#: modules/printbackends/cups/gtkprintbackendcups.c:2627
 msgid "Rejecting Jobs"
 msgstr "Aufträge werden abgewiesen"

 #. Translators: this string connects multiple printer states together.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2716
+#: modules/printbackends/cups/gtkprintbackendcups.c:2668
 msgid "; "
 msgstr "; "

-#: modules/printbackends/cups/gtkprintbackendcups.c:4644
-#: modules/printbackends/cups/gtkprintbackendcups.c:4711
+#: modules/printbackends/cups/gtkprintbackendcups.c:4439
+#: modules/printbackends/cups/gtkprintbackendcups.c:4506
 msgctxt "printing option"
 msgid "Two Sided"
 msgstr "Beidseitig"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4645
+#: modules/printbackends/cups/gtkprintbackendcups.c:4440
 msgctxt "printing option"
 msgid "Paper Type"
 msgstr "Papierart"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4646
+#: modules/printbackends/cups/gtkprintbackendcups.c:4441
 msgctxt "printing option"
 msgid "Paper Source"
 msgstr "Papiereinzug"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4647
-#: modules/printbackends/cups/gtkprintbackendcups.c:4712
+#: modules/printbackends/cups/gtkprintbackendcups.c:4442
+#: modules/printbackends/cups/gtkprintbackendcups.c:4507
 msgctxt "printing option"
 msgid "Output Tray"
 msgstr "Ausgabeschacht"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4648
+#: modules/printbackends/cups/gtkprintbackendcups.c:4443
 msgctxt "printing option"
 msgid "Resolution"
 msgstr "Auflösung"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4649
+#: modules/printbackends/cups/gtkprintbackendcups.c:4444
 msgctxt "printing option"
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript-Vorfilterung"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4658
+#: modules/printbackends/cups/gtkprintbackendcups.c:4453
 msgctxt "printing option value"
 msgid "One Sided"
 msgstr "Einseitig"

 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4660
+#: modules/printbackends/cups/gtkprintbackendcups.c:4455
 msgctxt "printing option value"
 msgid "Long Edge (Standard)"
 msgstr "Langer Rand (Vorgabe)"

 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4662
+#: modules/printbackends/cups/gtkprintbackendcups.c:4457
 msgctxt "printing option value"
 msgid "Short Edge (Flip)"
 msgstr "Kurzer Rand (Umdrehen)"

 #. Translators: this is an option of "Paper Source"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4664
-#: modules/printbackends/cups/gtkprintbackendcups.c:4666
-#: modules/printbackends/cups/gtkprintbackendcups.c:4674
+#: modules/printbackends/cups/gtkprintbackendcups.c:4459
+#: modules/printbackends/cups/gtkprintbackendcups.c:4461
+#: modules/printbackends/cups/gtkprintbackendcups.c:4469
 msgctxt "printing option value"
 msgid "Auto Select"
 msgstr "Automatische Auswahl"

 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4668
-#: modules/printbackends/cups/gtkprintbackendcups.c:4670
-#: modules/printbackends/cups/gtkprintbackendcups.c:4672
-#: modules/printbackends/cups/gtkprintbackendcups.c:4676
+#: modules/printbackends/cups/gtkprintbackendcups.c:4463
+#: modules/printbackends/cups/gtkprintbackendcups.c:4465
+#: modules/printbackends/cups/gtkprintbackendcups.c:4467
+#: modules/printbackends/cups/gtkprintbackendcups.c:4471
 msgctxt "printing option value"
 msgid "Printer Default"
 msgstr "Vorgabe-Drucker"

 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4678
+#: modules/printbackends/cups/gtkprintbackendcups.c:4473
 msgctxt "printing option value"
 msgid "Embed GhostScript fonts only"
 msgstr "Nur GhostScript-Schriften einbinden"

 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4680
+#: modules/printbackends/cups/gtkprintbackendcups.c:4475
 msgctxt "printing option value"
 msgid "Convert to PS level 1"
 msgstr "Zu PS Level 1 konvertieren"

 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4682
+#: modules/printbackends/cups/gtkprintbackendcups.c:4477
 msgctxt "printing option value"
 msgid "Convert to PS level 2"
 msgstr "Zu PS Level 2 konvertieren"

 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4684
+#: modules/printbackends/cups/gtkprintbackendcups.c:4479
 msgctxt "printing option value"
 msgid "No pre-filtering"
 msgstr "Keine Vorfilterung"

 #. Translators: "Miscellaneous" is the label for a button, that opens
 #. up an extra panel of settings in a print dialog.
-#: modules/printbackends/cups/gtkprintbackendcups.c:4693
+#: modules/printbackends/cups/gtkprintbackendcups.c:4488
 msgctxt "printing option group"
 msgid "Miscellaneous"
 msgstr "Erweitert"

-#: modules/printbackends/cups/gtkprintbackendcups.c:4720
+#: modules/printbackends/cups/gtkprintbackendcups.c:4515
 msgctxt "sides"
 msgid "One Sided"
 msgstr "Einseitig"

 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4722
+#: modules/printbackends/cups/gtkprintbackendcups.c:4517
 msgctxt "sides"
 msgid "Long Edge (Standard)"
 msgstr "Langer Rand (Vorgabe)"

 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:4724
+#: modules/printbackends/cups/gtkprintbackendcups.c:4519
 msgctxt "sides"
 msgid "Short Edge (Flip)"
 msgstr "Kurzer Rand (Umdrehen)"

 #. Translators: Top output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4727
+#: modules/printbackends/cups/gtkprintbackendcups.c:4522
 msgctxt "output-bin"
 msgid "Top Bin"
 msgstr "Oberer Bin"

 #. Translators: Middle output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4729
+#: modules/printbackends/cups/gtkprintbackendcups.c:4524
 msgctxt "output-bin"
 msgid "Middle Bin"
 msgstr "Mittlerer Bin"

 #. Translators: Bottom output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4731
+#: modules/printbackends/cups/gtkprintbackendcups.c:4526
 msgctxt "output-bin"
 msgid "Bottom Bin"
 msgstr "Unterer Bin"

 #. Translators: Side output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4733
+#: modules/printbackends/cups/gtkprintbackendcups.c:4528
 msgctxt "output-bin"
 msgid "Side Bin"
 msgstr "Seiten-Bin"

 #. Translators: Left output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4735
+#: modules/printbackends/cups/gtkprintbackendcups.c:4530
 msgctxt "output-bin"
 msgid "Left Bin"
 msgstr "Linker Bin"

 #. Translators: Right output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4737
+#: modules/printbackends/cups/gtkprintbackendcups.c:4532
 msgctxt "output-bin"
 msgid "Right Bin"
 msgstr "Rechter Bin"

 #. Translators: Center output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4739
+#: modules/printbackends/cups/gtkprintbackendcups.c:4534
 msgctxt "output-bin"
 msgid "Center Bin"
 msgstr "Mittlerer Bin"

 #. Translators: Rear output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4741
+#: modules/printbackends/cups/gtkprintbackendcups.c:4536
 msgctxt "output-bin"
 msgid "Rear Bin"
 msgstr "Hinterer Bin"

 #. Translators: Output bin where one sided output is oriented in the face-up position
-#: modules/printbackends/cups/gtkprintbackendcups.c:4743
+#: modules/printbackends/cups/gtkprintbackendcups.c:4538
 msgctxt "output-bin"
 msgid "Face Up Bin"
 msgstr "Bin nach oben"

 #. Translators: Output bin where one sided output is oriented in the face-down position
-#: modules/printbackends/cups/gtkprintbackendcups.c:4745
+#: modules/printbackends/cups/gtkprintbackendcups.c:4540
 msgctxt "output-bin"
 msgid "Face Down Bin"
 msgstr "Bin nach unten"

 #. Translators: Large capacity output bin
-#: modules/printbackends/cups/gtkprintbackendcups.c:4747
+#: modules/printbackends/cups/gtkprintbackendcups.c:4542
 msgctxt "output-bin"
 msgid "Large Capacity Bin"
 msgstr "Großer Bin"

 #. Translators: Output stacker number %d
-#: modules/printbackends/cups/gtkprintbackendcups.c:4769
+#: modules/printbackends/cups/gtkprintbackendcups.c:4564
 #, c-format
 msgctxt "output-bin"
 msgid "Stacker %d"
 msgstr "Stacker %d"

 #. Translators: Output mailbox number %d
-#: modules/printbackends/cups/gtkprintbackendcups.c:4773
+#: modules/printbackends/cups/gtkprintbackendcups.c:4568
 #, c-format
 msgctxt "output-bin"
 msgid "Mailbox %d"
 msgstr "Postfach %d"

 #. Translators: Private mailbox
-#: modules/printbackends/cups/gtkprintbackendcups.c:4777
+#: modules/printbackends/cups/gtkprintbackendcups.c:4572
 msgctxt "output-bin"
 msgid "My Mailbox"
 msgstr "Eigenes Postfach"

 #. Translators: Output tray number %d
-#: modules/printbackends/cups/gtkprintbackendcups.c:4781
+#: modules/printbackends/cups/gtkprintbackendcups.c:4576
 #, c-format
 msgctxt "output-bin"
 msgid "Tray %d"
 msgstr "Ablage %d"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5252
+#: modules/printbackends/cups/gtkprintbackendcups.c:5047
 msgid "Printer Default"
 msgstr "Vorgabe-Drucker"

 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5693
+#: modules/printbackends/cups/gtkprintbackendcups.c:5488
 msgid "Urgent"
 msgstr "Dringend"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5693
+#: modules/printbackends/cups/gtkprintbackendcups.c:5488
 msgid "High"
 msgstr "Hoch"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5693
+#: modules/printbackends/cups/gtkprintbackendcups.c:5488
 msgid "Medium"
 msgstr "Mittel"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5693
+#: modules/printbackends/cups/gtkprintbackendcups.c:5488
 msgid "Low"
 msgstr "Niedrig"

 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5723
+#: modules/printbackends/cups/gtkprintbackendcups.c:5518
 msgid "Job Priority"
 msgstr "Priorität"

@@ -8270,41 +8270,41 @@ msgstr "Priorität"
 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5734
+#: modules/printbackends/cups/gtkprintbackendcups.c:5529
 msgid "Billing Info"
 msgstr "Abrechnungsinfo"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5758
+#: modules/printbackends/cups/gtkprintbackendcups.c:5553
 msgctxt "cover page"
 msgid "None"
 msgstr "Keine"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5759
+#: modules/printbackends/cups/gtkprintbackendcups.c:5554
 msgctxt "cover page"
 msgid "Classified"
 msgstr "Klassifiziert"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5760
+#: modules/printbackends/cups/gtkprintbackendcups.c:5555
 msgctxt "cover page"
 msgid "Confidential"
 msgstr "Vertraulich"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5761
+#: modules/printbackends/cups/gtkprintbackendcups.c:5556
 msgctxt "cover page"
 msgid "Secret"
 msgstr "Geheim"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5762
+#: modules/printbackends/cups/gtkprintbackendcups.c:5557
 msgctxt "cover page"
 msgid "Standard"
 msgstr "Standard"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5763
+#: modules/printbackends/cups/gtkprintbackendcups.c:5558
 msgctxt "cover page"
 msgid "Top Secret"
 msgstr "Streng geheim"

-#: modules/printbackends/cups/gtkprintbackendcups.c:5764
+#: modules/printbackends/cups/gtkprintbackendcups.c:5559
 msgctxt "cover page"
 msgid "Unclassified"
 msgstr "Unklassifiziert"
@@ -8312,7 +8312,7 @@ msgstr "Unklassifiziert"
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5776
+#: modules/printbackends/cups/gtkprintbackendcups.c:5571
 msgctxt "printer option"
 msgid "Pages per Sheet"
 msgstr "Seiten pro Blatt"
@@ -8320,7 +8320,7 @@ msgstr "Seiten pro Blatt"
 #. Translators, this string is used to label the option in the print
 #. * dialog that controls in what order multiple pages are arranged
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5793
+#: modules/printbackends/cups/gtkprintbackendcups.c:5588
 msgctxt "printer option"
 msgid "Page Ordering"
 msgstr "Reihenfolge"
@@ -8328,7 +8328,7 @@ msgstr "Reihenfolge"
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5835
+#: modules/printbackends/cups/gtkprintbackendcups.c:5630
 msgctxt "printer option"
 msgid "Before"
 msgstr "Vorne"
@@ -8336,7 +8336,7 @@ msgstr "Vorne"
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5850
+#: modules/printbackends/cups/gtkprintbackendcups.c:5645
 msgctxt "printer option"
 msgid "After"
 msgstr "Hinten"
@@ -8345,7 +8345,7 @@ msgstr "Hinten"
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5870
+#: modules/printbackends/cups/gtkprintbackendcups.c:5665
 msgctxt "printer option"
 msgid "Print at"
 msgstr "Drucken um"
@@ -8353,7 +8353,7 @@ msgstr "Drucken um"
 #. Translators: this is the name of the option that allows the user
 #. * to specify a time when a print job will be printed.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5881
+#: modules/printbackends/cups/gtkprintbackendcups.c:5676
 msgctxt "printer option"
 msgid "Print at time"
 msgstr "Drucken zu Uhrzeit"
@@ -8363,18 +8363,18 @@ msgstr "Drucken zu Uhrzeit"
 #. * the width and height in points. E.g: "Custom
 #. * 230.4x142.9"
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:5926
+#: modules/printbackends/cups/gtkprintbackendcups.c:5721
 #, c-format
 msgid "Custom %s×%s"
 msgstr "Benutzerdefiniert %s×%s"

-#: modules/printbackends/cups/gtkprintbackendcups.c:6036
+#: modules/printbackends/cups/gtkprintbackendcups.c:5831
 msgctxt "printer option"
 msgid "Printer Profile"
 msgstr "Druckerfarbprofil"

 #. TRANSLATORS: this is when color profile information is unavailable
-#: modules/printbackends/cups/gtkprintbackendcups.c:6043
+#: modules/printbackends/cups/gtkprintbackendcups.c:5838
 msgctxt "printer option value"
 msgid "Unavailable"
 msgstr "Nicht verfügbar"
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the gtk+ package.
 #
 # Sung-Hyun Nam <namsh@lgic.co.kr>, 1998
-# Changwoo Ryu <cwryu@debian.org>, 2002-2021.
+# Changwoo Ryu <cwryu@debian.org>, 2002-2020.
 #
 #
 # - font family를 나타내는 family는 "계열"이라고 번역
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-18 01:03+0000\n"
-"PO-Revision-Date: 2021-03-01 21:57+0900\n"
+"POT-Creation-Date: 2020-08-28 14:45+0000\n"
+"PO-Revision-Date: 2020-08-29 12:47+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Gnome Korea <gnome-kr@googlegroups.com>\n"
 "Language: ko\n"
@@ -1959,243 +1959,198 @@ msgstr "색: %s"

 #: gtk/gtkcolorchooserwidget.c:446
 msgctxt "Color name"
-msgid "Very Light Blue"
-msgstr "매우 연한 파랑"
+msgid "Light Scarlet Red"
+msgstr "연한 다홍"

 #: gtk/gtkcolorchooserwidget.c:447
 msgctxt "Color name"
-msgid "Light Blue"
-msgstr "연한 파랑"
+msgid "Scarlet Red"
+msgstr "다홍"

 #: gtk/gtkcolorchooserwidget.c:448
 msgctxt "Color name"
-msgid "Blue"
-msgstr "파랑"
+msgid "Dark Scarlet Red"
+msgstr "짙은 다홍"

 #: gtk/gtkcolorchooserwidget.c:449
 msgctxt "Color name"
-msgid "Dark Blue"
-msgstr "짙은 파랑"
-
-#: gtk/gtkcolorchooserwidget.c:450
-msgctxt "Color name"
-msgid "Very Dark Blue"
-msgstr "짙은 파랑"
-
-#: gtk/gtkcolorchooserwidget.c:451
-msgctxt "Color name"
-msgid "Very Light Green"
-msgstr "매우 연한 녹색"
-
-#: gtk/gtkcolorchooserwidget.c:452
-msgctxt "Color name"
-msgid "Light Green"
-msgstr "연한 녹색"
-
-#: gtk/gtkcolorchooserwidget.c:453
-msgctxt "Color name"
-msgid "Green"
-msgstr "녹색"
-
-#: gtk/gtkcolorchooserwidget.c:454
-msgctxt "Color name"
-msgid "Dark Green"
-msgstr "짙은 녹색"
-
-#: gtk/gtkcolorchooserwidget.c:455
-msgctxt "Color name"
-msgid "Very Dark Green"
-msgstr "매우 짙은 녹색"
-
-#: gtk/gtkcolorchooserwidget.c:456
-msgctxt "Color name"
-msgid "Very Light Yellow"
-msgstr "매우 연한 노랑"
-
-#: gtk/gtkcolorchooserwidget.c:457
-msgctxt "Color name"
-msgid "Light Yellow"
-msgstr "연한 노랑"
-
-#: gtk/gtkcolorchooserwidget.c:458
-msgctxt "Color name"
-msgid "Yellow"
-msgstr "노랑"
-
-#: gtk/gtkcolorchooserwidget.c:459
-msgctxt "Color name"
-msgid "Dark Yellow"
-msgstr "짙은 노랑"
-
-#: gtk/gtkcolorchooserwidget.c:460
-msgctxt "Color name"
-msgid "Very Dark Yellow"
-msgstr "매우 짙은 노랑"
-
-#: gtk/gtkcolorchooserwidget.c:461
-msgctxt "Color name"
-msgid "Very Light Orange"
-msgstr "매우 연한 주황"
-
-#: gtk/gtkcolorchooserwidget.c:462
-msgctxt "Color name"
 msgid "Light Orange"
 msgstr "연한 주황"

-#: gtk/gtkcolorchooserwidget.c:463
+#: gtk/gtkcolorchooserwidget.c:450
 msgctxt "Color name"
 msgid "Orange"
 msgstr "주황"

-#: gtk/gtkcolorchooserwidget.c:464
+#: gtk/gtkcolorchooserwidget.c:451
 msgctxt "Color name"
 msgid "Dark Orange"
 msgstr "짙은 주황"

+#: gtk/gtkcolorchooserwidget.c:452
+msgctxt "Color name"
+msgid "Light Butter"
+msgstr "연한 버터색"
+
+#: gtk/gtkcolorchooserwidget.c:453
+msgctxt "Color name"
+msgid "Butter"
+msgstr "버터색"
+
+#: gtk/gtkcolorchooserwidget.c:454
+msgctxt "Color name"
+msgid "Dark Butter"
+msgstr "짙은 버터색"
+
+#: gtk/gtkcolorchooserwidget.c:455
+msgctxt "Color name"
+msgid "Light Chameleon"
+msgstr "연한 카멜레온"
+
+#: gtk/gtkcolorchooserwidget.c:456
+msgctxt "Color name"
+msgid "Chameleon"
+msgstr "카멜레온"
+
+#: gtk/gtkcolorchooserwidget.c:457
+msgctxt "Color name"
+msgid "Dark Chameleon"
+msgstr "짙은 카멜레온"
+
+#: gtk/gtkcolorchooserwidget.c:458
+msgctxt "Color name"
+msgid "Light Sky Blue"
+msgstr "연한 하늘색"
+
+#: gtk/gtkcolorchooserwidget.c:459
+msgctxt "Color name"
+msgid "Sky Blue"
+msgstr "하늘색"
+
+#: gtk/gtkcolorchooserwidget.c:460
+msgctxt "Color name"
+msgid "Dark Sky Blue"
+msgstr "짙은 하늘색"
+
+#: gtk/gtkcolorchooserwidget.c:461
+msgctxt "Color name"
+msgid "Light Plum"
+msgstr "연한 자두색"
+
+#: gtk/gtkcolorchooserwidget.c:462
+msgctxt "Color name"
+msgid "Plum"
+msgstr "자두색"
+
+#: gtk/gtkcolorchooserwidget.c:463
+msgctxt "Color name"
+msgid "Dark Plum"
+msgstr "짙은 자두색"
+
+#: gtk/gtkcolorchooserwidget.c:464
+msgctxt "Color name"
+msgid "Light Chocolate"
+msgstr "연한 초콜릿색"
+
 #: gtk/gtkcolorchooserwidget.c:465
 msgctxt "Color name"
-msgid "Very Dark Orange"
-msgstr "매우 짙은 주황"
+msgid "Chocolate"
+msgstr "초콜릿색"

 #: gtk/gtkcolorchooserwidget.c:466
 msgctxt "Color name"
-msgid "Very Light Red"
-msgstr "매우 연한 빨강"
+msgid "Dark Chocolate"
+msgstr "짙은 초콜릿색"

 #: gtk/gtkcolorchooserwidget.c:467
 msgctxt "Color name"
-msgid "Light Red"
-msgstr "연한 빨강"
+msgid "Light Aluminum 1"
+msgstr "연한 알루미늄 1"

 #: gtk/gtkcolorchooserwidget.c:468
 msgctxt "Color name"
-msgid "Red"
-msgstr "빨강"
+msgid "Aluminum 1"
+msgstr "알루미늄 1"

 #: gtk/gtkcolorchooserwidget.c:469
 msgctxt "Color name"
-msgid "Dark Red"
-msgstr "짙은 빨강"
+msgid "Dark Aluminum 1"
+msgstr "짙은 알루미늄 1"

 #: gtk/gtkcolorchooserwidget.c:470
 msgctxt "Color name"
-msgid "Very Dark Red"
-msgstr "매우 짙은 빨강"
+msgid "Light Aluminum 2"
+msgstr "연한 알루미늄 2"

 #: gtk/gtkcolorchooserwidget.c:471
 msgctxt "Color name"
-msgid "Very Light Purple"
-msgstr "매우 연한 보라"
+msgid "Aluminum 2"
+msgstr "알루미늄 2"

 #: gtk/gtkcolorchooserwidget.c:472
 msgctxt "Color name"
-msgid "Light Purple"
-msgstr "연한 보라"
-
-#: gtk/gtkcolorchooserwidget.c:473
-msgctxt "Color name"
-msgid "Purple"
-msgstr "보라"
-
-#: gtk/gtkcolorchooserwidget.c:474
-msgctxt "Color name"
-msgid "Dark Purple"
-msgstr "짙은 보라"
-
-#: gtk/gtkcolorchooserwidget.c:475
-msgctxt "Color name"
-msgid "Very Dark Purple"
-msgstr "매우 짙은 보라"
-
-#: gtk/gtkcolorchooserwidget.c:476
-msgctxt "Color name"
-msgid "Very Light Brown"
-msgstr "매우 연한 갈색"
-
-#: gtk/gtkcolorchooserwidget.c:477
-msgctxt "Color name"
-msgid "Light Brown"
-msgstr "연한 갈색"
-
-#: gtk/gtkcolorchooserwidget.c:478
-msgctxt "Color name"
-msgid "Brown"
-msgstr "갈색"
-
-#: gtk/gtkcolorchooserwidget.c:479
-msgctxt "Color name"
-msgid "Dark Brown"
-msgstr "짙은 갈색"
-
-#: gtk/gtkcolorchooserwidget.c:480
-msgctxt "Color name"
-msgid "Very Dark Brown"
-msgstr "매우 짙은 갈색"
-
-#: gtk/gtkcolorchooserwidget.c:481
-msgctxt "Color name"
-msgid "White"
-msgstr "흰색"
-
-#: gtk/gtkcolorchooserwidget.c:482
-msgctxt "Color name"
-msgid "Light Gray 1"
-msgstr "연한 회색 1"
-
-#: gtk/gtkcolorchooserwidget.c:483
-msgctxt "Color name"
-msgid "Light Gray 2"
-msgstr "연한 회색 2"
-
-#: gtk/gtkcolorchooserwidget.c:484
-msgctxt "Color name"
-msgid "Light Gray 3"
-msgstr "연한 회색 3"
-
-#: gtk/gtkcolorchooserwidget.c:485
-msgctxt "Color name"
-msgid "Light Gray 4"
-msgstr "연한 회색 4"
+msgid "Dark Aluminum 2"
+msgstr "짙은 알루미늄 2"

 #: gtk/gtkcolorchooserwidget.c:486
 msgctxt "Color name"
-msgid "Dark Gray 1"
-msgstr "짙은 회색 1"
-
-#: gtk/gtkcolorchooserwidget.c:487
-msgctxt "Color name"
-msgid "Dark Gray 2"
-msgstr "짙은 회색 2"
-
-#: gtk/gtkcolorchooserwidget.c:488
-msgctxt "Color name"
-msgid "Dark Gray 3"
-msgstr "짙은 회색 3"
-
-#: gtk/gtkcolorchooserwidget.c:489
-msgctxt "Color name"
-msgid "Dark Gray 4"
-msgstr "짙은 회색 4"
-
-#: gtk/gtkcolorchooserwidget.c:490
-msgctxt "Color name"
 msgid "Black"
 msgstr "검정"

+#: gtk/gtkcolorchooserwidget.c:487
+msgctxt "Color name"
+msgid "Very Dark Gray"
+msgstr "매우 짙은 회색"
+
+#: gtk/gtkcolorchooserwidget.c:488
+msgctxt "Color name"
+msgid "Darker Gray"
+msgstr "더 짙은 회색"
+
+#: gtk/gtkcolorchooserwidget.c:489
+msgctxt "Color name"
+msgid "Dark Gray"
+msgstr "짙은 회색"
+
+#: gtk/gtkcolorchooserwidget.c:490
+msgctxt "Color name"
+msgid "Medium Gray"
+msgstr "중간 회색"
+
+#: gtk/gtkcolorchooserwidget.c:491
+msgctxt "Color name"
+msgid "Light Gray"
+msgstr "연한 회색"
+
+#: gtk/gtkcolorchooserwidget.c:492
+msgctxt "Color name"
+msgid "Lighter Gray"
+msgstr "더 연한 회색"
+
+#: gtk/gtkcolorchooserwidget.c:493
+msgctxt "Color name"
+msgid "Very Light Gray"
+msgstr "매우 연한 회색"
+
+#: gtk/gtkcolorchooserwidget.c:494
+msgctxt "Color name"
+msgid "White"
+msgstr "흰색"
+
 #. translators: label for the custom section in the color chooser
-#: gtk/gtkcolorchooserwidget.c:534
+#: gtk/gtkcolorchooserwidget.c:543
 msgid "Custom"
 msgstr "사용자 지정"

-#: gtk/gtkcolorchooserwidget.c:541
+#: gtk/gtkcolorchooserwidget.c:550
 msgid "Custom color"
-msgstr "사용자 지정 %d: %s"
+msgstr "사용자 지정 색"

-#: gtk/gtkcolorchooserwidget.c:542
+#: gtk/gtkcolorchooserwidget.c:551
 msgid "Create a custom color"
-msgstr "사용자 지정"
+msgstr "사용자 지정 색 만들기"

-#: gtk/gtkcolorchooserwidget.c:561
+#: gtk/gtkcolorchooserwidget.c:570
 #, c-format
 msgid "Custom color %d: %s"
 msgstr "사용자 지정 %d: %s"
@@ -2393,8 +2348,7 @@ msgstr "폴더를 만들 수 없습니다. 같은 이름의 파일이 이미 있

 #: gtk/gtkfilechooserwidget.c:823
 msgid "Try using a different name for the folder, or rename the file first."
-msgstr ""
-"폴더 이름으로 다른 이름을 사용하거나, 먼저 기존 파일의 이름을 바꾸십시오."
+msgstr "폴더 이름으로 다른 이름을 사용하거나, 먼저 기존 파일의 이름을 바꾸십시오."

 #: gtk/gtkfilechooserwidget.c:836
 msgid "You need to choose a valid filename."
@@ -2743,51 +2697,51 @@ msgctxt "font"
 msgid "None"
 msgstr "없음"

-#: gtk/gtkfontchooserwidget.c:1556
+#: gtk/gtkfontchooserwidget.c:1525
 msgid "Width"
 msgstr "너비"

-#: gtk/gtkfontchooserwidget.c:1557
+#: gtk/gtkfontchooserwidget.c:1526
 msgid "Weight"
 msgstr "두께"

-#: gtk/gtkfontchooserwidget.c:1558
+#: gtk/gtkfontchooserwidget.c:1527
 msgid "Italic"
 msgstr "이탤릭"

-#: gtk/gtkfontchooserwidget.c:1559
+#: gtk/gtkfontchooserwidget.c:1528
 msgid "Slant"
 msgstr "기울이기"

-#: gtk/gtkfontchooserwidget.c:1560
+#: gtk/gtkfontchooserwidget.c:1529
 msgid "Optical Size"
 msgstr "광학 크기"

-#: gtk/gtkfontchooserwidget.c:2097 gtk/inspector/prop-editor.c:1676
+#: gtk/gtkfontchooserwidget.c:2066 gtk/inspector/prop-editor.c:1676
 msgid "Default"
 msgstr "기본값"

-#: gtk/gtkfontchooserwidget.c:2144
+#: gtk/gtkfontchooserwidget.c:2113
 msgid "Ligatures"
 msgstr "리거쳐"

-#: gtk/gtkfontchooserwidget.c:2145
+#: gtk/gtkfontchooserwidget.c:2114
 msgid "Letter Case"
 msgstr "문자 대소문자"

-#: gtk/gtkfontchooserwidget.c:2146
+#: gtk/gtkfontchooserwidget.c:2115
 msgid "Number Case"
 msgstr "문자 대소문자"

-#: gtk/gtkfontchooserwidget.c:2147
+#: gtk/gtkfontchooserwidget.c:2116
 msgid "Number Spacing"
 msgstr "숫자 간격"

-#: gtk/gtkfontchooserwidget.c:2148
+#: gtk/gtkfontchooserwidget.c:2117
 msgid "Number Formatting"
 msgstr "숫자 포매팅"

-#: gtk/gtkfontchooserwidget.c:2149
+#: gtk/gtkfontchooserwidget.c:2118
 msgid "Character Variants"
 msgstr "문자 이형"

@@ -8372,15 +8326,15 @@ msgstr "파일"
 msgid "_Output format"
 msgstr "출력 형식(_O)"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:394
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:393
 msgid "Print to LPR"
 msgstr "LPR로 인쇄"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:423
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:419
 msgid "Pages Per Sheet"
 msgstr "한 장당 페이지 수"

-#: modules/printbackends/lpr/gtkprintbackendlpr.c:430
+#: modules/printbackends/lpr/gtkprintbackendlpr.c:426
 msgid "Command Line"
 msgstr "명령행"

@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-25 13:49+0000\n"
-"PO-Revision-Date: 2021-02-25 17:25+0300\n"
+"POT-Creation-Date: 2021-02-21 13:40+0000\n"
+"PO-Revision-Date: 2021-02-21 20:59+0300\n"
 "Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
 "Language-Team: Türkçe <gnome-turk@gnome.org>\n"
 "Language: tr\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.4.2\n"

 #: gdk/broadway/gdkbroadway-server.c:144
 #, c-format
@@ -945,7 +945,7 @@ msgstr "_Yazdır"
 #: gtk/a11y/gtkimageaccessible.c:107 gtk/deprecated/gtkstock.c:435
 msgctxt "Stock label"
 msgid "Print Pre_view"
-msgstr "Yazıcı Ö_n İzleme"
+msgstr "Yazıcı Ö_nizleme"

 #: gtk/a11y/gtkimageaccessible.c:108 gtk/deprecated/gtkstock.c:436
 msgctxt "Stock label"
@@ -1282,7 +1282,7 @@ msgstr "Bo_yut:"
 #. create the text entry widget
 #: gtk/deprecated/gtkfontsel.c:577
 msgid "_Preview:"
-msgstr "_Ön İzleme:"
+msgstr "_Önizleme:"

 #: gtk/deprecated/gtkfontsel.c:1693 gtk/gtkpagesetupunixdialog.c:198
 #: gtk/ui/gtkassistant.ui:50
@@ -1800,16 +1800,16 @@ msgstr ""
 "  validate              Dosyayı doğrula\n"
 "  simplify [SEÇENEKLER] Dosyayı basitleştir\n"
 "  enumerate             Tüm nesneleri listele\n"
-"  preview [SEÇENEKLER]  Dosyayı ön izle\n"
+"  preview [SEÇENEKLER]  Dosyayı önizle\n"
 "\n"
 "Simplify (Basitleştir) Seçenekleri:\n"
 "  --replace             Dosyayı değiştir\n"
 "\n"
-"Ön İzleme Seçenekleri:\n"
-"  --id=KİMLİK           Yalnızca adı verilen nesneyi ön izle\n"
+"Preview (Önizle) Seçenekleri:\n"
+"  --id=KİMLİK           Yalnızca adı verilen nesneyi önizle\n"
 "  --css=DOSYA           CSS dosyasından biçem kullan\n"
 "\n"
-"GtkBuilder .ui dosyaları üzerinde türlü görevler gerçekleştir.\n"
+"GtkBuilder .ui dosyaları üzerinde çeşitli görevler gerçekleştir.\n"

 #. Translate to calendar:YM if you want years to be displayed
 #. * before months; otherwise translate to calendar:MY.
@@ -2346,7 +2346,7 @@ msgstr "_Kaydet"

 #: gtk/gtkfilechoosernativequartz.c:331 gtk/ui/gtkfilechooserwidget.ui:405
 msgid "Select which types of files are shown"
-msgstr "Hangi türdeki dosyaların gösterileceğini seç"
+msgstr "Hangi türdeki dosyaların gösterileceğini seçin"

 #. Translators: the first string is a path and the second string
 #. * is a hostname. Nautilus and the panel contain the same string
@@ -2359,7 +2359,7 @@ msgstr "%2$s üzerindeki %1$s"

 #: gtk/gtkfilechooserwidget.c:385
 msgid "Type name of new folder"
-msgstr "Yeni klasörün adını gir"
+msgstr "Yeni klasörün adını girin"

 #: gtk/gtkfilechooserwidget.c:809
 msgid "The folder could not be created"
@@ -2556,11 +2556,11 @@ msgstr "Arama"

 #: gtk/gtkfilechooserwidget.c:3370
 msgid "Enter location"
-msgstr "Konum gir"
+msgstr "Konum girin"

 #: gtk/gtkfilechooserwidget.c:3372
 msgid "Enter location or URL"
-msgstr "Konum ya da URL gir"
+msgstr "Konum ya da URL girin"

 #: gtk/gtkfilechooserwidget.c:4450 gtk/gtkfilechooserwidget.c:7492
 #: gtk/ui/gtkfilechooserwidget.ui:248
@@ -2877,7 +2877,8 @@ msgstr "%s: eksik uygulama adı"
 #, c-format
 msgid "Creating AppInfo from id not supported on non unix operating systems"
 msgstr ""
-"Kimlikten AppInfo oluşturma Unix olmayan işletim sistemlerinde desteklenmiyor"
+"Kimlikten UygulamaBilgisi oluşturma Unix olmayan işletim sistemlerinde "
+"desteklenmiyor"

 #. Translators: the first %s is the program name, the second one
 #. is the application name.
@@ -2915,7 +2916,7 @@ msgid ""
 "Click to prevent further changes"
 msgstr ""
 "Pencere kilidi kaldırıldı.\n"
-"Gelecek değişiklikleri önlemek için tıkla"
+"Daha çok değişikliği önlemek için tıklayın"

 #: gtk/gtklockbutton.c:302
 msgid ""
@@ -2923,7 +2924,7 @@ msgid ""
 "Click to make changes"
 msgstr ""
 "Pencere kilitlendi.\n"
-"Değişiklik yapmak için tıkla"
+"Değişiklik yapmak için tıklayın"

 #: gtk/gtklockbutton.c:311
 msgid ""
@@ -3038,7 +3039,7 @@ msgstr "Parolayı _anında unut"

 #: gtk/gtkmountoperation.c:765
 msgid "Remember password until you _logout"
-msgstr "Parolayı _çıkış yapana dek anımsa"
+msgstr "Parolayı _çıkış yapana kadar anımsa"

 #: gtk/gtkmountoperation.c:775
 msgid "Remember _forever"
@@ -3167,7 +3168,7 @@ msgstr "Masaüstünüzün içeriğini bir klasör içerisinde açın"

 #: gtk/gtkplacessidebar.c:1125
 msgid "Enter Location"
-msgstr "Konum Gir"
+msgstr "Konum Girin"

 #: gtk/gtkplacessidebar.c:1127
 msgid "Manually enter a location"
@@ -3544,12 +3545,12 @@ msgstr "%d yazdırılıyor"
 #: gtk/gtkprintoperation.c:3038
 #, c-format
 msgid "Error creating print preview"
-msgstr "Baskı ön izleme oluşturulurken hata"
+msgstr "Baskı önizleme oluşturulurken hata"

 #: gtk/gtkprintoperation.c:3041
 #, c-format
 msgid "The most probable reason is that a temporary file could not be created."
-msgstr "En olası nedeni geçici dosyanın oluşturulamamasıdır."
+msgstr "En olası sebebi geçici dosyanın oluşturulamamış olmasıdır."

 #. window
 #: gtk/gtkprintoperation-portal.c:231 gtk/gtkprintoperation-portal.c:549
@@ -3573,7 +3574,7 @@ msgstr "Durduruldu"

 #: gtk/gtkprintoperation-win32.c:637
 msgid "Need user intervention"
-msgstr "Kullanıcı girişimi gerekli"
+msgstr "Kullanıcı müdahalesi gerekiyor"

 #: gtk/gtkprintoperation-win32.c:742
 msgid "Custom size"
@@ -3594,7 +3595,7 @@ msgstr "StartDoc'tan hata"
 #: gtk/gtkprintoperation-win32.c:1777 gtk/gtkprintoperation-win32.c:1800
 #: gtk/gtkprintoperation-win32.c:1848
 msgid "Not enough free memory"
-msgstr "Yeterince boş bellek yok"
+msgstr "Yeteri kadar boş bellek yok"

 #: gtk/gtkprintoperation-win32.c:1853
 msgid "Invalid argument to PrintDlgEx"
@@ -3614,7 +3615,7 @@ msgstr "Belirsiz hata"

 #: gtk/gtkprintunixdialog.c:746
 msgid "Pre_view"
-msgstr "Ön İzl_e"
+msgstr "Ö_nizleme"

 #: gtk/gtkprintunixdialog.c:748
 msgid "_Print"
@@ -3988,11 +3989,11 @@ msgstr "Dönüştürülen veri bozulmuş. İlk bölüm GTKTEXTBUFFERCONTENTS-000

 #: gtk/gtktextutil.c:57
 msgid "LRM _Left-to-right mark"
-msgstr "LRM _Soldan sağa imi"
+msgstr "LRM _Soldan sağa işaretleme"

 #: gtk/gtktextutil.c:58
 msgid "RLM _Right-to-left mark"
-msgstr "RLM _Sağdan sola imi"
+msgstr "RLM _Sağdan sola işaretleme"

 #: gtk/gtktextutil.c:59
 msgid "LRE Left-to-right _embedding"
@@ -4330,7 +4331,7 @@ msgstr "Nesne"
 #: gtk/inspector/prop-editor.c:679
 #, c-format
 msgid "Pointer: %p"
-msgstr "İmleç: %p"
+msgstr "İşaretçi: %p"

 #: gtk/inspector/prop-editor.c:694
 msgctxt "type name"
@@ -4627,7 +4628,7 @@ msgstr "Yerleşim Sınırlarını Göster"

 #: gtk/inspector/visual.ui:615
 msgid "Show Pixel Cache"
-msgstr "Piksel Önbelleğini Göster"
+msgstr "Piksel Ön Belleğini Göster"

 #: gtk/inspector/visual.ui:649
 msgid "Show Widget Resizes"
@@ -7246,7 +7247,7 @@ msgstr "Yazı Tipi Ailesi"

 #: gtk/ui/gtkfontchooserwidget.ui:121 gtk/ui/gtkfontchooserwidget.ui:248
 msgid "Preview text"
-msgstr "Metni ön izle"
+msgstr "Metni önizle"

 #: gtk/ui/gtkfontchooserwidget.ui:201
 msgid "No Fonts Found"
@@ -7321,7 +7322,7 @@ msgstr "_Sunucuya Bağlan"

 #: gtk/ui/gtkplacesview.ui:340
 msgid "Enter server address…"
-msgstr "Sunucu adresini gir…"
+msgstr "Sunucu adresini girin…"

 #: gtk/ui/gtkprintunixdialog.ui:112
 msgid "Printer"
@@ -7346,7 +7347,7 @@ msgstr "_Geçerli Sayfa"

 #: gtk/ui/gtkprintunixdialog.ui:233
 msgid "Se_lection"
-msgstr "Seçi_m"
+msgstr "Se_çim"

 #: gtk/ui/gtkprintunixdialog.ui:249
 msgid "Pag_es:"
@@ -7419,15 +7420,15 @@ msgstr "Ö_lçek:"

 #: gtk/ui/gtkprintunixdialog.ui:649
 msgid "Paper"
-msgstr "Kağıt"
+msgstr "Sayfa"

 #: gtk/ui/gtkprintunixdialog.ui:672
 msgid "Paper _type:"
-msgstr "Kağıt _türü:"
+msgstr "Sayfa _türü:"

 #: gtk/ui/gtkprintunixdialog.ui:697
 msgid "Paper _source:"
-msgstr "Kağıt _kaynağı:"
+msgstr "Sayfa _kaynağı:"

 #: gtk/ui/gtkprintunixdialog.ui:722
 msgid "Output t_ray:"
@@ -7485,7 +7486,7 @@ msgstr "_Beklemede"

 #: gtk/ui/gtkprintunixdialog.ui:1054 gtk/ui/gtkprintunixdialog.ui:1055
 msgid "Hold the job until it is explicitly released"
-msgstr "Özellikle bırakılmadıkça görevi tut"
+msgstr "Özellikle bırakılmadığı müddetçe görevi tut"

 #: gtk/ui/gtkprintunixdialog.ui:1092
 msgid "Add Cover Page"
@@ -7508,7 +7509,7 @@ msgstr "Görev"
 #. This will appear as a tab label in the print dialog.
 #: gtk/ui/gtkprintunixdialog.ui:1214
 msgid "Image Quality"
-msgstr "Görüntü Niteliği"
+msgstr "Resim Kalitesi"

 #. This will appear as a tab label in the print dialog.
 #: gtk/ui/gtkprintunixdialog.ui:1247
@@ -7530,7 +7531,7 @@ msgstr "Penceredeki kimi ayarlar çakışıyor"

 #: gtk/ui/gtkrecentchooserdefault.ui:78
 msgid "Select which type of documents are shown"
-msgstr "Hangi tür belgelerin görüntüleneceğini seç"
+msgstr "Hangi tür belgelerin görüntüleneceğini seçin"

 #: gtk/ui/gtkvolumebutton.ui:24
 msgid "Volume"
@@ -7609,7 +7610,7 @@ msgstr "%s dosyası geri %s olarak yeniden adlandırılamadı: %s\n"
 #: gtk/updateiconcache.c:1615
 #, c-format
 msgid "Cache file created successfully.\n"
-msgstr "Önbellek dosyası başarıyla oluşturuldu.\n"
+msgstr "Ön bellek dosyası başarıyla oluşturuldu.\n"

 #: gtk/updateiconcache.c:1654
 msgid "Overwrite an existing cache, even if up to date"
@@ -7625,7 +7626,7 @@ msgstr "Önbellekte görüntü verisini içerme"

 #: gtk/updateiconcache.c:1657
 msgid "Include image data in the cache"
-msgstr "Önbellekte görüntü verisini içer"
+msgstr "Önbelleğe görüntü verisini dahil et"

 #: gtk/updateiconcache.c:1658
 msgid "Output a C header file"
@@ -38,14 +38,6 @@ GLIB_COMPILE_RESOURCES = $(PREFIX)\bin\glib-compile-resources.exe
 GDBUS_CODEGEN = $(PREFIX)\bin\gdbus-codegen
 !endif

-!if "$(PLAT)" == "x64"
-AT_PLAT=x86_64
-!elseif "$(PLAT)" == "arm64"
-AT_PLAT=aarch64
-!else
-AT_PLAT=i686
-!endif
-
 # Please do not change anything beneath this line unless maintaining the NMake Makefiles
 GTK_VERSION = @GTK_VERSION@

@@ -78,7 +70,7 @@ GTK_PREPROCESSOR_FLAGS =	\
 	 /D_USE_MATH_DEFINES	\
 	 /DGTK_COMPILATION	\
 	 /DG_LOG_DOMAIN=\"Gtk\"	\
-	 /DGTK_HOST=\"$(AT_PLAT)-pc-vs$(VSVER)\"	\
+	 /DGTK_HOST=\"i686-pc-vs$(VSVER)\"	\
 	 /DGTK_PRINT_BACKENDS=\"file\"	\
 	 /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED	\
 	 /DINCLUDE_IM_am_et	\
@@ -77,8 +77,6 @@ CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE)

 !if "$(PLAT)" == "x64"
 LDFLAGS_ARCH = /machine:x64
-!elseif "$(PLAT)" == "arm64"
-LDFLAGS_ARCH = /machine:arm64
 !else
 LDFLAGS_ARCH = /machine:x86
 !endif
@@ -22,8 +22,6 @@ built_install_typelibs =	\

 !if "$(PLAT)" == "x64"
 AT_PLAT=x86_64
-!elseif "$(PLAT)" == "arm64"
-AT_PLAT=aarch64
 !else
 AT_PLAT=i686
 !endif
@@ -9,10 +9,7 @@
    <GtkPrefixDefine>GTK_PREFIX=\"$(GtkDummyPrefix)\"</GtkPrefixDefine>
    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
    <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
-    <GtkHostMachine Condition="'$(Platform)' == 'Win32'">i686</GtkHostMachine>
-    <GtkHostMachine Condition="'$(Platform)' == 'x64'">x86_64</GtkHostMachine>
-    <GtkHostMachine Condition="'$(Platform)' == 'arm64'">aarch64</GtkHostMachine>
-    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="$(GtkHostMachine)-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED</GtkDefines>
+    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED</GtkDefines>
    <CommonARM64SystemLibs Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|arm64'">ole32.lib;advapi32.lib;shell32.lib;gdi32.lib</CommonARM64SystemLibs>
    <GtkGdkCommonLibs>pangowin32-1.0.lib;fribidi.lib;imm32.lib;$(CommonARM64SystemLibs)</GtkGdkCommonLibs>
    <GdkAdditionalLibs>winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs)</GdkAdditionalLibs>
@@ -65,9 +62,6 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
    <BuildMacro Include="GtkIncludedImmodulesDefines">
      <Value>$(GtkIncludedImmodulesDefines)</Value>
    </BuildMacro>
-    <BuildMacro Include="GtkHostMachine">
-      <Value>$(GtkHostMachine)</Value>
-    </BuildMacro>
    <BuildMacro Include="GtkDefines">
      <Value>$(GtkDefines)</Value>
    </BuildMacro>
@@ -114,7 +114,7 @@ if exist .\Debug\$(Platform)\bin\Gtk-3.0.typelib copy .\Debug\$(Platform)\bin\Gt
 copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig
 copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc
 copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig
-copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-3.0.pc"
+copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-3.0.pc"
 copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig
    </GtkDoInstallBin>
    <GtkDoInstall>
@@ -96,7 +96,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefinesX64)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -128,7 +128,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\gtk;..\..\gdk;..\..\gdk\win32"
-				PreprocessorDefinitions="$(GtkDefinesX64)"
+				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -43,10 +43,6 @@
 		Name="GtkDefines"
 		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED"
 	/>
-	<UserMacro
-		Name="GtkDefinesX64"
-		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;x86_64-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED"
-	/>
 	<UserMacro
 		Name="GtkGdkCommonLibs"
 		Value="pangowin32-1.0.lib fribidi.lib imm32.lib"