Merge branch 'gtkbuilder-gbinding' into gtkbuilder-gbinding-transformgtkbuilder-gbinding-transform

123 files changed, 26490 insertions, 17895 deletions

diff --git a/NEWS b/NEWS
index e2ea52cda0..08169f50ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,43 @@
+Overview of Changes in GTK+ 3.1.14
+==================================
+
+* GtkTreeView:
+ - The GtkTreeModelFilter and GtkTreeModelSort implementations
+   have been improved and a comprehensive test suite has been added.
+
+* GtkFileChooser:
+ - The selected file(s) can now be copied to the clipboard
+
+* Bugs fixed:
+ 656851 Allow use of GVariant in GtkListStore
+ 344858 gtk_menu_item_new_with_label() created widget with refcount 2
+ 349502 option to copy full path in "Save AS"/"Open file" dialogs
+ 621076 GtkTreeModelFilter does not emit all signals in some situations
+ 634136 GtkTable::children accessor
+ 649588 crash when sending a notification: "Gdk-CRITICAL **: gdk_visual_...
+ 650762 gtk_misc_set_alignment replacement with the new API functions
+ 651827 Crash in check_application()
+ 656986 GtkSwitch is unusable when added to primary toolbar.
+ 657146 Missing files in POTFILEs.in
+ 657260 Gtk should use AtkWindow and remove that hack on GailUtil
+ 657359 Crash when specifying data length in gtk_css_provider_load_...
+ 657384 missing accessors for GdkEvent structures
+
+* Translation updates:
+ Galician
+ German
+ Gujarati
+ Indonesian
+ Norwegian bokmål
+ Persian
+ Russian
+ Serbian
+ Spanish
+ Swedish
+ Traditional Chinese
+ Uighur
+
+
 Overview of Changes in GTK+ 3.1.12
 ==================================
 
diff --git a/configure.ac b/configure.ac
index 15ceab3c43..38f9a2dc40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [1])
-m4_define([gtk_micro_version], [13])
+m4_define([gtk_micro_version], [15])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -41,7 +41,7 @@ m4_define([gtk_binary_version], [3.0.0])
 # required versions of other packages
 m4_define([glib_required_version], [2.29.14])
 m4_define([pango_required_version], [1.29.0])
-m4_define([atk_required_version], [1.30])
+m4_define([atk_required_version], [2.1.5])
 m4_define([cairo_required_version], [1.10.0])
 m4_define([gdk_pixbuf_required_version], [2.23.5])
 m4_define([introspection_required_version], [0.10.1])
@@ -383,7 +383,7 @@ if test "x$enable_wayland_backend" == "xyes"; then
   GIO_PACKAGE=gio-unix-2.0
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl"
+  WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl egl"
   AM_CONDITIONAL(USE_WAYLAND, true)
 else
   AM_CONDITIONAL(USE_WAYLAND, false)
@@ -1263,7 +1263,7 @@ LDFLAGS="$saved_ldflags"
 
 GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
 
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
 GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
@@ -1320,7 +1320,7 @@ if test x"$os_openbsd" = xyes; then
 fi
 
 GTK_EXTRA_CFLAGS=
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS"
+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB"
 GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
 if test x"$os_win32" = xyes; then
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 973307869c..2dac9ece83 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -73,7 +73,7 @@ EXTRA_DIST += 		\
 	demo.ui
 
 demos.h: @REBUILD@ $(demos) geninclude.pl
-	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
+	$(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
 gtk3_demo_SOURCES = 		\
 	$(demos)		\
diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c
index 36b7af25d1..a86b9aff16 100644
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -397,7 +397,8 @@ left_align_button_new (const char *label)
   GtkWidget *button = gtk_button_new_with_mnemonic (label);
   GtkWidget *child = gtk_bin_get_child (GTK_BIN (button));
 
-  gtk_misc_set_alignment (GTK_MISC (child), 0., 0.5);
+  gtk_widget_set_halign (child, GTK_ALIGN_START);
+  gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
 
   return button;
 }
diff --git a/demos/gtk-demo/pickers.c b/demos/gtk-demo/pickers.c
index e1f82ca02e..b7754b5626 100644
--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -33,33 +33,38 @@ do_pickers (GtkWidget *do_widget)
     gtk_container_set_border_width (GTK_CONTAINER (table), 10);
 
     label = gtk_label_new ("Color:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_color_button_new ();
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 0, 1);
 
     label = gtk_label_new ("Font:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_font_button_new ();
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 1, 2);
 
     label = gtk_label_new ("File:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_file_chooser_button_new ("Pick a File",
                                           GTK_FILE_CHOOSER_ACTION_OPEN);
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 2, 3);
 
     label = gtk_label_new ("Folder:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_file_chooser_button_new ("Pick a Folder",
                                           GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
 
     label = gtk_label_new ("Mail:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
     gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c
index e7a8595d15..5bc95b77e7 100644
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -46,7 +46,8 @@ add_row (GtkTable     *table,
   GtkWidget *label;
 
   label = gtk_label_new_with_mnemonic (label_text);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 1);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
+  gtk_widget_set_valign (label, GTK_ALIGN_END);
   gtk_table_attach (GTK_TABLE (table), label,
 		    0, 1,                  row, row + 1,
 		    GTK_EXPAND | GTK_FILL, 0,
diff --git a/demos/gtk-demo/ui_manager.c b/demos/gtk-demo/ui_manager.c
index 76ea246c76..293fd10885 100644
--- a/demos/gtk-demo/ui_manager.c
+++ b/demos/gtk-demo/ui_manager.c
@@ -205,7 +205,8 @@ do_ui_manager (GtkWidget *do_widget)
 
       label = gtk_label_new ("Type\n<alt>\nto start");
       gtk_widget_set_size_request (label, 200, 200);
-      gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
 
 
diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml
index 6534d352b8..7884d4ab87 100644
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -57,6 +57,10 @@
     <title>Index of new symbols in 3.0</title>
     <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-3-2" role="3.2">
+    <title>Index of new symbols in 3.2</title>
+    <xi:include href="xml/api-index-3.2.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 6f373f1c36..54934520de 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -761,11 +761,16 @@ gdk_event_put
 gdk_event_new
 gdk_event_copy
 gdk_event_free
-gdk_event_get_time
-gdk_event_get_state
 gdk_event_get_axis
+gdk_event_get_button
+gdk_event_get_click_count
 gdk_event_get_coords
+gdk_event_get_keycode
+gdk_event_get_keyval
 gdk_event_get_root_coords
+gdk_event_get_scroll_direction
+gdk_event_get_state
+gdk_event_get_time
 gdk_event_request_motions
 gdk_events_get_angle
 gdk_events_get_center
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 7ec6f1d82c..aca18e9a2d 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -5739,6 +5739,19 @@ gtk_css_provider_new
 gtk_css_provider_to_string
 GTK_CSS_PROVIDER_ERROR
 GtkCssProviderError
+<SUBSECTION>
+GtkCssSection
+GtkCssSectionType
+gtk_css_section_get_end_line
+gtk_css_section_get_end_position
+gtk_css_section_get_file
+gtk_css_section_get_parent
+gtk_css_section_get_section_type
+gtk_css_section_get_start_line
+gtk_css_section_get_start_position
+gtk_css_section_get_type
+gtk_css_section_ref
+gtk_css_section_unref
 <SUBSECTION Standard>
 GTK_TYPE_CSS_PROVIDER
 GTK_CSS_PROVIDER
@@ -5749,6 +5762,7 @@ GTK_IS_CSS_PROVIDER_CLASS
 <SUBSECTION Private>
 gtk_css_provider_get_type
 gtk_css_provider_error_quark
+gtk_css_section_get_type
 </SECTION>
 
 <SECTION>
@@ -6974,6 +6988,7 @@ GtkGrid
 gtk_grid_new
 gtk_grid_attach
 gtk_grid_attach_next_to
+gtk_grid_get_child_at
 gtk_grid_insert_row
 gtk_grid_insert_column
 gtk_grid_insert_next_to
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 04ca455dbf..86423c6bb6 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -156,10 +156,15 @@ gdk_event_copy
 gdk_event_free
 gdk_event_get
 gdk_event_get_axis
+gdk_event_get_button
+gdk_event_get_click_count
 gdk_event_get_coords
 gdk_event_get_device
+gdk_event_get_keycode
+gdk_event_get_keyval
 gdk_event_get_root_coords
 gdk_event_get_screen
+gdk_event_get_scroll_direction
 gdk_event_get_source_device
 gdk_event_get_state
 gdk_event_get_time
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 29dff076d0..ae42b4ffa4 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -950,6 +950,192 @@ gdk_event_get_root_coords (const GdkEvent *event,
 }
 
 /**
+ * gdk_event_get_button:
+ * @event: a #GdkEvent
+ * @button: (out): location to store mouse button number
+ *
+ * Extract the button number from an event.
+ *
+ * Return value: %TRUE if the event delivered a button number
+ *
+ * Since: 3.2
+ **/
+gboolean
+gdk_event_get_button (const GdkEvent *event,
+                      guint *button)
+{
+  gboolean fetched = TRUE;
+  guint number = 0;
+
+  g_return_val_if_fail (event != NULL, FALSE);
+  
+  switch (event->type)
+    {
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      number = event->button.button;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (button)
+    *button = number;
+
+  return fetched;
+}
+
+/**
+ * gdk_event_get_click_count:
+ * @event: a #GdkEvent
+ * @click_count: (out): location to store click count
+ *
+ * Extracts the click count from an event.
+ *
+ * Return value: %TRUE if the event delivered a click count
+ *
+ * Since: 3.2
+ */
+gboolean
+gdk_event_get_click_count (const GdkEvent *event,
+                           guint *click_count)
+{
+  gboolean fetched = TRUE;
+  guint number = 0;
+
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  switch (event->type)
+    {
+    case GDK_BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      number = 1;
+      break;
+    case GDK_2BUTTON_PRESS:
+      number = 2;
+      break;
+    case GDK_3BUTTON_PRESS:
+      number = 3;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (click_count)
+    *click_count = number;
+
+  return fetched;
+}
+
+/**
+ * gdk_event_get_keyval:
+ * @event: a #GdkEvent
+ * @keyval: (out): location to store the keyval
+ *
+ * Extracts the keyval from an event.
+ *
+ * Return value: %TRUE if the event delivered a key symbol
+ *
+ * Since: 3.2
+ */
+gboolean
+gdk_event_get_keyval (const GdkEvent *event,
+                      guint *keyval)
+{
+  gboolean fetched = TRUE;
+  guint number = 0;
+
+  switch (event->type)
+    {
+    case GDK_KEY_PRESS:
+    case GDK_KEY_RELEASE:
+      number = event->key.keyval;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (keyval)
+    *keyval = number;
+
+  return fetched;
+}
+
+/**
+ * gdk_event_get_keycode:
+ * @event: a #GdkEvent
+ * @keycode: (out): location to store the keycode
+ *
+ * Extracts the hardware keycode from an event.
+ *
+ * Return value: %TRUE if the event delivered a hardware keycode
+ *
+ * Since: 3.2
+ */
+gboolean
+gdk_event_get_keycode (const GdkEvent *event,
+                       guint16 *keycode)
+{
+  gboolean fetched = TRUE;
+  guint16 number = 0;
+
+  switch (event->type)
+    {
+    case GDK_KEY_PRESS:
+    case GDK_KEY_RELEASE:
+      number = event->key.hardware_keycode;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (keycode)
+    *keycode = number;
+
+  return fetched;
+}
+
+/**
+ * gdk_event_get_scroll_direction:
+ * @event: a #GdkEvent
+ * @direction: (out): location to store the scroll direction
+ *
+ * Extracts the scroll direction from an event.
+ *
+ * Return value: %TRUE if the event delivered a scroll direction
+ *
+ * Since: 3.2
+ */
+gboolean
+gdk_event_get_scroll_direction (const GdkEvent *event,
+                                GdkScrollDirection *direction)
+{
+  gboolean fetched = TRUE;
+  GdkScrollDirection dir = 0;
+
+  switch (event->type)
+    {
+    case GDK_SCROLL:
+      dir = event->scroll.direction;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (direction)
+    *direction = dir;
+
+  return fetched;
+}
+
+/**
  * gdk_event_get_axis:
  * @event: a #GdkEvent
  * @axis_use: the axis use to look for
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index f1684ba66e..8bf7d565d6 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -1054,9 +1054,19 @@ gboolean  gdk_event_get_state           (const GdkEvent  *event,
 gboolean  gdk_event_get_coords		(const GdkEvent  *event,
 					 gdouble	 *x_win,
 					 gdouble	 *y_win);
-gboolean  gdk_event_get_root_coords	(const GdkEvent  *event,
-					 gdouble	 *x_root,
-					 gdouble	 *y_root);
+gboolean  gdk_event_get_root_coords	(const GdkEvent *event,
+					 gdouble	*x_root,
+					 gdouble	*y_root);
+gboolean  gdk_event_get_button          (const GdkEvent *event,
+                                         guint          *button);
+gboolean  gdk_event_get_click_count     (const GdkEvent *event,
+                                         guint          *click_count);
+gboolean  gdk_event_get_keyval          (const GdkEvent *event,
+                                         guint          *keyval);
+gboolean  gdk_event_get_keycode         (const GdkEvent *event,
+                                         guint16        *keycode);
+gboolean gdk_event_get_scroll_direction (const GdkEvent *event,
+                                         GdkScrollDirection *direction);
 gboolean  gdk_event_get_axis            (const GdkEvent  *event,
                                          GdkAxisUse       axis_use,
                                          gdouble         *value);
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 194d7633e5..b2be78b34d 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -400,9 +400,11 @@ gdk_wayland_create_cairo_surface (GdkDisplayWayland *display,
     display->create_image(display->egl_display, NULL, EGL_NATIVE_PIXMAP_KHR,
 			  (EGLClientBuffer) data->pixmap, NULL);
 
+  cairo_device_acquire(display->cairo_device);
   glGenTextures(1, &data->texture);
   glBindTexture(GL_TEXTURE_2D, data->texture);
   display->image_target_texture_2d(GL_TEXTURE_2D, data->image);
+  cairo_device_release(display->cairo_device);
 
   surface = cairo_gl_surface_create_for_texture(display->cairo_device,
 						CAIRO_CONTENT_COLOR_ALPHA,
diff --git a/gtk+.doap b/gtk+.doap
index 290a3619b6..880b977f51 100644
--- a/gtk+.doap
+++ b/gtk+.doap
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
          xmlns:foaf="http://xmlns.com/foaf/0.1/"
@@ -5,6 +6,7 @@
          xmlns="http://usefulinc.com/ns/doap#">
 
   <name xml:lang="en">Gtk+</name>
+  <shortname>gtk+</shortname>
   <shortdesc xml:lang="en">Multi-platform toolkit</shortdesc>
   <description xml:lang="en">GTK+ is a multi-platform toolkit for creating graphical user
 interfaces. Offering a complete set of widgets, GTK+ is suitable for
@@ -21,6 +23,9 @@ licensing terms for GTK+, the GNU LGPL, allow it to be used by all
 developers, including those developing proprietary software, without
 any license fees or royalties.</description>
   <homepage rdf:resource="http://www.gtk+.org/" />
+  <license rdf:resource="http://usefulinc.com/doap/licenses/lgpl" />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B" />
+  <download-page rdf:resource="http://download.gnome.org/sources/gtk+/" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gtk-list" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gtk-app-devel-list" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gtk-devel-list" />
@@ -29,6 +34,15 @@ any license fees or royalties.</description>
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gtk-perl-list" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/language-bindings" />
 
+  <programming-language>C</programming-language>
+
+  <repository>
+    <GitRepository>
+        <browse rdf:resource="http://git.gnome.org/browse/gtk+/"/>
+      <location rdf:resource="git://git.gnome.org/gtk+"/>
+    </GitRepository>
+  </repository>
+
   <maintainer>
     <foaf:Person>
       <foaf:name>Matthias Clasen</foaf:name>
@@ -43,4 +57,5 @@ any license fees or royalties.</description>
       <gnome:userid>timj</gnome:userid>
     </foaf:Person>
   </maintainer>
+
 </Project>
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2ddfab1e38..f6d6ee1fa4 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -199,6 +199,7 @@ gtk_public_h_sources = 		\
 	gtkcomboboxtext.h	\
 	gtkcontainer.h		\
 	gtkcssprovider.h	\
+	gtkcsssection.h 	\
 	gtkdebug.h		\
 	gtkdialog.h		\
 	gtkdnd.h		\
@@ -394,6 +395,7 @@ gtk_private_h_sources =		\
 	gtkcontainerprivate.h   \
 	gtkcssparserprivate.h	\
 	gtkcssproviderprivate.h	\
+	gtkcsssectionprivate.h 	\
 	gtkcssselectorprivate.h	\
 	gtkcsstypesprivate.h	\
 	gtkcustompaperunixdialog.h \
@@ -526,6 +528,7 @@ gtk_base_c_sources = 		\
 	gtkcontainer.c		\
 	gtkcssparser.c		\
 	gtkcssprovider.c	\
+	gtkcsssection.c 	\
 	gtkcssselector.c	\
 	gtkcsstypes.c		\
 	gtkdialog.c		\
@@ -843,7 +846,8 @@ gtk_extra_sources =				\
 	gtkstatusicon-quartz.c			\
 	gtk.symbols				\
 	gtkversion.h.in				\
-	gtkmarshalers.list
+	gtkmarshalers.list			\
+	fallback-c89.c
 
 #
 # setup GTK+ sources and their dependencies
diff --git a/gtk/a11y/gailutil.c b/gtk/a11y/gailutil.c
index b835b02696..e9ca92b007 100644
--- a/gtk/a11y/gailutil.c
+++ b/gtk/a11y/gailutil.c
@@ -1,4 +1,5 @@
 /* GAIL - The GNOME Accessibility Implementation Library
+ * Copyright 2011, F123 Consulting & Mais Diferenças
  * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -270,26 +271,7 @@ gail_util_add_global_event_listener (GSignalEmissionHook  listener,
 
   split_string = g_strsplit (event_type, ":", 3);
 
-  if (split_string)
-    {
-      if (!g_strcmp0 ("window", split_string[0]))
-        {
-          static gboolean initialized = FALSE;
-
-          if (!initialized)
-            {
-              do_window_event_initialization ();
-              initialized = TRUE;
-            }
-          rc = add_listener (listener, "GtkWindowAccessible", split_string[1], event_type);
-        }
-      else
-        {
-          rc = add_listener (listener, split_string[1], split_string[2], event_type);
-        }
-
-      g_strfreev (split_string);
-    }
+  rc = add_listener (listener, split_string[1], split_string[2], event_type);
 
   return rc;
 }
@@ -494,4 +476,5 @@ _gail_util_install (void)
   atk_class->get_toolkit_version = gail_util_get_toolkit_version;
 
   listener_list = g_hash_table_new_full (g_int_hash, g_int_equal, NULL, g_free);
+  do_window_event_initialization ();
 }
diff --git a/gtk/a11y/gtkimagecellaccessible.c b/gtk/a11y/gtkimagecellaccessible.c
index 4b356602e0..1db1470833 100644
--- a/gtk/a11y/gtkimagecellaccessible.c
+++ b/gtk/a11y/gtkimagecellaccessible.c
@@ -129,6 +129,9 @@ gtk_image_cell_accessible_get_image_size (AtkImage *image,
   GtkCellRenderer *cell_renderer;
   GdkPixbuf *pixbuf = NULL;
 
+  *width = 0;
+  *height = 0;
+
   cell_renderer = GTK_RENDERER_CELL_ACCESSIBLE (cell)->renderer;
   g_object_get (GTK_CELL_RENDERER_PIXBUF (cell_renderer),
                 "pixbuf", &pixbuf,
diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c
index b82af485f7..6c1a8cedcf 100644
--- a/gtk/a11y/gtkwindowaccessible.c
+++ b/gtk/a11y/gtkwindowaccessible.c
@@ -1,4 +1,5 @@
 /* GAIL - The GNOME Accessibility Implementation Library
+ * Copyright 2011, F123 Consulting & Mais Diferenças
  * Copyright 2001, 2002, 2003 Sun Microsystems Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -24,20 +25,6 @@
 #include "gtkwindowaccessible.h"
 #include "gtktoplevelaccessible.h"
 
-enum {
-  ACTIVATE,
-  CREATE,
-  DEACTIVATE,
-  DESTROY,
-  MAXIMIZE,
-  MINIMIZE,
-  MOVE,
-  RESIZE,
-  RESTORE,
-  LAST_SIGNAL
-};
-
-
 /* atkcomponent.h */
 
 static void                  gtk_window_accessible_get_extents      (AtkComponent         *component,
@@ -50,12 +37,16 @@ static void                  gtk_window_accessible_get_size         (AtkComponen
                                                            gint                 *width,
                                                            gint                 *height);
 
-static guint gtk_window_accessible_signals [LAST_SIGNAL] = { 0, };
-
 static void atk_component_interface_init (AtkComponentIface *iface);
+static void atk_window_interface_init (AtkWindowIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkWindowAccessible, _gtk_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
+G_DEFINE_TYPE_WITH_CODE (GtkWindowAccessible,
+                         _gtk_window_accessible,
+                         GTK_TYPE_CONTAINER_ACCESSIBLE,
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT,
+                                                atk_component_interface_init)
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_WINDOW,
+                                                atk_window_interface_init));
 
 
 static void
@@ -306,79 +297,6 @@ _gtk_window_accessible_class_init (GtkWindowAccessibleClass *klass)
   class->ref_state_set = gtk_window_accessible_ref_state_set;
   class->initialize = gtk_window_accessible_initialize;
   class->focus_event = gtk_window_accessible_focus_event;
-
-  gtk_window_accessible_signals [ACTIVATE] =
-    g_signal_new ("activate",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-  gtk_window_accessible_signals [CREATE] =
-    g_signal_new ("create",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-  gtk_window_accessible_signals [DEACTIVATE] =
-    g_signal_new ("deactivate",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-  gtk_window_accessible_signals [DESTROY] =
-    g_signal_new ("destroy",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-  gtk_window_accessible_signals [MAXIMIZE] =
-    g_signal_new ("maximize",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-  gtk_window_accessible_signals [MINIMIZE] =
-    g_signal_new ("minimize",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-  gtk_window_accessible_signals [MOVE] =
-    g_signal_new ("move",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-  gtk_window_accessible_signals [RESIZE] =
-    g_signal_new ("resize",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
-  gtk_window_accessible_signals [RESTORE] =
-    g_signal_new ("restore",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
 }
 
 static void
@@ -466,3 +384,9 @@ atk_component_interface_init (AtkComponentIface *iface)
   iface->get_extents = gtk_window_accessible_get_extents;
   iface->get_size = gtk_window_accessible_get_size;
 }
+
+static void
+atk_window_interface_init (AtkWindowIface *iface)
+{
+  /* At this moment AtkWindow is just about signals */
+}
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 7e2526e5b0..a2813e9b0d 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -82,6 +82,7 @@
 #include <gtk/gtkcomboboxtext.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkcssprovider.h>
+#include <gtk/gtkcsssection.h>
 #include <gtk/gtkdebug.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkdnd.h>
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 2c95bdf87f..c21babf4f7 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -701,6 +701,17 @@ gtk_css_provider_load_from_file
 gtk_css_provider_load_from_path
 gtk_css_provider_new
 gtk_css_provider_to_string
+gtk_css_section_get_end_line
+gtk_css_section_get_end_position
+gtk_css_section_get_file
+gtk_css_section_get_parent
+gtk_css_section_get_section_type
+gtk_css_section_get_start_line
+gtk_css_section_get_start_position
+gtk_css_section_get_type
+gtk_css_section_ref
+gtk_css_section_type_get_type
+gtk_css_section_unref
 #ifdef G_OS_UNIX
 gtk_custom_paper_unix_dialog_get_type
 #endif
@@ -1104,6 +1115,7 @@ gtk_grab_get_current
 gtk_grab_remove
 gtk_grid_attach
 gtk_grid_attach_next_to
+gtk_grid_get_child_at
 gtk_grid_get_column_homogeneous
 gtk_grid_get_column_spacing
 gtk_grid_get_row_homogeneous
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index ae6c91865f..a9e9efbd87 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -37,7 +37,7 @@
 #include "gtkbbox.h"
 #include "gtkdialog.h"
 #include "gtkgrid.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtklinkbutton.h"
@@ -47,7 +47,6 @@
 #include "gtkscrolledwindow.h"
 #include "gtkstock.h"
 #include "gtktextview.h"
-#include "gtkvbox.h"
 #include "gtkiconfactory.h"
 #include "gtkshow.h"
 #include "gtkmainprivate.h"
@@ -2240,7 +2239,8 @@ add_credits_section (GtkAboutDialog *about,
   label = gtk_label_new (markup);
   gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
   g_free (markup);
-  gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_END);
+  gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_grid_attach (grid, label, 0, *row, 1, 1);
 
   for (p = people; *p; p++)
@@ -2329,7 +2329,8 @@ add_credits_section (GtkAboutDialog *about,
       label = gtk_label_new (str->str);
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       g_string_free (str, TRUE);
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_grid_attach (grid, label, 1, *row, 1, 1);
       (*row)++;
     }
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index faf469a7e3..5f8c5396e2 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -481,40 +481,56 @@ refetch_widget_accel_closure (GtkAccelLabel *accel_label)
   gtk_accel_label_set_accel_closure (accel_label, closure);
 }
 
+static void
+accel_widget_weak_ref_cb (GtkAccelLabel *accel_label,
+                          GtkWidget     *old_accel_widget)
+{
+  g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
+  g_return_if_fail (GTK_IS_WIDGET (accel_label->priv->accel_widget));
+
+  g_signal_handlers_disconnect_by_func (accel_label->priv->accel_widget,
+                                        refetch_widget_accel_closure,
+                                        accel_label);
+  accel_label->priv->accel_widget = NULL;
+  g_object_notify (G_OBJECT (accel_label), "accel-widget");
+}
+
 /**
  * gtk_accel_label_set_accel_widget:
  * @accel_label: a #GtkAccelLabel
  * @accel_widget: the widget to be monitored.
  *
- * Sets the widget to be monitored by this accelerator label. 
- **/
+ * Sets the widget to be monitored by this accelerator label.
+ */
 void
 gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label,
-				  GtkWidget     *accel_widget)
+                                  GtkWidget     *accel_widget)
 {
   g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
   if (accel_widget)
     g_return_if_fail (GTK_IS_WIDGET (accel_widget));
-    
+
   if (accel_widget != accel_label->priv->accel_widget)
     {
       if (accel_label->priv->accel_widget)
-	{
-	  gtk_accel_label_set_accel_closure (accel_label, NULL);
-	  g_signal_handlers_disconnect_by_func (accel_label->priv->accel_widget,
-						refetch_widget_accel_closure,
-						accel_label);
-	  g_object_unref (accel_label->priv->accel_widget);
-	}
+        {
+          gtk_accel_label_set_accel_closure (accel_label, NULL);
+          g_signal_handlers_disconnect_by_func (accel_label->priv->accel_widget,
+                                                refetch_widget_accel_closure,
+                                                accel_label);
+          g_object_weak_unref (G_OBJECT (accel_label->priv->accel_widget),
+                               (GWeakNotify) accel_widget_weak_ref_cb, accel_label);
+        }
       accel_label->priv->accel_widget = accel_widget;
       if (accel_label->priv->accel_widget)
-	{
-	  g_object_ref (accel_label->priv->accel_widget);
-	  g_signal_connect_object (accel_label->priv->accel_widget, "accel-closures-changed",
-				   G_CALLBACK (refetch_widget_accel_closure),
-				   accel_label, G_CONNECT_SWAPPED);
-	  refetch_widget_accel_closure (accel_label);
-	}
+        {
+          g_object_weak_ref (G_OBJECT (accel_label->priv->accel_widget),
+                             (GWeakNotify) accel_widget_weak_ref_cb, accel_label);
+          g_signal_connect_object (accel_label->priv->accel_widget, "accel-closures-changed",
+                                   G_CALLBACK (refetch_widget_accel_closure),
+                                   accel_label, G_CONNECT_SWAPPED);
+          refetch_widget_accel_closure (accel_label);
+        }
       g_object_notify (G_OBJECT (accel_label), "accel-widget");
     }
 }
diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c
index b9cc244322..fbcd99dde6 100644
--- a/gtk/gtkappchooserbutton.c
+++ b/gtk/gtkappchooserbutton.c
@@ -214,6 +214,8 @@ other_application_dialog_response_cb (GtkDialog *dialog,
 
   info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (dialog));
 
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+
   /* refresh the combobox to get the new application */
   gtk_app_chooser_refresh (GTK_APP_CHOOSER (self));
   gtk_app_chooser_button_select_application (self, info);
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 3f1b798f6e..5412e7a91e 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -212,6 +212,12 @@ check_application (GtkAppChooserDialog  *self,
   command = NULL;
 
   info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
+  if (info == NULL)
+    {
+      *app_out = NULL;
+      return FALSE;
+    }
+
   command = g_app_info_get_executable (info);
 
   g_shell_parse_argv (command, &argc, &argv, &error);
@@ -258,13 +264,15 @@ add_or_find_application (GtkAppChooserDialog *self)
 
   app = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self));
 
-  /* we don't care about reporting errors here */
-  if (self->priv->content_type)
-    g_app_info_set_as_last_used_for_type (app,
-					  self->priv->content_type,
-					  NULL);
-
-  g_object_unref (app);
+  if (app)
+    {
+      /* we don't care about reporting errors here */
+      if (self->priv->content_type)
+        g_app_info_set_as_last_used_for_type (app,
+                                              self->priv->content_type,
+                                              NULL);
+      g_object_unref (app);
+    }
 }
 
 static void
@@ -477,8 +485,8 @@ build_dialog_ui (GtkAppChooserDialog *self)
 {
   GtkWidget *vbox;
   GtkWidget *vbox2;
-  GtkWidget *label;
   GtkWidget *button, *w;
+  GAppInfo *info;
 
   gtk_container_set_border_width (GTK_CONTAINER (self), 5);
 
@@ -492,7 +500,8 @@ build_dialog_ui (GtkAppChooserDialog *self)
   gtk_widget_show (vbox2);
 
   self->priv->label = gtk_label_new ("");
-  gtk_misc_set_alignment (GTK_MISC (self->priv->label), 0, 0.5);
+  gtk_widget_set_halign (self->priv->label, GTK_ALIGN_START);
+  gtk_widget_set_valign (self->priv->label, GTK_ALIGN_CENTER);
   gtk_label_set_line_wrap (GTK_LABEL (self->priv->label), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox2), self->priv->label,
                       FALSE, FALSE, 0);
@@ -527,23 +536,14 @@ build_dialog_ui (GtkAppChooserDialog *self)
                          GTK_STOCK_CANCEL,
                          GTK_RESPONSE_CANCEL);
 
-  /* Create a custom stock icon */
-  self->priv->button = gtk_button_new ();
-
-  label = gtk_label_new_with_mnemonic (_("_Select"));
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (self->priv->button));
-  gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
-  gtk_widget_show (label);
-  self->priv->open_label = label;
+  self->priv->button = gtk_dialog_add_button (GTK_DIALOG (self),
+                                              _("_Select"),
+                                              GTK_RESPONSE_OK);
 
-  gtk_container_add (GTK_CONTAINER (self->priv->button),
-                     self->priv->open_label);
-
-  gtk_widget_show (self->priv->button);
-  gtk_widget_set_can_default (self->priv->button, TRUE);
-
-  gtk_dialog_add_action_widget (GTK_DIALOG (self),
-                                self->priv->button, GTK_RESPONSE_OK);
+  info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
+  gtk_widget_set_sensitive (self->priv->button, info != NULL);
+  if (info)
+    g_object_unref (info);
 
   gtk_dialog_set_default_response (GTK_DIALOG (self),
                                    GTK_RESPONSE_OK);
diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c
index 8b3ab9d365..551c1ddbb6 100644
--- a/gtk/gtkappchooserwidget.c
+++ b/gtk/gtkappchooserwidget.c
@@ -1176,7 +1176,7 @@ gtk_app_chooser_widget_init (GtkAppChooserWidget *self)
   gtk_widget_show (self->priv->program_list);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->program_list));
-  gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
   gtk_tree_selection_set_select_function (selection, gtk_app_chooser_selection_func,
                                           self, NULL);
   g_signal_connect_swapped (selection, "changed",
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index aa3fe63b18..d48eea49fc 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -49,8 +49,7 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkimage.h"
-#include "gtkhbox.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkstock.h"
 #include "gtkiconfactory.h"
 #include "gtkactivatable.h"
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index c83279a335..a2ab2b42e4 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -40,7 +40,7 @@
 #include "gtkdnd.h"
 #include "gtkdrawingarea.h"
 #include "gtkframe.h"
-#include "gtktable.h"
+#include "gtkgrid.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkimage.h"
@@ -49,7 +49,6 @@
 #include "gtkscale.h"
 #include "gtkentry.h"
 #include "gtkbutton.h"
-#include "gtkinvisible.h"
 #include "gtkmenuitem.h"
 #include "gtkmain.h"
 #include "gtksettings.h"
@@ -444,15 +443,15 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
 
   top_right_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (top_hbox), top_right_vbox, FALSE, FALSE, 0);
-  table = gtk_table_new (8, 6, FALSE);
+  table = gtk_grid_new ();
   gtk_box_pack_start (GTK_BOX (top_right_vbox), table, FALSE, FALSE, 0);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 12);
 
   make_label_spinbutton (colorsel, &priv->hue_spinbutton, _("_Hue:"), table, 0, 0, COLORSEL_HUE,
                          _("Position on the color wheel."));
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (priv->hue_spinbutton), TRUE);
-  make_label_spinbutton (colorsel, &priv->sat_spinbutton, _("_Saturation:"), table, 0, 1, COLORSEL_SATURATION,
+  make_label_spinbutton (colorsel, &priv->sat_spinbutton, _("S_aturation:"), table, 0, 1, COLORSEL_SATURATION,
                          _("Intensity of the color."));
   make_label_spinbutton (colorsel, &priv->val_spinbutton, _("_Value:"), table, 0, 2, COLORSEL_VALUE,
                          _("Brightness of the color."));
@@ -462,12 +461,12 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
                          _("Amount of green light in the color."));
   make_label_spinbutton (colorsel, &priv->blue_spinbutton, _("_Blue:"), table, 6, 2, COLORSEL_BLUE,
                          _("Amount of blue light in the color."));
-  gtk_table_attach_defaults (GTK_TABLE (table), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), 0, 8, 3, 4);
+  gtk_grid_attach (GTK_GRID (table), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), 0, 3, 8, 1);
 
   priv->opacity_label = gtk_label_new_with_mnemonic (_("Op_acity:"));
   gtk_widget_set_halign (priv->opacity_label, GTK_ALIGN_START);
   gtk_widget_set_valign (priv->opacity_label, GTK_ALIGN_CENTER);
-  gtk_table_attach_defaults (GTK_TABLE (table), priv->opacity_label, 0, 1, 4, 5);
+  gtk_grid_attach (GTK_GRID (table), priv->opacity_label, 0, 4, 1, 1);
   adjust = gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 1.0, 0.0);
   g_object_set_data (G_OBJECT (adjust), I_("COLORSEL"), colorsel);
   priv->opacity_slider = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjust);
@@ -479,7 +478,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   g_signal_connect (adjust, "value-changed",
                     G_CALLBACK (adjustment_changed),
                     GINT_TO_POINTER (COLORSEL_OPACITY));
-  gtk_table_attach_defaults (GTK_TABLE (table), priv->opacity_slider, 1, 7, 4, 5);
+  gtk_grid_attach (GTK_GRID (table), priv->opacity_slider, 1, 4, 6, 1);
   priv->opacity_entry = gtk_entry_new ();
   gtk_widget_set_tooltip_text (priv->opacity_entry,
                         _("Transparency of the color."));
@@ -487,10 +486,10 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
 
   g_signal_connect (priv->opacity_entry, "activate",
                     G_CALLBACK (opacity_entry_changed), colorsel);
-  gtk_table_attach_defaults (GTK_TABLE (table), priv->opacity_entry, 7, 8, 4, 5);
+  gtk_grid_attach (GTK_GRID (table), priv->opacity_entry, 7, 4, 1, 1);
 
   label = gtk_label_new_with_mnemonic (_("Color _name:"));
-  gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 5, 1, 1);
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   priv->hex_entry = gtk_entry_new ();
@@ -509,7 +508,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
                           "in this entry."));
 
   gtk_entry_set_width_chars (GTK_ENTRY (priv->hex_entry), 7);
-  gtk_table_attach_defaults (GTK_TABLE (table), priv->hex_entry, 1, 5, 5, 6);
+  gtk_grid_attach (GTK_GRID (table), priv->hex_entry, 1, 5, 4, 1);
 
   focus_chain = g_list_append (focus_chain, priv->hue_spinbutton);
   focus_chain = g_list_append (focus_chain, priv->sat_spinbutton);
@@ -524,9 +523,9 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   g_list_free (focus_chain);
 
   /* Set up the palette */
-  table = gtk_table_new (GTK_CUSTOM_PALETTE_HEIGHT, GTK_CUSTOM_PALETTE_WIDTH, TRUE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 1);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 1);
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 1);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 1);
   for (i = 0; i < GTK_CUSTOM_PALETTE_WIDTH; i++)
     {
       for (j = 0; j < GTK_CUSTOM_PALETTE_HEIGHT; j++)
@@ -2177,8 +2176,8 @@ make_label_spinbutton (GtkColorSelection *colorsel,
 
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-  gtk_table_attach_defaults (GTK_TABLE (table), label, i, i+1, j, j+1);
-  gtk_table_attach_defaults (GTK_TABLE (table), *spinbutton, i+1, i+2, j, j+1);
+  gtk_grid_attach (GTK_GRID (table), label, i, j, 1, 1);
+  gtk_grid_attach (GTK_GRID (table), *spinbutton, i+1, j, 1, 1);
 }
 
 static void
@@ -2196,7 +2195,7 @@ make_palette_frame (GtkColorSelection *colorsel,
   priv->custom_palette[i][j] = palette_new (colorsel);
   gtk_widget_set_size_request (priv->custom_palette[i][j], CUSTOM_PALETTE_ENTRY_WIDTH, CUSTOM_PALETTE_ENTRY_HEIGHT);
   gtk_container_add (GTK_CONTAINER (frame), priv->custom_palette[i][j]);
-  gtk_table_attach_defaults (GTK_TABLE (table), frame, i, i+1, j, j+1);
+  gtk_grid_attach (GTK_GRID (table), frame, i, j, 1, 1);
 }
 
 /* Set the palette entry [x][y] to be the currently selected one. */
diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c
index 627efa97c3..a8a77e7177 100644
--- a/gtk/gtkcolorseldialog.c
+++ b/gtk/gtkcolorseldialog.c
@@ -190,17 +190,17 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
   gtk_color_selection_set_has_opacity_control (GTK_COLOR_SELECTION (priv->colorsel), FALSE);
   gtk_container_add (GTK_CONTAINER (content_area), priv->colorsel);
   gtk_widget_show (priv->colorsel);
-  
+
   priv->cancel_button = gtk_dialog_add_button (dialog,
                                                GTK_STOCK_CANCEL,
                                                GTK_RESPONSE_CANCEL);
 
   priv->ok_button = gtk_dialog_add_button (dialog,
-                                           GTK_STOCK_OK,
+                                           _("_Select"),
                                            GTK_RESPONSE_OK);
-                                                   
+
   gtk_widget_grab_default (priv->ok_button);
-  
+
   priv->help_button = gtk_dialog_add_button (dialog,
                                              GTK_STOCK_HELP,
                                              GTK_RESPONSE_HELP);
diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h
index 41d6807d84..aeaa507ced 100644
--- a/gtk/gtkcolorseldialog.h
+++ b/gtk/gtkcolorseldialog.h
@@ -33,7 +33,6 @@
 
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkcolorsel.h>
-#include <gtk/gtkvbox.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 6986db25d8..0b82c2240d 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -28,7 +28,7 @@
 #include "gtkcellview.h"
 #include "gtkeventbox.h"
 #include "gtkframe.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkliststore.h"
 #include "gtkmain.h"
 #include "gtkmenuprivate.h"
diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c
index e9fe6a4fdb..2d6a4df3d0 100644
--- a/gtk/gtkcssparser.c
+++ b/gtk/gtkcssparser.c
@@ -61,7 +61,7 @@ _gtk_css_parser_new (const char            *data,
   parser->user_data = user_data;
 
   parser->line_start = data;
-  parser->line = 1;
+  parser->line = 0;
 
   return parser;
 }
@@ -875,17 +875,20 @@ _gtk_css_parser_resync_internal (GtkCssParser *parser,
       case '(':
         parser->data++;
         _gtk_css_parser_resync (parser, FALSE, ')');
-        parser->data++;
+        if (*parser->data)
+          parser->data++;
         break;
       case '[':
         parser->data++;
         _gtk_css_parser_resync (parser, FALSE, ']');
-        parser->data++;
+        if (*parser->data)
+          parser->data++;
         break;
       case '{':
         parser->data++;
         _gtk_css_parser_resync (parser, FALSE, '}');
-        parser->data++;
+        if (*parser->data)
+          parser->data++;
         if (sync_at_semicolon || !terminator)
           {
             _gtk_css_parser_skip_whitespace (parser);
@@ -902,6 +905,8 @@ _gtk_css_parser_resync_internal (GtkCssParser *parser,
           }
         parser->data++;
         continue;
+      case '\0':
+        break;
       case '/':
       default:
         parser->data++;
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 984618541e..dd73322ec5 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -28,6 +28,7 @@
 #include "gtkcssproviderprivate.h"
 
 #include "gtkcssparserprivate.h"
+#include "gtkcsssectionprivate.h"
 #include "gtkcssselectorprivate.h"
 #include "gtksymboliccolor.h"
 #include "gtkstyleprovider.h"
@@ -964,12 +965,11 @@ struct _GtkCssScanner
 {
   GtkCssProvider *provider;
   GtkCssParser *parser;
+  GtkCssSection *section;
   GtkCssScanner *parent;
   GFile *file;
   GFile *base;
   GSList *state;
-  GSList *cur_selectors;
-  GHashTable *cur_properties;
 };
 
 struct _GtkCssProviderPrivate
@@ -1022,7 +1022,6 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
                                 GtkCssScanner  *scanner,
                                 GFile          *file,
                                 const char     *data,
-                                gsize           length,
                                 GError        **error);
 
 GQuark
@@ -1037,10 +1036,8 @@ G_DEFINE_TYPE_EXTENDED (GtkCssProvider, gtk_css_provider, G_TYPE_OBJECT, 0,
 
 static void
 gtk_css_provider_parsing_error (GtkCssProvider  *provider,
-                                const gchar     *path,
-                                guint            line,
-                                guint            position,
-                                const GError *   error)
+                                GtkCssSection   *section,
+                                const GError    *error)
 {
   /* Only emit a warning when we have no error handlers. This is our
    * default handlers. And in this case erroneous CSS files are a bug
@@ -1053,7 +1050,34 @@ gtk_css_provider_parsing_error (GtkCssProvider  *provider,
                                      0,
                                      TRUE))
     {
-      g_warning ("Theme parsing error: %s:%u:%u: %s", path ? path : "<unknown>", line, position, error->message);
+      GFileInfo *info;
+      GFile *file;
+      const char *path;
+
+      file = gtk_css_section_get_file (section);
+      if (file)
+        {
+          GFileInfo *info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, 0, NULL, NULL);
+
+          if (info)
+            path = g_file_info_get_display_name (info);
+          else
+            path = "<broken file>";
+        }
+      else
+        {
+          info = NULL;
+          path = "<data>";
+        }
+
+      g_warning ("Theme parsing error: %s:%u:%u: %s",
+                 path,
+                 gtk_css_section_get_end_line (section) + 1,
+                 gtk_css_section_get_end_position (section),
+                 error->message);
+
+      if (info)
+        g_object_unref (info);
     }
 }
 
@@ -1065,11 +1089,7 @@ gtk_css_provider_class_init (GtkCssProviderClass *klass)
   /**
    * GtkCssProvider::parsing-error:
    * @provider: the provider that had a parsing error
-   * @path: path to the parsed file or %NULL if the file cannot be
-   *   identified or the data was not loaded from a file
-   * @line: line in the file or data or 0 if unknown
-   * @position: offset into the current line or 0 if unknown or the
-   *   whole line is affected
+   * @section: section the error happened in
    * @error: The parsing error
    *
    * Signals that a parsing error occured. the @path, @line and @position
@@ -1090,9 +1110,8 @@ gtk_css_provider_class_init (GtkCssProviderClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkCssProviderClass, parsing_error),
                   NULL, NULL,
-                  _gtk_marshal_VOID__STRING_UINT_UINT_BOXED,
-                  G_TYPE_NONE, 4,
-                  G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_ERROR);
+                  _gtk_marshal_VOID__BOXED_BOXED,
+                  G_TYPE_NONE, 2, GTK_TYPE_CSS_SECTION, G_TYPE_ERROR);
 
   object_class->finalize = gtk_css_provider_finalize;
 
@@ -1102,27 +1121,6 @@ gtk_css_provider_class_init (GtkCssProviderClass *klass)
 }
 
 static void
-gtk_css_provider_take_error_full (GtkCssProvider *provider,
-                                  GFile          *file,
-                                  guint           line,
-                                  guint           position,
-                                  GError         *error)
-{
-  char *filename;
-
-  if (file)
-    filename = g_file_get_path (file);
-  else
-    filename = NULL;
-
-  g_signal_emit (provider, css_provider_signals[PARSING_ERROR], 0,
-                 filename, line, position, error);
-
-  g_free (filename);
-  g_error_free (error);
-}
-
-static void
 gtk_css_ruleset_init_copy (GtkCssRuleset       *new,
                            const GtkCssRuleset *ruleset,
                            GtkCssSelector      *selector)
@@ -1149,19 +1147,39 @@ gtk_css_ruleset_clear (GtkCssRuleset *ruleset)
   memset (ruleset, 0, sizeof (GtkCssRuleset));
 }
 
+typedef struct _PropertyValue PropertyValue;
+struct _PropertyValue {
+  GtkCssSection *section;
+  GValue         value;
+};
+
+static PropertyValue *
+property_value_new (GtkCssSection *section)
+{
+  PropertyValue *value;
+
+  value = g_slice_new0 (PropertyValue);
+
+  value->section = gtk_css_section_ref (section);
+
+  return value;
+}
+
 static void
-property_value_free (GValue *value)
+property_value_free (PropertyValue *value)
 {
-  if (G_IS_VALUE (value))
-    g_value_unset (value);
+  if (G_IS_VALUE (&value->value))
+    g_value_unset (&value->value);
+
+  gtk_css_section_unref (value->section);
 
-  g_slice_free (GValue, value);
+  g_slice_free (PropertyValue, value);
 }
 
 static void
 gtk_css_ruleset_add_style (GtkCssRuleset *ruleset,
                            char          *name,
-                           GValue        *value)
+                           PropertyValue *value)
 {
   if (ruleset->widget_style == NULL)
     ruleset->widget_style = g_hash_table_new_full (g_str_hash,
@@ -1175,7 +1193,7 @@ gtk_css_ruleset_add_style (GtkCssRuleset *ruleset,
 static void
 gtk_css_ruleset_add (GtkCssRuleset          *ruleset,
                      const GtkStyleProperty *prop,
-                     GValue                 *value)
+                     PropertyValue          *value)
 {
   if (ruleset->style == NULL)
     ruleset->style = g_hash_table_new_full (g_direct_hash,
@@ -1188,16 +1206,17 @@ gtk_css_ruleset_add (GtkCssRuleset          *ruleset,
       GParameter *parameters;
       guint i, n_parameters;
 
-      parameters = _gtk_style_property_unpack (prop, value, &n_parameters);
+      parameters = _gtk_style_property_unpack (prop, &value->value, &n_parameters);
 
       for (i = 0; i < n_parameters; i++)
         {
           const GtkStyleProperty *child;
-          GValue *value;
+          PropertyValue *val;
 
           child = _gtk_style_property_lookup (parameters[i].name);
-          value = g_slice_dup (GValue, &parameters[i].value);
-          gtk_css_ruleset_add (ruleset, child, value);
+          val = property_value_new (value->section);
+          memcpy (&val->value, &parameters[i].value, sizeof (GValue));
+          gtk_css_ruleset_add (ruleset, child, val);
         }
       g_free (parameters);
       property_value_free (value);
@@ -1217,68 +1236,54 @@ gtk_css_ruleset_matches (GtkCssRuleset *ruleset,
 }
 
 static void
-gtk_css_scanner_reset (GtkCssScanner *scanner)
-{
-  g_slist_free (scanner->state);
-  scanner->state = NULL;
-
-  g_slist_free_full (scanner->cur_selectors, (GDestroyNotify) _gtk_css_selector_free);
-  scanner->cur_selectors = NULL;
-
-  if (scanner->cur_properties)
-    g_hash_table_unref (scanner->cur_properties);
-
-  scanner ->cur_properties = g_hash_table_new_full (g_str_hash,
-                                                    g_str_equal,
-                                                    (GDestroyNotify) g_free,
-                                                    (GDestroyNotify) property_value_free);
-}
-
-static void
 gtk_css_scanner_destroy (GtkCssScanner *scanner)
 {
-  gtk_css_scanner_reset (scanner);
-
   g_object_unref (scanner->provider);
   if (scanner->file)
     g_object_unref (scanner->file);
   g_object_unref (scanner->base);
-  g_hash_table_destroy (scanner->cur_properties);
   _gtk_css_parser_free (scanner->parser);
 
   g_slice_free (GtkCssScanner, scanner);
 }
 
 static void
+gtk_css_provider_emit_error (GtkCssProvider *provider,
+                             GtkCssScanner  *scanner,
+                             const GError   *error)
+{
+  g_signal_emit (provider, css_provider_signals[PARSING_ERROR], 0,
+                 scanner->section, error);
+}
+
+static void
 gtk_css_scanner_parser_error (GtkCssParser *parser,
                               const GError *error,
                               gpointer      user_data)
 {
   GtkCssScanner *scanner = user_data;
 
-  gtk_css_provider_take_error_full (scanner->provider,
-                                    scanner->file,
-                                    _gtk_css_parser_get_line (scanner->parser),
-                                    _gtk_css_parser_get_position (scanner->parser),
-                                    g_error_copy (error));
+  gtk_css_provider_emit_error (scanner->provider,
+                               scanner,
+                               error);
 }
 
 static GtkCssScanner *
 gtk_css_scanner_new (GtkCssProvider *provider,
                      GtkCssScanner  *parent,
+                     GtkCssSection  *section,
                      GFile          *file,
-                     const gchar    *data,
-                     gsize           length)
+                     const gchar    *text)
 {
   GtkCssScanner *scanner;
 
-  g_assert (data[length] == 0);
-
   scanner = g_slice_new0 (GtkCssScanner);
 
   g_object_ref (provider);
   scanner->provider = provider;
   scanner->parent = parent;
+  if (section)
+    scanner->section = gtk_css_section_ref (section);
 
   if (file)
     {
@@ -1292,12 +1297,7 @@ gtk_css_scanner_new (GtkCssProvider *provider,
       g_free (dir);
     }
 
-  scanner->cur_properties = g_hash_table_new_full (g_str_hash,
-                                                   g_str_equal,
-                                                   (GDestroyNotify) g_free,
-                                                   (GDestroyNotify) property_value_free);
-
-  scanner->parser = _gtk_css_parser_new (data,
+  scanner->parser = _gtk_css_parser_new (text,
                                          gtk_css_scanner_parser_error,
                                          scanner);
 
@@ -1326,6 +1326,40 @@ gtk_css_scanner_would_recurse (GtkCssScanner *scanner,
 }
 
 static void
+gtk_css_scanner_push_section (GtkCssScanner     *scanner,
+                              GtkCssSectionType  section_type)
+{
+  GtkCssSection *section;
+
+  section = _gtk_css_section_new (scanner->section,
+                                  section_type,
+                                  scanner->parser,
+                                  scanner->file);
+
+  if (scanner->section)
+    gtk_css_section_unref (scanner->section);
+  scanner->section = section;
+}
+
+static void
+gtk_css_scanner_pop_section (GtkCssScanner *scanner,
+                             GtkCssSectionType check_type)
+{
+  GtkCssSection *parent;
+  
+  g_assert (gtk_css_section_get_section_type (scanner->section) == check_type);
+
+  parent = gtk_css_section_get_parent (scanner->section);
+  if (parent)
+    gtk_css_section_ref (parent);
+
+  _gtk_css_section_end (scanner->section);
+  gtk_css_section_unref (scanner->section);
+
+  scanner->section = parent;
+}
+
+static void
 gtk_css_provider_init (GtkCssProvider *css_provider)
 {
   GtkCssProviderPrivate *priv;
@@ -1386,7 +1420,7 @@ gtk_css_provider_get_style (GtkStyleProvider *provider,
         {
           GtkCssRuleset *ruleset;
           GHashTableIter iter;
-          gpointer key, value;
+          gpointer key, val;
 
           ruleset = &g_array_index (priv->rulesets, GtkCssRuleset, i);
 
@@ -1401,9 +1435,10 @@ gtk_css_provider_get_style (GtkStyleProvider *provider,
 
           g_hash_table_iter_init (&iter, ruleset->style);
 
-          while (g_hash_table_iter_next (&iter, &key, &value))
+          while (g_hash_table_iter_next (&iter, &key, &val))
             {
               GtkStyleProperty *prop = key;
+              PropertyValue *value = val;
 
               if (l != length && !_gtk_style_property_is_inherit (prop))
                 continue;
@@ -1411,7 +1446,7 @@ gtk_css_provider_get_style (GtkStyleProvider *provider,
               _gtk_style_properties_set_property_by_property (props,
                                                               prop,
                                                               _gtk_css_selector_get_state_flags (ruleset->selector),
-                                                              value);
+                                                              &value->value);
             }
         }
     }
@@ -1419,20 +1454,6 @@ gtk_css_provider_get_style (GtkStyleProvider *provider,
   return props;
 }
 
-static void
-gtk_css_provider_parser_error (GtkCssParser *parser,
-                               const GError *error,
-                               gpointer      user_data)
-{
-  GtkCssProvider *provider = user_data;
-
-  gtk_css_provider_take_error_full (provider,
-                                    NULL,
-                                    _gtk_css_parser_get_line (parser),
-                                    _gtk_css_parser_get_position (parser),
-                                    g_error_copy (error));
-}
-
 static gboolean
 gtk_css_provider_get_style_property (GtkStyleProvider *provider,
                                      GtkWidgetPath    *path,
@@ -1442,7 +1463,7 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
 {
   GtkCssProvider *css_provider = GTK_CSS_PROVIDER (provider);
   GtkCssProviderPrivate *priv = css_provider->priv;
-  const GValue *val;
+  PropertyValue *val;
   gboolean found = FALSE;
   gchar *prop_name;
   gint i;
@@ -1473,18 +1494,20 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
            ((selector_state & state) != 0 &&
             (selector_state & ~(state)) == 0)))
         {
-          GtkCssParser *parser;
+          GtkCssScanner *scanner;
 
-          parser = _gtk_css_parser_new (g_value_get_string (val),
-                                        gtk_css_provider_parser_error,
-                                        provider);
+          scanner = gtk_css_scanner_new (css_provider,
+                                         NULL,
+                                         val->section,
+                                         gtk_css_section_get_file (val->section),
+                                         g_value_get_string (&val->value));
 
           found = _gtk_style_property_parse_value (NULL,
                                                    value,
-                                                   parser,
+                                                   scanner->parser,
                                                    NULL);
 
-          _gtk_css_parser_free (parser);
+          gtk_css_scanner_destroy (scanner);
 
           if (found)
             break;
@@ -1542,11 +1565,11 @@ gtk_css_provider_take_error (GtkCssProvider *provider,
                              GtkCssScanner  *scanner,
                              GError         *error)
 {
-  gtk_css_provider_take_error_full (provider,
-                                    scanner->file,
-                                    _gtk_css_parser_get_line (scanner->parser),
-                                    _gtk_css_parser_get_position (scanner->parser),
-                                    error);
+  gtk_css_provider_emit_error (scanner->provider,
+                               scanner,
+                               error);
+
+  g_error_free (error);
 }
 
 static void
@@ -1664,20 +1687,30 @@ gtk_css_provider_propagate_error (GtkCssProvider  *provider,
   g_prefix_error (propagate_to, "%s:%u:%u: ", path ? path : "<unknown>", line, position);
 }
 
-static void
+static gboolean
 parse_import (GtkCssScanner *scanner)
 {
   GFile *file;
   char *uri;
 
+  gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_IMPORT);
+
+  if (!_gtk_css_parser_try (scanner->parser, "@import", TRUE))
+    {
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_IMPORT);
+      return FALSE;
+    }
+
   if (_gtk_css_parser_is_string (scanner->parser))
     uri = _gtk_css_parser_read_string (scanner->parser);
   else
     uri = _gtk_css_parser_read_uri (scanner->parser);
+
   if (uri == NULL)
     {
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
-      return;
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_IMPORT);
+      return TRUE;
     }
 
   file = g_file_resolve_relative_path (gtk_css_scanner_get_base_url (scanner), uri);
@@ -1699,27 +1732,36 @@ parse_import (GtkCssScanner *scanner)
       gtk_css_provider_load_internal (scanner->provider,
                                       scanner,
                                       file,
-                                      NULL, 0,
+                                      NULL,
                                       NULL);
     }
 
   if (!_gtk_css_parser_try (scanner->parser, ";", TRUE))
     {
-      g_object_unref (file);
       gtk_css_provider_invalid_token (scanner->provider, scanner, "semicolon");
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
-      return;
     }
 
   g_object_unref (file);
+
+  gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_IMPORT);
+  return TRUE;
 }
 
-static void
+static gboolean
 parse_color_definition (GtkCssScanner *scanner)
 {
   GtkSymbolicColor *symbolic;
   char *name;
 
+  gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
+
+  if (!_gtk_css_parser_try (scanner->parser, "@define-color", TRUE))
+    {
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
+      return FALSE;
+    }
+
   name = _gtk_css_parser_try_name (scanner->parser, TRUE);
   if (name == NULL)
     {
@@ -1729,7 +1771,8 @@ parse_color_definition (GtkCssScanner *scanner)
                                       GTK_CSS_PROVIDER_ERROR_SYNTAX,
                                       "Not a valid color name");
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
-      return;
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
+      return TRUE;
     }
 
   symbolic = _gtk_css_parser_read_symbolic_color (scanner->parser);
@@ -1737,7 +1780,8 @@ parse_color_definition (GtkCssScanner *scanner)
     {
       g_free (name);
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
-      return;
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
+      return TRUE;
     }
 
   if (!_gtk_css_parser_try (scanner->parser, ";", TRUE))
@@ -1750,18 +1794,31 @@ parse_color_definition (GtkCssScanner *scanner)
                                       GTK_CSS_PROVIDER_ERROR_SYNTAX,
                                       "Missing semicolon at end of color definition");
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
-      return;
+
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
+      return TRUE;
     }
 
   g_hash_table_insert (scanner->provider->priv->symbolic_colors, name, symbolic);
+
+  gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_COLOR_DEFINITION);
+  return TRUE;
 }
 
-static void
+static gboolean
 parse_binding_set (GtkCssScanner *scanner)
 {
   GtkBindingSet *binding_set;
   char *name;
 
+  gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_BINDING_SET);
+
+  if (!_gtk_css_parser_try (scanner->parser, "@binding-set", TRUE))
+    {
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_BINDING_SET);
+      return FALSE;
+    }
+
   name = _gtk_css_parser_try_ident (scanner->parser, TRUE);
   if (name == NULL)
     {
@@ -1850,17 +1907,22 @@ skip_semicolon:
                                       "Nonstandard semicolon at end of binding set");
       _gtk_css_parser_try (scanner->parser, ";", TRUE);
     }
+
+  gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_BINDING_SET);
+
+  return TRUE;
 }
 
 static void
 parse_at_keyword (GtkCssScanner *scanner)
 {
-  if (_gtk_css_parser_try (scanner->parser, "@import", TRUE))
-    parse_import (scanner);
-  else if (_gtk_css_parser_try (scanner->parser, "@define-color", TRUE))
-    parse_color_definition (scanner);
-  else if (_gtk_css_parser_try (scanner->parser, "@binding-set", TRUE))
-    parse_binding_set (scanner);
+  if (parse_import (scanner))
+    return;
+  if (parse_color_definition (scanner))
+    return;
+  if (parse_binding_set (scanner))
+    return;
+
   else
     {
       gtk_css_provider_error_literal (scanner->provider,
@@ -2152,6 +2214,8 @@ parse_selector_list (GtkCssScanner *scanner)
 {
   GSList *selectors = NULL;
 
+  gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_SELECTOR);
+
   do {
       GtkCssSelector *select = parse_selector (scanner);
 
@@ -2159,6 +2223,7 @@ parse_selector_list (GtkCssScanner *scanner)
         {
           g_slist_free_full (selectors, (GDestroyNotify) _gtk_css_selector_free);
           _gtk_css_parser_resync (scanner->parser, FALSE, 0);
+          gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_SELECTOR);
           return NULL;
         }
 
@@ -2166,6 +2231,8 @@ parse_selector_list (GtkCssScanner *scanner)
     }
   while (_gtk_css_parser_try (scanner->parser, ",", TRUE));
 
+  gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_SELECTOR);
+
   return selectors;
 }
 
@@ -2176,6 +2243,8 @@ parse_declaration (GtkCssScanner *scanner,
   const GtkStyleProperty *property;
   char *name;
 
+  gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_DECLARATION);
+
   name = _gtk_css_parser_try_ident (scanner->parser, TRUE);
   if (name == NULL)
     goto check_for_semicolon;
@@ -2191,6 +2260,7 @@ parse_declaration (GtkCssScanner *scanner,
                               name);
       _gtk_css_parser_resync (scanner->parser, TRUE, '}');
       g_free (name);
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
       return;
     }
 
@@ -2199,20 +2269,23 @@ parse_declaration (GtkCssScanner *scanner,
       gtk_css_provider_invalid_token (scanner->provider, scanner, "':'");
       _gtk_css_parser_resync (scanner->parser, TRUE, '}');
       g_free (name);
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
       return;
     }
 
   if (property)
     {
-      GValue *val;
+      PropertyValue *val;
 
       g_free (name);
 
-      val = g_slice_new0 (GValue);
-      g_value_init (val, property->pspec->value_type);
+      gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_VALUE);
+
+      val = property_value_new (scanner->section);
+      g_value_init (&val->value, property->pspec->value_type);
 
       if (_gtk_style_property_parse_value (property,
-                                           val,
+                                           &val->value,
                                            scanner->parser,
                                            gtk_css_scanner_get_base_url (scanner)))
         {
@@ -2230,44 +2303,55 @@ parse_declaration (GtkCssScanner *scanner,
                                               GTK_CSS_PROVIDER_ERROR_SYNTAX,
                                               "Junk at end of value");
               _gtk_css_parser_resync (scanner->parser, TRUE, '}');
-              g_value_unset (val);
-              g_slice_free (GValue, val);
+              property_value_free (val);
+              gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
+              gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
               return;
             }
         }
       else
         {
-          g_value_unset (val);
-          g_slice_free (GValue, val);
+          property_value_free (val);
           _gtk_css_parser_resync (scanner->parser, TRUE, '}');
+          gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
+          gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
           return;
         }
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
     }
   else if (name[0] == '-')
     {
       char *value_str;
 
+      gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_VALUE);
+
       value_str = _gtk_css_parser_read_value (scanner->parser);
       if (value_str)
         {
-          GValue *val;
+          PropertyValue *val;
 
-          val = g_slice_new0 (GValue);
-          g_value_init (val, G_TYPE_STRING);
-          g_value_take_string (val, value_str);
+          val = property_value_new (scanner->section);
+          g_value_init (&val->value, G_TYPE_STRING);
+          g_value_take_string (&val->value, value_str);
 
           gtk_css_ruleset_add_style (ruleset, name, val);
         }
       else
         {
           _gtk_css_parser_resync (scanner->parser, TRUE, '}');
+          gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
+          gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
           return;
         }
+
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_VALUE);
     }
   else
     g_free (name);
 
 check_for_semicolon:
+  gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DECLARATION);
+
   if (!_gtk_css_parser_try (scanner->parser, ";", TRUE))
     {
       if (!_gtk_css_parser_begins_with (scanner->parser, '}') &&
@@ -2300,9 +2384,14 @@ parse_ruleset (GtkCssScanner *scanner)
   GSList *selectors;
   GtkCssRuleset ruleset = { 0, };
 
+  gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_RULESET);
+
   selectors = parse_selector_list (scanner);
   if (selectors == NULL)
-    return;
+    {
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_RULESET);
+      return;
+    }
 
   if (!_gtk_css_parser_try (scanner->parser, "{", TRUE))
     {
@@ -2313,6 +2402,7 @@ parse_ruleset (GtkCssScanner *scanner)
                                       "expected '{' after selectors");
       _gtk_css_parser_resync (scanner->parser, FALSE, 0);
       g_slist_free_full (selectors, (GDestroyNotify) _gtk_css_selector_free);
+      gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_RULESET);
       return;
     }
 
@@ -2330,12 +2420,13 @@ parse_ruleset (GtkCssScanner *scanner)
           _gtk_css_parser_resync (scanner->parser, FALSE, 0);
           g_slist_free_full (selectors, (GDestroyNotify) _gtk_css_selector_free);
           gtk_css_ruleset_clear (&ruleset);
-          return;
+          gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_RULESET);
         }
     }
 
   css_provider_commit (scanner->provider, selectors, &ruleset);
   gtk_css_ruleset_clear (&ruleset);
+  gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_RULESET);
 }
 
 static void
@@ -2350,6 +2441,8 @@ parse_statement (GtkCssScanner *scanner)
 static void
 parse_stylesheet (GtkCssScanner *scanner)
 {
+  gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_DOCUMENT);
+
   _gtk_css_parser_skip_whitespace (scanner->parser);
 
   while (!_gtk_css_parser_is_eof (scanner->parser))
@@ -2360,6 +2453,8 @@ parse_stylesheet (GtkCssScanner *scanner)
 
       parse_statement (scanner);
     }
+
+  gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_DOCUMENT);
 }
 
 static int
@@ -2396,8 +2491,7 @@ static gboolean
 gtk_css_provider_load_internal (GtkCssProvider *css_provider,
                                 GtkCssScanner  *parent,
                                 GFile          *file,
-                                const char     *data,
-                                gsize           length,
+                                const char     *text,
                                 GError        **error)
 {
   GtkCssScanner *scanner;
@@ -2412,41 +2506,43 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
   else
     error_handler = 0; /* silence gcc */
 
-  if (data == NULL)
+  if (text == NULL)
     {
       GError *load_error = NULL;
 
       if (g_file_load_contents (file, NULL,
-                                &free_data, &length,
+                                &free_data, NULL,
                                 NULL, &load_error))
         {
-          data = free_data;
+          text = free_data;
         }
       else
         {
+          GtkCssSection *section;
+          
           if (parent)
-            {
-              gtk_css_provider_error (css_provider,
-                                      parent,
-                                      GTK_CSS_PROVIDER_ERROR,
-                                      GTK_CSS_PROVIDER_ERROR_IMPORT,
-                                      "Failed to import: %s",
-                                      load_error->message);
-              g_error_free (load_error);
-            }
+            section = gtk_css_section_ref (parent->section);
           else
-            {
-              gtk_css_provider_take_error_full (css_provider,
-                                                file,
-                                                0, 0,
-                                                load_error);
-            }
+            section = _gtk_css_section_new_for_file (GTK_CSS_SECTION_DOCUMENT, file);
+
+          gtk_css_provider_error (css_provider,
+                                  parent,
+                                  GTK_CSS_PROVIDER_ERROR,
+                                  GTK_CSS_PROVIDER_ERROR_IMPORT,
+                                  "Failed to import: %s",
+                                  load_error->message);
+
+          gtk_css_section_unref (section);
         }
     }
 
-  if (data)
+  if (text)
     {
-      scanner = gtk_css_scanner_new (css_provider, parent, file, data, length);
+      scanner = gtk_css_scanner_new (css_provider,
+                                     parent,
+                                     parent ? parent->section : NULL,
+                                     file,
+                                     text);
 
       parse_stylesheet (scanner);
 
@@ -2477,7 +2573,9 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
  * gtk_css_provider_load_from_data:
  * @css_provider: a #GtkCssProvider
  * @data: (array length=length) (element-type guint8): CSS data loaded in memory
- * @length: the length of @data in bytes, or -1 for NUL terminated strings
+ * @length: the length of @data in bytes, or -1 for NUL terminated strings. If
+ *   @length is not -1, the code will assume it is not NUL terminated and will
+ *   potentially do a copy.
  * @error: (out) (allow-none): return location for a #GError, or %NULL
  *
  * Loads @data into @css_provider, making it clear any previously loaded
@@ -2491,15 +2589,30 @@ gtk_css_provider_load_from_data (GtkCssProvider  *css_provider,
                                  gssize           length,
                                  GError         **error)
 {
+  char *free_data;
+  gboolean ret;
+
   g_return_val_if_fail (GTK_IS_CSS_PROVIDER (css_provider), FALSE);
   g_return_val_if_fail (data != NULL, FALSE);
 
   if (length < 0)
-    length = strlen (data);
+    {
+      length = strlen (data);
+      free_data = NULL;
+    }
+  else
+    {
+      free_data = g_strndup (data, length);
+      data = free_data;
+    }
 
   gtk_css_provider_reset (css_provider);
 
-  return gtk_css_provider_load_internal (css_provider, NULL, NULL, data, length, error);
+  ret = gtk_css_provider_load_internal (css_provider, NULL, NULL, data, error);
+
+  g_free (free_data);
+
+  return ret;
 }
 
 /**
@@ -2523,7 +2636,7 @@ gtk_css_provider_load_from_file (GtkCssProvider  *css_provider,
 
   gtk_css_provider_reset (css_provider);
 
-  return gtk_css_provider_load_internal (css_provider, NULL, file, NULL, 0, error);
+  return gtk_css_provider_load_internal (css_provider, NULL, file, NULL, error);
 }
 
 /**
@@ -3083,12 +3196,12 @@ gtk_css_ruleset_print (const GtkCssRuleset *ruleset,
       for (walk = keys; walk; walk = walk->next)
         {
           GtkStyleProperty *prop = walk->data;
-          const GValue *value = g_hash_table_lookup (ruleset->style, prop);
+          const PropertyValue *value = g_hash_table_lookup (ruleset->style, prop);
 
           g_string_append (str, "  ");
           g_string_append (str, prop->pspec->name);
           g_string_append (str, ": ");
-          _gtk_style_property_print_value (prop, value, str);
+          _gtk_style_property_print_value (prop, &value->value, str);
           g_string_append (str, ";\n");
         }
 
@@ -3104,12 +3217,12 @@ gtk_css_ruleset_print (const GtkCssRuleset *ruleset,
       for (walk = keys; walk; walk = walk->next)
         {
           const char *name = walk->data;
-          const GValue *value = g_hash_table_lookup (ruleset->widget_style, (gpointer) name);
+          const PropertyValue *value = g_hash_table_lookup (ruleset->widget_style, (gpointer) name);
 
           g_string_append (str, "  ");
           g_string_append (str, name);
           g_string_append (str, ": ");
-          g_string_append (str, g_value_get_string (value));
+          g_string_append (str, g_value_get_string (&value->value));
           g_string_append (str, ";\n");
         }
 
diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h
index a9c7fdf41b..e1d0cfa84a 100644
--- a/gtk/gtkcssprovider.h
+++ b/gtk/gtkcssprovider.h
@@ -21,6 +21,7 @@
 #define __GTK_CSS_PROVIDER_H__
 
 #include <gio/gio.h>
+#include <gtk/gtkcsssection.h>
 
 G_BEGIN_DECLS
 
@@ -60,9 +61,7 @@ struct _GtkCssProviderClass
   GObjectClass parent_class;
 
   void (* parsing_error)                        (GtkCssProvider  *provider,
-                                                 const gchar     *path,
-                                                 guint            line,
-                                                 guint            position,
+                                                 GtkCssSection   *section,
                                                  const GError *   error);
 
   /* Padding for future expansion */
diff --git a/gtk/gtkcsssection.c b/gtk/gtkcsssection.c
new file mode 100644
index 0000000000..a33e3b4545
--- /dev/null
+++ b/gtk/gtkcsssection.c
@@ -0,0 +1,308 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include "gtkcsssectionprivate.h"
+
+#include "gtkcssparserprivate.h"
+
+/**
+ * GtkCssSection:
+ *
+ * Defines a part of a CSS document. Because sections are nested into
+ * one another, you can use gtk_css_section_get_parent() to get the
+ * containing region.
+ *
+ * Since: 3.2
+ */
+
+struct _GtkCssSection
+{
+  volatile gint       ref_count;
+  GtkCssSectionType   section_type;
+  GtkCssSection      *parent;
+  GFile              *file;
+  guint               start_line;
+  guint               start_position;
+  GtkCssParser       *parser;         /* parser if section isn't finished parsing yet or %NULL */
+  guint               end_line;       /* end line if parser is %NULL */
+  guint               end_position;   /* end position if parser is %NULL */
+};
+
+G_DEFINE_BOXED_TYPE (GtkCssSection, gtk_css_section, gtk_css_section_ref, gtk_css_section_unref)
+
+GtkCssSection *
+_gtk_css_section_new (GtkCssSection     *parent,
+                      GtkCssSectionType  type,
+                      GtkCssParser      *parser,
+                      GFile             *file)
+{
+  GtkCssSection *section;
+
+  g_return_val_if_fail (parser != NULL, NULL);
+  g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL);
+
+  section = g_slice_new0 (GtkCssSection);
+
+  section->ref_count = 1;
+  section->section_type = type;
+  if (parent)
+    section->parent = gtk_css_section_ref (parent);
+  if (file)
+    section->file = g_object_ref (file);
+  section->start_line = _gtk_css_parser_get_line (parser);
+  section->start_position = _gtk_css_parser_get_position (parser);
+  section->parser = parser;
+
+  return section;
+}
+
+GtkCssSection *
+_gtk_css_section_new_for_file (GtkCssSectionType  type,
+                               GFile             *file)
+{
+  GtkCssSection *section;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+
+  section = g_slice_new0 (GtkCssSection);
+
+  section->ref_count = 1;
+  section->section_type = type;
+  section->file = g_object_ref (file);
+
+  return section;
+}
+
+void
+_gtk_css_section_end (GtkCssSection *section)
+{
+  g_return_if_fail (section != NULL);
+  g_return_if_fail (section->parser != NULL);
+
+  section->end_line = _gtk_css_parser_get_line (section->parser);
+  section->end_position = _gtk_css_parser_get_position (section->parser);
+  section->parser = NULL;
+}
+
+/**
+ * gtk_css_section_ref:
+ * @section: a #GtkCssSection
+ *
+ * Increments the reference count on @section.
+ *
+ * Returns: @section itself.
+ *
+ * Since: 3.2
+ **/
+GtkCssSection *
+gtk_css_section_ref (GtkCssSection *section)
+{
+  g_return_val_if_fail (section != NULL, NULL);
+
+  g_atomic_int_add (&section->ref_count, 1);
+
+  return section;
+}
+
+/**
+ * gtk_css_section_unref:
+ * @section: a #GtkCssSection
+ *
+ * Decrements the reference count on @section, freeing the
+ * structure if the reference count reaches 0.
+ *
+ * Since: 3.2
+ **/
+void
+gtk_css_section_unref (GtkCssSection *section)
+{
+  g_return_if_fail (section != NULL);
+
+  if (!g_atomic_int_dec_and_test (&section->ref_count))
+    return;
+
+  if (section->parent)
+    gtk_css_section_unref (section->parent);
+  if (section->file)
+    g_object_unref (section->file);
+
+  g_slice_free (GtkCssSection, section);
+}
+
+/**
+ * gtk_css_section_get_section_type:
+ * @section: the section
+ *
+ * Gets the type of information that @section describes.
+ *
+ * Returns: the type of @section
+ *
+ * Since: 3.2
+ **/
+GtkCssSectionType
+gtk_css_section_get_section_type (const GtkCssSection *section)
+{
+  g_return_val_if_fail (section != NULL, GTK_CSS_SECTION_DOCUMENT);
+
+  return section->section_type;
+}
+
+/**
+ * gtk_css_section_get_parent:
+ * @section: the section
+ *
+ * Gets the parent section for the given @section. The parent section is
+ * the section that contains this @section. A special case are sections of
+ * type #GTK_CSS_SECTION_TYPE_DOCUMENT. Their parent will either be %NULL
+ * if they are the original CSS document that was loaded by
+ * gtk_css_provider_load_from_file() or a section of type
+ * #GTK_CSS_SECTION_TYPE_IMPORT if it was loaded with an import rule from
+ * a different file.
+ *
+ * Returns: the parent section or %NULL if none
+ *
+ * Since: 3.2
+ **/
+GtkCssSection *
+gtk_css_section_get_parent (const GtkCssSection *section)
+{
+  g_return_val_if_fail (section != NULL, NULL);
+
+  return section->parent;
+}
+
+/**
+ * gtk_css_section_get_file:
+ * @section: the section
+ *
+ * Gets the file that @section was parsed from. If no such file exists,
+ * for example because the CSS was loaded via 
+ * @gtk_css_provider_load_from_data(), then %NULL is returned.
+ *
+ * Returns: the #GFile that @section was parsed from or %NULL if
+ *   @section was parsed from other data.
+ *
+ * Since: 3.2
+ **/
+GFile *
+gtk_css_section_get_file (const GtkCssSection *section)
+{
+  g_return_val_if_fail (section != NULL, NULL);
+
+  return section->file;
+}
+
+/**
+ * gtk_css_section_get_start_line:
+ * @section: the section
+ *
+ * Returns the line in the CSS document where this section starts.
+ * The line number is 0-indexed, so the first line of the document
+ * will return 0.
+ *
+ * Returns: the line number
+ *
+ * Since: 3.2
+ **/
+guint
+gtk_css_section_get_start_line (const GtkCssSection *section)
+{
+  g_return_val_if_fail (section != NULL, 0);
+
+  return section->start_line;
+}
+
+/**
+ * gtk_css_section_get_start_position:
+ * @section: the section
+ *
+ * Returns the offset in bytes from the start of the current line
+ * returned via gtk_css_section_get_start_line().
+ *
+ * Returns: the offset in bytes from the start of the line.
+ *
+ * Since: 3.2
+ **/
+guint
+gtk_css_section_get_start_position (const GtkCssSection *section)
+{
+  g_return_val_if_fail (section != NULL, 0);
+
+  return section->start_position;
+}
+
+/**
+ * gtk_css_section_get_end_line:
+ * @section: the section
+ *
+ * Returns the line in the CSS document where this section end.
+ * The line number is 0-indexed, so the first line of the document
+ * will return 0.
+ * This value may change in future invocations of this function if
+ * @section is not yet parsed completely. This will for example 
+ * happen in the GtkCssProvider::parsing-error signal.
+ * The end position and line may be identical to the start
+ * position and line for sections which failed to parse anything
+ * successfully.
+ *
+ * Returns: the line number
+ *
+ * Since: 3.2
+ **/
+guint
+gtk_css_section_get_end_line (const GtkCssSection *section)
+{
+  g_return_val_if_fail (section != NULL, 0);
+
+  if (section->parser)
+    return _gtk_css_parser_get_line (section->parser);
+  else
+    return section->end_line;
+}
+
+/**
+ * gtk_css_section_get_start_position:
+ * @section: the section
+ *
+ * Returns the offset in bytes from the start of the current line
+ * returned via gtk_css_section_get_end_line().
+ * This value may change in future invocations of this function if
+ * @section is not yet parsed completely. This will for example 
+ * happen in the GtkCssProvider::parsing-error signal.
+ * The end position and line may be identical to the start
+ * position and line for sections which failed to parse anything
+ * successfully.
+ *
+ * Returns: the offset in bytes from the start of the line.
+ *
+ * Since: 3.2
+ **/
+guint
+gtk_css_section_get_end_position (const GtkCssSection *section)
+{
+  g_return_val_if_fail (section != NULL, 0);
+
+  if (section->parser)
+    return _gtk_css_parser_get_position (section->parser);
+  else
+    return section->end_position;
+}
+
diff --git a/gtk/gtkcsssection.h b/gtk/gtkcsssection.h
new file mode 100644
index 0000000000..06222eb467
--- /dev/null
+++ b/gtk/gtkcsssection.h
@@ -0,0 +1,84 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_CSS_SECTION_H__
+#define __GTK_CSS_SECTION_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_CSS_SECTION         (gtk_css_section_get_type ())
+
+/**
+ * GtkCssSection:
+ * @GTK_CSS_SECTION_DOCUMENT: The section describes a complete document.
+ *   This section time is the only one where gtk_css_section_get_parent()
+ *   might return %NULL.
+ * @GTK_CSS_SECTION_IMPORT: The section defines an import rule.
+ * @GTK_CSS_SECTION_COLOR_DEFINITION: The section defines a color. This
+ *   is a GTK extension to CSS.
+ * @GTK_CSS_SECTION_BINDING_SET: The section defines a binding set. This
+ *   is a GTK extension to CSS.
+ * @GTK_CSS_SECTION_RULESET: The section defines a CSS ruleset.
+ * @GTK_CSS_SECTION_SELECTOR: The section defines a CSS selector.
+ * @GTK_CSS_SECTION_DECLARATION: The section defines the declaration of
+ *   a CSS variable.
+ * @GTK_CSS_SECTION_VALUE: The section defines the value of a CSS declaration.
+ *
+ * The different types of sections indicate parts of a CSS document as
+ * parsed by GTK's CSS parser. They are oriented towards the CSS grammar
+ * <ulink url="http://www.w3.org/TR/CSS21/grammar.html">CSS grammer</ulink>,
+ * but may contain extensions.
+ *
+ * More types might be added in the future as the parser incorporates
+ * more features.
+ *
+ * Since: 3.2
+ */
+typedef enum
+{
+  GTK_CSS_SECTION_DOCUMENT,
+  GTK_CSS_SECTION_IMPORT,
+  GTK_CSS_SECTION_COLOR_DEFINITION,
+  GTK_CSS_SECTION_BINDING_SET,
+  GTK_CSS_SECTION_RULESET,
+  GTK_CSS_SECTION_SELECTOR,
+  GTK_CSS_SECTION_DECLARATION,
+  GTK_CSS_SECTION_VALUE
+} GtkCssSectionType;
+
+typedef struct _GtkCssSection GtkCssSection;
+
+GType              gtk_css_section_get_type            (void) G_GNUC_CONST;
+
+GtkCssSection *    gtk_css_section_ref                 (GtkCssSection        *section);
+void               gtk_css_section_unref               (GtkCssSection        *section);
+
+GtkCssSectionType  gtk_css_section_get_section_type    (const GtkCssSection  *section);
+GtkCssSection *    gtk_css_section_get_parent          (const GtkCssSection  *section);
+GFile *            gtk_css_section_get_file            (const GtkCssSection  *section);
+guint              gtk_css_section_get_start_line      (const GtkCssSection  *section);
+guint              gtk_css_section_get_start_position  (const GtkCssSection  *section);
+guint              gtk_css_section_get_end_line        (const GtkCssSection  *section);
+guint              gtk_css_section_get_end_position    (const GtkCssSection  *section);
+
+G_END_DECLS
+
+#endif /* __GTK_CSS_SECTION_H__ */
diff --git a/gtk/gtkcsssectionprivate.h b/gtk/gtkcsssectionprivate.h
new file mode 100644
index 0000000000..ba70414721
--- /dev/null
+++ b/gtk/gtkcsssectionprivate.h
@@ -0,0 +1,40 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_CSS_SECTION_PRIVATE_H__
+#define __GTK_CSS_SECTION_PRIVATE_H__
+
+#include "gtkcsssection.h"
+
+#include "gtkcssparserprivate.h"
+
+G_BEGIN_DECLS
+
+GtkCssSection *    _gtk_css_section_new                (GtkCssSection        *parent,
+                                                        GtkCssSectionType     type,
+                                                        GtkCssParser         *parser,
+                                                        GFile                *file);
+GtkCssSection *    _gtk_css_section_new_for_file       (GtkCssSectionType     type,
+                                                        GFile                *file);
+
+void               _gtk_css_section_end                (GtkCssSection        *section);
+
+G_END_DECLS
+
+#endif /* __GTK_CSS_SECTION_PRIVATE_H__ */
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 5dfb7791bb..f743921711 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -34,7 +34,7 @@
 #include "gtkbbox.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkmain.h"
 #include "gtkintl.h"
 #include "gtkbindings.h"
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index b88fa802f3..d3d3a0405e 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -79,7 +79,7 @@
 #include "gtktreeview.h"
 #include "gtkscrolledwindow.h"
 #include "gtksizerequest.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkwindow.h"
 #include "gtkentry.h"
 #include "gtkmainprivate.h"
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 15c00996f1..7eaaef2830 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -61,7 +61,7 @@
 #include "gtksizegroup.h"
 #include "gtksizerequest.h"
 #include "gtkstock.h"
-#include "gtktable.h"
+#include "gtkgrid.h"
 #include "gtktoolbar.h"
 #include "gtktoolbutton.h"
 #include "gtktooltip.h"
@@ -86,6 +86,10 @@
 #include <io.h>
 #endif
 
+/* Values for GtkSelection-related "info" fields */
+#define SELECTION_TEXT 0
+#define SELECTION_URI  1
+
 /* Profiling stuff */
 #undef PROFILE_FILE_CHOOSER
 #ifdef PROFILE_FILE_CHOOSER
@@ -96,6 +100,7 @@
 #endif
 
 #define PROFILE_INDENT 4
+
 static int profile_indent;
 
 static void
@@ -3787,6 +3792,7 @@ popup_menu_detach_cb (GtkWidget *attach_widget,
   impl->browse_files_popup_menu = NULL;
   impl->browse_files_popup_menu_add_shortcut_item = NULL;
   impl->browse_files_popup_menu_hidden_files_item = NULL;
+  impl->browse_files_popup_menu_copy_file_location_item = NULL;
 }
 
 /* Callback used when the "Add to Bookmarks" menu item is activated */
@@ -3797,6 +3803,97 @@ add_to_shortcuts_cb (GtkMenuItem           *item,
   bookmarks_add_selected_folder (impl);
 }
 
+/* callback used to set data to clipboard */
+static void
+copy_file_get_cb  (GtkClipboard     *clipboard,
+                   GtkSelectionData *selection_data,
+                   guint             info,
+                   gpointer          data)
+{
+  GSList *selected_files = data;
+
+  if (selected_files)
+    {
+      gint num_files = g_slist_length (selected_files);
+      gchar **uris;
+      gint i;
+      GSList *l;
+
+      uris = g_new (gchar *, num_files + 1);
+      uris[num_files] = NULL; /* null terminator */
+
+      i = 0;
+
+      for (l = selected_files; l; l = l->next)
+        {
+          GFile *file = (GFile *) l->data;
+
+	  if (info == SELECTION_URI)
+	    uris[i] = g_file_get_uri (file);
+	  else /* if (info == SELECTION_TEXT) - let this be the fallback */
+	    uris[i] = g_file_get_parse_name (file);
+
+          i++;
+        }
+
+      if (info == SELECTION_URI)
+	gtk_selection_data_set_uris (selection_data, uris);
+      else /* if (info == SELECTION_TEXT) - let this be the fallback */
+	{
+	  char *str = g_strjoinv (" ", uris);
+	  gtk_selection_data_set_text (selection_data, str, -1);
+	  g_free (str);
+	}
+
+      g_strfreev (uris);
+    }
+}
+
+/* callback used to clear the clipboard data */
+static void
+copy_file_clear_cb (GtkClipboard *clipboard,
+                    gpointer      data)
+{
+  GSList *selected_files = data;
+
+  g_slist_foreach (selected_files, (GFunc) g_object_unref, NULL);
+  g_slist_free (selected_files);
+}
+
+/* Callback used when the "Copy file's location" menu item is activated */
+static void
+copy_file_location_cb (GtkMenuItem           *item,
+                       GtkFileChooserDefault *impl)
+{
+  GSList *selected_files = NULL;
+
+  selected_files = search_get_selected_files (impl);
+
+  if (selected_files)
+    {
+      GtkClipboard *clipboard;
+      GtkTargetList *target_list;
+      GtkTargetEntry *targets;
+      int n_targets;
+
+      clipboard = gtk_widget_get_clipboard (GTK_WIDGET (impl), GDK_SELECTION_CLIPBOARD);
+
+      target_list = gtk_target_list_new (NULL, 0);
+      gtk_target_list_add_text_targets (target_list, SELECTION_TEXT);
+      gtk_target_list_add_uri_targets (target_list, SELECTION_URI);
+
+      targets = gtk_target_table_new_from_list (target_list, &n_targets);
+      gtk_target_list_unref (target_list);
+
+      gtk_clipboard_set_with_data (clipboard, targets, n_targets,
+				   copy_file_get_cb,
+                                   copy_file_clear_cb,
+				   selected_files);
+
+      gtk_target_table_free (targets, n_targets);
+    }
+}
+
 /* Callback used when the "Show Hidden Files" menu item is toggled */
 static void
 show_hidden_toggled_cb (GtkCheckMenuItem      *item,
@@ -3984,6 +4081,25 @@ file_list_drag_motion_cb (GtkWidget             *widget,
   return TRUE;
 }
 
+/* Sensitizes the "Copy file's location" context menu item if there is actually
+ * a selection active.
+ */
+static void
+check_copy_file_location_sensitivity (GtkFileChooserDefault *impl)
+{
+  GtkTreeSelection *selection;
+  gboolean active;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
+  if (gtk_tree_selection_count_selected_rows (selection) == 0)
+    active = FALSE;
+  else
+    active = TRUE;
+
+  if (impl->browse_files_popup_menu_copy_file_location_item)
+    gtk_widget_set_sensitive (impl->browse_files_popup_menu_copy_file_location_item, active);
+}
+
 /* Constructs the popup menu for the file list if needed */
 static void
 file_list_build_popup_menu (GtkFileChooserDefault *impl)
@@ -3998,6 +4114,15 @@ file_list_build_popup_menu (GtkFileChooserDefault *impl)
 			     impl->browse_files_tree_view,
 			     popup_menu_detach_cb);
 
+  item = gtk_image_menu_item_new_with_mnemonic (_("_Copy file's location"));
+  impl->browse_files_popup_menu_copy_file_location_item = item;
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
+                                 gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_MENU));
+  g_signal_connect (item, "activate",
+                    G_CALLBACK (copy_file_location_cb), impl);
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+
   item = gtk_image_menu_item_new_with_mnemonic (_("_Add to Bookmarks"));
   impl->browse_files_popup_menu_add_shortcut_item = item;
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
@@ -4026,6 +4151,7 @@ file_list_build_popup_menu (GtkFileChooserDefault *impl)
   gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
 
   bookmarks_check_add_sensitivity (impl);
+  check_copy_file_location_sensitivity (impl);
 }
 
 /* Updates the popup menu for the file list, creating it if necessary */
@@ -4420,30 +4546,25 @@ save_widgets_create (GtkFileChooserDefault *impl)
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 
-  impl->save_widgets_table = gtk_table_new (2, 2, FALSE);
+  impl->save_widgets_table = gtk_grid_new ();
   gtk_box_pack_start (GTK_BOX (vbox), impl->save_widgets_table, FALSE, FALSE, 0);
   gtk_widget_show (impl->save_widgets_table);
-  gtk_table_set_row_spacings (GTK_TABLE (impl->save_widgets_table), 12);
-  gtk_table_set_col_spacings (GTK_TABLE (impl->save_widgets_table), 12);
+  gtk_grid_set_row_spacing (GTK_GRID (impl->save_widgets_table), 12);
+  gtk_grid_set_column_spacing (GTK_GRID (impl->save_widgets_table), 12);
 
   /* Label */
 
   widget = gtk_label_new_with_mnemonic (_("_Name:"));
   gtk_widget_set_halign (widget, GTK_ALIGN_START);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_table_attach (GTK_TABLE (impl->save_widgets_table), widget,
-		    0, 1, 0, 1,
-		    GTK_FILL, GTK_FILL,
-		    0, 0);
+  gtk_grid_attach (GTK_GRID (impl->save_widgets_table), widget, 0, 0, 1, 1);
   gtk_widget_show (widget);
 
   /* Location entry */
 
   location_entry_create (impl);
-  gtk_table_attach (GTK_TABLE (impl->save_widgets_table), impl->location_entry,
-		    1, 2, 0, 1,
-		    GTK_EXPAND | GTK_FILL, 0,
-		    0, 0);
+  gtk_widget_set_hexpand (impl->location_entry, TRUE);
+  gtk_grid_attach (GTK_GRID (impl->save_widgets_table), impl->location_entry, 1, 0, 1, 1);
   gtk_widget_show (impl->location_entry);
   gtk_label_set_mnemonic_widget (GTK_LABEL (widget), impl->location_entry);
 
@@ -4451,10 +4572,7 @@ save_widgets_create (GtkFileChooserDefault *impl)
   impl->save_folder_label = gtk_label_new (NULL);
   gtk_widget_set_halign (impl->save_folder_label, GTK_ALIGN_START);
   gtk_widget_set_valign (impl->save_folder_label, GTK_ALIGN_CENTER);
-  gtk_table_attach (GTK_TABLE (impl->save_widgets_table), impl->save_folder_label,
-		    0, 1, 1, 2,
-		    GTK_FILL, GTK_FILL,
-		    0, 0);
+  gtk_grid_attach (GTK_GRID (impl->save_widgets_table), impl->save_folder_label, 0, 1, 1, 1);
   gtk_widget_show (impl->save_folder_label);
 
   impl->save_widgets = vbox;
@@ -5116,10 +5234,8 @@ restore_path_bar (GtkFileChooserDefault *impl)
   else if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
 	   || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
     {
-      gtk_table_attach (GTK_TABLE (impl->save_widgets_table), impl->browse_path_bar_hbox,
-			1, 2, 1, 2,
-			GTK_EXPAND | GTK_FILL, GTK_FILL,
-			0, 0);
+      gtk_widget_set_hexpand (impl->browse_path_bar_hbox, TRUE);
+      gtk_grid_attach (GTK_GRID (impl->save_widgets_table), impl->browse_path_bar_hbox, 1, 1, 1, 1);
       gtk_label_set_mnemonic_widget (GTK_LABEL (impl->save_folder_label), impl->browse_path_bar);
     }
   else
@@ -9299,7 +9415,6 @@ typedef struct
 {
   GtkFileChooserDefault *impl;
   GList *items;
-  guint needs_sorting : 1;
 } RecentLoadData;
 
 static void
@@ -9311,6 +9426,7 @@ recent_idle_cleanup (gpointer data)
   gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view),
                            GTK_TREE_MODEL (impl->recent_model));
   file_list_set_sort_column_ids (impl);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (impl->recent_model), MODEL_COL_MTIME, GTK_SORT_DESCENDING);
 
   set_busy_cursor (impl, FALSE);
   
@@ -9320,16 +9436,6 @@ recent_idle_cleanup (gpointer data)
 }
 
 static gint
-recent_sort_mru (gconstpointer a,
-                 gconstpointer b)
-{
-  GtkRecentInfo *info_a = (GtkRecentInfo *) a;
-  GtkRecentInfo *info_b = (GtkRecentInfo *) b;
-
-  return (gtk_recent_info_get_modified (info_b) - gtk_recent_info_get_modified (info_a));
-}
-
-static gint
 get_recent_files_limit (GtkWidget *widget)
 {
   GtkSettings *settings;
@@ -9404,32 +9510,18 @@ recent_idle_load (gpointer data)
   if (!impl->recent_manager)
     return FALSE;
 
-  /* first iteration: load all the items */
+  load_data->items = gtk_recent_manager_get_items (impl->recent_manager);
   if (!load_data->items)
-    {
-      load_data->items = gtk_recent_manager_get_items (impl->recent_manager);
-      if (!load_data->items)
-        return FALSE;
-
-      load_data->needs_sorting = TRUE;
-
-      return TRUE;
-    }
-  
-  /* second iteration: MRU sorting and clamping, and populating the model */
-  if (load_data->needs_sorting)
-    {
-      load_data->items = g_list_sort (load_data->items, recent_sort_mru);
+    return FALSE;
 
-      if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
-	populate_model_with_recent_items (impl, load_data->items);
-      else
-	populate_model_with_folders (impl, load_data->items);
+  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
+    populate_model_with_recent_items (impl, load_data->items);
+  else
+    populate_model_with_folders (impl, load_data->items);
 
-      g_list_foreach (load_data->items, (GFunc) gtk_recent_info_unref, NULL);
-      g_list_free (load_data->items);
-      load_data->items = NULL;
-    }
+  g_list_foreach (load_data->items, (GFunc) gtk_recent_info_unref, NULL);
+  g_list_free (load_data->items);
+  load_data->items = NULL;
 
   return FALSE;
 }
@@ -9449,7 +9541,6 @@ recent_start_loading (GtkFileChooserDefault *impl)
   load_data = g_new (RecentLoadData, 1);
   load_data->impl = impl;
   load_data->items = NULL;
-  load_data->needs_sorting = TRUE;
 
   /* begin lazy loading the recent files into the model */
   impl->load_recent_id = gdk_threads_add_idle_full (G_PRIORITY_HIGH_IDLE + 30,
@@ -9969,6 +10060,7 @@ list_selection_changed (GtkTreeSelection      *selection,
 
   check_preview_change (impl);
   bookmarks_check_add_sensitivity (impl);
+  check_copy_file_location_sensitivity (impl);
 
   g_signal_emit_by_name (impl, "selection-changed", 0);
 }
diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h
index dd4bccb97b..81fc3b25da 100644
--- a/gtk/gtkfilechooserprivate.h
+++ b/gtk/gtkfilechooserprivate.h
@@ -180,6 +180,7 @@ struct _GtkFileChooserDefault
   GtkWidget *browse_files_popup_menu_add_shortcut_item;
   GtkWidget *browse_files_popup_menu_hidden_files_item;
   GtkWidget *browse_files_popup_menu_size_column_item;
+  GtkWidget *browse_files_popup_menu_copy_file_location_item;
   GtkWidget *browse_new_folder_button;
   GtkWidget *browse_path_bar_hbox;
   GtkSizeGroup *browse_path_bar_size_group;
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 2e863a89c3..0d195d397f 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -31,7 +31,7 @@
 #include "gtkfontbutton.h"
 
 #include "gtkmain.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtklabel.h"
 #include "gtkfontchooserdialog.h"
 #include "gtkimage.h"
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index 733758fb7f..db9b469ece 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -29,23 +29,20 @@
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"
 #include "gtkframe.h"
-#include "gtkhbbox.h"
-#include "gtkhbox.h"
+#include "gtkbbox.h"
+#include "gtkbox.h"
 #include "gtklabel.h"
 #include "gtkliststore.h"
 #include "gtkstock.h"
 #include "gtktextview.h"
 #include "gtktreeselection.h"
 #include "gtktreeview.h"
-#include "gtkbox.h"
 #include "gtkscrolledwindow.h"
 #include "gtkintl.h"
 #include "gtkaccessible.h"
 #include "gtkbuildable.h"
 #include "gtkprivate.h"
-#include "gtkalignment.h"
 #include "gtkscale.h"
-#include "gtkbox.h"
 #include "gtkspinbutton.h"
 #include "gtknotebook.h"
 #include "gtkwidget.h"
@@ -141,6 +138,13 @@ enum {
   PREVIEW_TITLE_COLUMN
 };
 
+enum {
+  SIGNAL_FONT_ACTIVATED,
+  N_SIGNALS
+};
+
+static guint signals[N_SIGNALS] = { 0, };
+
 static void  gtk_font_chooser_set_property       (GObject         *object,
                                                   guint            prop_id,
                                                   const GValue    *value,
@@ -199,6 +203,26 @@ gtk_font_chooser_class_init (GtkFontChooserClass *klass)
                                                         TRUE,
                                                         GTK_PARAM_READWRITE));
 
+  /**
+   * GtkFontChooserWidget::font-activated:
+   * @self: the object which received the signal
+   * @fontname: the font name
+   *
+   * Emitted when a font is activated from the widget's list.
+   * This usually happens when the user double clicks an item,
+   * or an item is selected and the user presses one of the keys
+   * Space, Shift+Space, Return or Enter.
+   */
+  signals[SIGNAL_FONT_ACTIVATED] =
+    g_signal_new ("font-activated",
+                  GTK_TYPE_FONT_CHOOSER,
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkFontChooserClass, font_activated),
+                  NULL, NULL,
+                  NULL,
+                  G_TYPE_NONE,
+                  1, G_TYPE_STRING);
+
   g_type_class_add_private (klass, sizeof (GtkFontChooserPrivate));
 }
 
@@ -396,6 +420,21 @@ set_range_marks (GtkFontChooserPrivate *priv,
 }
 
 static void
+row_activated_cb (GtkTreeView       *view,
+                  GtkTreePath       *path,
+                  GtkTreeViewColumn *column,
+                  gpointer           user_data)
+{
+  GtkFontChooser *self = user_data;
+  gchar *fontname;
+
+  fontname = gtk_font_chooser_get_font_name (self);
+
+  g_signal_emit (self, signals[SIGNAL_FONT_ACTIVATED], 0, fontname);
+  g_free (fontname);
+}
+
+static void
 cursor_changed_cb (GtkTreeView *treeview,
                    gpointer     user_data)
 {
@@ -642,7 +681,10 @@ gtk_font_chooser_init (GtkFontChooser *fontchooser)
       g_signal_connect (priv->family_face_list, "cursor-changed",
                         G_CALLBACK (cursor_changed_cb), fontchooser);
 
-  /* Zoom on preview scroll*/
+  g_signal_connect (priv->family_face_list, "row-activated",
+                    G_CALLBACK (row_activated_cb), fontchooser);
+
+  /* Zoom on preview scroll */
   g_signal_connect (priv->preview, "scroll-event",
                     G_CALLBACK (zoom_preview_cb), fontchooser);
 
@@ -1070,6 +1112,7 @@ gtk_font_chooser_get_font_name (GtkFontChooser *fontchooser)
 
   font_name = g_strdup_printf ("%s %d", font_desc_name, fontchooser->priv->size / PANGO_SCALE);
   g_free (font_desc_name);
+
   return font_name;
 }
 
diff --git a/gtk/gtkfontchooser.h b/gtk/gtkfontchooser.h
index d346837e7b..4dd390780b 100644
--- a/gtk/gtkfontchooser.h
+++ b/gtk/gtkfontchooser.h
@@ -51,6 +51,9 @@ struct _GtkFontChooserClass
 {
   GtkBoxClass parent_class;
 
+  void (* font_activated) (GtkFontChooser *chooser,
+                           const gchar    *fontname);
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c
index b57fb18b7b..2fac04ce10 100644
--- a/gtk/gtkfontchooserdialog.c
+++ b/gtk/gtkfontchooserdialog.c
@@ -87,6 +87,16 @@ gtk_font_chooser_dialog_class_init (GtkFontChooserDialogClass *klass)
 }
 
 static void
+font_activated_cb (GtkFontChooser *fontchooser,
+                   const gchar    *fontname,
+                   gpointer        user_data)
+{
+  GtkDialog *dialog = user_data;
+
+  gtk_dialog_response (dialog, GTK_RESPONSE_OK);
+}
+
+static void
 gtk_font_chooser_dialog_init (GtkFontChooserDialog *fontchooserdiag)
 {
   GtkFontChooserDialogPrivate *priv;
@@ -117,27 +127,29 @@ gtk_font_chooser_dialog_init (GtkFontChooserDialog *fontchooserdiag)
   gtk_box_pack_start (GTK_BOX (content_area),
                       priv->fontchooser, TRUE, TRUE, 0);
 
+  g_signal_connect (priv->fontchooser, "font-activated",
+                    G_CALLBACK (font_activated_cb), dialog);
+
   /* Create the action area */
   priv->cancel_button = gtk_dialog_add_button (dialog,
                                                GTK_STOCK_CANCEL,
                                                GTK_RESPONSE_CANCEL);
   priv->select_button = gtk_dialog_add_button (dialog,
-                                               _("Select"),
+                                               _("_Select"),
                                                GTK_RESPONSE_OK);
   gtk_widget_grab_default (priv->select_button);
 
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (fontchooserdiag),
-             GTK_RESPONSE_OK,
-             GTK_RESPONSE_CANCEL,
-             -1);
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
 
   gtk_window_set_title (GTK_WINDOW (fontchooserdiag), _("Font Selection"));
 
   gtk_widget_pop_composite_child ();
 }
 
-/**
- * gtk_font_chooser_dialog_new:
+/** gtk_font_chooser_dialog_new:
  * @title: (allow-none): Title of the dialog, or %NULL
  * @parent: (allow-none): Trasient parent of the dialog, or %NULL
  *
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 20ec688294..cfb21f41ba 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -1480,6 +1480,42 @@ gtk_grid_attach_next_to (GtkGrid         *grid,
 }
 
 /**
+ * gtk_grid_get_child_at:
+ * @grid: a #GtkGrid
+ * @left: the left edge of the cell
+ * @top: the top edge of the cell
+ *
+ * Gets the child of @grid whose area covers the grid
+ * cell whose upper left corner is at @left, @top.
+ *
+ * Returns: the child at the given position, or %NULL
+ *
+ * Since: 3.2
+ */
+GtkWidget *
+gtk_grid_get_child_at (GtkGrid *grid,
+                       gint     left,
+                       gint     top)
+{
+  GtkGridPrivate *priv = grid->priv;
+  GtkGridChild *child;
+  GList *list;
+
+  for (list = priv->children; list; list = list->next)
+    {
+      child = list->data;
+
+      if (CHILD_LEFT (child) <= left &&
+          CHILD_LEFT (child) + CHILD_WIDTH (child) > left &&
+          CHILD_TOP (child) <= top &&
+          CHILD_TOP (child) + CHILD_HEIGHT (child) > top)
+        return child->widget;
+    }
+
+  return NULL;
+}
+
+/**
  * gtk_grid_insert_row:
  * @grid: a #GtkGrid
  * @position: the position to insert the row at
diff --git a/gtk/gtkgrid.h b/gtk/gtkgrid.h
index 99f9e4e300..491ba22321 100644
--- a/gtk/gtkgrid.h
+++ b/gtk/gtkgrid.h
@@ -79,6 +79,9 @@ void       gtk_grid_attach_next_to         (GtkGrid         *grid,
                                             GtkPositionType  side,
                                             gint             width,
                                             gint             height);
+GtkWidget *gtk_grid_get_child_at           (GtkGrid         *grid,
+                                            gint             left,
+                                            gint             top);
 void       gtk_grid_insert_row             (GtkGrid         *grid,
                                             gint             position);
 void       gtk_grid_insert_column          (GtkGrid         *grid,
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index fe8ccb326f..a252e0f745 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3692,7 +3692,7 @@ gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view,
 				   gint         count)
 {
   GtkIconViewItem *item;
-  GtkCellRenderer *cell;
+  GtkCellRenderer *cell = NULL;
   gboolean dirty = FALSE;
   gint step;
   GtkDirectionType direction;
@@ -7316,6 +7316,9 @@ gtk_icon_view_item_accessible_get_image_size (AtkImage *image,
   if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
     return;
 
+  *width = 0;
+  *height = 0;
+
   if (get_pixbuf_box (GTK_ICON_VIEW (item->widget), item->item, &box))
     {
       *width = box.width;
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 9fadbfd2d2..0bb962c1ac 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -5333,7 +5333,8 @@ gtk_label_set_selection_text (GtkLabel         *label,
 {
   GtkLabelPrivate *priv = label->priv;
 
-  if ((priv->select_info->selection_anchor !=
+  if (priv->select_info &&
+      (priv->select_info->selection_anchor !=
        priv->select_info->selection_end) &&
       priv->text)
     {
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index b6533e4d80..5ed838fb45 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -647,7 +647,10 @@ gtk_list_store_get_iter (GtkTreeModel *tree_model,
   i = gtk_tree_path_get_indices (path)[0];
 
   if (i >= g_sequence_get_length (seq))
-    return FALSE;
+    {
+      iter->stamp = 0;
+      return FALSE;
+    }
 
   iter->stamp = priv->stamp;
   iter->user_data = g_sequence_get_iter_at_pos (seq, i);
diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 7961149f11..fa60a7c91d 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -108,7 +108,6 @@ VOID:STRING,STRING,STRING
 VOID:STRING,INT,POINTER
 VOID:STRING,UINT,FLAGS
 VOID:STRING,UINT,FLAGS,UINT
-VOID:STRING,UINT,UINT,BOXED
 VOID:UINT,FLAGS,BOXED
 VOID:UINT,UINT
 VOID:UINT,STRING
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index c50abda9dd..454336b3c8 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -106,7 +106,7 @@
 #include "gtkmenushellprivate.h"
 #include "gtktearoffmenuitem.h"
 #include "gtkwindow.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkscrollbar.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 9d87b818a6..34337b507c 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -71,6 +71,7 @@ enum {
   CANCEL,
   CYCLE_FOCUS,
   MOVE_SELECTED,
+  INSERT,
   LAST_SIGNAL
 };
 
@@ -368,6 +369,31 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                   G_TYPE_BOOLEAN, 1,
                   G_TYPE_INT);
 
+  /**
+   * GtkMenuShell::insert:
+   * @menu_shell: the object on which the signal is emitted
+   * @child: the #GtkMenuItem that is being inserted
+   * @position: the position at which the insert occurs
+   *
+   * The ::insert signal is emitted when a new #GtkMenuItem is added to
+   * a #GtkMenuShell.  A separate signal is used instead of
+   * GtkContainer::add because of the need for an additional position
+   * parameter.
+   *
+   * The inverse of this signal is the GtkContainer::removed signal.
+   *
+   * Since: 3.2
+   **/
+  menu_shell_signals[INSERT] =
+    g_signal_new (I_("insert"),
+                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkMenuShellClass, insert),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__OBJECT_INT,
+                  G_TYPE_NONE, 2, GTK_TYPE_WIDGET, G_TYPE_INT);
+
+
   binding_set = gtk_binding_set_by_class (klass);
   gtk_binding_entry_add_signal (binding_set,
                                 GDK_KEY_Escape, 0,
@@ -552,15 +578,10 @@ gtk_menu_shell_insert (GtkMenuShell *menu_shell,
                        GtkWidget    *child,
                        gint          position)
 {
-  GtkMenuShellClass *class;
-
   g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
   g_return_if_fail (GTK_IS_MENU_ITEM (child));
 
-  class = GTK_MENU_SHELL_GET_CLASS (menu_shell);
-
-  if (class->insert)
-    class->insert (menu_shell, child, position);
+  g_signal_emit (menu_shell, menu_shell_signals[INSERT], 0, child, position);
 }
 
 static void
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index a0427379b1..59518036b1 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -25,8 +25,7 @@
 
 #include "gtktogglebutton.h"
 #include "gtkarrow.h"
-#include "gtkhbox.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkmenu.h"
 #include "gtkmain.h"
 #include "gtksizerequest.h"
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index bd3a1306ee..19ab948efc 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -33,8 +33,7 @@
 #include "gtkaccessible.h"
 #include "gtkbuildable.h"
 #include "gtklabel.h"
-#include "gtkhbox.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkimage.h"
 #include "gtkstock.h"
 #include "gtkiconfactory.h"
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 93c394a0e7..2d022cc00e 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -32,16 +32,15 @@
 #include "gtkmountoperationprivate.h"
 #include "gtkbox.h"
 #include "gtkentry.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkintl.h"
 #include "gtklabel.h"
-#include "gtkvbox.h"
 #include "gtkmessagedialog.h"
 #include "gtkmountoperation.h"
 #include "gtkprivate.h"
 #include "gtkradiobutton.h"
 #include "gtkstock.h"
-#include "gtktable.h"
+#include "gtkgrid.h"
 #include "gtkwindow.h"
 #include "gtktreeview.h"
 #include "gtktreeselection.h"
@@ -418,17 +417,15 @@ table_add_entry (GtkWidget  *table,
   label = gtk_label_new_with_mnemonic (label_text);
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+  gtk_widget_set_hexpand (label, TRUE);
 
   entry = gtk_entry_new ();
 
   if (value)
     gtk_entry_set_text (GTK_ENTRY (entry), value);
 
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, row, row + 1,
-                    GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-  gtk_table_attach_defaults (GTK_TABLE (table), entry,
-                             1, 2, row, row + 1);
+  gtk_grid_attach (GTK_GRID (table), label, 0, row, 1, 1);
+  gtk_grid_attach (GTK_GRID (table), entry, 1, row, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
 
   g_signal_connect (entry, "changed",
@@ -585,9 +582,9 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
     rows++;
 
   /* The table that holds the entries */
-  table = gtk_table_new (rows, 2, FALSE);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 6);
 
   if (can_anonymous)
     gtk_widget_set_margin_left (table, 12);
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 9c7ece563c..a518e9c7ca 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2254,7 +2254,7 @@ gtk_notebook_size_request (GtkWidget      *widget,
 
       if (priv->show_tabs)
         {
-          GtkRequisition tabs_requisition;
+          GtkRequisition tabs_requisition = { 0, 0 };
 
           gtk_notebook_get_preferred_tabs_size (notebook, &tabs_requisition);
           if (orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -7853,7 +7853,7 @@ gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
   gtk_widget_child_notify (child, "tab-fill");
   gtk_widget_child_notify (child, "position");
   if (priv->show_tabs)
-    gtk_notebook_pages_allocate (notebook);
+    gtk_widget_queue_resize (GTK_WIDGET (notebook));
   gtk_widget_thaw_child_notify (child);
 }
 
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index fe75d5dd39..7517bba24c 100644
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -1,4 +1,4 @@
-/* GtkPageSetupUnixDialog 
+/* GtkPageSetupUnixDialog
  * Copyright (C) 2006 Alexander Larsson <alexl@redhat.com>
  * Copyright © 2006, 2007, 2008 Christian Persch
  *
@@ -9,7 +9,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -33,16 +33,13 @@
 #include "gtktreemodel.h"
 #include "gtkbutton.h"
 #include "gtkscrolledwindow.h"
-#include "gtkframe.h"
-#include "gtkeventbox.h"
 #include "gtkcombobox.h"
 #include "gtktogglebutton.h"
 #include "gtkradiobutton.h"
 #include "gtklabel.h"
-#include "gtktable.h"
+#include "gtkgrid.h"
 #include "gtkcelllayout.h"
 #include "gtkcellrenderertext.h"
-#include "gtkspinbutton.h"
 
 #include "gtkpagesetupunixdialog.h"
 #include "gtkcustompaperunixdialog.h"
@@ -70,7 +67,7 @@ struct _GtkPageSetupUnixDialogPrivate
   GtkListStore *printer_list;
   GtkListStore *page_setup_list;
   GtkListStore *custom_paper_list;
-  
+
   GList *print_backends;
 
   GtkWidget *printer_combo;
@@ -84,7 +81,7 @@ struct _GtkPageSetupUnixDialogPrivate
 
   gulong request_details_tag;
   GtkPrinter *request_details_printer;
-  
+
   GtkPrintSettings *print_settings;
 
   /* Save last setup so we can re-set it after selecting manage custom sizes */
@@ -110,16 +107,16 @@ G_DEFINE_TYPE (GtkPageSetupUnixDialog, gtk_page_setup_unix_dialog, GTK_TYPE_DIAL
 static void gtk_page_setup_unix_dialog_finalize  (GObject                *object);
 static void populate_dialog                      (GtkPageSetupUnixDialog *dialog);
 static void fill_paper_sizes_from_printer        (GtkPageSetupUnixDialog *dialog,
-						  GtkPrinter             *printer);
+                                                  GtkPrinter             *printer);
 static void printer_added_cb                     (GtkPrintBackend        *backend,
-						  GtkPrinter             *printer,
-						  GtkPageSetupUnixDialog *dialog);
+                                                  GtkPrinter             *printer,
+                                                  GtkPageSetupUnixDialog *dialog);
 static void printer_removed_cb                   (GtkPrintBackend        *backend,
-						  GtkPrinter             *printer,
-						  GtkPageSetupUnixDialog *dialog);
+                                                  GtkPrinter             *printer,
+                                                  GtkPageSetupUnixDialog *dialog);
 static void printer_status_cb                    (GtkPrintBackend        *backend,
-						  GtkPrinter             *printer,
-						  GtkPageSetupUnixDialog *dialog);
+                                                  GtkPrinter             *printer,
+                                                  GtkPageSetupUnixDialog *dialog);
 
 
 
@@ -165,8 +162,8 @@ gtk_page_setup_unix_dialog_init (GtkPageSetupUnixDialog *dialog)
   priv->print_backends = NULL;
 
   priv->printer_list = gtk_list_store_new (PRINTER_LIST_N_COLS,
-						   G_TYPE_STRING,
-						   G_TYPE_OBJECT);
+                                                   G_TYPE_STRING,
+                                                   G_TYPE_OBJECT);
 
   gtk_list_store_append (priv->printer_list, &iter);
   tmp = g_strdup_printf ("<b>%s</b>\n%s", _("Any Printer"), _("For portable documents"));
@@ -177,22 +174,22 @@ gtk_page_setup_unix_dialog_init (GtkPageSetupUnixDialog *dialog)
   g_free (tmp);
 
   priv->page_setup_list = gtk_list_store_new (PAGE_SETUP_LIST_N_COLS,
-						      G_TYPE_OBJECT,
-						      G_TYPE_BOOLEAN);
+                                                      G_TYPE_OBJECT,
+                                                      G_TYPE_BOOLEAN);
 
   priv->custom_paper_list = gtk_list_store_new (1, G_TYPE_OBJECT);
   _gtk_print_load_custom_papers (priv->custom_paper_list);
 
   populate_dialog (dialog);
-  
-  gtk_dialog_add_buttons (GTK_DIALOG (dialog), 
+
+  gtk_dialog_add_buttons (GTK_DIALOG (dialog),
                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                           GTK_STOCK_APPLY, GTK_RESPONSE_OK,
                           NULL);
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
-					   GTK_RESPONSE_OK,
-					   GTK_RESPONSE_CANCEL,
-					   -1);
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 }
@@ -204,16 +201,16 @@ gtk_page_setup_unix_dialog_finalize (GObject *object)
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
   GtkPrintBackend *backend;
   GList *node;
-  
+
   if (priv->request_details_tag)
     {
       g_signal_handler_disconnect (priv->request_details_printer,
-				   priv->request_details_tag);
+                                   priv->request_details_tag);
       g_object_unref (priv->request_details_printer);
       priv->request_details_printer = NULL;
       priv->request_details_tag = 0;
     }
-  
+
   if (priv->printer_list)
     {
       g_object_unref (priv->printer_list);
@@ -252,7 +249,7 @@ gtk_page_setup_unix_dialog_finalize (GObject *object)
       gtk_print_backend_destroy (backend);
       g_object_unref (backend);
     }
-  
+
   g_list_free (priv->print_backends);
   priv->print_backends = NULL;
 
@@ -260,9 +257,9 @@ gtk_page_setup_unix_dialog_finalize (GObject *object)
 }
 
 static void
-printer_added_cb (GtkPrintBackend        *backend, 
-		  GtkPrinter             *printer, 
-		  GtkPageSetupUnixDialog *dialog)
+printer_added_cb (GtkPrintBackend        *backend,
+                  GtkPrinter             *printer,
+                  GtkPageSetupUnixDialog *dialog)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
   GtkTreeIter iter;
@@ -276,8 +273,8 @@ printer_added_cb (GtkPrintBackend        *backend,
   if (location == NULL)
     location = "";
   str = g_strdup_printf ("<b>%s</b>\n%s",
-			 gtk_printer_get_name (printer),
-			 location);
+                         gtk_printer_get_name (printer),
+                         location);
 
   gtk_list_store_append (priv->printer_list, &iter);
   gtk_list_store_set (priv->printer_list, &iter,
@@ -286,25 +283,25 @@ printer_added_cb (GtkPrintBackend        *backend,
                       -1);
 
   g_object_set_data_full (G_OBJECT (printer),
-			  "gtk-print-tree-iter",
+                          "gtk-print-tree-iter",
                           gtk_tree_iter_copy (&iter),
                           (GDestroyNotify) gtk_tree_iter_free);
   g_free (str);
 
   if (priv->waiting_for_printer != NULL &&
       strcmp (priv->waiting_for_printer,
-	      gtk_printer_get_name (printer)) == 0)
+              gtk_printer_get_name (printer)) == 0)
     {
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->printer_combo),
-				     &iter);
+                                     &iter);
       priv->waiting_for_printer = NULL;
     }
 }
 
 static void
-printer_removed_cb (GtkPrintBackend        *backend, 
-		    GtkPrinter             *printer, 
-		    GtkPageSetupUnixDialog *dialog)
+printer_removed_cb (GtkPrintBackend        *backend,
+                    GtkPrinter             *printer,
+                    GtkPageSetupUnixDialog *dialog)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
   GtkTreeIter *iter;
@@ -315,23 +312,23 @@ printer_removed_cb (GtkPrintBackend        *backend,
 
 
 static void
-printer_status_cb (GtkPrintBackend        *backend, 
-                   GtkPrinter             *printer, 
-		   GtkPageSetupUnixDialog *dialog)
+printer_status_cb (GtkPrintBackend        *backend,
+                   GtkPrinter             *printer,
+                   GtkPageSetupUnixDialog *dialog)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
   GtkTreeIter *iter;
   gchar *str;
   const gchar *location;
-  
+
   iter = g_object_get_data (G_OBJECT (printer), "gtk-print-tree-iter");
 
   location = gtk_printer_get_location (printer);
   if (location == NULL)
     location = "";
   str = g_strdup_printf ("<b>%s</b>\n%s",
-			 gtk_printer_get_name (printer),
-			 location);
+                         gtk_printer_get_name (printer),
+                         location);
   gtk_list_store_set (priv->printer_list, iter,
                       PRINTER_LIST_COL_NAME, str,
                       -1);
@@ -340,26 +337,26 @@ printer_status_cb (GtkPrintBackend        *backend,
 
 static void
 printer_list_initialize (GtkPageSetupUnixDialog *dialog,
-			 GtkPrintBackend        *print_backend)
+                         GtkPrintBackend        *print_backend)
 {
   GList *list, *node;
-  
+
   g_return_if_fail (print_backend != NULL);
 
-  g_signal_connect_object (print_backend, 
-			   "printer-added", 
-			   (GCallback) printer_added_cb, 
-			   G_OBJECT (dialog), 0);
+  g_signal_connect_object (print_backend,
+                           "printer-added",
+                           (GCallback) printer_added_cb,
+                           G_OBJECT (dialog), 0);
 
-  g_signal_connect_object (print_backend, 
-			   "printer-removed", 
-			   (GCallback) printer_removed_cb, 
-			   G_OBJECT (dialog), 0);
+  g_signal_connect_object (print_backend,
+                           "printer-removed",
+                           (GCallback) printer_removed_cb,
+                           G_OBJECT (dialog), 0);
 
-  g_signal_connect_object (print_backend, 
-			   "printer-status-changed", 
-			   (GCallback) printer_status_cb, 
-			   G_OBJECT (dialog), 0);
+  g_signal_connect_object (print_backend,
+                           "printer-status-changed",
+                           (GCallback) printer_status_cb,
+                           G_OBJECT (dialog), 0);
 
   list = gtk_print_backend_get_printer_list (print_backend);
 
@@ -371,7 +368,7 @@ printer_list_initialize (GtkPageSetupUnixDialog *dialog,
     }
 
   g_list_free (list);
-  
+
 }
 
 static void
@@ -389,8 +386,8 @@ load_print_backends (GtkPageSetupUnixDialog *dialog)
 
 static gboolean
 paper_size_row_is_separator (GtkTreeModel *model,
-			     GtkTreeIter  *iter,
-			     gpointer      data)
+                             GtkTreeIter  *iter,
+                             gpointer      data)
 {
   gboolean separator;
 
@@ -407,11 +404,11 @@ get_current_page_setup (GtkPageSetupUnixDialog *dialog)
   GtkTreeIter iter;
 
   current_page_setup = NULL;
-  
+
   combo_box = GTK_COMBO_BOX (priv->paper_size_combo);
   if (gtk_combo_box_get_active_iter (combo_box, &iter))
     gtk_tree_model_get (GTK_TREE_MODEL (priv->page_setup_list), &iter,
-			PAGE_SETUP_LIST_COL_PAGE_SETUP, &current_page_setup, -1);
+                        PAGE_SETUP_LIST_COL_PAGE_SETUP, &current_page_setup, -1);
 
   if (current_page_setup)
     return current_page_setup;
@@ -419,17 +416,17 @@ get_current_page_setup (GtkPageSetupUnixDialog *dialog)
   /* No selected page size, return the default one.
    * This is used to set the first page setup when the dialog is created
    * as there is no selection on the first printer_changed.
-   */ 
+   */
   return gtk_page_setup_new ();
 }
 
 static gboolean
-page_setup_is_equal (GtkPageSetup *a, 
-		     GtkPageSetup *b)
+page_setup_is_equal (GtkPageSetup *a,
+                     GtkPageSetup *b)
 {
   return
     gtk_paper_size_is_equal (gtk_page_setup_get_paper_size (a),
-			     gtk_page_setup_get_paper_size (b)) &&
+                             gtk_page_setup_get_paper_size (b)) &&
     gtk_page_setup_get_top_margin (a, GTK_UNIT_MM) == gtk_page_setup_get_top_margin (b, GTK_UNIT_MM) &&
     gtk_page_setup_get_bottom_margin (a, GTK_UNIT_MM) == gtk_page_setup_get_bottom_margin (b, GTK_UNIT_MM) &&
     gtk_page_setup_get_left_margin (a, GTK_UNIT_MM) == gtk_page_setup_get_left_margin (b, GTK_UNIT_MM) &&
@@ -438,17 +435,17 @@ page_setup_is_equal (GtkPageSetup *a,
 
 static gboolean
 page_setup_is_same_size (GtkPageSetup *a,
-			 GtkPageSetup *b)
+                         GtkPageSetup *b)
 {
   return gtk_paper_size_is_equal (gtk_page_setup_get_paper_size (a),
-				  gtk_page_setup_get_paper_size (b));
+                                  gtk_page_setup_get_paper_size (b));
 }
 
 static gboolean
 set_paper_size (GtkPageSetupUnixDialog *dialog,
-		GtkPageSetup           *page_setup,
-		gboolean                size_only,
-		gboolean                add_item)
+                GtkPageSetup           *page_setup,
+                gboolean                size_only,
+                gboolean                add_item)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
   GtkTreeModel *model;
@@ -460,38 +457,38 @@ set_paper_size (GtkPageSetupUnixDialog *dialog,
   if (gtk_tree_model_get_iter_first (model, &iter))
     {
       do
-	{
-	  gtk_tree_model_get (GTK_TREE_MODEL (priv->page_setup_list), &iter,
-			      PAGE_SETUP_LIST_COL_PAGE_SETUP, &list_page_setup, -1);
-	  if (list_page_setup == NULL)
-	    continue;
-	  
-	  if ((size_only && page_setup_is_same_size (page_setup, list_page_setup)) ||
-	      (!size_only && page_setup_is_equal (page_setup, list_page_setup)))
-	    {
-	      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->paper_size_combo),
-					     &iter);
-	      g_object_unref (list_page_setup);
-	      return TRUE;
-	    }
-	      
-	  g_object_unref (list_page_setup);
-	  
-	} while (gtk_tree_model_iter_next (model, &iter));
+        {
+          gtk_tree_model_get (GTK_TREE_MODEL (priv->page_setup_list), &iter,
+                              PAGE_SETUP_LIST_COL_PAGE_SETUP, &list_page_setup, -1);
+          if (list_page_setup == NULL)
+            continue;
+
+          if ((size_only && page_setup_is_same_size (page_setup, list_page_setup)) ||
+              (!size_only && page_setup_is_equal (page_setup, list_page_setup)))
+            {
+              gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->paper_size_combo),
+                                             &iter);
+              g_object_unref (list_page_setup);
+              return TRUE;
+            }
+
+          g_object_unref (list_page_setup);
+
+        } while (gtk_tree_model_iter_next (model, &iter));
     }
 
   if (add_item)
     {
       gtk_list_store_append (priv->page_setup_list, &iter);
       gtk_list_store_set (priv->page_setup_list, &iter,
-			  PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE,
-			  -1);
+                          PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE,
+                          -1);
       gtk_list_store_append (priv->page_setup_list, &iter);
       gtk_list_store_set (priv->page_setup_list, &iter,
-			  PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
-			  -1);
+                          PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
+                          -1);
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->paper_size_combo),
-				     &iter);
+                                     &iter);
       return TRUE;
     }
 
@@ -510,22 +507,22 @@ fill_custom_paper_sizes (GtkPageSetupUnixDialog *dialog)
     {
       gtk_list_store_append (priv->page_setup_list, &paper_iter);
       gtk_list_store_set (priv->page_setup_list, &paper_iter,
-			  PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE,
-			  -1);
+                          PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE,
+                          -1);
       do
-	{
-	  GtkPageSetup *page_setup;
-	  gtk_tree_model_get (model, &iter, 0, &page_setup, -1);
+        {
+          GtkPageSetup *page_setup;
+          gtk_tree_model_get (model, &iter, 0, &page_setup, -1);
 
-	  gtk_list_store_append (priv->page_setup_list, &paper_iter);
-	  gtk_list_store_set (priv->page_setup_list, &paper_iter,
-			      PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
-			      -1);
+          gtk_list_store_append (priv->page_setup_list, &paper_iter);
+          gtk_list_store_set (priv->page_setup_list, &paper_iter,
+                              PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
+                              -1);
 
-	  g_object_unref (page_setup);
-	} while (gtk_tree_model_iter_next (model, &iter));
+          g_object_unref (page_setup);
+        } while (gtk_tree_model_iter_next (model, &iter));
     }
-  
+
   gtk_list_store_append (priv->page_setup_list, &paper_iter);
   gtk_list_store_set (priv->page_setup_list, &paper_iter,
                       PAGE_SETUP_LIST_COL_IS_SEPARATOR, TRUE,
@@ -538,7 +535,7 @@ fill_custom_paper_sizes (GtkPageSetupUnixDialog *dialog)
 
 static void
 fill_paper_sizes_from_printer (GtkPageSetupUnixDialog *dialog,
-			       GtkPrinter             *printer)
+                               GtkPrinter             *printer)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
   GList *list, *l;
@@ -552,38 +549,38 @@ fill_paper_sizes_from_printer (GtkPageSetupUnixDialog *dialog,
   if (printer == NULL)
     {
       for (i = 0; i < G_N_ELEMENTS (common_paper_sizes); i++)
-	{
-	  page_setup = gtk_page_setup_new ();
-	  paper_size = gtk_paper_size_new (common_paper_sizes[i]);
-	  gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size);
-	  gtk_paper_size_free (paper_size);
-	  
-	  gtk_list_store_append (priv->page_setup_list, &iter);
-	  gtk_list_store_set (priv->page_setup_list, &iter,
-			      PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
-			      -1);
-	  g_object_unref (page_setup);
-	}
+        {
+          page_setup = gtk_page_setup_new ();
+          paper_size = gtk_paper_size_new (common_paper_sizes[i]);
+          gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size);
+          gtk_paper_size_free (paper_size);
+
+          gtk_list_store_append (priv->page_setup_list, &iter);
+          gtk_list_store_set (priv->page_setup_list, &iter,
+                              PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
+                              -1);
+          g_object_unref (page_setup);
+        }
     }
   else
     {
       list = gtk_printer_list_papers (printer);
       /* TODO: We should really sort this list so interesting size
-	 are at the top */
+         are at the top */
       for (l = list; l != NULL; l = l->next)
-	{
-	  page_setup = l->data;
-	  gtk_list_store_append (priv->page_setup_list, &iter);
-	  gtk_list_store_set (priv->page_setup_list, &iter,
-			      PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
-			      -1);
-	  g_object_unref (page_setup);
-	}
+        {
+          page_setup = l->data;
+          gtk_list_store_append (priv->page_setup_list, &iter);
+          gtk_list_store_set (priv->page_setup_list, &iter,
+                              PAGE_SETUP_LIST_COL_PAGE_SETUP, page_setup,
+                              -1);
+          g_object_unref (page_setup);
+        }
       g_list_free (list);
     }
 
   fill_custom_paper_sizes (dialog);
-  
+
   current_page_setup = NULL;
 
   /* When selecting a different printer, select its default paper size */
@@ -595,24 +592,24 @@ fill_paper_sizes_from_printer (GtkPageSetupUnixDialog *dialog,
 
   if (!set_paper_size (dialog, current_page_setup, FALSE, FALSE))
     set_paper_size (dialog, current_page_setup, TRUE, TRUE);
-  
+
   if (current_page_setup)
     g_object_unref (current_page_setup);
 }
 
 static void
 printer_changed_finished_callback (GtkPrinter             *printer,
-				   gboolean                success,
-				   GtkPageSetupUnixDialog *dialog)
+                                   gboolean                success,
+                                   GtkPageSetupUnixDialog *dialog)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
 
   g_signal_handler_disconnect (priv->request_details_printer,
-			       priv->request_details_tag);
+                               priv->request_details_tag);
   g_object_unref (priv->request_details_printer);
   priv->request_details_tag = 0;
   priv->request_details_printer = NULL;
-  
+
   if (success)
     fill_paper_sizes_from_printer (dialog, printer);
 
@@ -620,60 +617,60 @@ printer_changed_finished_callback (GtkPrinter             *printer,
 
 static void
 printer_changed_callback (GtkComboBox            *combo_box,
-			  GtkPageSetupUnixDialog *dialog)
+                          GtkPageSetupUnixDialog *dialog)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
   GtkPrinter *printer;
   GtkTreeIter iter;
 
   /* If we're waiting for a specific printer but the user changed
-   * to another printer, cancel that wait. 
+   * to another printer, cancel that wait.
    */
   if (priv->waiting_for_printer)
     {
       g_free (priv->waiting_for_printer);
       priv->waiting_for_printer = NULL;
     }
-  
+
   if (priv->request_details_tag)
     {
       g_signal_handler_disconnect (priv->request_details_printer,
-				   priv->request_details_tag);
+                                   priv->request_details_tag);
       g_object_unref (priv->request_details_printer);
       priv->request_details_printer = NULL;
       priv->request_details_tag = 0;
     }
-  
+
   if (gtk_combo_box_get_active_iter (combo_box, &iter))
     {
       gtk_tree_model_get (gtk_combo_box_get_model (combo_box), &iter,
-			  PRINTER_LIST_COL_PRINTER, &printer, -1);
+                          PRINTER_LIST_COL_PRINTER, &printer, -1);
 
       if (printer == NULL || gtk_printer_has_details (printer))
-	fill_paper_sizes_from_printer (dialog, printer);
+        fill_paper_sizes_from_printer (dialog, printer);
       else
-	{
-	  priv->request_details_printer = g_object_ref (printer);
-	  priv->request_details_tag =
-	    g_signal_connect (printer, "details-acquired",
-			      G_CALLBACK (printer_changed_finished_callback), dialog);
-	  gtk_printer_request_details (printer);
+        {
+          priv->request_details_printer = g_object_ref (printer);
+          priv->request_details_tag =
+            g_signal_connect (printer, "details-acquired",
+                              G_CALLBACK (printer_changed_finished_callback), dialog);
+          gtk_printer_request_details (printer);
 
-	}
+        }
 
       if (printer)
-	g_object_unref (printer);
+        g_object_unref (printer);
 
       if (priv->print_settings)
-	{
-	  const char *name = NULL;
-
-	  if (printer)
-	    name = gtk_printer_get_name (printer);
-	  
-	  gtk_print_settings_set (priv->print_settings,
-				  "format-for-printer", name);
-	}
+        {
+          const char *name = NULL;
+
+          if (printer)
+            name = gtk_printer_get_name (printer);
+
+          gtk_print_settings_set (priv->print_settings,
+                                  "format-for-printer", name);
+        }
     }
 }
 
@@ -681,8 +678,8 @@ printer_changed_callback (GtkComboBox            *combo_box,
    after the decimal point, and not to many such digits if they
    are nonzero. I wish printf let you specify max precision for %f... */
 static gchar *
-double_to_string (gdouble d, 
-		  GtkUnit unit)
+double_to_string (gdouble d,
+                  GtkUnit unit)
 {
   gchar *val, *p;
   struct lconv *locale_data;
@@ -692,7 +689,7 @@ double_to_string (gdouble d,
   locale_data = localeconv ();
   decimal_point = locale_data->decimal_point;
   decimal_point_len = strlen (decimal_point);
-  
+
   /* Max two decimal digits for inch, max one for mm */
   if (unit == GTK_UNIT_INCH)
     val = g_strdup_printf ("%.2f", d);
@@ -705,7 +702,7 @@ double_to_string (gdouble d,
       while (*p == '0')
         p--;
       if (p - val + 1 >= decimal_point_len &&
-	  strncmp (p - (decimal_point_len - 1), decimal_point, decimal_point_len) == 0)
+          strncmp (p - (decimal_point_len - 1), decimal_point, decimal_point_len) == 0)
         p -= decimal_point_len;
       p[1] = '\0';
     }
@@ -716,8 +713,8 @@ double_to_string (gdouble d,
 
 static void
 custom_paper_dialog_response_cb (GtkDialog *custom_paper_dialog,
-				 gint       response_id,
-				 gpointer   user_data)
+                                 gint       response_id,
+                                 gpointer   user_data)
 {
   GtkPageSetupUnixDialog *page_setup_dialog = GTK_PAGE_SETUP_UNIX_DIALOG (user_data);
   GtkPageSetupUnixDialogPrivate *priv = page_setup_dialog->priv;
@@ -732,7 +729,7 @@ custom_paper_dialog_response_cb (GtkDialog *custom_paper_dialog,
 
 static void
 paper_size_changed (GtkComboBox            *combo_box,
-		    GtkPageSetupUnixDialog *dialog)
+                    GtkPageSetupUnixDialog *dialog)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
   GtkTreeIter iter;
@@ -744,22 +741,22 @@ paper_size_changed (GtkComboBox            *combo_box,
   const gchar *unit_str;
 
   label = GTK_LABEL (priv->paper_size_label);
-   
+
   if (gtk_combo_box_get_active_iter (combo_box, &iter))
     {
       gtk_tree_model_get (gtk_combo_box_get_model (combo_box),
-			  &iter, PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup, -1);
+                          &iter, PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup, -1);
 
       if (page_setup == NULL)
-	{
+        {
           GtkWidget *custom_paper_dialog;
 
           /* Change from "manage" menu item to last value */
           if (priv->last_setup)
             last_page_setup = g_object_ref (priv->last_setup);
           else
-	    last_page_setup = gtk_page_setup_new (); /* "good" default */
-	  set_paper_size (dialog, last_page_setup, FALSE, TRUE);
+            last_page_setup = gtk_page_setup_new (); /* "good" default */
+          set_paper_size (dialog, last_page_setup, FALSE, TRUE);
           g_object_unref (last_page_setup);
 
           /* And show the custom paper dialog */
@@ -768,29 +765,28 @@ paper_size_changed (GtkComboBox            *combo_box,
           gtk_window_present (GTK_WINDOW (custom_paper_dialog));
 
           return;
-	}
+        }
 
       if (priv->last_setup)
-	g_object_unref (priv->last_setup);
+        g_object_unref (priv->last_setup);
 
       priv->last_setup = g_object_ref (page_setup);
-      
+
       unit = _gtk_print_get_default_user_units ();
 
       if (unit == GTK_UNIT_MM)
-	unit_str = _("mm");
+        unit_str = _("mm");
       else
-	unit_str = _("inch");
-	
+        unit_str = _("inch");
 
       w = double_to_string (gtk_page_setup_get_paper_width (page_setup, unit),
-			    unit);
+                            unit);
       h = double_to_string (gtk_page_setup_get_paper_height (page_setup, unit),
-			    unit);
+                            unit);
       str = g_strdup_printf ("%s x %s %s", w, h, unit_str);
       g_free (w);
       g_free (h);
-      
+
       gtk_label_set_text (label, str);
       g_free (str);
 
@@ -800,23 +796,23 @@ paper_size_changed (GtkComboBox            *combo_box,
       right = double_to_string (gtk_page_setup_get_right_margin (page_setup, unit), unit);
 
       str = g_strdup_printf (_("Margins:\n"
-			       " Left: %s %s\n"
-			       " Right: %s %s\n"
-			       " Top: %s %s\n"
-			       " Bottom: %s %s"
-			       ),
-			     left, unit_str,
-			     right, unit_str,
-			     top, unit_str,
-			     bottom, unit_str);
+                               " Left: %s %s\n"
+                               " Right: %s %s\n"
+                               " Top: %s %s\n"
+                               " Bottom: %s %s"
+                               ),
+                             left, unit_str,
+                             right, unit_str,
+                             top, unit_str,
+                             bottom, unit_str);
       g_free (top);
       g_free (bottom);
       g_free (left);
       g_free (right);
-      
+
       gtk_widget_set_tooltip_text (priv->paper_size_label, str);
       g_free (str);
-      
+
       g_object_unref (page_setup);
     }
   else
@@ -824,23 +820,23 @@ paper_size_changed (GtkComboBox            *combo_box,
       gtk_label_set_text (label, "");
       gtk_widget_set_tooltip_text (priv->paper_size_label, NULL);
       if (priv->last_setup)
-	g_object_unref (priv->last_setup);
+        g_object_unref (priv->last_setup);
       priv->last_setup = NULL;
     }
 }
 
 static void
 page_name_func (GtkCellLayout   *cell_layout,
-		GtkCellRenderer *cell,
-		GtkTreeModel    *tree_model,
-		GtkTreeIter     *iter,
-		gpointer         data)
+                GtkCellRenderer *cell,
+                GtkTreeModel    *tree_model,
+                GtkTreeIter     *iter,
+                gpointer         data)
 {
   GtkPageSetup *page_setup;
   GtkPaperSize *paper_size;
-  
+
   gtk_tree_model_get (tree_model, iter,
-		      PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup, -1);
+                      PAGE_SETUP_LIST_COL_PAGE_SETUP, &page_setup, -1);
   if (page_setup)
     {
       paper_size = gtk_page_setup_get_paper_size (page_setup);
@@ -849,12 +845,12 @@ page_name_func (GtkCellLayout   *cell_layout,
     }
   else
     g_object_set (cell, "text",  _("Manage Custom Sizes..."), NULL);
-      
+
 }
 
 static GtkWidget *
 create_radio_button (GSList      *group,
-		     const gchar *stock_id)
+                     const gchar *stock_id)
 {
   GtkWidget *radio_button, *image, *label, *hbox;
   GtkStockItem item;
@@ -892,9 +888,9 @@ populate_dialog (GtkPageSetupUnixDialog *ps_dialog)
   gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
   gtk_box_set_spacing (GTK_BOX (action_area), 6);
 
-  table = gtk_table_new (5, 4, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 12);
   gtk_container_set_border_width (GTK_CONTAINER (table), 5);
   gtk_box_pack_start (GTK_BOX (content_area), table, TRUE, TRUE, 0);
   gtk_widget_show (table);
@@ -902,9 +898,7 @@ populate_dialog (GtkPageSetupUnixDialog *ps_dialog)
   label = gtk_label_new_with_mnemonic (_("_Format for:"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-  gtk_table_attach (GTK_TABLE (table), label,
-		    0, 1, 0, 1,
-		    GTK_FILL, 0, 0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
   gtk_widget_show (label);
 
   combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (priv->printer_list));
@@ -916,33 +910,31 @@ populate_dialog (GtkPageSetupUnixDialog *ps_dialog)
                                   "markup", PRINTER_LIST_COL_NAME,
                                   NULL);
 
-  gtk_table_attach (GTK_TABLE (table), combo,
-		    1, 4, 0, 1,
-		    GTK_FILL | GTK_EXPAND, 0, 0, 0);
+  gtk_widget_set_halign (combo, GTK_ALIGN_FILL);
+  gtk_widget_set_hexpand (combo, TRUE);
+  gtk_grid_attach (GTK_GRID (table), combo, 1, 0, 3, 1);
   gtk_widget_show (combo);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
 
   label = gtk_label_new_with_mnemonic (_("_Paper size:"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-  gtk_table_attach (GTK_TABLE (table), label,
-		    0, 1, 1, 2,
-		    GTK_FILL, 0, 0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
   gtk_widget_show (label);
 
   combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (priv->page_setup_list));
   priv->paper_size_combo = combo;
-  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), 
-					paper_size_row_is_separator, NULL, NULL);
-  
+  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
+                                        paper_size_row_is_separator, NULL, NULL);
+
   cell = gtk_cell_renderer_text_new ();
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE);
   gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo), cell,
-				      page_name_func, NULL, NULL);
+                                      page_name_func, NULL, NULL);
 
-  gtk_table_attach (GTK_TABLE (table), combo,
-		    1, 4, 1, 2,
-		    GTK_FILL | GTK_EXPAND, 0, 0, 0);
+  gtk_widget_set_halign (combo, GTK_ALIGN_FILL);
+  gtk_widget_set_hexpand (combo, TRUE);
+  gtk_grid_attach (GTK_GRID (table), combo, 1, 1, 3, 1);
   gtk_widget_show (combo);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
 
@@ -950,50 +942,43 @@ populate_dialog (GtkPageSetupUnixDialog *ps_dialog)
   priv->paper_size_label = label;
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-  gtk_table_attach (GTK_TABLE (table), label,
-		    1, 4, 2, 3,
-		    GTK_FILL, 0, 0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 1, 2, 3, 1);
   gtk_widget_show (label);
 
   label = gtk_label_new_with_mnemonic (_("_Orientation:"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-  gtk_table_attach (GTK_TABLE (table), label,
-		    0, 1, 3, 4,
-		    GTK_FILL, 0, 0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
   gtk_widget_show (label);
 
   radio_button = create_radio_button (NULL, GTK_STOCK_ORIENTATION_PORTRAIT);
   priv->portrait_radio = radio_button;
-  gtk_table_attach (GTK_TABLE (table), radio_button,
-		    1, 2, 3, 4,
-		    GTK_EXPAND|GTK_FILL, 0, 0, 0);
+  gtk_widget_set_halign (combo, GTK_ALIGN_FILL);
+  gtk_widget_set_hexpand (combo, TRUE);
+  gtk_grid_attach (GTK_GRID (table), radio_button, 1, 3, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), radio_button);
 
   radio_button = create_radio_button (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_button)),
-				      GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT);
+                                      GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT);
   priv->reverse_portrait_radio = radio_button;
-  gtk_table_attach (GTK_TABLE (table), radio_button,
-		    2, 3, 3, 4,
-		    GTK_EXPAND|GTK_FILL, 0, 0, 0);
+  gtk_widget_set_halign (combo, GTK_ALIGN_FILL);
+  gtk_widget_set_hexpand (combo, TRUE);
+  gtk_grid_attach (GTK_GRID (table), radio_button, 2, 3, 1, 1);
 
   radio_button = create_radio_button (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_button)),
-				      GTK_STOCK_ORIENTATION_LANDSCAPE);
+                                      GTK_STOCK_ORIENTATION_LANDSCAPE);
   priv->landscape_radio = radio_button;
-  gtk_table_attach (GTK_TABLE (table), radio_button,
-		    1, 2, 4, 5,
-		    GTK_EXPAND|GTK_FILL, 0, 0, 0);
+  gtk_widget_set_halign (combo, GTK_ALIGN_FILL);
+  gtk_widget_set_hexpand (combo, TRUE);
+  gtk_grid_attach (GTK_GRID (table), radio_button, 1, 4, 1, 1);
   gtk_widget_show (radio_button);
 
-  gtk_table_set_row_spacing (GTK_TABLE (table), 3, 0);
-  
   radio_button = create_radio_button (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_button)),
-				      GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE);
+                                      GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE);
   priv->reverse_landscape_radio = radio_button;
-  gtk_table_attach (GTK_TABLE (table), radio_button,
-		    2, 3, 4, 5,
-		    GTK_EXPAND|GTK_FILL, 0, 0, 0);
-
+  gtk_widget_set_halign (combo, GTK_ALIGN_FILL);
+  gtk_widget_set_hexpand (combo, TRUE);
+  gtk_grid_attach (GTK_GRID (table), radio_button, 2, 4, 1, 1);
 
   g_signal_connect (priv->paper_size_combo, "changed", G_CALLBACK (paper_size_changed), ps_dialog);
   g_signal_connect (priv->printer_combo, "changed", G_CALLBACK (printer_changed_callback), ps_dialog);
@@ -1015,13 +1000,13 @@ populate_dialog (GtkPageSetupUnixDialog *ps_dialog)
  */
 GtkWidget *
 gtk_page_setup_unix_dialog_new (const gchar *title,
-				GtkWindow   *parent)
+                                GtkWindow   *parent)
 {
   GtkWidget *result;
 
   if (title == NULL)
     title = _("Page Setup");
-  
+
   result = g_object_new (GTK_TYPE_PAGE_SETUP_UNIX_DIALOG,
                          "title", title,
                          NULL);
@@ -1047,8 +1032,8 @@ get_orientation (GtkPageSetupUnixDialog *dialog)
 }
 
 static void
-set_orientation (GtkPageSetupUnixDialog *dialog, 
-		 GtkPageOrientation      orientation)
+set_orientation (GtkPageSetupUnixDialog *dialog,
+                 GtkPageOrientation      orientation)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
 
@@ -1073,7 +1058,7 @@ set_orientation (GtkPageSetupUnixDialog *dialog,
  * gtk_page_setup_unix_dialog_set_page_setup:
  * @dialog: a #GtkPageSetupUnixDialog
  * @page_setup: a #GtkPageSetup
- * 
+ *
  * Sets the #GtkPageSetup from which the page setup
  * dialog takes its values.
  *
@@ -1081,7 +1066,7 @@ set_orientation (GtkPageSetupUnixDialog *dialog,
  **/
 void
 gtk_page_setup_unix_dialog_set_page_setup (GtkPageSetupUnixDialog *dialog,
-					   GtkPageSetup           *page_setup)
+                                           GtkPageSetup           *page_setup)
 {
   if (page_setup)
     {
@@ -1093,10 +1078,10 @@ gtk_page_setup_unix_dialog_set_page_setup (GtkPageSetupUnixDialog *dialog,
 /**
  * gtk_page_setup_unix_dialog_get_page_setup:
  * @dialog: a #GtkPageSetupUnixDialog
- * 
- * Gets the currently selected page setup from the dialog. 
- * 
- * Returns: (transfer none): the current page setup 
+ *
+ * Gets the currently selected page setup from the dialog.
+ *
+ * Returns: (transfer none): the current page setup
  *
  * Since: 2.10
  **/
@@ -1104,7 +1089,7 @@ GtkPageSetup *
 gtk_page_setup_unix_dialog_get_page_setup (GtkPageSetupUnixDialog *dialog)
 {
   GtkPageSetup *page_setup;
-  
+
   page_setup = get_current_page_setup (dialog);
 
   gtk_page_setup_set_orientation (page_setup, get_orientation (dialog));
@@ -1114,7 +1099,7 @@ gtk_page_setup_unix_dialog_get_page_setup (GtkPageSetupUnixDialog *dialog)
 
 static gboolean
 set_active_printer (GtkPageSetupUnixDialog *dialog,
-		    const gchar            *printer_name)
+                    const gchar            *printer_name)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
   GtkTreeModel *model;
@@ -1126,25 +1111,25 @@ set_active_printer (GtkPageSetupUnixDialog *dialog,
   if (gtk_tree_model_get_iter_first (model, &iter))
     {
       do
-	{
-	  gtk_tree_model_get (GTK_TREE_MODEL (priv->printer_list), &iter,
-			      PRINTER_LIST_COL_PRINTER, &printer, -1);
-	  if (printer == NULL)
-	    continue;
-	  
-	  if (strcmp (gtk_printer_get_name (printer), printer_name) == 0)
-	    {
-	      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->printer_combo),
-					     &iter);
-	      g_object_unref (printer);
-	      return TRUE;
-	    }
-	      
-	  g_object_unref (printer);
-	  
-	} while (gtk_tree_model_iter_next (model, &iter));
+        {
+          gtk_tree_model_get (GTK_TREE_MODEL (priv->printer_list), &iter,
+                              PRINTER_LIST_COL_PRINTER, &printer, -1);
+          if (printer == NULL)
+            continue;
+
+          if (strcmp (gtk_printer_get_name (printer), printer_name) == 0)
+            {
+              gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->printer_combo),
+                                             &iter);
+              g_object_unref (printer);
+              return TRUE;
+            }
+
+          g_object_unref (printer);
+
+        } while (gtk_tree_model_iter_next (model, &iter));
     }
-  
+
   return FALSE;
 }
 
@@ -1152,15 +1137,15 @@ set_active_printer (GtkPageSetupUnixDialog *dialog,
  * gtk_page_setup_unix_dialog_set_print_settings:
  * @dialog: a #GtkPageSetupUnixDialog
  * @print_settings: a #GtkPrintSettings
- * 
+ *
  * Sets the #GtkPrintSettings from which the page setup dialog
  * takes its values.
- * 
+ *
  * Since: 2.10
  **/
 void
 gtk_page_setup_unix_dialog_set_print_settings (GtkPageSetupUnixDialog *dialog,
-					       GtkPrintSettings       *print_settings)
+                                               GtkPrintSettings       *print_settings)
 {
   GtkPageSetupUnixDialogPrivate *priv = dialog->priv;
   const gchar *format_for_printer;
@@ -1178,21 +1163,21 @@ gtk_page_setup_unix_dialog_set_print_settings (GtkPageSetupUnixDialog *dialog,
 
       format_for_printer = gtk_print_settings_get (print_settings, "format-for-printer");
 
-      /* Set printer if in list, otherwise set when 
-       * that printer is added 
+      /* Set printer if in list, otherwise set when
+       * that printer is added
        */
       if (format_for_printer &&
-	  !set_active_printer (dialog, format_for_printer))
-	priv->waiting_for_printer = g_strdup (format_for_printer); 
+          !set_active_printer (dialog, format_for_printer))
+        priv->waiting_for_printer = g_strdup (format_for_printer);
     }
 }
 
 /**
  * gtk_page_setup_unix_dialog_get_print_settings:
  * @dialog: a #GtkPageSetupUnixDialog
- * 
+ *
  * Gets the current print settings from the dialog.
- * 
+ *
  * Returns: (transfer none): the current print settings
  *
  * Since: 2.10
diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
index 6af3a8337c..2181b7b40b 100644
--- a/gtk/gtkpango.c
+++ b/gtk/gtkpango.c
@@ -693,6 +693,7 @@ _gtk_pango_move_lines (PangoLayout *layout,
   text = pango_layout_get_text (layout);
   index = g_utf8_offset_to_pointer (text, offset) - text;
   lines = pango_layout_get_lines (layout);
+  line = NULL;
 
   num = 0;
   for (l = lines; l; l = l->next)
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 8f467b2701..d5d0f3b6fc 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -32,7 +32,7 @@
 #include "gtkicontheme.h"
 #include "gtkiconfactory.h"
 #include "gtklabel.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 
diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index fdc2e1dac5..840fb26414 100644
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -34,7 +34,7 @@
 #include "gtkliststore.h"
 #include "gtkradiobutton.h"
 #include "gtkstock.h"
-#include "gtktable.h"
+#include "gtkgrid.h"
 #include "gtktogglebutton.h"
 #include "gtkorientable.h"
 #include "gtkprivate.h"
@@ -783,9 +783,9 @@ construct_widgets (GtkPrinterOptionWidget *widget)
       {
         GtkWidget *label;
         
-        priv->filechooser = gtk_table_new (2, 2, FALSE);
-        gtk_table_set_row_spacings (GTK_TABLE (priv->filechooser), 6);
-        gtk_table_set_col_spacings (GTK_TABLE (priv->filechooser), 12);
+        priv->filechooser = gtk_grid_new ();
+        gtk_grid_set_row_spacing (GTK_GRID (priv->filechooser), 6);
+        gtk_grid_set_column_spacing (GTK_GRID (priv->filechooser), 12);
 
         /* TODO: make this a gtkfilechooserentry once we move to GTK */
         priv->entry = gtk_entry_new ();
@@ -801,26 +801,16 @@ construct_widgets (GtkPrinterOptionWidget *widget)
         gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->entry);
 
-        gtk_table_attach (GTK_TABLE (priv->filechooser), label,
-                          0, 1, 0, 1, GTK_FILL, 0,
-                          0, 0);
-
-        gtk_table_attach (GTK_TABLE (priv->filechooser), priv->entry,
-                          1, 2, 0, 1, GTK_FILL, 0,
-                          0, 0);
+        gtk_grid_attach (GTK_GRID (priv->filechooser), label, 0, 0, 1, 1);
+        gtk_grid_attach (GTK_GRID (priv->filechooser), priv->entry, 1, 0, 1, 1);
 
         label = gtk_label_new_with_mnemonic (_("_Save in folder:"));
         gtk_widget_set_halign (label, GTK_ALIGN_START);
         gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
         gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->combo);
 
-        gtk_table_attach (GTK_TABLE (priv->filechooser), label,
-                          0, 1, 1, 2, GTK_FILL, 0,
-                          0, 0);
-
-        gtk_table_attach (GTK_TABLE (priv->filechooser), priv->combo,
-                          1, 2, 1, 2, GTK_FILL, 0,
-                          0, 0);
+        gtk_grid_attach (GTK_GRID (priv->filechooser), label, 0, 1, 1, 1);
+        gtk_grid_attach (GTK_GRID (priv->filechooser), priv->combo, 1, 1, 1, 1);
 
         gtk_widget_show_all (priv->filechooser);
         gtk_box_pack_start (GTK_BOX (widget), priv->filechooser, TRUE, TRUE, 0);
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 141da44bf9..a909fa7961 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -48,8 +48,8 @@
 #include "gtktogglebutton.h"
 #include "gtkradiobutton.h"
 #include "gtkdrawingarea.h"
-#include "gtkvbox.h"
-#include "gtktable.h"
+#include "gtkbox.h"
+#include "gtkgrid.h"
 #include "gtkframe.h"
 #include "gtklabel.h"
 #include "gtkeventbox.h"
@@ -1268,25 +1268,56 @@ add_option_to_extension_point (GtkPrinterOption *option,
     gtk_box_pack_start (GTK_BOX (extension_point), widget, FALSE, FALSE, 0);
 }
 
+static gint
+grid_rows (GtkGrid *table)
+{
+  gint t0, t1, t, h;
+  GList *children, *c;
+
+  children = gtk_container_get_children (GTK_CONTAINER (table));
+  t0 = t1 = 0;
+  for (c = children; c; c = c->next)
+    {
+      gtk_container_child_get (GTK_CONTAINER (table), c->data,
+                               "top-attach", &t,
+                               "height", &h,
+                               NULL);
+      if (c == children)
+        {
+          t0 = t;
+          t1 = t + h;
+        }
+      else
+        {
+          if (t < t0)
+            t0 = t;
+          if (t + h > t1)
+            t1 = t + h;
+        }
+    }
+  g_list_free (children);
+
+  return t1 - t0;
+}
+
 static void
 add_option_to_table (GtkPrinterOption *option,
                      gpointer          user_data)
 {
-  GtkTable *table;
+  GtkGrid *table;
   GtkWidget *label, *widget;
   guint row;
 
-  table = GTK_TABLE (user_data);
+  table = GTK_GRID (user_data);
 
   if (g_str_has_prefix (option->name, "gtk-"))
     return;
 
+  row = grid_rows (table);
+
   widget = gtk_printer_option_widget_new (option);
   gtk_widget_show (widget);
 
-  gtk_table_get_size (table, &row, NULL);
-  gtk_table_resize (table, row + 1, 2);
-
   if (gtk_printer_option_widget_has_external_label (GTK_PRINTER_OPTION_WIDGET (widget)))
     {
       label = gtk_printer_option_widget_get_external_label (GTK_PRINTER_OPTION_WIDGET (widget));
@@ -1296,15 +1327,11 @@ add_option_to_table (GtkPrinterOption *option,
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
-      gtk_table_attach (table, label,
-                        0, 1, row - 1 , row,  GTK_FILL, 0, 0, 0);
-
-      gtk_table_attach (table, widget,
-                        1, 2, row - 1, row,  GTK_FILL, 0, 0, 0);
+      gtk_grid_attach (table, label, 0, row - 1, 1, 1);
+      gtk_grid_attach (table, widget, 1, row - 1, 1, 1);
     }
   else
-    gtk_table_attach (table, widget,
-                      0, 2, row - 1, row,  GTK_FILL, 0, 0, 0);
+    gtk_grid_attach (table, widget, 0, row - 1, 2, 1);
 }
 
 static void
@@ -1313,13 +1340,13 @@ setup_page_table (GtkPrinterOptionSet *options,
                   GtkWidget           *table,
                   GtkWidget           *page)
 {
-  guint nrows;
+  gint nrows;
 
   gtk_printer_option_set_foreach_in_group (options, group,
                                            add_option_to_table,
                                            table);
 
-  gtk_table_get_size (GTK_TABLE (table), &nrows, NULL);
+  nrows = grid_rows (GTK_GRID (page));
   if (nrows == 1)
     gtk_widget_hide (page);
   else
@@ -1484,16 +1511,16 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog)
           strcmp (group, "GtkPrintDialogExtension") == 0)
         continue;
 
-      table = gtk_table_new (1, 2, FALSE);
-      gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-      gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+      table = gtk_grid_new ();
+      gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+      gtk_grid_set_column_spacing (GTK_GRID (table), 12);
 
       gtk_printer_option_set_foreach_in_group (priv->options,
                                                group,
                                                add_option_to_table,
                                                table);
 
-      gtk_table_get_size (GTK_TABLE (table), &nrows, NULL);
+      nrows = grid_rows (GTK_GRID (table));
       if (nrows == 1)
         gtk_widget_destroy (table);
       else
@@ -1845,20 +1872,13 @@ clear_per_printer_ui (GtkPrintUnixDialog *dialog)
   GtkPrintUnixDialogPrivate *priv = dialog->priv;
 
   gtk_container_foreach (GTK_CONTAINER (priv->finishing_table),
-                         (GtkCallback)gtk_widget_destroy,
-                         NULL);
-  gtk_table_resize (GTK_TABLE (priv->finishing_table), 1, 2);
+                         (GtkCallback)gtk_widget_destroy, NULL);
   gtk_container_foreach (GTK_CONTAINER (priv->image_quality_table),
-                         (GtkCallback)gtk_widget_destroy,
-                         NULL);
-  gtk_table_resize (GTK_TABLE (priv->image_quality_table), 1, 2);
+                         (GtkCallback)gtk_widget_destroy, NULL);
   gtk_container_foreach (GTK_CONTAINER (priv->color_table),
-                         (GtkCallback)gtk_widget_destroy,
-                         NULL);
-  gtk_table_resize (GTK_TABLE (priv->color_table), 1, 2);
+                         (GtkCallback)gtk_widget_destroy, NULL);
   gtk_container_foreach (GTK_CONTAINER (priv->advanced_vbox),
-                         (GtkCallback)gtk_widget_destroy,
-                         NULL);
+                         (GtkCallback)gtk_widget_destroy, NULL);
   extension_point_clear_children (GTK_CONTAINER (priv->extension_point));
 }
 
@@ -2256,10 +2276,10 @@ create_main_page (GtkPrintUnixDialog *dialog)
   gtk_widget_show (hbox);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
 
-  table = gtk_table_new (4, 2, FALSE);
+  table = gtk_grid_new ();
   priv->range_table = table;
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 12);
   frame = wrap_in_frame (_("Range"), table);
   gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (table);
@@ -2267,28 +2287,21 @@ create_main_page (GtkPrintUnixDialog *dialog)
   radio = gtk_radio_button_new_with_mnemonic (NULL, _("_All Pages"));
   priv->all_pages_radio = radio;
   gtk_widget_show (radio);
-  gtk_table_attach (GTK_TABLE (table), radio,
-                    0, 2, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), radio, 0, 0, 2, 1);
   radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)),
                                               _("C_urrent Page"));
   if (priv->current_page == -1)
     gtk_widget_set_sensitive (radio, FALSE);
   priv->current_page_radio = radio;
   gtk_widget_show (radio);
-  gtk_table_attach (GTK_TABLE (table), radio,
-                    0, 2, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), radio, 0, 1, 2, 1);
 
   radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)),
                                               _("Se_lection"));
 
   gtk_widget_set_sensitive (radio, priv->has_selection);
   priv->selection_radio = radio;
-  gtk_table_attach (GTK_TABLE (table), radio,
-                    0, 2, 2, 3,  GTK_FILL, 0,
-                    0, 0);
-  gtk_table_set_row_spacing (GTK_TABLE (table), 2, 0);
+  gtk_grid_attach (GTK_GRID (table), radio, 0, 2, 2, 1);
 
   radio = gtk_radio_button_new_with_mnemonic (gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)), _("Pag_es:"));
   range_tooltip = _("Specify one or more page ranges,\n e.g. 1-3,7,11");
@@ -2296,24 +2309,20 @@ create_main_page (GtkPrintUnixDialog *dialog)
 
   priv->page_range_radio = radio;
   gtk_widget_show (radio);
-  gtk_table_attach (GTK_TABLE (table), radio,
-                    0, 1, 3, 4,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), radio, 0, 3, 1, 1);
   entry = gtk_entry_new ();
   gtk_widget_set_tooltip_text (entry, range_tooltip);
   atk_object_set_name (gtk_widget_get_accessible (entry), _("Pages"));
   atk_object_set_description (gtk_widget_get_accessible (entry), range_tooltip);
   priv->page_range_entry = entry;
   gtk_widget_show (entry);
-  gtk_table_attach (GTK_TABLE (table), entry,
-                    1, 2, 3, 4,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), entry, 1, 3, 1, 1);
   g_signal_connect (radio, "toggled", G_CALLBACK (update_entry_sensitivity), entry);
   update_entry_sensitivity (radio, entry);
 
-  table = gtk_table_new (3, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 12);
   frame = wrap_in_frame (_("Copies"), table);
   gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (table);
@@ -2323,15 +2332,11 @@ create_main_page (GtkPrintUnixDialog *dialog)
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
   spinbutton = gtk_spin_button_new_with_range (1.0, 100.0, 1.0);
   priv->copies_spin = spinbutton;
   gtk_widget_show (spinbutton);
-  gtk_table_attach (GTK_TABLE (table), spinbutton,
-                    1, 2, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), spinbutton, 1, 0, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton);
   g_signal_connect_swapped (spinbutton, "value-changed",
                             G_CALLBACK (update_dialog_from_capabilities), dialog);
@@ -2342,17 +2347,13 @@ create_main_page (GtkPrintUnixDialog *dialog)
   priv->collate_check = check;
   g_signal_connect (check, "toggled", G_CALLBACK (update_collate_icon), dialog);
   gtk_widget_show (check);
-  gtk_table_attach (GTK_TABLE (table), check,
-                    0, 1, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), check, 0, 1, 1, 1);
 
   check = gtk_check_button_new_with_mnemonic (_("_Reverse"));
   g_signal_connect (check, "toggled", G_CALLBACK (update_collate_icon), dialog);
   priv->reverse_check = check;
   gtk_widget_show (check);
-  gtk_table_attach (GTK_TABLE (table), check,
-                    0, 1, 2, 3,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), check, 0, 2, 1, 1);
 
   image = gtk_drawing_area_new ();
   gtk_widget_set_has_window (image, FALSE);
@@ -2360,9 +2361,7 @@ create_main_page (GtkPrintUnixDialog *dialog)
   priv->collate_image = image;
   gtk_widget_show (image);
   gtk_widget_set_size_request (image, 70, 90);
-  gtk_table_attach (GTK_TABLE (table), image,
-                    1, 2, 1, 3, GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), image, 1, 1, 1, 2);
   g_signal_connect (image, "draw",
                     G_CALLBACK (draw_collate_cb), dialog);
 
@@ -3393,9 +3392,9 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
   gtk_widget_show (hbox);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
 
-  table = gtk_table_new (5, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 12);
   frame = wrap_in_frame (_("Layout"), table);
   gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (table);
@@ -3404,67 +3403,51 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
 
   widget = gtk_printer_option_widget_new (NULL);
   priv->duplex = GTK_PRINTER_OPTION_WIDGET (widget);
   gtk_widget_show (widget);
-  gtk_table_attach (GTK_TABLE (table), widget,
-                    1, 2, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), widget, 1, 0, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
   label = gtk_label_new_with_mnemonic (_("Pages per _side:"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
 
   widget = gtk_printer_option_widget_new (NULL);
   g_signal_connect_swapped (widget, "changed", G_CALLBACK (redraw_page_layout_preview), dialog);
   g_signal_connect_swapped (widget, "changed", G_CALLBACK (update_number_up_layout), dialog);
   priv->pages_per_sheet = GTK_PRINTER_OPTION_WIDGET (widget);
   gtk_widget_show (widget);
-  gtk_table_attach (GTK_TABLE (table), widget,
-                    1, 2, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), widget, 1, 1, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
   label = gtk_label_new_with_mnemonic (_("Page or_dering:"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 2, 3,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
 
   widget = gtk_printer_option_widget_new (NULL);
   g_signal_connect_swapped (widget, "changed", G_CALLBACK (redraw_page_layout_preview), dialog);
   priv->number_up_layout = GTK_PRINTER_OPTION_WIDGET (widget);
   gtk_widget_show (widget);
-  gtk_table_attach (GTK_TABLE (table), widget,
-                    1, 2, 2, 3,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), widget, 1, 2, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
   label = gtk_label_new_with_mnemonic (_("_Only print:"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 3, 4,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
 
   combo = gtk_combo_box_text_new ();
   priv->page_set_combo = combo;
   gtk_widget_show (combo);
-  gtk_table_attach (GTK_TABLE (table), combo,
-                    1, 2, 3, 4,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), combo, 1, 3, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
   /* In enum order */
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("All sheets"));
@@ -3476,15 +3459,11 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 4, 5,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 4, 1, 1);
 
   hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_widget_show (hbox2);
-  gtk_table_attach (GTK_TABLE (table), hbox2,
-                    1, 2, 4, 5,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), hbox2, 1, 4, 1, 1);
 
   spinbutton = gtk_spin_button_new_with_range (1.0, 1000.0, 1.0);
   priv->scale_spin = spinbutton;
@@ -3497,9 +3476,9 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
   gtk_widget_show (label);
   gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
 
-  table = gtk_table_new (4, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 12);
   frame = wrap_in_frame (_("Paper"), table);
   gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 6);
   gtk_widget_show (table);
@@ -3508,48 +3487,36 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
 
   widget = gtk_printer_option_widget_new (NULL);
   priv->paper_type = GTK_PRINTER_OPTION_WIDGET (widget);
   gtk_widget_show (widget);
-  gtk_table_attach (GTK_TABLE (table), widget,
-                    1, 2, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), widget, 1, 0, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
   label = gtk_label_new_with_mnemonic (_("Paper _source:"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
 
   widget = gtk_printer_option_widget_new (NULL);
   priv->paper_source = GTK_PRINTER_OPTION_WIDGET (widget);
   gtk_widget_show (widget);
-  gtk_table_attach (GTK_TABLE (table), widget,
-                    1, 2, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), widget, 1, 1, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
   label = gtk_label_new_with_mnemonic (_("Output t_ray:"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 2, 3,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
 
   widget = gtk_printer_option_widget_new (NULL);
   priv->output_tray = GTK_PRINTER_OPTION_WIDGET (widget);
   gtk_widget_show (widget);
-  gtk_table_attach (GTK_TABLE (table), widget,
-                    1, 2, 2, 3,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), widget, 1, 2, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
 
@@ -3558,40 +3525,31 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-		    0, 1, 3, 4,  GTK_FILL, 0,
-		    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
 
   combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (priv->page_setup_list));
   priv->paper_size_combo = GTK_WIDGET (combo);
-  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), 
+  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
                                         paper_size_row_is_separator, NULL, NULL);
   cell = gtk_cell_renderer_text_new ();
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE);
   gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo), cell,
                                       page_name_func, NULL, NULL);
-  gtk_table_attach (GTK_TABLE (table), combo,
-		    1, 2, 3, 4,  GTK_FILL, 0,
-		    0, 0);
+  gtk_grid_attach (GTK_GRID (table), combo, 1, 3, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
   gtk_widget_set_sensitive (combo, FALSE);
   gtk_widget_show (combo);
 
-
   label = gtk_label_new_with_mnemonic (_("Or_ientation:"));
   priv->orientation_combo_label = GTK_WIDGET (label);
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-		    0, 1, 4, 5,
-		    GTK_FILL, 0, 0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 4, 1, 1);
 
   combo = gtk_combo_box_text_new ();
   priv->orientation_combo = GTK_WIDGET (combo);
-  gtk_table_attach (GTK_TABLE (table), combo,
-		    1, 2, 4, 5,  GTK_FILL, 0,
-		    0, 0);
+  gtk_grid_attach (GTK_GRID (table), combo, 1, 4, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
   /* In enum order */
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Portrait"));
@@ -3634,59 +3592,47 @@ create_job_page (GtkPrintUnixDialog *dialog)
   const gchar *at_tooltip;
   const gchar *on_hold_tooltip;
 
-  main_table = gtk_table_new (2, 2, FALSE);
+  main_table = gtk_grid_new ();
   gtk_container_set_border_width (GTK_CONTAINER (main_table), 12);
-  gtk_table_set_row_spacings (GTK_TABLE (main_table), 18);
-  gtk_table_set_col_spacings (GTK_TABLE (main_table), 18);
+  gtk_grid_set_row_spacing (GTK_GRID (main_table), 18);
+  gtk_grid_set_column_spacing (GTK_GRID (main_table), 18);
 
-  table = gtk_table_new (2, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 12);
   frame = wrap_in_frame (_("Job Details"), table);
-  gtk_table_attach (GTK_TABLE (main_table), frame,
-                    0, 1, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (main_table), frame, 0, 0, 1, 1);
   gtk_widget_show (table);
 
   label = gtk_label_new_with_mnemonic (_("Pri_ority:"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
 
   widget = gtk_printer_option_widget_new (NULL);
   priv->job_prio = GTK_PRINTER_OPTION_WIDGET (widget);
   gtk_widget_show (widget);
-  gtk_table_attach (GTK_TABLE (table), widget,
-                    1, 2, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), widget, 1, 0, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
   label = gtk_label_new_with_mnemonic (_("_Billing info:"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
 
   widget = gtk_printer_option_widget_new (NULL);
   priv->billing_info = GTK_PRINTER_OPTION_WIDGET (widget);
   gtk_widget_show (widget);
-  gtk_table_attach (GTK_TABLE (table), widget,
-                    1, 2, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), widget, 1, 1, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
-  table = gtk_table_new (2, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 12);
   frame = wrap_in_frame (_("Print Document"), table);
-  gtk_table_attach (GTK_TABLE (main_table), frame,
-                    0, 1, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (main_table), frame, 0, 1, 1, 1);
   gtk_widget_show (table);
 
   /* Translators: this is one of the choices for the print at option
@@ -3695,9 +3641,7 @@ create_job_page (GtkPrintUnixDialog *dialog)
   radio = gtk_radio_button_new_with_mnemonic (NULL, _("_Now"));
   priv->print_now_radio = radio;
   gtk_widget_show (radio);
-  gtk_table_attach (GTK_TABLE (table), radio,
-                    0, 2, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), radio, 0, 0, 2, 1);
   /* Translators: this is one of the choices for the print at option
    * in the print dialog. It also serves as the label for an entry that
    * allows the user to enter a time.
@@ -3713,9 +3657,7 @@ create_job_page (GtkPrintUnixDialog *dialog)
   gtk_widget_set_tooltip_text (radio, at_tooltip);
   priv->print_at_radio = radio;
   gtk_widget_show (radio);
-  gtk_table_attach (GTK_TABLE (table), radio,
-                    0, 1, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), radio, 0, 1, 1, 1);
 
   entry = gtk_entry_new ();
   gtk_widget_set_tooltip_text (entry, at_tooltip);
@@ -3723,9 +3665,7 @@ create_job_page (GtkPrintUnixDialog *dialog)
   atk_object_set_description (gtk_widget_get_accessible (entry), at_tooltip);
   priv->print_at_entry = entry;
   gtk_widget_show (entry);
-  gtk_table_attach (GTK_TABLE (table), entry,
-                    1, 2, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), entry, 1, 1, 1, 1);
 
   g_signal_connect (radio, "toggled", G_CALLBACK (update_entry_sensitivity), entry);
   update_entry_sensitivity (radio, entry);
@@ -3740,9 +3680,7 @@ create_job_page (GtkPrintUnixDialog *dialog)
   gtk_widget_set_tooltip_text (radio, on_hold_tooltip);
   priv->print_hold_radio = radio;
   gtk_widget_show (radio);
-  gtk_table_attach (GTK_TABLE (table), radio,
-                    0, 2, 2, 3,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), radio, 0, 2, 2, 1);
 
   g_signal_connect_swapped (priv->print_now_radio, "toggled",
                             G_CALLBACK (update_print_at_option), dialog);
@@ -3753,13 +3691,11 @@ create_job_page (GtkPrintUnixDialog *dialog)
   g_signal_connect_swapped (priv->print_hold_radio, "toggled",
                             G_CALLBACK (update_print_at_option), dialog);
 
-  table = gtk_table_new (2, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 12);
   frame = wrap_in_frame (_("Add Cover Page"), table);
-  gtk_table_attach (GTK_TABLE (main_table), frame,
-                    1, 2, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (main_table), frame, 1, 0, 1, 1);
   gtk_widget_show (table);
 
   /* Translators, this is the label used for the option in the print
@@ -3769,16 +3705,12 @@ create_job_page (GtkPrintUnixDialog *dialog)
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
 
   widget = gtk_printer_option_widget_new (NULL);
   priv->cover_before = GTK_PRINTER_OPTION_WIDGET (widget);
   gtk_widget_show (widget);
-  gtk_table_attach (GTK_TABLE (table), widget,
-                    1, 2, 0, 1,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), widget, 1, 0, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
   /* Translators, this is the label used for the option in the print
@@ -3788,16 +3720,12 @@ create_job_page (GtkPrintUnixDialog *dialog)
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_widget_show (label);
-  gtk_table_attach (GTK_TABLE (table), label,
-                    0, 1, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
 
   widget = gtk_printer_option_widget_new (NULL);
   priv->cover_after = GTK_PRINTER_OPTION_WIDGET (widget);
   gtk_widget_show (widget);
-  gtk_table_attach (GTK_TABLE (table), widget,
-                    1, 2, 1, 2,  GTK_FILL, 0,
-                    0, 0);
+  gtk_grid_attach (GTK_GRID (table), widget, 1, 1, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
 
   /* Translators: this is the tab label for the notebook tab containing
@@ -3825,9 +3753,9 @@ create_optional_page (GtkPrintUnixDialog  *dialog,
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_AUTOMATIC);
 
-  table = gtk_table_new (1, 2, FALSE);
-  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 12);
   gtk_container_set_border_width (GTK_CONTAINER (table), 12);
   gtk_widget_show (table);
 
@@ -4386,15 +4314,11 @@ gtk_print_unix_dialog_set_support_selection (GtkPrintUnixDialog *dialog,
           if (support_selection)
             {
               gtk_widget_set_sensitive (priv->selection_radio, priv->has_selection);
-              gtk_table_set_row_spacing (GTK_TABLE (priv->range_table),
-                                         2,
-                                         gtk_table_get_default_row_spacing (GTK_TABLE (priv->range_table)));
               gtk_widget_show (priv->selection_radio);
             }
           else
             {
               gtk_widget_set_sensitive (priv->selection_radio, FALSE);
-              gtk_table_set_row_spacing (GTK_TABLE (priv->range_table), 2, 0);
               gtk_widget_hide (priv->selection_radio);
             }
         }
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index 3ddc36478d..20b66b5bd7 100644
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -1,7 +1,7 @@
 /* GTK - The GIMP Toolkit
  * gtkrecentchooserdefault.c
  * Copyright (C) 2005-2006, Emmanuele Bassi
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -58,7 +58,6 @@
 #include "gtkseparatormenuitem.h"
 #include "gtksizegroup.h"
 #include "gtksizerequest.h"
-#include "gtktable.h"
 #include "gtktreemodelsort.h"
 #include "gtktreemodelfilter.h"
 #include "gtktreeselection.h"
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index c56b73e7ef..bd3157ad19 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -51,7 +51,7 @@
 #include "gtkscale.h"
 #include "gtkscalebutton.h"
 #include "gtkstock.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkwindow.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 9d86805ae4..b05b8aae95 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -31,9 +31,7 @@
 #ifndef __GTK_SCROLLED_WINDOW_H__
 #define __GTK_SCROLLED_WINDOW_H__
 
-
-#include <gtk/gtkviewport.h>
-
+#include <gtk/gtkbin.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 6e53bc9f71..8d5a0efbb2 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -2964,6 +2964,17 @@ gtk_status_icon_set_name (GtkStatusIcon *status_icon,
   priv = status_icon->priv;
 
 #ifdef GDK_WINDOWING_X11
-  gtk_window_set_wmclass (GTK_WINDOW (priv->tray_icon), name, name);
+  if (gtk_widget_get_realized (priv->tray_icon))
+    {
+      /* gtk_window_set_wmclass() only operates on non-realized windows,
+       * so temporarily unrealize the tray here
+       */
+      gtk_widget_hide (priv->tray_icon);
+      gtk_widget_unrealize (priv->tray_icon);
+      gtk_window_set_wmclass (GTK_WINDOW (priv->tray_icon), name, name);
+      gtk_widget_show (priv->tray_icon);
+    }
+  else
+    gtk_window_set_wmclass (GTK_WINDOW (priv->tray_icon), name, name);
 #endif
 }
diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 69f2e8ec4a..c907bfd65a 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -863,7 +863,7 @@ gtk_css_parse_url (GtkCssParser *parser,
               
               error = g_error_new_literal (GTK_CSS_PROVIDER_ERROR,
                                            GTK_CSS_PROVIDER_ERROR_DEPRECATED,
-                                           "Whitespace between 'url' and '(' is not allowed");
+                                           "Whitespace between 'url' and '(' is deprecated");
                              
               _gtk_css_parser_take_error (parser, error);
             }
diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index 8604079cf0..acb306db53 100644
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -112,7 +112,7 @@ gtk_switch_button_press (GtkWidget      *widget,
       if (event->x <= allocation.width / 2)
         {
           priv->in_press = TRUE;
-          return FALSE;
+          return TRUE;
         }
 
       priv->offset = event->x - allocation.width / 2;
@@ -125,7 +125,7 @@ gtk_switch_button_press (GtkWidget      *widget,
       if (event->x >= allocation.width / 2)
         {
           priv->in_press = TRUE;
-          return FALSE;
+          return TRUE;
         }
 
       priv->offset = event->x;
@@ -137,7 +137,7 @@ gtk_switch_button_press (GtkWidget      *widget,
                 "gtk-dnd-drag-threshold", &priv->drag_threshold,
                 NULL);
 
-  return FALSE;
+  return TRUE;
 }
 
 static gboolean
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index d9f93fc8b4..b753f39f16 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -39,7 +39,6 @@
 
 #include "gtkarrow.h"
 #include "gtkbindings.h"
-#include "gtkhbox.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtkmainprivate.h"
@@ -52,7 +51,7 @@
 #include "gtkseparatortoolitem.h"
 #include "gtkstock.h"
 #include "gtktoolshell.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
@@ -3896,6 +3895,9 @@ gtk_toolbar_get_visible_position (GtkToolbar *toolbar,
 {
   CountingData count = { child, FALSE, 0, 0 };
 
+  if (child == (GtkWidget*)toolbar->priv->highlight_tool_item)
+    return 0;
+
   /* foreach iterates in visible order */
   gtk_container_forall (GTK_CONTAINER (toolbar),
                         count_widget_position,
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index f78572985a..8ee5fdf0e3 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -23,13 +23,12 @@
 #include "config.h"
 #include "gtktoolbutton.h"
 #include "gtkbutton.h"
-#include "gtkhbox.h"
 #include "gtkiconfactory.h"
 #include "gtkimage.h"
 #include "gtkimagemenuitem.h"
 #include "gtklabel.h"
 #include "gtkstock.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkintl.h"
 #include "gtktoolbar.h"
 #include "gtkactivatable.h"
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 00aa6bf41d..f65e08df4c 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -31,7 +31,7 @@
 #include "gtkmain.h"
 #include "gtklabel.h"
 #include "gtkimage.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtksizerequest.h"
 #include "gtkwindowprivate.h"
 
diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index 9c35dafd70..fdc055b6f3 100644
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -478,10 +478,6 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon)
   gulong nitems;
   gulong bytes_after;
   int error, result;
-  GdkVisual *visual;
-  gint red_prec;
-  gint green_prec;
-  gint blue_prec;
 
   g_assert (icon->priv->manager_window != None);
 
@@ -496,25 +492,31 @@ gtk_tray_icon_get_visual_property (GtkTrayIcon *icon)
 			       &bytes_after, &(prop.prop_ch));
   error = gdk_error_trap_pop ();
 
-  visual = NULL;
-
   if (!error && result == Success &&
       type == XA_VISUALID && nitems == 1 && format == 32)
     {
-      VisualID visual_id = prop.prop[0];
+      VisualID visual_id;
+      GdkVisual *visual;
+      gint red_prec, green_prec, blue_prec;
+
+      visual_id = prop.prop[0];
       visual = gdk_x11_screen_lookup_visual (screen, visual_id);
+      gdk_visual_get_red_pixel_details (visual, NULL, NULL, &red_prec);
+      gdk_visual_get_green_pixel_details (visual, NULL, NULL, &green_prec);
+      gdk_visual_get_blue_pixel_details (visual, NULL, NULL, &blue_prec);
+      icon->priv->manager_visual = visual;
+      icon->priv->manager_visual_rgba =
+          (red_prec + blue_prec + green_prec < gdk_visual_get_depth (visual));
+    }
+  else
+    {
+      icon->priv->manager_visual = NULL;
+      icon->priv->manager_visual_rgba = FALSE;
     }
 
-  gdk_visual_get_red_pixel_details (visual, NULL, NULL, &red_prec);
-  gdk_visual_get_green_pixel_details (visual, NULL, NULL, &green_prec);
-  gdk_visual_get_blue_pixel_details (visual, NULL, NULL, &blue_prec);
-
-  icon->priv->manager_visual = visual;
-  icon->priv->manager_visual_rgba = visual != NULL &&
-    (red_prec + blue_prec + green_prec < gdk_visual_get_depth (visual));
-
-  /* For the background-relative hack we use when we aren't using a real RGBA
-   * visual, we can't be double-buffered */
+  /* For the background-relative hack we use when we aren't
+   * using a real RGBA visual, we can't be double-buffered
+   */
   gtk_widget_set_double_buffered (GTK_WIDGET (icon), icon->priv->manager_visual_rgba);
 
   if (type != None)
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index f0043005fe..3ea382efc5 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -197,6 +197,36 @@
  * </programlisting>
  * </example>
  *
+ * The #GtkTreeModel interface contains two methods for reference
+ * counting: gtk_tree_model_ref_node() and gtk_tree_model_unref_node().
+ * These two methods are optional to implement. The reference counting
+ * is meant as a way for views to let models know when nodes are being
+ * displayed. #GtkTreeView will take a reference on a node when it is
+ * visible, which means the node is either in the toplevel or expanded.
+ * Being displayed does not mean that the node is currently directly
+ * visible to the user in the viewport. Based on this reference counting
+ * scheme a caching model, for example, can decide whether or not to cache
+ * a node based on the reference count. A file-system based model would
+ * not want to keep the entire file hierarchy in memory, but just the
+ * folders that are currently expanded in every current view.
+ *
+ * When working with reference counting, the following rules must be taken
+ * into account:
+ * <itemizedlist>
+ * <listitem><para>Never take a reference on a node without owning a
+ * reference on its parent. This means that all parent nodes of a referenced
+ * node must be referenced as well.</para></listitem>
+ * <listitem><para>Outstanding references on a deleted node are not released.
+ * This is not possible because the node has already been deleted by the
+ * time the row-deleted signal is received.
+ * </para></listitem>
+ * <listitem><para>Models are not obligated to emit a signal on rows of
+ * which none of its siblings are referenced. To phrase this differently,
+ * signals are only required for levels in which nodes are referenced. For
+ * the root level however, signals must be emitted at all times (however the
+ * root level is always referenced when any view is attached).
+ * </para></listitem>
+ * </itemizedlist>
  */
 
 #define INITIALIZE_TREE_ITER(Iter) \
@@ -1186,7 +1216,8 @@ gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
  * @iter: (out): the uninitialized #GtkTreeIter
  * @path: the #GtkTreePath
  *
- * Sets @iter to a valid iterator pointing to @path.
+ * Sets @iter to a valid iterator pointing to @path.  If @path does
+ * not exist, @iter is set to an invalid iterator and %FALSE is returned.
  *
  * Return value: %TRUE, if @iter was set
  */
@@ -1614,9 +1645,11 @@ gtk_tree_model_iter_parent (GtkTreeModel *tree_model,
  *
  * This function is primarily meant as a way for views to let
  * caching models know when nodes are being displayed (and hence,
- * whether or not to cache that node). For example, a file-system
- * based model would not want to keep the entire file-hierarchy in
- * memory, just the sections that are currently being displayed by
+ * whether or not to cache that node). Being displayed means a node
+ * is in an expanded branch, regardless of whether the node is currently
+ * visible in the viewport. For example, a file-system based model
+ * would not want to keep the entire file-hierarchy in memory,
+ * just the sections that are currently being displayed by
  * every current view.
  *
  * A model should be expected to be able to get an iter independent
@@ -1823,6 +1856,9 @@ gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
  * This should be called by models after a row has been removed.
  * The location pointed to by @path should be the location that
  * the row previously was at. It may not be a valid location anymore.
+ *
+ * Nodes that are deleted are not unreffed, this means that any
+ * outstanding references on the deleted node should not be released.
  */
 void
 gtk_tree_model_row_deleted (GtkTreeModel *tree_model,
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 6a348ae74d..ae6aa1f9f1 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -53,37 +53,192 @@
  * a #GtkTreePath indicating the root node for the filter at construction time.
  * </para></listitem>
  * </itemizedlist>
- */
-
-
-/* ITER FORMAT:
  *
- * iter->stamp = filter->priv->stamp
- * iter->user_data = FilterLevel
- * iter->user_data2 = FilterElt
- */
-
-/* all paths, iters, etc prefixed with c_ are paths, iters, etc relative to the
- * child model.
+ * The basic API is similar to #GtkTreeModelSort. For an example on its usage,
+ * see the section on #GtkTreeModelSort.
+ *
+ * When using #GtkTreeModelFilter, it is important to realize that
+ * #GtkTreeModelFilter maintains an internal cache of all nodes which are
+ * visible in its clients. The cache is likely to be a subtree of the tree
+ * exposed by the child model. #GtkTreeModelFilter will not cache the entire
+ * child model when unnecessary to not compromise the caching mechanism
+ * that is exposed by the reference counting scheme. If the child model
+ * implements reference counting, unnecessary signals may not be emitted
+ * because of reference counting rule 3, see the #GtkTreeModel
+ * documentation. (Note that e.g. #GtkTreeStore does not implement
+ * reference counting and will always emit all signals, even when
+ * the receiving node is not visible).
+ *
+ * Because of this, limitations for possible visible functions do apply.
+ * In general, visible functions should only use data or properties from
+ * the node for which the visibility state must be determined, its siblings
+ * or its parents. Usually, having a dependency on the state of any child
+ * node is not possible, unless references are taken on these explicitly.
+ * When no such reference exists, no signals may be received for these child
+ * nodes (see reference couting rule number 3 in the #GtkTreeModel section).
+ *
+ * Determining the visibility state of a given node based on the state
+ * of its child nodes is a frequently occurring use case. Therefore,
+ * #GtkTreeModelFilter explicitly supports this. For example, when a node
+ * does not have any children, you might not want the node to be visible.
+ * As soon as the first row is added to the node's child level (or the
+ * last row removed), the node's visibility should be updated.
+ *
+ * This introduces a dependency from the node on its child nodes. In order
+ * to accommodate this, #GtkTreeModelFilter must make sure the necesary
+ * signals are received from the child model. This is achieved by building,
+ * for all nodes which are exposed as visible nodes to #GtkTreeModelFilter's
+ * clients, the child level (if any) and take a reference on the first node
+ * in this level. Furthermore, for every row-inserted, row-changed or
+ * row-deleted signal (also these which were not handled because the node
+ * was not cached), #GtkTreeModelFilter will check if the visibility state
+ * of any parent node has changed.
+ *
+ * Beware, however, that this explicit support is limited to these two
+ * cases. For example, if you want a node to be visible only if two nodes
+ * in a child's child level (2 levels deeper) are visible, you are on your
+ * own. In this case, either rely on #GtkTreeStore to emit all signals
+ * because it does not implement reference counting, or for models that
+ * do implement reference counting, obtain references on these child levels
+ * yourself.
  */
 
-/* A few notes:
- *  There are three model/views involved, so there are two mappings:
- *    * this model -> child model: mapped via offset in FilterElt.
- *    * this model -> parent model (or view): mapped via the array index
- *                                            of FilterElt.
+/* Notes on this implementation of GtkTreeModelFilter
+ * ==================================================
+ *
+ * Warnings
+ * --------
+ *
+ * In this code there is a potential for confusion as to whether an iter,
+ * path or value refers to the GtkTreeModelFilter model, or to the child
+ * model that has been set. As a convention, variables referencing the
+ * child model will have a c_ prefix before them (ie. c_iter, c_value,
+ * c_path). In case the c_ prefixed names are already in use, an f_
+ * prefix is used. Conversion of iterators and paths between
+ * GtkTreeModelFilter and the child model is done through the various
+ * gtk_tree_model_filter_convert_* functions.
+ *
+ * Even though the GtkTreeModelSort and GtkTreeModelFilter have very
+ * similar data structures, many assumptions made in the GtkTreeModelSort
+ * code do *not* apply in the GtkTreeModelFilter case. Reference counting
+ * in particular is more complicated in GtkTreeModelFilter, because
+ * we explicitly support reliance on the state of a node's children as
+ * outlined in the public API documentation. Because of these differences,
+ * you are strongly recommended to first read through these notes before
+ * making any modification to the code.
+ *
+ * Iterator format
+ * ---------------
+ *
+ * The iterator format of iterators handed out by GtkTreeModelFilter is
+ * as follows:
+ *
+ *     iter->stamp = filter->priv->stamp
+ *     iter->user_data = FilterLevel
+ *     iter->user_data2 = FilterElt
+ *
+ * Internal data structure
+ * -----------------------
+ *
+ * Using FilterLevel and FilterElt, GtkTreeModelFilter maintains a "cache"
+ * of the mapping from GtkTreeModelFilter nodes to nodes in the child model.
+ * This is to avoid re-creating a level each time (which involves computing
+ * visibility for each node in that level) an operation is requested on
+ * GtkTreeModelFilter, such as get iter, get path and get value.
+ *
+ * A FilterElt corresponds to a single node. The FilterElt can either be
+ * visible or invisible in the model that is exposed to the clients of this
+ * GtkTreeModelFilter. The visibility state is stored in the "visible_siter"
+ * field, which is NULL when the node is not visible. The FilterLevel keeps
+ * a reference to the parent FilterElt and its FilterLevel (if any). The
+ * FilterElt can have a "children" pointer set, which points at a child
+ * level (a sub level).
+ *
+ * In a FilterLevel, two separate GSequences are maintained. One contains
+ * all nodes of this FilterLevel, regardless of the visibility state of
+ * the node. Another contains only visible nodes. A visible FilterElt
+ * is thus present in both the full and the visible GSequence. The
+ * GSequence allows for fast access, addition and removal of nodes.
+ *
+ * It is important to recognize the two different mappings that play
+ * a part in this code:
+ *   I.  The mapping from the client to this model. The order in which
+ *       nodes are stored in the *visible* GSequence is the order in
+ *       which the nodes are exposed to clients of the GtkTreeModelFilter.
+ *   II. The mapping from this model to its child model. Each FilterElt
+ *       contains an "offset" field which is the offset of the
+ *       corresponding node in the child model.
+ *
+ * Throughout the code, two kinds of paths relative to the GtkTreeModelFilter
+ * (those generated from the sequence positions) are used. There are paths
+ * which take non-visible nodes into account (generated from the full
+ * sequences) and paths which don't (generated from the visible sequences).
+ * Paths which have been generated from the full sequences should only be
+ * used internally and NEVER be passed along with a signal emisson.
+ *
+ * Reference counting
+ * ------------------
+ *
+ * GtkTreeModelFilter forwards all reference and unreference operations
+ * to the corresponding node in the child model. In addition,
+ * GtkTreeModelFilter will also add references of its own. The full reference
+ * count of each node (i.e. all forwarded references and these by the
+ * filter model) is maintained internally in the "ref_count" fields in
+ * FilterElt and FilterLevel. Because there is a need to determine whether
+ * a node should be visible for the client, the reference count of only
+ * the forwarded references is maintained as well, in the "ext_ref_count"
+ * fields.
+ *
+ * In a few cases, GtkTreeModelFilter takes additional references on
+ * nodes. The first case is that a reference is taken on the parent
+ * (if any) of each level. This happens in gtk_tree_model_filter_build_level()
+ * and the reference is released again in gtk_tree_model_filter_free_level().
+ * This ensures that for all references which are taken by the filter
+ * model, all parent nodes are referenced according to reference counting
+ * rule 1 in the GtkTreeModel documentation.
+ *
+ * A second case is required to support visible functions which depend on
+ * the state of a node's children (see the public API documentation for
+ * GtkTreeModelFilter above). We build the child level of each node that
+ * could be visible in the client (i.e. the level has an ext_ref_count > 0;
+ * not the elt, because the elt might be invisible and thus unreferenced
+ * by the client). For each node that becomes visible, due to insertion or
+ * changes in visibility state, it is checked whether node has children, if
+ * so the child level is built.
  *
- *  Note that there are two kinds of paths relative to the filter model
- *  (those generated from the array indices): paths taking non-visible
- *  nodes into account, and paths which don't.  Paths which take
- *  non-visible nodes into account should only be used internally and
- *  NEVER be passed along with a signal emission.
+ * A reference is taken on the first node of each level so that the child
+ * model will emit all signals for this level, due to reference counting
+ * rule 3 in the GtkTreeModel documentation. If due to changes in the level,
+ * another node becomes the first node (e.g. due to insertion or reordering),
+ * this reference is transferred from the old to the new first node.
  *
- *  The filter model has a reference on every node that is not in the root
- *  level and has a parent with ref_count > 1.  Exception is a virtual root
- *  level; all nodes in the virtual root level are referenced too.
+ * When a level has an *external* reference count of zero (which means that
+ * none of the nodes in the level is referenced by the clients), the level
+ * has a "zero ref count" on all its parents. As soon as the level reaches
+ * an *external* reference count of zero, the zero ref count value is
+ * incremented by one for all parents of this level. Due to the additional
+ * references taken by the filter model, it is important to base the
+ * zero ref count on the external reference count instead of on the full
+ * reference count of the node.
+ *
+ * The zero ref count value aids in determining which portions of the
+ * cache are possibly unused and could be removed. If a FilterElt has
+ * a zero ref count of one, then its child level is unused. However, the
+ * child level can only be removed from the cache if the FilterElt's
+ * parent has an external ref count of zero. Otherwise, monitoring
+ * this level is necessary to possibly update the visibility state
+ * of the parent. This is an important difference from GtkTreeModelSort!
+ *
+ * Signals are only required for levels with an external ref count > 0.
+ * This due to reference counting rule 3, see the GtkTreeModel
+ * documentation. In the GtkTreeModelFilter we try hard to stick to this
+ * rule and not emit redundant signals (though redundant emissions of
+ * row-has-child-toggled could appear frequently; it does happen that
+ * we simply forward the signal emitted by e.g. GtkTreeStore but also
+ * emit our own copy).
  */
 
+
 typedef struct _FilterElt FilterElt;
 typedef struct _FilterLevel FilterLevel;
 
@@ -93,17 +248,19 @@ struct _FilterElt
   FilterLevel *children;
   gint offset;
   gint ref_count;
+  gint ext_ref_count;
   gint zero_ref_count;
-  gboolean visible;
+  GSequenceIter *visible_siter; /* iter into visible_seq */
 };
 
 struct _FilterLevel
 {
-  GArray *array;
+  GSequence *seq;
+  GSequence *visible_seq;
   gint ref_count;
-  gint visible_nodes;
+  gint ext_ref_count;
 
-  gint parent_elt_index;
+  FilterElt *parent_elt;
   FilterLevel *parent_level;
 };
 
@@ -151,14 +308,21 @@ enum
   PROP_VIRTUAL_ROOT
 };
 
-#define GTK_TREE_MODEL_FILTER_CACHE_CHILD_ITERS(filter) \
+/* Set this to 0 to disable caching of child iterators.  This
+ * allows for more stringent testing.  It is recommended to set this
+ * to one when refactoring this code and running the unit tests to
+ * catch more errors.
+ */
+#if 1
+#  define GTK_TREE_MODEL_FILTER_CACHE_CHILD_ITERS(filter) \
         (((GtkTreeModelFilter *)filter)->priv->child_flags & GTK_TREE_MODEL_ITERS_PERSIST)
+#else
+#  define GTK_TREE_MODEL_FILTER_CACHE_CHILD_ITERS(filter) (FALSE)
+#endif
 
 #define FILTER_ELT(filter_elt) ((FilterElt *)filter_elt)
 #define FILTER_LEVEL(filter_level) ((FilterLevel *)filter_level)
-
-#define FILTER_LEVEL_PARENT_ELT(level) (&g_array_index (FILTER_LEVEL ((level))->parent_level->array, FilterElt, FILTER_LEVEL ((level))->parent_elt_index))
-#define FILTER_LEVEL_ELT_INDEX(level, elt) (FILTER_ELT ((elt)) - FILTER_ELT (FILTER_LEVEL ((level))->array->data))
+#define GET_ELT(siter) ((FilterElt*) (siter ? g_sequence_get (siter) : NULL))
 
 /* general code (object/interface init, properties, etc) */
 static void         gtk_tree_model_filter_tree_model_init                 (GtkTreeModelIface       *iface);
@@ -247,11 +411,12 @@ static gboolean    gtk_tree_model_filter_drag_data_delete                 (GtkTr
 /* private functions */
 static void        gtk_tree_model_filter_build_level                      (GtkTreeModelFilter     *filter,
                                                                            FilterLevel            *parent_level,
-                                                                           gint                    parent_elt_index,
+                                                                           FilterElt              *parent_elt,
                                                                            gboolean                emit_inserted);
 
 static void        gtk_tree_model_filter_free_level                       (GtkTreeModelFilter     *filter,
-                                                                           FilterLevel            *filter_level);
+                                                                           FilterLevel            *filter_level,
+                                                                           gboolean                unref);
 
 static GtkTreePath *gtk_tree_model_filter_elt_get_path                    (FilterLevel            *level,
                                                                            FilterElt              *elt,
@@ -277,8 +442,12 @@ static gboolean     gtk_tree_model_filter_visible                         (GtkTr
 static void         gtk_tree_model_filter_clear_cache_helper              (GtkTreeModelFilter     *filter,
                                                                            FilterLevel            *level);
 
+static void         gtk_tree_model_filter_real_ref_node                   (GtkTreeModel           *model,
+                                                                           GtkTreeIter            *iter,
+                                                                           gboolean                external);
 static void         gtk_tree_model_filter_real_unref_node                 (GtkTreeModel           *model,
                                                                            GtkTreeIter            *iter,
+                                                                           gboolean                external,
                                                                            gboolean                propagate_unref);
 
 static void         gtk_tree_model_filter_set_model                       (GtkTreeModelFilter     *filter,
@@ -286,7 +455,8 @@ static void         gtk_tree_model_filter_set_model                       (GtkTr
 static void         gtk_tree_model_filter_ref_path                        (GtkTreeModelFilter     *filter,
                                                                            GtkTreePath            *path);
 static void         gtk_tree_model_filter_unref_path                      (GtkTreeModelFilter     *filter,
-                                                                           GtkTreePath            *path);
+                                                                           GtkTreePath            *path,
+                                                                           int                     depth);
 static void         gtk_tree_model_filter_set_root                        (GtkTreeModelFilter     *filter,
                                                                            GtkTreePath            *root);
 
@@ -295,27 +465,28 @@ static GtkTreePath *gtk_real_tree_model_filter_convert_child_path_to_path (GtkTr
                                                                            gboolean                build_levels,
                                                                            gboolean                fetch_children);
 
-static FilterElt   *gtk_tree_model_filter_get_nth                         (GtkTreeModelFilter     *filter,
-                                                                           FilterLevel            *level,
-                                                                           int                     n);
 static gboolean    gtk_tree_model_filter_elt_is_visible_in_target         (FilterLevel            *level,
                                                                            FilterElt              *elt);
-static FilterElt   *gtk_tree_model_filter_get_nth_visible                 (GtkTreeModelFilter     *filter,
-                                                                           FilterLevel            *level,
-                                                                           int                     n);
 
+static FilterElt   *gtk_tree_model_filter_insert_elt_in_level             (GtkTreeModelFilter     *filter,
+                                                                           GtkTreeIter            *c_iter,
+                                                                           FilterLevel            *level,
+                                                                           gint                    offset,
+                                                                           gint                   *index);
 static FilterElt   *gtk_tree_model_filter_fetch_child                     (GtkTreeModelFilter     *filter,
                                                                            FilterLevel            *level,
                                                                            gint                    offset,
                                                                            gint                   *index);
-static void         gtk_tree_model_filter_remove_node                     (GtkTreeModelFilter     *filter,
-                                                                           GtkTreeIter            *iter);
+static void         gtk_tree_model_filter_remove_elt_from_level           (GtkTreeModelFilter     *filter,
+                                                                           FilterLevel            *level,
+                                                                           FilterElt              *elt);
 static void         gtk_tree_model_filter_update_children                 (GtkTreeModelFilter     *filter,
                                                                            FilterLevel            *level,
                                                                            FilterElt              *elt);
-static FilterElt   *bsearch_elt_with_offset                               (GArray                 *array,
-                                                                           gint                   offset,
-                                                                           gint                  *index);
+static void         gtk_tree_model_filter_emit_row_inserted_for_path      (GtkTreeModelFilter     *filter,
+                                                                           GtkTreeModel           *c_model,
+                                                                           GtkTreePath            *c_path,
+                                                                           GtkTreeIter            *c_iter);
 
 
 G_DEFINE_TYPE_WITH_CODE (GtkTreeModelFilter, gtk_tree_model_filter, G_TYPE_OBJECT,
@@ -412,7 +583,8 @@ gtk_tree_model_filter_finalize (GObject *object)
 
   if (filter->priv->virtual_root && !filter->priv->virtual_root_deleted)
     {
-      gtk_tree_model_filter_unref_path (filter, filter->priv->virtual_root);
+      gtk_tree_model_filter_unref_path (filter, filter->priv->virtual_root,
+                                        -1);
       filter->priv->virtual_root_deleted = TRUE;
     }
 
@@ -422,7 +594,7 @@ gtk_tree_model_filter_finalize (GObject *object)
     gtk_tree_path_free (filter->priv->virtual_root);
 
   if (filter->priv->root)
-    gtk_tree_model_filter_free_level (filter, filter->priv->root);
+    gtk_tree_model_filter_free_level (filter, filter->priv->root, TRUE);
 
   g_free (filter->priv->modify_types);
   
@@ -482,22 +654,98 @@ gtk_tree_model_filter_get_property (GObject    *object,
 
 /* helpers */
 
+static FilterElt *
+filter_elt_new (void)
+{
+  return g_slice_new (FilterElt);
+}
+
+static void
+filter_elt_free (gpointer elt)
+{
+  g_slice_free (FilterElt, elt);
+}
+
+static gint
+filter_elt_cmp (gconstpointer a,
+                gconstpointer b,
+                gpointer      user_data)
+{
+  const FilterElt *elt_a = a;
+  const FilterElt *elt_b = b;
+
+  if (elt_a->offset > elt_b->offset)
+    return +1;
+  else if (elt_a->offset < elt_b->offset)
+    return -1;
+  else
+    return 0;
+}
+
+static FilterElt *
+lookup_elt_with_offset (GSequence      *seq,
+                        gint            offset,
+                        GSequenceIter **ret_siter)
+{
+  GSequenceIter *siter;
+  FilterElt dummy;
+
+  dummy.offset = offset;
+  siter = g_sequence_lookup (seq, &dummy, filter_elt_cmp, NULL);
+
+  if (ret_siter)
+    *ret_siter = siter;
+
+  return GET_ELT (siter);
+}
+
+static void
+increase_offset_iter (gpointer data,
+                      gpointer user_data)
+{
+  FilterElt *elt = data;
+  gint offset = GPOINTER_TO_INT (user_data);
+
+  if (elt->offset >= offset)
+    elt->offset++;
+}
+
+static void
+decrease_offset_iter (gpointer data,
+                      gpointer user_data)
+{
+  FilterElt *elt = data;
+  gint offset = GPOINTER_TO_INT (user_data);
+
+  if (elt->offset > offset)
+    elt->offset--;
+}
+
 static void
 gtk_tree_model_filter_build_level (GtkTreeModelFilter *filter,
                                    FilterLevel        *parent_level,
-                                   gint                parent_elt_index,
+                                   FilterElt          *parent_elt,
                                    gboolean            emit_inserted)
 {
   GtkTreeIter iter;
   GtkTreeIter first_node;
   GtkTreeIter root;
-  FilterElt *parent_elt = NULL;
   FilterLevel *new_level;
+  FilterLevel *tmp_level;
+  FilterElt *tmp_elt;
+  GtkTreeIter f_iter;
   gint length = 0;
   gint i;
+  gboolean empty = TRUE;
 
   g_assert (filter->priv->child_model != NULL);
 
+  /* Avoid building a level that already exists */
+  if (parent_level)
+    g_assert (parent_elt->children == NULL);
+  else
+    g_assert (filter->priv->root == NULL);
+
   if (filter->priv->in_row_deleted)
     return;
 
@@ -524,8 +772,6 @@ gtk_tree_model_filter_build_level (GtkTreeModelFilter *filter,
       GtkTreeIter parent_iter;
       GtkTreeIter child_parent_iter;
 
-      parent_elt = &g_array_index (parent_level->array, FilterElt, parent_elt_index);
-
       parent_iter.stamp = filter->priv->stamp;
       parent_iter.user_data = parent_level;
       parent_iter.user_data2 = parent_elt;
@@ -541,31 +787,37 @@ gtk_tree_model_filter_build_level (GtkTreeModelFilter *filter,
                                                         &child_parent_iter,
                                                         &parent_iter);
       length = gtk_tree_model_iter_n_children (filter->priv->child_model, &child_parent_iter);
+
+      /* Take a reference on the parent */
+      gtk_tree_model_filter_real_ref_node (GTK_TREE_MODEL (filter),
+                                           &parent_iter, FALSE);
     }
 
   g_return_if_fail (length > 0);
 
   new_level = g_new (FilterLevel, 1);
-  new_level->array = g_array_sized_new (FALSE, FALSE,
-                                        sizeof (FilterElt),
-                                        length);
+  new_level->seq = g_sequence_new (filter_elt_free);
+  new_level->visible_seq = g_sequence_new (NULL);
   new_level->ref_count = 0;
-  new_level->visible_nodes = 0;
-  new_level->parent_elt_index = parent_elt_index;
+  new_level->ext_ref_count = 0;
+  new_level->parent_elt = parent_elt;
   new_level->parent_level = parent_level;
 
-  if (parent_elt_index >= 0)
+  if (parent_elt)
     parent_elt->children = new_level;
   else
     filter->priv->root = new_level;
 
   /* increase the count of zero ref_counts */
-  while (parent_level)
+  tmp_level = parent_level;
+  tmp_elt = parent_elt;
+
+  while (tmp_level)
     {
-      g_array_index (parent_level->array, FilterElt, parent_elt_index).zero_ref_count++;
+      tmp_elt->zero_ref_count++;
 
-      parent_elt_index = parent_level->parent_elt_index;
-      parent_level = parent_level->parent_level;
+      tmp_elt = tmp_level->parent_elt;
+      tmp_level = tmp_level->parent_level;
     }
   if (new_level != filter->priv->root)
     filter->priv->zero_ref_count++;
@@ -578,33 +830,33 @@ gtk_tree_model_filter_build_level (GtkTreeModelFilter *filter,
     {
       if (gtk_tree_model_filter_visible (filter, &iter))
         {
-          GtkTreeIter f_iter;
-          FilterElt filter_elt;
+          FilterElt *filter_elt;
 
-          filter_elt.offset = i;
-          filter_elt.zero_ref_count = 0;
-          filter_elt.ref_count = 0;
-          filter_elt.children = NULL;
-          filter_elt.visible = TRUE;
+          filter_elt = filter_elt_new ();
+          filter_elt->offset = i;
+          filter_elt->zero_ref_count = 0;
+          filter_elt->ref_count = 0;
+          filter_elt->ext_ref_count = 0;
+          filter_elt->children = NULL;
+          filter_elt->visible_siter = NULL;
 
           if (GTK_TREE_MODEL_FILTER_CACHE_CHILD_ITERS (filter))
-            filter_elt.iter = iter;
-
-          g_array_append_val (new_level->array, filter_elt);
-          new_level->visible_nodes++;
-
-          f_iter.stamp = filter->priv->stamp;
-          f_iter.user_data = new_level;
-          f_iter.user_data2 = &(g_array_index (new_level->array, FilterElt, new_level->array->len - 1));
+            filter_elt->iter = iter;
 
-          if (new_level->parent_level || filter->priv->virtual_root)
-            gtk_tree_model_filter_ref_node (GTK_TREE_MODEL (filter), &f_iter);
+          g_sequence_append (new_level->seq, filter_elt);
+          filter_elt->visible_siter = g_sequence_append (new_level->visible_seq, filter_elt);
+          empty = FALSE;
 
           if (emit_inserted)
             {
               GtkTreePath *f_path;
+              GtkTreeIter f_iter;
               GtkTreeIter children;
 
+              f_iter.stamp = filter->priv->stamp;
+              f_iter.user_data = new_level;
+              f_iter.user_data2 = filter_elt;
+
               f_path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter),
                                                 &f_iter);
               gtk_tree_model_row_inserted (GTK_TREE_MODEL (filter),
@@ -622,90 +874,162 @@ gtk_tree_model_filter_build_level (GtkTreeModelFilter *filter,
     }
   while (gtk_tree_model_iter_next (filter->priv->child_model, &iter));
 
-  if (new_level->array->len == 0
-      && (new_level != filter->priv->root || filter->priv->virtual_root))
+  /* The level does not contain any visible nodes.  However, changes in
+   * this level might affect the parent node, which can either be visible
+   * or invisible.  Therefore, this level can only be removed again,
+   * if the parent of the parent node is not visible.  In that case,
+   * possible changes in state of the parent are not requested.
+   */
+  if (empty &&
+       (parent_level && parent_elt->ext_ref_count == 0))
     {
-      /* If none of the nodes are visible, we will just pull in the
-       * first node of the level and keep a reference on it.  We need this
-       * to make sure that we get all signals for this level.
-       */
-      FilterElt filter_elt;
-      GtkTreeIter f_iter;
+      gtk_tree_model_filter_free_level (filter, new_level, FALSE);
+      return;
+    }
 
-      filter_elt.offset = 0;
-      filter_elt.zero_ref_count = 0;
-      filter_elt.ref_count = 0;
-      filter_elt.children = NULL;
-      filter_elt.visible = FALSE;
+  /* If none of the nodes are visible, we will just pull in the
+   * first node of the level.
+   */
+  if (empty)
+    {
+      FilterElt *filter_elt;
+
+      filter_elt = filter_elt_new ();
+      filter_elt->offset = 0;
+      filter_elt->zero_ref_count = 0;
+      filter_elt->ref_count = 0;
+      filter_elt->ext_ref_count = 0;
+      filter_elt->children = NULL;
+      filter_elt->visible_siter = NULL;
 
       if (GTK_TREE_MODEL_FILTER_CACHE_CHILD_ITERS (filter))
-        filter_elt.iter = first_node;
+        filter_elt->iter = first_node;
 
-      g_array_append_val (new_level->array, filter_elt);
+      g_sequence_append (new_level->seq, filter_elt);
+    }
 
-      f_iter.stamp = filter->priv->stamp;
-      f_iter.user_data = new_level;
-      f_iter.user_data2 = &(g_array_index (new_level->array, FilterElt, new_level->array->len - 1));
+  /* Keep a reference on the first node of this level.  We need this
+   * to make sure that we get all signals for this level.
+   */
+  f_iter.stamp = filter->priv->stamp;
+  f_iter.user_data = new_level;
+  f_iter.user_data2 = g_sequence_get (g_sequence_get_begin_iter (new_level->seq));
 
-      gtk_tree_model_filter_ref_node (GTK_TREE_MODEL (filter), &f_iter);
-    }
-  else if (new_level->array->len == 0)
-    gtk_tree_model_filter_free_level (filter, new_level);
+  gtk_tree_model_filter_real_ref_node (GTK_TREE_MODEL (filter), &f_iter,
+                                       FALSE);
 }
 
 static void
 gtk_tree_model_filter_free_level (GtkTreeModelFilter *filter,
-                                  FilterLevel        *filter_level)
+                                  FilterLevel        *filter_level,
+                                  gboolean            unref)
 {
-  gint i;
+  GSequenceIter *siter;
+  GSequenceIter *end_siter;
 
   g_assert (filter_level);
 
-  for (i = 0; i < filter_level->array->len; i++)
+  end_siter = g_sequence_get_end_iter (filter_level->seq);
+  for (siter = g_sequence_get_begin_iter (filter_level->seq);
+       siter != end_siter;
+       siter = g_sequence_iter_next (siter))
     {
-      if (g_array_index (filter_level->array, FilterElt, i).children)
+      FilterElt *elt = g_sequence_get (siter);
+
+      if (elt->children)
         gtk_tree_model_filter_free_level (filter,
-                                          FILTER_LEVEL (g_array_index (filter_level->array, FilterElt, i).children));
+                                          FILTER_LEVEL (elt->children),
+                                          unref);
+    }
 
-      if (filter_level->parent_level || filter->priv->virtual_root)
-        {
-          GtkTreeIter f_iter;
+  /* Release the reference on the first item.
+   */
+  if (unref)
+    {
+      GtkTreeIter f_iter;
 
-          f_iter.stamp = filter->priv->stamp;
-          f_iter.user_data = filter_level;
-          f_iter.user_data2 = &(g_array_index (filter_level->array, FilterElt, i));
+      f_iter.stamp = filter->priv->stamp;
+      f_iter.user_data = filter_level;
+      f_iter.user_data2 = g_sequence_get (g_sequence_get_begin_iter (filter_level->seq));
 
-          gtk_tree_model_filter_unref_node (GTK_TREE_MODEL (filter), &f_iter);
-        }
+      gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter),
+                                             &f_iter, FALSE, TRUE);
     }
 
-  if (filter_level->ref_count == 0)
+  if (filter_level->ext_ref_count == 0)
     {
       FilterLevel *parent_level = filter_level->parent_level;
-      gint parent_elt_index = filter_level->parent_elt_index;
+      FilterElt *parent_elt = filter_level->parent_elt;
 
       while (parent_level)
         {
-	  g_array_index (parent_level->array, FilterElt, parent_elt_index).zero_ref_count--;
+          parent_elt->zero_ref_count--;
 
-	  parent_elt_index = parent_level->parent_elt_index;
-	  parent_level = parent_level->parent_level;
+          parent_elt = parent_level->parent_elt;
+          parent_level = parent_level->parent_level;
         }
 
       if (filter_level != filter->priv->root)
         filter->priv->zero_ref_count--;
     }
 
-  if (filter_level->parent_elt_index >= 0)
-    FILTER_LEVEL_PARENT_ELT (filter_level)->children = NULL;
+  if (filter_level->parent_elt)
+    {
+      /* Release reference on parent */
+      if (unref)
+        {
+          GtkTreeIter parent_iter;
+
+          parent_iter.stamp = filter->priv->stamp;
+          parent_iter.user_data = filter_level->parent_level;
+          parent_iter.user_data2 = filter_level->parent_elt;
+
+          gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter),
+                                                 &parent_iter, FALSE, TRUE);
+        }
+
+      filter_level->parent_elt->children = NULL;
+    }
   else
     filter->priv->root = NULL;
 
-  g_array_free (filter_level->array, TRUE);
-  filter_level->array = NULL;
-
+  g_sequence_free (filter_level->seq);
+  g_sequence_free (filter_level->visible_seq);
   g_free (filter_level);
-  filter_level = NULL;
+}
+
+static void
+gtk_tree_model_filter_level_transfer_first_ref (GtkTreeModelFilter *filter,
+                                                FilterLevel        *level,
+                                                GSequenceIter      *from_iter,
+                                                GSequenceIter      *to_iter)
+{
+  GtkTreeIter f_iter;
+
+  f_iter.stamp = filter->priv->stamp;
+  f_iter.user_data = level;
+  f_iter.user_data2 = g_sequence_get (to_iter);
+
+  gtk_tree_model_filter_real_ref_node (GTK_TREE_MODEL (filter),
+                                       &f_iter, FALSE);
+
+  f_iter.stamp = filter->priv->stamp;
+  f_iter.user_data = level;
+  f_iter.user_data2 = g_sequence_get (from_iter);
+
+  gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter),
+                                         &f_iter, FALSE, TRUE);
+}
+
+static void
+gtk_tree_model_filter_level_transfer_first_ref_with_index (GtkTreeModelFilter *filter,
+                                                           FilterLevel        *level,
+                                                           gint                from_index,
+                                                           gint                to_index)
+{
+  gtk_tree_model_filter_level_transfer_first_ref (filter, level,
+                                                  g_sequence_get_iter_at_pos (level->seq, from_index),
+                                                  g_sequence_get_iter_at_pos (level->seq, to_index));
 }
 
 /* Creates paths suitable for accessing the child model. */
@@ -728,10 +1052,7 @@ gtk_tree_model_filter_elt_get_path (FilterLevel *level,
     {
       gtk_tree_path_prepend_index (path, walker2->offset);
 
-      if (!walker->parent_level)
-        break;
-
-      walker2 = FILTER_LEVEL_PARENT_ELT (walker);
+      walker2 = walker->parent_elt;
       walker = walker->parent_level;
     }
 
@@ -841,56 +1162,56 @@ gtk_tree_model_filter_visible (GtkTreeModelFilter *self,
 }
 
 static void
+gtk_tree_model_filter_clear_cache_helper_iter (gpointer data,
+                                               gpointer user_data)
+{
+  GtkTreeModelFilter *filter = user_data;
+  FilterElt *elt = data;
+
+  if (elt->zero_ref_count > 0)
+    gtk_tree_model_filter_clear_cache_helper (filter, elt->children);
+}
+
+static void
 gtk_tree_model_filter_clear_cache_helper (GtkTreeModelFilter *filter,
                                           FilterLevel        *level)
 {
-  gint i;
-
   g_assert (level);
 
-  for (i = 0; i < level->array->len; i++)
-    {
-      if (g_array_index (level->array, FilterElt, i).zero_ref_count > 0)
-        gtk_tree_model_filter_clear_cache_helper (filter, g_array_index (level->array, FilterElt, i).children);
-     }
+  g_sequence_foreach (level->seq, gtk_tree_model_filter_clear_cache_helper_iter, filter);
 
-  if (level->ref_count == 0 && level != filter->priv->root)
+  /* If the level's ext_ref_count is zero, it means the level is not visible
+   * and can be removed.  But, since we support monitoring a child level
+   * of a parent for changes (these might affect the parent), we will only
+   * free the level if the parent's parent also has an external ref
+   * count of zero.  In that case, changes concerning our parent are
+   * not requested.
+   */
+  if (level->ext_ref_count == 0 && level != filter->priv->root &&
+      level->parent_level && level->parent_elt &&
+      level->parent_elt->ext_ref_count == 0)
     {
-      gtk_tree_model_filter_free_level (filter, level);
+      gtk_tree_model_filter_free_level (filter, level, TRUE);
       return;
     }
 }
 
-static FilterElt *
-gtk_tree_model_filter_get_nth (GtkTreeModelFilter *filter,
-                               FilterLevel        *level,
-                               int                 n)
-{
-  if (level->array->len <= n)
-    return NULL;
-
-  return &g_array_index (level->array, FilterElt, n);
-}
-
 static gboolean
 gtk_tree_model_filter_elt_is_visible_in_target (FilterLevel *level,
                                                 FilterElt   *elt)
 {
-  gint elt_index;
-
-  if (!elt->visible)
+  if (!elt->visible_siter)
     return FALSE;
 
-  if (level->parent_elt_index == -1)
+  if (!level->parent_elt)
     return TRUE;
 
   do
     {
-      elt_index = level->parent_elt_index;
+      elt = level->parent_elt;
       level = level->parent_level;
 
-      if (elt_index >= 0
-          && !g_array_index (level->array, FilterElt, elt_index).visible)
+      if (elt && !elt->visible_siter)
         return FALSE;
     }
   while (level);
@@ -898,30 +1219,214 @@ gtk_tree_model_filter_elt_is_visible_in_target (FilterLevel *level,
   return TRUE;
 }
 
-static FilterElt *
-gtk_tree_model_filter_get_nth_visible (GtkTreeModelFilter *filter,
-                                       FilterLevel        *level,
-                                       int                 n)
+/* If a change has occurred in path (inserted, changed or deleted),
+ * then this function is used to check all its ancestors.  An ancestor
+ * could have changed state as a result and this needs to be propagated
+ * to the objects monitoring the filter model.
+ */
+static void
+gtk_tree_model_filter_check_ancestors (GtkTreeModelFilter *filter,
+                                       GtkTreePath        *path)
 {
   int i = 0;
+  int *indices = gtk_tree_path_get_indices (path);
   FilterElt *elt;
+  FilterLevel *level;
+  GtkTreeIter c_iter, tmp_iter;
 
-  if (level->visible_nodes <= n)
-    return NULL;
+  level = FILTER_LEVEL (filter->priv->root);
 
-  elt = FILTER_ELT (level->array->data);
-  while (!elt->visible)
-    elt++;
+  if (!level)
+    return;
+
+  if (filter->priv->virtual_root)
+    gtk_tree_model_get_iter (filter->priv->child_model, &c_iter,
+                             filter->priv->virtual_root);
+
+  tmp_iter = c_iter;
+  gtk_tree_model_iter_nth_child (filter->priv->child_model, &c_iter,
+                                 filter->priv->virtual_root ? &tmp_iter : NULL,
+                                 indices[i]);
 
-  while (i < n)
+  while (i < gtk_tree_path_get_depth (path) - 1)
     {
-      if (elt->visible)
-        i++;
-      elt++;
+      gboolean requested_state;
+
+      elt = lookup_elt_with_offset (level->seq,
+                                    gtk_tree_path_get_indices (path)[i], NULL);
+
+      requested_state = gtk_tree_model_filter_visible (filter, &c_iter);
+
+      if (!elt)
+        {
+          int index;
+          GtkTreePath *c_path;
+
+          if (requested_state == FALSE)
+            return;
+
+          /* The elt does not exist in this level (so it is not
+           * visible), but should now be visible.  We emit the
+           * row-inserted and row-has-child-toggled signals.
+           */
+          elt = gtk_tree_model_filter_insert_elt_in_level (filter,
+                                                           &c_iter,
+                                                           level,
+                                                           indices[i],
+                                                           &index);
+
+          /* insert_elt_in_level defaults to FALSE */
+          elt->visible_siter = g_sequence_insert_sorted (level->visible_seq,
+                                                         elt,
+                                                         filter_elt_cmp, NULL);
+
+          c_path = gtk_tree_model_get_path (filter->priv->child_model,
+                                            &c_iter);
+
+          gtk_tree_model_filter_emit_row_inserted_for_path (filter,
+                                                            filter->priv->child_model,
+                                                            c_path,
+                                                            &c_iter);
+
+          gtk_tree_path_free (c_path);
+
+          /* We can immediately return, because this node was not visible
+           * before and its children will be checked for in response to
+           * the emitted row-has-child-toggled signal.
+           */
+          return;
+        }
+      else if (elt->visible_siter)
+        {
+          if (!requested_state)
+            {
+              /* A node has turned invisible.  Remove it from the level
+               * and emit row-deleted.  Since this node is being
+               * deleted. it makes no sense to look further up the
+               * chain.
+               */
+              gtk_tree_model_filter_remove_elt_from_level (filter,
+                                                           level, elt);
+              return;
+            }
+
+          /* Otherwise continue up the chain */
+        }
+      else if (!elt->visible_siter)
+        {
+          if (requested_state)
+            {
+              /* A node is already in the cache, but invisible.  This
+               * is usually a node on which a reference is kept by
+               * the filter model, or a node fetched on the filter's
+               * request, and thus not shown.  Therefore, we will
+               * not emit row-inserted for this node.  Instead,
+               * we signal to its parent that a change has occurred.
+               *
+               * Exception: root level, in this case, we must emit
+               * row-inserted.
+               */
+              if (level->parent_level)
+                {
+                  GtkTreeIter f_iter;
+                  GtkTreePath *f_path;
+
+                  elt->visible_siter = g_sequence_insert_sorted (level->visible_seq, elt,
+                                                                 filter_elt_cmp, NULL);
+
+                  f_iter.stamp = filter->priv->stamp;
+                  f_iter.user_data = level->parent_level;
+                  f_iter.user_data2 = level->parent_elt;
+
+                  f_path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter),
+                                                    &f_iter);
+                  gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (filter),
+                                                        f_path, &f_iter);
+                  gtk_tree_path_free (f_path);
+                }
+              else
+                {
+                  GtkTreePath *c_path;
+
+                  elt->visible_siter = g_sequence_insert_sorted (level->visible_seq, elt,
+                                                                 filter_elt_cmp, NULL);
+
+                  c_path = gtk_tree_model_get_path (filter->priv->child_model,
+                                                    &c_iter);
+
+                  gtk_tree_model_filter_emit_row_inserted_for_path (filter,
+                                                                    filter->priv->child_model,
+                                                                    c_path,
+                                                                    &c_iter);
+
+                  gtk_tree_path_free (c_path);
+                }
+
+              /* We can immediately return, because this node was not visible
+               * before and the parent will check its children, including
+               * this node, in response to the emitted row-has-child-toggled
+               * signal.
+               */
+              return;
+            }
+
+          /* Not visible, so no need to continue. */
+          return;
+        }
+
+      if (!elt->children)
+        {
+          /* If an elt does not have children, these are not visible.
+           * Therefore, any signals emitted for these children will
+           * be ignored, so we do not have to emit them.
+           */
+          return;
+        }
+
+      level = elt->children;
+      i++;
+
+      tmp_iter = c_iter;
+      gtk_tree_model_iter_nth_child (filter->priv->child_model, &c_iter,
+                                     &tmp_iter, indices[i]);
     }
+}
+
+static FilterElt *
+gtk_tree_model_filter_insert_elt_in_level (GtkTreeModelFilter *filter,
+                                           GtkTreeIter        *c_iter,
+                                           FilterLevel        *level,
+                                           gint                offset,
+                                           gint               *index)
+{
+  FilterElt *elt;
+  GSequenceIter *siter;
+
+  elt = filter_elt_new ();
+
+  if (GTK_TREE_MODEL_FILTER_CACHE_CHILD_ITERS (filter))
+    elt->iter = *c_iter;
+
+  elt->offset = offset;
+  elt->zero_ref_count = 0;
+  elt->ref_count = 0;
+  elt->ext_ref_count = 0;
+  elt->children = NULL;
+
+  /* Because we don't emit row_inserted, the node is invisible and thus
+   * not inserted in visible_seq
+   */
+  elt->visible_siter = NULL;
+
+  siter = g_sequence_insert_sorted (level->seq, elt, filter_elt_cmp, NULL);
+  *index = g_sequence_iter_get_position (siter);
 
-  while (!elt->visible)
-    elt++;
+  /* If the insert location is zero, we need to move our reference
+   * on the old first node to the new first node.
+   */
+  if (*index == 0)
+    gtk_tree_model_filter_level_transfer_first_ref_with_index (filter, level,
+                                                               1, 0);
 
   return elt;
 }
@@ -932,21 +1437,18 @@ gtk_tree_model_filter_fetch_child (GtkTreeModelFilter *filter,
                                    gint                offset,
                                    gint               *index)
 {
-  gint i = 0;
-  gint start, middle, end;
   gint len;
   GtkTreePath *c_path = NULL;
   GtkTreeIter c_iter;
   GtkTreePath *c_parent_path = NULL;
   GtkTreeIter c_parent_iter;
-  FilterElt elt;
 
   /* check if child exists and is visible */
-  if (level->parent_elt_index >= 0)
+  if (level->parent_elt)
     {
       c_parent_path =
         gtk_tree_model_filter_elt_get_path (level->parent_level,
-                                            FILTER_LEVEL_PARENT_ELT (level),
+                                            level->parent_elt,
                                             filter->priv->virtual_root);
       if (!c_parent_path)
         return NULL;
@@ -983,189 +1485,148 @@ gtk_tree_model_filter_fetch_child (GtkTreeModelFilter *filter,
   if (offset >= len || !gtk_tree_model_filter_visible (filter, &c_iter))
     return NULL;
 
-  /* add child */
-  elt.offset = offset;
-  elt.zero_ref_count = 0;
-  elt.ref_count = 0;
-  elt.children = NULL;
-  /* visibility should be FALSE as we don't emit row_inserted */
-  elt.visible = FALSE;
-
-  if (GTK_TREE_MODEL_FILTER_CACHE_CHILD_ITERS (filter))
-    elt.iter = c_iter;
-
-  /* find index (binary search on offset) */
-  start = 0;
-  end = level->array->len;
-
-  if (start != end)
-    {
-      while (start != end)
-        {
-          middle = (start + end) / 2;
-
-          if (g_array_index (level->array, FilterElt, middle).offset <= offset)
-            start = middle + 1;
-          else
-            end = middle;
-        }
-
-      if (g_array_index (level->array, FilterElt, middle).offset <= offset)
-        i = middle + 1;
-      else
-        i = middle;
-    }
-  else
-    i = 0;
-
-  g_array_insert_val (level->array, i, elt);
-  *index = i;
-
-  for (i = 0; i < level->array->len; i++)
-    {
-      FilterElt *e = &(g_array_index (level->array, FilterElt, i));
-      if (e->children)
-        e->children->parent_elt_index = i;
-    }
-
-  c_iter.stamp = filter->priv->stamp;
-  c_iter.user_data = level;
-  c_iter.user_data2 = &g_array_index (level->array, FilterElt, *index);
-
-  if (level->parent_level || filter->priv->virtual_root)
-    gtk_tree_model_filter_ref_node (GTK_TREE_MODEL (filter), &c_iter);
-
-  return &g_array_index (level->array, FilterElt, *index);
+  return gtk_tree_model_filter_insert_elt_in_level (filter, &c_iter,
+                                                    level, offset,
+                                                    index);
 }
 
+/* Note that this function is never called from the row-deleted handler.
+ * This means that this function is only used for removing elements
+ * which are still present in the child model.  As a result, we must
+ * take care to properly release the references the filter model has
+ * on the child model nodes.
+ */
 static void
-gtk_tree_model_filter_remove_node (GtkTreeModelFilter *filter,
-                                   GtkTreeIter        *iter)
+gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter,
+                                             FilterLevel        *level,
+                                             FilterElt          *elt)
 {
-  FilterElt *elt, *parent;
-  FilterLevel *level, *parent_level;
-  gint i, length, parent_elt_index;
+  FilterElt *parent;
+  FilterLevel *parent_level;
+  gint length, orig_level_ext_ref_count;
+  GtkTreeIter iter;
+  GtkTreePath *path = NULL;
 
   gboolean emit_child_toggled = FALSE;
 
-  level = FILTER_LEVEL (iter->user_data);
-  elt = FILTER_ELT (iter->user_data2);
+  iter.stamp = filter->priv->stamp;
+  iter.user_data = level;
+  iter.user_data2 = elt;
 
-  parent_elt_index = level->parent_elt_index;
-  if (parent_elt_index >= 0)
-    parent = FILTER_LEVEL_PARENT_ELT (level);
-  else
-    parent = NULL;
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter);
+
+  parent = level->parent_elt;
   parent_level = level->parent_level;
 
-  length = level->array->len;
+  length = g_sequence_get_length (level->seq);
+
+  /* We need to know about the level's ext ref count before removal
+   * of this node.
+   */
+  orig_level_ext_ref_count = level->ext_ref_count;
+
+  /* first register the node to be invisible */
+  g_sequence_remove (elt->visible_siter);
+  elt->visible_siter = NULL;
 
   /* we distinguish a couple of cases:
    *  - root level, length > 1: emit row-deleted and remove.
    *  - root level, length == 1: emit row-deleted and keep in cache.
-   *  - level, length == 1: parent->ref_count > 1: emit row-deleted and keep.
+   *  - level, length == 1: parent->ext_ref_count > 0: emit row-deleted
+   *                        and keep.
    *  - level, length > 1: emit row-deleted and remove.
    *  - else, remove level.
    *
-   *  if level != root level and visible nodes == 0, emit row-has-child-toggled.
+   *  if level != root level and the number of visible nodes is 0 (ie. this
+   *  is the last node to be removed from the level), emit
+   *  row-has-child-toggled.
    */
 
   if (level != filter->priv->root
-      && level->visible_nodes == 0
+      && g_sequence_get_length (level->visible_seq) == 0
       && parent
-      && parent->visible)
+      && parent->visible_siter)
     emit_child_toggled = TRUE;
 
   if (length > 1)
     {
-      GtkTreePath *path;
-      FilterElt *tmp;
+      GSequenceIter *siter;
 
       /* We emit row-deleted, and remove the node from the cache.
        * If it has any children, these will be removed here as well.
        */
 
       if (elt->children)
-        gtk_tree_model_filter_free_level (filter, elt->children);
+        gtk_tree_model_filter_free_level (filter, elt->children, TRUE);
 
-      path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), iter);
-      elt->visible = FALSE;
-      gtk_tree_model_filter_increment_stamp (filter);
-      iter->stamp = filter->priv->stamp;
-      gtk_tree_model_row_deleted (GTK_TREE_MODEL (filter), path);
-      gtk_tree_path_free (path);
+      /* If the first node is being removed, transfer, the reference */
+      if (elt == g_sequence_get (g_sequence_get_begin_iter (level->seq)))
+        {
+          gtk_tree_model_filter_level_transfer_first_ref_with_index (filter, level,
+                                                                     0, 1);
+        }
 
-      while (elt->ref_count > 1)
+      while (elt->ext_ref_count > 0)
         gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter),
-                                               iter, FALSE);
-
-      if (parent_level || filter->priv->virtual_root)
-        gtk_tree_model_filter_unref_node (GTK_TREE_MODEL (filter), iter);
-      else if (elt->ref_count > 0)
+                                               &iter, TRUE, FALSE);
+      while (elt->ref_count > 0)
         gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter),
-                                               iter, FALSE);
+                                               &iter, FALSE, FALSE);
 
       /* remove the node */
-      tmp = bsearch_elt_with_offset (level->array, elt->offset, &i);
+      lookup_elt_with_offset (level->seq, elt->offset, &siter);
+      g_sequence_remove (siter);
 
-      if (tmp)
-        {
-          g_array_remove_index (level->array, i);
+      gtk_tree_model_filter_increment_stamp (filter);
 
-	  i--;
-          for (i = MAX (i, 0); i < level->array->len; i++)
-            {
-              /* NOTE: here we do *not* decrease offsets, because the node was
-               * not removed from the child model
-               */
-              elt = &g_array_index (level->array, FilterElt, i);
-              if (elt->children)
-                elt->children->parent_elt_index = i;
-            }
-        }
+      /* Only if the node is in the root level (parent == NULL) or
+       * the level is visible, a row-deleted signal is necessary.
+       */
+      if (!parent || orig_level_ext_ref_count > 0)
+        gtk_tree_model_row_deleted (GTK_TREE_MODEL (filter), path);
     }
-  else if ((length == 1 && parent && parent->ref_count > 1)
+  else if ((length == 1 && parent && parent->ext_ref_count > 0)
            || (length == 1 && level == filter->priv->root))
     {
-      GtkTreePath *path;
-
       /* We emit row-deleted, but keep the node in the cache and
        * referenced.  Its children will be removed.
        */
 
       if (elt->children)
         {
-          gtk_tree_model_filter_free_level (filter, elt->children);
+          gtk_tree_model_filter_free_level (filter, elt->children, TRUE);
           elt->children = NULL;
         }
 
-      path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), iter);
-      elt->visible = FALSE;
       gtk_tree_model_filter_increment_stamp (filter);
-      gtk_tree_model_row_deleted (GTK_TREE_MODEL (filter), path);
-      gtk_tree_path_free (path);
+
+      /* Only if the node is in the root level (parent == NULL) or
+       * the level is visible, a row-deleted signal is necessary.
+       */
+      if (!parent || orig_level_ext_ref_count > 0)
+        gtk_tree_model_row_deleted (GTK_TREE_MODEL (filter), path);
     }
   else
     {
-      GtkTreePath *path;
+      while (elt->ext_ref_count > 0)
+        gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter),
+                                               &iter, TRUE, FALSE);
+      while (elt->ref_count > 0)
+        gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter),
+                                               &iter, FALSE, FALSE);
 
       /* Blow level away, including any child levels */
+      gtk_tree_model_filter_free_level (filter, level, TRUE);
 
-      path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), iter);
-      elt->visible = FALSE;
       gtk_tree_model_filter_increment_stamp (filter);
-      iter->stamp = filter->priv->stamp;
-      gtk_tree_model_row_deleted (GTK_TREE_MODEL (filter), path);
-      gtk_tree_path_free (path);
 
-      while (elt->ref_count > 1)
-        gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter),
-                                               iter, FALSE);
-
-      gtk_tree_model_filter_free_level (filter, level);
+      if (!parent || orig_level_ext_ref_count > 0)
+        gtk_tree_model_row_deleted (GTK_TREE_MODEL (filter), path);
     }
 
-  if (emit_child_toggled)
+  gtk_tree_path_free (path);
+
+  if (emit_child_toggled && parent->ext_ref_count > 0)
     {
       GtkTreeIter piter;
       GtkTreePath *ppath;
@@ -1182,6 +1643,10 @@ gtk_tree_model_filter_remove_node (GtkTreeModelFilter *filter,
     }
 }
 
+/* This function is called after the given node has become visible.
+ * When the node has children, we should build the level and
+ * take a reference on the first child.
+ */
 static void
 gtk_tree_model_filter_update_children (GtkTreeModelFilter *filter,
 				       FilterLevel        *level,
@@ -1190,7 +1655,7 @@ gtk_tree_model_filter_update_children (GtkTreeModelFilter *filter,
   GtkTreeIter c_iter;
   GtkTreeIter iter;
 
-  if (!elt->visible)
+  if (!elt->visible_siter)
     return;
 
   iter.stamp = filter->priv->stamp;
@@ -1199,70 +1664,162 @@ gtk_tree_model_filter_update_children (GtkTreeModelFilter *filter,
 
   gtk_tree_model_filter_convert_iter_to_child_iter (filter, &c_iter, &iter);
 
-  if (gtk_tree_model_iter_has_child (filter->priv->child_model, &c_iter))
+  if ((!level->parent_level || level->parent_elt->ext_ref_count > 0) &&
+      gtk_tree_model_iter_has_child (filter->priv->child_model, &c_iter))
     {
-      GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter),
-                                                   &iter);
-      gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (filter),
-                                            path,
-                                            &iter);
-      if (path)
-        gtk_tree_path_free (path);
+      if (!elt->children)
+        gtk_tree_model_filter_build_level (filter, level, elt, FALSE);
+
+      if (elt->ext_ref_count > 0 && elt->children &&
+          g_sequence_get_length (elt->children->seq))
+        {
+          GtkTreePath *path;
+          path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter);
+          gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (filter),
+                                                path,
+                                                &iter);
+          if (path)
+            gtk_tree_path_free (path);
+        }
     }
 }
 
-static FilterElt *
-bsearch_elt_with_offset (GArray *array,
-                         gint    offset,
-                         gint   *index)
+/* Path is relative to the child model (this is on search on elt offset)
+ * but with the virtual root already removed if necesssary.
+ */
+static gboolean
+find_elt_with_offset (GtkTreeModelFilter *filter,
+                      GtkTreePath        *path,
+                      FilterLevel       **level_,
+                      FilterElt         **elt_)
 {
-  gint start, middle, end;
-  FilterElt *elt;
-
-  start = 0;
-  end = array->len;
+  int i = 0;
+  FilterLevel *level;
+  FilterLevel *parent_level = NULL;
+  FilterElt *elt = NULL;
 
-  if (array->len < 1)
-    return NULL;
+  level = FILTER_LEVEL (filter->priv->root);
 
-  if (start == end)
+  while (i < gtk_tree_path_get_depth (path))
     {
-      elt = &g_array_index (array, FilterElt, 0);
+      if (!level)
+        return FALSE;
 
-      if (elt->offset == offset)
-        {
-          *index = 0;
-          return elt;
-        }
-      else
-        return NULL;
+      elt = lookup_elt_with_offset (level->seq,
+                                    gtk_tree_path_get_indices (path)[i],
+                                    NULL);
+
+      if (!elt)
+        return FALSE;
+
+      parent_level = level;
+      level = elt->children;
+      i++;
     }
 
-  do
+  if (level_)
+    *level_ = parent_level;
+
+  if (elt_)
+    *elt_ = elt;
+
+  return TRUE;
+}
+
+/* TreeModel signals */
+static void
+gtk_tree_model_filter_emit_row_inserted_for_path (GtkTreeModelFilter *filter,
+                                                  GtkTreeModel       *c_model,
+                                                  GtkTreePath        *c_path,
+                                                  GtkTreeIter        *c_iter)
+{
+  FilterLevel *level;
+  FilterElt *elt;
+  GtkTreePath *path;
+  GtkTreeIter iter, children;
+  gboolean signals_emitted = FALSE;
+
+  if (!filter->priv->root)
     {
-      middle = (start + end) / 2;
+      /* The root level has not been exposed to the view yet, so we
+       * need to emit signals for any node that is being inserted.
+       */
+      gtk_tree_model_filter_build_level (filter, NULL, NULL, TRUE);
 
-      elt = &g_array_index (array, FilterElt, middle);
+      /* Check if the root level was built.  Then child levels
+       * that matter have also been built (due to update_children,
+       * which triggers iter_n_children).
+       */
+      if (filter->priv->root &&
+          g_sequence_get_length (FILTER_LEVEL (filter->priv->root)->visible_seq) > 0)
+        signals_emitted = TRUE;
+    }
 
-      if (elt->offset < offset)
-        start = middle + 1;
-      else if (elt->offset > offset)
-        end = middle;
-      else
-        break;
+  gtk_tree_model_filter_increment_stamp (filter);
+
+  /* We need to disallow to build new levels, because we are then pulling
+   * in a child in an invisible level.  We only want to find path if it
+   * is in a visible level (and thus has a parent that is visible).
+   */
+  path = gtk_real_tree_model_filter_convert_child_path_to_path (filter,
+                                                                c_path,
+                                                                FALSE,
+                                                                TRUE);
+
+  if (!path)
+    /* parent is probably being filtered out */
+    return;
+
+  gtk_tree_model_filter_get_iter_full (GTK_TREE_MODEL (filter), &iter, path);
+
+  level = FILTER_LEVEL (iter.user_data);
+  elt = FILTER_ELT (iter.user_data2);
+
+  /* Make sure elt is visible.  elt can already be visible in case
+   * it was pulled in above, so avoid inserted it into visible_seq twice.
+   */
+  if (!elt->visible_siter)
+    {
+      elt->visible_siter = g_sequence_insert_sorted (level->visible_seq,
+                                                     elt, filter_elt_cmp,
+                                                     NULL);
     }
-  while (start != end);
 
-  if (elt->offset == offset)
+  /* Check whether the node and all of its parents are visible */
+  if (gtk_tree_model_filter_elt_is_visible_in_target (level, elt))
     {
-      *index = middle;
-      return elt;
+      /* visibility changed -- reget path */
+      gtk_tree_path_free (path);
+      path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter);
+
+      if (!signals_emitted &&
+          (!level->parent_level || level->ext_ref_count > 0))
+        gtk_tree_model_row_inserted (GTK_TREE_MODEL (filter), path, &iter);
+
+      if (level->parent_level && level->parent_elt->ext_ref_count > 0 &&
+          g_sequence_get_length (level->visible_seq) == 1)
+        {
+          /* We know that this is the first visible node in this level, so
+           * we need to emit row-has-child-toggled on the parent.  This
+           * does not apply to the root level.
+           */
+
+          gtk_tree_path_up (path);
+          gtk_tree_model_get_iter (GTK_TREE_MODEL (filter), &iter, path);
+
+          gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (filter),
+                                                path,
+                                                &iter);
+        }
+
+      if (!signals_emitted
+          && gtk_tree_model_iter_children (c_model, &children, c_iter))
+        gtk_tree_model_filter_update_children (filter, level, elt);
     }
 
-  return NULL;
+  gtk_tree_path_free (path);
 }
 
-/* TreeModel signals */
 static void
 gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
                                    GtkTreePath  *c_path,
@@ -1274,6 +1831,7 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
   GtkTreeIter children;
   GtkTreeIter real_c_iter;
   GtkTreePath *path = NULL;
+  GtkTreePath *real_path = NULL;
 
   FilterElt *elt;
   FilterLevel *level;
@@ -1281,7 +1839,6 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
   gboolean requested_state;
   gboolean current_state;
   gboolean free_c_path = FALSE;
-  gboolean signals_emitted = FALSE;
 
   g_return_if_fail (c_path != NULL || c_iter != NULL);
 
@@ -1291,6 +1848,12 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
       free_c_path = TRUE;
     }
 
+  if (filter->priv->virtual_root)
+    real_path = gtk_tree_model_filter_remove_root (c_path,
+                                                   filter->priv->virtual_root);
+  else
+    real_path = gtk_tree_path_copy (c_path);
+
   if (c_iter)
     real_c_iter = *c_iter;
   else
@@ -1315,7 +1878,7 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
     {
       gtk_tree_model_filter_get_iter_full (GTK_TREE_MODEL (filter),
                                            &iter, path);
-      current_state = FILTER_ELT (iter.user_data2)->visible;
+      current_state = FILTER_ELT (iter.user_data2)->visible_siter != NULL;
     }
   else
     current_state = FALSE;
@@ -1326,11 +1889,12 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
 
   if (current_state == TRUE && requested_state == FALSE)
     {
-      /* get rid of this node */
-      level = FILTER_LEVEL (iter.user_data);
-      level->visible_nodes--;
+      gtk_tree_model_filter_remove_elt_from_level (filter,
+                                                   FILTER_LEVEL (iter.user_data),
+                                                   FILTER_ELT (iter.user_data2));
 
-      gtk_tree_model_filter_remove_node (filter, &iter);
+      if (real_path)
+        gtk_tree_model_filter_check_ancestors (filter, real_path);
 
       goto done;
     }
@@ -1348,13 +1912,17 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
 
       if (gtk_tree_model_filter_elt_is_visible_in_target (level, elt))
         {
-          gtk_tree_model_row_changed (GTK_TREE_MODEL (filter), path, &iter);
+          if (level->ext_ref_count > 0)
+            gtk_tree_model_row_changed (GTK_TREE_MODEL (filter), path, &iter);
 
           /* and update the children */
           if (gtk_tree_model_iter_children (c_model, &children, &real_c_iter))
             gtk_tree_model_filter_update_children (filter, level, elt);
         }
 
+      if (real_path)
+        gtk_tree_model_filter_check_ancestors (filter, real_path);
+
       goto done;
     }
 
@@ -1363,79 +1931,19 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
    */
   g_return_if_fail (current_state == FALSE && requested_state == TRUE);
 
-  /* make sure the new item has been pulled in */
-  if (!filter->priv->root)
-    {
-      gtk_tree_model_filter_build_level (filter, NULL, -1, TRUE);
-
-      /* We will only proceed below if the item is found.  If the item
-       * is found, we can be sure row-inserted has just been emitted
-       * for it.
-       */
-      signals_emitted = TRUE;
-    }
-
-  gtk_tree_model_filter_increment_stamp (filter);
-
-  /* We need to allow to build new levels, because we are then pulling
-   * in a child in an invisible level.  We only want to find path if it
-   * is in a visible level (and thus has a parent that is visible).
-   */
-  if (!path)
-    path = gtk_real_tree_model_filter_convert_child_path_to_path (filter,
-                                                                  c_path,
-                                                                  FALSE,
-                                                                  TRUE);
-
-  if (!path)
-    /* parent is probably being filtered out */
-    goto done;
-
-  gtk_tree_model_filter_get_iter_full (GTK_TREE_MODEL (filter), &iter, path);
-
-  level = FILTER_LEVEL (iter.user_data);
-  elt = FILTER_ELT (iter.user_data2);
-
-  /* elt->visible can be TRUE at this point if it was pulled in above */
-  if (!elt->visible)
-    {
-      elt->visible = TRUE;
-      level->visible_nodes++;
-    }
-
-  if (gtk_tree_model_filter_elt_is_visible_in_target (level, elt))
-    {
-      /* visibility changed -- reget path */
-      gtk_tree_path_free (path);
-      path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter);
-
-      if (!signals_emitted)
-        gtk_tree_model_row_inserted (GTK_TREE_MODEL (filter), path, &iter);
-
-      if (level->parent_level && level->visible_nodes == 1)
-        {
-          /* We know that this is the first visible node in this level, so
-           * we need to emit row-has-child-toggled on the parent.  This
-           * does not apply to the root level.
-           */
-
-          gtk_tree_path_up (path);
-          gtk_tree_model_get_iter (GTK_TREE_MODEL (filter), &iter, path);
-
-          gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (filter),
-                                                path,
-                                                &iter);
-        }
+  if (real_path)
+    gtk_tree_model_filter_check_ancestors (filter, real_path);
 
-      if (!signals_emitted
-          && gtk_tree_model_iter_children (c_model, &children, c_iter))
-        gtk_tree_model_filter_update_children (filter, level, elt);
-    }
+  gtk_tree_model_filter_emit_row_inserted_for_path (filter, c_model,
+                                                    c_path, c_iter);
 
 done:
   if (path)
     gtk_tree_path_free (path);
 
+  if (real_path)
+    gtk_tree_path_free (real_path);
+
   if (free_c_path)
     gtk_tree_path_free (c_path);
 }
@@ -1447,19 +1955,20 @@ gtk_tree_model_filter_row_inserted (GtkTreeModel *c_model,
                                     gpointer      data)
 {
   GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (data);
-  GtkTreePath *path = NULL;
   GtkTreePath *real_path = NULL;
-  GtkTreeIter iter;
 
   GtkTreeIter real_c_iter;
 
-  FilterElt *elt;
-  FilterLevel *level;
-  FilterLevel *parent_level;
+  FilterElt *elt = NULL;
+  FilterLevel *level = NULL;
+  FilterLevel *parent_level = NULL;
+  GSequenceIter *siter;
+  FilterElt dummy;
 
   gint i = 0, offset;
 
   gboolean free_c_path = FALSE;
+  gboolean emit_row_inserted = FALSE;
 
   g_return_if_fail (c_path != NULL || c_iter != NULL);
 
@@ -1502,25 +2011,6 @@ gtk_tree_model_filter_row_inserted (GtkTreeModel *c_model,
         }
     }
 
-  if (!filter->priv->root)
-    {
-      /* No point in building the level if this node is not visible. */
-      if (!filter->priv->virtual_root
-          && !gtk_tree_model_filter_visible (filter, c_iter))
-        goto done;
-
-      /* build level will pull in the new child */
-      gtk_tree_model_filter_build_level (filter, NULL, -1, FALSE);
-
-      if (filter->priv->root
-          && FILTER_LEVEL (filter->priv->root)->visible_nodes)
-        goto done_and_emit;
-      else
-        goto done;
-    }
-
-  parent_level = level = FILTER_LEVEL (filter->priv->root);
-
   /* subtract virtual root if necessary */
   if (filter->priv->virtual_root)
     {
@@ -1533,57 +2023,71 @@ gtk_tree_model_filter_row_inserted (GtkTreeModel *c_model,
   else
     real_path = gtk_tree_path_copy (c_path);
 
-  if (gtk_tree_path_get_depth (real_path) - 1 >= 1)
+  if (!filter->priv->root)
     {
-      /* find the parent level */
-      while (i < gtk_tree_path_get_depth (real_path) - 1)
+      /* The root level has not been exposed to the view yet, so we
+       * need to emit signals for any node that is being inserted.
+       */
+      gtk_tree_model_filter_build_level (filter, NULL, NULL, TRUE);
+
+      /* Check if the root level was built.  Then child levels
+       * that matter have also been built (due to update_children,
+       * which triggers iter_n_children).
+       */
+      if (filter->priv->root)
         {
-          gint j;
+          emit_row_inserted = FALSE;
+          goto done;
+        }
+    }
 
-          if (!level)
-            /* we don't cover this signal */
-            goto done;
+  if (gtk_tree_path_get_depth (real_path) - 1 >= 1)
+    {
+      gboolean found = FALSE;
+      GtkTreePath *parent = gtk_tree_path_copy (real_path);
+      gtk_tree_path_up (parent);
 
-          elt = bsearch_elt_with_offset (level->array,
-                                         gtk_tree_path_get_indices (real_path)[i],
-                                         &j);
+      found = find_elt_with_offset (filter, parent, &parent_level, &elt);
 
-          if (!elt)
-            /* parent is probably being filtered out */
-            goto done;
+      gtk_tree_path_free (parent);
 
-          if (!elt->children)
-            {
-              GtkTreePath *tmppath;
-              GtkTreeIter  tmpiter;
+      if (!found)
+        /* Parent is not in the cache and probably being filtered out */
+        goto done;
+
+      level = elt->children;
+    }
+  else
+    level = FILTER_LEVEL (filter->priv->root);
 
-              tmpiter.stamp = filter->priv->stamp;
-              tmpiter.user_data = level;
-              tmpiter.user_data2 = elt;
+  if (!level)
+    {
+      if (elt && elt->visible_siter)
+        {
+          /* The level in which the new node should be inserted does not
+           * exist, but the parent, elt, does.  If elt is visible, emit
+           * row-has-child-toggled.
+           */
+          GtkTreePath *tmppath;
+          GtkTreeIter  tmpiter;
 
-              tmppath = gtk_tree_model_get_path (GTK_TREE_MODEL (data),
-                                                 &tmpiter);
+          tmpiter.stamp = filter->priv->stamp;
+          tmpiter.user_data = parent_level;
+          tmpiter.user_data2 = elt;
 
-              if (tmppath)
-                {
-                  gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (data),
-                                                        tmppath, &tmpiter);
-                  gtk_tree_path_free (tmppath);
-                }
+          tmppath = gtk_tree_model_get_path (GTK_TREE_MODEL (filter),
+                                             &tmpiter);
 
-              /* not covering this signal */
-              goto done;
+          if (tmppath)
+            {
+              gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (filter),
+                                                    tmppath, &tmpiter);
+              gtk_tree_path_free (tmppath);
             }
-
-          level = elt->children;
-          parent_level = level;
-          i++;
         }
+      goto done;
     }
 
-  if (!parent_level)
-    goto done;
-
   /* let's try to insert the value */
   offset = gtk_tree_path_get_indices (real_path)[gtk_tree_path_get_depth (real_path) - 1];
 
@@ -1591,83 +2095,36 @@ gtk_tree_model_filter_row_inserted (GtkTreeModel *c_model,
    * be a gap here. This will be filled with the node (via fetch_child) when
    * it becomes visible
    */
-  for (i = 0; i < level->array->len; i++)
-    {
-      FilterElt *e = &g_array_index (level->array, FilterElt, i);
-      if ((e->offset >= offset))
-        e->offset++;
-    }
+  dummy.offset = offset;
+  siter = g_sequence_search (level->seq, &dummy, filter_elt_cmp, NULL);
+  siter = g_sequence_iter_prev (siter);
+  g_sequence_foreach_range (siter, g_sequence_get_end_iter (level->seq),
+                            increase_offset_iter, GINT_TO_POINTER (offset));
 
   /* only insert when visible */
   if (gtk_tree_model_filter_visible (filter, &real_c_iter))
     {
-      FilterElt felt;
-
-      if (GTK_TREE_MODEL_FILTER_CACHE_CHILD_ITERS (filter))
-        felt.iter = real_c_iter;
-
-      felt.offset = offset;
-      felt.zero_ref_count = 0;
-      felt.ref_count = 0;
-      felt.visible = TRUE;
-      felt.children = NULL;
-
-      for (i = 0; i < level->array->len; i++)
-        if (g_array_index (level->array, FilterElt, i).offset > offset)
-          break;
-
-      level->visible_nodes++;
-
-      g_array_insert_val (level->array, i, felt);
-
-      if (level->parent_level || filter->priv->virtual_root)
-        {
-          GtkTreeIter f_iter;
-
-          f_iter.stamp = filter->priv->stamp;
-          f_iter.user_data = level;
-          f_iter.user_data2 = &g_array_index (level->array, FilterElt, i);
-
-          gtk_tree_model_filter_ref_node (GTK_TREE_MODEL (filter), &f_iter);
-        }
-    }
-
-  /* another iteration to update the references of children to parents. */
-  for (i = 0; i < level->array->len; i++)
-    {
-      FilterElt *e = &g_array_index (level->array, FilterElt, i);
-      if (e->children)
-        e->children->parent_elt_index = i;
+      FilterElt *felt;
+
+      felt = gtk_tree_model_filter_insert_elt_in_level (filter,
+                                                        &real_c_iter,
+                                                        level, offset,
+                                                        &i);
+
+      /* insert_elt_in_level defaults to FALSE */
+      felt->visible_siter = g_sequence_insert_sorted (level->visible_seq,
+                                                      felt,
+                                                      filter_elt_cmp, NULL);
+      emit_row_inserted = TRUE;
     }
 
-  /* don't emit the signal if we aren't visible */
-  if (!gtk_tree_model_filter_visible (filter, &real_c_iter))
-    goto done;
-
-done_and_emit:
-  /* NOTE: pass c_path here and NOT real_path. This function does
-   * root subtraction itself
-   */
-  path = gtk_real_tree_model_filter_convert_child_path_to_path (filter,
-                                                                c_path,
-                                                                FALSE, TRUE);
-
-  if (!path)
-    goto done;
-
-  gtk_tree_model_filter_increment_stamp (filter);
-
-  gtk_tree_model_filter_get_iter_full (GTK_TREE_MODEL (data), &iter, path);
-
-  /* get a path taking only visible nodes into account */
-  gtk_tree_path_free (path);
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (data), &iter);
-
-  gtk_tree_model_row_inserted (GTK_TREE_MODEL (data), path, &iter);
+done:
+  gtk_tree_model_filter_check_ancestors (filter, real_path);
 
-  gtk_tree_path_free (path);
+  if (emit_row_inserted)
+    gtk_tree_model_filter_emit_row_inserted_for_path (filter, c_model,
+                                                      c_path, c_iter);
 
-done:
   if (real_path)
     gtk_tree_path_free (real_path);
 
@@ -1696,7 +2153,7 @@ gtk_tree_model_filter_row_has_child_toggled (GtkTreeModel *c_model,
   if (filter->priv->virtual_root && !filter->priv->root
       && !gtk_tree_path_compare (c_path, filter->priv->virtual_root))
     {
-      gtk_tree_model_filter_build_level (filter, NULL, -1, TRUE);
+      gtk_tree_model_filter_build_level (filter, NULL, NULL, TRUE);
       return;
     }
 
@@ -1720,29 +2177,28 @@ gtk_tree_model_filter_row_has_child_toggled (GtkTreeModel *c_model,
 
   requested_state = gtk_tree_model_filter_visible (filter, c_iter);
 
-  if (!elt->visible && !requested_state)
+  if (!elt->visible_siter && !requested_state)
     {
       /* The parent node currently is not visible and will not become
        * visible, so we will not pass on the row-has-child-toggled event.
        */
       return;
     }
-  else if (elt->visible && !requested_state)
+  else if (elt->visible_siter && !requested_state)
     {
       /* The node is no longer visible, so it has to be removed.
-       * _remove_node() takes care of emitting row-has-child-toggled
+       * _remove_elt_from_level() takes care of emitting row-has-child-toggled
        * when required.
        */
-      level->visible_nodes--;
-
-      gtk_tree_model_filter_remove_node (filter, &iter);
+      gtk_tree_model_filter_remove_elt_from_level (filter, level, elt);
 
       return;
     }
-  else if (!elt->visible && requested_state)
+  else if (!elt->visible_siter && requested_state)
     {
-      elt->visible = TRUE;
-      level->visible_nodes++;
+      elt->visible_siter = g_sequence_insert_sorted (level->visible_seq,
+                                                     elt, filter_elt_cmp,
+                                                     NULL);
 
       /* Only insert if the parent is visible in the target */
       if (gtk_tree_model_filter_elt_is_visible_in_target (level, elt))
@@ -1763,10 +2219,9 @@ gtk_tree_model_filter_row_has_child_toggled (GtkTreeModel *c_model,
   /* If this node is referenced and has children, build the level so we
    * can monitor it for changes.
    */
-  if (elt->ref_count > 1 && gtk_tree_model_iter_has_child (c_model, c_iter))
-    gtk_tree_model_filter_build_level (filter, level,
-                                       FILTER_LEVEL_ELT_INDEX (level, elt),
-                                       TRUE);
+  if (elt->ref_count > 1 && !elt->children &&
+      gtk_tree_model_iter_has_child (c_model, c_iter))
+    gtk_tree_model_filter_build_level (filter, level, elt, FALSE);
 
   /* get a path taking only visible nodes into account */
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (data), &iter);
@@ -1775,160 +2230,181 @@ gtk_tree_model_filter_row_has_child_toggled (GtkTreeModel *c_model,
 }
 
 static void
-gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model,
-                                   GtkTreePath  *c_path,
-                                   gpointer      data)
+gtk_tree_model_filter_virtual_root_deleted (GtkTreeModelFilter *filter,
+                                            GtkTreePath        *c_path)
 {
-  GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (data);
+  gint i, nodes;
   GtkTreePath *path;
-  GtkTreeIter iter;
-  FilterElt *elt;
-  FilterLevel *level, *parent_level = NULL;
-  gboolean emit_child_toggled = FALSE;
-  gboolean emit_row_deleted = FALSE;
-  gint offset;
-  gint i;
-  gint parent_elt_index = -1;
+  FilterLevel *level = FILTER_LEVEL (filter->priv->root);
+
+  /* The virtual root (or one of its ancestors) has been deleted.  This
+   * means that all content for our model is now gone.  We deal with
+   * this by removing everything in the filter model: we just iterate
+   * over the root level and emit a row-deleted for each FilterElt.
+   * (FIXME: Should we emit row-deleted for child nodes as well? This
+   * has never been fully clear in TreeModel).
+   */
 
-  g_return_if_fail (c_path != NULL);
+  /* We unref the path of the virtual root, up to and not including the
+   * deleted node which can no longer be unreffed.
+   */
+  gtk_tree_model_filter_unref_path (filter, filter->priv->virtual_root,
+                                    gtk_tree_path_get_depth (c_path) - 1);
+  filter->priv->virtual_root_deleted = TRUE;
 
-  /* special case the deletion of an ancestor of the virtual root */
-  if (filter->priv->virtual_root &&
-      (gtk_tree_path_is_ancestor (c_path, filter->priv->virtual_root) ||
-       !gtk_tree_path_compare (c_path, filter->priv->virtual_root)))
-    {
-      gint i;
-      GtkTreePath *path2;
-      FilterLevel *level2 = FILTER_LEVEL (filter->priv->root);
+  if (!level)
+    return;
 
-      gtk_tree_model_filter_unref_path (filter, filter->priv->virtual_root);
-      filter->priv->virtual_root_deleted = TRUE;
+  nodes = g_sequence_get_length (level->visible_seq);
 
-      if (!level2)
-        return;
+  /* We should not propagate the unref here.  An unref for any of these
+   * nodes will fail, since the respective nodes in the child model are
+   * no longer there.
+   */
+  gtk_tree_model_filter_free_level (filter, filter->priv->root, FALSE);
 
-      /* remove everything in the filter model
-       *
-       * For now, we just iterate over the root level and emit a
-       * row_deleted for each FilterElt. Not sure if this is correct.
-       */
+  gtk_tree_model_filter_increment_stamp (filter);
 
-      gtk_tree_model_filter_increment_stamp (filter);
-      path2 = gtk_tree_path_new ();
-      gtk_tree_path_append_index (path2, 0);
+  path = gtk_tree_path_new ();
+  gtk_tree_path_append_index (path, 0);
 
-      for (i = 0; i < level2->visible_nodes; i++)
-        gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path2);
+  for (i = 0; i < nodes; i++)
+    gtk_tree_model_row_deleted (GTK_TREE_MODEL (filter), path);
 
-      gtk_tree_path_free (path2);
-      gtk_tree_model_filter_free_level (filter, filter->priv->root);
+  gtk_tree_path_free (path);
+}
 
-      return;
-    }
+static void
+gtk_tree_model_filter_adjust_virtual_root (GtkTreeModelFilter *filter,
+                                           GtkTreePath        *c_path)
+{
+  gint i;
+  gint level;
+  gint *v_indices, *c_indices;
+  gboolean common_prefix = TRUE;
+
+  level = gtk_tree_path_get_depth (c_path) - 1;
+  v_indices = gtk_tree_path_get_indices (filter->priv->virtual_root);
+  c_indices = gtk_tree_path_get_indices (c_path);
+
+  for (i = 0; i < level; i++)
+    if (v_indices[i] != c_indices[i])
+      {
+        common_prefix = FALSE;
+        break;
+      }
 
-  /* fixup virtual root */
-  if (filter->priv->virtual_root)
-    {
-      if (gtk_tree_path_get_depth (filter->priv->virtual_root) >=
-          gtk_tree_path_get_depth (c_path))
-        {
-          gint level2;
-          gint *v_indices, *c_indices;
-          gboolean common_prefix = TRUE;
+  if (common_prefix && v_indices[level] > c_indices[level])
+    (v_indices[level])--;
+}
 
-          level2 = gtk_tree_path_get_depth (c_path) - 1;
-          v_indices = gtk_tree_path_get_indices (filter->priv->virtual_root);
-          c_indices = gtk_tree_path_get_indices (c_path);
+static void
+gtk_tree_model_filter_row_deleted_invisible_node (GtkTreeModelFilter *filter,
+                                                  GtkTreePath        *c_path)
+{
+  int offset;
+  GtkTreePath *real_path;
+  FilterLevel *level;
+  FilterElt *elt;
+  FilterElt dummy;
+  GSequenceIter *siter;
 
-          for (i = 0; i < level2; i++)
-            if (v_indices[i] != c_indices[i])
-              {
-                common_prefix = FALSE;
-                break;
-              }
+  /* The node deleted in the child model is not visible in the
+   * filter model.  We will not emit a signal, just fixup the offsets
+   * of the other nodes.
+   */
 
-          if (common_prefix && v_indices[level2] > c_indices[level2])
-            (v_indices[level2])--;
-        }
-    }
+  if (!filter->priv->root)
+    return;
 
-  path = gtk_real_tree_model_filter_convert_child_path_to_path (filter,
-                                                                c_path,
-                                                                FALSE,
-                                                                FALSE);
+  level = FILTER_LEVEL (filter->priv->root);
 
-  if (!path)
+  /* subtract vroot if necessary */
+  if (filter->priv->virtual_root)
     {
-      /* The node deleted in the child model is not visible in the
-       * filter model.  We will not emit a signal, just fixup the offsets
-       * of the other nodes.
-       */
-      GtkTreePath *real_path;
-
-      if (!filter->priv->root)
+      real_path = gtk_tree_model_filter_remove_root (c_path,
+                                                     filter->priv->virtual_root);
+      /* we don't handle this */
+      if (!real_path)
         return;
+    }
+  else
+    real_path = gtk_tree_path_copy (c_path);
 
-      level = FILTER_LEVEL (filter->priv->root);
+  if (gtk_tree_path_get_depth (real_path) - 1 >= 1)
+    {
+      gboolean found = FALSE;
+      GtkTreePath *parent = gtk_tree_path_copy (real_path);
+      gtk_tree_path_up (parent);
 
-      /* subtract vroot if necessary */
-      if (filter->priv->virtual_root)
+      found = find_elt_with_offset (filter, parent, &level, &elt);
+
+      gtk_tree_path_free (parent);
+
+      if (!found)
         {
-          real_path = gtk_tree_model_filter_remove_root (c_path,
-                                                         filter->priv->virtual_root);
-          /* we don't handle this */
-          if (!real_path)
-            return;
+          /* parent is filtered out, so no level */
+          gtk_tree_path_free (real_path);
+          return;
         }
-      else
-        real_path = gtk_tree_path_copy (c_path);
 
-      i = 0;
-      if (gtk_tree_path_get_depth (real_path) - 1 >= 1)
-        {
-          /* find the level where the deletion occurred */
-          while (i < gtk_tree_path_get_depth (real_path) - 1)
-            {
-              gint j;
+      level = elt->children;
+    }
 
-              if (!level)
-                {
-                  /* we don't cover this */
-                  gtk_tree_path_free (real_path);
-                  return;
-                }
+  offset = gtk_tree_path_get_indices (real_path)[gtk_tree_path_get_depth (real_path) - 1];
+  gtk_tree_path_free (real_path);
 
-              elt = bsearch_elt_with_offset (level->array,
-                                             gtk_tree_path_get_indices (real_path)[i],
-                                             &j);
+  if (!level)
+    return;
 
-              if (!elt || !elt->children)
-                {
-                  /* parent is filtered out, so no level */
-                  gtk_tree_path_free (real_path);
-                  return;
-                }
+  /* decrease offset of all nodes following the deleted node */
+  dummy.offset = offset;
+  siter = g_sequence_search (level->seq, &dummy, filter_elt_cmp, NULL);
+  g_sequence_foreach_range (siter, g_sequence_get_end_iter (level->seq),
+                            decrease_offset_iter, GINT_TO_POINTER (offset));
+}
 
-              level = elt->children;
-              i++;
-            }
-        }
+static void
+gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model,
+                                   GtkTreePath  *c_path,
+                                   gpointer      data)
+{
+  GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (data);
+  GtkTreePath *path;
+  GtkTreeIter iter;
+  FilterElt *elt, *parent_elt = NULL;
+  FilterLevel *level, *parent_level = NULL;
+  GSequenceIter *siter;
+  gboolean emit_child_toggled = FALSE;
+  gboolean emit_row_deleted = FALSE;
+  gint offset;
+  gint orig_level_ext_ref_count;
+
+  g_return_if_fail (c_path != NULL);
 
-      offset = gtk_tree_path_get_indices (real_path)[gtk_tree_path_get_depth (real_path) - 1];
-      gtk_tree_path_free (real_path);
+  /* special case the deletion of an ancestor of the virtual root */
+  if (filter->priv->virtual_root &&
+      (gtk_tree_path_is_ancestor (c_path, filter->priv->virtual_root) ||
+       !gtk_tree_path_compare (c_path, filter->priv->virtual_root)))
+    {
+      gtk_tree_model_filter_virtual_root_deleted (filter, c_path);
+      return;
+    }
 
-      if (!level)
-        return;
+  /* adjust the virtual root for the deleted row */
+  if (filter->priv->virtual_root &&
+      gtk_tree_path_get_depth (filter->priv->virtual_root) >=
+      gtk_tree_path_get_depth (c_path))
+    gtk_tree_model_filter_adjust_virtual_root (filter, c_path);
 
-      /* decrease offset of all nodes following the deleted node */
-      for (i = 0; i < level->array->len; i++)
-        {
-          elt = &g_array_index (level->array, FilterElt, i);
-          if (elt->offset > offset)
-            elt->offset--;
-          if (elt->children)
-            elt->children->parent_elt_index = i;
-        }
+  path = gtk_real_tree_model_filter_convert_child_path_to_path (filter,
+                                                                c_path,
+                                                                FALSE,
+                                                                FALSE);
 
+  if (!path)
+    {
+      gtk_tree_model_filter_row_deleted_invisible_node (filter, c_path);
       return;
     }
 
@@ -1938,61 +2414,69 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model,
   level = FILTER_LEVEL (iter.user_data);
   elt = FILTER_ELT (iter.user_data2);
   offset = elt->offset;
+  orig_level_ext_ref_count = level->ext_ref_count;
 
-  if (elt->visible)
+  if (elt->visible_siter)
     {
       /* get a path taking only visible nodes into account */
       gtk_tree_path_free (path);
       path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter);
 
-      level->visible_nodes--;
-
-      if (level->visible_nodes == 0)
+      if (g_sequence_get_length (level->visible_seq) == 1)
         {
           emit_child_toggled = TRUE;
           parent_level = level->parent_level;
-          parent_elt_index = level->parent_elt_index;
+          parent_elt = level->parent_elt;
         }
 
       emit_row_deleted = TRUE;
     }
 
-  /* The filter model's reference on the child node is released
-   * below.
+  /* Release the references on this node, without propagation because
+   * the node does not exist anymore in the child model.  The filter
+   * model's references on the node in case of level->parent or use
+   * of a virtual root are automatically destroyed by the child model.
    */
-  while (elt->ref_count > 1)
-    gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (data), &iter, FALSE);
-
-  if (level->array->len == 1)
+  while (elt->ext_ref_count > 0)
+    gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (data), &iter,
+                                           TRUE, FALSE);
+  while (elt->ref_count > 0)
+    gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (data), &iter,
+                                           FALSE, FALSE);
+
+  if (g_sequence_get_length (level->seq) == 1)
     {
       /* kill level */
-      gtk_tree_model_filter_free_level (filter, level);
+      gtk_tree_model_filter_free_level (filter, level, FALSE);
     }
   else
     {
-      FilterElt *tmp;
+      GSequenceIter *tmp;
+      gboolean is_first;
 
-      /* release the filter model's reference on the node */
-      if (level->parent_level || filter->priv->virtual_root)
-        gtk_tree_model_filter_unref_node (GTK_TREE_MODEL (filter), &iter);
-      else if (elt->ref_count > 0)
-        gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (data), &iter,
-                                               FALSE);
+      lookup_elt_with_offset (level->seq, elt->offset, &siter);
+      is_first = g_sequence_get_begin_iter (level->seq) == siter;
 
       /* remove the row */
-      tmp = bsearch_elt_with_offset (level->array, elt->offset, &i);
+      g_sequence_remove (elt->visible_siter);
+      tmp = g_sequence_iter_next (siter);
+      g_sequence_remove (siter);
+      g_sequence_foreach_range (tmp, g_sequence_get_end_iter (level->seq),
+                                decrease_offset_iter, GINT_TO_POINTER (offset));
+
+      /* Take a reference on the new first node.  The first node previously
+       * keeping this reference has been removed above.
+       */
+      if (is_first)
+        {
+          GtkTreeIter f_iter;
 
-      offset = tmp->offset;
-      g_array_remove_index (level->array, i);
+          f_iter.stamp = filter->priv->stamp;
+          f_iter.user_data = level;
+          f_iter.user_data2 = g_sequence_get (g_sequence_get_begin_iter (level->seq));
 
-      i--;
-      for (i = MAX (i, 0); i < level->array->len; i++)
-        {
-          elt = &g_array_index (level->array, FilterElt, i);
-          if (elt->offset > offset)
-            elt->offset--;
-          if (elt->children)
-            elt->children->parent_elt_index = i;
+          gtk_tree_model_filter_real_ref_node (GTK_TREE_MODEL (filter),
+                                               &f_iter, FALSE);
         }
     }
 
@@ -2000,8 +2484,9 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model,
     {
       /* emit row_deleted */
       gtk_tree_model_filter_increment_stamp (filter);
-      gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path);
-      iter.stamp = filter->priv->stamp;
+
+      if (!parent_elt || orig_level_ext_ref_count > 0)
+        gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path);
     }
 
   if (emit_child_toggled && parent_level)
@@ -2011,7 +2496,7 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model,
 
       iter2.stamp = filter->priv->stamp;
       iter2.user_data = parent_level;
-      iter2.user_data2 = &g_array_index (parent_level->array, FilterElt, parent_elt_index);
+      iter2.user_data2 = parent_elt;
 
       /* We set in_row_deleted to TRUE to avoid a level build triggered
        * by row-has-child-toggled (parent model could call iter_has_child
@@ -2025,6 +2510,21 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model,
       filter->priv->in_row_deleted = FALSE;
     }
 
+  if (filter->priv->virtual_root)
+    {
+      GtkTreePath *real_path;
+
+      real_path = gtk_tree_model_filter_remove_root (c_path,
+                                                     filter->priv->root);
+      if (real_path)
+        {
+          gtk_tree_model_filter_check_ancestors (filter, real_path);
+          gtk_tree_path_free (real_path);
+        }
+    }
+  else
+    gtk_tree_model_filter_check_ancestors (filter, c_path);
+
   gtk_tree_path_free (path);
 }
 
@@ -2042,12 +2542,13 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
   GtkTreePath *path;
   GtkTreeIter iter;
 
+  GSequence *tmp_seq;
+  GSequenceIter *tmp_end_iter;
+  GSequenceIter *old_first_elt = NULL;
   gint *tmp_array;
-  gint i, j, elt_count;
+  gint i, elt_count;
   gint length;
 
-  GArray *new_array;
-
   g_return_if_fail (new_order != NULL);
 
   if (c_path == NULL || gtk_tree_path_get_depth (c_path) == 0)
@@ -2132,7 +2633,6 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
           gtk_tree_model_filter_get_iter_full (GTK_TREE_MODEL (data),
                                                &iter, path);
 
-          level = FILTER_LEVEL (iter.user_data);
           elt = FILTER_ELT (iter.user_data2);
 
           if (!elt->children)
@@ -2148,67 +2648,76 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
         }
     }
 
-  if (!level || level->array->len < 1)
+  if (!level || g_sequence_get_length (level->seq) < 1)
     {
       gtk_tree_path_free (path);
       return;
     }
 
-  /* NOTE: we do not bail out here if level->array->len < 2 like
+  /* NOTE: we do not bail out here if level->seq->len < 2 like
    * GtkTreeModelSort does. This because we do some special tricky
    * reordering.
    */
 
-  /* construct a new array */
-  new_array = g_array_sized_new (FALSE, FALSE, sizeof (FilterElt),
-                                 level->array->len);
-  tmp_array = g_new (gint, level->array->len);
+  tmp_seq = g_sequence_new (filter_elt_free);
+  tmp_end_iter = g_sequence_get_end_iter (tmp_seq);
+  tmp_array = g_new (gint, g_sequence_get_length (level->visible_seq));
+  elt_count = 0;
 
-  for (i = 0, elt_count = 0; i < length; i++)
+  for (i = 0; i < length; i++)
     {
-      FilterElt *e = NULL;
-      gint old_offset = -1;
-
-      for (j = 0; j < level->array->len; j++)
-        if (g_array_index (level->array, FilterElt, j).offset == new_order[i])
-          {
-            e = &g_array_index (level->array, FilterElt, j);
-            old_offset = j;
-            break;
-          }
+      FilterElt *elt;
+      GSequenceIter *siter;
 
-      if (!e)
+      elt = lookup_elt_with_offset (level->seq, new_order[i], &siter);
+      if (elt == NULL)
         continue;
 
-      tmp_array[elt_count] = old_offset;
-      g_array_append_val (new_array, *e);
-      g_array_index (new_array, FilterElt, elt_count).offset = i;
-      elt_count++;
-    }
+      /* Keep a reference if this elt has old_pos == 0 */
+      if (new_order[i] == 0)
+        old_first_elt = siter;
 
-  g_array_free (level->array, TRUE);
-  level->array = new_array;
+      /* Only for visible items an entry should be present in the order array
+       * to be emitted.
+       */
+      if (elt->visible_siter)
+        tmp_array[elt_count++] = g_sequence_iter_get_position (elt->visible_siter);
 
-  /* fix up stuff */
-  for (i = 0; i < level->array->len; i++)
-    {
-      FilterElt *e = &g_array_index (level->array, FilterElt, i);
-      if (e->children)
-        e->children->parent_elt_index = i;
+      /* Steal elt from level->seq and append it to tmp_seq */
+      g_sequence_move (siter, tmp_end_iter);
+      elt->offset = i;
     }
 
+  g_warn_if_fail (g_sequence_get_length (level->seq) == 0);
+  g_sequence_free (level->seq);
+  level->seq = tmp_seq;
+  g_sequence_sort (level->visible_seq, filter_elt_cmp, NULL);
+
+  /* Transfer the reference from the old item at position 0 to the
+   * new item at position 0.
+   */
+  if (old_first_elt && g_sequence_iter_get_position (old_first_elt))
+    gtk_tree_model_filter_level_transfer_first_ref (filter,
+                                                    level,
+                                                    old_first_elt,
+                                                    g_sequence_get_iter_at_pos (level->seq, 0));
+
+
   /* emit rows_reordered */
-  if (!gtk_tree_path_get_indices (path))
-    gtk_tree_model_rows_reordered (GTK_TREE_MODEL (data), path, NULL,
-                                   tmp_array);
-  else
+  if (g_sequence_get_length (level->visible_seq) > 0)
     {
-      /* get a path taking only visible nodes into account */
-      gtk_tree_path_free (path);
-      path = gtk_tree_model_get_path (GTK_TREE_MODEL (data), &iter);
+      if (!gtk_tree_path_get_indices (path))
+        gtk_tree_model_rows_reordered (GTK_TREE_MODEL (data), path, NULL,
+                                       tmp_array);
+      else
+        {
+          /* get a path taking only visible nodes into account */
+          gtk_tree_path_free (path);
+          path = gtk_tree_model_get_path (GTK_TREE_MODEL (data), &iter);
 
-      gtk_tree_model_rows_reordered (GTK_TREE_MODEL (data), path, &iter,
-                                     tmp_array);
+          gtk_tree_model_rows_reordered (GTK_TREE_MODEL (data), path, &iter,
+                                         tmp_array);
+        }
     }
 
   /* done */
@@ -2289,13 +2798,15 @@ gtk_tree_model_filter_get_iter_full (GtkTreeModel *model,
   FilterLevel *level;
   FilterElt *elt;
   gint depth, i;
+  GSequenceIter *siter;
+
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (model), FALSE);
   g_return_val_if_fail (filter->priv->child_model != NULL, FALSE);
 
   indices = gtk_tree_path_get_indices (path);
 
   if (filter->priv->root == NULL)
-    gtk_tree_model_filter_build_level (filter, NULL, -1, FALSE);
+    gtk_tree_model_filter_build_level (filter, NULL, NULL, FALSE);
   level = FILTER_LEVEL (filter->priv->root);
 
   depth = gtk_tree_path_get_depth (path);
@@ -2307,21 +2818,27 @@ gtk_tree_model_filter_get_iter_full (GtkTreeModel *model,
 
   for (i = 0; i < depth - 1; i++)
     {
-      if (!level || indices[i] >= level->array->len)
+      if (!level || indices[i] >= g_sequence_get_length (level->seq))
         {
+          iter->stamp = 0;
           return FALSE;
         }
 
-      elt = gtk_tree_model_filter_get_nth (filter, level, indices[i]);
+      siter = g_sequence_get_iter_at_pos (level->seq, indices[i]);
+      if (g_sequence_iter_is_end (siter))
+        {
+          iter->stamp = 0;
+          return FALSE;
+        }
+
+      elt = GET_ELT (siter);
 
       if (!elt->children)
-        gtk_tree_model_filter_build_level (filter, level,
-                                           FILTER_LEVEL_ELT_INDEX (level, elt),
-                                           FALSE);
+        gtk_tree_model_filter_build_level (filter, level, elt, FALSE);
       level = elt->children;
     }
 
-  if (!level || indices[i] >= level->array->len)
+  if (!level || indices[i] >= g_sequence_get_length (level->seq))
     {
       iter->stamp = 0;
       return FALSE;
@@ -2330,8 +2847,13 @@ gtk_tree_model_filter_get_iter_full (GtkTreeModel *model,
   iter->stamp = filter->priv->stamp;
   iter->user_data = level;
 
-  elt = gtk_tree_model_filter_get_nth (filter, level, indices[depth - 1]);
-  iter->user_data2 = elt;
+  siter = g_sequence_get_iter_at_pos (level->seq, indices[depth - 1]);
+  if (g_sequence_iter_is_end (siter))
+    {
+      iter->stamp = 0;
+      return FALSE;
+    }
+  iter->user_data2 = GET_ELT (siter);
 
   return TRUE;
 }
@@ -2345,14 +2867,16 @@ gtk_tree_model_filter_get_iter (GtkTreeModel *model,
   gint *indices;
   FilterLevel *level;
   FilterElt *elt;
+  GSequenceIter *siter;
   gint depth, i;
+
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (model), FALSE);
   g_return_val_if_fail (filter->priv->child_model != NULL, FALSE);
 
   indices = gtk_tree_path_get_indices (path);
 
   if (filter->priv->root == NULL)
-    gtk_tree_model_filter_build_level (filter, NULL, -1, FALSE);
+    gtk_tree_model_filter_build_level (filter, NULL, NULL, FALSE);
   level = FILTER_LEVEL (filter->priv->root);
 
   depth = gtk_tree_path_get_depth (path);
@@ -2364,21 +2888,26 @@ gtk_tree_model_filter_get_iter (GtkTreeModel *model,
 
   for (i = 0; i < depth - 1; i++)
     {
-      if (!level || indices[i] >= level->visible_nodes)
+      if (!level || indices[i] >= g_sequence_get_length (level->visible_seq))
         {
+          iter->stamp = 0;
           return FALSE;
         }
 
-      elt = gtk_tree_model_filter_get_nth_visible (filter, level, indices[i]);
+      siter = g_sequence_get_iter_at_pos (level->visible_seq, indices[i]);
+      if (g_sequence_iter_is_end (siter))
+        {
+          iter->stamp = 0;
+          return FALSE;
+        }
 
+      elt = GET_ELT (siter);
       if (!elt->children)
-        gtk_tree_model_filter_build_level (filter, level,
-                                           FILTER_LEVEL_ELT_INDEX (level, elt),
-                                           FALSE);
+        gtk_tree_model_filter_build_level (filter, level, elt, FALSE);
       level = elt->children;
     }
 
-  if (!level || indices[i] >= level->visible_nodes)
+  if (!level || indices[i] >= g_sequence_get_length (level->visible_seq))
     {
       iter->stamp = 0;
       return FALSE;
@@ -2387,9 +2916,13 @@ gtk_tree_model_filter_get_iter (GtkTreeModel *model,
   iter->stamp = filter->priv->stamp;
   iter->user_data = level;
 
-  elt = gtk_tree_model_filter_get_nth_visible (filter, level,
-                                               indices[depth - 1]);
-  iter->user_data2 = elt;
+  siter = g_sequence_get_iter_at_pos (level->visible_seq, indices[depth - 1]);
+  if (g_sequence_iter_is_end (siter))
+    {
+      iter->stamp = 0;
+      return FALSE;
+    }
+  iter->user_data2 = GET_ELT (siter);
 
   return TRUE;
 }
@@ -2401,7 +2934,6 @@ gtk_tree_model_filter_get_path (GtkTreeModel *model,
   GtkTreePath *retval;
   FilterLevel *level;
   FilterElt *elt;
-  gint elt_index;
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (model), NULL);
   g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->child_model != NULL, NULL);
@@ -2409,28 +2941,20 @@ gtk_tree_model_filter_get_path (GtkTreeModel *model,
 
   level = iter->user_data;
   elt = iter->user_data2;
-  elt_index = FILTER_LEVEL_ELT_INDEX (level, elt);
 
-  if (!elt->visible)
+  if (!elt->visible_siter)
     return NULL;
 
   retval = gtk_tree_path_new ();
 
   while (level)
     {
-      int i = 0, index = 0;
-
-      while (i < elt_index)
-        {
-          if (g_array_index (level->array, FilterElt, i).visible)
-            index++;
-          i++;
-
-          g_assert (i < level->array->len);
-        }
+      gint index;
 
+      index = g_sequence_iter_get_position (elt->visible_siter);
       gtk_tree_path_prepend_index (retval, index);
-      elt_index = level->parent_elt_index;
+
+      elt = level->parent_elt;
       level = level->parent_level;
     }
 
@@ -2459,10 +2983,9 @@ gtk_tree_model_filter_real_modify (GtkTreeModelFilter *self,
     {
       GtkTreeIter child_iter;
 
-      gtk_tree_model_filter_convert_iter_to_child_iter (
-          GTK_TREE_MODEL_FILTER (self), &child_iter, iter);
-      gtk_tree_model_get_value (child_model,
-          &child_iter, column, value);
+      gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (self),
+                                                        &child_iter, iter);
+      gtk_tree_model_get_value (child_model, &child_iter, column, value);
     }
 }
 
@@ -2486,9 +3009,9 @@ static gboolean
 gtk_tree_model_filter_iter_next (GtkTreeModel *model,
                                  GtkTreeIter  *iter)
 {
-  int i;
   FilterLevel *level;
   FilterElt *elt;
+  GSequenceIter *siter;
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (model), FALSE);
   g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->child_model != NULL, FALSE);
@@ -2497,59 +3020,41 @@ gtk_tree_model_filter_iter_next (GtkTreeModel *model,
   level = iter->user_data;
   elt = iter->user_data2;
 
-  i = elt - FILTER_ELT (level->array->data);
-
-  while (i < level->array->len - 1)
+  siter = g_sequence_iter_next (elt->visible_siter);
+  if (g_sequence_iter_is_end (siter))
     {
-      i++;
-      elt++;
-
-      if (elt->visible)
-        {
-          iter->user_data2 = elt;
-          return TRUE;
-        }
+      iter->stamp = 0;
+      return FALSE;
     }
 
-  /* no next visible iter */
-  iter->stamp = 0;
+  iter->user_data2 = GET_ELT (siter);
 
-  return FALSE;
+  return TRUE;
 }
 
 static gboolean
 gtk_tree_model_filter_iter_previous (GtkTreeModel *model,
                                      GtkTreeIter  *iter)
 {
-  int i;
-  FilterLevel *level;
   FilterElt *elt;
+  GSequenceIter *siter;
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (model), FALSE);
   g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->child_model != NULL, FALSE);
   g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->stamp == iter->stamp, FALSE);
 
-  level = iter->user_data;
   elt = iter->user_data2;
 
-  i = elt - FILTER_ELT (level->array->data);
-
-  while (i > 0)
+  siter = g_sequence_iter_prev (elt->visible_siter);
+  if (g_sequence_iter_is_begin (siter))
     {
-      i--;
-      elt--;
-
-      if (elt->visible)
-        {
-          iter->user_data2 = elt;
-          return TRUE;
-        }
+      iter->stamp = 0;
+      return FALSE;
     }
 
-  /* no previous visible iter */
-  iter->stamp = 0;
+  iter->user_data2 = GET_ELT (siter);
 
-  return FALSE;
+  return TRUE;
 }
 
 static gboolean
@@ -2559,6 +3064,7 @@ gtk_tree_model_filter_iter_children (GtkTreeModel *model,
 {
   GtkTreeModelFilter *filter = (GtkTreeModelFilter *)model;
   FilterLevel *level;
+  GSequenceIter *siter;
 
   iter->stamp = 0;
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (model), FALSE);
@@ -2568,74 +3074,48 @@ gtk_tree_model_filter_iter_children (GtkTreeModel *model,
 
   if (!parent)
     {
-      int i = 0;
-
       if (!filter->priv->root)
-        gtk_tree_model_filter_build_level (filter, NULL, -1, FALSE);
+        gtk_tree_model_filter_build_level (filter, NULL, NULL, FALSE);
       if (!filter->priv->root)
         return FALSE;
 
       level = filter->priv->root;
-
-      if (!level->visible_nodes)
-        return FALSE;
+      siter = g_sequence_get_begin_iter (level->visible_seq);
+      if (g_sequence_iter_is_end (siter))
+        {
+          iter->stamp = 0;
+          return FALSE;
+        }
 
       iter->stamp = filter->priv->stamp;
       iter->user_data = level;
+      iter->user_data2 = GET_ELT (siter);
 
-      while (i < level->array->len)
-        {
-          if (!g_array_index (level->array, FilterElt, i).visible)
-            {
-              i++;
-              continue;
-            }
-
-          iter->user_data2 = &g_array_index (level->array, FilterElt, i);
-          return TRUE;
-        }
-
-      iter->stamp = 0;
-      return FALSE;
+      return TRUE;
     }
   else
     {
-      int i = 0;
-      FilterElt *elt;
-
-      elt = FILTER_ELT (parent->user_data2);
-
-      if (elt->children == NULL)
+      if (FILTER_ELT (parent->user_data2)->children == NULL)
         gtk_tree_model_filter_build_level (filter,
                                            FILTER_LEVEL (parent->user_data),
-                                           FILTER_LEVEL_ELT_INDEX (parent->user_data, elt),
+                                           FILTER_ELT (parent->user_data2),
                                            FALSE);
-
-      if (elt->children == NULL)
+      if (FILTER_ELT (parent->user_data2)->children == NULL)
         return FALSE;
 
-      if (elt->children->visible_nodes <= 0)
-        return FALSE;
-
-      iter->stamp = filter->priv->stamp;
-      iter->user_data = elt->children;
-
-      level = FILTER_LEVEL (iter->user_data);
-
-      while (i < level->array->len)
+      level = FILTER_ELT (parent->user_data2)->children;
+      siter = g_sequence_get_begin_iter (level->visible_seq);
+      if (g_sequence_iter_is_end (siter))
         {
-          if (!g_array_index (level->array, FilterElt, i).visible)
-            {
-              i++;
-              continue;
-            }
-
-          iter->user_data2 = &g_array_index (level->array, FilterElt, i);
-          return TRUE;
+          iter->stamp = 0;
+          return FALSE;
         }
 
-      iter->stamp = 0;
-      return FALSE;
+      iter->stamp = filter->priv->stamp;
+      iter->user_data = level;
+      iter->user_data2 = GET_ELT (siter);
+
+      return TRUE;
     }
 
   iter->stamp = 0;
@@ -2659,7 +3139,7 @@ gtk_tree_model_filter_iter_has_child (GtkTreeModel *model,
   gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model), &child_iter, iter);
   elt = FILTER_ELT (iter->user_data2);
 
-  if (!elt->visible)
+  if (!elt->visible_siter)
     return FALSE;
 
   /* we need to build the level to check if not all children are filtered
@@ -2668,10 +3148,9 @@ gtk_tree_model_filter_iter_has_child (GtkTreeModel *model,
   if (!elt->children
       && gtk_tree_model_iter_has_child (filter->priv->child_model, &child_iter))
     gtk_tree_model_filter_build_level (filter, FILTER_LEVEL (iter->user_data),
-                                       FILTER_LEVEL_ELT_INDEX (iter->user_data, elt),
-                                       FALSE);
+                                       elt, FALSE);
 
-  if (elt->children && elt->children->visible_nodes > 0)
+  if (elt->children && g_sequence_get_length (elt->children->visible_seq) > 0)
     return TRUE;
 
   return FALSE;
@@ -2693,17 +3172,17 @@ gtk_tree_model_filter_iter_n_children (GtkTreeModel *model,
   if (!iter)
     {
       if (!filter->priv->root)
-        gtk_tree_model_filter_build_level (filter, NULL, -1, FALSE);
+        gtk_tree_model_filter_build_level (filter, NULL, NULL, FALSE);
 
       if (filter->priv->root)
-        return FILTER_LEVEL (filter->priv->root)->visible_nodes;
+        return g_sequence_get_length (FILTER_LEVEL (filter->priv->root)->visible_seq);
 
       return 0;
     }
 
   elt = FILTER_ELT (iter->user_data2);
 
-  if (!elt->visible)
+  if (!elt->visible_siter)
     return 0;
 
   gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model), &child_iter, iter);
@@ -2712,11 +3191,10 @@ gtk_tree_model_filter_iter_n_children (GtkTreeModel *model,
       gtk_tree_model_iter_has_child (filter->priv->child_model, &child_iter))
     gtk_tree_model_filter_build_level (filter,
                                        FILTER_LEVEL (iter->user_data),
-                                       FILTER_LEVEL_ELT_INDEX (iter->user_data, elt),
-                                       FALSE);
+                                       elt, FALSE);
 
   if (elt->children)
-    return elt->children->visible_nodes;
+    return g_sequence_get_length (elt->children->visible_seq);
 
   return 0;
 }
@@ -2727,9 +3205,9 @@ gtk_tree_model_filter_iter_nth_child (GtkTreeModel *model,
                                       GtkTreeIter  *parent,
                                       gint          n)
 {
-  FilterElt *elt;
   FilterLevel *level;
   GtkTreeIter children;
+  GSequenceIter *siter;
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (model), FALSE);
   if (parent)
@@ -2743,20 +3221,13 @@ gtk_tree_model_filter_iter_nth_child (GtkTreeModel *model,
     }
 
   level = children.user_data;
-  elt = FILTER_ELT (level->array->data);
-
-  if (n >= level->visible_nodes)
-    {
-      iter->stamp = 0;
-      return FALSE;
-    }
-
-  elt = gtk_tree_model_filter_get_nth_visible (GTK_TREE_MODEL_FILTER (model),
-                                               level, n);
+  siter = g_sequence_get_iter_at_pos (level->visible_seq, n);
+  if (g_sequence_iter_is_end (siter))
+    return FALSE;
 
   iter->stamp = GTK_TREE_MODEL_FILTER (model)->priv->stamp;
   iter->user_data = level;
-  iter->user_data2 = elt;
+  iter->user_data2 = GET_ELT (siter);
 
   return TRUE;
 }
@@ -2779,7 +3250,7 @@ gtk_tree_model_filter_iter_parent (GtkTreeModel *model,
     {
       iter->stamp = GTK_TREE_MODEL_FILTER (model)->priv->stamp;
       iter->user_data = level->parent_level;
-      iter->user_data2 = FILTER_LEVEL_PARENT_ELT (level);
+      iter->user_data2 = level->parent_elt;
 
       return TRUE;
     }
@@ -2791,6 +3262,14 @@ static void
 gtk_tree_model_filter_ref_node (GtkTreeModel *model,
                                 GtkTreeIter  *iter)
 {
+  gtk_tree_model_filter_real_ref_node (model, iter, TRUE);
+}
+
+static void
+gtk_tree_model_filter_real_ref_node (GtkTreeModel *model,
+                                     GtkTreeIter  *iter,
+                                     gboolean      external)
+{
   GtkTreeModelFilter *filter = (GtkTreeModelFilter *)model;
   GtkTreeIter child_iter;
   FilterLevel *level;
@@ -2809,22 +3288,29 @@ gtk_tree_model_filter_ref_node (GtkTreeModel *model,
 
   elt->ref_count++;
   level->ref_count++;
-  if (level->ref_count == 1)
+
+  if (external)
     {
-      FilterLevel *parent_level = level->parent_level;
-      gint parent_elt_index = level->parent_elt_index;
+      elt->ext_ref_count++;
+      level->ext_ref_count++;
 
-      /* we were at zero -- time to decrease the zero_ref_count val */
-      while (parent_level)
+      if (level->ext_ref_count == 1)
         {
-          g_array_index (parent_level->array, FilterElt, parent_elt_index).zero_ref_count--;
+          FilterLevel *parent_level = level->parent_level;
+          FilterElt *parent_elt = level->parent_elt;
 
-          parent_elt_index = parent_level->parent_elt_index;
-	  parent_level = parent_level->parent_level;
-        }
+          /* we were at zero -- time to decrease the zero_ref_count val */
+          while (parent_level)
+            {
+              parent_elt->zero_ref_count--;
+
+              parent_elt = parent_level->parent_elt;
+              parent_level = parent_level->parent_level;
+            }
 
-      if (filter->priv->root != level)
-	filter->priv->zero_ref_count--;
+          if (filter->priv->root != level)
+            filter->priv->zero_ref_count--;
+        }
     }
 }
 
@@ -2832,12 +3318,13 @@ static void
 gtk_tree_model_filter_unref_node (GtkTreeModel *model,
                                   GtkTreeIter  *iter)
 {
-  gtk_tree_model_filter_real_unref_node (model, iter, TRUE);
+  gtk_tree_model_filter_real_unref_node (model, iter, TRUE, TRUE);
 }
 
 static void
 gtk_tree_model_filter_real_unref_node (GtkTreeModel *model,
                                        GtkTreeIter  *iter,
+                                       gboolean      external,
                                        gboolean      propagate_unref)
 {
   GtkTreeModelFilter *filter = (GtkTreeModelFilter *)model;
@@ -2862,22 +3349,29 @@ gtk_tree_model_filter_real_unref_node (GtkTreeModel *model,
 
   elt->ref_count--;
   level->ref_count--;
-  if (level->ref_count == 0)
+
+  if (external)
     {
-      FilterLevel *parent_level = level->parent_level;
-      gint parent_elt_index = level->parent_elt_index;
+      elt->ext_ref_count--;
+      level->ext_ref_count--;
 
-      /* we are at zero -- time to increase the zero_ref_count val */
-      while (parent_level)
+      if (level->ext_ref_count == 0)
         {
-          g_array_index (parent_level->array, FilterElt, parent_elt_index).zero_ref_count++;
+          FilterLevel *parent_level = level->parent_level;
+          FilterElt *parent_elt = level->parent_elt;
 
-          parent_elt_index = parent_level->parent_elt_index;
-          parent_level = parent_level->parent_level;
-        }
+          /* we are at zero -- time to increase the zero_ref_count val */
+          while (parent_level)
+            {
+              parent_elt->zero_ref_count++;
+
+              parent_elt = parent_level->parent_elt;
+              parent_level = parent_level->parent_level;
+            }
 
-      if (filter->priv->root != level)
-	filter->priv->zero_ref_count++;
+          if (filter->priv->root != level)
+            filter->priv->zero_ref_count++;
+        }
     }
 }
 
@@ -2959,7 +3453,7 @@ gtk_tree_model_filter_set_model (GtkTreeModelFilter *filter,
 
       /* reset our state */
       if (filter->priv->root)
-        gtk_tree_model_filter_free_level (filter, filter->priv->root);
+        gtk_tree_model_filter_free_level (filter, filter->priv->root, TRUE);
 
       filter->priv->root = NULL;
       g_object_unref (filter->priv->child_model);
@@ -3022,12 +3516,17 @@ gtk_tree_model_filter_ref_path (GtkTreeModelFilter *filter,
 
 static void
 gtk_tree_model_filter_unref_path (GtkTreeModelFilter *filter,
-                                  GtkTreePath        *path)
+                                  GtkTreePath        *path,
+                                  int                 depth)
 {
   int len;
   GtkTreePath *p;
 
-  len = gtk_tree_path_get_depth (path);
+  if (depth != -1)
+    len = depth;
+  else
+    len = gtk_tree_path_get_depth (path);
+
   p = gtk_tree_path_copy (path);
   while (len--)
     {
@@ -3319,12 +3818,16 @@ gtk_tree_model_filter_convert_iter_to_child_iter (GtkTreeModelFilter *filter,
   else
     {
       GtkTreePath *path;
+      gboolean valid = FALSE;
 
       path = gtk_tree_model_filter_elt_get_path (filter_iter->user_data,
                                                  filter_iter->user_data2,
                                                  filter->priv->virtual_root);
-      gtk_tree_model_get_iter (filter->priv->child_model, child_iter, path);
+      valid = gtk_tree_model_get_iter (filter->priv->child_model, child_iter,
+                                       path);
       gtk_tree_path_free (path);
+
+      g_return_if_fail (valid == TRUE);
     }
 }
 
@@ -3359,12 +3862,12 @@ gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filte
   child_indices = gtk_tree_path_get_indices (real_path);
 
   if (filter->priv->root == NULL && build_levels)
-    gtk_tree_model_filter_build_level (filter, NULL, -1, FALSE);
+    gtk_tree_model_filter_build_level (filter, NULL, NULL, FALSE);
   level = FILTER_LEVEL (filter->priv->root);
 
   for (i = 0; i < gtk_tree_path_get_depth (real_path); i++)
     {
-      gint j;
+      GSequenceIter *siter;
       gboolean found_child = FALSE;
 
       if (!level)
@@ -3374,20 +3877,20 @@ gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filte
           return NULL;
         }
 
-      tmp = bsearch_elt_with_offset (level->array, child_indices[i], &j);
+      tmp = lookup_elt_with_offset (level->seq, child_indices[i], &siter);
       if (tmp)
         {
-          gtk_tree_path_append_index (retval, j);
+          gtk_tree_path_append_index (retval, g_sequence_iter_get_position (siter));
           if (!tmp->children && build_levels)
-            gtk_tree_model_filter_build_level (filter, level,
-                                               FILTER_LEVEL_ELT_INDEX (level, tmp),
-                                               FALSE);
+            gtk_tree_model_filter_build_level (filter, level, tmp, FALSE);
           level = tmp->children;
           found_child = TRUE;
         }
 
       if (!found_child && fetch_children)
         {
+          int j;
+
           tmp = gtk_tree_model_filter_fetch_child (filter, level,
                                                    child_indices[i],
                                                    &j);
@@ -3403,9 +3906,7 @@ gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filte
 
           gtk_tree_path_append_index (retval, j);
           if (!tmp->children && build_levels)
-            gtk_tree_model_filter_build_level (filter, level,
-                                               FILTER_LEVEL_ELT_INDEX (level, tmp),
-                                               FALSE);
+            gtk_tree_model_filter_build_level (filter, level, tmp, FALSE);
           level = tmp->children;
           found_child = TRUE;
         }
@@ -3497,33 +3998,31 @@ gtk_tree_model_filter_convert_path_to_child_path (GtkTreeModelFilter *filter,
   retval = gtk_tree_path_new ();
   filter_indices = gtk_tree_path_get_indices (filter_path);
   if (!filter->priv->root)
-    gtk_tree_model_filter_build_level (filter, NULL, -1, FALSE);
+    gtk_tree_model_filter_build_level (filter, NULL, NULL, FALSE);
   level = FILTER_LEVEL (filter->priv->root);
 
   for (i = 0; i < gtk_tree_path_get_depth (filter_path); i++)
     {
       FilterElt *elt;
+      GSequenceIter *siter;
 
-      if (!level || level->visible_nodes <= filter_indices[i])
+      if (!level)
         {
           gtk_tree_path_free (retval);
           return NULL;
         }
 
-      elt = gtk_tree_model_filter_get_nth_visible (filter, level,
-                                                   filter_indices[i]);
-
-      if (elt->children == NULL)
-        gtk_tree_model_filter_build_level (filter, level,
-                                           FILTER_LEVEL_ELT_INDEX (level, elt),
-                                           FALSE);
-
-      if (!level || level->visible_nodes <= filter_indices[i])
+      siter = g_sequence_get_iter_at_pos (level->visible_seq, filter_indices[i]);
+      if (g_sequence_iter_is_end (siter))
         {
           gtk_tree_path_free (retval);
           return NULL;
         }
 
+      elt = GET_ELT (siter);
+      if (elt->children == NULL)
+        gtk_tree_model_filter_build_level (filter, level, elt, FALSE);
+
       gtk_tree_path_append_index (retval, elt->offset);
       level = elt->children;
     }
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 9daa32fb48..0050b577f2 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -18,25 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/* NOTE: There is a potential for confusion in this code as to whether an iter,
- * path or value refers to the GtkTreeModelSort model, or the child model being
- * sorted.  As a convention, variables referencing the child model will have an
- * s_ prefix before them (ie. s_iter, s_value, s_path);
- */
-
-/* ITER FORMAT:
- *
- * iter->stamp = tree_model_sort->stamp
- * iter->user_data = SortLevel
- * iter->user_data2 = SortElt
- */
-
-/* WARNING: this code is dangerous, can cause sleepless nights,
- * can cause your dog to die among other bad things
- *
- * we warned you and we're not liable for any head injuries.
- */
-
 #include "config.h"
 #include <string.h>
 
@@ -156,42 +137,120 @@
  */
 
 
+/* Notes on this implementation of GtkTreeModelSort
+ * ================================================
+ *
+ * Warnings
+ * --------
+ *
+ * In this code there is a potential for confusion as to whether an iter,
+ * path or value refers to the GtkTreeModelSort model, or to the child model
+ * that has been set. As a convention, variables referencing the child model
+ * will have an s_ prefix before them (ie. s_iter, s_value, s_path);
+ * Conversion of iterators and paths between GtkTreeModelSort and the child
+ * model is done through the various gtk_tree_model_sort_convert_* functions.
+ *
+ * Iterator format
+ * ---------------
+ *
+ * The iterator format of iterators handed out by GtkTreeModelSort is as
+ * follows:
+ *
+ *    iter->stamp = tree_model_sort->stamp
+ *    iter->user_data = SortLevel
+ *    iter->user_data2 = SortElt
+ *
+ * Internal data structure
+ * -----------------------
+ *
+ * Using SortLevel and SortElt, GtkTreeModelSort maintains a "cache" of
+ * the mapping from GtkTreeModelSort nodes to nodes in the child model.
+ * This is to avoid sorting a level each time an operation is requested
+ * on GtkTreeModelSort, such as get iter, get path, get value.
+ *
+ * A SortElt corresponds to a single node. A node and its siblings are
+ * stored in a SortLevel. The SortLevel keeps a reference to the parent
+ * SortElt and its SortLevel (if any). The SortElt can have a "children"
+ * pointer set, which points at a child level (a sub level).
+ *
+ * In a SortLevel, nodes are stored in a GSequence. The GSequence
+ * allows for fast additions and removals, and supports sorting
+ * the level of SortElt nodes.
+ *
+ * It is important to recognize the two different mappings that play
+ * a part in this code:
+ *   I.  The mapping from the client to this model. The order in which
+ *       nodes are stored in the GSequence is the order in which the
+ *       nodes are exposed to clients of the GtkTreeModelSort.
+ *   II. The mapping from this model to its child model. Each SortElt
+ *       contains an "offset" field which is the offset of the
+ *       corresponding node in the child model.
+ *
+ * Reference counting
+ * ------------------
+ *
+ * GtkTreeModelSort forwards all reference and unreference operations
+ * to the corresponding node in the child model. The reference count
+ * of each node is also maintained internally, in the "ref_count"
+ * fields in SortElt and SortLevel. For each ref and unref operation on
+ * a SortElt, the "ref_count" of the SortLevel is updated accordingly.
+ * In addition, if a SortLevel has a parent, a reference is taken on
+ * this parent. This happens in gtk_tree_model_sort_build_level() and
+ * the reference is released again in gtk_tree_model_sort_free_level().
+ * This ensures that when GtkTreeModelSort takes a reference on a node
+ * (for example during sorting), all parent nodes are referenced
+ * according to reference counting rule 1, see the GtkTreeModel
+ * documentation.
+ *
+ * When a level has a reference count of zero, which means that
+ * none of the nodes in the level is referenced, the level has
+ * a "zero ref count" on all its parents. As soon as the level
+ * reaches a reference count of zero, the zero ref count value is
+ * incremented by one on all parents of this level. Similarly, as
+ * soon as the reference count of a level changes from zero, the
+ * zero ref count value is decremented by one on all parents.
+ *
+ * The zero ref count value is used to clear unused portions of
+ * the cache. If a SortElt has a zero ref count of one, then
+ * its child level is unused and can be removed from the cache.
+ * If the zero ref count value is higher than one, then the
+ * child level contains sublevels which are unused as well.
+ * gtk_tree_model_sort_clear_cache() uses this to not recurse
+ * into levels which have a zero ref count of zero.
+ */
+
 typedef struct _SortElt SortElt;
 typedef struct _SortLevel SortLevel;
 typedef struct _SortData SortData;
-typedef struct _SortTuple SortTuple;
 
 struct _SortElt
 {
-  GtkTreeIter  iter;
-  SortLevel   *children;
-  gint         offset;
-  gint         ref_count;
-  gint         zero_ref_count;
+  GtkTreeIter    iter;
+  SortLevel     *children;
+  gint           offset;
+  gint           ref_count;
+  gint           zero_ref_count;
+  GSequenceIter *siter; /* iter into seq */
+  gint           old_index; /* used while sorting */
 };
 
 struct _SortLevel
 {
-  GArray    *array;
+  GSequence *seq;
   gint       ref_count;
-  gint       parent_elt_index;
+  SortElt   *parent_elt;
   SortLevel *parent_level;
 };
 
 struct _SortData
 {
   GtkTreeModelSort *tree_model_sort;
-  GtkTreePath *parent_path;
-  gint parent_path_depth;
-  gint *parent_path_indices;
   GtkTreeIterCompareFunc sort_func;
   gpointer sort_data;
-};
 
-struct _SortTuple
-{
-  SortElt   *elt;
-  gint       offset;
+  GtkTreePath *parent_path;
+  gint parent_path_depth;
+  gint *parent_path_indices;
 };
 
 /* Properties */
@@ -228,14 +287,21 @@ struct _GtkTreeModelSortPrivate
   gulong reordered_id;
 };
 
-
-#define GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS(tree_model_sort) \
+/* Set this to 0 to disable caching of child iterators.  This
+ * allows for more stringent testing.  It is recommended to set this
+ * to one when refactoring this code and running the unit tests to
+ * catch more errors.
+ */
+#if 1
+#  define GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS(tree_model_sort) \
 	(((GtkTreeModelSort *)tree_model_sort)->priv->child_flags&GTK_TREE_MODEL_ITERS_PERSIST)
+#else
+#  define GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS(tree_model_sort) (FALSE)
+#endif
+
 #define SORT_ELT(sort_elt) ((SortElt *)sort_elt)
 #define SORT_LEVEL(sort_level) ((SortLevel *)sort_level)
-
-#define SORT_LEVEL_PARENT_ELT(level) (&g_array_index (SORT_LEVEL ((level))->parent_level->array, SortElt, SORT_LEVEL ((level))->parent_elt_index))
-#define SORT_LEVEL_ELT_INDEX(level, elt) (SORT_ELT ((elt)) - SORT_ELT (SORT_LEVEL ((level))->array->data))
+#define GET_ELT(siter) ((SortElt *) (siter ? g_sequence_get (siter) : NULL))
 
 
 #define GET_CHILD_ITER(tree_model_sort,ch_iter,so_iter) gtk_tree_model_sort_convert_iter_to_child_iter((GtkTreeModelSort*)(tree_model_sort), (ch_iter), (so_iter));
@@ -350,19 +416,16 @@ static gboolean     gtk_tree_model_sort_has_default_sort_func (GtkTreeSortable
 /* Private functions (sort funcs, level handling and other utils) */
 static void         gtk_tree_model_sort_build_level       (GtkTreeModelSort *tree_model_sort,
 							   SortLevel        *parent_level,
-							   gint              parent_elt_index);
+                                                           SortElt          *parent_elt);
 static void         gtk_tree_model_sort_free_level        (GtkTreeModelSort *tree_model_sort,
-							   SortLevel        *sort_level);
+							   SortLevel        *sort_level,
+                                                           gboolean          unref);
 static void         gtk_tree_model_sort_increment_stamp   (GtkTreeModelSort *tree_model_sort);
 static void         gtk_tree_model_sort_sort_level        (GtkTreeModelSort *tree_model_sort,
 							   SortLevel        *level,
 							   gboolean          recurse,
 							   gboolean          emit_reordered);
 static void         gtk_tree_model_sort_sort              (GtkTreeModelSort *tree_model_sort);
-static gint         gtk_tree_model_sort_level_find_insert (GtkTreeModelSort *tree_model_sort,
-							   SortLevel        *level,
-							   GtkTreeIter      *iter,
-							   gint             skip_index);
 static gboolean     gtk_tree_model_sort_insert_value      (GtkTreeModelSort *tree_model_sort,
 							   SortLevel        *level,
 							   GtkTreePath      *s_path,
@@ -375,6 +438,15 @@ static GtkTreePath *gtk_real_tree_model_sort_convert_child_path_to_path (GtkTree
 									 GtkTreePath      *child_path,
 									 gboolean          build_levels);
 
+static gint         gtk_tree_model_sort_compare_func        (gconstpointer     a,
+                                                             gconstpointer     b,
+                                                             gpointer          user_data);
+static gint         gtk_tree_model_sort_offset_compare_func (gconstpointer     a,
+                                                             gconstpointer     b,
+                                                             gpointer          user_data);
+static void         gtk_tree_model_sort_clear_cache_helper  (GtkTreeModelSort *tree_model_sort,
+                                                             SortLevel        *level);
+
 
 G_DEFINE_TYPE_WITH_CODE (GtkTreeModelSort, gtk_tree_model_sort, G_TYPE_OBJECT,
 			 G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
@@ -494,7 +566,7 @@ gtk_tree_model_sort_finalize (GObject *object)
   gtk_tree_model_sort_set_model (tree_model_sort, NULL);
 
   if (priv->root)
-    gtk_tree_model_sort_free_level (tree_model_sort, priv->root);
+    gtk_tree_model_sort_free_level (tree_model_sort, priv->root, TRUE);
 
   if (priv->sort_list)
     {
@@ -552,6 +624,122 @@ gtk_tree_model_sort_get_property (GObject    *object,
     }
 }
 
+/* helpers */
+static SortElt *
+sort_elt_new (void)
+{
+  return g_slice_new (SortElt);
+}
+
+static void
+sort_elt_free (gpointer elt)
+{
+  g_slice_free (SortElt, elt);
+}
+
+static void
+increase_offset_iter (gpointer data,
+                      gpointer user_data)
+{
+  SortElt *elt = data;
+  gint offset = GPOINTER_TO_INT (user_data);
+
+  if (elt->offset >= offset)
+    elt->offset++;
+}
+
+static void
+decrease_offset_iter (gpointer data,
+                      gpointer user_data)
+{
+  SortElt *elt = data;
+  gint offset = GPOINTER_TO_INT (user_data);
+
+  if (elt->offset > offset)
+    elt->offset--;
+}
+
+static void
+fill_sort_data (SortData         *data,
+                GtkTreeModelSort *tree_model_sort,
+                SortLevel        *level)
+{
+  GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
+
+  data->tree_model_sort = tree_model_sort;
+
+  if (priv->sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
+    {
+      GtkTreeDataSortHeader *header;
+      
+      header = _gtk_tree_data_list_get_header (priv->sort_list,
+					       priv->sort_column_id);
+      
+      g_return_if_fail (header != NULL);
+      g_return_if_fail (header->func != NULL);
+      
+      data->sort_func = header->func;
+      data->sort_data = header->data;
+    }
+  else
+    {
+      /* absolutely SHOULD NOT happen: */
+      g_return_if_fail (priv->default_sort_func != NULL);
+
+      data->sort_func = priv->default_sort_func;
+      data->sort_data = priv->default_sort_data;
+    }
+
+  if (level->parent_elt)
+    {
+      data->parent_path = gtk_tree_model_sort_elt_get_path (level->parent_level,
+                                                            level->parent_elt);
+      gtk_tree_path_append_index (data->parent_path, 0);
+    }
+  else
+    {
+      data->parent_path = gtk_tree_path_new_first ();
+    }
+  data->parent_path_depth = gtk_tree_path_get_depth (data->parent_path);
+  data->parent_path_indices = gtk_tree_path_get_indices (data->parent_path);
+}
+
+static void
+free_sort_data (SortData *data)
+{
+  gtk_tree_path_free (data->parent_path);
+}
+
+static SortElt *
+lookup_elt_with_offset (GtkTreeModelSort *tree_model_sort,
+                        SortLevel        *level,
+                        gint              offset,
+                        GSequenceIter   **ret_siter)
+{
+  GSequenceIter *siter, *end_siter;
+
+  /* FIXME: We have to do a search like this, because the sequence is not
+   * (always) sorted on offset order.  Perhaps we should introduce a
+   * second sequence which is sorted on offset order.
+   */
+  end_siter = g_sequence_get_end_iter (level->seq);
+  for (siter = g_sequence_get_begin_iter (level->seq);
+       siter != end_siter;
+       siter = g_sequence_iter_next (siter))
+    {
+      SortElt *elt = g_sequence_get (siter);
+
+      if (elt->offset == offset)
+        break;
+    }
+
+  if (ret_siter)
+    *ret_siter = siter;
+
+  return GET_ELT (siter);
+}
+
+
 static void
 gtk_tree_model_sort_row_changed (GtkTreeModel *s_model,
 				 GtkTreePath  *start_s_path,
@@ -564,13 +752,13 @@ gtk_tree_model_sort_row_changed (GtkTreeModel *s_model,
   GtkTreeIter iter;
   GtkTreeIter tmpiter;
 
-  SortElt tmp;
   SortElt *elt;
   SortLevel *level;
+  SortData sort_data;
 
   gboolean free_s_path = FALSE;
 
-  gint index = 0, old_index, i;
+  gint index = 0, old_index;
 
   g_return_if_fail (start_s_path != NULL || start_s_iter != NULL);
 
@@ -596,7 +784,7 @@ gtk_tree_model_sort_row_changed (GtkTreeModel *s_model,
   level = iter.user_data;
   elt = iter.user_data2;
 
-  if (level->array->len < 2 ||
+  if (g_sequence_get_length (level->seq) < 2 ||
       (priv->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID &&
        priv->default_sort_func == NO_SORT_FUNC))
     {
@@ -610,47 +798,24 @@ gtk_tree_model_sort_row_changed (GtkTreeModel *s_model,
 
       return;
     }
-  
-  if (!GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
-    {
-      gtk_tree_model_get_iter (priv->child_model,
-			       &tmpiter, start_s_path);
-    }
-
-  old_index = elt - SORT_ELT (level->array->data);
-
-  memcpy (&tmp, elt, sizeof (SortElt));
 
   if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
-    index = gtk_tree_model_sort_level_find_insert (tree_model_sort,
-						   level,
-						   &tmp.iter,
-						   old_index);
+    tmpiter = elt->iter;
   else
-    index = gtk_tree_model_sort_level_find_insert (tree_model_sort,
-						   level,
-						   &tmpiter,
-						   old_index);
+    gtk_tree_model_get_iter (priv->child_model,
+                             &tmpiter, start_s_path);
 
-  if (index < old_index)
-    {
-      g_memmove (level->array->data + ((index + 1)*sizeof (SortElt)),
-		 level->array->data + ((index)*sizeof (SortElt)),
-		 (old_index - index)* sizeof(SortElt));
-    }
-  else if (index > old_index)
-    {
-      g_memmove (level->array->data + ((old_index)*sizeof (SortElt)),
-		 level->array->data + ((old_index + 1)*sizeof (SortElt)),
-		 (index - old_index)* sizeof(SortElt));
-    }
-  memcpy (level->array->data + ((index)*sizeof (SortElt)),
-	  &tmp, sizeof (SortElt));
+  old_index = g_sequence_iter_get_position (elt->siter);
+
+  fill_sort_data (&sort_data, tree_model_sort, level);
+  g_sequence_sort_changed (elt->siter,
+                           gtk_tree_model_sort_compare_func,
+                           &sort_data);
+  free_sort_data (&sort_data);
 
-  for (i = 0; i < level->array->len; i++)
-    if (g_array_index (level->array, SortElt, i).children)
-      g_array_index (level->array, SortElt, i).children->parent_elt_index = i;
+  index = g_sequence_iter_get_position (elt->siter);
 
+  /* Prepare the path for signal emission */
   gtk_tree_path_up (path);
   gtk_tree_path_append_index (path, index);
 
@@ -664,9 +829,9 @@ gtk_tree_model_sort_row_changed (GtkTreeModel *s_model,
 
       GtkTreePath *tmppath;
 
-      new_order = g_new (gint, level->array->len);
+      new_order = g_new (gint, g_sequence_get_length (level->seq));
 
-      for (j = 0; j < level->array->len; j++)
+      for (j = 0; j < g_sequence_get_length (level->seq); j++)
         {
 	  if (index > old_index)
 	    {
@@ -689,11 +854,11 @@ gtk_tree_model_sort_row_changed (GtkTreeModel *s_model,
 	  /* else? shouldn't really happen */
 	}
 
-      if (level->parent_elt_index >= 0)
+      if (level->parent_elt)
         {
 	  iter.stamp = priv->stamp;
 	  iter.user_data = level->parent_level;
-	  iter.user_data2 = SORT_LEVEL_PARENT_ELT (level);
+	  iter.user_data2 = level->parent_elt;
 
 	  tmppath = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_model_sort), &iter);
 
@@ -760,7 +925,7 @@ gtk_tree_model_sort_row_inserted (GtkTreeModel          *s_model,
 
   if (!priv->root)
     {
-      gtk_tree_model_sort_build_level (tree_model_sort, NULL, -1);
+      gtk_tree_model_sort_build_level (tree_model_sort, NULL, NULL);
 
       /* the build level already put the inserted iter in the level,
 	 so no need to handle this signal anymore */
@@ -771,15 +936,13 @@ gtk_tree_model_sort_row_inserted (GtkTreeModel          *s_model,
   /* find the parent level */
   while (i < gtk_tree_path_get_depth (s_path) - 1)
     {
-      gint j;
-
       if (!level)
 	{
 	  /* level not yet build, we won't cover this signal */
 	  goto done;
 	}
 
-      if (level->array->len < gtk_tree_path_get_indices (s_path)[i])
+      if (g_sequence_get_length (level->seq) < gtk_tree_path_get_indices (s_path)[i])
 	{
 	  g_warning ("%s: A node was inserted with a parent that's not in the tree.\n"
 		     "This possibly means that a GtkTreeModel inserted a child node\n"
@@ -788,13 +951,9 @@ gtk_tree_model_sort_row_inserted (GtkTreeModel          *s_model,
 	  goto done;
 	}
 
-      elt = NULL;
-      for (j = 0; j < level->array->len; j++)
-	if (g_array_index (level->array, SortElt, j).offset == gtk_tree_path_get_indices (s_path)[i])
-	  {
-	    elt = &g_array_index (level->array, SortElt, j);
-	    break;
-	  }
+      elt = lookup_elt_with_offset (tree_model_sort, level,
+                                    gtk_tree_path_get_indices (s_path)[i],
+                                    NULL);
 
       g_return_if_fail (elt != NULL);
 
@@ -814,7 +973,7 @@ gtk_tree_model_sort_row_inserted (GtkTreeModel          *s_model,
 
   if (level->ref_count == 0 && level != priv->root)
     {
-      gtk_tree_model_sort_free_level (tree_model_sort, level);
+      gtk_tree_model_sort_free_level (tree_model_sort, level, TRUE);
       goto done;
     }
 
@@ -878,7 +1037,6 @@ gtk_tree_model_sort_row_deleted (GtkTreeModel *s_model,
   SortLevel *level;
   GtkTreeIter iter;
   gint offset;
-  gint i;
 
   g_return_if_fail (s_path != NULL);
 
@@ -892,52 +1050,46 @@ gtk_tree_model_sort_row_deleted (GtkTreeModel *s_model,
   elt = SORT_ELT (iter.user_data2);
   offset = elt->offset;
 
-  /* we _need_ to emit ::row_deleted before we start unreffing the node
-   * itself. This is because of the row refs, which start unreffing nodes
-   * when we emit ::row_deleted
-   */
-  gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path);
-
   gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
 
   while (elt->ref_count > 0)
     gtk_tree_model_sort_real_unref_node (GTK_TREE_MODEL (data), &iter, FALSE);
 
+  /* If this node has children, we free the level (recursively) here
+   * and specify that unref may not be used, because parent and its
+   * children have been removed by now.
+   */
+  if (elt->children)
+    gtk_tree_model_sort_free_level (tree_model_sort,
+                                    elt->children, FALSE);
+
   if (level->ref_count == 0)
     {
-      /* This will prune the level, so I can just emit the signal and 
-       * not worry about cleaning this level up. 
-       * Careful, root level is not cleaned up in increment stamp.
-       */
       gtk_tree_model_sort_increment_stamp (tree_model_sort);
+      gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path);
       gtk_tree_path_free (path);
+
       if (level == tree_model_sort->priv->root)
 	{
-	  gtk_tree_model_sort_free_level (tree_model_sort, 
-					  tree_model_sort->priv->root);
+	  gtk_tree_model_sort_free_level (tree_model_sort,
+					  tree_model_sort->priv->root,
+                                          TRUE);
 	  tree_model_sort->priv->root = NULL;
 	}
       return;
     }
 
-  gtk_tree_model_sort_increment_stamp (tree_model_sort);
-
-  /* Remove the row */
-  for (i = 0; i < level->array->len; i++)
-    if (elt->offset == g_array_index (level->array, SortElt, i).offset)
-      break;
+  g_sequence_remove (elt->siter);
+  elt = NULL;
 
-  g_array_remove_index (level->array, i);
+  /* The sequence is not ordered on offset, so we traverse the entire
+   * sequence.
+   */
+  g_sequence_foreach (level->seq, decrease_offset_iter,
+                      GINT_TO_POINTER (offset));
 
-  /* update all offsets */
-  for (i = 0; i < level->array->len; i++)
-    {
-      elt = & (g_array_index (level->array, SortElt, i));
-      if (elt->offset > offset)
-	elt->offset--;
-      if (elt->children)
-	elt->children->parent_elt_index = i;
-    }
+  gtk_tree_model_sort_increment_stamp (tree_model_sort);
+  gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path);
 
   gtk_tree_path_free (path);
 }
@@ -953,8 +1105,9 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
   SortLevel *level;
   GtkTreeIter iter;
   gint *tmp_array;
-  int i, j;
+  int i, length;
   GtkTreePath *path;
+  GSequenceIter *siter, *end_siter;
   GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
 
@@ -974,7 +1127,6 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
 	return;
       gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
 
-      level = SORT_LEVEL (iter.user_data);
       elt = SORT_ELT (iter.user_data2);
 
       if (!elt->children)
@@ -986,30 +1138,55 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
       level = elt->children;
     }
 
-  if (level->array->len < 2)
+  length = g_sequence_get_length (level->seq);
+  if (length < 2)
     {
       gtk_tree_path_free (path);
       return;
     }
 
-  tmp_array = g_new (int, level->array->len);
-  for (i = 0; i < level->array->len; i++)
+  tmp_array = g_new (int, length);
+
+  /* FIXME: I need to think about whether this can be done in a more
+   * efficient way?
+   */
+  i = 0;
+  end_siter = g_sequence_get_end_iter (level->seq);
+  for (siter = g_sequence_get_begin_iter (level->seq);
+       siter != end_siter;
+       siter = g_sequence_iter_next (siter))
     {
-      for (j = 0; j < level->array->len; j++)
+      gint j;
+      SortElt *elt = g_sequence_get (siter);
+
+      for (j = 0; j < length; j++)
 	{
-	  if (g_array_index (level->array, SortElt, i).offset == new_order[j])
+	  if (elt->offset == new_order[j])
 	    tmp_array[i] = j;
 	}
+
+      i++;
     }
 
-  for (i = 0; i < level->array->len; i++)
-    g_array_index (level->array, SortElt, i).offset = tmp_array[i];
+  /* This loop cannot be merged with the above loop nest, because that
+   * would introduce duplicate offsets.
+   */
+  i = 0;
+  end_siter = g_sequence_get_end_iter (level->seq);
+  for (siter = g_sequence_get_begin_iter (level->seq);
+       siter != end_siter;
+       siter = g_sequence_iter_next (siter))
+    {
+      SortElt *elt = g_sequence_get (siter);
+
+      elt->offset = tmp_array[i];
+      i++;
+    }
   g_free (tmp_array);
 
   if (priv->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID &&
       priv->default_sort_func == NO_SORT_FUNC)
     {
-
       gtk_tree_model_sort_sort_level (tree_model_sort, level,
 				      FALSE, FALSE);
       gtk_tree_model_sort_increment_stamp (tree_model_sort);
@@ -1079,33 +1256,50 @@ gtk_tree_model_sort_get_iter (GtkTreeModel *tree_model,
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
   gint *indices;
+  SortElt *elt;
   SortLevel *level;
   gint depth, i;
+  GSequenceIter *siter;
 
   g_return_val_if_fail (priv->child_model != NULL, FALSE);
 
   indices = gtk_tree_path_get_indices (path);
 
   if (priv->root == NULL)
-    gtk_tree_model_sort_build_level (tree_model_sort, NULL, -1);
+    gtk_tree_model_sort_build_level (tree_model_sort, NULL, NULL);
   level = SORT_LEVEL (priv->root);
 
   depth = gtk_tree_path_get_depth (path);
   if (depth == 0)
-    return FALSE;
+    {
+      iter->stamp = 0;
+      return FALSE;
+    }
 
   for (i = 0; i < depth - 1; i++)
     {
       if ((level == NULL) ||
-	  (indices[i] >= level->array->len))
-	return FALSE;
+	  (indices[i] >= g_sequence_get_length (level->seq)))
+        {
+          iter->stamp = 0;
+          return FALSE;
+        }
+
+      siter = g_sequence_get_iter_at_pos (level->seq, indices[i]);
+      if (g_sequence_iter_is_end (siter))
+        {
+          iter->stamp = 0;
+          return FALSE;
+        }
+
+      elt = GET_ELT (siter);
+      if (elt->children == NULL)
+	gtk_tree_model_sort_build_level (tree_model_sort, level, elt);
 
-      if (g_array_index (level->array, SortElt, indices[i]).children == NULL)
-	gtk_tree_model_sort_build_level (tree_model_sort, level, indices[i]);
-      level = g_array_index (level->array, SortElt, indices[i]).children;
+      level = elt->children;
     }
 
-  if (!level || indices[i] >= level->array->len)
+  if (!level || indices[i] >= g_sequence_get_length (level->seq))
     {
       iter->stamp = 0;
       return FALSE;
@@ -1113,7 +1307,14 @@ gtk_tree_model_sort_get_iter (GtkTreeModel *tree_model,
 
   iter->stamp = priv->stamp;
   iter->user_data = level;
-  iter->user_data2 = &g_array_index (level->array, SortElt, indices[depth - 1]);
+
+  siter = g_sequence_get_iter_at_pos (level->seq, indices[depth - 1]);
+  if (g_sequence_iter_is_end (siter))
+    {
+      iter->stamp = 0;
+      return FALSE;
+    }
+  iter->user_data2 = GET_ELT (siter);
 
   return TRUE;
 }
@@ -1126,7 +1327,7 @@ gtk_tree_model_sort_get_path (GtkTreeModel *tree_model,
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
   GtkTreePath *retval;
   SortLevel *level;
-  gint elt_index;
+  SortElt *elt;
 
   g_return_val_if_fail (priv->child_model != NULL, NULL);
   g_return_val_if_fail (priv->stamp == iter->stamp, NULL);
@@ -1134,13 +1335,16 @@ gtk_tree_model_sort_get_path (GtkTreeModel *tree_model,
   retval = gtk_tree_path_new ();
 
   level = SORT_LEVEL (iter->user_data);
-  elt_index = SORT_LEVEL_ELT_INDEX (level, iter->user_data2);
+  elt = SORT_ELT (iter->user_data2);
 
   while (level)
     {
-      gtk_tree_path_prepend_index (retval, elt_index);
+      gint index;
 
-      elt_index = level->parent_elt_index;
+      index = g_sequence_iter_get_position (elt->siter);
+      gtk_tree_path_prepend_index (retval, index);
+
+      elt = level->parent_elt;
       level = level->parent_level;
     }
 
@@ -1171,21 +1375,21 @@ gtk_tree_model_sort_iter_next (GtkTreeModel *tree_model,
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  SortLevel *level;
   SortElt *elt;
+  GSequenceIter *siter;
 
   g_return_val_if_fail (priv->child_model != NULL, FALSE);
   g_return_val_if_fail (priv->stamp == iter->stamp, FALSE);
 
-  level = iter->user_data;
   elt = iter->user_data2;
 
-  if (elt - (SortElt *)level->array->data >= level->array->len - 1)
+  siter = g_sequence_iter_next (elt->siter);
+  if (g_sequence_iter_is_end (siter))
     {
       iter->stamp = 0;
       return FALSE;
     }
-  iter->user_data2 = elt + 1;
+  iter->user_data2 = GET_ELT (siter);
 
   return TRUE;
 }
@@ -1196,21 +1400,21 @@ gtk_tree_model_sort_iter_previous (GtkTreeModel *tree_model,
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  SortLevel *level;
   SortElt *elt;
+  GSequenceIter *siter;
 
   g_return_val_if_fail (priv->child_model != NULL, FALSE);
   g_return_val_if_fail (priv->stamp == iter->stamp, FALSE);
 
-  level = iter->user_data;
   elt = iter->user_data2;
 
-  if (elt == (SortElt *)level->array->data)
+  siter = g_sequence_iter_prev (elt->siter);
+  if (g_sequence_iter_is_begin (siter))
     {
       iter->stamp = 0;
       return FALSE;
     }
-  iter->user_data2 = elt - 1;
+  iter->user_data2 = GET_ELT (siter);
 
   return TRUE;
 }
@@ -1232,14 +1436,14 @@ gtk_tree_model_sort_iter_children (GtkTreeModel *tree_model,
   if (parent == NULL)
     {
       if (priv->root == NULL)
-	gtk_tree_model_sort_build_level (tree_model_sort, NULL, -1);
+	gtk_tree_model_sort_build_level (tree_model_sort, NULL, NULL);
       if (priv->root == NULL)
 	return FALSE;
 
       level = priv->root;
       iter->stamp = priv->stamp;
       iter->user_data = level;
-      iter->user_data2 = level->array->data;
+      iter->user_data2 = g_sequence_get (g_sequence_get_begin_iter (level->seq));
     }
   else
     {
@@ -1249,15 +1453,14 @@ gtk_tree_model_sort_iter_children (GtkTreeModel *tree_model,
       elt = SORT_ELT (parent->user_data2);
 
       if (elt->children == NULL)
-        gtk_tree_model_sort_build_level (tree_model_sort, level,
-                                         SORT_LEVEL_ELT_INDEX (level, elt));
+        gtk_tree_model_sort_build_level (tree_model_sort, level, elt);
 
       if (elt->children == NULL)
 	return FALSE;
 
       iter->stamp = priv->stamp;
       iter->user_data = elt->children;
-      iter->user_data2 = elt->children->array->data;
+      iter->user_data2 = g_sequence_get (g_sequence_get_begin_iter (elt->children->seq));
     }
 
   return TRUE;
@@ -1321,7 +1524,7 @@ gtk_tree_model_sort_iter_nth_child (GtkTreeModel *tree_model,
     }
 
   level = children.user_data;
-  if (n >= level->array->len)
+  if (n >= g_sequence_get_length (level->seq))
     {
       iter->stamp = 0;
       return FALSE;
@@ -1329,7 +1532,7 @@ gtk_tree_model_sort_iter_nth_child (GtkTreeModel *tree_model,
 
   iter->stamp = tree_model_sort->priv->stamp;
   iter->user_data = level;
-  iter->user_data2 = &g_array_index (level->array, SortElt, n);
+  iter->user_data2 = g_sequence_get (g_sequence_get_iter_at_pos (level->seq, n));
 
   return TRUE;
 }
@@ -1353,7 +1556,7 @@ gtk_tree_model_sort_iter_parent (GtkTreeModel *tree_model,
     {
       iter->stamp = priv->stamp;
       iter->user_data = level->parent_level;
-      iter->user_data2 = SORT_LEVEL_PARENT_ELT (level);
+      iter->user_data2 = level->parent_elt;
 
       return TRUE;
     }
@@ -1367,9 +1570,8 @@ gtk_tree_model_sort_ref_node (GtkTreeModel *tree_model,
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
   GtkTreeIter child_iter;
-  SortLevel *level, *parent_level;
+  SortLevel *level;
   SortElt *elt;
-  gint parent_elt_index;
 
   g_return_if_fail (priv->child_model != NULL);
   g_return_if_fail (VALID_ITER (iter, tree_model_sort));
@@ -1386,35 +1588,17 @@ gtk_tree_model_sort_ref_node (GtkTreeModel *tree_model,
   elt->ref_count++;
   level->ref_count++;
 
-  /* Increase the reference count of all parent elements */
-  parent_level = level->parent_level;
-  parent_elt_index = level->parent_elt_index;
-
-  while (parent_level)
-    {
-      GtkTreeIter tmp_iter;
-
-      tmp_iter.stamp = priv->stamp;
-      tmp_iter.user_data = parent_level;
-      tmp_iter.user_data2 = &g_array_index (parent_level->array, SortElt, parent_elt_index);
-
-      gtk_tree_model_sort_ref_node (tree_model, &tmp_iter);
-
-      parent_elt_index = parent_level->parent_elt_index;
-      parent_level = parent_level->parent_level;
-    }
-
   if (level->ref_count == 1)
     {
       SortLevel *parent_level = level->parent_level;
-      gint parent_elt_index = level->parent_elt_index;
+      SortElt *parent_elt = level->parent_elt;
 
       /* We were at zero -- time to decrement the zero_ref_count val */
       while (parent_level)
         {
-	  g_array_index (parent_level->array, SortElt, parent_elt_index).zero_ref_count--;
+          parent_elt->zero_ref_count--;
 
-          parent_elt_index = parent_level->parent_elt_index;
+          parent_elt = parent_level->parent_elt;
 	  parent_level = parent_level->parent_level;
 	}
 
@@ -1430,9 +1614,8 @@ gtk_tree_model_sort_real_unref_node (GtkTreeModel *tree_model,
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  SortLevel *level, *parent_level;
+  SortLevel *level;
   SortElt *elt;
-  gint parent_elt_index;
 
   g_return_if_fail (priv->child_model != NULL);
   g_return_if_fail (VALID_ITER (iter, tree_model_sort));
@@ -1453,35 +1636,17 @@ gtk_tree_model_sort_real_unref_node (GtkTreeModel *tree_model,
   elt->ref_count--;
   level->ref_count--;
 
-  /* Decrease the reference count of all parent elements */
-  parent_level = level->parent_level;
-  parent_elt_index = level->parent_elt_index;
-
-  while (parent_level)
-    {
-      GtkTreeIter tmp_iter;
-
-      tmp_iter.stamp = priv->stamp;
-      tmp_iter.user_data = parent_level;
-      tmp_iter.user_data2 = &g_array_index (parent_level->array, SortElt, parent_elt_index);
-
-      gtk_tree_model_sort_real_unref_node (tree_model, &tmp_iter, FALSE);
-
-      parent_elt_index = parent_level->parent_elt_index;
-      parent_level = parent_level->parent_level;
-    }
-
   if (level->ref_count == 0)
     {
       SortLevel *parent_level = level->parent_level;
-      gint parent_elt_index = level->parent_elt_index;
+      SortElt *parent_elt = level->parent_elt;
 
       /* We are at zero -- time to increment the zero_ref_count val */
       while (parent_level)
 	{
-	  g_array_index (parent_level->array, SortElt, parent_elt_index).zero_ref_count++;
+          parent_elt->zero_ref_count++;
 
-	  parent_elt_index = parent_level->parent_elt_index;
+          parent_elt = parent_level->parent_elt;
 	  parent_level = parent_level->parent_level;
 	}
 
@@ -1670,26 +1835,22 @@ gtk_tree_model_sort_compare_func (gconstpointer a,
   SortData *data = (SortData *)user_data;
   GtkTreeModelSort *tree_model_sort = data->tree_model_sort;
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  SortTuple *sa = (SortTuple *)a;
-  SortTuple *sb = (SortTuple *)b;
+  const SortElt *sa = a;
+  const SortElt *sb = b;
 
   GtkTreeIter iter_a, iter_b;
   gint retval;
 
-  /* shortcut, if we've the same offsets here, they should be equal */
-  if (sa->offset == sb->offset)
-    return 0;
-
   if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
     {
-      iter_a = sa->elt->iter;
-      iter_b = sb->elt->iter;
+      iter_a = sa->iter;
+      iter_b = sb->iter;
     }
   else
     {
-      data->parent_path_indices [data->parent_path_depth-1] = sa->elt->offset;
+      data->parent_path_indices [data->parent_path_depth-1] = sa->offset;
       gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->child_model), &iter_a, data->parent_path);
-      data->parent_path_indices [data->parent_path_depth-1] = sb->elt->offset;
+      data->parent_path_indices [data->parent_path_depth-1] = sb->offset;
       gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->child_model), &iter_b, data->parent_path);
     }
 
@@ -1715,14 +1876,14 @@ gtk_tree_model_sort_offset_compare_func (gconstpointer a,
 {
   gint retval;
 
-  SortTuple *sa = (SortTuple *)a;
-  SortTuple *sb = (SortTuple *)b;
+  const SortElt *sa = (SortElt *)a;
+  const SortElt *sb = (SortElt *)b;
 
   SortData *data = (SortData *)user_data;
 
-  if (sa->elt->offset < sb->elt->offset)
+  if (sa->offset < sb->offset)
     retval = -1;
-  else if (sa->elt->offset > sb->elt->offset)
+  else if (sa->offset > sb->offset)
     retval = 1;
   else
     retval = 0;
@@ -1746,9 +1907,8 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
 {
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
   gint i;
-  gint ref_offset;
-  GArray *sort_array;
-  GArray *new_array;
+  GSequenceIter *begin_siter, *end_siter, *siter;
+  SortElt *begin_elt;
   gint *new_order;
 
   GtkTreeIter iter;
@@ -1758,103 +1918,61 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
 
   g_return_if_fail (level != NULL);
 
-  if (level->array->len < 1 && !((SortElt *)level->array->data)->children)
+  begin_siter = g_sequence_get_begin_iter (level->seq);
+  begin_elt = g_sequence_get (begin_siter);
+
+  if (g_sequence_get_length (level->seq) < 1 && !begin_elt->children)
     return;
 
   iter.stamp = priv->stamp;
   iter.user_data = level;
-  iter.user_data2 = &g_array_index (level->array, SortElt, 0);
+  iter.user_data2 = begin_elt;
 
   gtk_tree_model_sort_ref_node (GTK_TREE_MODEL (tree_model_sort), &iter);
-  ref_offset = g_array_index (level->array, SortElt, 0).offset;
 
-  /* Set up data */
-  data.tree_model_sort = tree_model_sort;
-  if (level->parent_elt_index >= 0)
+  i = 0;
+  end_siter = g_sequence_get_end_iter (level->seq);
+  for (siter = g_sequence_get_begin_iter (level->seq);
+       siter != end_siter;
+       siter = g_sequence_iter_next (siter))
     {
-      data.parent_path = gtk_tree_model_sort_elt_get_path (level->parent_level,
-							   SORT_LEVEL_PARENT_ELT (level));
-      gtk_tree_path_append_index (data.parent_path, 0);
-    }
-  else
-    {
-      data.parent_path = gtk_tree_path_new_first ();
-    }
-  data.parent_path_depth = gtk_tree_path_get_depth (data.parent_path);
-  data.parent_path_indices = gtk_tree_path_get_indices (data.parent_path);
-
-  /* make the array to be sorted */
-  sort_array = g_array_sized_new (FALSE, FALSE, sizeof (SortTuple), level->array->len);
-  for (i = 0; i < level->array->len; i++)
-    {
-      SortTuple tuple;
-
-      tuple.elt = &g_array_index (level->array, SortElt, i);
-      tuple.offset = i;
+      SortElt *elt = g_sequence_get (siter);
 
-      g_array_append_val (sort_array, tuple);
+      elt->old_index = i;
+      i++;
     }
 
-    if (priv->sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
-      {
-	GtkTreeDataSortHeader *header = NULL;
-
-	header = _gtk_tree_data_list_get_header (priv->sort_list,
-						 priv->sort_column_id);
-
-	g_return_if_fail (header != NULL);
-	g_return_if_fail (header->func != NULL);
-
-	data.sort_func = header->func;
-	data.sort_data = header->data;
-      }
-    else
-      {
-	/* absolutely SHOULD NOT happen: */
-	g_return_if_fail (priv->default_sort_func != NULL);
-
-	data.sort_func = priv->default_sort_func;
-	data.sort_data = priv->default_sort_data;
-      }
+  fill_sort_data (&data, tree_model_sort, level);
 
   if (data.sort_func == NO_SORT_FUNC)
-    g_array_sort_with_data (sort_array,
-			    gtk_tree_model_sort_offset_compare_func,
-			    &data);
+    g_sequence_sort (level->seq, gtk_tree_model_sort_offset_compare_func,
+                     &data);
   else
-    g_array_sort_with_data (sort_array,
-			    gtk_tree_model_sort_compare_func,
-			    &data);
+    g_sequence_sort (level->seq, gtk_tree_model_sort_compare_func, &data);
 
-  gtk_tree_path_free (data.parent_path);
+  free_sort_data (&data);
 
-  new_array = g_array_sized_new (FALSE, FALSE, sizeof (SortElt), level->array->len);
-  new_order = g_new (gint, level->array->len);
+  new_order = g_new (gint, g_sequence_get_length (level->seq));
 
-  for (i = 0; i < level->array->len; i++)
+  i = 0;
+  end_siter = g_sequence_get_end_iter (level->seq);
+  for (siter = g_sequence_get_begin_iter (level->seq);
+       siter != end_siter;
+       siter = g_sequence_iter_next (siter))
     {
-      SortElt *elt;
+      SortElt *elt = g_sequence_get (siter);
 
-      elt = g_array_index (sort_array, SortTuple, i).elt;
-      new_order[i] = g_array_index (sort_array, SortTuple, i).offset;
-
-      g_array_append_val (new_array, *elt);
-      if (elt->children)
-	elt->children->parent_elt_index = i;
+      new_order[i++] = elt->old_index;
     }
 
-  g_array_free (level->array, TRUE);
-  level->array = new_array;
-  g_array_free (sort_array, TRUE);
-
   if (emit_reordered)
     {
       gtk_tree_model_sort_increment_stamp (tree_model_sort);
-      if (level->parent_elt_index >= 0)
+      if (level->parent_elt)
 	{
 	  iter.stamp = priv->stamp;
 	  iter.user_data = level->parent_level;
-	  iter.user_data2 = SORT_LEVEL_PARENT_ELT (level);
+	  iter.user_data2 = level->parent_elt;
 
 	  path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_model_sort),
 					  &iter);
@@ -1876,9 +1994,12 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
   /* recurse, if possible */
   if (recurse)
     {
-      for (i = 0; i < level->array->len; i++)
+      end_siter = g_sequence_get_end_iter (level->seq);
+      for (siter = g_sequence_get_begin_iter (level->seq);
+           siter != end_siter;
+           siter = g_sequence_iter_next (siter))
 	{
-	  SortElt *elt = &g_array_index (level->array, SortElt, i);
+	  SortElt *elt = g_sequence_get (siter);
 
 	  if (elt->children)
 	    gtk_tree_model_sort_sort_level (tree_model_sort,
@@ -1894,15 +2015,7 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
    */
   iter.stamp = priv->stamp;
   iter.user_data = level;
-
-  for (i = 0; i < level->array->len; i++)
-    {
-      if (g_array_index (level->array, SortElt, i).offset == ref_offset)
-        {
-	  iter.user_data2 = &g_array_index (level->array, SortElt, i);
-	  break;
-	}
-    }
+  iter.user_data2 = begin_elt;
 
   gtk_tree_model_sort_unref_node (GTK_TREE_MODEL (tree_model_sort), &iter);
 }
@@ -1937,91 +2050,6 @@ gtk_tree_model_sort_sort (GtkTreeModelSort *tree_model_sort)
 }
 
 /* signal helpers */
-static gint
-gtk_tree_model_sort_level_find_insert (GtkTreeModelSort *tree_model_sort,
-				       SortLevel        *level,
-				       GtkTreeIter      *iter,
-				       gint             skip_index)
-{
-  GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  gint start, middle, end;
-  gint cmp;
-  SortElt *tmp_elt;
-  GtkTreeIter tmp_iter;
-
-  GtkTreeIterCompareFunc func;
-  gpointer data;
-
-  if (priv->sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
-    {
-      GtkTreeDataSortHeader *header;
-      
-      header = _gtk_tree_data_list_get_header (priv->sort_list,
-					       priv->sort_column_id);
-      
-      g_return_val_if_fail (header != NULL, 0);
-      
-      func = header->func;
-      data = header->data;
-    }
-  else
-    {
-      func = priv->default_sort_func;
-      data = priv->default_sort_data;
-      
-      g_return_val_if_fail (func != NO_SORT_FUNC, 0);
-    }
-
-  g_return_val_if_fail (func != NULL, 0);
-
-  start = 0;
-  end = level->array->len;
-  if (skip_index < 0)
-    skip_index = end;
-  else
-    end--;
-
-  if (start == end)
-    return 0;
-  
-  while (start != end)
-    {
-      middle = (start + end) / 2;
-
-      if (middle < skip_index)
-	tmp_elt = &(g_array_index (level->array, SortElt, middle));
-      else
-	tmp_elt = &(g_array_index (level->array, SortElt, middle + 1));
-  
-      if (!GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
-	{
-	  GtkTreePath *path = gtk_tree_model_sort_elt_get_path (level, tmp_elt);
-	  gtk_tree_model_get_iter (priv->child_model,
-				   &tmp_iter, path);
-	  gtk_tree_path_free (path);
-	}
-      else
-	tmp_iter = tmp_elt->iter;
-  
-      if (priv->order == GTK_SORT_ASCENDING)
-	cmp = (* func) (GTK_TREE_MODEL (priv->child_model),
-			&tmp_iter, iter, data);
-      else
-	cmp = (* func) (GTK_TREE_MODEL (priv->child_model),
-			iter, &tmp_iter, data);
-
-      if (cmp <= 0)
-	start = middle + 1;
-      else
-	end = middle;
-    }
-
-  if (cmp <= 0)
-    return middle + 1;
-  else
-    return middle;
-}
-
 static gboolean
 gtk_tree_model_sort_insert_value (GtkTreeModelSort *tree_model_sort,
 				  SortLevel        *level,
@@ -2029,39 +2057,41 @@ gtk_tree_model_sort_insert_value (GtkTreeModelSort *tree_model_sort,
 				  GtkTreeIter      *s_iter)
 {
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  gint offset, index, i;
+  SortElt *elt;
+  SortData data;
+  gint offset;
 
-  SortElt elt;
-  SortElt *tmp_elt;
+  elt = sort_elt_new ();
 
   offset = gtk_tree_path_get_indices (s_path)[gtk_tree_path_get_depth (s_path) - 1];
 
   if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
-    elt.iter = *s_iter;
-  elt.offset = offset;
-  elt.zero_ref_count = 0;
-  elt.ref_count = 0;
-  elt.children = NULL;
+    elt->iter = *s_iter;
+  elt->offset = offset;
+  elt->zero_ref_count = 0;
+  elt->ref_count = 0;
+  elt->children = NULL;
 
   /* update all larger offsets */
-  tmp_elt = SORT_ELT (level->array->data);
-  for (i = 0; i < level->array->len; i++, tmp_elt++)
-    if (tmp_elt->offset >= offset)
-      tmp_elt->offset++;
+  g_sequence_foreach (level->seq, increase_offset_iter, GINT_TO_POINTER (offset));
+
+  fill_sort_data (&data, tree_model_sort, level);
 
   if (priv->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID &&
       priv->default_sort_func == NO_SORT_FUNC)
-    index = offset;
+    {
+      elt->siter = g_sequence_insert_sorted (level->seq, elt,
+                                             gtk_tree_model_sort_offset_compare_func,
+                                             &data);
+    }
   else
-    index = gtk_tree_model_sort_level_find_insert (tree_model_sort,
-                                                   level, s_iter,
-                                                   -1);
+    {
+      elt->siter = g_sequence_insert_sorted (level->seq, elt,
+                                             gtk_tree_model_sort_compare_func,
+                                             &data);
+    }
 
-  g_array_insert_vals (level->array, index, &elt, 1);
-  tmp_elt = SORT_ELT (level->array->data);
-  for (i = 0; i < level->array->len; i++, tmp_elt++)
-    if (tmp_elt->children)
-      tmp_elt->children->parent_elt_index = i;
+  free_sort_data (&data);
 
   return TRUE;
 }
@@ -2087,7 +2117,7 @@ gtk_tree_model_sort_elt_get_path (SortLevel *level,
       if (!walker->parent_level)
 	break;
 
-      walker2 = SORT_LEVEL_PARENT_ELT (walker);
+      walker2 = walker->parent_elt;
       walker = walker->parent_level;
     }
 
@@ -2128,7 +2158,7 @@ gtk_tree_model_sort_set_model (GtkTreeModelSort *tree_model_sort,
 
       /* reset our state */
       if (priv->root)
-	gtk_tree_model_sort_free_level (tree_model_sort, priv->root);
+	gtk_tree_model_sort_free_level (tree_model_sort, priv->root, TRUE);
       priv->root = NULL;
       _gtk_tree_data_list_header_free (priv->sort_list);
       priv->sort_list = NULL;
@@ -2213,12 +2243,13 @@ gtk_real_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_mode
   child_indices = gtk_tree_path_get_indices (child_path);
 
   if (priv->root == NULL && build_levels)
-    gtk_tree_model_sort_build_level (tree_model_sort, NULL, -1);
+    gtk_tree_model_sort_build_level (tree_model_sort, NULL, NULL);
   level = SORT_LEVEL (priv->root);
 
   for (i = 0; i < gtk_tree_path_get_depth (child_path); i++)
     {
-      gint j;
+      SortElt *tmp;
+      GSequenceIter *siter;
       gboolean found_child = FALSE;
 
       if (!level)
@@ -2227,25 +2258,23 @@ gtk_real_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_mode
 	  return NULL;
 	}
 
-      if (child_indices[i] >= level->array->len)
+      if (child_indices[i] >= g_sequence_get_length (level->seq))
 	{
 	  gtk_tree_path_free (retval);
 	  return NULL;
 	}
-      for (j = 0; j < level->array->len; j++)
-	{
-	  if ((g_array_index (level->array, SortElt, j)).offset == child_indices[i])
-	    {
-	      gtk_tree_path_append_index (retval, j);
-	      if (g_array_index (level->array, SortElt, j).children == NULL && build_levels)
-		{
-		  gtk_tree_model_sort_build_level (tree_model_sort, level, j);
-		}
-	      level = g_array_index (level->array, SortElt, j).children;
-	      found_child = TRUE;
-	      break;
-	    }
-	}
+      tmp = lookup_elt_with_offset (tree_model_sort, level,
+                                    child_indices[i], &siter);
+      if (tmp)
+        {
+          gtk_tree_path_append_index (retval, g_sequence_iter_get_position (siter));
+          if (tmp->children == NULL && build_levels)
+            gtk_tree_model_sort_build_level (tree_model_sort, level, tmp);
+
+          level = tmp->children;
+          found_child = TRUE;
+        }
+
       if (! found_child)
 	{
 	  gtk_tree_path_free (retval);
@@ -2359,22 +2388,31 @@ gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sor
   retval = gtk_tree_path_new ();
   sorted_indices = gtk_tree_path_get_indices (sorted_path);
   if (priv->root == NULL)
-    gtk_tree_model_sort_build_level (tree_model_sort, NULL, -1);
+    gtk_tree_model_sort_build_level (tree_model_sort, NULL, NULL);
   level = SORT_LEVEL (priv->root);
 
   for (i = 0; i < gtk_tree_path_get_depth (sorted_path); i++)
     {
-      gint count = sorted_indices[i];
+      SortElt *elt = NULL;
+      GSequenceIter *siter;
 
       if ((level == NULL) ||
-	  (level->array->len <= count))
+	  (g_sequence_get_length (level->seq) <= sorted_indices[i]))
 	{
 	  gtk_tree_path_free (retval);
 	  return NULL;
 	}
 
-      if (g_array_index (level->array, SortElt, count).children == NULL)
-	gtk_tree_model_sort_build_level (tree_model_sort, level, count);
+      siter = g_sequence_get_iter_at_pos (level->seq, sorted_indices[i]);
+      if (g_sequence_iter_is_end (siter))
+        {
+          gtk_tree_path_free (retval);
+          return NULL;
+        }
+
+      elt = GET_ELT (siter);
+      if (elt->children == NULL)
+	gtk_tree_model_sort_build_level (tree_model_sort, level, elt);
 
       if (level == NULL)
         {
@@ -2382,8 +2420,8 @@ gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sor
 	  break;
 	}
 
-      gtk_tree_path_append_index (retval, g_array_index (level->array, SortElt, count).offset);
-      level = g_array_index (level->array, SortElt, count).children;
+      gtk_tree_path_append_index (retval, elt->offset);
+      level = elt->children;
     }
  
   return retval;
@@ -2416,22 +2454,24 @@ gtk_tree_model_sort_convert_iter_to_child_iter (GtkTreeModelSort *tree_model_sor
   else
     {
       GtkTreePath *path;
+      gboolean valid = FALSE;
 
       path = gtk_tree_model_sort_elt_get_path (sorted_iter->user_data,
 					       sorted_iter->user_data2);
-      gtk_tree_model_get_iter (priv->child_model, child_iter, path);
+      valid = gtk_tree_model_get_iter (priv->child_model, child_iter, path);
       gtk_tree_path_free (path);
+
+      g_return_if_fail (valid == TRUE);
     }
 }
 
 static void
 gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
 				 SortLevel        *parent_level,
-				 gint              parent_elt_index)
+                                 SortElt          *parent_elt)
 {
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
   GtkTreeIter iter;
-  SortElt *parent_elt = NULL;
   SortLevel *new_level;
   gint length = 0;
   gint i;
@@ -2449,8 +2489,6 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
       GtkTreeIter parent_iter;
       GtkTreeIter child_parent_iter;
 
-      parent_elt = &g_array_index (parent_level->array, SortElt, parent_elt_index);
-
       parent_iter.stamp = priv->stamp;
       parent_iter.user_data = parent_level;
       parent_iter.user_data2 = parent_elt;
@@ -2469,17 +2507,20 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
 						      &parent_iter);
 
       length = gtk_tree_model_iter_n_children (priv->child_model, &child_parent_iter);
+
+      gtk_tree_model_sort_ref_node (GTK_TREE_MODEL (tree_model_sort),
+                                    &parent_iter);
     }
 
   g_return_if_fail (length > 0);
 
   new_level = g_new (SortLevel, 1);
-  new_level->array = g_array_sized_new (FALSE, FALSE, sizeof (SortElt), length);
+  new_level->seq = g_sequence_new (sort_elt_free);
   new_level->ref_count = 0;
   new_level->parent_level = parent_level;
-  new_level->parent_elt_index = parent_elt_index;
+  new_level->parent_elt = parent_elt;
 
-  if (parent_elt_index >= 0)
+  if (parent_elt)
     parent_elt->children = new_level;
   else
     priv->root = new_level;
@@ -2487,9 +2528,9 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
   /* increase the count of zero ref_counts.*/
   while (parent_level)
     {
-      g_array_index (parent_level->array, SortElt, parent_elt_index).zero_ref_count++;
+      parent_elt->zero_ref_count++;
 
-      parent_elt_index = parent_level->parent_elt_index;
+      parent_elt = parent_level->parent_elt;
       parent_level = parent_level->parent_level;
     }
 
@@ -2498,15 +2539,17 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
 
   for (i = 0; i < length; i++)
     {
-      SortElt sort_elt;
-      sort_elt.offset = i;
-      sort_elt.zero_ref_count = 0;
-      sort_elt.ref_count = 0;
-      sort_elt.children = NULL;
+      SortElt *sort_elt;
+
+      sort_elt = sort_elt_new ();
+      sort_elt->offset = i;
+      sort_elt->zero_ref_count = 0;
+      sort_elt->ref_count = 0;
+      sort_elt->children = NULL;
 
       if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
 	{
-	  sort_elt.iter = iter;
+	  sort_elt->iter = iter;
 	  if (gtk_tree_model_iter_next (priv->child_model, &iter) == FALSE &&
 	      i < length - 1)
 	    {
@@ -2537,7 +2580,8 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
 	      return;
 	    }
 	}
-      g_array_append_val (new_level->array, sort_elt);
+
+      sort_elt->siter = g_sequence_append (new_level->seq, sort_elt);
     }
 
   /* sort level */
@@ -2547,30 +2591,37 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
 
 static void
 gtk_tree_model_sort_free_level (GtkTreeModelSort *tree_model_sort,
-				SortLevel        *sort_level)
+				SortLevel        *sort_level,
+                                gboolean          unref)
 {
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  gint i;
+  GSequenceIter *siter;
+  GSequenceIter *end_siter;
 
   g_assert (sort_level);
 
-  for (i = 0; i < sort_level->array->len; i++)
+  end_siter = g_sequence_get_end_iter (sort_level->seq);
+  for (siter = g_sequence_get_begin_iter (sort_level->seq);
+       siter != end_siter;
+       siter = g_sequence_iter_next (siter))
     {
-      if (g_array_index (sort_level->array, SortElt, i).children)
-	gtk_tree_model_sort_free_level (tree_model_sort,
-					SORT_LEVEL (g_array_index (sort_level->array, SortElt, i).children));
+      SortElt *elt = g_sequence_get (siter);
+
+      if (elt->children)
+        gtk_tree_model_sort_free_level (tree_model_sort,
+                                        elt->children, unref);
     }
 
   if (sort_level->ref_count == 0)
     {
       SortLevel *parent_level = sort_level->parent_level;
-      gint parent_elt_index = sort_level->parent_elt_index;
+      SortElt *parent_elt = sort_level->parent_elt;
 
       while (parent_level)
         {
-	  g_array_index (parent_level->array, SortElt, parent_elt_index).zero_ref_count--;
+          parent_elt->zero_ref_count--;
 
-          parent_elt_index = parent_level->parent_elt_index;
+          parent_elt = parent_level->parent_elt;
 	  parent_level = parent_level->parent_level;
 	}
 
@@ -2578,13 +2629,27 @@ gtk_tree_model_sort_free_level (GtkTreeModelSort *tree_model_sort,
 	priv->zero_ref_count--;
     }
 
-  if (sort_level->parent_elt_index >= 0)
-    SORT_LEVEL_PARENT_ELT (sort_level)->children = NULL;
+  if (sort_level->parent_elt)
+    {
+      if (unref)
+        {
+          GtkTreeIter parent_iter;
+
+          parent_iter.stamp = tree_model_sort->priv->stamp;
+          parent_iter.user_data = sort_level->parent_level;
+          parent_iter.user_data2 = sort_level->parent_elt;
+
+          gtk_tree_model_sort_unref_node (GTK_TREE_MODEL (tree_model_sort),
+                                          &parent_iter);
+        }
+
+      sort_level->parent_elt->children = NULL;
+    }
   else
     priv->root = NULL;
 
-  g_array_free (sort_level->array, TRUE);
-  sort_level->array = NULL;
+  g_sequence_free (sort_level->seq);
+  sort_level->seq = NULL;
 
   g_free (sort_level);
   sort_level = NULL;
@@ -2605,21 +2670,27 @@ gtk_tree_model_sort_increment_stamp (GtkTreeModelSort *tree_model_sort)
 }
 
 static void
+gtk_tree_model_sort_clear_cache_helper_iter (gpointer data,
+                                             gpointer user_data)
+{
+  GtkTreeModelSort *tree_model_sort = user_data;
+  SortElt *elt = data;
+
+  if (elt->zero_ref_count > 0)
+    gtk_tree_model_sort_clear_cache_helper (tree_model_sort, elt->children);
+}
+
+static void
 gtk_tree_model_sort_clear_cache_helper (GtkTreeModelSort *tree_model_sort,
 					SortLevel        *level)
 {
-  gint i;
-
   g_assert (level != NULL);
 
-  for (i = 0; i < level->array->len; i++)
-    {
-      if (g_array_index (level->array, SortElt, i).zero_ref_count > 0)
-	gtk_tree_model_sort_clear_cache_helper (tree_model_sort, g_array_index (level->array, SortElt, i).children);
-    }
+  g_sequence_foreach (level->seq, gtk_tree_model_sort_clear_cache_helper_iter,
+                      tree_model_sort);
 
   if (level->ref_count == 0 && level != tree_model_sort->priv->root)
-    gtk_tree_model_sort_free_level (tree_model_sort, level);
+    gtk_tree_model_sort_free_level (tree_model_sort, level, TRUE);
 }
 
 /**
@@ -2679,11 +2750,14 @@ static gboolean
 gtk_tree_model_sort_iter_is_valid_helper (GtkTreeIter *iter,
 					  SortLevel   *level)
 {
-  gint i;
+  GSequenceIter *siter;
+  GSequenceIter *end_siter;
 
-  for (i = 0; i < level->array->len; i++)
+  end_siter = g_sequence_get_end_iter (level->seq);
+  for (siter = g_sequence_get_begin_iter (level->seq);
+       siter != end_siter; siter = g_sequence_iter_next (siter))
     {
-      SortElt *elt = &g_array_index (level->array, SortElt, i);
+      SortElt *elt = g_sequence_get (siter);
 
       if (iter->user_data == level && iter->user_data2 == elt)
 	return TRUE;
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index e2e969ed5f..e0d40dd40f 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -560,13 +560,19 @@ gtk_tree_store_get_iter (GtkTreeModel *tree_model,
   parent.user_data = priv->root;
 
   if (!gtk_tree_store_iter_nth_child (tree_model, iter, &parent, indices[0]))
-    return FALSE;
+    {
+      iter->stamp = 0;
+      return FALSE;
+    }
 
   for (i = 1; i < depth; i++)
     {
       parent = *iter;
       if (!gtk_tree_store_iter_nth_child (tree_model, iter, &parent, indices[i]))
-	return FALSE;
+        {
+          iter->stamp = 0;
+          return FALSE;
+        }
     }
 
   return TRUE;
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 36d1bb258c..b8337706be 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -33,8 +33,7 @@
 #include "gtkbuildable.h"
 #include "gtkbutton.h"
 #include "gtklabel.h"
-#include "gtkhbox.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkarrow.h"
 #include "gtkintl.h"
 #include "gtkbindings.h"
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 11f86cd1d6..af79da7a6d 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -29,7 +29,7 @@
 #include "gtkbutton.h"
 #include "gtkalignment.h"
 #include "gtklabel.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkmarshalers.h"
 #include "gtkarrow.h"
 #include "gtkcellareacontext.h"
diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index ff5720d68e..4b2d3440ef 100644
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -27,13 +27,18 @@ TEST_PROGS			+= testing
 testing_SOURCES			 = testing.c
 testing_LDADD			 = $(progs_ldadd)
 
-TEST_PROGS			+= liststore
-liststore_SOURCES		 = liststore.c
-liststore_LDADD			 = $(progs_ldadd)
-
-TEST_PROGS			+= treestore
-treestore_SOURCES		 = treestore.c
-treestore_LDADD			 = $(progs_ldadd)
+TEST_PROGS			+= treemodel
+treemodel_SOURCES		 = \
+				treemodel.h \
+				treemodel.c \
+				liststore.c \
+				treestore.c \
+				filtermodel.c \
+				sortmodel.c \
+				modelrefcount.c \
+				gtktreemodelrefcount.h \
+				gtktreemodelrefcount.c
+treemodel_LDADD			 = $(progs_ldadd)
 
 TEST_PROGS			+= treeview
 treeview_SOURCES		 = treeview.c
@@ -41,7 +46,7 @@ treeview_LDADD			 = $(progs_ldadd)
 
 TEST_PROGS			+= treeview-scrolling
 treeview_scrolling_SOURCES	 = treeview-scrolling.c
-treeview_scrolling_LDADD	 = $(progs_ldadd)
+treeview_scrolling_LDADD	 = $(progs_ldadd) -lm
 
 TEST_PROGS			+= recentmanager
 recentmanager_SOURCES 		 = recentmanager.c
@@ -86,10 +91,6 @@ TEST_PROGS			+= textiter
 textiter_SOURCES		 = textiter.c
 textiter_LDADD			 = $(progs_ldadd)
 
-TEST_PROGS			+= filtermodel
-filtermodel_SOURCES		 = filtermodel.c
-filtermodel_LDADD		 = $(progs_ldadd)
-
 TEST_PROGS			+= expander
 expander_SOURCES		 = expander.c
 expander_LDADD			 = $(progs_ldadd)
diff --git a/gtk/tests/action.c b/gtk/tests/action.c
index dffb5b18fe..6617d9521a 100644
--- a/gtk/tests/action.c
+++ b/gtk/tests/action.c
@@ -57,6 +57,7 @@ menu_item_label_notify_count (ActionTest    *fixture,
   GtkWidget *item = gtk_menu_item_new ();
   unsigned int emmisions = 0;
 
+  g_object_ref_sink (item);
   g_signal_connect (item, "notify::label",
 		    G_CALLBACK (notify_count_emmisions), &emmisions);
 
diff --git a/gtk/tests/filtermodel.c b/gtk/tests/filtermodel.c
index 91daaf9f12..a0c11a8994 100644
--- a/gtk/tests/filtermodel.c
+++ b/gtk/tests/filtermodel.c
@@ -1,5 +1,5 @@
 /* Extensive GtkTreeModelFilter tests.
- * Copyright (C) 2009  Kristian Rietveld  <kris@gtk.org>
+ * Copyright (C) 2009,2011  Kristian Rietveld  <kris@gtk.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,15 +19,23 @@
 
 #include <gtk/gtk.h>
 
+#include "treemodel.h"
+#include "gtktreemodelrefcount.h"
 
 /* Left to do:
  *   - Proper coverage checking to see if the unit tests cover
  *     all possible cases.
- *   - Verify if the ref counting is done properly for both the
- *     normal ref_count and the zero_ref_count.  One way to test
- *     this area is by collapsing/expanding branches on the view
- *     that is connected to the filter model.
  *   - Check if the iterator stamp is incremented at the correct times.
+ *
+ * For more thorough testing:
+ *   - Test with randomized models.
+ *   - Extensively test a filter model wrapping a sort model,
+ *     or a sort model wrapping a filter model by:
+ *       # Checking structure.
+ *       # Checking for correct signals emissions.
+ *       # Checking correct reference counting.
+ *       # Tests should be done with the sort and filter model
+ *         in various filtering and sorting states.
  */
 
 
@@ -91,271 +99,6 @@ create_tree_store (int      depth,
 }
 
 /*
- * Signal monitor
- */
-
-typedef enum
-{
-  ROW_INSERTED,
-  ROW_DELETED,
-  ROW_CHANGED,
-  ROW_HAS_CHILD_TOGGLED,
-  ROWS_REORDERED,
-  LAST_SIGNAL
-}
-SignalName;
-
-static const char *
-signal_name_to_string (SignalName signal)
-{
-  switch (signal)
-    {
-      case ROW_INSERTED:
-          return "row-inserted";
-
-      case ROW_DELETED:
-          return "row-deleted";
-
-      case ROW_CHANGED:
-          return "row-changed";
-
-      case ROW_HAS_CHILD_TOGGLED:
-          return "row-has-child-toggled";
-
-      case ROWS_REORDERED:
-          return "rows-reordered";
-
-      default:
-          /* Fall through */
-          break;
-    }
-
-  return "(unknown)";
-}
-
-typedef struct
-{
-  SignalName signal;
-  GtkTreePath *path;
-}
-Signal;
-
-
-static Signal *
-signal_new (SignalName signal, GtkTreePath *path)
-{
-  Signal *s;
-
-  s = g_new0 (Signal, 1);
-  s->signal = signal;
-  s->path = gtk_tree_path_copy (path);
-
-  return s;
-}
-
-static void
-signal_free (Signal *s)
-{
-  if (s->path)
-    gtk_tree_path_free (s->path);
-
-  g_free (s);
-}
-
-
-typedef struct
-{
-  GQueue *queue;
-  GtkTreeModel *client;
-  gulong signal_ids[LAST_SIGNAL];
-}
-SignalMonitor;
-
-
-static void
-signal_monitor_generic_handler (SignalMonitor *m,
-                                SignalName     signal,
-                                GtkTreeModel  *model,
-                                GtkTreePath   *path)
-{
-  Signal *s;
-
-  if (g_queue_is_empty (m->queue))
-    {
-      g_error ("Signal queue empty\n");
-      g_assert_not_reached ();
-    }
-
-  if (m->client != model)
-    {
-      g_error ("Model mismatch; expected %p, got %p\n",
-               m->client, model);
-      g_assert_not_reached ();
-    }
-
-  s = g_queue_peek_tail (m->queue);
-
-#if 0
-  /* For debugging: output signals that are coming in.  Leaks memory. */
-  g_print ("signal=%d  path=%s\n", signal, gtk_tree_path_to_string (path));
-#endif
-
-  if (s->signal != signal
-      || gtk_tree_path_compare (s->path, path) != 0)
-    {
-      gchar *path_str, *s_path_str;
-
-      s_path_str = gtk_tree_path_to_string (s->path);
-      path_str = gtk_tree_path_to_string (path);
-
-      g_error ("Signals don't match; expected signal %s path %s, got signal %s path %s\n",
-               signal_name_to_string (s->signal), s_path_str,
-               signal_name_to_string (signal), path_str);
-
-      g_free (s_path_str);
-      g_free (path_str);
-
-      g_assert_not_reached ();
-    }
-
-  s = g_queue_pop_tail (m->queue);
-
-  signal_free (s);
-}
-
-static void
-signal_monitor_row_inserted (GtkTreeModel *model,
-                             GtkTreePath  *path,
-                             GtkTreeIter  *iter,
-                             gpointer      data)
-{
-  signal_monitor_generic_handler (data, ROW_INSERTED,
-                                  model, path);
-}
-
-static void
-signal_monitor_row_deleted (GtkTreeModel *model,
-                            GtkTreePath  *path,
-                            gpointer      data)
-{
-  signal_monitor_generic_handler (data, ROW_DELETED,
-                                  model, path);
-}
-
-static void
-signal_monitor_row_changed (GtkTreeModel *model,
-                            GtkTreePath  *path,
-                            GtkTreeIter  *iter,
-                            gpointer      data)
-{
-  signal_monitor_generic_handler (data, ROW_CHANGED,
-                                  model, path);
-}
-
-static void
-signal_monitor_row_has_child_toggled (GtkTreeModel *model,
-                                      GtkTreePath  *path,
-                                      GtkTreeIter  *iter,
-                                      gpointer      data)
-{
-  signal_monitor_generic_handler (data, ROW_HAS_CHILD_TOGGLED,
-                                  model, path);
-}
-
-static void
-signal_monitor_rows_reordered (GtkTreeModel *model,
-                               GtkTreePath  *path,
-                               GtkTreeIter  *iter,
-                               gint         *new_order,
-                               gpointer      data)
-{
-  signal_monitor_generic_handler (data, ROWS_REORDERED,
-                                  model, path);
-}
-
-static SignalMonitor *
-signal_monitor_new (GtkTreeModel *client)
-{
-  SignalMonitor *m;
-
-  m = g_new0 (SignalMonitor, 1);
-  m->client = g_object_ref (client);
-  m->queue = g_queue_new ();
-
-  m->signal_ids[ROW_INSERTED] = g_signal_connect (client,
-                                                  "row-inserted",
-                                                  G_CALLBACK (signal_monitor_row_inserted),
-                                                  m);
-  m->signal_ids[ROW_DELETED] = g_signal_connect (client,
-                                                 "row-deleted",
-                                                 G_CALLBACK (signal_monitor_row_deleted),
-                                                 m);
-  m->signal_ids[ROW_CHANGED] = g_signal_connect (client,
-                                                 "row-changed",
-                                                 G_CALLBACK (signal_monitor_row_changed),
-                                                 m);
-  m->signal_ids[ROW_HAS_CHILD_TOGGLED] = g_signal_connect (client,
-                                                           "row-has-child-toggled",
-                                                           G_CALLBACK (signal_monitor_row_has_child_toggled),
-                                                           m);
-  m->signal_ids[ROWS_REORDERED] = g_signal_connect (client,
-                                                    "rows-reordered",
-                                                    G_CALLBACK (signal_monitor_rows_reordered),
-                                                    m);
-
-  return m;
-}
-
-static void
-signal_monitor_free (SignalMonitor *m)
-{
-  int i;
-
-  for (i = 0; i < LAST_SIGNAL; i++)
-    g_signal_handler_disconnect (m->client, m->signal_ids[i]);
-
-  g_object_unref (m->client);
-
-  if (m->queue)
-    g_queue_free (m->queue);
-
-  g_free (m);
-}
-
-static void
-signal_monitor_assert_is_empty (SignalMonitor *m)
-{
-  g_assert (g_queue_is_empty (m->queue));
-}
-
-static void
-signal_monitor_append_signal_path (SignalMonitor *m,
-                                   SignalName     signal,
-                                   GtkTreePath   *path)
-{
-  Signal *s;
-
-  s = signal_new (signal, path);
-  g_queue_push_head (m->queue, s);
-}
-
-static void
-signal_monitor_append_signal (SignalMonitor *m,
-                              SignalName     signal,
-                              const gchar   *path_string)
-{
-  Signal *s;
-  GtkTreePath *path;
-
-  path = gtk_tree_path_new_from_string (path_string);
-
-  s = signal_new (signal, path);
-  g_queue_push_head (m->queue, s);
-
-  gtk_tree_path_free (path);
-}
-
-/*
  * Fixture
  */
 
@@ -412,6 +155,23 @@ filter_test_setup_generic (FilterTest    *fixture,
 }
 
 static void
+filter_test_setup_expand_root (FilterTest *fixture)
+{
+  int i;
+  GtkTreePath *path;
+
+  path = gtk_tree_path_new_from_indices (0, -1);
+
+  for (i = 0; i < LEVEL_LENGTH; i++)
+    {
+      gtk_tree_view_expand_row (GTK_TREE_VIEW (fixture->tree_view),
+                                path, FALSE);
+      gtk_tree_path_next (path);
+    }
+  gtk_tree_path_free (path);
+}
+
+static void
 filter_test_setup (FilterTest    *fixture,
                    gconstpointer  test_data)
 {
@@ -433,12 +193,28 @@ filter_test_setup_unfiltered (FilterTest    *fixture,
 }
 
 static void
+filter_test_setup_unfiltered_root_expanded (FilterTest    *fixture,
+                                            gconstpointer  test_data)
+{
+  filter_test_setup_unfiltered (fixture, test_data);
+  filter_test_setup_expand_root (fixture);
+}
+
+static void
 filter_test_setup_empty_unfiltered (FilterTest    *fixture,
                                     gconstpointer  test_data)
 {
   filter_test_setup_generic (fixture, test_data, 3, TRUE, TRUE);
 }
 
+static void
+filter_test_setup_empty_unfiltered_root_expanded (FilterTest    *fixture,
+                                                  gconstpointer  test_data)
+{
+  filter_test_setup_empty_unfiltered (fixture, test_data);
+  filter_test_setup_expand_root (fixture);
+}
+
 static GtkTreePath *
 strip_virtual_root (GtkTreePath *path,
                     GtkTreePath *root_path)
@@ -463,6 +239,32 @@ strip_virtual_root (GtkTreePath *path,
   return real_path;
 }
 
+static int
+count_visible (FilterTest  *fixture,
+               GtkTreePath *store_path)
+{
+  int i;
+  int n_visible = 0;
+  GtkTreeIter iter;
+
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store),
+                           &iter, store_path);
+
+  for (i = 0; i < LEVEL_LENGTH; i++)
+    {
+      gboolean visible;
+
+      gtk_tree_model_get (GTK_TREE_MODEL (fixture->store), &iter,
+                          1, &visible,
+                          -1);
+
+      if (visible)
+        n_visible++;
+    }
+
+  return n_visible;
+}
+
 static void
 filter_test_append_refilter_signals_recurse (FilterTest  *fixture,
                                              GtkTreePath *store_path,
@@ -530,26 +332,48 @@ filter_test_append_refilter_signals_recurse (FilterTest  *fixture,
           /* This row will be inserted */
           signal_monitor_append_signal_path (fixture->monitor, ROW_CHANGED,
                                              real_path);
-          signal_monitor_append_signal_path (fixture->monitor,
-                                             ROW_HAS_CHILD_TOGGLED,
-                                             real_path);
 
-          if (depth > 1
-              && gtk_tree_model_iter_has_child (GTK_TREE_MODEL (fixture->store),
-                                                &iter))
+          if (gtk_tree_model_iter_has_child (GTK_TREE_MODEL (fixture->store),
+                                             &iter))
             {
-              GtkTreePath *store_copy;
-              GtkTreePath *filter_copy;
-
-              store_copy = gtk_tree_path_copy (store_path);
-              filter_copy = gtk_tree_path_copy (filter_path);
-              filter_test_append_refilter_signals_recurse (fixture,
-                                                           store_copy,
-                                                           filter_copy,
-                                                           depth - 1,
-                                                           root_path);
-              gtk_tree_path_free (store_copy);
-              gtk_tree_path_free (filter_copy);
+              signal_monitor_append_signal_path (fixture->monitor,
+                                                 ROW_HAS_CHILD_TOGGLED,
+                                                 real_path);
+
+              if (depth > 1)
+                {
+                  GtkTreePath *store_copy;
+                  GtkTreePath *filter_copy;
+
+                  store_copy = gtk_tree_path_copy (store_path);
+                  filter_copy = gtk_tree_path_copy (filter_path);
+                  filter_test_append_refilter_signals_recurse (fixture,
+                                                               store_copy,
+                                                               filter_copy,
+                                                               depth - 1,
+                                                               root_path);
+                  gtk_tree_path_free (store_copy);
+                  gtk_tree_path_free (filter_copy);
+                }
+              else if (depth == 1)
+                {
+                  GtkTreePath *tmp_path;
+
+                  /* If all child rows are invisible, then the last row to
+                   * become invisible will emit row-has-child-toggled on the
+                   * parent.
+                   */
+
+                  tmp_path = gtk_tree_path_copy (store_path);
+                  gtk_tree_path_append_index (tmp_path, 0);
+
+                  if (count_visible (fixture, tmp_path) == 0)
+                    signal_monitor_append_signal_path (fixture->monitor,
+                                                       ROW_HAS_CHILD_TOGGLED,
+                                                       real_path);
+
+                  gtk_tree_path_free (tmp_path);
+                }
             }
 
           gtk_tree_path_next (filter_path);
@@ -660,6 +484,8 @@ filter_test_teardown (FilterTest    *fixture,
 {
   signal_monitor_free (fixture->monitor);
 
+  gtk_widget_destroy (fixture->tree_view);
+
   g_object_unref (fixture->filter);
   g_object_unref (fixture->store);
 }
@@ -733,6 +559,9 @@ check_filter_model_recurse (FilterTest  *fixture,
                                           gtk_tree_path_copy (store_parent_path),
                                           tmp);
             }
+          else
+            /* Only when we do not recurse we need to free tmp */
+            gtk_tree_path_free (tmp);
 
           gtk_tree_path_next (filter_parent_path);
           filter_has_next = gtk_tree_model_iter_next (GTK_TREE_MODEL (fixture->filter), &filter_iter);
@@ -780,24 +609,26 @@ check_filter_model_with_root (FilterTest  *fixture,
 static void
 check_level_length (GtkTreeModelFilter *filter,
                     const gchar        *level,
-                    const int           length)
+                    const int           expected_length)
 {
   if (!level)
     {
-      int l = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), NULL);
-      g_return_if_fail (l == length);
+      int model_length;
+
+      model_length = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), NULL);
+      g_assert_cmpint (model_length, ==, expected_length);
     }
   else
     {
-      int l;
+      int model_length;
       gboolean retrieved_iter = FALSE;
       GtkTreeIter iter;
 
       retrieved_iter = gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (filter),
                                                             &iter, level);
       g_return_if_fail (retrieved_iter);
-      l = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), &iter);
-      g_return_if_fail (l == length);
+      model_length = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), &iter);
+      g_assert_cmpint (model_length, ==, expected_length);
     }
 }
 
@@ -908,6 +739,59 @@ static void
 filled_hide_child_levels (FilterTest    *fixture,
                           gconstpointer  user_data)
 {
+  set_path_visibility (fixture, "0:2", FALSE);
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0", LEVEL_LENGTH - 1);
+
+  set_path_visibility (fixture, "0:4", FALSE);
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0", LEVEL_LENGTH - 2);
+
+  set_path_visibility (fixture, "0:4:3", FALSE);
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0", LEVEL_LENGTH - 2);
+
+  set_path_visibility (fixture, "0:4:0", FALSE);
+  set_path_visibility (fixture, "0:4:1", FALSE);
+  set_path_visibility (fixture, "0:4:2", FALSE);
+  set_path_visibility (fixture, "0:4:4", FALSE);
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0", LEVEL_LENGTH - 2);
+
+  /* Since "0:2" is hidden, "0:4" must be "0:3" in the filter model */
+  set_path_visibility (fixture, "0:4", TRUE);
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, "0:3", 0);
+
+  set_path_visibility (fixture, "0:2", TRUE);
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, "0:2", LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0:3", LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0:4", 0);
+
+  /* Once 0:4:0 got inserted, 0:4 became a parent.  Because 0:4 is
+   * not visible, not signals are emitted.
+   */
+  set_path_visibility (fixture, "0:4:2", TRUE);
+  set_path_visibility (fixture, "0:4:4", TRUE);
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, "0:4", 2);
+}
+
+static void
+filled_hide_child_levels_root_expanded (FilterTest    *fixture,
+                                        gconstpointer  user_data)
+{
+  GtkTreePath *path;
+
+  path = gtk_tree_path_new_from_indices (0, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (fixture->tree_view), path, FALSE);
+  gtk_tree_path_free (path);
+
   signal_monitor_append_signal (fixture->monitor, ROW_DELETED, "0:2");
   set_path_visibility (fixture, "0:2", FALSE);
   check_filter_model (fixture);
@@ -935,10 +819,6 @@ filled_hide_child_levels (FilterTest    *fixture,
 
   /* Since "0:2" is hidden, "0:4" must be "0:3" in the filter model */
   signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0:3");
-  /* FIXME: Actually, the filter model should not be emitted the
-   * row-has-child-toggled signal here.  *However* an extraneous emission
-   * of this signal does not hurt and is allowed.
-   */
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0:3");
   set_path_visibility (fixture, "0:4", TRUE);
   check_filter_model (fixture);
@@ -952,13 +832,8 @@ filled_hide_child_levels (FilterTest    *fixture,
   check_level_length (fixture->filter, "0:3", LEVEL_LENGTH);
   check_level_length (fixture->filter, "0:4", 0);
 
-  signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0:4:0");
-  /* Once 0:4:0 got inserted, 0:4 became a parent */
+  /* has-child-toggled for 0:4 is required.  */
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0:4");
-  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0:4:0");
-  signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0:4:1");
-  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0:4:1");
-
   set_path_visibility (fixture, "0:4:2", TRUE);
   set_path_visibility (fixture, "0:4:4", TRUE);
   signal_monitor_assert_is_empty (fixture->monitor);
@@ -1101,6 +976,60 @@ filled_vroot_hide_child_levels (FilterTest    *fixture,
 {
   GtkTreePath *path = (GtkTreePath *)user_data;
 
+  set_path_visibility (fixture, "2:0:2", FALSE);
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0", LEVEL_LENGTH - 1);
+
+  set_path_visibility (fixture, "2:0:4", FALSE);
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0", LEVEL_LENGTH - 2);
+
+  set_path_visibility (fixture, "2:0:4:3", FALSE);
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0", LEVEL_LENGTH - 2);
+
+  set_path_visibility (fixture, "2:0:4:0", FALSE);
+  set_path_visibility (fixture, "2:0:4:1", FALSE);
+  set_path_visibility (fixture, "2:0:4:2", FALSE);
+  set_path_visibility (fixture, "2:0:4:4", FALSE);
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0", LEVEL_LENGTH - 2);
+
+  /* Since "0:2" is hidden, "0:4" must be "0:3" in the filter model */
+  set_path_visibility (fixture, "2:0:4", TRUE);
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, "0:3", 0);
+
+  set_path_visibility (fixture, "2:0:2", TRUE);
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, "0:2", LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0:3", LEVEL_LENGTH);
+  check_level_length (fixture->filter, "0:4", 0);
+
+  /* Once 0:4:0 got inserted, 0:4 became a parent. However, 0:4 is not
+   * visible, so no signal should be emitted.
+   */
+  set_path_visibility (fixture, "2:0:4:2", TRUE);
+  set_path_visibility (fixture, "2:0:4:4", TRUE);
+  check_level_length (fixture->filter, "0:4", 2);
+  signal_monitor_assert_is_empty (fixture->monitor);
+}
+
+static void
+filled_vroot_hide_child_levels_root_expanded (FilterTest    *fixture,
+                                              gconstpointer  user_data)
+{
+  GtkTreePath *path = (GtkTreePath *)user_data;
+  GtkTreePath *tmp_path;
+
+  tmp_path = gtk_tree_path_new_from_indices (0, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (fixture->tree_view), tmp_path, FALSE);
+  gtk_tree_path_free (tmp_path);
+
   signal_monitor_append_signal (fixture->monitor, ROW_DELETED, "0:2");
   set_path_visibility (fixture, "2:0:2", FALSE);
   check_filter_model_with_root (fixture, path);
@@ -1128,10 +1057,6 @@ filled_vroot_hide_child_levels (FilterTest    *fixture,
 
   /* Since "0:2" is hidden, "0:4" must be "0:3" in the filter model */
   signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0:3");
-  /* FIXME: Actually, the filter model should not be emitted the
-   * row-has-child-toggled signal here.  *However* an extraneous emission
-   * of this signal does not hurt and is allowed.
-   */
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0:3");
   set_path_visibility (fixture, "2:0:4", TRUE);
   check_filter_model_with_root (fixture, path);
@@ -1145,19 +1070,14 @@ filled_vroot_hide_child_levels (FilterTest    *fixture,
   check_level_length (fixture->filter, "0:3", LEVEL_LENGTH);
   check_level_length (fixture->filter, "0:4", 0);
 
-  /* FIXME: Inconsistency!  For the non-vroot case we also receive two
-   * row-has-child-toggled signals here.
-   */
-  signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0:4:0");
   /* Once 0:4:0 got inserted, 0:4 became a parent */
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0:4");
-  signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0:4:1");
   set_path_visibility (fixture, "2:0:4:2", TRUE);
   set_path_visibility (fixture, "2:0:4:4", TRUE);
   check_level_length (fixture->filter, "0:4", 2);
+  signal_monitor_assert_is_empty (fixture->monitor);
 }
 
-
 static void
 empty_show_nodes (FilterTest    *fixture,
                   gconstpointer  user_data)
@@ -1177,9 +1097,7 @@ empty_show_nodes (FilterTest    *fixture,
   check_level_length (fixture->filter, NULL, 1);
   check_level_length (fixture->filter, "0", 0);
 
-  signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0:0");
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0");
-  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0:0");
   set_path_visibility (fixture, "3:2", TRUE);
   check_filter_model (fixture);
   check_level_length (fixture->filter, NULL, 1);
@@ -1217,8 +1135,6 @@ empty_show_multiple_nodes (FilterTest    *fixture,
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0");
   signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "1");
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "1");
-  signal_monitor_append_signal (fixture->monitor, ROW_CHANGED, "1");
-  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "1");
 
   /* We simulate a change in visible func condition with this.  The
    * visibility state of multiple nodes changes at once, we emit row-changed
@@ -1233,6 +1149,7 @@ empty_show_multiple_nodes (FilterTest    *fixture,
   gtk_tree_path_append_index (changed_path, 2);
   gtk_tree_model_get_iter (GTK_TREE_MODEL (fixture->store),
                            &iter, changed_path);
+  /* Invisible node - so no signals expected */
   gtk_tree_model_row_changed (GTK_TREE_MODEL (fixture->store),
                               changed_path, &iter);
 
@@ -1257,9 +1174,7 @@ empty_show_multiple_nodes (FilterTest    *fixture,
   check_level_length (fixture->filter, NULL, 2);
   check_level_length (fixture->filter, "0", 0);
 
-  signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0:0");
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0");
-  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0:0");
   set_path_visibility (fixture, "3:2", TRUE);
   check_filter_model (fixture);
   check_level_length (fixture->filter, NULL, 2);
@@ -1451,9 +1366,28 @@ unfiltered_hide_single (FilterTest    *fixture,
   signal_monitor_assert_is_empty (fixture->monitor);
   check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
 
-  /* The view only shows the root level, so the filter model only has
-   * the first two levels cached.
+  /* The view only shows the root level, so we only expect signals
+   * for the root level.
    */
+  filter_test_append_refilter_signals (fixture, 1);
+  filter_test_enable_filter (fixture);
+
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH - 1);
+}
+
+static void
+unfiltered_hide_single_root_expanded (FilterTest    *fixture,
+                                      gconstpointer  user_data)
+
+{
+  signal_monitor_append_signal (fixture->monitor, ROW_CHANGED, "2");
+  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "2");
+  set_path_visibility (fixture, "2", FALSE);
+
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+
   filter_test_append_refilter_signals (fixture, 2);
   filter_test_enable_filter (fixture);
 
@@ -1466,6 +1400,29 @@ unfiltered_hide_single_child (FilterTest    *fixture,
                               gconstpointer  user_data)
 
 {
+  /* This row is not shown, so its signal is not propagated */
+  set_path_visibility (fixture, "2:2", FALSE);
+
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH);
+
+  /* The view only shows the root level, so we only expect signals
+   * for the root level.
+   */
+  filter_test_append_refilter_signals (fixture, 0);
+  filter_test_enable_filter (fixture);
+
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH - 1);
+}
+
+static void
+unfiltered_hide_single_child_root_expanded (FilterTest    *fixture,
+                                            gconstpointer  user_data)
+
+{
   signal_monitor_append_signal (fixture->monitor, ROW_CHANGED, "2:2");
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "2:2");
   set_path_visibility (fixture, "2:2", FALSE);
@@ -1474,9 +1431,6 @@ unfiltered_hide_single_child (FilterTest    *fixture,
   check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
   check_level_length (fixture->filter, "2", LEVEL_LENGTH);
 
-  /* The view only shows the root level, so the filter model only has
-   * the first two levels cached.
-   */
   filter_test_append_refilter_signals (fixture, 2);
   filter_test_enable_filter (fixture);
 
@@ -1493,6 +1447,40 @@ unfiltered_hide_single_multi_level (FilterTest    *fixture,
   /* This row is not shown, so its signal is not propagated */
   set_path_visibility (fixture, "2:2:2", FALSE);
 
+  /* This row is not shown, so its signal is not propagated */
+  set_path_visibility (fixture, "2:2", FALSE);
+
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2:2", LEVEL_LENGTH);
+
+  /* The view only shows the root level, so we only expect signals
+   * for the root level.
+   */
+  filter_test_append_refilter_signals (fixture, 1);
+  filter_test_enable_filter (fixture);
+
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH - 1);
+
+  set_path_visibility (fixture, "2:2", TRUE);
+
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2:2", LEVEL_LENGTH - 1);
+}
+
+static void
+unfiltered_hide_single_multi_level_root_expanded (FilterTest    *fixture,
+                                                  gconstpointer  user_data)
+
+{
+  /* This row is not shown, so its signal is not propagated */
+  set_path_visibility (fixture, "2:2:2", FALSE);
+
   signal_monitor_append_signal (fixture->monitor, ROW_CHANGED, "2:2");
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "2:2");
   set_path_visibility (fixture, "2:2", FALSE);
@@ -1502,9 +1490,6 @@ unfiltered_hide_single_multi_level (FilterTest    *fixture,
   check_level_length (fixture->filter, "2", LEVEL_LENGTH);
   check_level_length (fixture->filter, "2:2", LEVEL_LENGTH);
 
-  /* The view only shows the root level, so the filter model only has
-   * the first two levels cached.
-   */
   filter_test_append_refilter_signals (fixture, 2);
   filter_test_enable_filter (fixture);
 
@@ -1523,6 +1508,7 @@ unfiltered_hide_single_multi_level (FilterTest    *fixture,
 }
 
 
+
 static void
 unfiltered_vroot_hide_single (FilterTest    *fixture,
                               gconstpointer  user_data)
@@ -1537,11 +1523,11 @@ unfiltered_vroot_hide_single (FilterTest    *fixture,
   signal_monitor_assert_is_empty (fixture->monitor);
   check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
 
-  /* The view only shows the root level, so the filter model only has
-   * the first two levels cached.  (We add an additional level to
+  /* The view only shows the root level, so we only expect signals
+   * for the root level.  (Though for the depth argument, we have to
    * take the virtual root into account).
    */
-  filter_test_append_refilter_signals_with_vroot (fixture, 3, path);
+  filter_test_append_refilter_signals_with_vroot (fixture, 2, path);
   filter_test_enable_filter (fixture);
 
   check_filter_model_with_root (fixture, path);
@@ -1555,6 +1541,32 @@ unfiltered_vroot_hide_single_child (FilterTest    *fixture,
 {
   GtkTreePath *path = (GtkTreePath *)user_data;
 
+  /* Not visible, so no signal will be received. */
+  set_path_visibility (fixture, "2:2:2", FALSE);
+
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH);
+
+  /* The view only shows the root level, so we only expect signals
+   * for the root level.  (Though for the depth argument, we have to
+   * take the virtual root into account).
+   */
+  filter_test_append_refilter_signals_with_vroot (fixture, 2, path);
+  filter_test_enable_filter (fixture);
+
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH - 1);
+}
+
+static void
+unfiltered_vroot_hide_single_child_root_expanded (FilterTest    *fixture,
+                                                  gconstpointer  user_data)
+
+{
+  GtkTreePath *path = (GtkTreePath *)user_data;
+
   signal_monitor_append_signal (fixture->monitor, ROW_CHANGED, "2:2");
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "2:2");
   set_path_visibility (fixture, "2:2:2", FALSE);
@@ -1563,10 +1575,6 @@ unfiltered_vroot_hide_single_child (FilterTest    *fixture,
   check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
   check_level_length (fixture->filter, "2", LEVEL_LENGTH);
 
-  /* The view only shows the root level, so the filter model only has
-   * the first two levels cached.  (We add an additional level to take
-   * the virtual root into account).
-   */
   filter_test_append_refilter_signals_with_vroot (fixture, 3, path);
   filter_test_enable_filter (fixture);
 
@@ -1585,6 +1593,43 @@ unfiltered_vroot_hide_single_multi_level (FilterTest    *fixture,
   /* This row is not shown, so its signal is not propagated */
   set_path_visibility (fixture, "2:2:2:2", FALSE);
 
+  /* Not shown, so no signal */
+  set_path_visibility (fixture, "2:2:2", FALSE);
+
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2:2", LEVEL_LENGTH);
+
+  /* We only expect signals for the root level.  The depth is 2
+   * because we have to take the virtual root into account.
+   */
+  filter_test_append_refilter_signals_with_vroot (fixture, 2, path);
+  filter_test_enable_filter (fixture);
+
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH - 1);
+
+  /* Not shown, so no signal */
+  set_path_visibility (fixture, "2:2:2", TRUE);
+
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2:2", LEVEL_LENGTH - 1);
+}
+
+static void
+unfiltered_vroot_hide_single_multi_level_root_expanded (FilterTest    *fixture,
+                                                        gconstpointer  user_data)
+
+{
+  GtkTreePath *path = (GtkTreePath *)user_data;
+
+  /* This row is not shown, so its signal is not propagated */
+  set_path_visibility (fixture, "2:2:2:2", FALSE);
+
   signal_monitor_append_signal (fixture->monitor, ROW_CHANGED, "2:2");
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "2:2");
   set_path_visibility (fixture, "2:2:2", FALSE);
@@ -1594,9 +1639,6 @@ unfiltered_vroot_hide_single_multi_level (FilterTest    *fixture,
   check_level_length (fixture->filter, "2", LEVEL_LENGTH);
   check_level_length (fixture->filter, "2:2", LEVEL_LENGTH);
 
-  /* The view only shows the root level, so the filter model only has
-   * the first two levels cached.
-   */
   filter_test_append_refilter_signals_with_vroot (fixture, 3, path);
   filter_test_enable_filter (fixture);
 
@@ -1614,8 +1656,6 @@ unfiltered_vroot_hide_single_multi_level (FilterTest    *fixture,
   check_level_length (fixture->filter, "2:2", LEVEL_LENGTH - 1);
 }
 
-
-
 static void
 unfiltered_show_single (FilterTest    *fixture,
                         gconstpointer  user_data)
@@ -1628,10 +1668,8 @@ unfiltered_show_single (FilterTest    *fixture,
   signal_monitor_assert_is_empty (fixture->monitor);
   check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
 
-  /* The view only shows the root level, so the filter model only has
-   * the first two levels cached.
-   */
-  filter_test_append_refilter_signals (fixture, 2);
+  /* We only expect signals for the root level */
+  filter_test_append_refilter_signals (fixture, 1);
   filter_test_enable_filter (fixture);
 
   check_filter_model (fixture);
@@ -1643,6 +1681,35 @@ unfiltered_show_single_child (FilterTest    *fixture,
                               gconstpointer  user_data)
 
 {
+  set_path_visibility (fixture, "2:2", TRUE);
+
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH);
+
+  /* We only expect signals for the root level */
+  filter_test_append_refilter_signals (fixture, 1);
+  filter_test_enable_filter (fixture);
+
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, 0);
+
+  /* From here we are filtered, "2" in the real model is "0" in the filter
+   * model.
+   */
+  signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0");
+  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0");
+  set_path_visibility (fixture, "2", TRUE);
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, 1);
+  check_level_length (fixture->filter, "0", 1);
+}
+
+static void
+unfiltered_show_single_child_root_expanded (FilterTest    *fixture,
+                                            gconstpointer  user_data)
+
+{
   signal_monitor_append_signal (fixture->monitor, ROW_CHANGED, "2:2");
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "2:2");
   set_path_visibility (fixture, "2:2", TRUE);
@@ -1651,10 +1718,7 @@ unfiltered_show_single_child (FilterTest    *fixture,
   check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
   check_level_length (fixture->filter, "2", LEVEL_LENGTH);
 
-  /* The view only shows the root level, so the filter model only has
-   * the first two levels cached.
-   */
-  filter_test_append_refilter_signals (fixture, 3);
+  filter_test_append_refilter_signals (fixture, 2);
   filter_test_enable_filter (fixture);
 
   check_filter_model (fixture);
@@ -1676,6 +1740,41 @@ unfiltered_show_single_multi_level (FilterTest    *fixture,
                                     gconstpointer  user_data)
 
 {
+  /* The view is not showing these rows (collapsed state), so it is not
+   * referenced.  The signal should not go through.
+   */
+  set_path_visibility (fixture, "2:2:2", TRUE);
+  set_path_visibility (fixture, "2:2", TRUE);
+
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2:2", LEVEL_LENGTH);
+
+  /* We only expect signals for the first level */
+  filter_test_append_refilter_signals (fixture, 1);
+  filter_test_enable_filter (fixture);
+
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, 0);
+
+  /* From here we are filtered, "2" in the real model is "0" in the filter
+   * model.
+   */
+  signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0");
+  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0");
+  set_path_visibility (fixture, "2", TRUE);
+  check_filter_model (fixture);
+  check_level_length (fixture->filter, NULL, 1);
+  check_level_length (fixture->filter, "0", 1);
+  check_level_length (fixture->filter, "0:0", 1);
+}
+
+static void
+unfiltered_show_single_multi_level_root_expanded (FilterTest    *fixture,
+                                                  gconstpointer  user_data)
+
+{
   /* The view is not showing this row (collapsed state), so it is not
    * referenced.  The signal should not go through.
    */
@@ -1690,10 +1789,7 @@ unfiltered_show_single_multi_level (FilterTest    *fixture,
   check_level_length (fixture->filter, "2", LEVEL_LENGTH);
   check_level_length (fixture->filter, "2:2", LEVEL_LENGTH);
 
-  /* The view only shows the root level, so the filter model only has
-   * the first two levels cached.
-   */
-  filter_test_append_refilter_signals (fixture, 3);
+  filter_test_append_refilter_signals (fixture, 2);
   filter_test_enable_filter (fixture);
 
   check_filter_model (fixture);
@@ -1711,7 +1807,6 @@ unfiltered_show_single_multi_level (FilterTest    *fixture,
   check_level_length (fixture->filter, "0:0", 1);
 }
 
-
 static void
 unfiltered_vroot_show_single (FilterTest    *fixture,
                               gconstpointer  user_data)
@@ -1729,7 +1824,7 @@ unfiltered_vroot_show_single (FilterTest    *fixture,
   /* The view only shows the root level, so the filter model only has
    * the first two levels cached.
    */
-  filter_test_append_refilter_signals_with_vroot (fixture, 3, path);
+  filter_test_append_refilter_signals_with_vroot (fixture, 2, path);
   filter_test_enable_filter (fixture);
 
   check_filter_model_with_root (fixture, path);
@@ -1743,8 +1838,6 @@ unfiltered_vroot_show_single_child (FilterTest    *fixture,
 {
   GtkTreePath *path = (GtkTreePath *)user_data;
 
-  signal_monitor_append_signal (fixture->monitor, ROW_CHANGED, "2:2");
-  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "2:2");
   set_path_visibility (fixture, "2:2:2", TRUE);
 
   signal_monitor_assert_is_empty (fixture->monitor);
@@ -1772,6 +1865,39 @@ unfiltered_vroot_show_single_child (FilterTest    *fixture,
 }
 
 static void
+unfiltered_vroot_show_single_child_root_expanded (FilterTest    *fixture,
+                                                  gconstpointer  user_data)
+
+{
+  GtkTreePath *path = (GtkTreePath *)user_data;
+
+  signal_monitor_append_signal (fixture->monitor, ROW_CHANGED, "2:2");
+  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "2:2");
+  set_path_visibility (fixture, "2:2:2", TRUE);
+
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH);
+
+  filter_test_append_refilter_signals_with_vroot (fixture, 3, path);
+  filter_test_enable_filter (fixture);
+
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, NULL, 0);
+
+  /* From here we are filtered, "2" in the real model is "0" in the filter
+   * model.
+   */
+  signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0");
+  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0");
+  set_path_visibility (fixture, "2:2", TRUE);
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, 1);
+  check_level_length (fixture->filter, "0", 1);
+}
+
+
+static void
 unfiltered_vroot_show_single_multi_level (FilterTest    *fixture,
                                           gconstpointer  user_data)
 
@@ -1783,6 +1909,44 @@ unfiltered_vroot_show_single_multi_level (FilterTest    *fixture,
    */
   set_path_visibility (fixture, "2:2:2:2", TRUE);
 
+  set_path_visibility (fixture, "2:2:2", TRUE);
+
+  signal_monitor_assert_is_empty (fixture->monitor);
+  check_level_length (fixture->filter, NULL, LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2", LEVEL_LENGTH);
+  check_level_length (fixture->filter, "2:2", LEVEL_LENGTH);
+
+  /* We only expect signals for the root level */
+  filter_test_append_refilter_signals_with_vroot (fixture, 2, path);
+  filter_test_enable_filter (fixture);
+
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, NULL, 0);
+
+  /* From here we are filtered, "2" in the real model is "0" in the filter
+   * model.
+   */
+  signal_monitor_append_signal (fixture->monitor, ROW_INSERTED, "0");
+  signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "0");
+  set_path_visibility (fixture, "2:2", TRUE);
+  check_filter_model_with_root (fixture, path);
+  check_level_length (fixture->filter, NULL, 1);
+  check_level_length (fixture->filter, "0", 1);
+  check_level_length (fixture->filter, "0:0", 1);
+}
+
+static void
+unfiltered_vroot_show_single_multi_level_root_expanded (FilterTest    *fixture,
+                                                        gconstpointer  user_data)
+
+{
+  GtkTreePath *path = (GtkTreePath *)user_data;
+
+  /* The view is not showing this row (collapsed state), so it is not
+   * referenced.  The signal should not go through.
+   */
+  set_path_visibility (fixture, "2:2:2:2", TRUE);
+
   signal_monitor_append_signal (fixture->monitor, ROW_CHANGED, "2:2");
   signal_monitor_append_signal (fixture->monitor, ROW_HAS_CHILD_TOGGLED, "2:2");
   set_path_visibility (fixture, "2:2:2", TRUE);
@@ -1792,10 +1956,7 @@ unfiltered_vroot_show_single_multi_level (FilterTest    *fixture,
   check_level_length (fixture->filter, "2", LEVEL_LENGTH);
   check_level_length (fixture->filter, "2:2", LEVEL_LENGTH);
 
-  /* The view only shows the root level, so the filter model only has
-   * the first two levels cached.
-   */
-  filter_test_append_refilter_signals_with_vroot (fixture, 4, path);
+  filter_test_append_refilter_signals_with_vroot (fixture, 3, path);
   filter_test_enable_filter (fixture);
 
   check_filter_model_with_root (fixture, path);
@@ -1813,6 +1974,1332 @@ unfiltered_vroot_show_single_multi_level (FilterTest    *fixture,
   check_level_length (fixture->filter, "0:0", 1);
 }
 
+static void
+unfiltered_rows_reordered_root_level (FilterTest    *fixture,
+                                      gconstpointer  user_data)
+{
+  int order0[] = { 1, 2, 3, 4, 0 };
+  int order1[] = { 0, 2, 1, 3, 4 };
+  int order2[] = { 4, 0, 1, 2, 3 };
+  GtkTreeIter iter0, iter1, iter2, iter3, iter4;
+  GtkTreePath *path;
+
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter0, "0");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter1, "1");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter2, "2");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter3, "3");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter4, "4");
+
+  path = gtk_tree_path_new ();
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order0, 5);
+  gtk_tree_store_move_after (fixture->store, &iter0, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order1, 5);
+  gtk_tree_store_move_after (fixture->store, &iter2, &iter3);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order2, 5);
+  gtk_tree_store_move_before (fixture->store, &iter0, &iter1);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_path_free (path);
+}
+
+static void
+unfiltered_rows_reordered_child_level (FilterTest    *fixture,
+                                       gconstpointer  user_data)
+{
+  int order0[] = { 1, 2, 3, 4, 0 };
+  int order1[] = { 0, 2, 1, 3, 4 };
+  int order2[] = { 4, 0, 1, 2, 3 };
+  GtkTreeIter iter0, iter1, iter2, iter3, iter4;
+  GtkTreePath *path;
+
+  /* Expand row 0 */
+  path = gtk_tree_path_new_from_indices (0, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (fixture->tree_view), path, FALSE);
+
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter0, "0:0");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter1, "0:1");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter2, "0:2");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter3, "0:3");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter4, "0:4");
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order0, 5);
+  gtk_tree_store_move_after (fixture->store, &iter0, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order1, 5);
+  gtk_tree_store_move_after (fixture->store, &iter2, &iter3);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order2, 5);
+  gtk_tree_store_move_before (fixture->store, &iter0, &iter1);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_path_free (path);
+}
+
+static void
+filtered_rows_reordered_root_level_first_hidden (FilterTest    *fixture,
+                                                 gconstpointer  user_data)
+{
+  int order0[] = { 1, 2, 3, 0 };
+  int order1[] = { 0, 2, 1, 3 };
+  int order2[] = { 3, 0, 1, 2 };
+  GtkTreeIter iter1, iter2, iter3, iter4;
+  GtkTreePath *path;
+
+  /* Hide middle path */
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0");
+  set_path_visibility (fixture, "0", FALSE);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter1, "1");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter2, "2");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter3, "3");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter4, "4");
+
+  path = gtk_tree_path_new ();
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order0, 4);
+  gtk_tree_store_move_after (fixture->store, &iter1, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order1, 4);
+  gtk_tree_store_move_after (fixture->store, &iter3, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order2, 4);
+  gtk_tree_store_move_before (fixture->store, &iter1, &iter2);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_path_free (path);
+}
+
+static void
+filtered_rows_reordered_root_level_middle_hidden (FilterTest    *fixture,
+                                                  gconstpointer  user_data)
+{
+  int order0[] = { 1, 2, 3, 0 };
+  int order1[] = { 0, 2, 1, 3 };
+  int order2[] = { 3, 0, 1, 2 };
+  GtkTreeIter iter0, iter1, iter3, iter4;
+  GtkTreePath *path;
+
+  /* Hide middle path */
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "2");
+  set_path_visibility (fixture, "2", FALSE);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter0, "0");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter1, "1");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter3, "3");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter4, "4");
+
+  path = gtk_tree_path_new ();
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order0, 4);
+  gtk_tree_store_move_after (fixture->store, &iter0, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order1, 4);
+  gtk_tree_store_move_after (fixture->store, &iter3, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order2, 4);
+  gtk_tree_store_move_before (fixture->store, &iter0, &iter1);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_path_free (path);
+}
+
+static void
+filtered_rows_reordered_child_level_first_hidden (FilterTest    *fixture,
+                                                  gconstpointer  user_data)
+{
+  int order0[] = { 1, 2, 3, 0 };
+  int order1[] = { 0, 2, 1, 3 };
+  int order2[] = { 3, 0, 1, 2 };
+  GtkTreeIter iter1, iter2, iter3, iter4;
+  GtkTreePath *path;
+
+  /* Expand row 0 */
+  path = gtk_tree_path_new_from_indices (0, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (fixture->tree_view), path, TRUE);
+
+  /* Hide middle path */
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:0");
+  set_path_visibility (fixture, "0:0", FALSE);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter1, "0:1");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter2, "0:2");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter3, "0:3");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter4, "0:4");
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order0, 4);
+  gtk_tree_store_move_after (fixture->store, &iter1, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order1, 4);
+  gtk_tree_store_move_after (fixture->store, &iter3, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order2, 4);
+  gtk_tree_store_move_before (fixture->store, &iter1, &iter2);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_path_free (path);
+}
+
+static void
+filtered_rows_reordered_child_level_middle_hidden (FilterTest    *fixture,
+                                                   gconstpointer  user_data)
+{
+  int order0[] = { 1, 2, 3, 0 };
+  int order1[] = { 0, 2, 1, 3 };
+  int order2[] = { 3, 0, 1, 2 };
+  GtkTreeIter iter0, iter1, iter3, iter4;
+  GtkTreePath *path;
+
+  /* Expand row 0 */
+  path = gtk_tree_path_new_from_indices (0, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (fixture->tree_view), path, FALSE);
+
+  /* Hide middle path */
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:2");
+  set_path_visibility (fixture, "0:2", FALSE);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter0, "0:0");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter1, "0:1");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter3, "0:3");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter4, "0:4");
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order0, 4);
+  gtk_tree_store_move_after (fixture->store, &iter0, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order1, 4);
+  gtk_tree_store_move_after (fixture->store, &iter3, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order2, 4);
+  gtk_tree_store_move_before (fixture->store, &iter0, &iter1);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_path_free (path);
+}
+
+static void
+filtered_rows_reordered_child_level_4_hidden (FilterTest    *fixture,
+                                              gconstpointer  user_data)
+{
+  int order0[] = { 0 };
+  GtkTreeIter iter1, iter4;
+  GtkTreePath *path;
+
+  /* Expand row 0 */
+  path = gtk_tree_path_new_from_indices (0, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (fixture->tree_view), path, FALSE);
+
+  /* Hide last 4 paths */
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:4");
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:3");
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:2");
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:0");
+  set_path_visibility (fixture, "0:4", FALSE);
+  set_path_visibility (fixture, "0:3", FALSE);
+  set_path_visibility (fixture, "0:2", FALSE);
+  set_path_visibility (fixture, "0:0", FALSE);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter1, "0:1");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter4, "0:4");
+
+  signal_monitor_append_signal_reordered (fixture->monitor,
+                                          ROWS_REORDERED,
+                                          path, order0, 1);
+  gtk_tree_store_move_after (fixture->store, &iter1, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_path_free (path);
+}
+
+static void
+filtered_rows_reordered_child_level_all_hidden (FilterTest    *fixture,
+                                                gconstpointer  user_data)
+{
+  GtkTreeIter iter1, iter4;
+  GtkTreePath *path;
+
+  /* Expand row 0 */
+  path = gtk_tree_path_new_from_indices (0, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (fixture->tree_view), path, FALSE);
+  gtk_tree_path_free (path);
+
+  /* Hide last 4 paths */
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:4");
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:3");
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:2");
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:1");
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_DELETED, "0:0");
+  signal_monitor_append_signal (fixture->monitor,
+                                ROW_HAS_CHILD_TOGGLED, "0");
+  set_path_visibility (fixture, "0:4", FALSE);
+  set_path_visibility (fixture, "0:3", FALSE);
+  set_path_visibility (fixture, "0:2", FALSE);
+  set_path_visibility (fixture, "0:1", FALSE);
+  set_path_visibility (fixture, "0:0", FALSE);
+  signal_monitor_assert_is_empty (fixture->monitor);
+
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter1, "0:1");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture->store),
+                                       &iter4, "0:4");
+
+  gtk_tree_store_move_after (fixture->store, &iter1, &iter4);
+  signal_monitor_assert_is_empty (fixture->monitor);
+}
+
+static void
+insert_before (void)
+{
+  GtkTreeStore *store;
+  GtkTreeModel *filter;
+  GtkWidget *tree_view;
+  SignalMonitor *monitor;
+  GtkTreeIter iter;
+  GtkTreeIter last_iter;
+  GtkTreePath *path;
+
+  /* This tests two aspects of the row-inserted handling:
+   *   1) If the newly inserted node was already handled by building
+   *      the root level, don't handle it a second time.
+   *   2) Offsets of existing nodes must be updated when a new
+   *      node is inserted.
+   */
+
+  store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+  filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
+  gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (filter),
+                                            1);
+
+  tree_view = gtk_tree_view_new_with_model (filter);
+  monitor = signal_monitor_new (filter);
+
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 0);
+
+  /* Insert 0 */
+  path = gtk_tree_path_new_from_indices (0, -1);
+  signal_monitor_append_signal_path (monitor, ROW_INSERTED, path);
+  gtk_tree_path_free (path);
+
+  gtk_tree_store_insert_with_values (store, &iter, NULL, 0,
+                                     0, "Foo", 1, TRUE, -1);
+
+  signal_monitor_assert_is_empty (monitor);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 1);
+
+  /* Insert 1 */
+  path = gtk_tree_path_new_from_indices (1, -1);
+  signal_monitor_append_signal_path (monitor, ROW_INSERTED, path);
+  gtk_tree_path_free (path);
+
+  gtk_tree_store_insert_with_values (store, &iter, NULL, 1,
+                                     0, "Foo", 1, TRUE, -1);
+  last_iter = iter;
+
+  signal_monitor_assert_is_empty (monitor);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 2);
+
+  /* Insert on 1 again -- invisible */
+  gtk_tree_store_insert_with_values (store, &iter, NULL, 1,
+                                     0, "Foo", 1, FALSE, -1);
+
+  signal_monitor_assert_is_empty (monitor);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 2);
+
+  /* Insert on 1 again -- visible */
+  path = gtk_tree_path_new_from_indices (1, -1);
+  signal_monitor_append_signal_path (monitor, ROW_INSERTED, path);
+  gtk_tree_path_free (path);
+
+  gtk_tree_store_insert_with_values (store, &iter, NULL, 1,
+                                     0, "Foo", 1, TRUE, -1);
+
+  signal_monitor_assert_is_empty (monitor);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 3);
+
+  /* Modify the iter that should be at the last position and check the
+   * signal we get.
+   */
+  path = gtk_tree_path_new_from_indices (2, -1);
+  signal_monitor_append_signal_path (monitor, ROW_CHANGED, path);
+  gtk_tree_path_free (path);
+
+  gtk_tree_store_set (store, &last_iter, 0, "Foo changed", -1);
+
+  signal_monitor_assert_is_empty (monitor);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 3);
+}
+
+static void
+insert_child (void)
+{
+  GtkTreeStore *store;
+  GtkTreeModel *filter;
+  GtkWidget *tree_view;
+  SignalMonitor *monitor;
+  GtkTreeIter parent, iter;
+  GtkTreePath *path;
+
+  store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+
+  gtk_tree_store_insert_with_values (store, &parent, NULL, 0,
+                                     0, "Parent", 1, TRUE, -1);
+
+
+  filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
+  gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (filter),
+                                            1);
+
+  tree_view = gtk_tree_view_new_with_model (filter);
+  monitor = signal_monitor_new (filter);
+
+  /* Insert child -- invisible */
+  path = gtk_tree_path_new_from_indices (0, -1);
+  signal_monitor_append_signal_path (monitor, ROW_HAS_CHILD_TOGGLED, path);
+  /* The signal is received twice, once a pass through from GtkTreeStore
+   * and one generated by GtkTreeModelFilter.  Not accurate, but cannot
+   * hurt.
+   */
+  signal_monitor_append_signal_path (monitor, ROW_HAS_CHILD_TOGGLED, path);
+  gtk_tree_path_free (path);
+
+  gtk_tree_store_insert_with_values (store, &iter, &parent, 1,
+                                     0, "Child", 1, FALSE, -1);
+
+  signal_monitor_assert_is_empty (monitor);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 1);
+
+  /* Insert child */
+  path = gtk_tree_path_new_from_indices (0, 0, -1);
+  gtk_tree_path_up (path); /* 0 */
+  signal_monitor_append_signal_path (monitor, ROW_HAS_CHILD_TOGGLED, path);
+  gtk_tree_path_free (path);
+
+  gtk_tree_store_insert_with_values (store, &iter, &parent, 0,
+                                     0, "Child", 1, TRUE, -1);
+
+  signal_monitor_assert_is_empty (monitor);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 1);
+
+  /* Insert child -- invisible */
+  gtk_tree_store_insert_with_values (store, &iter, &parent, 1,
+                                     0, "Child", 1, FALSE, -1);
+
+  signal_monitor_assert_is_empty (monitor);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 1);
+}
+
+
+
+static void
+remove_node (void)
+{
+  GtkTreeIter iter, iter1, iter2, iter3;
+  GtkListStore *list;
+  GtkTreeModel *filter;
+  GtkWidget *view G_GNUC_UNUSED;
+
+  list = gtk_list_store_new (1, G_TYPE_INT);
+  gtk_list_store_insert_with_values (list, &iter1, 0, 0, 1, -1);
+  gtk_list_store_insert_with_values (list, &iter, 1, 0, 2, -1);
+  gtk_list_store_insert_with_values (list, &iter, 2, 0, 3, -1);
+  gtk_list_store_insert_with_values (list, &iter, 3, 0, 4, -1);
+  gtk_list_store_insert_with_values (list, &iter, 4, 0, 5, -1);
+  gtk_list_store_insert_with_values (list, &iter, 5, 0, 6, -1);
+  gtk_list_store_insert_with_values (list, &iter2, 6, 0, 7, -1);
+  gtk_list_store_insert_with_values (list, &iter3, 7, 0, 8, -1);
+
+  filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (list), NULL);
+  view = gtk_tree_view_new_with_model (filter);
+
+  gtk_list_store_remove (list, &iter1);
+  gtk_list_store_remove (list, &iter3);
+  gtk_list_store_remove (list, &iter2);
+
+  gtk_widget_destroy (view);
+  g_object_unref (filter);
+  g_object_unref (list);
+}
+
+static void
+remove_node_vroot (void)
+{
+  GtkTreeIter parent, root;
+  GtkTreeIter iter, iter1, iter2, iter3;
+  GtkTreeStore *tree;
+  GtkTreeModel *filter;
+  GtkTreePath *path;
+  GtkWidget *view G_GNUC_UNUSED;
+
+  tree = gtk_tree_store_new (1, G_TYPE_INT);
+  gtk_tree_store_insert_with_values (tree, &parent, NULL, 0, 0, 0, -1);
+  gtk_tree_store_insert_with_values (tree, &root, &parent, 0, 0, 0, -1);
+
+  gtk_tree_store_insert_with_values (tree, &iter1, &root, 0, 0, 1, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, &root, 1, 0, 2, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, &root, 2, 0, 3, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, &root, 3, 0, 4, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, &root, 4, 0, 5, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, &root, 5, 0, 6, -1);
+  gtk_tree_store_insert_with_values (tree, &iter2, &root, 6, 0, 7, -1);
+  gtk_tree_store_insert_with_values (tree, &iter3, &root, 7, 0, 8, -1);
+
+  path = gtk_tree_path_new_from_indices (0, 0, -1);
+  filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (tree), path);
+  gtk_tree_path_free (path);
+
+  view = gtk_tree_view_new_with_model (filter);
+
+  gtk_tree_store_remove (tree, &iter1);
+  gtk_tree_store_remove (tree, &iter3);
+  gtk_tree_store_remove (tree, &iter2);
+
+  gtk_widget_destroy (view);
+  g_object_unref (filter);
+  g_object_unref (tree);
+}
+
+static void
+remove_vroot_ancestor (void)
+{
+  GtkTreeIter parent, root;
+  GtkTreeIter iter, iter1, iter2, iter3;
+  GtkTreeStore *tree;
+  GtkTreeModel *filter;
+  GtkTreePath *path;
+  GtkWidget *view G_GNUC_UNUSED;
+
+  tree = gtk_tree_store_new (1, G_TYPE_INT);
+  gtk_tree_store_insert_with_values (tree, &parent, NULL, 0, 0, 0, -1);
+  gtk_tree_store_insert_with_values (tree, &root, &parent, 0, 0, 0, -1);
+
+  gtk_tree_store_insert_with_values (tree, &iter1, &root, 0, 0, 1, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, &root, 1, 0, 2, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, &root, 2, 0, 3, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, &root, 3, 0, 4, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, &root, 4, 0, 5, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, &root, 5, 0, 6, -1);
+  gtk_tree_store_insert_with_values (tree, &iter2, &root, 6, 0, 7, -1);
+  gtk_tree_store_insert_with_values (tree, &iter3, &root, 7, 0, 8, -1);
+
+  path = gtk_tree_path_new_from_indices (0, 0, -1);
+  filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (tree), path);
+  gtk_tree_path_free (path);
+
+  view = gtk_tree_view_new_with_model (filter);
+
+  gtk_tree_store_remove (tree, &parent);
+
+  gtk_widget_destroy (view);
+  g_object_unref (filter);
+  g_object_unref (tree);
+}
+
+static void
+ref_count_single_level (void)
+{
+  GtkTreeIter iter[5];
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *filter_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter[0], NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter[1], NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter[2], NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter[3], NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter[4], NULL);
+
+  assert_root_level_unreferenced (ref_model);
+
+  filter_model = gtk_tree_model_filter_new (model, NULL);
+  tree_view = gtk_tree_view_new_with_model (filter_model);
+
+  assert_node_ref_count (ref_model, &iter[0], 2);
+  assert_node_ref_count (ref_model, &iter[1], 1);
+  assert_node_ref_count (ref_model, &iter[2], 1);
+  assert_node_ref_count (ref_model, &iter[3], 1);
+  assert_node_ref_count (ref_model, &iter[4], 1);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_node_ref_count (ref_model, &iter[0], 1);
+  assert_node_ref_count (ref_model, &iter[1], 0);
+  assert_node_ref_count (ref_model, &iter[2], 0);
+  assert_node_ref_count (ref_model, &iter[3], 0);
+  assert_node_ref_count (ref_model, &iter[4], 0);
+
+  g_object_unref (filter_model);
+
+  assert_node_ref_count (ref_model, &iter[0], 0);
+
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_two_levels (void)
+{
+  GtkTreeIter parent1, parent2, iter, iter_first;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *filter_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_first, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  filter_model = gtk_tree_model_filter_new (model, NULL);
+  tree_view = gtk_tree_view_new_with_model (filter_model);
+
+  /* This is quite confusing:
+   *  - node 0 has a ref count of 2 because it is referenced as the
+   *    first node in a level and by the tree view.
+   *  - node 1 has a ref count of 2 because it is referenced by its
+   *    child level and by the tree view.
+   */
+  assert_root_level_referenced (ref_model, 2);
+  assert_node_ref_count (ref_model, &iter_first, 1);
+  assert_node_ref_count (ref_model, &iter, 0);
+
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  assert_node_ref_count (ref_model, &parent1, 2);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_first, 2);
+  assert_node_ref_count (ref_model, &iter, 1);
+
+  gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
+
+  /* The child level is not destroyed because its parent is visible */
+  assert_node_ref_count (ref_model, &parent1, 2);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_first, 1);
+  assert_node_ref_count (ref_model, &iter, 0);
+
+  gtk_tree_model_filter_clear_cache (GTK_TREE_MODEL_FILTER (filter_model));
+
+  assert_node_ref_count (ref_model, &parent1, 2);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_first, 1);
+  assert_node_ref_count (ref_model, &iter, 0);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_node_ref_count (ref_model, &iter_first, 1);
+  assert_node_ref_count (ref_model, &iter, 0);
+
+  gtk_tree_model_filter_clear_cache (GTK_TREE_MODEL_FILTER (filter_model));
+
+  /* Only the reference on the first node of the root level is kept. */
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_node_ref_count (ref_model, &iter_first, 0);
+  assert_node_ref_count (ref_model, &iter, 0);
+
+  g_object_unref (filter_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_three_levels (void)
+{
+  GtkTreeIter grandparent1, grandparent2, parent1, parent2;
+  GtkTreeIter iter_parent1, iter_parent2, iter_parent2_first;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *filter_model;
+  GtkTreePath *path;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   * + grandparent2
+   *   + parent1
+   *     + iter_parent1
+   *   + parent2
+   *     + iter_parent2_first
+   *     + iter_parent2
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent1, &parent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2_first, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  filter_model = gtk_tree_model_filter_new (model, NULL);
+  tree_view = gtk_tree_view_new_with_model (filter_model);
+
+  /* This is quite confusing:
+   *  - node 0 has a ref count of 2 because it is referenced as the
+   *    first node in a level and by the tree view.
+   *  - node 1 has a ref count of 2 because it is referenced by its
+   *    child level and by the tree view.
+   */
+  assert_root_level_referenced (ref_model, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_level_unreferenced (ref_model, &parent1);
+  assert_level_unreferenced (ref_model, &parent2);
+
+  path = gtk_tree_path_new_from_indices (1, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, FALSE);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 3);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, TRUE);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 3);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 2);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 2);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 2);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_model_filter_clear_cache (GTK_TREE_MODEL_FILTER (filter_model));
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, FALSE);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 3);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_path_append_index (path, 1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, FALSE);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 3);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 2);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_tree_view_collapse_row (GTK_TREE_VIEW (tree_view), path);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 3);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_model_filter_clear_cache (GTK_TREE_MODEL_FILTER (filter_model));
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 3);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_path_up (path);
+  gtk_tree_view_collapse_row (GTK_TREE_VIEW (tree_view), path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 2);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_model_filter_clear_cache (GTK_TREE_MODEL_FILTER (filter_model));
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_widget_destroy (tree_view);
+
+  gtk_tree_model_filter_clear_cache (GTK_TREE_MODEL_FILTER (filter_model));
+
+  /* Only the reference on the first node of the root level is kept. */
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 0);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  g_object_unref (filter_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_delete_row (void)
+{
+  GtkTreeIter grandparent1, grandparent2, parent1, parent2;
+  GtkTreeIter iter_parent1, iter_parent2, iter_parent2_first;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *filter_model;
+  GtkTreePath *path;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   * + grandparent2
+   *   + parent1
+   *     + iter_parent1
+   *   + parent2
+   *     + iter_parent2_first
+   *     + iter_parent2
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent1, &parent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2_first, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  filter_model = gtk_tree_model_filter_new (model, NULL);
+  tree_view = gtk_tree_view_new_with_model (filter_model);
+
+  assert_root_level_referenced (ref_model, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_level_unreferenced (ref_model, &parent1);
+  assert_level_unreferenced (ref_model, &parent2);
+
+  path = gtk_tree_path_new_from_indices (1, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, TRUE);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 3);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 2);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 2);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &iter_parent2);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 3);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 2);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 2);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &parent1);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent2, 3);
+  assert_level_referenced (ref_model, 2, &parent2);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &grandparent2);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+
+  gtk_tree_model_filter_clear_cache (GTK_TREE_MODEL_FILTER (filter_model));
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+
+  gtk_widget_destroy (tree_view);
+  gtk_tree_model_filter_clear_cache (GTK_TREE_MODEL_FILTER (filter_model));
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+
+  g_object_unref (filter_model);
+
+  assert_node_ref_count (ref_model, &grandparent1, 0);
+
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_cleanup (void)
+{
+  GtkTreeIter grandparent1, grandparent2, parent1, parent2;
+  GtkTreeIter iter_parent1, iter_parent2, iter_parent2_first;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *filter_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   * + grandparent2
+   *   + parent1
+   *     + iter_parent1
+   *   + parent2
+   *     + iter_parent2_first
+   *     + iter_parent2
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent1, &parent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2_first, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+
+  filter_model = gtk_tree_model_filter_new (model, NULL);
+  tree_view = gtk_tree_view_new_with_model (filter_model);
+
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 3);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 2);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 2);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 1);
+  assert_node_ref_count (ref_model, &parent1, 2);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_model_filter_clear_cache (GTK_TREE_MODEL_FILTER (filter_model));
+
+  /* Only the reference on the first node of the root level is kept. */
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 0);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  g_object_unref (filter_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_row_ref (void)
+{
+  GtkTreeIter grandparent1, grandparent2, parent1, parent2;
+  GtkTreeIter iter_parent1, iter_parent2, iter_parent2_first;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *filter_model;
+  GtkWidget *tree_view;
+  GtkTreePath *path;
+  GtkTreeRowReference *row_ref;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   * + grandparent2
+   *   + parent1
+   *     + iter_parent1
+   *   + parent2
+   *     + iter_parent2
+   *     + iter_parent2
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent1, &parent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2_first, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+
+  filter_model = gtk_tree_model_filter_new (model, NULL);
+  tree_view = gtk_tree_view_new_with_model (filter_model);
+
+  path = gtk_tree_path_new_from_indices (1, 1, 1, -1);
+  row_ref = gtk_tree_row_reference_new (filter_model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 3);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_tree_row_reference_free (row_ref);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  path = gtk_tree_path_new_from_indices (1, 1, 1, -1);
+  row_ref = gtk_tree_row_reference_new (filter_model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 3);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2_first, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &parent2);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+
+  gtk_tree_row_reference_free (row_ref);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+
+  gtk_widget_destroy (tree_view);
+
+  gtk_tree_model_filter_clear_cache (GTK_TREE_MODEL_FILTER (filter_model));
+
+  /* Only the reference on the first node of the root level is kept. */
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 0);
+  assert_node_ref_count (ref_model, &parent1, 0);
+
+  g_object_unref (filter_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_transfer_root_level_insert (void)
+{
+  GtkTreeIter grandparent1, grandparent2, grandparent3;
+  GtkTreeIter new_node;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *filter_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   * + grandparent2
+   * + grandparent3
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent3, NULL);
+
+  filter_model = gtk_tree_model_filter_new (model, NULL);
+  tree_view = gtk_tree_view_new_with_model (filter_model);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 1);
+  assert_node_ref_count (ref_model, &grandparent3, 1);
+
+  gtk_tree_store_prepend (GTK_TREE_STORE (model), &new_node, NULL);
+
+  assert_node_ref_count (ref_model, &new_node, 2);
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 1);
+  assert_node_ref_count (ref_model, &grandparent3, 1);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (filter_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_transfer_root_level_reordered (void)
+{
+  GtkTreeIter grandparent1, grandparent2, grandparent3;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *filter_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   * + grandparent2
+   * + grandparent3
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent3, NULL);
+
+  filter_model = gtk_tree_model_filter_new (model, NULL);
+  tree_view = gtk_tree_view_new_with_model (filter_model);
+
+  assert_node_ref_count (ref_model, &grandparent1, 2);
+  assert_node_ref_count (ref_model, &grandparent2, 1);
+  assert_node_ref_count (ref_model, &grandparent3, 1);
+
+  /* gtk_tree_store_move() will emit rows-reordered */
+  gtk_tree_store_move_after (GTK_TREE_STORE (model),
+                             &grandparent1, &grandparent3);
+
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &grandparent3, 1);
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (filter_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_transfer_child_level_insert (void)
+{
+  GtkTreeIter grandparent1;
+  GtkTreeIter parent1, parent2, parent3;
+  GtkTreeIter new_node;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *filter_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   *   + parent1
+   *   + parent2
+   *   + parent3
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent3, &grandparent1);
+
+  filter_model = gtk_tree_model_filter_new (model, NULL);
+  tree_view = gtk_tree_view_new_with_model (filter_model);
+
+  assert_node_ref_count (ref_model, &grandparent1, 3);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_node_ref_count (ref_model, &parent3, 0);
+
+  gtk_tree_store_prepend (GTK_TREE_STORE (model), &new_node, &grandparent1);
+
+  assert_node_ref_count (ref_model, &grandparent1, 3);
+  assert_node_ref_count (ref_model, &new_node, 1);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_node_ref_count (ref_model, &parent3, 0);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (filter_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_transfer_child_level_reordered (void)
+{
+  GtkTreeIter grandparent1;
+  GtkTreeIter parent1, parent2, parent3;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *filter_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   *   + parent1
+   *   + parent2
+   *   + parent3
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent3, &grandparent1);
+
+  filter_model = gtk_tree_model_filter_new (model, NULL);
+  tree_view = gtk_tree_view_new_with_model (filter_model);
+
+  assert_node_ref_count (ref_model, &grandparent1, 3);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_node_ref_count (ref_model, &parent3, 0);
+
+  /* gtk_tree_store_move() will emit rows-reordered */
+  gtk_tree_store_move_after (GTK_TREE_STORE (model),
+                             &parent1, &parent3);
+
+  assert_node_ref_count (ref_model, &grandparent1, 3);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &parent3, 0);
+  assert_node_ref_count (ref_model, &parent1, 0);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (filter_model);
+  g_object_unref (ref_model);
+}
+
 
 static gboolean
 specific_path_dependent_filter_func (GtkTreeModel *model,
@@ -1866,6 +3353,10 @@ specific_path_dependent_filter (void)
                                          NULL, 2))
         gtk_list_store_remove (list, &iter);
     }
+
+  g_object_unref (filter);
+  g_object_unref (sort);
+  g_object_unref (list);
 }
 
 
@@ -2078,6 +3569,8 @@ specific_sort_filter_remove_root (void)
   sort = gtk_tree_model_sort_new_with_model (model);
   filter = gtk_tree_model_filter_new (sort, path);
 
+  gtk_tree_path_free (path);
+
   gtk_tree_store_remove (GTK_TREE_STORE (model), &root);
 
   g_object_unref (filter);
@@ -2138,13 +3631,15 @@ specific_has_child_filter (void)
 {
   GtkTreeModel *filter;
   GtkTreeIter iter, root;
-  /* A bit nasty, apologies */
-  FilterTest fixture;
+  FilterTest fixture; /* This is not how it should be done */
+  GtkWidget *tree_view;
 
   fixture.store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN);
   filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (fixture.store), NULL);
   fixture.filter = GTK_TREE_MODEL_FILTER (filter);
-  fixture.monitor = NULL;
+  fixture.monitor = signal_monitor_new (filter);
+
+  tree_view = gtk_tree_view_new_with_model (filter);
 
   /* We will filter on parent state using a filter function.  We will
    * manually keep the boolean column in sync, so that we can use
@@ -2158,11 +3653,20 @@ specific_has_child_filter (void)
                                           specific_has_child_filter_filter_func,
                                           NULL, NULL);
 
+  /* The first node will be initially invisible: no signals */
   gtk_tree_store_append (fixture.store, &root, NULL);
   create_tree_store_set_values (fixture.store, &root, FALSE);
 
   /* check_filter_model (&fixture); */
   check_level_length (fixture.filter, NULL, 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Insert a child node. This will cause the parent to become visible
+   * since there is a child now.
+   */
+  signal_monitor_append_signal (fixture.monitor, ROW_INSERTED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
 
   gtk_tree_store_append (fixture.store, &iter, &root);
   create_tree_store_set_values (fixture.store, &iter, TRUE);
@@ -2173,12 +3677,27 @@ specific_has_child_filter (void)
    */
   check_level_length (fixture.filter, NULL, 1);
   check_level_length (fixture.filter, "0", 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* This should propagate row-changed */
+  signal_monitor_append_signal (fixture.monitor, ROW_CHANGED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
 
   set_path_visibility (&fixture, "0", TRUE);
   /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
 
+  /* New root node, no child, so no signal */
   gtk_tree_store_append (fixture.store, &root, NULL);
   check_level_length (fixture.filter, NULL, 1);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* When the child comes in, this node will become visible */
+  signal_monitor_append_signal (fixture.monitor, ROW_INSERTED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_CHANGED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "1");
 
   gtk_tree_store_append (fixture.store, &iter, &root);
   check_level_length (fixture.filter, NULL, 2);
@@ -2188,14 +3707,19 @@ specific_has_child_filter (void)
   create_tree_store_set_values (fixture.store, &iter, TRUE);
 
   /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
 
+  /* Add another child for 1 */
   gtk_tree_store_append (fixture.store, &iter, &root);
   create_tree_store_set_values (fixture.store, &iter, TRUE);
   check_level_length (fixture.filter, NULL, 2);
   check_level_length (fixture.filter, "0", 0);
   check_level_length (fixture.filter, "1", 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
 
   /* Now remove one of the remaining child rows */
+  signal_monitor_append_signal (fixture.monitor, ROW_DELETED, "0");
+
   gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture.store),
                                        &iter, "0:0");
   gtk_tree_store_remove (fixture.store, &iter);
@@ -2205,6 +3729,7 @@ specific_has_child_filter (void)
 
   set_path_visibility (&fixture, "0", FALSE);
   /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
 }
 
 
@@ -2231,17 +3756,21 @@ specific_root_has_child_filter (void)
 {
   GtkTreeModel *filter;
   GtkTreeIter iter, root;
-  /* A bit nasty, apologies */
-  FilterTest fixture;
+  FilterTest fixture; /* This is not how it should be done ... */
+  GtkWidget *tree_view;
 
-  /* This is a variation on the above test case wherein the has-child
-   * check for visibility only applies to root level nodes.
+  /* This is a variation on the above test case, specific has-child-filter,
+   * herein the has-child check for visibility only applies to root level
+   * nodes.  In this test, children are always visible because we
+   * only filter based on the "has child" criterion.
    */
 
   fixture.store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN);
   filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (fixture.store), NULL);
   fixture.filter = GTK_TREE_MODEL_FILTER (filter);
-  fixture.monitor = NULL;
+  fixture.monitor = signal_monitor_new (filter);
+
+  tree_view = gtk_tree_view_new_with_model (filter);
 
   /* We will filter on parent state using a filter function.  We will
    * manually keep the boolean column in sync, so that we can use
@@ -2255,14 +3784,34 @@ specific_root_has_child_filter (void)
                                           specific_root_has_child_filter_filter_func,
                                           NULL, NULL);
 
+  /* Add a first node, this will be invisible initially, so no signal
+   * should be emitted.
+   */
   gtk_tree_store_append (fixture.store, &root, NULL);
   create_tree_store_set_values (fixture.store, &root, FALSE);
 
+  signal_monitor_assert_is_empty (fixture.monitor);
   /* check_filter_model (&fixture); */
   check_level_length (fixture.filter, NULL, 0);
 
+  /* Add a child node.  This will cause the parent to become visible,
+   * so we expect row-inserted signals for both.
+   */
+  signal_monitor_append_signal (fixture.monitor, ROW_INSERTED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+
   gtk_tree_store_append (fixture.store, &iter, &root);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  check_level_length (fixture.filter, NULL, 1);
+  check_level_length (fixture.filter, "0", 1);
+
+  /* Modify the content of iter, no signals because the parent is not
+   * expanded.
+   */
   create_tree_store_set_values (fixture.store, &iter, TRUE);
+  signal_monitor_assert_is_empty (fixture.monitor);
 
   /* Parent must now be visible.  Do the level length check first,
    * to avoid modifying the child model triggering a row-changed to
@@ -2271,37 +3820,375 @@ specific_root_has_child_filter (void)
   check_level_length (fixture.filter, NULL, 1);
   check_level_length (fixture.filter, "0", 1);
 
+  /* Modify path 0 */
+  signal_monitor_append_signal (fixture.monitor, ROW_CHANGED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+
   set_path_visibility (&fixture, "0", TRUE);
   /* check_filter_model (&fixture); */
 
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Insert another node in the root level.  Initially invisible, so
+   * not expecting any signal.
+   */
   gtk_tree_store_append (fixture.store, &root, NULL);
   check_level_length (fixture.filter, NULL, 1);
 
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Adding a child node which also makes parent at path 1 visible. */
+  signal_monitor_append_signal (fixture.monitor, ROW_INSERTED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "1");
+
   gtk_tree_store_append (fixture.store, &iter, &root);
   check_level_length (fixture.filter, NULL, 2);
   check_level_length (fixture.filter, "1", 1);
 
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Check if row-changed is propagated */
+  signal_monitor_append_signal (fixture.monitor, ROW_CHANGED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "1");
+
   create_tree_store_set_values (fixture.store, &root, TRUE);
   create_tree_store_set_values (fixture.store, &iter, TRUE);
-
   /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
 
+  /* Insert another child under node 1 */
   gtk_tree_store_append (fixture.store, &iter, &root);
   create_tree_store_set_values (fixture.store, &iter, TRUE);
   check_level_length (fixture.filter, NULL, 2);
   check_level_length (fixture.filter, "0", 1);
   check_level_length (fixture.filter, "1", 2);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Set a child node to invisible.  This should not yield any
+   * change, because filtering is only done on whether the root
+   * node has a child, which it still has.
+   */
+  set_path_visibility (&fixture, "0:0", FALSE);
+  signal_monitor_assert_is_empty (fixture.monitor);
 
   /* Now remove one of the remaining child rows */
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_DELETED, "0");
+
   gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture.store),
                                        &iter, "0:0");
   gtk_tree_store_remove (fixture.store, &iter);
 
   check_level_length (fixture.filter, NULL, 1);
   check_level_length (fixture.filter, "0", 2);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Set visibility of 0 to FALSE, no-op for filter model since
+   * the child 0:0 is already gone
+   */
+  set_path_visibility (&fixture, "0", FALSE);
+  /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
+}
+
+static void
+specific_has_child_filter_on_sort_model (void)
+{
+  GtkTreeModel *filter;
+  GtkTreeModel *sort_model;
+  GtkTreeIter iter, root;
+  FilterTest fixture; /* This is not how it should be done */
+  GtkWidget *tree_view;
+
+  fixture.store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+  sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (fixture.store));
+  filter = gtk_tree_model_filter_new (sort_model, NULL);
+  fixture.filter = GTK_TREE_MODEL_FILTER (filter);
+  fixture.monitor = signal_monitor_new (filter);
+
+  tree_view = gtk_tree_view_new_with_model (filter);
+
+  /* We will filter on parent state using a filter function.  We will
+   * manually keep the boolean column in sync, so that we can use
+   * check_filter_model() to check the consistency of the model.
+   */
+  /* FIXME: We need a check_filter_model() that is not tied to LEVEL_LENGTH
+   * to be able to check the structure here.  We keep the calls to
+   * check_filter_model() commented out until then.
+   */
+  gtk_tree_model_filter_set_visible_func (fixture.filter,
+                                          specific_has_child_filter_filter_func,
+                                          NULL, NULL);
+
+  /* The first node will be initially invisible: no signals */
+  gtk_tree_store_append (fixture.store, &root, NULL);
+  create_tree_store_set_values (fixture.store, &root, FALSE);
+
+  /* check_filter_model (&fixture); */
+  check_level_length (fixture.filter, NULL, 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Insert a child node. This will cause the parent to become visible
+   * since there is a child now.
+   */
+  signal_monitor_append_signal (fixture.monitor, ROW_INSERTED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+
+  gtk_tree_store_append (fixture.store, &iter, &root);
+  create_tree_store_set_values (fixture.store, &iter, TRUE);
+
+  /* Parent must now be visible.  Do the level length check first,
+   * to avoid modifying the child model triggering a row-changed to
+   * the filter model.
+   */
+  check_level_length (fixture.filter, NULL, 1);
+  check_level_length (fixture.filter, "0", 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* This should propagate row-changed */
+  signal_monitor_append_signal (fixture.monitor, ROW_CHANGED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+
+  set_path_visibility (&fixture, "0", TRUE);
+  /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* New root node, no child, so no signal */
+  gtk_tree_store_append (fixture.store, &root, NULL);
+  check_level_length (fixture.filter, NULL, 1);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* When the child comes in, this node will become visible */
+  signal_monitor_append_signal (fixture.monitor, ROW_INSERTED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_CHANGED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "1");
+
+  gtk_tree_store_append (fixture.store, &iter, &root);
+  check_level_length (fixture.filter, NULL, 2);
+  check_level_length (fixture.filter, "1", 0);
+
+  create_tree_store_set_values (fixture.store, &root, TRUE);
+  create_tree_store_set_values (fixture.store, &iter, TRUE);
+
+  /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Add another child for 1 */
+  gtk_tree_store_append (fixture.store, &iter, &root);
+  create_tree_store_set_values (fixture.store, &iter, TRUE);
+  check_level_length (fixture.filter, NULL, 2);
+  check_level_length (fixture.filter, "0", 0);
+  check_level_length (fixture.filter, "1", 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Now remove one of the remaining child rows */
+  signal_monitor_append_signal (fixture.monitor, ROW_DELETED, "0");
+
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture.store),
+                                       &iter, "0:0");
+  gtk_tree_store_remove (fixture.store, &iter);
+
+  check_level_length (fixture.filter, NULL, 1);
+  check_level_length (fixture.filter, "0", 0);
 
   set_path_visibility (&fixture, "0", FALSE);
   /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
+}
+
+static gboolean
+specific_at_least_2_children_filter_filter_func (GtkTreeModel *model,
+                                                 GtkTreeIter  *iter,
+                                                 gpointer      data)
+{
+  return gtk_tree_model_iter_n_children (model, iter) >= 2;
+}
+
+static void
+specific_at_least_2_children_filter (void)
+{
+  GtkTreeModel *filter;
+  GtkTreeIter iter, root;
+  FilterTest fixture; /* This is not how it should be done */
+  GtkWidget *tree_view;
+
+  fixture.store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+  filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (fixture.store), NULL);
+  fixture.filter = GTK_TREE_MODEL_FILTER (filter);
+  fixture.monitor = signal_monitor_new (filter);
+
+  tree_view = gtk_tree_view_new_with_model (filter);
+
+  gtk_tree_model_filter_set_visible_func (fixture.filter,
+                                          specific_at_least_2_children_filter_filter_func,
+                                          NULL, NULL);
+
+  /* The first node will be initially invisible: no signals */
+  gtk_tree_store_append (fixture.store, &root, NULL);
+  create_tree_store_set_values (fixture.store, &root, FALSE);
+
+  /* check_filter_model (&fixture); */
+  check_level_length (fixture.filter, NULL, 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Insert a child node.  Nothing should happen.
+   */
+  gtk_tree_store_append (fixture.store, &iter, &root);
+  create_tree_store_set_values (fixture.store, &iter, TRUE);
+
+  check_level_length (fixture.filter, NULL, 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Insert a second child node.  This will cause the parent to become
+   * visible.
+   */
+  signal_monitor_append_signal (fixture.monitor, ROW_INSERTED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+
+  gtk_tree_store_append (fixture.store, &iter, &root);
+  create_tree_store_set_values (fixture.store, &iter, TRUE);
+
+  /* Parent must now be visible.  Do the level length check first,
+   * to avoid modifying the child model triggering a row-changed to
+   * the filter model.
+   */
+  check_level_length (fixture.filter, NULL, 1);
+  check_level_length (fixture.filter, "0", 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* This should propagate row-changed */
+  signal_monitor_append_signal (fixture.monitor, ROW_CHANGED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+
+  set_path_visibility (&fixture, "0", TRUE);
+  /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* New root node, no child, so no signal */
+  gtk_tree_store_append (fixture.store, &root, NULL);
+  check_level_length (fixture.filter, NULL, 1);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* First child, no signal, no change */
+  gtk_tree_store_append (fixture.store, &iter, &root);
+  check_level_length (fixture.filter, NULL, 1);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* When the second child comes in, this node will become visible */
+  signal_monitor_append_signal (fixture.monitor, ROW_INSERTED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_CHANGED, "1");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "1");
+
+  gtk_tree_store_append (fixture.store, &iter, &root);
+  check_level_length (fixture.filter, NULL, 2);
+  check_level_length (fixture.filter, "1", 0);
+
+  create_tree_store_set_values (fixture.store, &root, TRUE);
+  create_tree_store_set_values (fixture.store, &iter, TRUE);
+
+  /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Add another child for 1 */
+  gtk_tree_store_append (fixture.store, &iter, &root);
+  create_tree_store_set_values (fixture.store, &iter, TRUE);
+  check_level_length (fixture.filter, NULL, 2);
+  check_level_length (fixture.filter, "0", 0);
+  check_level_length (fixture.filter, "1", 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Now remove one of the remaining child rows */
+  signal_monitor_append_signal (fixture.monitor, ROW_DELETED, "0");
+
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (fixture.store),
+                                       &iter, "0:0");
+  gtk_tree_store_remove (fixture.store, &iter);
+
+  check_level_length (fixture.filter, NULL, 1);
+  check_level_length (fixture.filter, "0", 0);
+
+  set_path_visibility (&fixture, "0", FALSE);
+  /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
+}
+
+static void
+specific_at_least_2_children_filter_on_sort_model (void)
+{
+  GtkTreeModel *filter;
+  GtkTreeModel *sort_model;
+  GtkTreeIter iter, root;
+  FilterTest fixture; /* This is not how it should be done */
+  GtkWidget *tree_view;
+
+  fixture.store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+  sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (fixture.store));
+  filter = gtk_tree_model_filter_new (sort_model, NULL);
+  fixture.filter = GTK_TREE_MODEL_FILTER (filter);
+  fixture.monitor = signal_monitor_new (filter);
+
+  tree_view = gtk_tree_view_new_with_model (filter);
+
+  gtk_tree_model_filter_set_visible_func (fixture.filter,
+                                          specific_at_least_2_children_filter_filter_func,
+                                          NULL, NULL);
+
+  /* The first node will be initially invisible: no signals */
+  gtk_tree_store_append (fixture.store, &root, NULL);
+  create_tree_store_set_values (fixture.store, &root, FALSE);
+
+  /* check_filter_model (&fixture); */
+  check_level_length (fixture.filter, NULL, 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* Insert a child node.  Nothing should happen.
+   */
+  gtk_tree_store_append (fixture.store, &iter, &root);
+  create_tree_store_set_values (fixture.store, &iter, TRUE);
+
+  check_level_length (fixture.filter, NULL, 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+    {
+      GtkTreePath *path = gtk_tree_path_new_from_indices (0, 0, -1);
+      GtkTreeRowReference *ref;
+
+      ref = gtk_tree_row_reference_new (sort_model, path);
+      gtk_tree_path_free (path);
+    }
+
+  /* Insert a second child node.  This will cause the parent to become
+   * visible.
+   */
+  signal_monitor_append_signal (fixture.monitor, ROW_INSERTED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+
+  gtk_tree_store_append (fixture.store, &iter, &root);
+  create_tree_store_set_values (fixture.store, &iter, TRUE);
+
+  /* Parent must now be visible.  Do the level length check first,
+   * to avoid modifying the child model triggering a row-changed to
+   * the filter model.
+   */
+  check_level_length (fixture.filter, NULL, 1);
+  check_level_length (fixture.filter, "0", 0);
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* This should propagate row-changed */
+  signal_monitor_append_signal (fixture.monitor, ROW_CHANGED, "0");
+  signal_monitor_append_signal (fixture.monitor, ROW_HAS_CHILD_TOGGLED, "0");
+
+  set_path_visibility (&fixture, "0", TRUE);
+  /* check_filter_model (&fixture); */
+  signal_monitor_assert_is_empty (fixture.monitor);
+
+  /* New root node, no child, so no signal */
+  gtk_tree_store_append (fixture.store, &root, NULL);
+  check_level_length (fixture.filter, NULL, 1);
+  signal_monitor_assert_is_empty (fixture.monitor);
 }
 
 
@@ -2365,43 +4252,150 @@ specific_list_store_clear (void)
 }
 
 static void
-specific_bug_300089 (void)
+specific_sort_ref_leaf_and_remove_ancestor (void)
 {
-  /* Test case for GNOME Bugzilla bug 300089.  Written by
-   * Matthias Clasen.
-   */
-  GtkTreeModel *sort_model, *child_model;
+  GtkTreeIter iter, child, child2, child3;
+  GtkTreeStore *tree;
+  GtkTreeModel *sort;
   GtkTreePath *path;
-  GtkTreeIter iter, iter2, sort_iter;
+  GtkTreeRowReference *rowref;
+  GtkWidget *view G_GNUC_UNUSED;
 
-  child_model = GTK_TREE_MODEL (gtk_tree_store_new (1, G_TYPE_STRING));
+  tree = gtk_tree_store_new (1, G_TYPE_INT);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 0, 0, 1, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 1, 0, 2, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 2, 0, 3, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 3, 0, 4, -1);
 
-  gtk_tree_store_append (GTK_TREE_STORE (child_model), &iter, NULL);
-  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter, 0, "A", -1);
-  gtk_tree_store_append (GTK_TREE_STORE (child_model), &iter, NULL);
-  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter, 0, "B", -1);
+  gtk_tree_store_insert_with_values (tree, &child, &iter, 0, 0, 50, -1);
+  gtk_tree_store_insert_with_values (tree, &child2, &child, 0, 0, 6, -1);
+  gtk_tree_store_insert_with_values (tree, &child3, &child2, 0, 0, 7, -1);
 
-  gtk_tree_store_append (GTK_TREE_STORE (child_model), &iter2, &iter);
-  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter2, 0, "D", -1);
-  gtk_tree_store_append (GTK_TREE_STORE (child_model), &iter2, &iter);
-  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter2, 0, "E", -1);
+  sort = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (tree));
+  view = gtk_tree_view_new_with_model (sort);
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (view));
 
-  gtk_tree_store_append (GTK_TREE_STORE (child_model), &iter, NULL);
-  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter, 0, "C", -1);
+  path = gtk_tree_path_new_from_indices (3, 0, 0, 0, -1);
+  rowref = gtk_tree_row_reference_new (sort, path);
+  gtk_tree_path_free (path);
 
+  path = gtk_tree_path_new_from_indices (3, 0, 0, 0, -1);
+  rowref = gtk_tree_row_reference_new (sort, path);
+  gtk_tree_path_free (path);
 
-  sort_model = GTK_TREE_MODEL (gtk_tree_model_sort_new_with_model (child_model));
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
-                                        0, GTK_SORT_ASCENDING);
+  path = gtk_tree_path_new_from_indices (3, 0, -1);
+  rowref = gtk_tree_row_reference_new (sort, path);
+  gtk_tree_path_free (path);
 
-  path = gtk_tree_path_new_from_indices (1, 1, -1);
+  path = gtk_tree_path_new_from_indices (3, -1);
+  rowref = gtk_tree_row_reference_new (sort, path);
+  gtk_tree_path_free (path);
 
-  /* make sure a level is constructed */ 
-  gtk_tree_model_get_iter (sort_model, &sort_iter, path);
+  /* Deleting a parent */
+  path = gtk_tree_path_new_from_indices (3, 0, -1);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (tree), &iter, path);
+  gtk_tree_store_remove (tree, &iter);
+  gtk_tree_path_free (path);
 
-  /* change the "E" row in a way that causes it to change position */ 
-  gtk_tree_model_get_iter (child_model, &iter, path);
-  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter, 0, "A", -1);
+  gtk_tree_row_reference_free (rowref);
+}
+
+static void
+specific_ref_leaf_and_remove_ancestor (void)
+{
+  GtkTreeIter iter, child, child2, child3;
+  GtkTreeStore *tree;
+  GtkTreeModel *filter;
+  GtkTreePath *path;
+  GtkTreeRowReference *rowref;
+  GtkWidget *view G_GNUC_UNUSED;
+
+  tree = gtk_tree_store_new (1, G_TYPE_INT);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 0, 0, 1, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 1, 0, 2, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 2, 0, 3, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 3, 0, 4, -1);
+
+  gtk_tree_store_insert_with_values (tree, &child, &iter, 0, 0, 50, -1);
+  gtk_tree_store_insert_with_values (tree, &child2, &child, 0, 0, 6, -1);
+  gtk_tree_store_insert_with_values (tree, &child3, &child2, 0, 0, 7, -1);
+
+  filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (tree), NULL);
+  view = gtk_tree_view_new_with_model (filter);
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (view));
+
+  path = gtk_tree_path_new_from_indices (3, 0, 0, 0, -1);
+  rowref = gtk_tree_row_reference_new (filter, path);
+  gtk_tree_path_free (path);
+
+  path = gtk_tree_path_new_from_indices (3, 0, 0, 0, -1);
+  rowref = gtk_tree_row_reference_new (filter, path);
+  gtk_tree_path_free (path);
+
+  path = gtk_tree_path_new_from_indices (3, 0, -1);
+  rowref = gtk_tree_row_reference_new (filter, path);
+  gtk_tree_path_free (path);
+
+  path = gtk_tree_path_new_from_indices (3, -1);
+  rowref = gtk_tree_row_reference_new (filter, path);
+  gtk_tree_path_free (path);
+
+  /* Deleting a parent */
+  path = gtk_tree_path_new_from_indices (3, 0, -1);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (tree), &iter, path);
+  gtk_tree_store_remove (tree, &iter);
+  gtk_tree_path_free (path);
+
+  gtk_tree_row_reference_free (rowref);
+}
+
+static void
+specific_virtual_ref_leaf_and_remove_ancestor (void)
+{
+  GtkTreeIter iter, child, child2, child3;
+  GtkTreeStore *tree;
+  GtkTreeModel *filter;
+  GtkTreePath *path;
+  GtkTreeRowReference *rowref;
+  GtkWidget *view G_GNUC_UNUSED;
+
+  tree = gtk_tree_store_new (1, G_TYPE_INT);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 0, 0, 1, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 1, 0, 2, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 2, 0, 3, -1);
+  gtk_tree_store_insert_with_values (tree, &iter, NULL, 3, 0, 4, -1);
+
+  gtk_tree_store_insert_with_values (tree, &child, &iter, 0, 0, 50, -1);
+  gtk_tree_store_insert_with_values (tree, &child2, &child, 0, 0, 6, -1);
+  gtk_tree_store_insert_with_values (tree, &child3, &child2, 0, 0, 7, -1);
+
+  /* Set a virtual root of 3:0 */
+  path = gtk_tree_path_new_from_indices (3, 0, -1);
+  filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (tree), path);
+  gtk_tree_path_free (path);
+
+  view = gtk_tree_view_new_with_model (filter);
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (view));
+
+  path = gtk_tree_path_new_from_indices (0, 0, -1);
+  rowref = gtk_tree_row_reference_new (filter, path);
+  gtk_tree_path_free (path);
+
+  path = gtk_tree_path_new_from_indices (0, 0, -1);
+  rowref = gtk_tree_row_reference_new (filter, path);
+  gtk_tree_path_free (path);
+
+  path = gtk_tree_path_new_from_indices (0, -1);
+  rowref = gtk_tree_row_reference_new (filter, path);
+  gtk_tree_path_free (path);
+
+  /* Deleting the virtual root */
+  path = gtk_tree_path_new_from_indices (3, 0, -1);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (tree), &iter, path);
+  gtk_tree_store_remove (tree, &iter);
+  gtk_tree_path_free (path);
+
+  gtk_tree_row_reference_free (rowref);
 }
 
 
@@ -2433,6 +4427,8 @@ specific_bug_301558 (void)
   int i;
   gboolean add;
 
+  g_test_bug ("301558");
+
   tree = gtk_tree_store_new (2, G_TYPE_INT, G_TYPE_BOOLEAN);
   gtk_tree_store_append (tree, &iter, NULL);
   gtk_tree_store_set (tree, &iter, 0, 123, 1, TRUE, -1);
@@ -2505,6 +4501,9 @@ specific_bug_311955 (void)
   GtkWidget *tree_view;
   int i;
   int n;
+  GtkTreePath *path;
+
+  g_test_bug ("311955");
 
   store = gtk_tree_store_new (1, G_TYPE_INT);
 
@@ -2533,6 +4532,9 @@ specific_bug_311955 (void)
   while (gtk_events_pending ())
     gtk_main_iteration ();
 
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 2);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), "0", 1);
+
   /* Fill model */
   for (i = 0; i < 4; i++)
     {
@@ -2553,6 +4555,9 @@ specific_bug_311955 (void)
   while (gtk_events_pending ())
     gtk_main_iteration ();
 
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), "0", 3);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), "0:2", 1);
+
   /* Remove bottommost child from the tree. */
   gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &root);
   n = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), &root);
@@ -2564,6 +4569,86 @@ specific_bug_311955 (void)
     }
   else
     g_assert_not_reached ();
+
+  path = gtk_tree_path_new_from_indices (0, 2, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, FALSE);
+  gtk_tree_path_free (path);
+
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), "0", 3);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), "0:2", 0);
+}
+
+static void
+specific_bug_311955_clean (void)
+{
+  /* Cleaned up version of the test case for GNOME Bugzilla bug 311955,
+   * which is easier to understand.
+   */
+  GtkTreeIter iter, child, grandchild;
+  GtkTreeStore *store;
+  GtkTreeModel *sort;
+  GtkTreeModel *filter;
+
+  GtkWidget *tree_view;
+  GtkTreePath *path;
+
+  store = gtk_tree_store_new (1, G_TYPE_INT);
+
+  gtk_tree_store_append (store, &iter, NULL);
+  gtk_tree_store_set (store, &iter, 0, 1, -1);
+
+  gtk_tree_store_append (store, &child, &iter);
+  gtk_tree_store_set (store, &child, 0, 1, -1);
+
+  sort = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (store));
+  filter = gtk_tree_model_filter_new (sort, NULL);
+
+  gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter),
+                                          specific_bug_311955_filter_func,
+                                          NULL, NULL);
+
+  tree_view = gtk_tree_view_new_with_model (filter);
+  g_object_unref (store);
+
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  while (gtk_events_pending ())
+    gtk_main_iteration ();
+
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), NULL, 1);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), "0", 1);
+
+  gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter);
+
+  gtk_tree_store_append (store, &child, &iter);
+  gtk_tree_store_set (store, &child, 0, 0, -1);
+
+  gtk_tree_store_append (store, &child, &iter);
+  gtk_tree_store_set (store, &child, 0, 1, -1);
+
+  gtk_tree_store_append (store, &child, &iter);
+  gtk_tree_store_set (store, &child, 0, 1, -1);
+
+  gtk_tree_store_append (store, &grandchild, &child);
+  gtk_tree_store_set (store, &grandchild, 0, 1, -1);
+
+  gtk_tree_store_append (store, &child, &iter);
+  /* Don't set a value: assume 0 */
+
+  /* Remove leaf node, check trigger row-has-child-toggled */
+  path = gtk_tree_path_new_from_indices (0, 3, 0, -1);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
+  gtk_tree_path_free (path);
+  gtk_tree_store_remove (store, &iter);
+
+  path = gtk_tree_path_new_from_indices (0, 2, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, FALSE);
+  gtk_tree_path_free (path);
+
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), "0", 3);
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), "0:2", 0);
+
+  gtk_widget_destroy (tree_view);
 }
 
 static void
@@ -2587,6 +4672,8 @@ specific_bug_346800 (void)
   store = gtk_tree_store_newv (2, columns);
   model = GTK_TREE_MODEL (store);
 
+  g_test_bug ("346800");
+
   filter = GTK_TREE_MODEL_FILTER (gtk_tree_model_filter_new (model, NULL));
   gtk_tree_model_filter_set_visible_column (filter, 1);
 
@@ -2622,45 +4709,6 @@ specific_bug_346800 (void)
     }
 }
 
-
-static void
-specific_bug_364946 (void)
-{
-  /* This is a test case for GNOME Bugzilla bug 364946.  It was written
-   * by Andreas Koehler.
-   */
-  GtkTreeStore *store;
-  GtkTreeIter a, aa, aaa, aab, iter;
-  GtkTreeModel *s_model;
-
-  store = gtk_tree_store_new (1, G_TYPE_STRING);
-
-  gtk_tree_store_append (store, &a, NULL);
-  gtk_tree_store_set (store, &a, 0, "0", -1);
-
-  gtk_tree_store_append (store, &aa, &a);
-  gtk_tree_store_set (store, &aa, 0, "0:0", -1);
-
-  gtk_tree_store_append (store, &aaa, &aa);
-  gtk_tree_store_set (store, &aaa, 0, "0:0:0", -1);
-
-  gtk_tree_store_append (store, &aab, &aa);
-  gtk_tree_store_set (store, &aab, 0, "0:0:1", -1);
-
-  s_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (store));
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (s_model), 0,
-                                        GTK_SORT_ASCENDING);
-
-  gtk_tree_model_get_iter_from_string (s_model, &iter, "0:0:0");
-
-  gtk_tree_store_set (store, &aaa, 0, "0:0:0", -1);
-  gtk_tree_store_remove (store, &aaa);
-  gtk_tree_store_remove (store, &aab);
-
-  gtk_tree_model_sort_clear_cache (GTK_TREE_MODEL_SORT (s_model));
-}
-
-
 static gboolean
 specific_bug_464173_visible_func (GtkTreeModel *model,
                                   GtkTreeIter  *iter,
@@ -2683,6 +4731,8 @@ specific_bug_464173 (void)
   GtkWidget *view G_GNUC_UNUSED;
   gboolean visible = TRUE;
 
+  g_test_bug ("464173");
+
   model = gtk_tree_store_new (1, G_TYPE_STRING);
   gtk_tree_store_append (model, &iter1, NULL);
   gtk_tree_store_set (model, &iter1, 0, "Foo", -1);
@@ -2725,6 +4775,8 @@ specific_bug_540201 (void)
 
   GtkWidget *tree_view G_GNUC_UNUSED;
 
+  g_test_bug ("540201");
+
   store = gtk_tree_store_new (1, G_TYPE_INT);
 
   gtk_tree_store_append (store, &root, NULL);
@@ -2776,6 +4828,8 @@ specific_bug_549287 (void)
   GtkTreeIter iter;
   GtkTreeIter *swap, *parent, *child;
 
+  g_test_bug ("529287");
+
   store = gtk_tree_store_new (1, G_TYPE_STRING);
   filtered = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
   gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filtered),
@@ -2821,180 +4875,582 @@ specific_bug_549287 (void)
     }
 }
 
-/* main */
+static gboolean
+specific_bug_621076_visible_func (GtkTreeModel *model,
+                                  GtkTreeIter  *iter,
+                                  gpointer      data)
+{
+  gboolean visible = FALSE;
+  gchar *str = NULL;
+
+  gtk_tree_model_get (model, iter, 0, &str, -1);
+  if (str != NULL && g_str_has_prefix (str, "visible"))
+    {
+      visible = TRUE;
+    }
+  else
+    {
+      GtkTreeIter child_iter;
+      gboolean valid;
+
+      /* Recursively check if we have a visible child */
+      for (valid = gtk_tree_model_iter_children (model, &child_iter, iter);
+           valid; valid = gtk_tree_model_iter_next (model, &child_iter))
+        {
+          if (specific_bug_621076_visible_func (model, &child_iter, data))
+            {
+              visible = TRUE;
+              break;
+            }
+        }
+    }
+
+  if (str)
+    g_free (str);
 
-int
-main (int    argc,
-      char **argv)
+  return visible;
+}
+
+static void
+specific_bug_621076 (void)
 {
-  gtk_test_init (&argc, &argv, NULL);
+  /* Test case for GNOME Bugzilla bug 621076, provided by Xavier Claessens */
+
+  /* This test case differs from has-child-filter and root-has-child-filter
+   * in that the visible function both filters on content and model
+   * structure.  Also, it is recursive.
+   */
+
+  GtkTreeStore *store;
+  GtkTreeModel *filter;
+  GtkWidget *view;
+  GtkTreeIter group_iter;
+  GtkTreeIter item_iter;
+  SignalMonitor *monitor;
+
+  g_test_bug ("621076");
+
+  store = gtk_tree_store_new (1, G_TYPE_STRING);
+  filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
+  gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter),
+                                          specific_bug_621076_visible_func,
+                                          NULL, NULL);
+
+  view = gtk_tree_view_new_with_model (filter);
+  g_object_ref_sink (view);
+
+  monitor = signal_monitor_new (filter);
+
+  signal_monitor_append_signal (monitor, ROW_INSERTED, "0");
+  gtk_tree_store_insert_with_values (store, &item_iter, NULL, -1,
+                                     0, "visible-group-0",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* visible-group-0 is not expanded, so ROW_INSERTED should not be emitted
+   * for its children. However, ROW_HAS_CHILD_TOGGLED should be emitted on
+   * visible-group-0 to tell the view that row can be expanded. */
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "0");
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "0");
+  group_iter = item_iter;
+  gtk_tree_store_insert_with_values (store, &item_iter, &group_iter, -1,
+                                     0, "visible-0:0",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  signal_monitor_append_signal (monitor, ROW_INSERTED, "1");
+  gtk_tree_store_insert_with_values (store, &item_iter, NULL, -1,
+                                     0, "visible-group-1",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* We are adding an hidden item inside visible-group-1, so
+   * ROW_HAS_CHILD_TOGGLED should not be emitted.  It is emitted though,
+   * because the signal originating at TreeStore will be propagated,
+   * as well a generated signal because the state of the parent *could*
+   * change by a change in the model.
+   */
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "1");
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "1");
+  group_iter = item_iter;
+  gtk_tree_store_insert_with_values (store, &item_iter, &group_iter, -1,
+                                     0, "group-1:0",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* This group is invisible and its parent too. Nothing should be emitted */
+  group_iter = item_iter;
+  gtk_tree_store_insert_with_values (store, &item_iter, &group_iter, -1,
+                                     0, "group-1:0:0",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* Adding a visible item in this group hierarchy will make all nodes
+   * in this path visible.  The first level should simply tell the view
+   * that it now has a child, and the view will load the tree if needed
+   * (depends on the expanded state).
+   */
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "1");
+  group_iter = item_iter;
+  gtk_tree_store_insert_with_values (store, &item_iter, &group_iter, -1,
+                                     0, "visible-1:0:0:0",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  check_level_length (GTK_TREE_MODEL_FILTER (filter), "1", 1);
+
+  gtk_tree_store_insert_with_values (store, &item_iter, NULL, -1,
+                                     0, "group-2",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* Parent is invisible, and adding this invisible item won't change that,
+   * so no signal should be emitted. */
+  group_iter = item_iter;
+  gtk_tree_store_insert_with_values (store, NULL, &group_iter, -1,
+                                     0, "invisible-2:0",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* This makes group-2 visible, so it gets inserted and tells it has
+   * children.
+   */
+  signal_monitor_append_signal (monitor, ROW_INSERTED, "2");
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "2");
+  gtk_tree_store_insert_with_values (store, NULL, &group_iter, -1,
+                                     0, "visible-2:1",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* group-2 is already visible, so this time it is a normal insertion */
+  gtk_tree_store_insert_with_values (store, NULL, &group_iter, -1,
+                                     0, "visible-2:2",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+
+  gtk_tree_store_insert_with_values (store, &item_iter, NULL, -1,
+                                     0, "group-3",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* Parent is invisible, and adding this invisible item won't change that,
+   * so no signal should be emitted. */
+  group_iter = item_iter;
+  gtk_tree_store_insert_with_values (store, NULL, &group_iter, -1,
+                                     0, "invisible-3:0",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  gtk_tree_store_insert_with_values (store, &item_iter, &group_iter, -1,
+                                     0, "invisible-3:1",
+                                     -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* This will make group 3 visible. */
+  signal_monitor_append_signal (monitor, ROW_INSERTED, "3");
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "3");
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "3");
+  gtk_tree_store_set (store, &item_iter, 0, "visible-3:1", -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* Make sure all groups are expanded, so the filter has the tree cached */
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (view));
+  while (gtk_events_pending ())
+    gtk_main_iteration ();
+
+  /* Should only yield a row-changed */
+  signal_monitor_append_signal (monitor, ROW_CHANGED, "3:0");
+  gtk_tree_store_set (store, &item_iter, 0, "visible-3:1", -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* Now remove/hide some items. If a group loses its last item, the group
+   * should be deleted instead of the item.
+   */
+
+  signal_monitor_append_signal (monitor, ROW_DELETED, "2:1");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (store), &item_iter, "2:2");
+  gtk_tree_store_remove (store, &item_iter);
+  signal_monitor_assert_is_empty (monitor);
+
+  signal_monitor_append_signal (monitor, ROW_DELETED, "2:0");
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "2");
+  signal_monitor_append_signal (monitor, ROW_DELETED, "2");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (store), &item_iter, "2:1");
+  gtk_tree_store_set (store, &item_iter, 0, "invisible-2:1", -1);
+  signal_monitor_assert_is_empty (monitor);
+
+  signal_monitor_append_signal (monitor, ROW_DELETED, "1:0:0:0");
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "1:0:0");
+  signal_monitor_append_signal (monitor, ROW_DELETED, "1:0");
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "1");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (store), &item_iter, "1:0:0:0");
+  gtk_tree_store_remove (store, &item_iter);
+  signal_monitor_assert_is_empty (monitor);
+
+  /* Hide a group using row-changed instead of row-deleted */
+  /* Caution: group 2 is gone, so offsets of the signals have moved. */
+  signal_monitor_append_signal (monitor, ROW_DELETED, "2:0");
+  signal_monitor_append_signal (monitor, ROW_HAS_CHILD_TOGGLED, "2");
+  signal_monitor_append_signal (monitor, ROW_DELETED, "2");
+  gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (store), &item_iter,
+                                       "3:1");
+  gtk_tree_store_set (store, &item_iter, 0, "invisible-3:1", -1);
+  signal_monitor_assert_is_empty (monitor);
+
+#if 0
+  {
+    GtkWidget *window;
+    GtkTreeViewColumn *col;
+
+    gtk_tree_view_expand_all (GTK_TREE_VIEW (view));
+
+    col = gtk_tree_view_column_new_with_attributes ("foo",
+        gtk_cell_renderer_text_new (),
+        "text", 0, NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW (view), col);
+
+    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    g_signal_connect (window, "delete-event",
+        G_CALLBACK (gtk_widget_destroy), NULL);
+    g_signal_connect (window, "destroy",
+        G_CALLBACK (gtk_main_quit), NULL);
+
+    gtk_container_add (GTK_CONTAINER (window), view);
+
+    gtk_widget_show (view);
+    gtk_widget_show (window);
+
+    gtk_main ();
+  }
+#endif
+
+  /* Cleanup */
+  signal_monitor_free (monitor);
+  g_object_unref (view);
+  g_object_unref (store);
+  g_object_unref (filter);
+}
 
-  g_test_add ("/FilterModel/self/verify-test-suite",
+/* main */
+
+void
+register_filter_model_tests (void)
+{
+  g_test_add ("/TreeModelFilter/self/verify-test-suite",
               FilterTest, NULL,
               filter_test_setup,
               verify_test_suite,
               filter_test_teardown);
 
-  g_test_add ("/FilterModel/self/verify-test-suite/vroot/depth-1",
+  g_test_add ("/TreeModelFilter/self/verify-test-suite/vroot/depth-1",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup,
               verify_test_suite_vroot,
               filter_test_teardown);
-  g_test_add ("/FilterModel/self/verify-test-suite/vroot/depth-2",
+  g_test_add ("/TreeModelFilter/self/verify-test-suite/vroot/depth-2",
               FilterTest, gtk_tree_path_new_from_indices (2, 3, -1),
               filter_test_setup,
               verify_test_suite_vroot,
               filter_test_teardown);
 
 
-  g_test_add ("/FilterModel/filled/hide-root-level",
+  g_test_add ("/TreeModelFilter/filled/hide-root-level",
               FilterTest, NULL,
               filter_test_setup,
               filled_hide_root_level,
               filter_test_teardown);
-  g_test_add ("/FilterModel/filled/hide-child-levels",
+  g_test_add ("/TreeModelFilter/filled/hide-child-levels",
               FilterTest, NULL,
               filter_test_setup,
               filled_hide_child_levels,
               filter_test_teardown);
+  g_test_add ("/TreeModelFilter/filled/hide-child-levels/root-expanded",
+              FilterTest, NULL,
+              filter_test_setup,
+              filled_hide_child_levels_root_expanded,
+              filter_test_teardown);
 
-  g_test_add ("/FilterModel/filled/hide-root-level/vroot",
+  g_test_add ("/TreeModelFilter/filled/hide-root-level/vroot",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup,
               filled_vroot_hide_root_level,
               filter_test_teardown);
-  g_test_add ("/FilterModel/filled/hide-child-levels/vroot",
+  g_test_add ("/TreeModelFilter/filled/hide-child-levels/vroot",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup,
               filled_vroot_hide_child_levels,
               filter_test_teardown);
+  g_test_add ("/TreeModelFilter/filled/hide-child-levels/vroot-root-expanded",
+              FilterTest, gtk_tree_path_new_from_indices (2, -1),
+              filter_test_setup,
+              filled_vroot_hide_child_levels_root_expanded,
+              filter_test_teardown);
 
 
-  g_test_add ("/FilterModel/empty/show-nodes",
+  g_test_add ("/TreeModelFilter/empty/show-nodes",
               FilterTest, NULL,
               filter_test_setup_empty,
               empty_show_nodes,
               filter_test_teardown);
-  g_test_add ("/FilterModel/empty/show-multiple-nodes",
+  g_test_add ("/TreeModelFilter/empty/show-multiple-nodes",
               FilterTest, NULL,
               filter_test_setup_empty,
               empty_show_multiple_nodes,
               filter_test_teardown);
 
-  g_test_add ("/FilterModel/empty/show-nodes/vroot",
+  g_test_add ("/TreeModelFilter/empty/show-nodes/vroot",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup_empty,
               empty_vroot_show_nodes,
               filter_test_teardown);
-  g_test_add ("/FilterModel/empty/show-multiple-nodes/vroot",
+  g_test_add ("/TreeModelFilter/empty/show-multiple-nodes/vroot",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup_empty,
               empty_vroot_show_multiple_nodes,
               filter_test_teardown);
 
 
-  g_test_add ("/FilterModel/unfiltered/hide-single",
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single",
               FilterTest, NULL,
               filter_test_setup_unfiltered,
               unfiltered_hide_single,
               filter_test_teardown);
-  g_test_add ("/FilterModel/unfiltered/hide-single-child",
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single/root-expanded",
+              FilterTest, NULL,
+              filter_test_setup_unfiltered_root_expanded,
+              unfiltered_hide_single_root_expanded,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single-child",
               FilterTest, NULL,
               filter_test_setup_unfiltered,
               unfiltered_hide_single_child,
               filter_test_teardown);
-  g_test_add ("/FilterModel/unfiltered/hide-single-multi-level",
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single-child/root-expanded",
+              FilterTest, NULL,
+              filter_test_setup_unfiltered_root_expanded,
+              unfiltered_hide_single_child_root_expanded,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single-multi-level",
               FilterTest, NULL,
               filter_test_setup_unfiltered,
               unfiltered_hide_single_multi_level,
               filter_test_teardown);
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single-multi-level/root-expanded",
+              FilterTest, NULL,
+              filter_test_setup_unfiltered_root_expanded,
+              unfiltered_hide_single_multi_level_root_expanded,
+              filter_test_teardown);
 
-  g_test_add ("/FilterModel/unfiltered/hide-single/vroot",
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single/vroot",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup_unfiltered,
               unfiltered_vroot_hide_single,
               filter_test_teardown);
-  g_test_add ("/FilterModel/unfiltered/hide-single-child/vroot",
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single-child/vroot",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup_unfiltered,
               unfiltered_vroot_hide_single_child,
               filter_test_teardown);
-  g_test_add ("/FilterModel/unfiltered/hide-single-multi-level/vroot",
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single-child/vroot/root-expanded",
+              FilterTest, gtk_tree_path_new_from_indices (2, -1),
+              filter_test_setup_unfiltered_root_expanded,
+              unfiltered_vroot_hide_single_child_root_expanded,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single-multi-level/vroot",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup_unfiltered,
               unfiltered_vroot_hide_single_multi_level,
               filter_test_teardown);
+  g_test_add ("/TreeModelFilter/unfiltered/hide-single-multi-level/vroot/root-expanded",
+              FilterTest, gtk_tree_path_new_from_indices (2, -1),
+              filter_test_setup_unfiltered_root_expanded,
+              unfiltered_vroot_hide_single_multi_level_root_expanded,
+              filter_test_teardown);
 
 
 
-  g_test_add ("/FilterModel/unfiltered/show-single",
+  g_test_add ("/TreeModelFilter/unfiltered/show-single",
               FilterTest, NULL,
               filter_test_setup_empty_unfiltered,
               unfiltered_show_single,
               filter_test_teardown);
-  g_test_add ("/FilterModel/unfiltered/show-single-child",
+  g_test_add ("/TreeModelFilter/unfiltered/show-single-child",
               FilterTest, NULL,
               filter_test_setup_empty_unfiltered,
               unfiltered_show_single_child,
               filter_test_teardown);
-  g_test_add ("/FilterModel/unfiltered/show-single-multi-level",
+  g_test_add ("/TreeModelFilter/unfiltered/show-single-child/root-expanded",
+              FilterTest, NULL,
+              filter_test_setup_empty_unfiltered_root_expanded,
+              unfiltered_show_single_child_root_expanded,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/unfiltered/show-single-multi-level",
               FilterTest, NULL,
               filter_test_setup_empty_unfiltered,
               unfiltered_show_single_multi_level,
               filter_test_teardown);
+  g_test_add ("/TreeModelFilter/unfiltered/show-single-multi-level/root-expanded",
+              FilterTest, NULL,
+              filter_test_setup_empty_unfiltered_root_expanded,
+              unfiltered_show_single_multi_level_root_expanded,
+              filter_test_teardown);
 
-  g_test_add ("/FilterModel/unfiltered/show-single/vroot",
+  g_test_add ("/TreeModelFilter/unfiltered/show-single/vroot",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup_empty_unfiltered,
               unfiltered_vroot_show_single,
               filter_test_teardown);
-  g_test_add ("/FilterModel/unfiltered/show-single-child/vroot",
+  g_test_add ("/TreeModelFilter/unfiltered/show-single-child/vroot",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup_empty_unfiltered,
               unfiltered_vroot_show_single_child,
               filter_test_teardown);
-  g_test_add ("/FilterModel/unfiltered/show-single-multi-level/vroot",
+  g_test_add ("/TreeModelFilter/unfiltered/show-single-child/vroot/root-expanded",
+              FilterTest, gtk_tree_path_new_from_indices (2, -1),
+              filter_test_setup_empty_unfiltered_root_expanded,
+              unfiltered_vroot_show_single_child_root_expanded,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/unfiltered/show-single-multi-level/vroot",
               FilterTest, gtk_tree_path_new_from_indices (2, -1),
               filter_test_setup_empty_unfiltered,
               unfiltered_vroot_show_single_multi_level,
               filter_test_teardown);
+  g_test_add ("/TreeModelFilter/unfiltered/show-single-multi-level/vroot/root-expanded",
+              FilterTest, gtk_tree_path_new_from_indices (2, -1),
+              filter_test_setup_empty_unfiltered_root_expanded,
+              unfiltered_vroot_show_single_multi_level_root_expanded,
+              filter_test_teardown);
 
 
-  g_test_add_func ("/FilterModel/specific/path-dependent-filter",
+  g_test_add ("/TreeModelFilter/unfiltered/rows-reordered/root-level",
+              FilterTest, NULL,
+              filter_test_setup_unfiltered,
+              unfiltered_rows_reordered_root_level,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/unfiltered/rows-reordered/child-level",
+              FilterTest, NULL,
+              filter_test_setup_unfiltered,
+              unfiltered_rows_reordered_child_level,
+              filter_test_teardown);
+
+  g_test_add ("/TreeModelFilter/filtered/rows-reordered/root-level/first-hidden",
+              FilterTest, NULL,
+              filter_test_setup,
+              filtered_rows_reordered_root_level_first_hidden,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/filtered/rows-reordered/root-level/middle-hidden",
+              FilterTest, NULL,
+              filter_test_setup,
+              filtered_rows_reordered_root_level_middle_hidden,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/filtered/rows-reordered/child-level/first-hidden",
+              FilterTest, NULL,
+              filter_test_setup,
+              filtered_rows_reordered_child_level_first_hidden,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/filtered/rows-reordered/child-level/middle-hidden",
+              FilterTest, NULL,
+              filter_test_setup,
+              filtered_rows_reordered_child_level_middle_hidden,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/filtered/rows-reordered/child-level/4-hidden",
+              FilterTest, NULL,
+              filter_test_setup,
+              filtered_rows_reordered_child_level_4_hidden,
+              filter_test_teardown);
+  g_test_add ("/TreeModelFilter/filtered/rows-reordered/child-level/all-hidden",
+              FilterTest, NULL,
+              filter_test_setup,
+              filtered_rows_reordered_child_level_all_hidden,
+              filter_test_teardown);
+
+  /* Inserts in child models after creation of filter model */
+  g_test_add_func ("/TreeModelFilter/insert/before",
+                   insert_before);
+  g_test_add_func ("/TreeModelFilter/insert/child",
+                   insert_child);
+
+  /* Removals from child model after creating of filter model */
+  g_test_add_func ("/TreeModelFilter/remove/node",
+                   remove_node);
+  g_test_add_func ("/TreeModelFilter/remove/node-vroot",
+                   remove_node_vroot);
+  g_test_add_func ("/TreeModelFilter/remove/vroot-ancestor",
+                   remove_vroot_ancestor);
+
+  /* Reference counting */
+  g_test_add_func ("/TreeModelFilter/ref-count/single-level",
+                   ref_count_single_level);
+  g_test_add_func ("/TreeModelFilter/ref-count/two-levels",
+                   ref_count_two_levels);
+  g_test_add_func ("/TreeModelFilter/ref-count/three-levels",
+                   ref_count_three_levels);
+  g_test_add_func ("/TreeModelFilter/ref-count/delete-row",
+                   ref_count_delete_row);
+  g_test_add_func ("/TreeModelFilter/ref-count/cleanup",
+                   ref_count_cleanup);
+  g_test_add_func ("/TreeModelFilter/ref-count/row-ref",
+                   ref_count_row_ref);
+
+  /* Reference counting, transfer of first reference on
+   * first node in level.  This is a GtkTreeModelFilter-specific
+   * feature.
+   */
+  g_test_add_func ("/TreeModelFilter/ref-count/transfer/root-level/insert",
+                   ref_count_transfer_root_level_insert);
+  g_test_add_func ("/TreeModelFilter/ref-count/transfer/root-level/reordered",
+                   ref_count_transfer_root_level_reordered);
+  g_test_add_func ("/TreeModelFilter/ref-count/transfer/child-level/insert",
+                   ref_count_transfer_child_level_insert);
+  g_test_add_func ("/TreeModelFilter/ref-count/transfer/child-level/reordered",
+                   ref_count_transfer_child_level_reordered);
+
+  g_test_add_func ("/TreeModelFilter/specific/path-dependent-filter",
                    specific_path_dependent_filter);
-  g_test_add_func ("/FilterModel/specific/append-after-collapse",
+  g_test_add_func ("/TreeModelFilter/specific/append-after-collapse",
                    specific_append_after_collapse);
-  g_test_add_func ("/FilterModel/specific/sort-filter-remove-node",
+  g_test_add_func ("/TreeModelFilter/specific/sort-filter-remove-node",
                    specific_sort_filter_remove_node);
-  g_test_add_func ("/FilterModel/specific/sort-filter-remove-root",
+  g_test_add_func ("/TreeModelFilter/specific/sort-filter-remove-root",
                    specific_sort_filter_remove_root);
-  g_test_add_func ("/FilterModel/specific/root-mixed-visibility",
+  g_test_add_func ("/TreeModelFilter/specific/root-mixed-visibility",
                    specific_root_mixed_visibility);
-  g_test_add_func ("/FilterModel/specific/has-child-filter",
+  g_test_add_func ("/TreeModelFilter/specific/has-child-filter",
                    specific_has_child_filter);
-  g_test_add_func ("/FilterModel/specific/root-has-child-filter",
+  g_test_add_func ("/TreeModelFilter/specific/has-child-filter-on-sort-model",
+                   specific_has_child_filter_on_sort_model);
+  g_test_add_func ("/TreeModelFilter/specific/at-least-2-children-filter",
+                   specific_at_least_2_children_filter);
+  g_test_add_func ("/TreeModelFilter/specific/at-least-2-children-filter-on-sort-model",
+                   specific_at_least_2_children_filter_on_sort_model);
+  g_test_add_func ("/TreeModelFilter/specific/root-has-child-filter",
                    specific_root_has_child_filter);
-  g_test_add_func ("/FilterModel/specific/filter-add-child",
+  g_test_add_func ("/TreeModelFilter/specific/filter-add-child",
                    specific_filter_add_child);
-  g_test_add_func ("/FilterModel/specific/list-store-clear",
+  g_test_add_func ("/TreeModelFilter/specific/list-store-clear",
                    specific_list_store_clear);
-
-  g_test_add_func ("/FilterModel/specific/bug-300089",
-                   specific_bug_300089);
-  g_test_add_func ("/FilterModel/specific/bug-301558",
+  g_test_add_func ("/TreeModelFilter/specific/sort-ref-leaf-and-remove-ancestor",
+                   specific_sort_ref_leaf_and_remove_ancestor);
+  g_test_add_func ("/TreeModelFilter/specific/ref-leaf-and-remove-ancestor",
+                   specific_ref_leaf_and_remove_ancestor);
+  g_test_add_func ("/TreeModelFilter/specific/virtual-ref-leaf-and-remove-ancestor",
+                   specific_virtual_ref_leaf_and_remove_ancestor);
+
+  g_test_add_func ("/TreeModelFilter/specific/bug-301558",
                    specific_bug_301558);
-  g_test_add_func ("/FilterModel/specific/bug-311955",
+  g_test_add_func ("/TreeModelFilter/specific/bug-311955",
                    specific_bug_311955);
-  g_test_add_func ("/FilterModel/specific/bug-346800",
+  g_test_add_func ("/TreeModelFilter/specific/bug-311955-clean",
+                   specific_bug_311955_clean);
+  g_test_add_func ("/TreeModelFilter/specific/bug-346800",
                    specific_bug_346800);
-  g_test_add_func ("/FilterModel/specific/bug-364946",
-                   specific_bug_364946);
-  g_test_add_func ("/FilterModel/specific/bug-464173",
+  g_test_add_func ("/TreeModelFilter/specific/bug-464173",
                    specific_bug_464173);
-  g_test_add_func ("/FilterModel/specific/bug-540201",
+  g_test_add_func ("/TreeModelFilter/specific/bug-540201",
                    specific_bug_540201);
-  g_test_add_func ("/FilterModel/specific/bug-549287",
+  g_test_add_func ("/TreeModelFilter/specific/bug-549287",
                    specific_bug_549287);
-
-  return g_test_run ();
+  g_test_add_func ("/TreeModelFilter/specific/bug-621076",
+                   specific_bug_621076);
 }
diff --git a/gtk/tests/gtktreemodelrefcount.c b/gtk/tests/gtktreemodelrefcount.c
new file mode 100644
index 0000000000..9c91a587da
--- /dev/null
+++ b/gtk/tests/gtktreemodelrefcount.c
@@ -0,0 +1,286 @@
+/* gtktreemodelrefcount.c
+ * Copyright (C) 2011  Kristian Rietveld <kris@gtk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+#include "gtktreemodelrefcount.h"
+
+
+/* The purpose of this GtkTreeModel is to keep record of the reference count
+ * of each node.  The reference count does not effect the functioning of
+ * the model in any way.  Because this model is a subclass of GtkTreeStore,
+ * the GtkTreeStore API should be used to add to and remove nodes from
+ * this model.  We depend on the iter format of GtkTreeStore, which means
+ * that this model needs to be revised in case the iter format of
+ * GtkTreeStore is modified.  Currently, we make use of the fact that
+ * the value stored in the user_data field is unique for each node.
+ */
+
+struct _GtkTreeModelRefCountPrivate
+{
+  GHashTable *node_hash;
+};
+
+typedef struct
+{
+  int ref_count;
+}
+NodeInfo;
+
+
+static void      gtk_tree_model_ref_count_tree_model_init (GtkTreeModelIface *iface);
+static void      gtk_tree_model_ref_count_finalize        (GObject           *object);
+
+static NodeInfo *node_info_new                            (void);
+static void      node_info_free                           (NodeInfo          *info);
+
+/* GtkTreeModel interface */
+static void      gtk_tree_model_ref_count_ref_node        (GtkTreeModel      *model,
+                                                           GtkTreeIter       *iter);
+static void      gtk_tree_model_ref_count_unref_node      (GtkTreeModel      *model,
+                                                           GtkTreeIter       *iter);
+
+
+G_DEFINE_TYPE_WITH_CODE (GtkTreeModelRefCount, gtk_tree_model_ref_count, GTK_TYPE_TREE_STORE,
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
+                                                gtk_tree_model_ref_count_tree_model_init))
+
+static void
+gtk_tree_model_ref_count_init (GtkTreeModelRefCount *ref_model)
+{
+  ref_model->priv = G_TYPE_INSTANCE_GET_PRIVATE (ref_model,
+                                                 GTK_TYPE_TREE_MODEL_REF_COUNT,
+                                                 GtkTreeModelRefCountPrivate);
+
+  ref_model->priv->node_hash = g_hash_table_new_full (g_direct_hash,
+                                                      g_direct_equal,
+                                                      NULL,
+                                                      (GDestroyNotify)node_info_free);
+}
+
+static void
+gtk_tree_model_ref_count_class_init (GtkTreeModelRefCountClass *ref_model_class)
+{
+  GObjectClass *object_class;
+
+  object_class = (GObjectClass *) ref_model_class;
+
+  object_class->finalize = gtk_tree_model_ref_count_finalize;
+
+  g_type_class_add_private (object_class, sizeof (GtkTreeModelRefCountPrivate));
+}
+
+static void
+gtk_tree_model_ref_count_tree_model_init (GtkTreeModelIface *iface)
+{
+  iface->ref_node = gtk_tree_model_ref_count_ref_node;
+  iface->unref_node = gtk_tree_model_ref_count_unref_node;
+}
+
+static void
+gtk_tree_model_ref_count_finalize (GObject *object)
+{
+  GtkTreeModelRefCount *ref_model = GTK_TREE_MODEL_REF_COUNT (object);
+
+  if (ref_model->priv->node_hash)
+    {
+      g_hash_table_destroy (ref_model->priv->node_hash);
+      ref_model->priv->node_hash = NULL;
+    }
+
+  G_OBJECT_CLASS (gtk_tree_model_ref_count_parent_class)->finalize (object);
+}
+
+
+static NodeInfo *
+node_info_new (void)
+{
+  NodeInfo *info = g_slice_new (NodeInfo);
+  info->ref_count = 0;
+
+  return info;
+}
+
+static void
+node_info_free (NodeInfo *info)
+{
+  g_slice_free (NodeInfo, info);
+}
+
+static void
+gtk_tree_model_ref_count_ref_node (GtkTreeModel *model,
+                                   GtkTreeIter  *iter)
+{
+  NodeInfo *info;
+  GtkTreeModelRefCount *ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  info = g_hash_table_lookup (ref_model->priv->node_hash, iter->user_data);
+  if (!info)
+    {
+      info = node_info_new ();
+
+      g_hash_table_insert (ref_model->priv->node_hash, iter->user_data, info);
+    }
+
+  info->ref_count++;
+}
+
+static void
+gtk_tree_model_ref_count_unref_node (GtkTreeModel *model,
+                                     GtkTreeIter  *iter)
+{
+  NodeInfo *info;
+  GtkTreeModelRefCount *ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  info = g_hash_table_lookup (ref_model->priv->node_hash, iter->user_data);
+  g_assert (info != NULL);
+  g_assert (info->ref_count > 0);
+
+  info->ref_count--;
+}
+
+
+GtkTreeModel *
+gtk_tree_model_ref_count_new (void)
+{
+  GtkTreeModel *retval;
+
+  retval = g_object_new (gtk_tree_model_ref_count_get_type (), NULL);
+
+  return retval;
+}
+
+static void
+dump_iter (GtkTreeModelRefCount *ref_model,
+           GtkTreeIter          *iter)
+{
+  gchar *path_str;
+  NodeInfo *info;
+  GtkTreePath *path;
+
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (ref_model), iter);
+  path_str = gtk_tree_path_to_string (path);
+  gtk_tree_path_free (path);
+
+  info = g_hash_table_lookup (ref_model->priv->node_hash, iter->user_data);
+  if (!info)
+    g_print ("%-16s ref_count=0\n", path_str);
+  else
+    g_print ("%-16s ref_count=%d\n", path_str, info->ref_count);
+
+  g_free (path_str);
+}
+
+static void
+gtk_tree_model_ref_count_dump_recurse (GtkTreeModelRefCount *ref_model,
+                                       GtkTreeIter          *iter)
+{
+  do
+    {
+      GtkTreeIter child;
+
+      dump_iter (ref_model, iter);
+
+      if (gtk_tree_model_iter_children (GTK_TREE_MODEL (ref_model),
+                                        &child, iter))
+        gtk_tree_model_ref_count_dump_recurse (ref_model, &child);
+    }
+  while (gtk_tree_model_iter_next (GTK_TREE_MODEL (ref_model), iter));
+}
+
+void
+gtk_tree_model_ref_count_dump (GtkTreeModelRefCount *ref_model)
+{
+  GtkTreeIter iter;
+
+  if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ref_model), &iter))
+    return;
+
+  gtk_tree_model_ref_count_dump_recurse (ref_model, &iter);
+}
+
+static gboolean
+check_iter (GtkTreeModelRefCount *ref_model,
+            GtkTreeIter          *iter,
+            gint                  expected_ref_count,
+            gboolean              may_assert)
+{
+  NodeInfo *info;
+
+  if (may_assert)
+    g_assert (gtk_tree_store_iter_is_valid (GTK_TREE_STORE (ref_model), iter));
+
+  info = g_hash_table_lookup (ref_model->priv->node_hash, iter->user_data);
+  if (!info)
+    {
+      if (expected_ref_count == 0)
+        return TRUE;
+      else
+        {
+          if (may_assert)
+            g_error ("Expected ref count %d, but node has never been referenced.\n", expected_ref_count);
+          return FALSE;
+        }
+    }
+
+  if (may_assert)
+    g_assert_cmpint (expected_ref_count, ==, info->ref_count);
+
+  return expected_ref_count == info->ref_count;
+}
+
+gboolean
+gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
+                                      GtkTreeIter          *parent,
+                                      gint                  expected_ref_count,
+                                      gboolean              recurse,
+                                      gboolean              may_assert)
+{
+  GtkTreeIter iter;
+
+  if (!gtk_tree_model_iter_children (GTK_TREE_MODEL (ref_model),
+                                     &iter, parent))
+    return TRUE;
+
+  do
+    {
+      if (!check_iter (ref_model, &iter, expected_ref_count, may_assert))
+        return FALSE;
+
+      if (recurse &&
+          gtk_tree_model_iter_has_child (GTK_TREE_MODEL (ref_model), &iter))
+        {
+          if (!gtk_tree_model_ref_count_check_level (ref_model, &iter,
+                                                     expected_ref_count,
+                                                     recurse, may_assert))
+            return FALSE;
+        }
+    }
+  while (gtk_tree_model_iter_next (GTK_TREE_MODEL (ref_model), &iter));
+
+  return TRUE;
+}
+
+gboolean
+gtk_tree_model_ref_count_check_node (GtkTreeModelRefCount *ref_model,
+                                     GtkTreeIter          *iter,
+                                     gint                  expected_ref_count,
+                                     gboolean              may_assert)
+{
+  return check_iter (ref_model, iter, expected_ref_count, may_assert);
+}
diff --git a/gtk/tests/gtktreemodelrefcount.h b/gtk/tests/gtktreemodelrefcount.h
new file mode 100644
index 0000000000..f32c8bd2b8
--- /dev/null
+++ b/gtk/tests/gtktreemodelrefcount.h
@@ -0,0 +1,134 @@
+/* gtktreemodelrefcount.h
+ * Copyright (C) 2011  Kristian Rietveld <kris@gtk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_TREE_MODEL_REF_COUNT_H__
+#define __GTK_TREE_MODEL_REF_COUNT_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_TREE_MODEL_REF_COUNT              (gtk_tree_model_ref_count_get_type ())
+#define GTK_TREE_MODEL_REF_COUNT(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL_REF_COUNT, GtkTreeModelRefCount))
+#define GTK_TREE_MODEL_REF_COUNT_CLASS(vtable)     (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_TREE_MODEL_REF_COUNT, GtkTreeModelRefCountClass))
+#define GTK_IS_TREE_MODEL_REF_COUNT(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL_REF_COUNT))
+#define GTK_IS_TREE_MODEL_REF_COUNT_CLASS(vtable)  (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_TREE_MODEL_REF_COUNT))
+#define GTK_TREE_MODEL_REF_COUNT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_MODEL_REF_COUNT, GtkTreeModelRefCountClass))
+
+
+typedef struct _GtkTreeModelRefCount        GtkTreeModelRefCount;
+typedef struct _GtkTreeModelRefCountClass   GtkTreeModelRefCountClass;
+typedef struct _GtkTreeModelRefCountPrivate GtkTreeModelRefCountPrivate;
+
+struct _GtkTreeModelRefCount
+{
+  GtkTreeStore parent;
+
+  /* < private > */
+  GtkTreeModelRefCountPrivate *priv;
+};
+
+struct _GtkTreeModelRefCountClass
+{
+  GtkTreeStoreClass parent_class;
+};
+
+
+GType         gtk_tree_model_ref_count_get_type    (void) G_GNUC_CONST;
+GtkTreeModel *gtk_tree_model_ref_count_new         (void);
+
+void          gtk_tree_model_ref_count_dump        (GtkTreeModelRefCount *ref_model);
+gboolean      gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
+                                                    GtkTreeIter          *parent,
+                                                    gint                  expected_ref_count,
+                                                    gboolean              recurse,
+                                                    gboolean              may_assert);
+gboolean      gtk_tree_model_ref_count_check_node  (GtkTreeModelRefCount *ref_model,
+                                                    GtkTreeIter          *iter,
+                                                    gint                  expected_ref_count,
+                                                    gboolean              may_assert);
+
+/* A couple of helpers for the tests.  Since this model will never be used
+ * outside of unit tests anyway, it is probably fine to have these here
+ * without namespacing.
+ */
+
+static inline void
+assert_entire_model_unreferenced (GtkTreeModelRefCount *ref_model)
+{
+  gtk_tree_model_ref_count_check_level (ref_model, NULL, 0, TRUE, TRUE);
+}
+
+static inline void
+assert_root_level_unreferenced (GtkTreeModelRefCount *ref_model)
+{
+  gtk_tree_model_ref_count_check_level (ref_model, NULL, 0, FALSE, TRUE);
+}
+
+static inline void
+assert_level_unreferenced (GtkTreeModelRefCount *ref_model,
+                           GtkTreeIter          *iter)
+{
+  gtk_tree_model_ref_count_check_level (ref_model, iter, 0, FALSE, TRUE);
+}
+
+static inline void
+assert_entire_model_referenced (GtkTreeModelRefCount *ref_model,
+                                gint                  ref_count)
+{
+  gtk_tree_model_ref_count_check_level (ref_model, NULL, ref_count, TRUE, TRUE);
+}
+
+static inline void
+assert_not_entire_model_referenced (GtkTreeModelRefCount *ref_model,
+                                    gint                  ref_count)
+{
+  g_assert_cmpint (gtk_tree_model_ref_count_check_level (ref_model, NULL,
+                                                         ref_count,
+                                                         TRUE, FALSE),
+                   ==, FALSE);
+}
+
+static inline void
+assert_root_level_referenced (GtkTreeModelRefCount *ref_model,
+                              gint                  ref_count)
+{
+  gtk_tree_model_ref_count_check_level (ref_model, NULL, ref_count,
+                                        FALSE, TRUE);
+}
+
+static inline void
+assert_level_referenced (GtkTreeModelRefCount *ref_model,
+                         gint                  ref_count,
+                         GtkTreeIter          *iter)
+{
+  gtk_tree_model_ref_count_check_level (ref_model, iter, ref_count,
+                                        FALSE, TRUE);
+}
+
+static inline void
+assert_node_ref_count (GtkTreeModelRefCount *ref_model,
+                       GtkTreeIter          *iter,
+                       gint                  ref_count)
+{
+  gtk_tree_model_ref_count_check_node (ref_model, iter, ref_count, TRUE);
+}
+
+
+#endif /* __GTK_TREE_MODEL_REF_COUNT_H__ */
diff --git a/gtk/tests/liststore.c b/gtk/tests/liststore.c
index e710d9bad2..4efc2879d5 100644
--- a/gtk/tests/liststore.c
+++ b/gtk/tests/liststore.c
@@ -27,6 +27,8 @@
 
 #include <gtk/gtk.h>
 
+#include "treemodel.h"
+
 static inline gboolean
 iters_equal (GtkTreeIter *a,
 	     GtkTreeIter *b)
@@ -998,128 +1000,123 @@ list_store_test_iter_parent_invalid (ListStore     *fixture,
 
 /* main */
 
-int
-main (int    argc,
-      char **argv)
+void
+register_list_store_tests (void)
 {
-  gtk_test_init (&argc, &argv, NULL);
-
   /* insertion */
-  g_test_add_func ("/list-store/insert-high-values",
+  g_test_add_func ("/ListStore/insert-high-values",
 	           list_store_test_insert_high_values);
-  g_test_add_func ("/list-store/append",
+  g_test_add_func ("/ListStore/append",
 		   list_store_test_append);
-  g_test_add_func ("/list-store/prepend",
+  g_test_add_func ("/ListStore/prepend",
 		   list_store_test_prepend);
-  g_test_add_func ("/list-store/insert-after",
+  g_test_add_func ("/ListStore/insert-after",
 		   list_store_test_insert_after);
-  g_test_add_func ("/list-store/insert-after-NULL",
+  g_test_add_func ("/ListStore/insert-after-NULL",
 		   list_store_test_insert_after_NULL);
-  g_test_add_func ("/list-store/insert-before",
+  g_test_add_func ("/ListStore/insert-before",
 		   list_store_test_insert_before);
-  g_test_add_func ("/list-store/insert-before-NULL",
+  g_test_add_func ("/ListStore/insert-before-NULL",
 		   list_store_test_insert_before_NULL);
 
   /* setting values (FIXME) */
 
   /* removal */
-  g_test_add ("/list-store/remove-begin", ListStore, NULL,
+  g_test_add ("/ListStore/remove-begin", ListStore, NULL,
 	      list_store_setup, list_store_test_remove_begin,
 	      list_store_teardown);
-  g_test_add ("/list-store/remove-middle", ListStore, NULL,
+  g_test_add ("/ListStore/remove-middle", ListStore, NULL,
 	      list_store_setup, list_store_test_remove_middle,
 	      list_store_teardown);
-  g_test_add ("/list-store/remove-end", ListStore, NULL,
+  g_test_add ("/ListStore/remove-end", ListStore, NULL,
 	      list_store_setup, list_store_test_remove_end,
 	      list_store_teardown);
 
-  g_test_add ("/list-store/clear", ListStore, NULL,
+  g_test_add ("/ListStore/clear", ListStore, NULL,
 	      list_store_setup, list_store_test_clear,
 	      list_store_teardown);
 
   /* reordering */
-  g_test_add ("/list-store/reorder", ListStore, NULL,
+  g_test_add ("/ListStore/reorder", ListStore, NULL,
 	      list_store_setup, list_store_test_reorder,
 	      list_store_teardown);
 
   /* swapping */
-  g_test_add ("/list-store/swap-begin", ListStore, NULL,
+  g_test_add ("/ListStore/swap-begin", ListStore, NULL,
 	      list_store_setup, list_store_test_swap_begin,
 	      list_store_teardown);
-  g_test_add ("/list-store/swap-middle-next", ListStore, NULL,
+  g_test_add ("/ListStore/swap-middle-next", ListStore, NULL,
 	      list_store_setup, list_store_test_swap_middle_next,
 	      list_store_teardown);
-  g_test_add ("/list-store/swap-middle-apart", ListStore, NULL,
+  g_test_add ("/ListStore/swap-middle-apart", ListStore, NULL,
 	      list_store_setup, list_store_test_swap_middle_apart,
 	      list_store_teardown);
-  g_test_add ("/list-store/swap-end", ListStore, NULL,
+  g_test_add ("/ListStore/swap-end", ListStore, NULL,
 	      list_store_setup, list_store_test_swap_end,
 	      list_store_teardown);
-  g_test_add_func ("/list-store/swap-single",
+  g_test_add_func ("/ListStore/swap-single",
 		   list_store_test_swap_single);
 
   /* moving */
-  g_test_add ("/list-store/move-after-from-start", ListStore, NULL,
+  g_test_add ("/ListStore/move-after-from-start", ListStore, NULL,
 	      list_store_setup, list_store_test_move_after_from_start,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-after-next", ListStore, NULL,
+  g_test_add ("/ListStore/move-after-next", ListStore, NULL,
 	      list_store_setup, list_store_test_move_after_next,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-after-apart", ListStore, NULL,
+  g_test_add ("/ListStore/move-after-apart", ListStore, NULL,
 	      list_store_setup, list_store_test_move_after_apart,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-after-end", ListStore, NULL,
+  g_test_add ("/ListStore/move-after-end", ListStore, NULL,
 	      list_store_setup, list_store_test_move_after_end,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-after-from-end", ListStore, NULL,
+  g_test_add ("/ListStore/move-after-from-end", ListStore, NULL,
 	      list_store_setup, list_store_test_move_after_from_end,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-after-change-ends", ListStore, NULL,
+  g_test_add ("/ListStore/move-after-change-ends", ListStore, NULL,
 	      list_store_setup, list_store_test_move_after_change_ends,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-after-NULL", ListStore, NULL,
+  g_test_add ("/ListStore/move-after-NULL", ListStore, NULL,
 	      list_store_setup, list_store_test_move_after_NULL,
 	      list_store_teardown);
-  g_test_add_func ("/list-store/move-after-single",
+  g_test_add_func ("/ListStore/move-after-single",
 		   list_store_test_move_after_single);
 
-  g_test_add ("/list-store/move-before-next", ListStore, NULL,
+  g_test_add ("/ListStore/move-before-next", ListStore, NULL,
 	      list_store_setup, list_store_test_move_before_next,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-before-apart", ListStore, NULL,
+  g_test_add ("/ListStore/move-before-apart", ListStore, NULL,
 	      list_store_setup, list_store_test_move_before_apart,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-before-to-start", ListStore, NULL,
+  g_test_add ("/ListStore/move-before-to-start", ListStore, NULL,
 	      list_store_setup, list_store_test_move_before_to_start,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-before-from-end", ListStore, NULL,
+  g_test_add ("/ListStore/move-before-from-end", ListStore, NULL,
 	      list_store_setup, list_store_test_move_before_from_end,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-before-change-ends", ListStore, NULL,
+  g_test_add ("/ListStore/move-before-change-ends", ListStore, NULL,
 	      list_store_setup, list_store_test_move_before_change_ends,
 	      list_store_teardown);
-  g_test_add ("/list-store/move-before-NULL", ListStore, NULL,
+  g_test_add ("/ListStore/move-before-NULL", ListStore, NULL,
 	      list_store_setup, list_store_test_move_before_NULL,
 	      list_store_teardown);
-  g_test_add_func ("/list-store/move-before-single",
+  g_test_add_func ("/ListStore/move-before-single",
 		   list_store_test_move_before_single);
 
   /* iter invalidation */
-  g_test_add ("/list-store/iter-prev-invalid", ListStore, NULL,
+  g_test_add ("/ListStore/iter-prev-invalid", ListStore, NULL,
               list_store_setup, list_store_test_iter_previous_invalid,
               list_store_teardown);
-  g_test_add ("/list-store/iter-next-invalid", ListStore, NULL,
+  g_test_add ("/ListStore/iter-next-invalid", ListStore, NULL,
               list_store_setup, list_store_test_iter_next_invalid,
               list_store_teardown);
-  g_test_add ("/list-store/iter-children-invalid", ListStore, NULL,
+  g_test_add ("/ListStore/iter-children-invalid", ListStore, NULL,
               list_store_setup, list_store_test_iter_children_invalid,
               list_store_teardown);
-  g_test_add ("/list-store/iter-nth-child-invalid", ListStore, NULL,
+  g_test_add ("/ListStore/iter-nth-child-invalid", ListStore, NULL,
               list_store_setup, list_store_test_iter_nth_child_invalid,
               list_store_teardown);
-  g_test_add ("/list-store/iter-parent-invalid", ListStore, NULL,
+  g_test_add ("/ListStore/iter-parent-invalid", ListStore, NULL,
               list_store_setup, list_store_test_iter_parent_invalid,
               list_store_teardown);
-
-  return g_test_run ();
 }
diff --git a/gtk/tests/modelrefcount.c b/gtk/tests/modelrefcount.c
new file mode 100644
index 0000000000..c701287927
--- /dev/null
+++ b/gtk/tests/modelrefcount.c
@@ -0,0 +1,978 @@
+/* GtkTreeModel ref counting tests
+ * Copyright (C) 2011  Kristian Rietveld  <kris@gtk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "gtktreemodelrefcount.h"
+#include "treemodel.h"
+
+/* And the tests themselves */
+
+static void
+test_list_no_reference (void)
+{
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+
+  assert_root_level_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_list_reference_during_creation (void)
+{
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+  tree_view = gtk_tree_view_new_with_model (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+
+  assert_root_level_referenced (ref_model, 1);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_root_level_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_list_reference_after_creation (void)
+{
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  assert_root_level_unreferenced (ref_model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+
+  tree_view = gtk_tree_view_new_with_model (model);
+
+  assert_root_level_referenced (ref_model, 1);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+
+  assert_root_level_referenced (ref_model, 1);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_root_level_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_list_reference_reordered (void)
+{
+  GtkTreeIter iter1, iter2, iter3, iter4, iter5;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  assert_root_level_unreferenced (ref_model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter3, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter4, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter5, NULL);
+
+  tree_view = gtk_tree_view_new_with_model (model);
+
+  assert_root_level_referenced (ref_model, 1);
+
+  gtk_tree_store_move_after (GTK_TREE_STORE (model),
+                             &iter1, &iter5);
+
+  assert_root_level_referenced (ref_model, 1);
+
+  gtk_tree_store_move_after (GTK_TREE_STORE (model),
+                             &iter3, &iter4);
+
+  assert_root_level_referenced (ref_model, 1);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_root_level_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+
+static void
+test_tree_no_reference (void)
+{
+  GtkTreeIter iter, child;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_tree_reference_during_creation (void)
+{
+  GtkTreeIter iter, child;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+  tree_view = gtk_tree_view_new_with_model (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_not_entire_model_referenced (ref_model, 1);
+  assert_level_unreferenced (ref_model, &child);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_tree_reference_after_creation (void)
+{
+  GtkTreeIter iter, child;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  tree_view = gtk_tree_view_new_with_model (model);
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_not_entire_model_referenced (ref_model, 1);
+  assert_level_unreferenced (ref_model, &child);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_tree_reference_reordered (void)
+{
+  GtkTreeIter parent;
+  GtkTreeIter iter1, iter2, iter3, iter4, iter5;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  assert_root_level_unreferenced (ref_model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter1, &parent);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter2, &parent);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter3, &parent);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter4, &parent);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter5, &parent);
+
+  tree_view = gtk_tree_view_new_with_model (model);
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  assert_entire_model_referenced (ref_model, 1);
+
+  gtk_tree_store_move_after (GTK_TREE_STORE (model),
+                             &iter1, &iter5);
+
+  assert_entire_model_referenced (ref_model, 1);
+
+  gtk_tree_store_move_after (GTK_TREE_STORE (model),
+                             &iter3, &iter4);
+
+  assert_entire_model_referenced (ref_model, 1);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_tree_reference_expand_all (void)
+{
+  GtkTreeIter iter, child;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  tree_view = gtk_tree_view_new_with_model (model);
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_not_entire_model_referenced (ref_model, 1);
+  assert_level_unreferenced (ref_model, &child);
+
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  assert_entire_model_referenced (ref_model, 1);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_not_entire_model_referenced (ref_model, 1);
+  assert_level_unreferenced (ref_model, &child);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_tree_reference_collapse_all (void)
+{
+  GtkTreeIter iter, child;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  tree_view = gtk_tree_view_new_with_model (model);
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  assert_entire_model_referenced (ref_model, 1);
+
+  gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_not_entire_model_referenced (ref_model, 1);
+  assert_level_unreferenced (ref_model, &child);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_tree_reference_expand_collapse (void)
+{
+  GtkTreeIter parent1, parent2, child;
+  GtkTreePath *path1, *path2;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+  tree_view = gtk_tree_view_new_with_model (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &parent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &parent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &parent2);
+
+  path1 = gtk_tree_model_get_path (model, &parent1);
+  path2 = gtk_tree_model_get_path (model, &parent2);
+
+  assert_level_unreferenced (ref_model, &parent1);
+  assert_level_unreferenced (ref_model, &parent2);
+
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path1, FALSE);
+
+  assert_level_referenced (ref_model, 1, &parent1);
+  assert_level_unreferenced (ref_model, &parent2);
+
+  gtk_tree_view_collapse_row (GTK_TREE_VIEW (tree_view), path1);
+
+  assert_level_unreferenced (ref_model, &parent1);
+  assert_level_unreferenced (ref_model, &parent2);
+
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path2, FALSE);
+
+  assert_level_unreferenced (ref_model, &parent1);
+  assert_level_referenced (ref_model, 1, &parent2);
+
+  gtk_tree_view_collapse_row (GTK_TREE_VIEW (tree_view), path2);
+
+  assert_level_unreferenced (ref_model, &parent1);
+  assert_level_unreferenced (ref_model, &parent2);
+
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path2, FALSE);
+
+  assert_level_unreferenced (ref_model, &parent1);
+  assert_level_referenced (ref_model, 1, &parent2);
+
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path1, FALSE);
+
+  assert_level_referenced (ref_model, 1, &parent1);
+  assert_level_referenced (ref_model, 1, &parent2);
+
+  gtk_tree_path_free (path1);
+  gtk_tree_path_free (path2);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (ref_model);
+}
+
+static void
+test_row_reference_list (void)
+{
+  GtkTreeIter iter0, iter1, iter2;
+  GtkTreePath *path;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeRowReference *row_ref;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter0, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter2, NULL);
+
+  assert_root_level_unreferenced (ref_model);
+
+  /* create and remove a row ref and check reference counts */
+  path = gtk_tree_path_new_from_indices (1, -1);
+  row_ref = gtk_tree_row_reference_new (model, path);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &iter2, 0);
+
+  gtk_tree_row_reference_free (row_ref);
+
+  assert_root_level_unreferenced (ref_model);
+
+  /* the same, but then also with a tree view monitoring the model */
+  tree_view = gtk_tree_view_new_with_model (model);
+
+  assert_root_level_referenced (ref_model, 1);
+
+  row_ref = gtk_tree_row_reference_new (model, path);
+
+  assert_node_ref_count (ref_model, &iter0, 1);
+  assert_node_ref_count (ref_model, &iter1, 2);
+  assert_node_ref_count (ref_model, &iter2, 1);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &iter2, 0);
+
+  gtk_tree_row_reference_free (row_ref);
+
+  assert_root_level_unreferenced (ref_model);
+
+  gtk_tree_path_free (path);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_row_reference_list_remove (void)
+{
+  GtkTreeIter iter0, iter1, iter2;
+  GtkTreePath *path;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeRowReference *row_ref;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter0, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter2, NULL);
+
+  assert_root_level_unreferenced (ref_model);
+
+  /* test creating the row reference and then removing the node */
+  path = gtk_tree_path_new_from_indices (1, -1);
+  row_ref = gtk_tree_row_reference_new (model, path);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &iter2, 0);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &iter1);
+
+  assert_root_level_unreferenced (ref_model);
+
+  gtk_tree_row_reference_free (row_ref);
+
+  assert_root_level_unreferenced (ref_model);
+
+  /* test creating a row ref, removing another node and then removing
+   * the row ref node.
+   */
+  row_ref = gtk_tree_row_reference_new (model, path);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &iter2, 1);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &iter0);
+
+  assert_root_level_referenced (ref_model, 1);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &iter2);
+
+  g_assert (!gtk_tree_model_get_iter_first (model, &iter0));
+
+  gtk_tree_row_reference_free (row_ref);
+
+  gtk_tree_path_free (path);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_row_reference_tree (void)
+{
+  GtkTreeIter iter0, iter1, iter2;
+  GtkTreeIter child0, child1, child2;
+  GtkTreeIter grandchild0, grandchild1, grandchild2;
+  GtkTreePath *path;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeRowReference *row_ref, *row_ref1;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter0, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child0, &iter0);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild0, &child0);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child1, &iter1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild1, &child1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child2, &iter2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild2, &child2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  /* create and remove a row ref and check reference counts */
+  path = gtk_tree_path_new_from_indices (1, 0, 0, -1);
+  row_ref = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &child1, 1);
+  assert_node_ref_count (ref_model, &grandchild1, 1);
+  assert_node_ref_count (ref_model, &iter2, 0);
+  assert_node_ref_count (ref_model, &child2, 0);
+  assert_node_ref_count (ref_model, &grandchild2, 0);
+
+  gtk_tree_row_reference_free (row_ref);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  /* again, with path 1:1 */
+  path = gtk_tree_path_new_from_indices (1, 0, -1);
+  row_ref = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &child1, 1);
+  assert_node_ref_count (ref_model, &grandchild1, 0);
+  assert_node_ref_count (ref_model, &iter2, 0);
+  assert_node_ref_count (ref_model, &child2, 0);
+  assert_node_ref_count (ref_model, &grandchild2, 0);
+
+  gtk_tree_row_reference_free (row_ref);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  /* both row refs existent at once and also with a tree view monitoring
+   * the model
+   */
+  tree_view = gtk_tree_view_new_with_model (model);
+
+  assert_root_level_referenced (ref_model, 1);
+
+  path = gtk_tree_path_new_from_indices (1, 0, 0, -1);
+  row_ref = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &iter0, 1);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 2);
+  assert_node_ref_count (ref_model, &child1, 1);
+  assert_node_ref_count (ref_model, &grandchild1, 1);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &child2, 0);
+  assert_node_ref_count (ref_model, &grandchild2, 0);
+
+  path = gtk_tree_path_new_from_indices (1, 0, -1);
+  row_ref1 = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &iter0, 1);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 3);
+  assert_node_ref_count (ref_model, &child1, 2);
+  assert_node_ref_count (ref_model, &grandchild1, 1);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &child2, 0);
+  assert_node_ref_count (ref_model, &grandchild2, 0);
+
+  gtk_tree_row_reference_free (row_ref);
+
+  assert_node_ref_count (ref_model, &iter0, 1);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 2);
+  assert_node_ref_count (ref_model, &child1, 1);
+  assert_node_ref_count (ref_model, &grandchild1, 0);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &child2, 0);
+  assert_node_ref_count (ref_model, &grandchild2, 0);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &child1, 1);
+  assert_node_ref_count (ref_model, &grandchild1, 0);
+  assert_node_ref_count (ref_model, &iter2, 0);
+  assert_node_ref_count (ref_model, &child2, 0);
+  assert_node_ref_count (ref_model, &grandchild2, 0);
+
+  gtk_tree_row_reference_free (row_ref1);
+
+  assert_root_level_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_row_reference_tree_remove (void)
+{
+  GtkTreeIter iter0, iter1, iter2;
+  GtkTreeIter child0, child1, child2;
+  GtkTreeIter grandchild0, grandchild1, grandchild2;
+  GtkTreePath *path;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeRowReference *row_ref, *row_ref1, *row_ref2;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter0, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child0, &iter0);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild0, &child0);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child1, &iter1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild1, &child1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child2, &iter2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild2, &child2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  path = gtk_tree_path_new_from_indices (1, 0, 0, -1);
+  row_ref = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  path = gtk_tree_path_new_from_indices (2, 0, -1);
+  row_ref1 = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  path = gtk_tree_path_new_from_indices (2, -1);
+  row_ref2 = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &child1, 1);
+  assert_node_ref_count (ref_model, &grandchild1, 1);
+  assert_node_ref_count (ref_model, &iter2, 2);
+  assert_node_ref_count (ref_model, &child2, 1);
+  assert_node_ref_count (ref_model, &grandchild2, 0);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &grandchild1);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 0);
+  assert_node_ref_count (ref_model, &child1, 0);
+  assert_node_ref_count (ref_model, &iter2, 2);
+  assert_node_ref_count (ref_model, &child2, 1);
+  assert_node_ref_count (ref_model, &grandchild2, 0);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &child2);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 0);
+  assert_node_ref_count (ref_model, &child1, 0);
+  assert_node_ref_count (ref_model, &iter2, 1);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &iter2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  gtk_tree_row_reference_free (row_ref);
+  gtk_tree_row_reference_free (row_ref1);
+  gtk_tree_row_reference_free (row_ref2);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_row_reference_tree_remove_ancestor (void)
+{
+  GtkTreeIter iter0, iter1, iter2;
+  GtkTreeIter child0, child1, child2;
+  GtkTreeIter grandchild0, grandchild1, grandchild2;
+  GtkTreePath *path;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeRowReference *row_ref, *row_ref1;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter0, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child0, &iter0);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild0, &child0);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child1, &iter1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild1, &child1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child2, &iter2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild2, &child2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  path = gtk_tree_path_new_from_indices (1, 0, 0, -1);
+  row_ref = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  path = gtk_tree_path_new_from_indices (2, 0, -1);
+  row_ref1 = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &child1, 1);
+  assert_node_ref_count (ref_model, &grandchild1, 1);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &child2, 1);
+  assert_node_ref_count (ref_model, &grandchild2, 0);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &child1);
+
+  assert_node_ref_count (ref_model, &iter0, 0);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 0);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &child2, 1);
+  assert_node_ref_count (ref_model, &grandchild2, 0);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &iter2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  gtk_tree_row_reference_free (row_ref);
+  gtk_tree_row_reference_free (row_ref1);
+
+  g_object_unref (ref_model);
+}
+
+static void
+test_row_reference_tree_expand (void)
+{
+  GtkTreeIter iter0, iter1, iter2;
+  GtkTreeIter child0, child1, child2;
+  GtkTreeIter grandchild0, grandchild1, grandchild2;
+  GtkTreePath *path;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeRowReference *row_ref, *row_ref1, *row_ref2;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+  tree_view = gtk_tree_view_new_with_model (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter0, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child0, &iter0);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild0, &child0);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child1, &iter1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild1, &child1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child2, &iter2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandchild2, &child2);
+
+  assert_root_level_referenced (ref_model, 1);
+
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  assert_entire_model_referenced (ref_model, 1);
+
+  path = gtk_tree_path_new_from_indices (1, 0, 0, -1);
+  row_ref = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  path = gtk_tree_path_new_from_indices (2, 0, -1);
+  row_ref1 = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  path = gtk_tree_path_new_from_indices (2, -1);
+  row_ref2 = gtk_tree_row_reference_new (model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &iter0, 1);
+  assert_node_ref_count (ref_model, &child0, 1);
+  assert_node_ref_count (ref_model, &grandchild0, 1);
+  assert_node_ref_count (ref_model, &iter1, 2);
+  assert_node_ref_count (ref_model, &child1, 2);
+  assert_node_ref_count (ref_model, &grandchild1, 2);
+  assert_node_ref_count (ref_model, &iter2, 3);
+  assert_node_ref_count (ref_model, &child2, 2);
+  assert_node_ref_count (ref_model, &grandchild2, 1);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &grandchild1);
+
+  assert_node_ref_count (ref_model, &iter0, 1);
+  assert_node_ref_count (ref_model, &child0, 1);
+  assert_node_ref_count (ref_model, &grandchild0, 1);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &child1, 1);
+  assert_node_ref_count (ref_model, &iter2, 3);
+  assert_node_ref_count (ref_model, &child2, 2);
+  assert_node_ref_count (ref_model, &grandchild2, 1);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &child2);
+
+  assert_node_ref_count (ref_model, &iter0, 1);
+  assert_node_ref_count (ref_model, &child0, 1);
+  assert_node_ref_count (ref_model, &grandchild0, 1);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &child1, 1);
+  assert_node_ref_count (ref_model, &iter2, 2);
+
+  gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
+
+  assert_node_ref_count (ref_model, &iter0, 1);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &child1, 0);
+  assert_node_ref_count (ref_model, &iter2, 2);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &iter2);
+
+  assert_node_ref_count (ref_model, &iter0, 1);
+  assert_node_ref_count (ref_model, &child0, 0);
+  assert_node_ref_count (ref_model, &grandchild0, 0);
+  assert_node_ref_count (ref_model, &iter1, 1);
+  assert_node_ref_count (ref_model, &child1, 0);
+
+  gtk_tree_row_reference_free (row_ref);
+  gtk_tree_row_reference_free (row_ref1);
+  gtk_tree_row_reference_free (row_ref2);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (ref_model);
+}
+
+void
+register_model_ref_count_tests (void)
+{
+  /* lists (though based on GtkTreeStore) */
+  g_test_add_func ("/TreeModel/ref-count/list/no-reference",
+                   test_list_no_reference);
+  g_test_add_func ("/TreeModel/ref-count/list/reference-during-creation",
+                   test_list_reference_during_creation);
+  g_test_add_func ("/TreeModel/ref-count/list/reference-after-creation",
+                   test_list_reference_after_creation);
+  g_test_add_func ("/TreeModel/ref-count/list/reference-reordered",
+                   test_list_reference_reordered);
+
+  /* trees */
+  g_test_add_func ("/TreeModel/ref-count/tree/no-reference",
+                   test_tree_no_reference);
+  g_test_add_func ("/TreeModel/ref-count/tree/reference-during-creation",
+                   test_tree_reference_during_creation);
+  g_test_add_func ("/TreeModel/ref-count/tree/reference-after-creation",
+                   test_tree_reference_after_creation);
+  g_test_add_func ("/TreeModel/ref-count/tree/expand-all",
+                   test_tree_reference_expand_all);
+  g_test_add_func ("/TreeModel/ref-count/tree/collapse-all",
+                   test_tree_reference_collapse_all);
+  g_test_add_func ("/TreeModel/ref-count/tree/expand-collapse",
+                   test_tree_reference_expand_collapse);
+  g_test_add_func ("/TreeModel/ref-count/tree/reference-reordered",
+                   test_tree_reference_reordered);
+
+  /* row references */
+  g_test_add_func ("/TreeModel/ref-count/row-reference/list",
+                   test_row_reference_list);
+  g_test_add_func ("/TreeModel/ref-count/row-reference/list-remove",
+                   test_row_reference_list_remove);
+  g_test_add_func ("/TreeModel/ref-count/row-reference/tree",
+                   test_row_reference_tree);
+  g_test_add_func ("/TreeModel/ref-count/row-reference/tree-remove",
+                   test_row_reference_tree_remove);
+  g_test_add_func ("/TreeModel/ref-count/row-reference/tree-remove-ancestor",
+                   test_row_reference_tree_remove_ancestor);
+  g_test_add_func ("/TreeModel/ref-count/row-reference/tree-expand",
+                   test_row_reference_tree_expand);
+}
diff --git a/gtk/tests/sortmodel.c b/gtk/tests/sortmodel.c
new file mode 100644
index 0000000000..a58359d6d1
--- /dev/null
+++ b/gtk/tests/sortmodel.c
@@ -0,0 +1,1151 @@
+/* Extensive GtkTreeModelSort tests.
+ * Copyright (C) 2009,2011  Kristian Rietveld  <kris@gtk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <gtk/gtk.h>
+
+#include "treemodel.h"
+#include "gtktreemodelrefcount.h"
+
+
+static void
+ref_count_single_level (void)
+{
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
+
+  assert_root_level_unreferenced (ref_model);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+
+  assert_entire_model_referenced (ref_model, 1);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (sort_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_two_levels (void)
+{
+  GtkTreeIter parent1, parent2, iter;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_node_ref_count (ref_model, &iter, 0);
+
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter, 1);
+
+  gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
+
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter, 0);
+
+  gtk_tree_model_sort_clear_cache (GTK_TREE_MODEL_SORT (sort_model));
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_node_ref_count (ref_model, &iter, 0);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (sort_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_three_levels (void)
+{
+  GtkTreeIter grandparent1, grandparent2, parent1, parent2;
+  GtkTreeIter iter_parent1, iter_parent2;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkTreePath *path;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   * + grandparent2
+   *   + parent1
+   *     + iter_parent1
+   *   + parent2
+   *     + iter_parent2
+   *     + iter_parent2
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent1, &parent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_level_unreferenced (ref_model, &parent1);
+  assert_level_unreferenced (ref_model, &parent2);
+
+  path = gtk_tree_path_new_from_indices (1, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, FALSE);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, TRUE);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 2);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_model_sort_clear_cache (GTK_TREE_MODEL_SORT (sort_model));
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &parent2, 0);
+
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, FALSE);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_path_append_index (path, 1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, FALSE);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_tree_view_collapse_row (GTK_TREE_VIEW (tree_view), path);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_model_sort_clear_cache (GTK_TREE_MODEL_SORT (sort_model));
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_path_up (path);
+  gtk_tree_view_collapse_row (GTK_TREE_VIEW (tree_view), path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_model_sort_clear_cache (GTK_TREE_MODEL_SORT (sort_model));
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 1);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (sort_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_delete_row (void)
+{
+  GtkTreeIter grandparent1, grandparent2, parent1, parent2;
+  GtkTreeIter iter_parent1, iter_parent2;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkTreePath *path;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   * + grandparent2
+   *   + parent1
+   *     + iter_parent1
+   *   + parent2
+   *     + iter_parent2
+   *     + iter_parent2
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent1, &parent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+
+  assert_root_level_referenced (ref_model, 1);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &parent2, 0);
+  assert_level_unreferenced (ref_model, &parent1);
+  assert_level_unreferenced (ref_model, &parent2);
+
+  path = gtk_tree_path_new_from_indices (1, -1);
+  gtk_tree_view_expand_row (GTK_TREE_VIEW (tree_view), path, TRUE);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 2);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 1);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &iter_parent2);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 2);
+  assert_level_referenced (ref_model, 1, &parent1);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_level_referenced (ref_model, 1, &parent2);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &parent1);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_level_referenced (ref_model, 1, &parent2);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &grandparent2);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+
+  gtk_tree_model_sort_clear_cache (GTK_TREE_MODEL_SORT (sort_model));
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+
+  gtk_widget_destroy (tree_view);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (sort_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_cleanup (void)
+{
+  GtkTreeIter grandparent1, grandparent2, parent1, parent2;
+  GtkTreeIter iter_parent1, iter_parent2;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkWidget *tree_view;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   * + grandparent2
+   *   + parent1
+   *     + iter_parent1
+   *   + parent2
+   *     + iter_parent2
+   *     + iter_parent2
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent1, &parent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  gtk_widget_destroy (tree_view);
+
+  assert_node_ref_count (ref_model, &grandparent1, 0);
+  assert_node_ref_count (ref_model, &grandparent2, 1);
+  assert_node_ref_count (ref_model, &parent1, 1);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  gtk_tree_model_sort_clear_cache (GTK_TREE_MODEL_SORT (sort_model));
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (sort_model);
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_row_ref (void)
+{
+  GtkTreeIter grandparent1, grandparent2, parent1, parent2;
+  GtkTreeIter iter_parent1, iter_parent2;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkWidget *tree_view;
+  GtkTreePath *path;
+  GtkTreeRowReference *row_ref;
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  /* + grandparent1
+   * + grandparent2
+   *   + parent1
+   *     + iter_parent1
+   *   + parent2
+   *     + iter_parent2
+   *     + iter_parent2
+   */
+
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent2, NULL);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent1, &parent1);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+  gtk_tree_store_append (GTK_TREE_STORE (model), &iter_parent2, &parent2);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+
+  path = gtk_tree_path_new_from_indices (1, 1, 1, -1);
+  row_ref = gtk_tree_row_reference_new (sort_model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  /* Referenced because the node is visible, its child level is built
+   * and referenced by the row ref.
+   */
+  assert_node_ref_count (ref_model, &grandparent2, 3);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  /* Referenced by the row ref and because its child level is built. */
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_tree_row_reference_free (row_ref);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 2);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &parent2, 1);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 0);
+
+  path = gtk_tree_path_new_from_indices (1, 1, 1, -1);
+  row_ref = gtk_tree_row_reference_new (sort_model, path);
+  gtk_tree_path_free (path);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  /* Referenced because the node is visible, its child level is built
+   * and referenced by the row ref.
+   */
+  assert_node_ref_count (ref_model, &grandparent2, 3);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  /* Referenced by the row ref and because its child level is built. */
+  assert_node_ref_count (ref_model, &parent2, 2);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent2, 1);
+
+  gtk_tree_store_remove (GTK_TREE_STORE (model), &parent2);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 1);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+
+  gtk_tree_row_reference_free (row_ref);
+
+  assert_node_ref_count (ref_model, &grandparent1, 1);
+  assert_node_ref_count (ref_model, &grandparent2, 1);
+  assert_node_ref_count (ref_model, &parent1, 0);
+  assert_node_ref_count (ref_model, &iter_parent1, 0);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (sort_model);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_reorder_single (void)
+{
+  GtkTreeIter iter1, iter2, iter3, iter4, iter5;
+  GtkTreeIter siter1, siter2, siter3, siter4, siter5;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkWidget *tree_view;
+  GType column_types[] = { G_TYPE_INT };
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_set_column_types (GTK_TREE_STORE (model), 1,
+                                   column_types);
+
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter1, NULL, 0,
+                                     0, 30, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter2, NULL, 1,
+                                     0, 40, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter3, NULL, 2,
+                                     0, 10, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter4, NULL, 3,
+                                     0, 20, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter5, NULL, 4,
+                                     0, 60, -1);
+
+  assert_root_level_unreferenced (ref_model);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+
+  assert_entire_model_referenced (ref_model, 1);
+
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter1, &iter1);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter2, &iter2);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter3, &iter3);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter4, &iter4);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter5, &iter5);
+
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter1);
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter1);
+
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter3);
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter3);
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter3);
+
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter5);
+
+  assert_node_ref_count (ref_model, &iter1, 3);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &iter3, 4);
+  assert_node_ref_count (ref_model, &iter4, 1);
+  assert_node_ref_count (ref_model, &iter5, 2);
+
+  /* Sort */
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                        0, GTK_SORT_ASCENDING);
+
+  assert_node_ref_count (ref_model, &iter1, 3);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &iter3, 4);
+  assert_node_ref_count (ref_model, &iter4, 1);
+  assert_node_ref_count (ref_model, &iter5, 2);
+
+  /* Re-translate the iters after sorting */
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter1, &iter1);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter2, &iter2);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter3, &iter3);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter4, &iter4);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter5, &iter5);
+
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter1);
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter1);
+
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter3);
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter3);
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter3);
+
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter5);
+
+  assert_entire_model_referenced (ref_model, 1);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (sort_model);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+ref_count_reorder_two (void)
+{
+  GtkTreeIter iter1, iter2, iter3, iter4, iter5;
+  GtkTreeIter citer1, citer2, citer3, citer4, citer5;
+  GtkTreeIter siter1, siter2, siter3, siter4, siter5;
+  GtkTreeIter sciter1, sciter2, sciter3, sciter4, sciter5;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkWidget *tree_view;
+  GType column_types[] = { G_TYPE_INT };
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_set_column_types (GTK_TREE_STORE (model), 1,
+                                   column_types);
+
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter1, NULL, 0,
+                                     0, 30, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter2, NULL, 1,
+                                     0, 40, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter3, NULL, 2,
+                                     0, 10, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter4, NULL, 3,
+                                     0, 20, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter5, NULL, 4,
+                                     0, 60, -1);
+
+  /* Child level */
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &citer1, &iter1, 0,
+                                     0, 30, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &citer2, &iter1, 1,
+                                     0, 40, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &citer3, &iter1, 2,
+                                     0, 10, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &citer4, &iter1, 3,
+                                     0, 20, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &citer5, &iter1, 4,
+                                     0, 60, -1);
+
+  assert_root_level_unreferenced (ref_model);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  assert_node_ref_count (ref_model, &iter1, 2);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &iter3, 1);
+  assert_node_ref_count (ref_model, &iter4, 1);
+  assert_node_ref_count (ref_model, &iter5, 1);
+
+  assert_level_referenced (ref_model, 1, &iter1);
+
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter1, &iter1);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter2, &iter2);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter3, &iter3);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter4, &iter4);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter5, &iter5);
+
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &sciter1, &citer1);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &sciter2, &citer2);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &sciter3, &citer3);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &sciter4, &citer4);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &sciter5, &citer5);
+
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter1);
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter1);
+
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter3);
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter3);
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter3);
+
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &siter5);
+
+  assert_node_ref_count (ref_model, &iter1, 4);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &iter3, 4);
+  assert_node_ref_count (ref_model, &iter4, 1);
+  assert_node_ref_count (ref_model, &iter5, 2);
+
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &sciter3);
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &sciter3);
+
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &sciter5);
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &sciter5);
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &sciter5);
+
+  gtk_tree_model_ref_node (GTK_TREE_MODEL (sort_model), &sciter1);
+
+  assert_node_ref_count (ref_model, &citer1, 2);
+  assert_node_ref_count (ref_model, &citer2, 1);
+  assert_node_ref_count (ref_model, &citer3, 3);
+  assert_node_ref_count (ref_model, &citer4, 1);
+  assert_node_ref_count (ref_model, &citer5, 4);
+
+  /* Sort */
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                        0, GTK_SORT_ASCENDING);
+
+  assert_node_ref_count (ref_model, &iter1, 4);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &iter3, 4);
+  assert_node_ref_count (ref_model, &iter4, 1);
+  assert_node_ref_count (ref_model, &iter5, 2);
+
+  assert_node_ref_count (ref_model, &citer1, 2);
+  assert_node_ref_count (ref_model, &citer2, 1);
+  assert_node_ref_count (ref_model, &citer3, 3);
+  assert_node_ref_count (ref_model, &citer4, 1);
+  assert_node_ref_count (ref_model, &citer5, 4);
+
+  /* Re-translate the iters after sorting */
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter1, &iter1);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter2, &iter2);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter3, &iter3);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter4, &iter4);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &siter5, &iter5);
+
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &sciter1, &citer1);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &sciter2, &citer2);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &sciter3, &citer3);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &sciter4, &citer4);
+  gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (sort_model), &sciter5, &citer5);
+
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter1);
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter1);
+
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter3);
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter3);
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter3);
+
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &siter5);
+
+  assert_node_ref_count (ref_model, &iter1, 2);
+  assert_node_ref_count (ref_model, &iter2, 1);
+  assert_node_ref_count (ref_model, &iter3, 1);
+  assert_node_ref_count (ref_model, &iter4, 1);
+  assert_node_ref_count (ref_model, &iter5, 1);
+
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &sciter3);
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &sciter3);
+
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &sciter5);
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &sciter5);
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &sciter5);
+
+  gtk_tree_model_unref_node (GTK_TREE_MODEL (sort_model), &sciter1);
+
+  assert_level_referenced (ref_model, 1, &iter1);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (sort_model);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+check_sort_order (GtkTreeModel *sort_model,
+                  GtkSortType   sort_order,
+                  const char   *parent_path)
+{
+  int prev_value;
+  GtkTreeIter siter;
+
+  if (!parent_path)
+    gtk_tree_model_get_iter_first (sort_model, &siter);
+  else
+    {
+      GtkTreePath *path;
+
+      path = gtk_tree_path_new_from_string (parent_path);
+      gtk_tree_path_append_index (path, 0);
+
+      gtk_tree_model_get_iter (sort_model, &siter, path);
+
+      gtk_tree_path_free (path);
+    }
+
+  if (sort_order == GTK_SORT_ASCENDING)
+    prev_value = -1;
+  else
+    prev_value = INT_MAX;
+
+  do
+    {
+      int value;
+
+      gtk_tree_model_get (sort_model, &siter, 0, &value, -1);
+      if (sort_order == GTK_SORT_ASCENDING)
+        g_assert (prev_value <= value);
+      else
+        g_assert (prev_value >= value);
+
+      prev_value = value;
+    }
+  while (gtk_tree_model_iter_next (sort_model, &siter));
+}
+
+static void
+rows_reordered_single_level (void)
+{
+  GtkTreeIter iter1, iter2, iter3, iter4, iter5;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkWidget *tree_view;
+  SignalMonitor *monitor;
+  GtkTreePath *path;
+  GType column_types[] = { G_TYPE_INT };
+  int order[][5] =
+    {
+        { 2, 3, 0, 1, 4 },
+        { 4, 3, 2, 1, 0 },
+        { 2, 1, 4, 3, 0 }
+    };
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_set_column_types (GTK_TREE_STORE (model), 1,
+                                   column_types);
+
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter1, NULL, 0,
+                                     0, 30, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter2, NULL, 1,
+                                     0, 40, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter3, NULL, 2,
+                                     0, 10, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter4, NULL, 3,
+                                     0, 20, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter5, NULL, 4,
+                                     0, 60, -1);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+
+  monitor = signal_monitor_new (sort_model);
+
+  /* Sort */
+  path = gtk_tree_path_new ();
+  signal_monitor_append_signal_reordered (monitor,
+                                          ROWS_REORDERED,
+                                          path, order[0], 5);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                        0, GTK_SORT_ASCENDING);
+  signal_monitor_assert_is_empty (monitor);
+  check_sort_order (sort_model, GTK_SORT_ASCENDING, NULL);
+
+  signal_monitor_append_signal_reordered (monitor,
+                                          ROWS_REORDERED,
+                                          path, order[1], 5);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                        0, GTK_SORT_DESCENDING);
+  signal_monitor_assert_is_empty (monitor);
+  check_sort_order (sort_model, GTK_SORT_DESCENDING, NULL);
+
+  signal_monitor_append_signal_reordered (monitor,
+                                          ROWS_REORDERED,
+                                          path, order[2], 5);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                        GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+                                        GTK_SORT_ASCENDING);
+  signal_monitor_assert_is_empty (monitor);
+
+  gtk_tree_path_free (path);
+  signal_monitor_free (monitor);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (sort_model);
+
+  assert_entire_model_unreferenced (ref_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+rows_reordered_two_levels (void)
+{
+  GtkTreeIter iter1, iter2, iter3, iter4, iter5;
+  GtkTreeIter citer1, citer2, citer3, citer4, citer5;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkWidget *tree_view;
+  SignalMonitor *monitor;
+  GtkTreePath *path, *child_path;
+  GType column_types[] = { G_TYPE_INT };
+  int order[][5] =
+    {
+        { 2, 3, 0, 1, 4 },
+        { 4, 3, 2, 1, 0 },
+        { 2, 1, 4, 3, 0 }
+    };
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_set_column_types (GTK_TREE_STORE (model), 1,
+                                   column_types);
+
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter1, NULL, 0,
+                                     0, 30, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter2, NULL, 1,
+                                     0, 40, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter3, NULL, 2,
+                                     0, 10, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter4, NULL, 3,
+                                     0, 20, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter5, NULL, 4,
+                                     0, 60, -1);
+
+  /* Child level */
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &citer1, &iter1, 0,
+                                     0, 30, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &citer2, &iter1, 1,
+                                     0, 40, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &citer3, &iter1, 2,
+                                     0, 10, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &citer4, &iter1, 3,
+                                     0, 20, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &citer5, &iter1, 4,
+                                     0, 60, -1);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+  gtk_tree_view_expand_all (GTK_TREE_VIEW (tree_view));
+
+  monitor = signal_monitor_new (sort_model);
+
+  /* Sort */
+  path = gtk_tree_path_new ();
+  child_path = gtk_tree_path_new_from_indices (2, -1);
+  signal_monitor_append_signal_reordered (monitor,
+                                          ROWS_REORDERED,
+                                          path, order[0], 5);
+  signal_monitor_append_signal_reordered (monitor,
+                                          ROWS_REORDERED,
+                                          child_path, order[0], 5);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                        0, GTK_SORT_ASCENDING);
+  signal_monitor_assert_is_empty (monitor);
+  check_sort_order (sort_model, GTK_SORT_ASCENDING, NULL);
+  /* The parent node of the child level moved due to sorting */
+  check_sort_order (sort_model, GTK_SORT_ASCENDING, "2");
+
+  signal_monitor_append_signal_reordered (monitor,
+                                          ROWS_REORDERED,
+                                          path, order[1], 5);
+  signal_monitor_append_signal_reordered (monitor,
+                                          ROWS_REORDERED,
+                                          child_path, order[1], 5);
+  gtk_tree_path_free (child_path);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                        0, GTK_SORT_DESCENDING);
+  signal_monitor_assert_is_empty (monitor);
+  check_sort_order (sort_model, GTK_SORT_DESCENDING, NULL);
+  /* The parent node of the child level moved due to sorting */
+  check_sort_order (sort_model, GTK_SORT_DESCENDING, "2");
+
+  child_path = gtk_tree_path_new_from_indices (0, -1);
+  signal_monitor_append_signal_reordered (monitor,
+                                          ROWS_REORDERED,
+                                          path, order[2], 5);
+  signal_monitor_append_signal_reordered (monitor,
+                                          ROWS_REORDERED,
+                                          child_path, order[2], 5);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                        GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+                                        GTK_SORT_ASCENDING);
+  signal_monitor_assert_is_empty (monitor);
+
+  gtk_tree_path_free (path);
+  gtk_tree_path_free (child_path);
+  signal_monitor_free (monitor);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (sort_model);
+
+  g_object_unref (ref_model);
+}
+
+static void
+sorted_insert (void)
+{
+  GtkTreeIter iter1, iter2, iter3, iter4, iter5, new_iter;
+  GtkTreeModel *model;
+  GtkTreeModelRefCount *ref_model;
+  GtkTreeModel *sort_model;
+  GtkWidget *tree_view;
+  SignalMonitor *monitor;
+  GtkTreePath *path;
+  GType column_types[] = { G_TYPE_INT };
+  int order0[] = { 1, 2, 3, 0, 4, 5, 6 };
+
+  model = gtk_tree_model_ref_count_new ();
+  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
+
+  gtk_tree_store_set_column_types (GTK_TREE_STORE (model), 1,
+                                   column_types);
+
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter1, NULL, 0,
+                                     0, 30, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter2, NULL, 1,
+                                     0, 40, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter3, NULL, 2,
+                                     0, 10, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter4, NULL, 3,
+                                     0, 20, -1);
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &iter5, NULL, 4,
+                                     0, 60, -1);
+
+  sort_model = gtk_tree_model_sort_new_with_model (model);
+  tree_view = gtk_tree_view_new_with_model (sort_model);
+
+  /* Sort */
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                        0, GTK_SORT_ASCENDING);
+  check_sort_order (sort_model, GTK_SORT_ASCENDING, NULL);
+
+  monitor = signal_monitor_new (sort_model);
+
+  /* Insert a new item */
+  signal_monitor_append_signal (monitor, ROW_INSERTED, "4");
+  gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), &new_iter, NULL,
+                                     5, 0, 50, -1);
+  signal_monitor_assert_is_empty (monitor);
+  check_sort_order (sort_model, GTK_SORT_ASCENDING, NULL);
+
+  /* Sort the tree sort and append a new item */
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
+                                        0, GTK_SORT_ASCENDING);
+  check_sort_order (model, GTK_SORT_ASCENDING, NULL);
+
+  path = gtk_tree_path_new ();
+  signal_monitor_append_signal (monitor, ROW_INSERTED, "0");
+  signal_monitor_append_signal_reordered (monitor,
+                                          ROWS_REORDERED,
+                                          path, order0, 7);
+  signal_monitor_append_signal (monitor, ROW_CHANGED, "3");
+  gtk_tree_store_append (GTK_TREE_STORE (model), &new_iter, NULL);
+  gtk_tree_store_set (GTK_TREE_STORE (model), &new_iter, 0, 35, -1);
+  check_sort_order (model, GTK_SORT_ASCENDING, NULL);
+  check_sort_order (sort_model, GTK_SORT_ASCENDING, NULL);
+
+  gtk_tree_path_free (path);
+  signal_monitor_free (monitor);
+
+  gtk_widget_destroy (tree_view);
+  g_object_unref (sort_model);
+
+  g_object_unref (ref_model);
+}
+
+
+static void
+specific_bug_300089 (void)
+{
+  /* Test case for GNOME Bugzilla bug 300089.  Written by
+   * Matthias Clasen.
+   */
+  GtkTreeModel *sort_model, *child_model;
+  GtkTreePath *path;
+  GtkTreeIter iter, iter2, sort_iter;
+
+  g_test_bug ("300089");
+
+  child_model = GTK_TREE_MODEL (gtk_tree_store_new (1, G_TYPE_STRING));
+
+  gtk_tree_store_append (GTK_TREE_STORE (child_model), &iter, NULL);
+  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter, 0, "A", -1);
+  gtk_tree_store_append (GTK_TREE_STORE (child_model), &iter, NULL);
+  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter, 0, "B", -1);
+
+  gtk_tree_store_append (GTK_TREE_STORE (child_model), &iter2, &iter);
+  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter2, 0, "D", -1);
+  gtk_tree_store_append (GTK_TREE_STORE (child_model), &iter2, &iter);
+  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter2, 0, "E", -1);
+
+  gtk_tree_store_append (GTK_TREE_STORE (child_model), &iter, NULL);
+  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter, 0, "C", -1);
+
+
+  sort_model = GTK_TREE_MODEL (gtk_tree_model_sort_new_with_model (child_model));
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                        0, GTK_SORT_ASCENDING);
+
+  path = gtk_tree_path_new_from_indices (1, 1, -1);
+
+  /* make sure a level is constructed */
+  gtk_tree_model_get_iter (sort_model, &sort_iter, path);
+
+  /* change the "E" row in a way that causes it to change position */ 
+  gtk_tree_model_get_iter (child_model, &iter, path);
+  gtk_tree_store_set (GTK_TREE_STORE (child_model), &iter, 0, "A", -1);
+
+  gtk_tree_path_free (path);
+}
+
+static void
+specific_bug_364946 (void)
+{
+  /* This is a test case for GNOME Bugzilla bug 364946.  It was written
+   * by Andreas Koehler.
+   */
+  GtkTreeStore *store;
+  GtkTreeIter a, aa, aaa, aab, iter;
+  GtkTreeModel *s_model;
+
+  g_test_bug ("364946");
+
+  store = gtk_tree_store_new (1, G_TYPE_STRING);
+
+  gtk_tree_store_append (store, &a, NULL);
+  gtk_tree_store_set (store, &a, 0, "0", -1);
+
+  gtk_tree_store_append (store, &aa, &a);
+  gtk_tree_store_set (store, &aa, 0, "0:0", -1);
+
+  gtk_tree_store_append (store, &aaa, &aa);
+  gtk_tree_store_set (store, &aaa, 0, "0:0:0", -1);
+
+  gtk_tree_store_append (store, &aab, &aa);
+  gtk_tree_store_set (store, &aab, 0, "0:0:1", -1);
+
+  s_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (store));
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (s_model), 0,
+                                        GTK_SORT_ASCENDING);
+
+  gtk_tree_model_get_iter_from_string (s_model, &iter, "0:0:0");
+
+  gtk_tree_store_set (store, &aaa, 0, "0:0:0", -1);
+  gtk_tree_store_remove (store, &aaa);
+  gtk_tree_store_remove (store, &aab);
+
+  gtk_tree_model_sort_clear_cache (GTK_TREE_MODEL_SORT (s_model));
+}
+
+/* main */
+
+void
+register_sort_model_tests (void)
+{
+  g_test_add_func ("/TreeModelSort/ref-count/single-level",
+                   ref_count_single_level);
+  g_test_add_func ("/TreeModelSort/ref-count/two-levels",
+                   ref_count_two_levels);
+  g_test_add_func ("/TreeModelSort/ref-count/three-levels",
+                   ref_count_three_levels);
+  g_test_add_func ("/TreeModelSort/ref-count/delete-row",
+                   ref_count_delete_row);
+  g_test_add_func ("/TreeModelSort/ref-count/cleanup",
+                   ref_count_cleanup);
+  g_test_add_func ("/TreeModelSort/ref-count/row-ref",
+                   ref_count_row_ref);
+  g_test_add_func ("/TreeModelSort/ref-count/reorder/single-level",
+                   ref_count_reorder_single);
+  g_test_add_func ("/TreeModelSort/ref-count/reorder/two-levels",
+                   ref_count_reorder_two);
+
+  g_test_add_func ("/TreeModelSort/rows-reordered/single-level",
+                   rows_reordered_single_level);
+  g_test_add_func ("/TreeModelSort/rows-reordered/two-levels",
+                   rows_reordered_two_levels);
+  g_test_add_func ("/TreeModelSort/sorted-insert",
+                   sorted_insert);
+
+  g_test_add_func ("/TreeModelSort/specific/bug-300089",
+                   specific_bug_300089);
+  g_test_add_func ("/TreeModelSort/specific/bug-364946",
+                   specific_bug_364946);
+}
diff --git a/gtk/tests/treemodel.c b/gtk/tests/treemodel.c
new file mode 100644
index 0000000000..97bbc14b27
--- /dev/null
+++ b/gtk/tests/treemodel.c
@@ -0,0 +1,347 @@
+/* Main wrapper for TreeModel test suite.
+ * Copyright (C) 2011  Kristian Rietveld  <kris@gtk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <gtk/gtk.h>
+
+#include "treemodel.h"
+
+int
+main (int    argc,
+      char **argv)
+{
+  gtk_test_init (&argc, &argv, NULL);
+
+  g_test_bug_base ("http://bugzilla.gnome.org/");
+
+  register_list_store_tests ();
+  register_tree_store_tests ();
+  register_model_ref_count_tests ();
+  register_sort_model_tests ();
+  register_filter_model_tests ();
+
+  return g_test_run ();
+}
+
+/*
+ * Signal monitor
+ */
+
+static const char *
+signal_name_to_string (SignalName signal)
+{
+  switch (signal)
+    {
+      case ROW_INSERTED:
+          return "row-inserted";
+
+      case ROW_DELETED:
+          return "row-deleted";
+
+      case ROW_CHANGED:
+          return "row-changed";
+
+      case ROW_HAS_CHILD_TOGGLED:
+          return "row-has-child-toggled";
+
+      case ROWS_REORDERED:
+          return "rows-reordered";
+
+      default:
+          /* Fall through */
+          break;
+    }
+
+  return "(unknown)";
+}
+
+typedef struct
+{
+  SignalName signal;
+  GtkTreePath *path;
+
+  /* For rows-reordered */
+  int *new_order;
+  int len;
+}
+Signal;
+
+
+static Signal *
+signal_new (SignalName signal, GtkTreePath *path)
+{
+  Signal *s;
+
+  s = g_new0 (Signal, 1);
+  s->signal = signal;
+  s->path = gtk_tree_path_copy (path);
+  s->new_order = NULL;
+
+  return s;
+}
+
+static Signal *
+signal_new_with_order (SignalName signal, GtkTreePath *path,
+                       int *new_order, int len)
+{
+  Signal *s = signal_new (signal, path);
+
+  s->new_order = new_order;
+  s->len = len;
+
+  return s;
+}
+
+static void
+signal_free (Signal *s)
+{
+  if (s->path)
+    gtk_tree_path_free (s->path);
+
+  g_free (s);
+}
+
+
+struct _SignalMonitor
+{
+  GQueue *queue;
+  GtkTreeModel *client;
+  gulong signal_ids[LAST_SIGNAL];
+};
+
+
+static void
+signal_monitor_generic_handler (SignalMonitor *m,
+                                SignalName     signal,
+                                GtkTreeModel  *model,
+                                GtkTreeIter   *iter,
+                                GtkTreePath   *path,
+                                int           *new_order)
+{
+  Signal *s;
+
+  if (g_queue_is_empty (m->queue))
+    {
+      gchar *path_str;
+
+      path_str = gtk_tree_path_to_string (path);
+      g_error ("Signal queue empty, got signal %s path %s\n",
+               signal_name_to_string (signal), path_str);
+      g_free (path_str);
+
+      g_assert_not_reached ();
+    }
+
+  if (m->client != model)
+    {
+      g_error ("Model mismatch; expected %p, got %p\n",
+               m->client, model);
+      g_assert_not_reached ();
+    }
+
+  s = g_queue_peek_tail (m->queue);
+
+#if 0
+  /* For debugging: output signals that are coming in.  Leaks memory. */
+  g_print ("signal=%s path=%s\n", signal_name_to_string (signal),
+           gtk_tree_path_to_string (path));
+#endif
+
+  if (s->signal != signal ||
+      (gtk_tree_path_get_depth (s->path) == 0 &&
+       gtk_tree_path_get_depth (path) != 0) ||
+      (gtk_tree_path_get_depth (s->path) != 0 &&
+       gtk_tree_path_compare (s->path, path) != 0))
+    {
+      gchar *path_str, *s_path_str;
+
+      s_path_str = gtk_tree_path_to_string (s->path);
+      path_str = gtk_tree_path_to_string (path);
+
+      g_error ("Signals don't match; expected signal %s path %s, got signal %s path %s\n",
+               signal_name_to_string (s->signal), s_path_str,
+               signal_name_to_string (signal), path_str);
+
+      g_free (s_path_str);
+      g_free (path_str);
+
+      g_assert_not_reached ();
+    }
+
+  if (signal == ROWS_REORDERED && s->new_order != NULL)
+    {
+      int i, len;
+
+      g_assert (new_order != NULL);
+
+      len = gtk_tree_model_iter_n_children (model, iter);
+      g_assert (s->len == len);
+
+      for (i = 0; i < len; i++)
+        g_assert (s->new_order[i] == new_order[i]);
+    }
+
+  s = g_queue_pop_tail (m->queue);
+
+  signal_free (s);
+}
+
+static void
+signal_monitor_row_inserted (GtkTreeModel *model,
+                             GtkTreePath  *path,
+                             GtkTreeIter  *iter,
+                             gpointer      data)
+{
+  signal_monitor_generic_handler (data, ROW_INSERTED,
+                                  model, iter, path, NULL);
+}
+
+static void
+signal_monitor_row_deleted (GtkTreeModel *model,
+                            GtkTreePath  *path,
+                            gpointer      data)
+{
+  signal_monitor_generic_handler (data, ROW_DELETED,
+                                  model, NULL, path, NULL);
+}
+
+static void
+signal_monitor_row_changed (GtkTreeModel *model,
+                            GtkTreePath  *path,
+                            GtkTreeIter  *iter,
+                            gpointer      data)
+{
+  signal_monitor_generic_handler (data, ROW_CHANGED,
+                                  model, iter, path, NULL);
+}
+
+static void
+signal_monitor_row_has_child_toggled (GtkTreeModel *model,
+                                      GtkTreePath  *path,
+                                      GtkTreeIter  *iter,
+                                      gpointer      data)
+{
+  signal_monitor_generic_handler (data, ROW_HAS_CHILD_TOGGLED,
+                                  model, iter, path, NULL);
+}
+
+static void
+signal_monitor_rows_reordered (GtkTreeModel *model,
+                               GtkTreePath  *path,
+                               GtkTreeIter  *iter,
+                               gint         *new_order,
+                               gpointer      data)
+{
+  signal_monitor_generic_handler (data, ROWS_REORDERED,
+                                  model, iter, path, new_order);
+}
+
+SignalMonitor *
+signal_monitor_new (GtkTreeModel *client)
+{
+  SignalMonitor *m;
+
+  m = g_new0 (SignalMonitor, 1);
+  m->client = g_object_ref (client);
+  m->queue = g_queue_new ();
+
+  m->signal_ids[ROW_INSERTED] = g_signal_connect (client,
+                                                  "row-inserted",
+                                                  G_CALLBACK (signal_monitor_row_inserted),
+                                                  m);
+  m->signal_ids[ROW_DELETED] = g_signal_connect (client,
+                                                 "row-deleted",
+                                                 G_CALLBACK (signal_monitor_row_deleted),
+                                                 m);
+  m->signal_ids[ROW_CHANGED] = g_signal_connect (client,
+                                                 "row-changed",
+                                                 G_CALLBACK (signal_monitor_row_changed),
+                                                 m);
+  m->signal_ids[ROW_HAS_CHILD_TOGGLED] = g_signal_connect (client,
+                                                           "row-has-child-toggled",
+                                                           G_CALLBACK (signal_monitor_row_has_child_toggled),
+                                                           m);
+  m->signal_ids[ROWS_REORDERED] = g_signal_connect (client,
+                                                    "rows-reordered",
+                                                    G_CALLBACK (signal_monitor_rows_reordered),
+                                                    m);
+
+  return m;
+}
+
+void
+signal_monitor_free (SignalMonitor *m)
+{
+  int i;
+
+  for (i = 0; i < LAST_SIGNAL; i++)
+    g_signal_handler_disconnect (m->client, m->signal_ids[i]);
+
+  g_object_unref (m->client);
+
+  if (m->queue)
+    g_queue_free (m->queue);
+
+  g_free (m);
+}
+
+void
+signal_monitor_assert_is_empty (SignalMonitor *m)
+{
+  g_assert (g_queue_is_empty (m->queue));
+}
+
+void
+signal_monitor_append_signal_path (SignalMonitor *m,
+                                   SignalName     signal,
+                                   GtkTreePath   *path)
+{
+  Signal *s;
+
+  s = signal_new (signal, path);
+  g_queue_push_head (m->queue, s);
+}
+
+void
+signal_monitor_append_signal_reordered (SignalMonitor *m,
+                                        SignalName     signal,
+                                        GtkTreePath   *path,
+                                        int           *new_order,
+                                        int            len)
+{
+  Signal *s;
+
+  s = signal_new_with_order (signal, path, new_order, len);
+  g_queue_push_head (m->queue, s);
+}
+
+void
+signal_monitor_append_signal (SignalMonitor *m,
+                              SignalName     signal,
+                              const gchar   *path_string)
+{
+  Signal *s;
+  GtkTreePath *path;
+
+  path = gtk_tree_path_new_from_string (path_string);
+
+  s = signal_new (signal, path);
+  g_queue_push_head (m->queue, s);
+
+  gtk_tree_path_free (path);
+}
diff --git a/gtk/tests/treemodel.h b/gtk/tests/treemodel.h
new file mode 100644
index 0000000000..1478f470b5
--- /dev/null
+++ b/gtk/tests/treemodel.h
@@ -0,0 +1,60 @@
+/* Main wrapper for TreeModel test suite.
+ * Copyright (C) 2011  Kristian Rietveld  <kris@gtk.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <gtk/gtk.h>
+
+void register_list_store_tests ();
+void register_tree_store_tests ();
+void register_sort_model_tests ();
+void register_filter_model_tests ();
+void register_model_ref_count_tests ();
+
+/*
+ * Signal monitor
+ */
+typedef struct _SignalMonitor           SignalMonitor;
+typedef enum _SignalName                SignalName;
+
+enum _SignalName
+{
+  ROW_INSERTED,
+  ROW_DELETED,
+  ROW_CHANGED,
+  ROW_HAS_CHILD_TOGGLED,
+  ROWS_REORDERED,
+  LAST_SIGNAL
+};
+
+
+SignalMonitor *signal_monitor_new                     (GtkTreeModel  *client);
+void           signal_monitor_free                    (SignalMonitor *m);
+
+void           signal_monitor_assert_is_empty         (SignalMonitor *m);
+
+void           signal_monitor_append_signal_reordered (SignalMonitor *m,
+                                                       SignalName     signal,
+                                                       GtkTreePath   *path,
+                                                       int           *new_order,
+                                                       int            len);
+void           signal_monitor_append_signal_path      (SignalMonitor *m,
+                                                       SignalName     signal,
+                                                       GtkTreePath   *path);
+void           signal_monitor_append_signal           (SignalMonitor *m,
+                                                       SignalName     signal,
+                                                       const gchar   *path_string);
diff --git a/gtk/tests/treestore.c b/gtk/tests/treestore.c
index 663eaaf580..9d0c4c3d4e 100644
--- a/gtk/tests/treestore.c
+++ b/gtk/tests/treestore.c
@@ -998,131 +998,162 @@ tree_store_test_iter_parent_invalid (TreeStore     *fixture,
   g_assert (iter.stamp == 0);
 }
 
+/* specific bugs */
+static void
+specific_bug_77977 (void)
+{
+  GtkTreeStore *tree_store;
+  GtkTreeIter iter1, iter2, iter3;
+  GtkTreePath *path;
+  GtkTreeRowReference *row_ref;
+
+  /* Stripped down version of test case for bug 77977 by Damon Chaplin */
+
+  g_test_bug ("77977");
+
+  tree_store = gtk_tree_store_new (1, G_TYPE_STRING);
+
+  gtk_tree_store_append (tree_store, &iter1, NULL);
+  gtk_tree_store_set (tree_store, &iter1, 0, "Window1", -1);
+
+  gtk_tree_store_append (tree_store, &iter2, &iter1);
+  gtk_tree_store_set (tree_store, &iter2, 0, "Table1", -1);
+
+  gtk_tree_store_append (tree_store, &iter3, &iter2);
+  gtk_tree_store_set (tree_store, &iter3, 0, "Button1", -1);
+
+  path = gtk_tree_path_new_from_indices (0, 0, 0, -1);
+  row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (tree_store), path);
+  gtk_tree_path_free (path);
+
+  gtk_tree_store_remove (tree_store, &iter1);
+
+  gtk_tree_row_reference_free (row_ref);
+  g_object_unref (tree_store);
+}
 
 /* main */
 
-int
-main (int    argc,
-      char **argv)
+void
+register_tree_store_tests (void)
 {
-  gtk_test_init (&argc, &argv, NULL);
-
   /* insertion */
-  g_test_add_func ("/tree-store/insert-high-values",
+  g_test_add_func ("/TreeStore/insert-high-values",
 	           tree_store_test_insert_high_values);
-  g_test_add_func ("/tree-store/append",
+  g_test_add_func ("/TreeStore/append",
 		   tree_store_test_append);
-  g_test_add_func ("/tree-store/prepend",
+  g_test_add_func ("/TreeStore/prepend",
 		   tree_store_test_prepend);
-  g_test_add_func ("/tree-store/insert-after",
+  g_test_add_func ("/TreeStore/insert-after",
 		   tree_store_test_insert_after);
-  g_test_add_func ("/tree-store/insert-after-NULL",
+  g_test_add_func ("/TreeStore/insert-after-NULL",
 		   tree_store_test_insert_after_NULL);
-  g_test_add_func ("/tree-store/insert-before",
+  g_test_add_func ("/TreeStore/insert-before",
 		   tree_store_test_insert_before);
-  g_test_add_func ("/tree-store/insert-before-NULL",
+  g_test_add_func ("/TreeStore/insert-before-NULL",
 		   tree_store_test_insert_before_NULL);
 
   /* setting values (FIXME) */
 
   /* removal */
-  g_test_add ("/tree-store/remove-begin", TreeStore, NULL,
+  g_test_add ("/TreeStore/remove-begin", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_remove_begin,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/remove-middle", TreeStore, NULL,
+  g_test_add ("/TreeStore/remove-middle", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_remove_middle,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/remove-end", TreeStore, NULL,
+  g_test_add ("/TreeStore/remove-end", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_remove_end,
 	      tree_store_teardown);
 
-  g_test_add ("/tree-store/clear", TreeStore, NULL,
+  g_test_add ("/TreeStore/clear", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_clear,
 	      tree_store_teardown);
 
   /* reordering */
-  g_test_add ("/tree-store/reorder", TreeStore, NULL,
+  g_test_add ("/TreeStore/reorder", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_reorder,
 	      tree_store_teardown);
 
   /* swapping */
-  g_test_add ("/tree-store/swap-begin", TreeStore, NULL,
+  g_test_add ("/TreeStore/swap-begin", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_swap_begin,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/swap-middle-next", TreeStore, NULL,
+  g_test_add ("/TreeStore/swap-middle-next", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_swap_middle_next,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/swap-middle-apart", TreeStore, NULL,
+  g_test_add ("/TreeStore/swap-middle-apart", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_swap_middle_apart,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/swap-end", TreeStore, NULL,
+  g_test_add ("/TreeStore/swap-end", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_swap_end,
 	      tree_store_teardown);
-  g_test_add_func ("/tree-store/swap-single",
+  g_test_add_func ("/TreeStore/swap-single",
 		   tree_store_test_swap_single);
 
   /* moving */
-  g_test_add ("/tree-store/move-after-from-start", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-after-from-start", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_after_from_start,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-after-next", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-after-next", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_after_next,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-after-apart", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-after-apart", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_after_apart,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-after-end", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-after-end", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_after_end,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-after-from-end", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-after-from-end", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_after_from_end,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-after-change-ends", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-after-change-ends", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_after_change_ends,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-after-NULL", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-after-NULL", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_after_NULL,
 	      tree_store_teardown);
-  g_test_add_func ("/tree-store/move-after-single",
+  g_test_add_func ("/TreeStore/move-after-single",
 		   tree_store_test_move_after_single);
 
-  g_test_add ("/tree-store/move-before-next", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-before-next", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_before_next,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-before-apart", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-before-apart", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_before_apart,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-before-to-start", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-before-to-start", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_before_to_start,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-before-from-end", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-before-from-end", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_before_from_end,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-before-change-ends", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-before-change-ends", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_before_change_ends,
 	      tree_store_teardown);
-  g_test_add ("/tree-store/move-before-NULL", TreeStore, NULL,
+  g_test_add ("/TreeStore/move-before-NULL", TreeStore, NULL,
 	      tree_store_setup, tree_store_test_move_before_NULL,
 	      tree_store_teardown);
-  g_test_add_func ("/tree-store/move-before-single",
+  g_test_add_func ("/TreeStore/move-before-single",
 		   tree_store_test_move_before_single);
 
   /* iter invalidation */
-  g_test_add ("/tree-store/iter-prev-invalid", TreeStore, NULL,
+  g_test_add ("/TreeStore/iter-prev-invalid", TreeStore, NULL,
               tree_store_setup, tree_store_test_iter_previous_invalid,
               tree_store_teardown);
-  g_test_add ("/tree-store/iter-next-invalid", TreeStore, NULL,
+  g_test_add ("/TreeStore/iter-next-invalid", TreeStore, NULL,
               tree_store_setup, tree_store_test_iter_next_invalid,
               tree_store_teardown);
-  g_test_add ("/tree-store/iter-children-invalid", TreeStore, NULL,
+  g_test_add ("/TreeStore/iter-children-invalid", TreeStore, NULL,
               tree_store_setup, tree_store_test_iter_children_invalid,
               tree_store_teardown);
-  g_test_add ("/tree-store/iter-nth-child-invalid", TreeStore, NULL,
+  g_test_add ("/TreeStore/iter-nth-child-invalid", TreeStore, NULL,
               tree_store_setup, tree_store_test_iter_nth_child_invalid,
               tree_store_teardown);
-  g_test_add ("/tree-store/iter-parent-invalid", TreeStore, NULL,
+  g_test_add ("/TreeStore/iter-parent-invalid", TreeStore, NULL,
               tree_store_setup, tree_store_test_iter_parent_invalid,
               tree_store_teardown);
 
-  return g_test_run ();
+  /* specific bugs */
+  g_test_add_func ("/TreeStore/bug-77977", specific_bug_77977);
 }
diff --git a/po-properties/POTFILES.in b/po-properties/POTFILES.in
index 85b2a606d5..fa02c1bd92 100644
--- a/po-properties/POTFILES.in
+++ b/po-properties/POTFILES.in
@@ -95,6 +95,8 @@ gtk/gtkfilesystem.c
 gtk/gtkfilesystemmodel.c
 gtk/gtkfixed.c
 gtk/gtkfontbutton.c
+gtk/gtkfontchooser.c
+gtk/gtkfontchooserdialog.c
 gtk/gtkfontsel.c
 gtk/gtkframe.c
 gtk/gtkgrid.c
@@ -254,4 +256,3 @@ modules/printbackends/file/gtkprintbackendfile.c
 modules/printbackends/lpr/gtkprintbackendlpr.c
 modules/printbackends/papi/gtkprintbackendpapi.c
 modules/printbackends/test/gtkprintbackendtest.c
-tests/testfilechooser.c
diff --git a/po-properties/POTFILES.skip b/po-properties/POTFILES.skip
index bab2cdcd3b..7cfeff0aaf 100644
--- a/po-properties/POTFILES.skip
+++ b/po-properties/POTFILES.skip
@@ -1 +1,64 @@
 demos/gtk-demo/demo.ui
+tests/a11y/accessible-name.ui
+tests/a11y/assistant.ui
+tests/a11y/buttons.ui
+tests/a11y/entries.ui
+tests/a11y/expander.ui
+tests/a11y/hello-world.ui
+tests/a11y/infobar.ui
+tests/a11y/link.ui
+tests/a11y/menus.ui
+tests/a11y/menu.ui
+tests/a11y/messagedialog.ui
+tests/a11y/mnemonic.ui
+tests/a11y/notebook.ui
+tests/a11y/paned.ui
+tests/a11y/placeholder-text.ui
+tests/a11y/tree.ui
+tests/reftests/background-area.ref.ui
+tests/reftests/background-area.ui
+tests/reftests/border-image-gradient.ref.ui
+tests/reftests/border-image-gradient.ui
+tests/reftests/border-image-url.ref.ui
+tests/reftests/border-image-url.ui
+tests/reftests/box-packing.ui
+tests/reftests/box-pseudo-classes.ref.ui
+tests/reftests/box-pseudo-classes.ui
+tests/reftests/css-match-inherit.ref.ui
+tests/reftests/css-match-inherit.ui
+tests/reftests/css-match-region-matches-star.ref.ui
+tests/reftests/css-match-region-matches-star.ui
+tests/reftests/css-match-regions.ref.ui
+tests/reftests/css-match-regions.ui
+tests/reftests/css-match-style-property-order.ref.ui
+tests/reftests/css-match-style-property-order.ui
+tests/reftests/entry-progress-coloring.ref.ui
+tests/reftests/entry-progress-coloring.ui
+tests/reftests/grid-wfh.ref.ui
+tests/reftests/grid-wfh.ui
+tests/reftests/label-shadows.ref.ui
+tests/reftests/label-shadows.ui
+tests/reftests/label-sizing.ref.ui
+tests/reftests/label-sizing.ui
+tests/reftests/label-small-ellipsized.ref.ui
+tests/reftests/label-small-ellipsized.ui
+tests/reftests/label-wrap-justify.ref.ui
+tests/reftests/label-wrap-justify.ui
+tests/reftests/messagedialog-secondarytext.ref.ui
+tests/reftests/messagedialog-secondarytext.ui
+tests/reftests/misc-alignment.ref.ui
+tests/reftests/misc-alignment.ui
+tests/reftests/no-colors.ref.ui
+tests/reftests/no-colors.ui
+tests/reftests/nonresizable-size.ref.ui
+tests/reftests/nonresizable-size.ui
+tests/reftests/notebook-childproperties.ref.ui
+tests/reftests/notebook-childproperties.ui
+tests/reftests/quit-mnemonic.ref.ui
+tests/reftests/quit-mnemonic.ui
+tests/reftests/rotated-layout.ref.ui
+tests/reftests/rotated-layout.ui
+tests/reftests/toplevel-vs-popup.ref.ui
+tests/reftests/toplevel-vs-popup.ui
+tests/testfilechooser.c
+tests/widget-factory.ui
diff --git a/po-properties/de.po b/po-properties/de.po
index bb115ded72..63a0eeb189 100644
--- a/po-properties/de.po
+++ b/po-properties/de.po
@@ -13,7 +13,7 @@
 # Christian Neumair <chris@gnome-de.org>, 2002-2004.
 # Hendrik Richter <hendrikr@gnome.org>, 2004-2009.
 # Hendrik Brandt <heb@gnome-de.org>, 2005.
-# Mario Blättermann <mariobl@gnome.org>, 2010.
+# Mario Blättermann <mariobl@freenet.de>, 2010, 2011.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010, 2011.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2011.
 #
@@ -22,9 +22,9 @@ msgstr ""
 "Project-Id-Version: GTK+ master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
 "%2b&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-30 23:13+0000\n"
-"PO-Revision-Date: 2011-03-31 09:38+0100\n"
-"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
+"POT-Creation-Date: 2011-08-27 15:50+0000\n"
+"PO-Revision-Date: 2011-08-28 13:36+0100\n"
+"Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -114,11 +114,11 @@ msgstr "Die Anzahl der Achsen des Geräts"
 msgid "Display for the device manager"
 msgstr "Anzeige für die Geräteverwaltung"
 
-#: ../gdk/gdkdisplaymanager.c:154
+#: ../gdk/gdkdisplaymanager.c:162
 msgid "Default Display"
 msgstr "Vorgabeanzeige"
 
-#: ../gdk/gdkdisplaymanager.c:155
+#: ../gdk/gdkdisplaymanager.c:163
 msgid "The default display for GDK"
 msgstr "Die voreingestellte Anzeige für GDK"
 
@@ -138,24 +138,15 @@ msgstr "Schriftauflösung"
 msgid "The resolution for fonts on the screen"
 msgstr "Die Auflösung für Schriften auf dem Bildschirm"
 
-#: ../gdk/gdkwindow.c:373 ../gdk/gdkwindow.c:374
+#: ../gdk/gdkwindow.c:376 ../gdk/gdkwindow.c:377
 msgid "Cursor"
 msgstr "Zeiger"
 
-#: ../gdk/x11/gdkdevice-xi.c:140 ../gdk/x11/gdkdevice-xi.c:141
-#: ../gdk/x11/gdkdevice-xi2.c:130
-msgid "Device ID"
-msgstr "Gerätekennung"
-
-#: ../gdk/x11/gdkdevice-xi2.c:131
-msgid "Device identifier"
-msgstr "Gerätebezeichner"
-
-#: ../gdk/x11/gdkdevicemanager-xi2.c:118
+#: ../gdk/x11/gdkdevicemanager-xi2.c:119
 msgid "Opcode"
 msgstr "Opcode"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:119
+#: ../gdk/x11/gdkdevicemanager-xi2.c:120
 msgid "Opcode for XInput2 requests"
 msgstr "Opcode für XInput2-Anfragen"
 
@@ -167,11 +158,20 @@ msgstr "Ereignisbasiert"
 msgid "Event base for XInput events"
 msgstr "Ereignisbasierung für XInput-Ereignisse"
 
-#: ../gtk/gtkaboutdialog.c:276
+#: ../gdk/x11/gdkdevice-xi2.c:130 ../gdk/x11/gdkdevice-xi.c:140
+#: ../gdk/x11/gdkdevice-xi.c:141
+msgid "Device ID"
+msgstr "Gerätekennung"
+
+#: ../gdk/x11/gdkdevice-xi2.c:131
+msgid "Device identifier"
+msgstr "Gerätebezeichner"
+
+#: ../gtk/gtkaboutdialog.c:275
 msgid "Program name"
 msgstr "Programmname"
 
-#: ../gtk/gtkaboutdialog.c:277
+#: ../gtk/gtkaboutdialog.c:276
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
@@ -179,101 +179,93 @@ msgstr ""
 "Der Name des Programms. Wird dies leer gelassen, so hat es den Wert von "
 "g_get_application_name()"
 
-#: ../gtk/gtkaboutdialog.c:291
+#: ../gtk/gtkaboutdialog.c:290
 msgid "Program version"
 msgstr "Programmversion"
 
-#: ../gtk/gtkaboutdialog.c:292
+#: ../gtk/gtkaboutdialog.c:291
 msgid "The version of the program"
 msgstr "Die Version des Programms"
 
-#: ../gtk/gtkaboutdialog.c:306
+#: ../gtk/gtkaboutdialog.c:305
 msgid "Copyright string"
 msgstr "Copyright Zeichenkette"
 
-#: ../gtk/gtkaboutdialog.c:307
+#: ../gtk/gtkaboutdialog.c:306
 msgid "Copyright information for the program"
 msgstr "Copyright-Informationen des Programms"
 
-#: ../gtk/gtkaboutdialog.c:324
+#: ../gtk/gtkaboutdialog.c:323
 msgid "Comments string"
 msgstr "Zeichenkette mit Kommentar"
 
-#: ../gtk/gtkaboutdialog.c:325
+#: ../gtk/gtkaboutdialog.c:324
 msgid "Comments about the program"
 msgstr "Kommentare über dieses Programme"
 
-#: ../gtk/gtkaboutdialog.c:375
+#: ../gtk/gtkaboutdialog.c:374
 msgid "License Type"
 msgstr "Lizenztyp"
 
-#: ../gtk/gtkaboutdialog.c:376
+#: ../gtk/gtkaboutdialog.c:375
 msgid "The license type of the program"
 msgstr "Die Lizenz des Programms"
 
-#: ../gtk/gtkaboutdialog.c:392
+#: ../gtk/gtkaboutdialog.c:391
 msgid "Website URL"
 msgstr "Adresse der Webseite"
 
-#: ../gtk/gtkaboutdialog.c:393
+#: ../gtk/gtkaboutdialog.c:392
 msgid "The URL for the link to the website of the program"
 msgstr "Die Adresse der Webseite des Programms"
 
-#: ../gtk/gtkaboutdialog.c:407
+#: ../gtk/gtkaboutdialog.c:406
 msgid "Website label"
 msgstr "Titel der Webseite"
 
-#: ../gtk/gtkaboutdialog.c:408
+#: ../gtk/gtkaboutdialog.c:407
 msgid "The label for the link to the website of the program"
 msgstr "Die Beschriftung der Verknüpfung zur Webseite des Programms"
 
-#: ../gtk/gtkaboutdialog.c:424
+#: ../gtk/gtkaboutdialog.c:423
 msgid "Authors"
 msgstr "Programm von"
 
-#: ../gtk/gtkaboutdialog.c:425
+#: ../gtk/gtkaboutdialog.c:424
 msgid "List of authors of the program"
 msgstr "Autoren des Programms"
 
-#: ../gtk/gtkaboutdialog.c:441
+#: ../gtk/gtkaboutdialog.c:440
 msgid "Documenters"
 msgstr "Dokumentation von"
 
-#: ../gtk/gtkaboutdialog.c:442
+#: ../gtk/gtkaboutdialog.c:441
 msgid "List of people documenting the program"
 msgstr "Autoren der Dokumentation"
 
-#: ../gtk/gtkaboutdialog.c:458
+#: ../gtk/gtkaboutdialog.c:457
 msgid "Artists"
 msgstr "Grafiken von"
 
-#: ../gtk/gtkaboutdialog.c:459
+#: ../gtk/gtkaboutdialog.c:458
 msgid "List of people who have contributed artwork to the program"
 msgstr "Personen, die Grafiken für das Programm erstellt haben"
 
-#: ../gtk/gtkaboutdialog.c:476
+#: ../gtk/gtkaboutdialog.c:475
 msgid "Translator credits"
-msgstr ""
-"Daniel Egger <Daniel.Egger@t-online>, 1998.\n"
-"Karsten Weiss <karsten@addx.au.s.shuttle.de>, 1999.\n"
-"Matthias Warkus <mawarkus@gnome.org>, 2001, 2002.\n"
-"Christian Neumair <chris@gnome-de.org>, 2002-2004.\n"
-"Hendrik Richter <hendrikr@gnome.org>, 2004-2009.\n"
-"Hendrik Brandt <heb@gnome-de.org>, 2005.\n"
-"Mario Blättermann <mariobl@gnome.org>, 2010.\n"
-"Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010."
+msgstr "Ãœbersetzung von"
 
-#: ../gtk/gtkaboutdialog.c:477
+#: ../gtk/gtkaboutdialog.c:476
 msgid "Credits to the translators. This string should be marked as translatable"
 msgstr ""
 "Die Übersetzer des Programms. Diese Zeichenkette sollte als übersetzbar "
 "markiert werden"
 
-#: ../gtk/gtkaboutdialog.c:492
+#: ../gtk/gtkaboutdialog.c:491
 msgid "Logo"
 msgstr "Logo"
 
-#: ../gtk/gtkaboutdialog.c:493
+#: ../gtk/gtkaboutdialog.c:492
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
@@ -281,19 +273,19 @@ msgstr ""
 "Ein Logo für das Info-Fenster. Wird dies leer gelassen, so hat es den Wert "
 "von gtk_window_get_default_icon_list()"
 
-#: ../gtk/gtkaboutdialog.c:508
+#: ../gtk/gtkaboutdialog.c:507
 msgid "Logo Icon Name"
 msgstr "Name des Logo-Symbols"
 
-#: ../gtk/gtkaboutdialog.c:509
+#: ../gtk/gtkaboutdialog.c:508
 msgid "A named icon to use as the logo for the about box."
 msgstr "Symbol, das für das Info-Fenster verwendet werden soll."
 
-#: ../gtk/gtkaboutdialog.c:522
+#: ../gtk/gtkaboutdialog.c:521
 msgid "Wrap license"
 msgstr "Lizenz umbrechen"
 
-#: ../gtk/gtkaboutdialog.c:523
+#: ../gtk/gtkaboutdialog.c:522
 msgid "Whether to wrap the license text."
 msgstr "Legt fest, ob der Lizenztext wenn notwendig umgebrochen wird."
 
@@ -314,7 +306,7 @@ msgid "The widget to be monitored for accelerator changes"
 msgstr "Das auf Kürzeländerungen hin zu überwachende Widget"
 
 #: ../gtk/gtkaction.c:222 ../gtk/gtkactiongroup.c:228 ../gtk/gtkprinter.c:125
-#: ../gtk/gtktextmark.c:89 ../gtk/gtkthemingengine.c:248
+#: ../gtk/gtktextmark.c:126 ../gtk/gtkthemingengine.c:256
 msgid "Name"
 msgstr "Name"
 
@@ -322,9 +314,9 @@ msgstr "Name"
 msgid "A unique name for the action."
 msgstr "Ein eindeutiger Aktionsname."
 
-#: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:227 ../gtk/gtkexpander.c:287
-#: ../gtk/gtkframe.c:133 ../gtk/gtklabel.c:567 ../gtk/gtkmenuitem.c:328
-#: ../gtk/gtktoolbutton.c:201 ../gtk/gtktoolitemgroup.c:1596
+#: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:228 ../gtk/gtkexpander.c:290
+#: ../gtk/gtkframe.c:171 ../gtk/gtklabel.c:729 ../gtk/gtkmenuitem.c:383
+#: ../gtk/gtktoolbutton.c:232 ../gtk/gtktoolitemgroup.c:1592
 msgid "Label"
 msgstr "Beschriftung"
 
@@ -361,31 +353,31 @@ msgid "The stock icon displayed in widgets representing this action."
 msgstr ""
 "Das in Widgets angezeigte Repertoire-Symbol, die diese Aktion repräsentieren."
 
-#: ../gtk/gtkaction.c:304 ../gtk/gtkstatusicon.c:245
+#: ../gtk/gtkaction.c:304 ../gtk/gtkstatusicon.c:275
 msgid "GIcon"
 msgstr "GIcon"
 
-#: ../gtk/gtkaction.c:305 ../gtk/gtkcellrendererpixbuf.c:215
-#: ../gtk/gtkimage.c:329 ../gtk/gtkstatusicon.c:246
+#: ../gtk/gtkaction.c:305 ../gtk/gtkcellrendererpixbuf.c:235
+#: ../gtk/gtkimage.c:330 ../gtk/gtkstatusicon.c:276
 msgid "The GIcon being displayed"
 msgstr "Das anzuzeigende GIcon"
 
-#: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:180
-#: ../gtk/gtkimage.c:311 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:229
-#: ../gtk/gtkwindow.c:722
+#: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:200
+#: ../gtk/gtkimage.c:312 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:259
+#: ../gtk/gtkwindow.c:757
 msgid "Icon Name"
 msgstr "Symbolname"
 
-#: ../gtk/gtkaction.c:326 ../gtk/gtkcellrendererpixbuf.c:181
-#: ../gtk/gtkimage.c:312 ../gtk/gtkstatusicon.c:230
+#: ../gtk/gtkaction.c:326 ../gtk/gtkcellrendererpixbuf.c:201
+#: ../gtk/gtkimage.c:313 ../gtk/gtkstatusicon.c:260
 msgid "The name of the icon from the icon theme"
 msgstr "Der Name des Symbols aus dem Symbolthema der gewählten Schrift"
 
-#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:195
+#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:194
 msgid "Visible when horizontal"
 msgstr "Sichtbar wenn horizontal"
 
-#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:196
+#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:195
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a horizontal "
 "orientation."
@@ -405,11 +397,11 @@ msgstr ""
 "Sollen leere Menüproxys für diese Aktion in der Werkzeugleiste angezeigt "
 "werden?"
 
-#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:202
+#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:201
 msgid "Visible when vertical"
 msgstr "Sichtbar wenn horizontal"
 
-#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:203
+#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:202
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a vertical "
 "orientation."
@@ -417,7 +409,7 @@ msgstr ""
 "Soll das Werkzeugleistenobjekt sichtbar sein, wenn die Werkzeugleiste "
 "vertikal ausgerichtet ist?"
 
-#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:209
+#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:208
 msgid "Is important"
 msgstr "Ist wichtig"
 
@@ -438,7 +430,7 @@ msgid "When TRUE, empty menu proxies for this action are hidden."
 msgstr "Sollen leere Menüproxys für diese Aktion verborgen werden?"
 
 #: ../gtk/gtkaction.c:381 ../gtk/gtkactiongroup.c:235
-#: ../gtk/gtkcellrenderer.c:290 ../gtk/gtkwidget.c:971
+#: ../gtk/gtkcellrenderer.c:290 ../gtk/gtkwidget.c:990
 msgid "Sensitive"
 msgstr "Sensibel"
 
@@ -447,8 +439,8 @@ msgid "Whether the action is enabled."
 msgstr "Soll das Widget aktiviert sein?"
 
 #: ../gtk/gtkaction.c:388 ../gtk/gtkactiongroup.c:242
-#: ../gtk/gtkstatusicon.c:280 ../gtk/gtktreeviewcolumn.c:246
-#: ../gtk/gtkwidget.c:964
+#: ../gtk/gtkstatusicon.c:310 ../gtk/gtktreeviewcolumn.c:248
+#: ../gtk/gtkwidget.c:983
 msgid "Visible"
 msgstr "Sichtbar"
 
@@ -468,11 +460,11 @@ msgstr ""
 "Die GtkActionGroup, mit der diese GtkAction verknüpft ist, oder NULL (für "
 "internen Gebrauch)."
 
-#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:183
+#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:194
 msgid "Always show image"
 msgstr "Bild immer anzeigen"
 
-#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:184
+#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:195
 msgid "Whether the image will always be shown"
 msgstr "Legt fest, ob das Bild immer angezeigt werden soll"
 
@@ -508,8 +500,8 @@ msgstr ""
 "Legt fest, ob die zugewiesene Eigenschaft der Aktionserscheinung verwendet "
 "werden soll"
 
-#: ../gtk/gtkadjustment.c:123 ../gtk/gtkcellrendererprogress.c:126
-#: ../gtk/gtkscalebutton.c:217 ../gtk/gtkspinbutton.c:381
+#: ../gtk/gtkadjustment.c:123 ../gtk/gtkcellrendererprogress.c:138
+#: ../gtk/gtkscalebutton.c:218 ../gtk/gtkspinbutton.c:384
 msgid "Value"
 msgstr "Wert"
 
@@ -561,7 +553,7 @@ msgstr "Die Seitengröße der Stellgröße"
 msgid "Horizontal alignment"
 msgstr "Horizontale Ausrichtung"
 
-#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:278
+#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:279
 msgid ""
 "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
 "right aligned"
@@ -573,7 +565,7 @@ msgstr ""
 msgid "Vertical alignment"
 msgstr "Vertikale Ausrichtung"
 
-#: ../gtk/gtkalignment.c:148 ../gtk/gtkbutton.c:297
+#: ../gtk/gtkalignment.c:148 ../gtk/gtkbutton.c:298
 msgid ""
 "Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
 "bottom aligned"
@@ -639,11 +631,11 @@ msgstr "Rechte Auffüllung"
 msgid "The padding to insert at the right of the widget."
 msgstr "Die rechts am Widget anzufügende Auffüllung."
 
-#: ../gtk/gtkappchooserbutton.c:551
+#: ../gtk/gtkappchooserbutton.c:557
 msgid "Include an 'Other...' item"
 msgstr "Ein »Weitere …«-Objekt einschließen"
 
-#: ../gtk/gtkappchooserbutton.c:552
+#: ../gtk/gtkappchooserbutton.c:558
 msgid ""
 "Whether the combobox should include an item that triggers a "
 "GtkAppChooserDialog"
@@ -651,105 +643,105 @@ msgstr ""
 "Gibt an, ob das Kombinationsfeld einen Eintrag enthalten soll, der einen "
 "GtkAppChooserDialog auslöst"
 
-#: ../gtk/gtkappchooserbutton.c:564 ../gtk/gtkappchooserdialog.c:722
+#: ../gtk/gtkappchooserbutton.c:570 ../gtk/gtkappchooserdialog.c:707
 msgid "Heading"
 msgstr "Kopfzeile"
 
-#: ../gtk/gtkappchooserbutton.c:565 ../gtk/gtkappchooserdialog.c:723
+#: ../gtk/gtkappchooserbutton.c:571 ../gtk/gtkappchooserdialog.c:708
 msgid "The text to show at the top of the dialog"
 msgstr "Der oben im Dialog anzuzeigende Text"
 
-#: ../gtk/gtkappchooser.c:58
+#: ../gtk/gtkappchooser.c:61
 msgid "Content type"
 msgstr "Inhaltstyp"
 
-#: ../gtk/gtkappchooser.c:59
+#: ../gtk/gtkappchooser.c:62
 msgid "The content type used by the open with object"
 msgstr "Der beim Öffnen des Objekts verwendete Inhaltstyp"
 
-#: ../gtk/gtkappchooserdialog.c:708
+#: ../gtk/gtkappchooserdialog.c:693
 msgid "GFile"
 msgstr "GFile"
 
-#: ../gtk/gtkappchooserdialog.c:709
+#: ../gtk/gtkappchooserdialog.c:694
 msgid "The GFile used by the app chooser dialog"
 msgstr "Das GFile, das vom Dateiwählerdialog verwendet werden soll"
 
-#: ../gtk/gtkappchooserwidget.c:1015
+#: ../gtk/gtkappchooserwidget.c:1016
 msgid "Show default app"
 msgstr "Vorgabeanwendung anzeigen"
 
-#: ../gtk/gtkappchooserwidget.c:1016
+#: ../gtk/gtkappchooserwidget.c:1017
 msgid "Whether the widget should show the default application"
 msgstr "Soll das Widget die Standardanwendung anzeigen?"
 
-#: ../gtk/gtkappchooserwidget.c:1029
+#: ../gtk/gtkappchooserwidget.c:1030
 msgid "Show recommended apps"
 msgstr "Empfohlene Anwendung anzeigen"
 
-#: ../gtk/gtkappchooserwidget.c:1030
+#: ../gtk/gtkappchooserwidget.c:1031
 msgid "Whether the widget should show recommended applications"
 msgstr "Soll das Widget empfohlene Anwendungen anzeigen?"
 
-#: ../gtk/gtkappchooserwidget.c:1043
+#: ../gtk/gtkappchooserwidget.c:1044
 msgid "Show fallback apps"
 msgstr "Ersatzanwendungen anzeigen"
 
-#: ../gtk/gtkappchooserwidget.c:1044
+#: ../gtk/gtkappchooserwidget.c:1045
 msgid "Whether the widget should show fallback applications"
 msgstr "Soll das Widget Ersatzanwendungen anzeigen?"
 
-#: ../gtk/gtkappchooserwidget.c:1056
+#: ../gtk/gtkappchooserwidget.c:1057
 msgid "Show other apps"
 msgstr "Andere Anwendungen anzeigen"
 
-#: ../gtk/gtkappchooserwidget.c:1057
+#: ../gtk/gtkappchooserwidget.c:1058
 msgid "Whether the widget should show other applications"
 msgstr "Soll das Widget andere Anwendungen anzeigen?"
 
-#: ../gtk/gtkappchooserwidget.c:1070
+#: ../gtk/gtkappchooserwidget.c:1071
 msgid "Show all apps"
 msgstr "Alle Anwendungen anzeigen"
 
-#: ../gtk/gtkappchooserwidget.c:1071
+#: ../gtk/gtkappchooserwidget.c:1072
 msgid "Whether the widget should show all applications"
 msgstr "Soll das Widget alle Anwendungen anzeigen?"
 
-#: ../gtk/gtkappchooserwidget.c:1084
+#: ../gtk/gtkappchooserwidget.c:1085
 msgid "Widget's default text"
 msgstr "Vorgabetext des Widgets"
 
-#: ../gtk/gtkappchooserwidget.c:1085
+#: ../gtk/gtkappchooserwidget.c:1086
 msgid "The default text appearing when there are no applications"
 msgstr ""
 "Der als Vorgabe erscheinende Text, wenn keine Anwendungen verfügbar sind"
 
-#: ../gtk/gtkarrow.c:110
+#: ../gtk/gtkarrow.c:112
 msgid "Arrow direction"
 msgstr "Pfeilrichtung"
 
-#: ../gtk/gtkarrow.c:111
+#: ../gtk/gtkarrow.c:113
 msgid "The direction the arrow should point"
 msgstr "Die Richtung, in die der Pfeil zeigen soll"
 
-#: ../gtk/gtkarrow.c:119
+#: ../gtk/gtkarrow.c:121
 msgid "Arrow shadow"
 msgstr "Pfeilschatten"
 
-#: ../gtk/gtkarrow.c:120
+#: ../gtk/gtkarrow.c:122
 msgid "Appearance of the shadow surrounding the arrow"
 msgstr "Das Aussehen des Schattens um den Pfeil"
 
-#: ../gtk/gtkarrow.c:127 ../gtk/gtkcombobox.c:985 ../gtk/gtkmenu.c:796
-#: ../gtk/gtkmenuitem.c:391
+#: ../gtk/gtkarrow.c:129 ../gtk/gtkcombobox.c:986 ../gtk/gtkmenu.c:798
+#: ../gtk/gtkmenuitem.c:446
 msgid "Arrow Scaling"
 msgstr "Pfeilskalierung"
 
-#: ../gtk/gtkarrow.c:128
+#: ../gtk/gtkarrow.c:130
 msgid "Amount of space used up by arrow"
 msgstr "Der vom Pfeil belegte Platz"
 
-#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1159
+#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1178
 msgid "Horizontal Alignment"
 msgstr "Horizontale Ausrichtung"
 
@@ -757,7 +749,7 @@ msgstr "Horizontale Ausrichtung"
 msgid "X alignment of the child"
 msgstr "X-Ausrichtung des Kindes"
 
-#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1175
+#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1194
 msgid "Vertical Alignment"
 msgstr "Vertikale Ausrichtung"
 
@@ -782,99 +774,99 @@ msgid "Force aspect ratio to match that of the frame's child"
 msgstr ""
 "Erzwingen, dass das Seitenverhältnis des Rahmens dem des Kindes entspricht"
 
-#: ../gtk/gtkassistant.c:326
+#: ../gtk/gtkassistant.c:310
 msgid "Header Padding"
 msgstr "Auffüllung um Kopf"
 
-#: ../gtk/gtkassistant.c:327
+#: ../gtk/gtkassistant.c:311
 msgid "Number of pixels around the header."
 msgstr "Anzahl der Pixel um den Kopf."
 
-#: ../gtk/gtkassistant.c:334
+#: ../gtk/gtkassistant.c:318
 msgid "Content Padding"
 msgstr "Auffüllung um Inhalt"
 
-#: ../gtk/gtkassistant.c:335
+#: ../gtk/gtkassistant.c:319
 msgid "Number of pixels around the content pages."
 msgstr "Anzahl der Pixel um Inhaltsseiten"
 
-#: ../gtk/gtkassistant.c:351
+#: ../gtk/gtkassistant.c:335
 msgid "Page type"
 msgstr "Seitentyp"
 
-#: ../gtk/gtkassistant.c:352
+#: ../gtk/gtkassistant.c:336
 msgid "The type of the assistant page"
 msgstr "Der Typ der Druidenseite"
 
-#: ../gtk/gtkassistant.c:369
+#: ../gtk/gtkassistant.c:351
 msgid "Page title"
 msgstr "Titel der Seite"
 
-#: ../gtk/gtkassistant.c:370
+#: ../gtk/gtkassistant.c:352
 msgid "The title of the assistant page"
 msgstr "Der Titel der Druidenseite"
 
-#: ../gtk/gtkassistant.c:386
+#: ../gtk/gtkassistant.c:369
 msgid "Header image"
 msgstr "Kopfbild"
 
-#: ../gtk/gtkassistant.c:387
+#: ../gtk/gtkassistant.c:370
 msgid "Header image for the assistant page"
 msgstr "Bild im Kopf der Druidenseite"
 
-#: ../gtk/gtkassistant.c:403
+#: ../gtk/gtkassistant.c:386
 msgid "Sidebar image"
 msgstr "Seitenbild"
 
-#: ../gtk/gtkassistant.c:404
+#: ../gtk/gtkassistant.c:387
 msgid "Sidebar image for the assistant page"
 msgstr "Bild in Seitenleiste der Druidenseite"
 
-#: ../gtk/gtkassistant.c:419
+#: ../gtk/gtkassistant.c:403
 msgid "Page complete"
 msgstr "Seite abgeschlossen"
 
-#: ../gtk/gtkassistant.c:420
+#: ../gtk/gtkassistant.c:404
 msgid "Whether all required fields on the page have been filled out"
 msgstr "Legt fest, ob alle benötigten Felder dieser Seite ausgefüllt wurden"
 
-#: ../gtk/gtkbbox.c:152
+#: ../gtk/gtkbbox.c:159
 msgid "Minimum child width"
 msgstr "Minimale Breite des Kindes"
 
-#: ../gtk/gtkbbox.c:153
+#: ../gtk/gtkbbox.c:160
 msgid "Minimum width of buttons inside the box"
 msgstr "Die minimale Breite von Knöpfen im Kasten"
 
-#: ../gtk/gtkbbox.c:161
+#: ../gtk/gtkbbox.c:168
 msgid "Minimum child height"
 msgstr "Minimale Höhe des Kindes"
 
-#: ../gtk/gtkbbox.c:162
+#: ../gtk/gtkbbox.c:169
 msgid "Minimum height of buttons inside the box"
 msgstr "Die minimale Höhe von Knöpfen im Kasten"
 
-#: ../gtk/gtkbbox.c:170
+#: ../gtk/gtkbbox.c:177
 msgid "Child internal width padding"
 msgstr "Interne Breitenauffüllung des Kindes"
 
-#: ../gtk/gtkbbox.c:171
+#: ../gtk/gtkbbox.c:178
 msgid "Amount to increase child's size on either side"
 msgstr "Ausmaß, um das das Kind nach beiden Seiten vergrößert werden soll"
 
-#: ../gtk/gtkbbox.c:179
+#: ../gtk/gtkbbox.c:186
 msgid "Child internal height padding"
 msgstr "Interne Höhenauffüllung des Kindes"
 
-#: ../gtk/gtkbbox.c:180
+#: ../gtk/gtkbbox.c:187
 msgid "Amount to increase child's size on the top and bottom"
 msgstr "Ausmaß, um das das Kind nach oben und unten vergrößert werden soll"
 
-#: ../gtk/gtkbbox.c:188
+#: ../gtk/gtkbbox.c:195
 msgid "Layout style"
 msgstr "Anordnungsstil"
 
-#: ../gtk/gtkbbox.c:189
+#: ../gtk/gtkbbox.c:196
 msgid ""
 "How to lay out the buttons in the box. Possible values are: spread, edge, "
 "start and end"
@@ -882,11 +874,11 @@ msgstr ""
 "Die Anordnung der Knöpfe im Kasten. Mögliche Werte sind »spread« (verteilen), "
 "»edge« (Kante), »start« (Anfang) und »end« (Ende)"
 
-#: ../gtk/gtkbbox.c:197
+#: ../gtk/gtkbbox.c:204
 msgid "Secondary"
 msgstr "Untergeordnet"
 
-#: ../gtk/gtkbbox.c:198
+#: ../gtk/gtkbbox.c:205
 msgid ""
 "If TRUE, the child appears in a secondary group of children, suitable for, e."
 "g., help buttons"
@@ -894,41 +886,51 @@ msgstr ""
 "Falls WAHR, erscheint das Kind in einer Untergruppe von Kindern, geeignet z."
 "B. für Hilfeknöpfe"
 
-#: ../gtk/gtkbox.c:239 ../gtk/gtkcellareabox.c:318 ../gtk/gtkexpander.c:311
-#: ../gtk/gtkiconview.c:645 ../gtk/gtktreeviewcolumn.c:271
+#: ../gtk/gtkbbox.c:212
+msgid "Non-Homogeneous"
+msgstr "Nicht-Gleichmäßig"
+
+#: ../gtk/gtkbbox.c:213
+msgid "If TRUE, the child will not be subject to homogeneous sizing"
+msgstr ""
+"Falls WAHR, wird das Unterobjekt nicht in gleichmäßige Größenänderungen "
+"einbezogen"
+
+#: ../gtk/gtkbox.c:241 ../gtk/gtkcellareabox.c:317 ../gtk/gtkexpander.c:314
+#: ../gtk/gtkiconview.c:643 ../gtk/gtktreeviewcolumn.c:283
 msgid "Spacing"
 msgstr "Abstand"
 
-#: ../gtk/gtkbox.c:240
+#: ../gtk/gtkbox.c:242
 msgid "The amount of space between children"
 msgstr "Der Abstand zwischen den Kindern"
 
-#: ../gtk/gtkbox.c:249 ../gtk/gtktable.c:193 ../gtk/gtktoolbar.c:551
-#: ../gtk/gtktoolitemgroup.c:1649
+#: ../gtk/gtkbox.c:251 ../gtk/gtktable.c:227 ../gtk/gtktoolbar.c:563
+#: ../gtk/gtktoolitemgroup.c:1645
 msgid "Homogeneous"
 msgstr "Gleichmäßig"
 
-#: ../gtk/gtkbox.c:250
+#: ../gtk/gtkbox.c:252
 msgid "Whether the children should all be the same size"
 msgstr "Sollen die Kinder alle gleich groß sein?"
 
-#: ../gtk/gtkbox.c:270 ../gtk/gtkcellareabox.c:338 ../gtk/gtktoolbar.c:543
-#: ../gtk/gtktoolitemgroup.c:1656 ../gtk/gtktoolpalette.c:1101
-#: ../gtk/gtktreeviewcolumn.c:327
+#: ../gtk/gtkbox.c:272 ../gtk/gtkcellareabox.c:337 ../gtk/gtktoolbar.c:555
+#: ../gtk/gtktoolitemgroup.c:1652 ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktreeviewcolumn.c:339
 msgid "Expand"
 msgstr "Ausdehnen"
 
-#: ../gtk/gtkbox.c:271
+#: ../gtk/gtkbox.c:273
 msgid "Whether the child should receive extra space when the parent grows"
 msgstr ""
 "Soll dem Kind zusätzlicher Platz zugewiesen werden, wenn das Eltern-Widget "
 "wächst?"
 
-#: ../gtk/gtkbox.c:287 ../gtk/gtktoolitemgroup.c:1663
+#: ../gtk/gtkbox.c:289 ../gtk/gtktoolitemgroup.c:1659
 msgid "Fill"
 msgstr "Füllen"
 
-#: ../gtk/gtkbox.c:288
+#: ../gtk/gtkbox.c:290
 msgid ""
 "Whether extra space given to the child should be allocated to the child or "
 "used as padding"
@@ -936,20 +938,20 @@ msgstr ""
 "Soll zusätzlicher, an das Kind übergebener Platz, diesem zugewiesen oder als "
 "Auffüllung verwendet werden?"
 
-#: ../gtk/gtkbox.c:295 ../gtk/gtktrayicon-x11.c:169
+#: ../gtk/gtkbox.c:297 ../gtk/gtktrayicon-x11.c:169
 msgid "Padding"
 msgstr "Auffüllung"
 
-#: ../gtk/gtkbox.c:296
+#: ../gtk/gtkbox.c:298
 msgid "Extra space to put between the child and its neighbors, in pixels"
 msgstr ""
 "Die zwischen dem Kind und dessen Nachbarn einzufügende Auffüllung in Pixel"
 
-#: ../gtk/gtkbox.c:302
+#: ../gtk/gtkbox.c:304
 msgid "Pack type"
 msgstr "Packtyp"
 
-#: ../gtk/gtkbox.c:303
+#: ../gtk/gtkbox.c:305
 msgid ""
 "A GtkPackType indicating whether the child is packed with reference to the "
 "start or end of the parent"
@@ -957,12 +959,12 @@ msgstr ""
 "Der GtkPackType zeigt an, ob das Kind bezüglich des Anfangs oder des Endes "
 "des Eltern-Widgets gepackt werden soll"
 
-#: ../gtk/gtkbox.c:309 ../gtk/gtknotebook.c:760 ../gtk/gtkpaned.c:326
-#: ../gtk/gtktoolitemgroup.c:1677
+#: ../gtk/gtkbox.c:311 ../gtk/gtknotebook.c:769 ../gtk/gtkpaned.c:349
+#: ../gtk/gtktoolitemgroup.c:1673
 msgid "Position"
 msgstr "Position"
 
-#: ../gtk/gtkbox.c:310 ../gtk/gtknotebook.c:761
+#: ../gtk/gtkbox.c:312 ../gtk/gtknotebook.c:770
 msgid "The index of the child in the parent"
 msgstr "Der Index des Kinds im Eltern-Widget"
 
@@ -974,20 +976,20 @@ msgstr "Übersetzungsdomäne"
 msgid "The translation domain used by gettext"
 msgstr "Die von gettext zu verwendende Übersetzungsdomäne"
 
-#: ../gtk/gtkbutton.c:228
+#: ../gtk/gtkbutton.c:229
 msgid ""
 "Text of the label widget inside the button, if the button contains a label "
 "widget"
 msgstr ""
 "Text des Beschriftungs-Widgets im Knopf, falls der Knopf ein solches enthält"
 
-#: ../gtk/gtkbutton.c:235 ../gtk/gtkexpander.c:295 ../gtk/gtklabel.c:588
-#: ../gtk/gtkmenuitem.c:343 ../gtk/gtktoolbutton.c:208
+#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:298 ../gtk/gtklabel.c:750
+#: ../gtk/gtkmenuitem.c:398 ../gtk/gtktoolbutton.c:239
 msgid "Use underline"
 msgstr "Unterstrich verwenden"
 
-#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:296 ../gtk/gtklabel.c:589
-#: ../gtk/gtkmenuitem.c:344
+#: ../gtk/gtkbutton.c:237 ../gtk/gtkexpander.c:299 ../gtk/gtklabel.c:751
+#: ../gtk/gtkmenuitem.c:399
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -995,72 +997,72 @@ msgstr ""
 "Falls eingeschaltet, bedeutet ein Unterstrich im Text, dass das nächste "
 "Zeichen als Tastaturkürzel verwendet werden soll"
 
-#: ../gtk/gtkbutton.c:243 ../gtk/gtkimagemenuitem.c:164
+#: ../gtk/gtkbutton.c:244 ../gtk/gtkimagemenuitem.c:175
 msgid "Use stock"
 msgstr "Repertoire verwenden"
 
-#: ../gtk/gtkbutton.c:244
+#: ../gtk/gtkbutton.c:245
 msgid ""
 "If set, the label is used to pick a stock item instead of being displayed"
 msgstr ""
 "Falls aktiv, wird die Beschriftung nicht angezeigt, sondern verwendet, um ein "
 "Symbol aus dem Repertoire zu wählen"
 
-#: ../gtk/gtkbutton.c:251 ../gtk/gtkcombobox.c:791
-#: ../gtk/gtkfilechooserbutton.c:383
+#: ../gtk/gtkbutton.c:252 ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkfilechooserbutton.c:426
 msgid "Focus on click"
 msgstr "Fokus beim Anklicken"
 
-#: ../gtk/gtkbutton.c:252 ../gtk/gtkfilechooserbutton.c:384
+#: ../gtk/gtkbutton.c:253 ../gtk/gtkfilechooserbutton.c:427
 msgid "Whether the button grabs focus when it is clicked with the mouse"
 msgstr ""
 "Soll der Knopf den Fokus erhalten, sobald er mit der Maus angeklickt wurde?"
 
-#: ../gtk/gtkbutton.c:259
+#: ../gtk/gtkbutton.c:260
 msgid "Border relief"
 msgstr "Randrelief"
 
-#: ../gtk/gtkbutton.c:260
+#: ../gtk/gtkbutton.c:261
 msgid "The border relief style"
 msgstr "Der Reliefstil des Rands"
 
-#: ../gtk/gtkbutton.c:277
+#: ../gtk/gtkbutton.c:278
 msgid "Horizontal alignment for child"
 msgstr "Horizontale Ausrichtung des Kinds"
 
-#: ../gtk/gtkbutton.c:296
+#: ../gtk/gtkbutton.c:297
 msgid "Vertical alignment for child"
 msgstr "Vertikale Ausrichtung des Kinds"
 
-#: ../gtk/gtkbutton.c:313 ../gtk/gtkimagemenuitem.c:149
+#: ../gtk/gtkbutton.c:314 ../gtk/gtkimagemenuitem.c:160
 msgid "Image widget"
 msgstr "Bild-Widget"
 
-#: ../gtk/gtkbutton.c:314
+#: ../gtk/gtkbutton.c:315
 msgid "Child widget to appear next to the button text"
 msgstr "Das Kind-Widget, das neben dem Button-Text erscheint"
 
-#: ../gtk/gtkbutton.c:328
+#: ../gtk/gtkbutton.c:329
 msgid "Image position"
 msgstr "Bildposition"
 
-#: ../gtk/gtkbutton.c:329
+#: ../gtk/gtkbutton.c:330
 msgid "The position of the image relative to the text"
 msgstr "Position des Bildes bezüglich des Textes"
 
-#: ../gtk/gtkbutton.c:449
+#: ../gtk/gtkbutton.c:450
 msgid "Default Spacing"
 msgstr "Abstandsvorgabe"
 
-#: ../gtk/gtkbutton.c:450
+#: ../gtk/gtkbutton.c:451
 msgid "Extra space to add for GTK_CAN_DEFAULT buttons"
 msgstr "Der zusätzliche Raum für GTK_CAN_DEFAULT-Knöpfe"
 
-#: ../gtk/gtkbutton.c:464
+#: ../gtk/gtkbutton.c:465
 msgid "Default Outside Spacing"
 msgstr "Vorgabeabstand außen"
 
-#: ../gtk/gtkbutton.c:465
+#: ../gtk/gtkbutton.c:466
 msgid ""
 "Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside "
 "the border"
@@ -1068,33 +1070,33 @@ msgstr ""
 "Der zusätzliche Raum für GTK_CAN_DEFAULT-Knöpfe, der immer außerhalb des "
 "Rands zugegeben werden soll"
 
-#: ../gtk/gtkbutton.c:470
+#: ../gtk/gtkbutton.c:471
 msgid "Child X Displacement"
 msgstr "X-Versatz des Kindes"
 
-#: ../gtk/gtkbutton.c:471
+#: ../gtk/gtkbutton.c:472
 msgid ""
 "How far in the x direction to move the child when the button is depressed"
 msgstr ""
 "Wie weit soll das Kind in horizontaler Richtung versetzt werden, wenn der "
 "Knopf gedrückt wird?"
 
-#: ../gtk/gtkbutton.c:478
+#: ../gtk/gtkbutton.c:479
 msgid "Child Y Displacement"
 msgstr "Y-Versatz des Kindes"
 
-#: ../gtk/gtkbutton.c:479
+#: ../gtk/gtkbutton.c:480
 msgid ""
 "How far in the y direction to move the child when the button is depressed"
 msgstr ""
 "Wie weit soll das Kind in vertikaler Richtung versetzt werden, wenn der Knopf "
 "gedrückt wird?"
 
-#: ../gtk/gtkbutton.c:495
+#: ../gtk/gtkbutton.c:496
 msgid "Displace focus"
 msgstr "Fokus ersetzen"
 
-#: ../gtk/gtkbutton.c:496
+#: ../gtk/gtkbutton.c:497
 msgid ""
 "Whether the child_displacement_x/_y properties should also affect the focus "
 "rectangle"
@@ -1102,43 +1104,43 @@ msgstr ""
 "Sollen die child_displacement_x/_y-Eigenschaften auch den Bereich des Fokus "
 "beeinflussen?"
 
-#: ../gtk/gtkbutton.c:509 ../gtk/gtkentry.c:787 ../gtk/gtkentry.c:1832
+#: ../gtk/gtkbutton.c:510 ../gtk/gtkentry.c:794 ../gtk/gtkentry.c:1869
 msgid "Inner Border"
 msgstr "Innerer Rand"
 
-#: ../gtk/gtkbutton.c:510
+#: ../gtk/gtkbutton.c:511
 msgid "Border between button edges and child."
 msgstr "Rand zwischen den Ecken des Knopfes und dem Kind."
 
-#: ../gtk/gtkbutton.c:523
+#: ../gtk/gtkbutton.c:524
 msgid "Image spacing"
 msgstr "Bildabstand"
 
-#: ../gtk/gtkbutton.c:524
+#: ../gtk/gtkbutton.c:525
 msgid "Spacing in pixels between the image and label"
 msgstr "Der Abstand zwischen dem Bild und der Beschriftung in Pixel"
 
-#: ../gtk/gtkcalendar.c:468
+#: ../gtk/gtkcalendar.c:470
 msgid "Year"
 msgstr "Jahr"
 
-#: ../gtk/gtkcalendar.c:469
+#: ../gtk/gtkcalendar.c:471
 msgid "The selected year"
 msgstr "Das gewählte Jahr"
 
-#: ../gtk/gtkcalendar.c:482
+#: ../gtk/gtkcalendar.c:484
 msgid "Month"
 msgstr "Monat"
 
-#: ../gtk/gtkcalendar.c:483
+#: ../gtk/gtkcalendar.c:485
 msgid "The selected month (as a number between 0 and 11)"
 msgstr "Der gewählte Monat (als Zahl zwischen 0 und 11)"
 
-#: ../gtk/gtkcalendar.c:497
+#: ../gtk/gtkcalendar.c:499
 msgid "Day"
 msgstr "Tag"
 
-#: ../gtk/gtkcalendar.c:498
+#: ../gtk/gtkcalendar.c:500
 msgid ""
 "The selected day (as a number between 1 and 31, or 0 to unselect the "
 "currently selected day)"
@@ -1146,115 +1148,115 @@ msgstr ""
 "Der gewählte Tag (als Zahl zwischen 1 und 31, oder 0, um den momentan "
 "gewählten Tag abzuwählen)"
 
-#: ../gtk/gtkcalendar.c:512
+#: ../gtk/gtkcalendar.c:514
 msgid "Show Heading"
 msgstr "Kopfzeile anzeigen"
 
-#: ../gtk/gtkcalendar.c:513
+#: ../gtk/gtkcalendar.c:515
 msgid "If TRUE, a heading is displayed"
 msgstr "Soll eine Kopfzeile angezeigt werden?"
 
-#: ../gtk/gtkcalendar.c:527
+#: ../gtk/gtkcalendar.c:529
 msgid "Show Day Names"
 msgstr "Wochentagsnamen anzeigen"
 
-#: ../gtk/gtkcalendar.c:528
+#: ../gtk/gtkcalendar.c:530
 msgid "If TRUE, day names are displayed"
 msgstr "Sollen die Namen der Wochentage angezeigt werden?"
 
-#: ../gtk/gtkcalendar.c:541
+#: ../gtk/gtkcalendar.c:543
 msgid "No Month Change"
 msgstr "Kein Monatswechsel"
 
-#: ../gtk/gtkcalendar.c:542
+#: ../gtk/gtkcalendar.c:544
 msgid "If TRUE, the selected month cannot be changed"
 msgstr "Soll der gewählte Monat unveränderlich sein?"
 
-#: ../gtk/gtkcalendar.c:556
+#: ../gtk/gtkcalendar.c:558
 msgid "Show Week Numbers"
 msgstr "Wochennummern anzeigen"
 
-#: ../gtk/gtkcalendar.c:557
+#: ../gtk/gtkcalendar.c:559
 msgid "If TRUE, week numbers are displayed"
 msgstr "Sollen Wochennummern angezeigt werden?"
 
-#: ../gtk/gtkcalendar.c:572
+#: ../gtk/gtkcalendar.c:574
 msgid "Details Width"
 msgstr "Vorgabebreite der Details"
 
-#: ../gtk/gtkcalendar.c:573
+#: ../gtk/gtkcalendar.c:575
 msgid "Details width in characters"
 msgstr "Maximale Breite der Details in Zeichen"
 
-#: ../gtk/gtkcalendar.c:588
+#: ../gtk/gtkcalendar.c:590
 msgid "Details Height"
 msgstr "Vorgabehöhe der Details"
 
-#: ../gtk/gtkcalendar.c:589
+#: ../gtk/gtkcalendar.c:591
 msgid "Details height in rows"
 msgstr "Vorgabehöhe der Details in Zeilen"
 
-#: ../gtk/gtkcalendar.c:605
+#: ../gtk/gtkcalendar.c:607
 msgid "Show Details"
 msgstr "Details anzeigen"
 
-#: ../gtk/gtkcalendar.c:606
+#: ../gtk/gtkcalendar.c:608
 msgid "If TRUE, details are shown"
 msgstr "Sollen die Details angezeigt werden?"
 
-#: ../gtk/gtkcalendar.c:618
+#: ../gtk/gtkcalendar.c:620
 msgid "Inner border"
 msgstr "Innerer Rand"
 
-#: ../gtk/gtkcalendar.c:619
+#: ../gtk/gtkcalendar.c:621
 msgid "Inner border space"
 msgstr "Abstand des inneren Rands"
 
-#: ../gtk/gtkcalendar.c:630
+#: ../gtk/gtkcalendar.c:632
 msgid "Vertical separation"
 msgstr "Vertikale Trennung"
 
-#: ../gtk/gtkcalendar.c:631
+#: ../gtk/gtkcalendar.c:633
 msgid "Space between day headers and main area"
 msgstr "Abstand zwischen Tagesbeschriftung und Hauptbereich"
 
-#: ../gtk/gtkcalendar.c:642
+#: ../gtk/gtkcalendar.c:644
 msgid "Horizontal separation"
 msgstr "Horizontale Trennung"
 
-#: ../gtk/gtkcalendar.c:643
+#: ../gtk/gtkcalendar.c:645
 msgid "Space between week headers and main area"
 msgstr "Abstand zwischen Wochenbeschriftung und Hauptbereich"
 
-#: ../gtk/gtkcellareabox.c:319 ../gtk/gtktreeviewcolumn.c:272
+#: ../gtk/gtkcellareabox.c:318 ../gtk/gtktreeviewcolumn.c:284
 msgid "Space which is inserted between cells"
 msgstr "Zwischen Zellen eingefügter Platz"
 
-#: ../gtk/gtkcellareabox.c:339
+#: ../gtk/gtkcellareabox.c:338
 msgid "Whether the cell expands"
 msgstr "Soll die Zelle ausgebreitet werden?"
 
-#: ../gtk/gtkcellareabox.c:354
+#: ../gtk/gtkcellareabox.c:353
 msgid "Align"
 msgstr "Ausrichten"
 
-#: ../gtk/gtkcellareabox.c:355
+#: ../gtk/gtkcellareabox.c:354
 msgid "Whether cell should align with adjacent rows"
 msgstr "Soll eine Zelle an benachbarten Zeilen ausgerichtet werden?"
 
-#: ../gtk/gtkcellareabox.c:371
+#: ../gtk/gtkcellareabox.c:370
 msgid "Fixed Size"
 msgstr "Feste Größe"
 
-#: ../gtk/gtkcellareabox.c:372
+#: ../gtk/gtkcellareabox.c:371
 msgid "Whether cells should be the same size in all rows"
 msgstr "Sollen Zellen in allen Zeilen gleich groß sein?"
 
-#: ../gtk/gtkcellareabox.c:388
+#: ../gtk/gtkcellareabox.c:387
 msgid "Pack Type"
 msgstr "Packtyp"
 
-#: ../gtk/gtkcellareabox.c:389
+#: ../gtk/gtkcellareabox.c:388
 msgid ""
 "A GtkPackType indicating whether the cell is packed with reference to the "
 "start or end of the cell area"
@@ -1287,28 +1289,28 @@ msgstr "Widget bearbeiten"
 msgid "The widget currently editing the edited cell"
 msgstr "Das Widget, welches derzeit die bearbeitete Zelle bearbeitet"
 
-#: ../gtk/gtkcellareacontext.c:127
+#: ../gtk/gtkcellareacontext.c:119
 msgid "Area"
 msgstr "Bereich"
 
-#: ../gtk/gtkcellareacontext.c:128
+#: ../gtk/gtkcellareacontext.c:120
 msgid "The Cell Area this context was created for"
 msgstr "Der Zellenbereich, für den dieser Kontext erstellt wurde"
 
-#: ../gtk/gtkcellareacontext.c:144 ../gtk/gtkcellareacontext.c:163
-#: ../gtk/gtktreeviewcolumn.c:299
+#: ../gtk/gtkcellareacontext.c:136 ../gtk/gtkcellareacontext.c:155
+#: ../gtk/gtktreeviewcolumn.c:311
 msgid "Minimum Width"
 msgstr "Minimale Breite"
 
-#: ../gtk/gtkcellareacontext.c:145 ../gtk/gtkcellareacontext.c:164
+#: ../gtk/gtkcellareacontext.c:137 ../gtk/gtkcellareacontext.c:156
 msgid "Minimum cached width"
 msgstr "Minimale zwischengespeicherte Breite"
 
-#: ../gtk/gtkcellareacontext.c:182 ../gtk/gtkcellareacontext.c:201
+#: ../gtk/gtkcellareacontext.c:174 ../gtk/gtkcellareacontext.c:193
 msgid "Minimum Height"
 msgstr "Minimale Höhe"
 
-#: ../gtk/gtkcellareacontext.c:183 ../gtk/gtkcellareacontext.c:202
+#: ../gtk/gtkcellareacontext.c:175 ../gtk/gtkcellareacontext.c:194
 msgid "Minimum cached height"
 msgstr "Minimale zwischengespeicherte Höhe"
 
@@ -1320,35 +1322,35 @@ msgstr "Bearbeitung abgebrochen"
 msgid "Indicates that editing has been canceled"
 msgstr "Gibt an, dass die Bearbeitung abgebrochen wurde"
 
-#: ../gtk/gtkcellrendereraccel.c:137
+#: ../gtk/gtkcellrendereraccel.c:152
 msgid "Accelerator key"
 msgstr "Tastaturkürzel"
 
-#: ../gtk/gtkcellrendereraccel.c:138
+#: ../gtk/gtkcellrendereraccel.c:153
 msgid "The keyval of the accelerator"
 msgstr "Das Zeichen des Kürzels"
 
-#: ../gtk/gtkcellrendereraccel.c:154
+#: ../gtk/gtkcellrendereraccel.c:169
 msgid "Accelerator modifiers"
 msgstr "Kürzel-Modifikator"
 
-#: ../gtk/gtkcellrendereraccel.c:155
+#: ../gtk/gtkcellrendereraccel.c:170
 msgid "The modifier mask of the accelerator"
 msgstr "Die Modifikator-Maske des Kürzels"
 
-#: ../gtk/gtkcellrendereraccel.c:172
+#: ../gtk/gtkcellrendereraccel.c:187
 msgid "Accelerator keycode"
 msgstr "Kürzel-Zeichencode"
 
-#: ../gtk/gtkcellrendereraccel.c:173
+#: ../gtk/gtkcellrendereraccel.c:188
 msgid "The hardware keycode of the accelerator"
 msgstr "Der Hardware-Zeichencode des Kürzels"
 
-#: ../gtk/gtkcellrendereraccel.c:192
+#: ../gtk/gtkcellrendereraccel.c:207
 msgid "Accelerator Mode"
 msgstr "Kürzel-Modus"
 
-#: ../gtk/gtkcellrendereraccel.c:193
+#: ../gtk/gtkcellrendereraccel.c:208
 msgid "The type of accelerators"
 msgstr "Der Typ des Kürzels"
 
@@ -1477,116 +1479,116 @@ msgstr "Zellhintergrund einstellen"
 msgid "Whether this tag affects the cell background color"
 msgstr "Soll dieses Tag die Hintergrundfarbe der Zelle beeinflussen?"
 
-#: ../gtk/gtkcellrenderercombo.c:109
+#: ../gtk/gtkcellrenderercombo.c:130
 msgid "Model"
 msgstr "Modell"
 
-#: ../gtk/gtkcellrenderercombo.c:110
+#: ../gtk/gtkcellrenderercombo.c:131
 msgid "The model containing the possible values for the combo box"
 msgstr "Das Modell für das Auswahlfeld, das die möglichen Werte enthält"
 
-#: ../gtk/gtkcellrenderercombo.c:132
+#: ../gtk/gtkcellrenderercombo.c:153
 msgid "Text Column"
 msgstr "Textspalte"
 
-#: ../gtk/gtkcellrenderercombo.c:133
+#: ../gtk/gtkcellrenderercombo.c:154
 msgid "A column in the data source model to get the strings from"
 msgstr ""
 "Eine Spalte im Datenquellenmodell, aus dem die Zeichenketten abgerufen werden "
 "sollen"
 
-#: ../gtk/gtkcellrenderercombo.c:150 ../gtk/gtkcombobox.c:858
+#: ../gtk/gtkcellrenderercombo.c:171 ../gtk/gtkcombobox.c:859
 msgid "Has Entry"
 msgstr "Hat Eintrag"
 
-#: ../gtk/gtkcellrenderercombo.c:151
+#: ../gtk/gtkcellrenderercombo.c:172
 msgid "If FALSE, don't allow to enter strings other than the chosen ones"
 msgstr "Dürfen andere Zeichenkette als die ausgewählten eingegeben werden?"
 
-#: ../gtk/gtkcellrendererpixbuf.c:120
+#: ../gtk/gtkcellrendererpixbuf.c:140
 msgid "Pixbuf Object"
 msgstr "Pixbuf-Objekt"
 
-#: ../gtk/gtkcellrendererpixbuf.c:121
+#: ../gtk/gtkcellrendererpixbuf.c:141
 msgid "The pixbuf to render"
 msgstr "Der darzustellende Pixbuf"
 
-#: ../gtk/gtkcellrendererpixbuf.c:128
+#: ../gtk/gtkcellrendererpixbuf.c:148
 msgid "Pixbuf Expander Open"
 msgstr "Pixbuf-Ausklapper offen"
 
-#: ../gtk/gtkcellrendererpixbuf.c:129
+#: ../gtk/gtkcellrendererpixbuf.c:149
 msgid "Pixbuf for open expander"
 msgstr "Der Pixbuf für den offenen Ausklapper"
 
-#: ../gtk/gtkcellrendererpixbuf.c:136
+#: ../gtk/gtkcellrendererpixbuf.c:156
 msgid "Pixbuf Expander Closed"
 msgstr "Pixbuf-Ausklapper geschlossen"
 
-#: ../gtk/gtkcellrendererpixbuf.c:137
+#: ../gtk/gtkcellrendererpixbuf.c:157
 msgid "Pixbuf for closed expander"
 msgstr "Der Pixbuf für den geschlossenen Ausklapper"
 
-#: ../gtk/gtkcellrendererpixbuf.c:144 ../gtk/gtkimage.c:253
-#: ../gtk/gtkstatusicon.c:221
+#: ../gtk/gtkcellrendererpixbuf.c:164 ../gtk/gtkimage.c:254
+#: ../gtk/gtkstatusicon.c:251
 msgid "Stock ID"
 msgstr "Repertoire-Kennung"
 
-#: ../gtk/gtkcellrendererpixbuf.c:145
+#: ../gtk/gtkcellrendererpixbuf.c:165
 msgid "The stock ID of the stock icon to render"
 msgstr "Die Repertoire-Kennung des darzustellenden Repertoire-Symbols"
 
-#: ../gtk/gtkcellrendererpixbuf.c:152 ../gtk/gtkcellrendererspinner.c:151
-#: ../gtk/gtkrecentmanager.c:309 ../gtk/gtkstatusicon.c:262
+#: ../gtk/gtkcellrendererpixbuf.c:172 ../gtk/gtkcellrendererspinner.c:151
+#: ../gtk/gtkrecentmanager.c:309 ../gtk/gtkstatusicon.c:292
 msgid "Size"
 msgstr "Größe"
 
-#: ../gtk/gtkcellrendererpixbuf.c:153
+#: ../gtk/gtkcellrendererpixbuf.c:173
 msgid "The GtkIconSize value that specifies the size of the rendered icon"
 msgstr "Der GtkIconSize-Wert, der die Größe des dargestellten Symbols festlegt"
 
-#: ../gtk/gtkcellrendererpixbuf.c:162
+#: ../gtk/gtkcellrendererpixbuf.c:182
 msgid "Detail"
 msgstr "Detailtreue"
 
-#: ../gtk/gtkcellrendererpixbuf.c:163
+#: ../gtk/gtkcellrendererpixbuf.c:183
 msgid "Render detail to pass to the theme engine"
 msgstr "Die an die Themen-Engine übergebende Detailtreue der Darstellung"
 
-#: ../gtk/gtkcellrendererpixbuf.c:196
+#: ../gtk/gtkcellrendererpixbuf.c:216
 msgid "Follow State"
 msgstr "Folgestatus"
 
-#: ../gtk/gtkcellrendererpixbuf.c:197
+#: ../gtk/gtkcellrendererpixbuf.c:217
 msgid "Whether the rendered pixbuf should be colorized according to the state"
 msgstr ""
 "Legt fest, ob der dargestellte Pixbuf je nach Status eingefärbt werden soll"
 
-#: ../gtk/gtkcellrendererpixbuf.c:214 ../gtk/gtkimage.c:328
-#: ../gtk/gtkwindow.c:699
+#: ../gtk/gtkcellrendererpixbuf.c:234 ../gtk/gtkimage.c:329
+#: ../gtk/gtkwindow.c:703
 msgid "Icon"
 msgstr "Symbol"
 
-#: ../gtk/gtkcellrendererprogress.c:127
+#: ../gtk/gtkcellrendererprogress.c:139
 msgid "Value of the progress bar"
 msgstr "Wert des Fortschrittsbalkens"
 
-#: ../gtk/gtkcellrendererprogress.c:144 ../gtk/gtkcellrenderertext.c:255
-#: ../gtk/gtkentry.c:830 ../gtk/gtkentrybuffer.c:352
-#: ../gtk/gtkmessagedialog.c:227 ../gtk/gtkprogressbar.c:177
-#: ../gtk/gtktextbuffer.c:210
+#: ../gtk/gtkcellrendererprogress.c:156 ../gtk/gtkcellrenderertext.c:254
+#: ../gtk/gtkentrybuffer.c:352 ../gtk/gtkentry.c:837
+#: ../gtk/gtkmessagedialog.c:229 ../gtk/gtkprogressbar.c:176
+#: ../gtk/gtktextbuffer.c:221
 msgid "Text"
 msgstr "Text"
 
-#: ../gtk/gtkcellrendererprogress.c:145
+#: ../gtk/gtkcellrendererprogress.c:157
 msgid "Text on the progress bar"
 msgstr "Im Fortschrittsbalken anzuzeigender Text"
 
-#: ../gtk/gtkcellrendererprogress.c:168 ../gtk/gtkcellrendererspinner.c:137
+#: ../gtk/gtkcellrendererprogress.c:180 ../gtk/gtkcellrendererspinner.c:137
 msgid "Pulse"
 msgstr "Puls"
 
-#: ../gtk/gtkcellrendererprogress.c:169
+#: ../gtk/gtkcellrendererprogress.c:181
 msgid ""
 "Set this to positive values to indicate that some progress is made, but you "
 "don't know how much."
@@ -1594,11 +1596,11 @@ msgstr ""
 "Ein positiver Wert bedeutet, dass ein Fortschritt gemacht wurde, dessen Größe "
 "unbekannt ist."
 
-#: ../gtk/gtkcellrendererprogress.c:185
+#: ../gtk/gtkcellrendererprogress.c:197
 msgid "Text x alignment"
 msgstr "X-Ausrichtung des Texts"
 
-#: ../gtk/gtkcellrendererprogress.c:186
+#: ../gtk/gtkcellrendererprogress.c:198
 msgid ""
 "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
@@ -1606,53 +1608,53 @@ msgstr ""
 "Die horizontale Ausrichtung, von 0 (links) bis 1 (rechts). In RTL-Layouts "
 "umgekehrt."
 
-#: ../gtk/gtkcellrendererprogress.c:202
+#: ../gtk/gtkcellrendererprogress.c:214
 msgid "Text y alignment"
 msgstr "Y-Ausrichtung des Texts"
 
-#: ../gtk/gtkcellrendererprogress.c:203
+#: ../gtk/gtkcellrendererprogress.c:215
 msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
 msgstr "Die vertikale Ausrichtung, von 0 (oben) bis 1 (unten)."
 
-#: ../gtk/gtkcellrendererprogress.c:214 ../gtk/gtkprogressbar.c:153
-#: ../gtk/gtkrange.c:424
+#: ../gtk/gtkcellrendererprogress.c:226 ../gtk/gtkprogressbar.c:152
+#: ../gtk/gtkrange.c:426
 msgid "Inverted"
 msgstr "Umgekehrt"
 
-#: ../gtk/gtkcellrendererprogress.c:215 ../gtk/gtkprogressbar.c:154
+#: ../gtk/gtkcellrendererprogress.c:227 ../gtk/gtkprogressbar.c:153
 msgid "Invert the direction in which the progress bar grows"
 msgstr "Die Wachstumsrichtung des Fortschrittsbalkens umkehren"
 
-#: ../gtk/gtkcellrendererspin.c:91 ../gtk/gtkrange.c:416
-#: ../gtk/gtkscalebutton.c:236 ../gtk/gtkspinbutton.c:320
+#: ../gtk/gtkcellrendererspin.c:113 ../gtk/gtkrange.c:418
+#: ../gtk/gtkscalebutton.c:237 ../gtk/gtkspinbutton.c:323
 msgid "Adjustment"
 msgstr "Stellgröße"
 
-#: ../gtk/gtkcellrendererspin.c:92 ../gtk/gtkspinbutton.c:321
+#: ../gtk/gtkcellrendererspin.c:114 ../gtk/gtkspinbutton.c:324
 msgid "The adjustment that holds the value of the spin button"
 msgstr "Die Stellgröße, die den Wert des Einstellfeldes enthält"
 
-#: ../gtk/gtkcellrendererspin.c:107
+#: ../gtk/gtkcellrendererspin.c:129
 msgid "Climb rate"
 msgstr "Steigrate"
 
-#: ../gtk/gtkcellrendererspin.c:108 ../gtk/gtkspinbutton.c:329
+#: ../gtk/gtkcellrendererspin.c:130 ../gtk/gtkspinbutton.c:332
 msgid "The acceleration rate when you hold down a button"
 msgstr "Die Beschleunigungsrate, während eine Knopf gedrückt gehalten wird"
 
-#: ../gtk/gtkcellrendererspin.c:121 ../gtk/gtkscale.c:252
-#: ../gtk/gtkspinbutton.c:338
+#: ../gtk/gtkcellrendererspin.c:143 ../gtk/gtkscale.c:254
+#: ../gtk/gtkspinbutton.c:341
 msgid "Digits"
 msgstr "Ziffern"
 
-#: ../gtk/gtkcellrendererspin.c:122 ../gtk/gtkspinbutton.c:339
+#: ../gtk/gtkcellrendererspin.c:144 ../gtk/gtkspinbutton.c:342
 msgid "The number of decimal places to display"
 msgstr "Die Anzahl der anzuzeigenden Nachkommastellen"
 
-#: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:106
-#: ../gtk/gtkmenu.c:586 ../gtk/gtkspinner.c:118 ../gtk/gtkswitch.c:801
-#: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:125
-#: ../gtk/gtktoggletoolbutton.c:112
+#: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkmenu.c:588 ../gtk/gtkspinner.c:115 ../gtk/gtkswitch.c:783
+#: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:178
+#: ../gtk/gtktoggletoolbutton.c:127
 msgid "Active"
 msgstr "Aktiv"
 
@@ -1668,193 +1670,195 @@ msgstr "Drehzahl des Spinners"
 msgid "The GtkIconSize value that specifies the size of the rendered spinner"
 msgstr "Der GtkIconSize-Wert, der die Größe des dargestellten Spinners festlegt"
 
-#: ../gtk/gtkcellrenderertext.c:256
+#: ../gtk/gtkcellrenderertext.c:255
 msgid "Text to render"
 msgstr "Der darzustellende Text"
 
-#: ../gtk/gtkcellrenderertext.c:263
+#: ../gtk/gtkcellrenderertext.c:262
 msgid "Markup"
 msgstr "Markup"
 
-#: ../gtk/gtkcellrenderertext.c:264
+#: ../gtk/gtkcellrenderertext.c:263
 msgid "Marked up text to render"
 msgstr "Der darzustellende Markup-Text"
 
-#: ../gtk/gtkcellrenderertext.c:271 ../gtk/gtklabel.c:574
+#: ../gtk/gtkcellrenderertext.c:270 ../gtk/gtklabel.c:736
 msgid "Attributes"
 msgstr "Attribute"
 
-#: ../gtk/gtkcellrenderertext.c:272
+#: ../gtk/gtkcellrenderertext.c:271
 msgid "A list of style attributes to apply to the text of the renderer"
 msgstr ""
 "Eine Liste der Stilattribute, die auf den dargestellten Text angewendet werden"
 
-#: ../gtk/gtkcellrenderertext.c:279
+#: ../gtk/gtkcellrenderertext.c:278
 msgid "Single Paragraph Mode"
 msgstr "Einzelabsatz-Modus"
 
-#: ../gtk/gtkcellrenderertext.c:280
+#: ../gtk/gtkcellrenderertext.c:279
 msgid "Whether to keep all text in a single paragraph"
 msgstr ""
 "Legt fest, ob der gesamte Text in einem einzigen Absatz vorgehalten werden "
 "soll"
 
-#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:191
-#: ../gtk/gtktexttag.c:196
+#: ../gtk/gtkcellrenderertext.c:287 ../gtk/gtkcellview.c:191
+#: ../gtk/gtktexttag.c:199
 msgid "Background color name"
 msgstr "Name der Hintergrundfarbe"
 
-#: ../gtk/gtkcellrenderertext.c:289 ../gtk/gtkcellview.c:192
-#: ../gtk/gtktexttag.c:197
+#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:192
+#: ../gtk/gtktexttag.c:200
 msgid "Background color as a string"
 msgstr "Die Hintergrundfarbe als Zeichenkette"
 
-#: ../gtk/gtkcellrenderertext.c:296 ../gtk/gtkcellview.c:198
-#: ../gtk/gtktexttag.c:204
+#: ../gtk/gtkcellrenderertext.c:295 ../gtk/gtkcellview.c:198
+#: ../gtk/gtktexttag.c:207
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
-#: ../gtk/gtkcellrenderertext.c:297 ../gtk/gtkcellview.c:199
+#: ../gtk/gtkcellrenderertext.c:296 ../gtk/gtkcellview.c:199
+#: ../gtk/gtktexttag.c:208
 msgid "Background color as a GdkColor"
 msgstr "Die Hintergrundfarbe als GdkColor"
 
-#: ../gtk/gtkcellrenderertext.c:311
+#: ../gtk/gtkcellrenderertext.c:310
 msgid "Background color as RGBA"
 msgstr "Hintergrundfarbe als RGBA"
 
-#: ../gtk/gtkcellrenderertext.c:312 ../gtk/gtkcellview.c:213
+#: ../gtk/gtkcellrenderertext.c:311 ../gtk/gtkcellview.c:213
+#: ../gtk/gtktexttag.c:223
 msgid "Background color as a GdkRGBA"
 msgstr "Die Hintergrundfarbe als GdkRGBA"
 
-#: ../gtk/gtkcellrenderertext.c:318 ../gtk/gtktexttag.c:220
+#: ../gtk/gtkcellrenderertext.c:317 ../gtk/gtktexttag.c:238
 msgid "Foreground color name"
 msgstr "Name der Vordergrundfarbe"
 
-#: ../gtk/gtkcellrenderertext.c:319 ../gtk/gtktexttag.c:221
+#: ../gtk/gtkcellrenderertext.c:318 ../gtk/gtktexttag.c:239
 msgid "Foreground color as a string"
 msgstr "Die Vordergrundfarbe als Zeichenkette"
 
-#: ../gtk/gtkcellrenderertext.c:326 ../gtk/gtktexttag.c:228
+#: ../gtk/gtkcellrenderertext.c:325 ../gtk/gtktexttag.c:246
 #: ../gtk/gtktrayicon-x11.c:137
 msgid "Foreground color"
 msgstr "Vordergrundfarbe"
 
-#: ../gtk/gtkcellrenderertext.c:327
+#: ../gtk/gtkcellrenderertext.c:326 ../gtk/gtktexttag.c:247
 msgid "Foreground color as a GdkColor"
 msgstr "Die Vordergrundfarbe als GdkColor"
 
-#: ../gtk/gtkcellrenderertext.c:341
+#: ../gtk/gtkcellrenderertext.c:340
 msgid "Foreground color as RGBA"
 msgstr "Vordergrundfarbe als RGBA"
 
-#: ../gtk/gtkcellrenderertext.c:342
+#: ../gtk/gtkcellrenderertext.c:341 ../gtk/gtktexttag.c:262
 msgid "Foreground color as a GdkRGBA"
 msgstr "Die Vordergrundfarbe als GdkRGBA"
 
-#: ../gtk/gtkcellrenderertext.c:350 ../gtk/gtkentry.c:754
-#: ../gtk/gtktexttag.c:245 ../gtk/gtktextview.c:684
+#: ../gtk/gtkcellrenderertext.c:349 ../gtk/gtkentry.c:761
+#: ../gtk/gtktexttag.c:278 ../gtk/gtktextview.c:686
 msgid "Editable"
 msgstr "Bearbeitbar"
 
-#: ../gtk/gtkcellrenderertext.c:351 ../gtk/gtktexttag.c:246
-#: ../gtk/gtktextview.c:685
+#: ../gtk/gtkcellrenderertext.c:350 ../gtk/gtktexttag.c:279
+#: ../gtk/gtktextview.c:687
 msgid "Whether the text can be modified by the user"
 msgstr "Soll der Text durch den Benutzer änderbar sein?"
 
-#: ../gtk/gtkcellrenderertext.c:358 ../gtk/gtkcellrenderertext.c:366
-#: ../gtk/gtktexttag.c:261 ../gtk/gtktexttag.c:269
+#: ../gtk/gtkcellrenderertext.c:357 ../gtk/gtkcellrenderertext.c:365
+#: ../gtk/gtktexttag.c:294 ../gtk/gtktexttag.c:302
 msgid "Font"
 msgstr "Schrift"
 
-#: ../gtk/gtkcellrenderertext.c:359 ../gtk/gtktexttag.c:262
+#: ../gtk/gtkcellrenderertext.c:358 ../gtk/gtktexttag.c:295
 msgid "Font description as a string, e.g. \"Sans Italic 12\""
 msgstr "Die Schriftbezeichnung als Zeichenkette, z.B. »Sans Italic 12«"
 
-#: ../gtk/gtkcellrenderertext.c:367 ../gtk/gtktexttag.c:270
+#: ../gtk/gtkcellrenderertext.c:366 ../gtk/gtktexttag.c:303
 msgid "Font description as a PangoFontDescription struct"
 msgstr "Schriftbeschreibung als PangoFontDescription-Struktur"
 
-#: ../gtk/gtkcellrenderertext.c:375 ../gtk/gtktexttag.c:277
+#: ../gtk/gtkcellrenderertext.c:374 ../gtk/gtktexttag.c:310
 msgid "Font family"
 msgstr "Schriftfamilie"
 
-#: ../gtk/gtkcellrenderertext.c:376 ../gtk/gtktexttag.c:278
+#: ../gtk/gtkcellrenderertext.c:375 ../gtk/gtktexttag.c:311
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "Der Name der Schriftfamilie, z.B. Sans, Helvetica, Times, Monospace"
 
-#: ../gtk/gtkcellrenderertext.c:383 ../gtk/gtkcellrenderertext.c:384
-#: ../gtk/gtktexttag.c:285
+#: ../gtk/gtkcellrenderertext.c:382 ../gtk/gtkcellrenderertext.c:383
+#: ../gtk/gtktexttag.c:318
 msgid "Font style"
 msgstr "Schriftstil"
 
-#: ../gtk/gtkcellrenderertext.c:392 ../gtk/gtkcellrenderertext.c:393
-#: ../gtk/gtktexttag.c:294
+#: ../gtk/gtkcellrenderertext.c:391 ../gtk/gtkcellrenderertext.c:392
+#: ../gtk/gtktexttag.c:327
 msgid "Font variant"
 msgstr "Schriftvariante"
 
-#: ../gtk/gtkcellrenderertext.c:401 ../gtk/gtkcellrenderertext.c:402
-#: ../gtk/gtktexttag.c:303
+#: ../gtk/gtkcellrenderertext.c:400 ../gtk/gtkcellrenderertext.c:401
+#: ../gtk/gtktexttag.c:336
 msgid "Font weight"
 msgstr "Schriftgewicht"
 
-#: ../gtk/gtkcellrenderertext.c:411 ../gtk/gtkcellrenderertext.c:412
-#: ../gtk/gtktexttag.c:314
+#: ../gtk/gtkcellrenderertext.c:410 ../gtk/gtkcellrenderertext.c:411
+#: ../gtk/gtktexttag.c:347
 msgid "Font stretch"
 msgstr "Schriftdehnung"
 
-#: ../gtk/gtkcellrenderertext.c:420 ../gtk/gtkcellrenderertext.c:421
-#: ../gtk/gtktexttag.c:323
+#: ../gtk/gtkcellrenderertext.c:419 ../gtk/gtkcellrenderertext.c:420
+#: ../gtk/gtktexttag.c:356
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: ../gtk/gtkcellrenderertext.c:430 ../gtk/gtktexttag.c:343
+#: ../gtk/gtkcellrenderertext.c:429 ../gtk/gtktexttag.c:376
 msgid "Font points"
 msgstr "Punktgröße"
 
-#: ../gtk/gtkcellrenderertext.c:431 ../gtk/gtktexttag.c:344
+#: ../gtk/gtkcellrenderertext.c:430 ../gtk/gtktexttag.c:377
 msgid "Font size in points"
 msgstr "Die Schriftgröße in Punkt"
 
-#: ../gtk/gtkcellrenderertext.c:440 ../gtk/gtktexttag.c:333
+#: ../gtk/gtkcellrenderertext.c:439 ../gtk/gtktexttag.c:366
 msgid "Font scale"
 msgstr "Schriftskalierung"
 
-#: ../gtk/gtkcellrenderertext.c:441
+#: ../gtk/gtkcellrenderertext.c:440
 msgid "Font scaling factor"
 msgstr "Der Skalierungsfaktor der Schrift"
 
-#: ../gtk/gtkcellrenderertext.c:450 ../gtk/gtktexttag.c:412
+#: ../gtk/gtkcellrenderertext.c:449 ../gtk/gtktexttag.c:445
 msgid "Rise"
 msgstr "Hochstellen"
 
-#: ../gtk/gtkcellrenderertext.c:451
+#: ../gtk/gtkcellrenderertext.c:450
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative)"
 msgstr ""
 "Hochstellen des Texts über der Grundlinie (Tiefstellen, wenn der Wert negativ "
 "ist)"
 
-#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:452
+#: ../gtk/gtkcellrenderertext.c:461 ../gtk/gtktexttag.c:485
 msgid "Strikethrough"
 msgstr "Durchstreichen"
 
-#: ../gtk/gtkcellrenderertext.c:463 ../gtk/gtktexttag.c:453
+#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:486
 msgid "Whether to strike through the text"
 msgstr "Den Text durchstreichen?"
 
-#: ../gtk/gtkcellrenderertext.c:470 ../gtk/gtktexttag.c:460
+#: ../gtk/gtkcellrenderertext.c:469 ../gtk/gtktexttag.c:493
 msgid "Underline"
 msgstr "Unterstreichen"
 
-#: ../gtk/gtkcellrenderertext.c:471 ../gtk/gtktexttag.c:461
+#: ../gtk/gtkcellrenderertext.c:470 ../gtk/gtktexttag.c:494
 msgid "Style of underline for this text"
 msgstr "Stil der Unterstreichung für diesen Text"
 
-#: ../gtk/gtkcellrenderertext.c:479 ../gtk/gtktexttag.c:372
+#: ../gtk/gtkcellrenderertext.c:478 ../gtk/gtktexttag.c:405
 msgid "Language"
 msgstr "Sprache"
 
-#: ../gtk/gtkcellrenderertext.c:480
+#: ../gtk/gtkcellrenderertext.c:479
 msgid ""
 "The language this text is in, as an ISO code. Pango can use this as a hint "
 "when rendering the text. If you don't understand this parameter, you probably "
@@ -1864,12 +1868,12 @@ msgstr ""
 "dies bei der Textdarstellung als Wink verwenden. Falls Sie diesen Parameter "
 "nicht verstehen, benötigen Sie ihn wahrscheinlich nicht."
 
-#: ../gtk/gtkcellrenderertext.c:500 ../gtk/gtklabel.c:699
-#: ../gtk/gtkprogressbar.c:217
+#: ../gtk/gtkcellrenderertext.c:499 ../gtk/gtklabel.c:861
+#: ../gtk/gtkprogressbar.c:220
 msgid "Ellipsize"
 msgstr "Auslassungen"
 
-#: ../gtk/gtkcellrenderertext.c:501
+#: ../gtk/gtkcellrenderertext.c:500
 msgid ""
 "The preferred place to ellipsize the string, if the cell renderer does not "
 "have enough room to display the entire string"
@@ -1877,28 +1881,28 @@ msgstr ""
 "Der bevorzugte Bereich zur Auslassung in der Zeichenkette, falls der Renderer "
 "der Zelle nicht genug Platz hat, um sie komplett anzuzeigen"
 
-#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtkfilechooserbutton.c:411
-#: ../gtk/gtklabel.c:720
+#: ../gtk/gtkcellrenderertext.c:519 ../gtk/gtkfilechooserbutton.c:454
+#: ../gtk/gtklabel.c:882
 msgid "Width In Characters"
 msgstr "Breite in Zeichen"
 
-#: ../gtk/gtkcellrenderertext.c:521 ../gtk/gtklabel.c:721
+#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtklabel.c:883
 msgid "The desired width of the label, in characters"
 msgstr "Die gewünschte Breite der Beschriftung, in Zeichen"
 
-#: ../gtk/gtkcellrenderertext.c:545 ../gtk/gtklabel.c:781
+#: ../gtk/gtkcellrenderertext.c:544 ../gtk/gtklabel.c:943
 msgid "Maximum Width In Characters"
 msgstr "Maximale Breite in Zeichen"
 
-#: ../gtk/gtkcellrenderertext.c:546
+#: ../gtk/gtkcellrenderertext.c:545
 msgid "The maximum width of the cell, in characters"
 msgstr "Die maximale Breite der Zelle, in Zeichen"
 
-#: ../gtk/gtkcellrenderertext.c:564 ../gtk/gtktexttag.c:469
+#: ../gtk/gtkcellrenderertext.c:563 ../gtk/gtktexttag.c:502
 msgid "Wrap mode"
 msgstr "Umbruchmodus"
 
-#: ../gtk/gtkcellrenderertext.c:565
+#: ../gtk/gtkcellrenderertext.c:564
 msgid ""
 "How to break the string into multiple lines, if the cell renderer does not "
 "have enough room to display the entire string"
@@ -1907,191 +1911,191 @@ msgstr ""
 "Zellen-Renderer nicht genügend Platz hat, um die gesamte Zeichenkette in "
 "einer Zeile anzuzeigen"
 
-#: ../gtk/gtkcellrenderertext.c:584 ../gtk/gtkcombobox.c:680
+#: ../gtk/gtkcellrenderertext.c:583 ../gtk/gtkcombobox.c:681
 msgid "Wrap width"
 msgstr "Umbruchbreite"
 
-#: ../gtk/gtkcellrenderertext.c:585
+#: ../gtk/gtkcellrenderertext.c:584
 msgid "The width at which the text is wrapped"
 msgstr "Die Breite bei der der Text umgebrochen wird"
 
-#: ../gtk/gtkcellrenderertext.c:605 ../gtk/gtktreeviewcolumn.c:352
+#: ../gtk/gtkcellrenderertext.c:604 ../gtk/gtktreeviewcolumn.c:364
 msgid "Alignment"
 msgstr "Ausrichtung"
 
-#: ../gtk/gtkcellrenderertext.c:606
+#: ../gtk/gtkcellrenderertext.c:605
 msgid "How to align the lines"
 msgstr "Wie sollen die Zeilen ausgerichtet werden?"
 
-#: ../gtk/gtkcellrenderertext.c:618 ../gtk/gtkcellview.c:317
-#: ../gtk/gtktexttag.c:558
+#: ../gtk/gtkcellrenderertext.c:617 ../gtk/gtkcellview.c:317
+#: ../gtk/gtktexttag.c:605
 msgid "Background set"
 msgstr "Hintergrund einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:619 ../gtk/gtkcellview.c:318
-#: ../gtk/gtktexttag.c:559
+#: ../gtk/gtkcellrenderertext.c:618 ../gtk/gtkcellview.c:318
+#: ../gtk/gtktexttag.c:606
 msgid "Whether this tag affects the background color"
 msgstr "Soll dieses Tag die Hintergrundfarbe beeinflussen?"
 
-#: ../gtk/gtkcellrenderertext.c:622 ../gtk/gtktexttag.c:566
+#: ../gtk/gtkcellrenderertext.c:621 ../gtk/gtktexttag.c:613
 msgid "Foreground set"
 msgstr "Vordergrund einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:623 ../gtk/gtktexttag.c:567
+#: ../gtk/gtkcellrenderertext.c:622 ../gtk/gtktexttag.c:614
 msgid "Whether this tag affects the foreground color"
 msgstr "Soll dieses Tag die Vordergrundfarbe beeinflussen?"
 
-#: ../gtk/gtkcellrenderertext.c:626 ../gtk/gtktexttag.c:570
+#: ../gtk/gtkcellrenderertext.c:625 ../gtk/gtktexttag.c:617
 msgid "Editability set"
 msgstr "Änderbarkeit einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:627 ../gtk/gtktexttag.c:571
+#: ../gtk/gtkcellrenderertext.c:626 ../gtk/gtktexttag.c:618
 msgid "Whether this tag affects text editability"
 msgstr "Soll dieses Tag die Änderbarkeit beeinflussen?"
 
-#: ../gtk/gtkcellrenderertext.c:630 ../gtk/gtktexttag.c:574
+#: ../gtk/gtkcellrenderertext.c:629 ../gtk/gtktexttag.c:621
 msgid "Font family set"
 msgstr "Schriftfamilie einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:631 ../gtk/gtktexttag.c:575
+#: ../gtk/gtkcellrenderertext.c:630 ../gtk/gtktexttag.c:622
 msgid "Whether this tag affects the font family"
 msgstr "Soll dieses Tag die Schriftfamilie beeinflussen?"
 
-#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtktexttag.c:578
+#: ../gtk/gtkcellrenderertext.c:633 ../gtk/gtktexttag.c:625
 msgid "Font style set"
 msgstr "Schriftstil einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:635 ../gtk/gtktexttag.c:579
+#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtktexttag.c:626
 msgid "Whether this tag affects the font style"
 msgstr "Soll dieses Tag den Schriftstil beeinflussen?"
 
-#: ../gtk/gtkcellrenderertext.c:638 ../gtk/gtktexttag.c:582
+#: ../gtk/gtkcellrenderertext.c:637 ../gtk/gtktexttag.c:629
 msgid "Font variant set"
 msgstr "Schriftvariante einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:639 ../gtk/gtktexttag.c:583
+#: ../gtk/gtkcellrenderertext.c:638 ../gtk/gtktexttag.c:630
 msgid "Whether this tag affects the font variant"
 msgstr "Soll dieses Tag die Schriftvariante beeinflussen?"
 
-#: ../gtk/gtkcellrenderertext.c:642 ../gtk/gtktexttag.c:586
+#: ../gtk/gtkcellrenderertext.c:641 ../gtk/gtktexttag.c:633
 msgid "Font weight set"
 msgstr "Schriftgewicht einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:643 ../gtk/gtktexttag.c:587
+#: ../gtk/gtkcellrenderertext.c:642 ../gtk/gtktexttag.c:634
 msgid "Whether this tag affects the font weight"
 msgstr "Soll dieses Tag das Schriftgewicht beeinflussen?"
 
-#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtktexttag.c:590
+#: ../gtk/gtkcellrenderertext.c:645 ../gtk/gtktexttag.c:637
 msgid "Font stretch set"
 msgstr "Schriftdehnung einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:647 ../gtk/gtktexttag.c:591
+#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtktexttag.c:638
 msgid "Whether this tag affects the font stretch"
 msgstr "Soll dieses Tag die Schriftdehnung beeinflussen?"
 
-#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:594
+#: ../gtk/gtkcellrenderertext.c:649 ../gtk/gtktexttag.c:641
 msgid "Font size set"
 msgstr "Schriftgröße einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:651 ../gtk/gtktexttag.c:595
+#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:642
 msgid "Whether this tag affects the font size"
 msgstr "Soll dieses Tag die Schriftgröße beeinflussen?"
 
-#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:598
+#: ../gtk/gtkcellrenderertext.c:653 ../gtk/gtktexttag.c:645
 msgid "Font scale set"
 msgstr "Schriftskalierung einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:655 ../gtk/gtktexttag.c:599
+#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:646
 msgid "Whether this tag scales the font size by a factor"
 msgstr "Soll dieses Tag die Schriftgröße um einen Faktor skalieren?"
 
-#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:618
+#: ../gtk/gtkcellrenderertext.c:657 ../gtk/gtktexttag.c:665
 msgid "Rise set"
 msgstr "Hochstellung einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:659 ../gtk/gtktexttag.c:619
+#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:666
 msgid "Whether this tag affects the rise"
 msgstr "Soll dieses Tag die Hochstellung bewirken?"
 
-#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:634
+#: ../gtk/gtkcellrenderertext.c:661 ../gtk/gtktexttag.c:681
 msgid "Strikethrough set"
 msgstr "Durchstreichung einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:663 ../gtk/gtktexttag.c:635
+#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:682
 msgid "Whether this tag affects strikethrough"
 msgstr "Soll dieses Tag die Durchstreichung bewirken?"
 
-#: ../gtk/gtkcellrenderertext.c:666 ../gtk/gtktexttag.c:642
+#: ../gtk/gtkcellrenderertext.c:665 ../gtk/gtktexttag.c:689
 msgid "Underline set"
 msgstr "Unterstreichung einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:667 ../gtk/gtktexttag.c:643
+#: ../gtk/gtkcellrenderertext.c:666 ../gtk/gtktexttag.c:690
 msgid "Whether this tag affects underlining"
 msgstr "Soll dieses Tag die Unterstreichung bewirken?"
 
-#: ../gtk/gtkcellrenderertext.c:670 ../gtk/gtktexttag.c:606
+#: ../gtk/gtkcellrenderertext.c:669 ../gtk/gtktexttag.c:653
 msgid "Language set"
 msgstr "Sprache einstellen"
 
-#: ../gtk/gtkcellrenderertext.c:671 ../gtk/gtktexttag.c:607
+#: ../gtk/gtkcellrenderertext.c:670 ../gtk/gtktexttag.c:654
 msgid "Whether this tag affects the language the text is rendered as"
 msgstr ""
 "Soll dieses Tag die Sprache beeinflussen, in der der Text dargestellt wird?"
 
-#: ../gtk/gtkcellrenderertext.c:674
+#: ../gtk/gtkcellrenderertext.c:673
 msgid "Ellipsize set"
 msgstr "Auslassungspunkte benutzen"
 
-#: ../gtk/gtkcellrenderertext.c:675
+#: ../gtk/gtkcellrenderertext.c:674
 msgid "Whether this tag affects the ellipsize mode"
 msgstr "Soll dieses Tag Auslassungen bewirken?"
 
-#: ../gtk/gtkcellrenderertext.c:678
+#: ../gtk/gtkcellrenderertext.c:677
 msgid "Align set"
 msgstr "Ausrichtung"
 
-#: ../gtk/gtkcellrenderertext.c:679
+#: ../gtk/gtkcellrenderertext.c:678
 msgid "Whether this tag affects the alignment mode"
 msgstr "Legt fest, ob dieses Tag die Ausrichtung beeinflusst"
 
-#: ../gtk/gtkcellrenderertoggle.c:128
+#: ../gtk/gtkcellrenderertoggle.c:140
 msgid "Toggle state"
 msgstr "Schaltzustand"
 
-#: ../gtk/gtkcellrenderertoggle.c:129
+#: ../gtk/gtkcellrenderertoggle.c:141
 msgid "The toggle state of the button"
 msgstr "Der Schaltzustand des Knopfes"
 
-#: ../gtk/gtkcellrenderertoggle.c:136
+#: ../gtk/gtkcellrenderertoggle.c:148
 msgid "Inconsistent state"
 msgstr "Inkonsistenter Zustand"
 
-#: ../gtk/gtkcellrenderertoggle.c:137
+#: ../gtk/gtkcellrenderertoggle.c:149
 msgid "The inconsistent state of the button"
 msgstr "Der inkonsistente Zustand des Knopfes"
 
-#: ../gtk/gtkcellrenderertoggle.c:144
+#: ../gtk/gtkcellrenderertoggle.c:156
 msgid "Activatable"
 msgstr "Aktivierbar"
 
-#: ../gtk/gtkcellrenderertoggle.c:145
+#: ../gtk/gtkcellrenderertoggle.c:157
 msgid "The toggle button can be activated"
 msgstr "Kann der Umschaltknopf aktiviert werden?"
 
-#: ../gtk/gtkcellrenderertoggle.c:152
+#: ../gtk/gtkcellrenderertoggle.c:164
 msgid "Radio state"
 msgstr "Radiozustand"
 
-#: ../gtk/gtkcellrenderertoggle.c:153
+#: ../gtk/gtkcellrenderertoggle.c:165
 msgid "Draw the toggle button as a radio button"
 msgstr "Den Umschaltknopf als Radioknopf darstellen"
 
-#: ../gtk/gtkcellrenderertoggle.c:160
+#: ../gtk/gtkcellrenderertoggle.c:172
 msgid "Indicator size"
 msgstr "Indikatorgröße"
 
-#: ../gtk/gtkcellrenderertoggle.c:161 ../gtk/gtkcheckbutton.c:78
-#: ../gtk/gtkcheckmenuitem.c:130
+#: ../gtk/gtkcellrenderertoggle.c:173 ../gtk/gtkcheckbutton.c:95
+#: ../gtk/gtkcheckmenuitem.c:146
 msgid "Size of check or radio indicator"
 msgstr "Die Größe des Ankreuz- oder Radioindikators"
 
@@ -2107,15 +2111,15 @@ msgstr "Cell-View-Modell"
 msgid "The model for cell view"
 msgstr "Das Modell für die Cell-View"
 
-#: ../gtk/gtkcellview.c:246 ../gtk/gtkcombobox.c:944
-#: ../gtk/gtkentrycompletion.c:448 ../gtk/gtkiconview.c:770
-#: ../gtk/gtktreemenu.c:329 ../gtk/gtktreeviewcolumn.c:415
+#: ../gtk/gtkcellview.c:246 ../gtk/gtkcombobox.c:945
+#: ../gtk/gtkentrycompletion.c:448 ../gtk/gtkiconview.c:768
+#: ../gtk/gtktreemenu.c:329 ../gtk/gtktreeviewcolumn.c:427
 msgid "Cell Area"
 msgstr "Zellenbereich"
 
-#: ../gtk/gtkcellview.c:247 ../gtk/gtkcombobox.c:945
-#: ../gtk/gtkentrycompletion.c:449 ../gtk/gtkiconview.c:771
-#: ../gtk/gtktreemenu.c:330 ../gtk/gtktreeviewcolumn.c:416
+#: ../gtk/gtkcellview.c:247 ../gtk/gtkcombobox.c:946
+#: ../gtk/gtkentrycompletion.c:449 ../gtk/gtkiconview.c:769
+#: ../gtk/gtktreemenu.c:330 ../gtk/gtktreeviewcolumn.c:428
 msgid "The GtkCellArea used to layout cells"
 msgstr "Der zur Anordnung der Zellen verwendete GtkCellArea"
 
@@ -2146,35 +2150,35 @@ msgstr "Modell einpassen"
 msgid "Whether to request enough space for every row in the model"
 msgstr "Soll ausreichender Platz für jede Zeile im Modell angefordert werden?"
 
-#: ../gtk/gtkcheckbutton.c:77 ../gtk/gtkcheckmenuitem.c:129
+#: ../gtk/gtkcheckbutton.c:94 ../gtk/gtkcheckmenuitem.c:145
 msgid "Indicator Size"
 msgstr "Indikatorgröße"
 
-#: ../gtk/gtkcheckbutton.c:85 ../gtk/gtkexpander.c:345
+#: ../gtk/gtkcheckbutton.c:102 ../gtk/gtkexpander.c:364
 msgid "Indicator Spacing"
 msgstr "Indikatorabstand"
 
-#: ../gtk/gtkcheckbutton.c:86
+#: ../gtk/gtkcheckbutton.c:103
 msgid "Spacing around check or radio indicator"
 msgstr "Der Freiraum um den Ankreuz- oder Radioindikator"
 
-#: ../gtk/gtkcheckmenuitem.c:107
+#: ../gtk/gtkcheckmenuitem.c:123
 msgid "Whether the menu item is checked"
 msgstr "Soll der Menüeintrag angekreuzt sein?"
 
-#: ../gtk/gtkcheckmenuitem.c:114 ../gtk/gtktogglebutton.c:133
+#: ../gtk/gtkcheckmenuitem.c:130 ../gtk/gtktogglebutton.c:186
 msgid "Inconsistent"
 msgstr "Inkonsistent"
 
-#: ../gtk/gtkcheckmenuitem.c:115
+#: ../gtk/gtkcheckmenuitem.c:131
 msgid "Whether to display an \"inconsistent\" state"
 msgstr "Soll der Zustand »inkonsistent« angezeigt werden?"
 
-#: ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkcheckmenuitem.c:138
 msgid "Draw as radio menu item"
 msgstr "Als Auswahl-Menüeintrag zeichnen"
 
-#: ../gtk/gtkcheckmenuitem.c:123
+#: ../gtk/gtkcheckmenuitem.c:139
 msgid "Whether the menu item looks like a radio menu item"
 msgstr "Soll der Menüeintrag wie ein Auswahl-Menüeintrag aussehen?"
 
@@ -2186,9 +2190,9 @@ msgstr "Alpha verwenden"
 msgid "Whether to give the color an alpha value"
 msgstr "Soll der Farbe ein Alphawert gegeben werden?"
 
-#: ../gtk/gtkcolorbutton.c:185 ../gtk/gtkfilechooserbutton.c:397
-#: ../gtk/gtkfontbutton.c:140 ../gtk/gtkprintjob.c:141
-#: ../gtk/gtkstatusicon.c:408 ../gtk/gtktreeviewcolumn.c:319
+#: ../gtk/gtkcolorbutton.c:185 ../gtk/gtkfilechooserbutton.c:440
+#: ../gtk/gtkfontbutton.c:150 ../gtk/gtkprintjob.c:141
+#: ../gtk/gtkstatusicon.c:438 ../gtk/gtktreeviewcolumn.c:331
 msgid "Title"
 msgstr "Titel"
 
@@ -2196,7 +2200,7 @@ msgstr "Titel"
 msgid "The title of the color selection dialog"
 msgstr "Der Titel des Farbwahldialogs"
 
-#: ../gtk/gtkcolorbutton.c:200 ../gtk/gtkcolorsel.c:338
+#: ../gtk/gtkcolorbutton.c:200 ../gtk/gtkcolorsel.c:336
 msgid "Current Color"
 msgstr "Aktuelle Farbe"
 
@@ -2204,7 +2208,7 @@ msgstr "Aktuelle Farbe"
 msgid "The selected color"
 msgstr "Die gewählte Farbe"
 
-#: ../gtk/gtkcolorbutton.c:215 ../gtk/gtkcolorsel.c:345
+#: ../gtk/gtkcolorbutton.c:215 ../gtk/gtkcolorsel.c:343
 msgid "Current Alpha"
 msgstr "Aktuelles Alpha"
 
@@ -2221,168 +2225,168 @@ msgstr "Aktuelle RGBA-Farbe"
 msgid "The selected RGBA color"
 msgstr "Die gewählte RGBA-Farbe"
 
-#: ../gtk/gtkcolorsel.c:324
+#: ../gtk/gtkcolorsel.c:322
 msgid "Has Opacity Control"
 msgstr "Hat Deckkraftregler"
 
-#: ../gtk/gtkcolorsel.c:325
+#: ../gtk/gtkcolorsel.c:323
 msgid "Whether the color selector should allow setting opacity"
 msgstr "Soll der Farbwähler eine Regelung der Deckkraft zulassen?"
 
-#: ../gtk/gtkcolorsel.c:331
+#: ../gtk/gtkcolorsel.c:329
 msgid "Has palette"
 msgstr "Hat Palette"
 
-#: ../gtk/gtkcolorsel.c:332
+#: ../gtk/gtkcolorsel.c:330
 msgid "Whether a palette should be used"
 msgstr "Soll eine Palette verwendet werden?"
 
-#: ../gtk/gtkcolorsel.c:339
+#: ../gtk/gtkcolorsel.c:337
 msgid "The current color"
 msgstr "Die aktuelle Farbe"
 
-#: ../gtk/gtkcolorsel.c:346
+#: ../gtk/gtkcolorsel.c:344
 msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr ""
 "Die aktuelle Deckkraft (0 ist völlig transparent, 65535 völlig undurchsichtig)"
 
-#: ../gtk/gtkcolorsel.c:360
+#: ../gtk/gtkcolorsel.c:358
 msgid "Current RGBA"
 msgstr "Aktuelles RGBA"
 
-#: ../gtk/gtkcolorsel.c:361
+#: ../gtk/gtkcolorsel.c:359
 msgid "The current RGBA color"
 msgstr "Die aktuelle RGBA-Farbe"
 
-#: ../gtk/gtkcolorseldialog.c:110
+#: ../gtk/gtkcolorseldialog.c:136
 msgid "Color Selection"
 msgstr "Farbauswahl"
 
-#: ../gtk/gtkcolorseldialog.c:111
+#: ../gtk/gtkcolorseldialog.c:137
 msgid "The color selection embedded in the dialog."
 msgstr "Die in den Dialog eingebundene Farbauswahl."
 
-#: ../gtk/gtkcolorseldialog.c:117
+#: ../gtk/gtkcolorseldialog.c:143
 msgid "OK Button"
 msgstr "OK-Knopf"
 
-#: ../gtk/gtkcolorseldialog.c:118
+#: ../gtk/gtkcolorseldialog.c:144
 msgid "The OK button of the dialog."
 msgstr "Der OK-Knopf des Dialogs"
 
-#: ../gtk/gtkcolorseldialog.c:124
+#: ../gtk/gtkcolorseldialog.c:150
 msgid "Cancel Button"
 msgstr "Abbrechen-Knopf"
 
-#: ../gtk/gtkcolorseldialog.c:125
+#: ../gtk/gtkcolorseldialog.c:151
 msgid "The cancel button of the dialog."
 msgstr "Der Abbrechen-Knopf des Dialogs"
 
-#: ../gtk/gtkcolorseldialog.c:131
+#: ../gtk/gtkcolorseldialog.c:157
 msgid "Help Button"
 msgstr "Hilfe-Knopf"
 
-#: ../gtk/gtkcolorseldialog.c:132
+#: ../gtk/gtkcolorseldialog.c:158
 msgid "The help button of the dialog."
 msgstr "Der Hilfe-Knopf des Dialogs"
 
-#: ../gtk/gtkcombobox.c:663
+#: ../gtk/gtkcombobox.c:664
 msgid "ComboBox model"
 msgstr "Modell des Auswahlfeldes"
 
-#: ../gtk/gtkcombobox.c:664
+#: ../gtk/gtkcombobox.c:665
 msgid "The model for the combo box"
 msgstr "Das Modell für das Auswahlfeld"
 
-#: ../gtk/gtkcombobox.c:681
+#: ../gtk/gtkcombobox.c:682
 msgid "Wrap width for laying out the items in a grid"
 msgstr "Umbruchbreite zum Anordnen der Objekte in einem Gitter"
 
 # CHECK
-#: ../gtk/gtkcombobox.c:703 ../gtk/gtktreemenu.c:383
+#: ../gtk/gtkcombobox.c:704 ../gtk/gtktreemenu.c:383
 msgid "Row span column"
 msgstr "Spalte zur Zeilenüberbrückung"
 
-#: ../gtk/gtkcombobox.c:704 ../gtk/gtktreemenu.c:384
+#: ../gtk/gtkcombobox.c:705 ../gtk/gtktreemenu.c:384
 msgid "TreeModel column containing the row span values"
 msgstr "TreeModel-Spalte, die die Zeilenüberbrückungswerte enthält"
 
 # CHECK
-#: ../gtk/gtkcombobox.c:725 ../gtk/gtktreemenu.c:404
+#: ../gtk/gtkcombobox.c:726 ../gtk/gtktreemenu.c:404
 msgid "Column span column"
 msgstr "Spalte zur Spaltenüberbrückung"
 
-#: ../gtk/gtkcombobox.c:726 ../gtk/gtktreemenu.c:405
+#: ../gtk/gtkcombobox.c:727 ../gtk/gtktreemenu.c:405
 msgid "TreeModel column containing the column span values"
 msgstr "TreeModel-Spalte, die die Spaltenüberbrückungswerte enthält"
 
-#: ../gtk/gtkcombobox.c:747
+#: ../gtk/gtkcombobox.c:748
 msgid "Active item"
 msgstr "Aktives Objekt"
 
-#: ../gtk/gtkcombobox.c:748
+#: ../gtk/gtkcombobox.c:749
 msgid "The item which is currently active"
 msgstr "Das momentan aktive Objekt"
 
-#: ../gtk/gtkcombobox.c:767 ../gtk/gtkuimanager.c:225
+#: ../gtk/gtkcombobox.c:768 ../gtk/gtkuimanager.c:479
 msgid "Add tearoffs to menus"
 msgstr "Abreiß-Einträge zu Menüs hinzufügen"
 
-#: ../gtk/gtkcombobox.c:768
+#: ../gtk/gtkcombobox.c:769
 msgid "Whether dropdowns should have a tearoff menu item"
 msgstr "Sollen Herabklapper Abreiß-Einträge haben?"
 
-#: ../gtk/gtkcombobox.c:783 ../gtk/gtkentry.c:779
+#: ../gtk/gtkcombobox.c:784 ../gtk/gtkentry.c:786
 msgid "Has Frame"
 msgstr "Hat Rahmen"
 
-#: ../gtk/gtkcombobox.c:784
+#: ../gtk/gtkcombobox.c:785
 msgid "Whether the combo box draws a frame around the child"
 msgstr "Soll das Auswahlfeld einen Rahmen um das Kind zeichnen?"
 
-#: ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkcombobox.c:793
 msgid "Whether the combo box grabs focus when it is clicked with the mouse"
 msgstr ""
 "Soll das Auswahlfeld den Fokus erhalten, sobald es mit der Maus angeklickt "
 "wurde?"
 
-#: ../gtk/gtkcombobox.c:807 ../gtk/gtkmenu.c:641
+#: ../gtk/gtkcombobox.c:808 ../gtk/gtkmenu.c:643
 msgid "Tearoff Title"
 msgstr "Abreißtitel"
 
-#: ../gtk/gtkcombobox.c:808
+#: ../gtk/gtkcombobox.c:809
 msgid ""
 "A title that may be displayed by the window manager when the popup is torn-off"
 msgstr ""
 "Ein Titel, der evtl. von der Fensterverwaltung angezeigt wird, wenn dieses "
 "Einblend-Fenster abgerissen wurde"
 
-#: ../gtk/gtkcombobox.c:825
+#: ../gtk/gtkcombobox.c:826
 msgid "Popup shown"
 msgstr "Einblend-Fenster anzeigen"
 
-#: ../gtk/gtkcombobox.c:826
+#: ../gtk/gtkcombobox.c:827
 msgid "Whether the combo's dropdown is shown"
 msgstr ""
 "Legt fest, ob ausklappende Auswahllisten von Auswahlfeldern angezeigt werden"
 
-#: ../gtk/gtkcombobox.c:842
+#: ../gtk/gtkcombobox.c:843
 msgid "Button Sensitivity"
 msgstr "Knopf-Empfindlichkeit"
 
-#: ../gtk/gtkcombobox.c:843
+#: ../gtk/gtkcombobox.c:844
 msgid "Whether the dropdown button is sensitive when the model is empty"
 msgstr "Soll das Ausklappmenü aktivierbar sein, wenn das Modell leer ist?"
 
-#: ../gtk/gtkcombobox.c:859
+#: ../gtk/gtkcombobox.c:860
 msgid "Whether combo box has an entry"
 msgstr "Soll das Auswahlfeld einen Eintrag haben?"
 
-#: ../gtk/gtkcombobox.c:874
+#: ../gtk/gtkcombobox.c:875
 msgid "Entry Text Column"
 msgstr "Texteingabespalte"
 
-#: ../gtk/gtkcombobox.c:875
+#: ../gtk/gtkcombobox.c:876
 msgid ""
 "The column in the combo box's model to associate with strings from the entry "
 "if the combo was created with #GtkComboBox:has-entry = %TRUE"
@@ -2391,11 +2395,11 @@ msgstr ""
 "Eintrags verknüpft wird, wenn die Auswahl mit »#GtkComboBox:has-entry = "
 "%TRUE« erstellt wurde"
 
-#: ../gtk/gtkcombobox.c:892
+#: ../gtk/gtkcombobox.c:893
 msgid "ID Column"
 msgstr "Kennungsspalte"
 
-#: ../gtk/gtkcombobox.c:893
+#: ../gtk/gtkcombobox.c:894
 msgid ""
 "The column in the combo box's model that provides string IDs for the values "
 "in the model"
@@ -2403,19 +2407,19 @@ msgstr ""
 "Die Spalte im Modells des Auswahlfeldes, die Zeichenketten-Kennungen für die "
 "Werte im Modell liefert"
 
-#: ../gtk/gtkcombobox.c:908
+#: ../gtk/gtkcombobox.c:909
 msgid "Active id"
 msgstr "Aktive Kennung"
 
-#: ../gtk/gtkcombobox.c:909
+#: ../gtk/gtkcombobox.c:910
 msgid "The value of the id column for the active row"
 msgstr "Der Wert der Kennungsspalte für die aktive Zeile"
 
-#: ../gtk/gtkcombobox.c:924
+#: ../gtk/gtkcombobox.c:925
 msgid "Popup Fixed Width"
 msgstr "Einblend-Fenster in fester Breite"
 
-#: ../gtk/gtkcombobox.c:925
+#: ../gtk/gtkcombobox.c:926
 msgid ""
 "Whether the popup's width should be a fixed width matching the allocated "
 "width of the combo box"
@@ -2423,138 +2427,150 @@ msgstr ""
 "Legt fest, ob die Breite des Einblend-Fensters fest sein soll, entsprechend "
 "der zugewiesenen Breite des Auswahlfelds"
 
-#: ../gtk/gtkcombobox.c:951
+#: ../gtk/gtkcombobox.c:952
 msgid "Appears as list"
 msgstr "Als Liste anzeigen"
 
-#: ../gtk/gtkcombobox.c:952
+#: ../gtk/gtkcombobox.c:953
 msgid "Whether dropdowns should look like lists rather than menus"
 msgstr "Sollen Herabklapper wie Listen statt wie Menüs aussehen?"
 
-#: ../gtk/gtkcombobox.c:968
+#: ../gtk/gtkcombobox.c:969
 msgid "Arrow Size"
 msgstr "Pfeilgröße"
 
-#: ../gtk/gtkcombobox.c:969
+#: ../gtk/gtkcombobox.c:970
 msgid "The minimum size of the arrow in the combo box"
 msgstr "Die Minimale Größe des Pfeils im Auswahlfeld"
 
-#: ../gtk/gtkcombobox.c:986
+#: ../gtk/gtkcombobox.c:987
 msgid "The amount of space used by the arrow"
 msgstr "Der vom Pfeil belegte Platz"
 
-#: ../gtk/gtkcombobox.c:1001 ../gtk/gtkentry.c:879 ../gtk/gtkhandlebox.c:190
-#: ../gtk/gtkmenubar.c:207 ../gtk/gtkstatusbar.c:180 ../gtk/gtktoolbar.c:601
-#: ../gtk/gtkviewport.c:153
+#: ../gtk/gtkcombobox.c:1002 ../gtk/gtkentry.c:886 ../gtk/gtkhandlebox.c:218
+#: ../gtk/gtkmenubar.c:218 ../gtk/gtkstatusbar.c:182 ../gtk/gtktoolbar.c:613
+#: ../gtk/gtkviewport.c:155
 msgid "Shadow type"
 msgstr "Schattentyp"
 
-#: ../gtk/gtkcombobox.c:1002
+#: ../gtk/gtkcombobox.c:1003
 msgid "Which kind of shadow to draw around the combo box"
 msgstr "Die Art des Schattens, der um das Auswahlfeld gezeichnet wird"
 
-#: ../gtk/gtkcontainer.c:456
+#: ../gtk/gtkcontainer.c:457
 msgid "Resize mode"
 msgstr "Größenänderungsmodus"
 
-#: ../gtk/gtkcontainer.c:457
+#: ../gtk/gtkcontainer.c:458
 msgid "Specify how resize events are handled"
 msgstr ""
 "Die Art und Weise, auf die mit Größenänderungsereignissen umgegangen werden "
 "soll"
 
-#: ../gtk/gtkcontainer.c:464
+#: ../gtk/gtkcontainer.c:465
 msgid "Border width"
 msgstr "Randbreite"
 
-#: ../gtk/gtkcontainer.c:465
+#: ../gtk/gtkcontainer.c:466
 msgid "The width of the empty border outside the containers children"
 msgstr "Die Breite des leeren Rands um die Kinder des Containers"
 
-#: ../gtk/gtkcontainer.c:473
+#: ../gtk/gtkcontainer.c:474
 msgid "Child"
 msgstr "Kind"
 
-#: ../gtk/gtkcontainer.c:474
+#: ../gtk/gtkcontainer.c:475
 msgid "Can be used to add a new child to the container"
 msgstr "Kann verwendet werden, um ein neues Kind zum Container hinzuzufügen"
 
-#: ../gtk/gtkdialog.c:289 ../gtk/gtkinfobar.c:426
+#: ../gtk/gtkdialog.c:291 ../gtk/gtkinfobar.c:427
 msgid "Content area border"
 msgstr "Rand um Inhaltsfläche"
 
-#: ../gtk/gtkdialog.c:290
+#: ../gtk/gtkdialog.c:292
 msgid "Width of border around the main dialog area"
 msgstr "Die Breite des Rands um den Hauptbereich des Dialoges"
 
-#: ../gtk/gtkdialog.c:307 ../gtk/gtkinfobar.c:443
+#: ../gtk/gtkdialog.c:309 ../gtk/gtkinfobar.c:444
 msgid "Content area spacing"
 msgstr "Freiraum um Inhaltsfläche"
 
-#: ../gtk/gtkdialog.c:308
+#: ../gtk/gtkdialog.c:310
 msgid "Spacing between elements of the main dialog area"
 msgstr "Der Abstand zwischen Elementen im Inhaltsbereich des Dialogs"
 
-#: ../gtk/gtkdialog.c:315 ../gtk/gtkinfobar.c:459
+#: ../gtk/gtkdialog.c:317 ../gtk/gtkinfobar.c:460
 msgid "Button spacing"
 msgstr "Knopfabstand"
 
-#: ../gtk/gtkdialog.c:316 ../gtk/gtkinfobar.c:460
+#: ../gtk/gtkdialog.c:318 ../gtk/gtkinfobar.c:461
 msgid "Spacing between buttons"
 msgstr "Abstand zwischen Knöpfen"
 
-#: ../gtk/gtkdialog.c:324 ../gtk/gtkinfobar.c:475
+#: ../gtk/gtkdialog.c:326 ../gtk/gtkinfobar.c:476
 msgid "Action area border"
 msgstr "Rand um Aktionsfläche"
 
-#: ../gtk/gtkdialog.c:325
+#: ../gtk/gtkdialog.c:327
 msgid "Width of border around the button area at the bottom of the dialog"
 msgstr "Die Breite des Rands um den Knopfbereich unten im Dialog"
 
-#: ../gtk/gtkentry.c:726
+#: ../gtk/gtkentrybuffer.c:353
+msgid "The contents of the buffer"
+msgstr "Der Inhalt des Puffers"
+
+#: ../gtk/gtkentrybuffer.c:367 ../gtk/gtkentry.c:917
+msgid "Text length"
+msgstr "Textlänge"
+
+#: ../gtk/gtkentrybuffer.c:368
+msgid "Length of the text currently in the buffer"
+msgstr "Länge des aktuellen Textes im Puffer"
+
+#: ../gtk/gtkentrybuffer.c:382 ../gtk/gtkentry.c:769
+msgid "Maximum length"
+msgstr "Maximale Länge"
+
+#: ../gtk/gtkentrybuffer.c:383 ../gtk/gtkentry.c:770
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr ""
+"Die Maximale Anzahl der Zeichen für diesen Eintrag. Null, wenn unbegrenzt"
+
+#: ../gtk/gtkentry.c:733
 msgid "Text Buffer"
 msgstr "Textpuffer"
 
-#: ../gtk/gtkentry.c:727
+#: ../gtk/gtkentry.c:734
 msgid "Text buffer object which actually stores entry text"
 msgstr "Das Textpufferobjekt, das tatsächlich den eingetragenen Text speichert"
 
-#: ../gtk/gtkentry.c:734 ../gtk/gtklabel.c:662
+#: ../gtk/gtkentry.c:741 ../gtk/gtklabel.c:824
 msgid "Cursor Position"
 msgstr "Zeigerposition"
 
-#: ../gtk/gtkentry.c:735 ../gtk/gtklabel.c:663
+#: ../gtk/gtkentry.c:742 ../gtk/gtklabel.c:825
 msgid "The current position of the insertion cursor in chars"
 msgstr "Die momentane Position des Einfügezeigers, in Zeichen"
 
-#: ../gtk/gtkentry.c:744 ../gtk/gtklabel.c:672
+#: ../gtk/gtkentry.c:751 ../gtk/gtklabel.c:834
 msgid "Selection Bound"
 msgstr "Markierungsgrenze"
 
-#: ../gtk/gtkentry.c:745 ../gtk/gtklabel.c:673
+#: ../gtk/gtkentry.c:752 ../gtk/gtklabel.c:835
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars"
 msgstr ""
 "Der Abstand des gegenüberliegenden Endes der Markierung vom Zeiger in Zeichen"
 
-#: ../gtk/gtkentry.c:755
+#: ../gtk/gtkentry.c:762
 msgid "Whether the entry contents can be edited"
 msgstr "Sollen die Feldinhalte bearbeitet werden können?"
 
-#: ../gtk/gtkentry.c:762 ../gtk/gtkentrybuffer.c:382
-msgid "Maximum length"
-msgstr "Maximale Länge"
-
-#: ../gtk/gtkentry.c:763 ../gtk/gtkentrybuffer.c:383
-msgid "Maximum number of characters for this entry. Zero if no maximum"
-msgstr ""
-"Die Maximale Anzahl der Zeichen für diesen Eintrag. Null, wenn unbegrenzt"
-
-#: ../gtk/gtkentry.c:771
+#: ../gtk/gtkentry.c:778
 msgid "Visibility"
 msgstr "Sichtbarkeit"
 
-#: ../gtk/gtkentry.c:772
+#: ../gtk/gtkentry.c:779
 msgid ""
 "FALSE displays the \"invisible char\" instead of the actual text (password "
 "mode)"
@@ -2562,28 +2578,28 @@ msgstr ""
 "Falls FALSCH, das »unsichtbare Zeichen« statt des eigentlichen Texts anzeigen "
 "(Passwort-Modus)"
 
-#: ../gtk/gtkentry.c:780
+#: ../gtk/gtkentry.c:787
 msgid "FALSE removes outside bevel from entry"
 msgstr "FALSCH entfernt die äußere Fase des Eintrags"
 
-#: ../gtk/gtkentry.c:788
+#: ../gtk/gtkentry.c:795
 msgid "Border between text and frame. Overrides the inner-border style property"
 msgstr ""
 "Rand zwischen Text und Rahmen. Überschreibt die Eigenschaft »inner-border«."
 
-#: ../gtk/gtkentry.c:795 ../gtk/gtkentry.c:1361
+#: ../gtk/gtkentry.c:802 ../gtk/gtkentry.c:1398
 msgid "Invisible character"
 msgstr "Unsichtbares Zeichen"
 
-#: ../gtk/gtkentry.c:796 ../gtk/gtkentry.c:1362
+#: ../gtk/gtkentry.c:803 ../gtk/gtkentry.c:1399
 msgid "The character to use when masking entry contents (in \"password mode\")"
 msgstr "Das Zeichen, mit dem Feldinhalte verdeckt werden (im »Passwort-Modus«)"
 
-#: ../gtk/gtkentry.c:803
+#: ../gtk/gtkentry.c:810
 msgid "Activates default"
 msgstr "Vorgabe aktivieren"
 
-#: ../gtk/gtkentry.c:804
+#: ../gtk/gtkentry.c:811
 msgid ""
 "Whether to activate the default widget (such as the default button in a "
 "dialog) when Enter is pressed"
@@ -2591,34 +2607,34 @@ msgstr ""
 "Soll das Vorgabe-Widget (z.B. der Vorgabeknopf in einem Dialogfenster) "
 "aktiviert werden, wenn die Eingabetaste gedrückt wird?"
 
-#: ../gtk/gtkentry.c:810
+#: ../gtk/gtkentry.c:817
 msgid "Width in chars"
 msgstr "Breite in Zeichen"
 
-#: ../gtk/gtkentry.c:811
+#: ../gtk/gtkentry.c:818
 msgid "Number of characters to leave space for in the entry"
 msgstr ""
 "Die Anzahl der Zeichen, für die in diesem Feld Platz gelassen werden soll"
 
-#: ../gtk/gtkentry.c:820
+#: ../gtk/gtkentry.c:827
 msgid "Scroll offset"
 msgstr "Rollversatz"
 
-#: ../gtk/gtkentry.c:821
+#: ../gtk/gtkentry.c:828
 msgid "Number of pixels of the entry scrolled off the screen to the left"
 msgstr ""
 "Die Anzahl der Pixel, um die der Eintrag nach links aus dem Schirm gerollt "
 "werden soll"
 
-#: ../gtk/gtkentry.c:831
+#: ../gtk/gtkentry.c:838
 msgid "The contents of the entry"
 msgstr "Der Inhalt des Feldes"
 
-#: ../gtk/gtkentry.c:846 ../gtk/gtkmisc.c:81
+#: ../gtk/gtkentry.c:853 ../gtk/gtkmisc.c:105
 msgid "X align"
 msgstr "X-Ausrichtung"
 
-#: ../gtk/gtkentry.c:847 ../gtk/gtkmisc.c:82
+#: ../gtk/gtkentry.c:854 ../gtk/gtkmisc.c:106
 msgid ""
 "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
@@ -2626,68 +2642,64 @@ msgstr ""
 "Die horizontale Ausrichtung, von 0 (links) bis 1 (rechts). In RTL-Layouts "
 "umgekehrt"
 
-#: ../gtk/gtkentry.c:863
+#: ../gtk/gtkentry.c:870
 msgid "Truncate multiline"
 msgstr "Mehrzeiliges abbrechen"
 
-#: ../gtk/gtkentry.c:864
+#: ../gtk/gtkentry.c:871
 msgid "Whether to truncate multiline pastes to one line."
 msgstr ""
 "Sollen mehrzeilige eingefügte Texte nach der ersten Zeile abgebrochen werden?"
 
-#: ../gtk/gtkentry.c:880
+#: ../gtk/gtkentry.c:887
 msgid "Which kind of shadow to draw around the entry when has-frame is set"
 msgstr ""
 "Legt fest, welcher Schattentyp um den Eintrag gezeichnet wird, wenn has-frame "
 "gesetzt ist"
 
-#: ../gtk/gtkentry.c:895 ../gtk/gtktextview.c:764
+#: ../gtk/gtkentry.c:902 ../gtk/gtktextview.c:766
 msgid "Overwrite mode"
 msgstr "Ãœberschreibmodus"
 
-#: ../gtk/gtkentry.c:896
+#: ../gtk/gtkentry.c:903
 msgid "Whether new text overwrites existing text"
 msgstr "Soll eingegebener Text vorhandenen Inhalt überschreiben?"
 
-#: ../gtk/gtkentry.c:910 ../gtk/gtkentrybuffer.c:367
-msgid "Text length"
-msgstr "Textlänge"
-
-#: ../gtk/gtkentry.c:911
+#: ../gtk/gtkentry.c:918
 msgid "Length of the text currently in the entry"
 msgstr "Länge des Inhalts des Feldes"
 
-#: ../gtk/gtkentry.c:926
+#: ../gtk/gtkentry.c:933
 msgid "Invisible character set"
 msgstr "Unsichtbarer Zeichensatz"
 
-#: ../gtk/gtkentry.c:927
+#: ../gtk/gtkentry.c:934
 msgid "Whether the invisible character has been set"
 msgstr "Legt fest, ob das unsichtbare Zeichen aktiviert ist"
 
-#: ../gtk/gtkentry.c:945
+#: ../gtk/gtkentry.c:952
 msgid "Caps Lock warning"
 msgstr "Feststelltasten-Warnung"
 
-#: ../gtk/gtkentry.c:946
+#: ../gtk/gtkentry.c:953
 msgid "Whether password entries will show a warning when Caps Lock is on"
 msgstr ""
 "Legt fest, ob Passwortfelder eine Warnung anzeigen, wenn die Feststelltaste "
 "aktiviert ist"
 
-#: ../gtk/gtkentry.c:960
+#: ../gtk/gtkentry.c:967
 msgid "Progress Fraction"
 msgstr "Fortschritts-Anteil"
 
-#: ../gtk/gtkentry.c:961
+#: ../gtk/gtkentry.c:968
 msgid "The current fraction of the task that's been completed"
 msgstr "Der fertiggestellte Anteil an der gesamten Arbeit"
 
-#: ../gtk/gtkentry.c:978
+#: ../gtk/gtkentry.c:985
 msgid "Progress Pulse Step"
 msgstr "Fortschrittspuls-Schrittweite"
 
-#: ../gtk/gtkentry.c:979
+#: ../gtk/gtkentry.c:986
 msgid ""
 "The fraction of total entry width to move the progress bouncing block for "
 "each call to gtk_entry_progress_pulse()"
@@ -2695,181 +2707,189 @@ msgstr ""
 "Der Anteil an der gesamten Breite, um die sich der hüpfende Balken bei jedem "
 "Aufruf von gtk_entry_progress_pulse() bewegt"
 
-#: ../gtk/gtkentry.c:995
+#: ../gtk/gtkentry.c:1002
+msgid "Placeholder text"
+msgstr "Platzhaltertext"
+
+#: ../gtk/gtkentry.c:1003
+msgid "Show text in the entry when it's empty and unfocused"
+msgstr "Text im Eintrag anzeigen, wenn er leer und nicht fokussiert ist"
+
+#: ../gtk/gtkentry.c:1017
 msgid "Primary pixbuf"
 msgstr "Primärer Pixbuf"
 
-#: ../gtk/gtkentry.c:996
+#: ../gtk/gtkentry.c:1018
 msgid "Primary pixbuf for the entry"
 msgstr "Der primäre Pixbuf des Textfeldes"
 
-#: ../gtk/gtkentry.c:1010
+#: ../gtk/gtkentry.c:1032
 msgid "Secondary pixbuf"
 msgstr "Sekundärer Pixbux"
 
-#: ../gtk/gtkentry.c:1011
+#: ../gtk/gtkentry.c:1033
 msgid "Secondary pixbuf for the entry"
 msgstr "Sekundärer Pixbux des Textfeldes"
 
-#: ../gtk/gtkentry.c:1025
+#: ../gtk/gtkentry.c:1047
 msgid "Primary stock ID"
 msgstr "Primäre Repertoire-ID"
 
-#: ../gtk/gtkentry.c:1026
+#: ../gtk/gtkentry.c:1048
 msgid "Stock ID for primary icon"
 msgstr "Repertoire-ID des primären Symbols"
 
-#: ../gtk/gtkentry.c:1040
+#: ../gtk/gtkentry.c:1062
 msgid "Secondary stock ID"
 msgstr "Sekundäre Repertoire-ID"
 
-#: ../gtk/gtkentry.c:1041
+#: ../gtk/gtkentry.c:1063
 msgid "Stock ID for secondary icon"
 msgstr "Repertoire-ID des sekundären Symbols"
 
-#: ../gtk/gtkentry.c:1055
+#: ../gtk/gtkentry.c:1077
 msgid "Primary icon name"
 msgstr "Primärer der Symbolnamen"
 
-#: ../gtk/gtkentry.c:1056
+#: ../gtk/gtkentry.c:1078
 msgid "Icon name for primary icon"
 msgstr "Symbolname des primären Symbols"
 
-#: ../gtk/gtkentry.c:1070
+#: ../gtk/gtkentry.c:1092
 msgid "Secondary icon name"
 msgstr "Sekundärer Symbolname"
 
-#: ../gtk/gtkentry.c:1071
+#: ../gtk/gtkentry.c:1093
 msgid "Icon name for secondary icon"
 msgstr "Symbolname des sekundären Symbols"
 
-#: ../gtk/gtkentry.c:1085
+#: ../gtk/gtkentry.c:1107
 msgid "Primary GIcon"
 msgstr "Primäres GIcon"
 
-#: ../gtk/gtkentry.c:1086
+#: ../gtk/gtkentry.c:1108
 msgid "GIcon for primary icon"
 msgstr "GIcon des primären Symbols"
 
-#: ../gtk/gtkentry.c:1100
+#: ../gtk/gtkentry.c:1122
 msgid "Secondary GIcon"
 msgstr "Sekundäres GIcon"
 
-#: ../gtk/gtkentry.c:1101
+#: ../gtk/gtkentry.c:1123
 msgid "GIcon for secondary icon"
 msgstr "GIcon für sekundäres Symbol"
 
-#: ../gtk/gtkentry.c:1115
+#: ../gtk/gtkentry.c:1137
 msgid "Primary storage type"
 msgstr "Primäre Speicherform"
 
-#: ../gtk/gtkentry.c:1116
+#: ../gtk/gtkentry.c:1138
 msgid "The representation being used for primary icon"
 msgstr "Die für das primäre Symbol verwendete Speicherform"
 
-#: ../gtk/gtkentry.c:1131
+#: ../gtk/gtkentry.c:1153
 msgid "Secondary storage type"
 msgstr "Sekundäre Speicherform"
 
-#: ../gtk/gtkentry.c:1132
+#: ../gtk/gtkentry.c:1154
 msgid "The representation being used for secondary icon"
 msgstr "Die für das sekundäre Symbol verwendete Speicherform"
 
-#: ../gtk/gtkentry.c:1153
+#: ../gtk/gtkentry.c:1175
 msgid "Primary icon activatable"
 msgstr "Primäres Symbol aktivierbar"
 
-#: ../gtk/gtkentry.c:1154
+#: ../gtk/gtkentry.c:1176
 msgid "Whether the primary icon is activatable"
 msgstr "Legt fest, ob das primäre Symbol aktivierbar ist"
 
-#: ../gtk/gtkentry.c:1174
+#: ../gtk/gtkentry.c:1196
 msgid "Secondary icon activatable"
 msgstr "Sekundäres Symbol aktivierbar"
 
-#: ../gtk/gtkentry.c:1175
+#: ../gtk/gtkentry.c:1197
 msgid "Whether the secondary icon is activatable"
 msgstr "Legt fest, ob das sekundäre Symbol aktivierbar ist"
 
 # CHECK - leicht reagierend? sensibel?
-#: ../gtk/gtkentry.c:1197
+#: ../gtk/gtkentry.c:1219
 msgid "Primary icon sensitive"
 msgstr "Primäres Symbol sensibel darstellen"
 
-#: ../gtk/gtkentry.c:1198
+#: ../gtk/gtkentry.c:1220
 msgid "Whether the primary icon is sensitive"
 msgstr "Legt fest, ob das primäre Symbol sensibel ist"
 
-#: ../gtk/gtkentry.c:1219
+#: ../gtk/gtkentry.c:1241
 msgid "Secondary icon sensitive"
 msgstr "Sekundäres Symbol sensibel darstellen"
 
-#: ../gtk/gtkentry.c:1220
+#: ../gtk/gtkentry.c:1242
 msgid "Whether the secondary icon is sensitive"
 msgstr "Legt fest, ob das sekundäre Symbol sensibel ist"
 
 # CHECK - leicht reagierend? sensibel?
-#: ../gtk/gtkentry.c:1236
+#: ../gtk/gtkentry.c:1258
 msgid "Primary icon tooltip text"
 msgstr "Minihilfentext für primäres Symbol"
 
-#: ../gtk/gtkentry.c:1237 ../gtk/gtkentry.c:1273
+#: ../gtk/gtkentry.c:1259 ../gtk/gtkentry.c:1295
 msgid "The contents of the tooltip on the primary icon"
 msgstr "Der Inhalt der Minihilfe des primären Symbols"
 
-#: ../gtk/gtkentry.c:1253
+#: ../gtk/gtkentry.c:1275
 msgid "Secondary icon tooltip text"
 msgstr "Minihilfentext für sekundäres Symbol"
 
-#: ../gtk/gtkentry.c:1254 ../gtk/gtkentry.c:1292
+#: ../gtk/gtkentry.c:1276 ../gtk/gtkentry.c:1314
 msgid "The contents of the tooltip on the secondary icon"
 msgstr "Der Inhalt der Minihilfe des sekundären Symbols"
 
-#: ../gtk/gtkentry.c:1272
+#: ../gtk/gtkentry.c:1294
 msgid "Primary icon tooltip markup"
 msgstr "Minihilfen-Markup für primäres Symbol"
 
-#: ../gtk/gtkentry.c:1291
+#: ../gtk/gtkentry.c:1313
 msgid "Secondary icon tooltip markup"
 msgstr "Minihilfen-Markup für sekundäres Symbol"
 
-#: ../gtk/gtkentry.c:1311 ../gtk/gtktextview.c:792
+#: ../gtk/gtkentry.c:1333 ../gtk/gtktextview.c:794
 msgid "IM module"
 msgstr "IM-Modul"
 
-#: ../gtk/gtkentry.c:1312 ../gtk/gtktextview.c:793
+#: ../gtk/gtkentry.c:1334 ../gtk/gtktextview.c:795
 msgid "Which IM module should be used"
 msgstr "Legt fest, welches IM-Modul verwendet wird"
 
-#: ../gtk/gtkentry.c:1326
+#: ../gtk/gtkentry.c:1348
+msgid "Completion"
+msgstr "Vervollständigung"
+
+#: ../gtk/gtkentry.c:1349
+msgid "The auxiliary completion object"
+msgstr "Das Hilfsobjekt zur Vervollständigung"
+
+#: ../gtk/gtkentry.c:1363
 msgid "Icon Prelight"
 msgstr "Symbol-Hervorhebung"
 
-#: ../gtk/gtkentry.c:1327
+#: ../gtk/gtkentry.c:1364
 msgid "Whether activatable icons should prelight when hovered"
 msgstr ""
 "Legt fest, ob aktivierbare Symbole beim Berühren hervorgehoben werden sollen"
 
-#: ../gtk/gtkentry.c:1340
+#: ../gtk/gtkentry.c:1377
 msgid "Progress Border"
 msgstr "Rand um Fortschrittsbalken"
 
-#: ../gtk/gtkentry.c:1341
+#: ../gtk/gtkentry.c:1378
 msgid "Border around the progress bar"
 msgstr "Um den Fortschrittsbalken anzuzeigender Rand"
 
-#: ../gtk/gtkentry.c:1833
+#: ../gtk/gtkentry.c:1870
 msgid "Border between text and frame."
 msgstr "Rand zwischen Text und Rahmen."
 
-#: ../gtk/gtkentrybuffer.c:353
-msgid "The contents of the buffer"
-msgstr "Der Inhalt des Puffers"
-
-#: ../gtk/gtkentrybuffer.c:368
-msgid "Length of the text currently in the buffer"
-msgstr "Länge des aktuellen Textes im Puffer"
-
 #: ../gtk/gtkentrycompletion.c:320
 msgid "Completion Model"
 msgstr "Vervollständigungsmodell"
@@ -2886,7 +2906,7 @@ msgstr "Minimale Schlüssellänge"
 msgid "Minimum length of the search key in order to look up matches"
 msgstr "Die minimale Länge des Suchschlüssels, damit nach Treffern gesucht wird"
 
-#: ../gtk/gtkentrycompletion.c:344 ../gtk/gtkiconview.c:566
+#: ../gtk/gtkentrycompletion.c:344 ../gtk/gtkiconview.c:564
 msgid "Text column"
 msgstr "Textspalte"
 
@@ -2965,78 +2985,90 @@ msgstr ""
 "Befindet sich das ereigniseinfangende Fenster des Ereignisfelds oberhalb des "
 "Fensters des Kind-Widgets? Andernfalls befindet es sich darunter."
 
-#: ../gtk/gtkexpander.c:279
+#: ../gtk/gtkexpander.c:282
 msgid "Expanded"
 msgstr "Ausgeklappt"
 
-#: ../gtk/gtkexpander.c:280
+#: ../gtk/gtkexpander.c:283
 msgid "Whether the expander has been opened to reveal the child widget"
 msgstr "Wurde der Ausklapper geöffnet, um das Kind-Widget anzuzeigen?"
 
-#: ../gtk/gtkexpander.c:288
+#: ../gtk/gtkexpander.c:291
 msgid "Text of the expander's label"
 msgstr "Der Text der Ausklapperbeschriftung"
 
-#: ../gtk/gtkexpander.c:303 ../gtk/gtklabel.c:581
+#: ../gtk/gtkexpander.c:306 ../gtk/gtklabel.c:743
 msgid "Use markup"
 msgstr "Markup verwenden"
 
-#: ../gtk/gtkexpander.c:304 ../gtk/gtklabel.c:582
+#: ../gtk/gtkexpander.c:307 ../gtk/gtklabel.c:744
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr ""
 "Der Text der Beschriftung enthält XML-Markup. Siehe pango_parse_markup()"
 
-#: ../gtk/gtkexpander.c:312
+#: ../gtk/gtkexpander.c:315
 msgid "Space to put between the label and the child"
 msgstr "Freiraum zwischen dem Kind und dessen Nachbarn in Pixel"
 
-#: ../gtk/gtkexpander.c:321 ../gtk/gtkframe.c:168 ../gtk/gtktoolbutton.c:215
-#: ../gtk/gtktoolitemgroup.c:1603
+#: ../gtk/gtkexpander.c:324 ../gtk/gtkframe.c:206 ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolitemgroup.c:1599
 msgid "Label widget"
 msgstr "Beschriftungs-Widget"
 
-#: ../gtk/gtkexpander.c:322
+#: ../gtk/gtkexpander.c:325
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Ein Widget, das anstatt der üblichen Ausklapperbeschriftung angezeigt werden "
 "soll"
 
-#: ../gtk/gtkexpander.c:329
+#: ../gtk/gtkexpander.c:332
 msgid "Label fill"
 msgstr "Füllung der Beschriftung"
 
-#: ../gtk/gtkexpander.c:330
+#: ../gtk/gtkexpander.c:333
 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:336 ../gtk/gtktoolitemgroup.c:1631
+#: ../gtk/gtkexpander.c:348
+msgid "Resize toplevel"
+msgstr "Größenänderungsmodus"
+
+#: ../gtk/gtkexpander.c:349
+msgid ""
+"Whether the expander will resize the toplevel window upon expanding and "
+"collapsing"
+msgstr ""
+"Legt fest, ob der Expander die Größe des Fensters der obersten Ebene beim "
+"Aus- und Einklappen anpasst"
+
+#: ../gtk/gtkexpander.c:355 ../gtk/gtktoolitemgroup.c:1627
 #: ../gtk/gtktreeview.c:1187
 msgid "Expander Size"
 msgstr "Ausklappergröße"
 
-#: ../gtk/gtkexpander.c:337 ../gtk/gtktoolitemgroup.c:1632
+#: ../gtk/gtkexpander.c:356 ../gtk/gtktoolitemgroup.c:1628
 #: ../gtk/gtktreeview.c:1188
 msgid "Size of the expander arrow"
 msgstr "Größe des Ausklapppfeils"
 
-#: ../gtk/gtkexpander.c:346
+#: ../gtk/gtkexpander.c:365
 msgid "Spacing around expander arrow"
 msgstr "Freiraum um Ausklapppfeil"
 
-#: ../gtk/gtkfilechooserbutton.c:366
+#: ../gtk/gtkfilechooserbutton.c:409
 msgid "Dialog"
 msgstr "Dialog"
 
-#: ../gtk/gtkfilechooserbutton.c:367
+#: ../gtk/gtkfilechooserbutton.c:410
 msgid "The file chooser dialog to use."
 msgstr "Der Dateiwähler, der verwendet werden soll."
 
-#: ../gtk/gtkfilechooserbutton.c:398
+#: ../gtk/gtkfilechooserbutton.c:441
 msgid "The title of the file chooser dialog."
 msgstr "Der Titel des Dateiwählers."
 
-#: ../gtk/gtkfilechooserbutton.c:412
+#: ../gtk/gtkfilechooserbutton.c:455
 msgid "The desired width of the button widget, in characters."
 msgstr "Die gewünschte Breite des Knopfes in Zeichen"
 
@@ -3143,7 +3175,7 @@ msgstr ""
 "Legt fest, ob der Dateiauswahldialog, der nicht im Öffnen-Modus ist, das "
 "Erstellen von Ordnern erlaubt."
 
-#: ../gtk/gtkfixed.c:152 ../gtk/gtklayout.c:634
+#: ../gtk/gtkfixed.c:152 ../gtk/gtklayout.c:634 ../gtk/gtktreeviewcolumn.c:264
 msgid "X position"
 msgstr "X-Position"
 
@@ -3159,185 +3191,194 @@ msgstr "Y-Position"
 msgid "Y position of child widget"
 msgstr "Die vertikale Position des Kind-Widgets"
 
-#: ../gtk/gtkfontbutton.c:141
-msgid "The title of the font selection dialog"
-msgstr "Der Titel des Schriftwahlfensters"
+#: ../gtk/gtkfontbutton.c:151
+msgid "The title of the font chooser dialog"
+msgstr "Der Titel des Schriftwählerdialogs"
 
-#: ../gtk/gtkfontbutton.c:156 ../gtk/gtkfontsel.c:219
+#: ../gtk/gtkfontbutton.c:166 ../gtk/gtkfontchooser.c:189
+#: ../gtk/gtkfontsel.c:244
 msgid "Font name"
 msgstr "Schriftname"
 
-#: ../gtk/gtkfontbutton.c:157
+#: ../gtk/gtkfontbutton.c:167
 msgid "The name of the selected font"
 msgstr "Der Name der gewählten Schrift"
 
-#: ../gtk/gtkfontbutton.c:158
+#: ../gtk/gtkfontbutton.c:168
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:173
+#: ../gtk/gtkfontbutton.c:183
 msgid "Use font in label"
 msgstr "Schrift in Beschriftung verwenden"
 
-#: ../gtk/gtkfontbutton.c:174
+#: ../gtk/gtkfontbutton.c:184
 msgid "Whether the label is drawn in the selected font"
 msgstr "Soll der Beschriftungstext in der gewählten Schrift dargestellt werden?"
 
-#: ../gtk/gtkfontbutton.c:189
+#: ../gtk/gtkfontbutton.c:199
 msgid "Use size in label"
 msgstr "Größe in Beschriftung verwenden"
 
-#: ../gtk/gtkfontbutton.c:190
+#: ../gtk/gtkfontbutton.c:200
 msgid "Whether the label is drawn with the selected font size"
 msgstr ""
 "Soll der Beschriftungstext in der gewählten Schriftgröße dargestellt werden?"
 
-#: ../gtk/gtkfontbutton.c:206
+#: ../gtk/gtkfontbutton.c:216
 msgid "Show style"
 msgstr "Stil anzeigen"
 
-#: ../gtk/gtkfontbutton.c:207
+#: ../gtk/gtkfontbutton.c:217
 msgid "Whether the selected font style is shown in the label"
 msgstr "Soll der Beschriftungstext im gewählten Schriftstil dargestellt werden?"
 
-#: ../gtk/gtkfontbutton.c:222
+#: ../gtk/gtkfontbutton.c:232
 msgid "Show size"
 msgstr "Größe anzeigen"
 
-#: ../gtk/gtkfontbutton.c:223
+#: ../gtk/gtkfontbutton.c:233
 msgid "Whether selected font size is shown in the label"
 msgstr "Soll die gewählte Schriftgröße in der Beschriftung angezeigt werden?"
 
-#: ../gtk/gtkfontsel.c:220
+#: ../gtk/gtkfontchooser.c:190 ../gtk/gtkfontsel.c:245
 msgid "The string that represents this font"
 msgstr "Die Zeichenkette, die diese Schrift bezeichnet"
 
-#: ../gtk/gtkfontsel.c:226
+#: ../gtk/gtkfontchooser.c:196 ../gtk/gtkfontsel.c:251
 msgid "Preview text"
 msgstr "Vorschautext"
 
-#: ../gtk/gtkfontsel.c:227
+#: ../gtk/gtkfontchooser.c:197 ../gtk/gtkfontsel.c:252
 msgid "The text to display in order to demonstrate the selected font"
 msgstr ""
 "Der Text, der zur Demonstration der gewählten Schrift angezeigt werden soll"
 
-#: ../gtk/gtkframe.c:134
+#: ../gtk/gtkfontchooser.c:204
+msgid "Show preview text entry"
+msgstr "Vorschautext anzeigen"
+
+#: ../gtk/gtkfontchooser.c:205
+msgid "Whether the preview text entry is shown or not"
+msgstr "Legt fest, ob der Vorschautext angezeigt wird oder nicht"
+
+#: ../gtk/gtkframe.c:172
 msgid "Text of the frame's label"
 msgstr "Der Text der Rahmenbeschriftung"
 
-#: ../gtk/gtkframe.c:141
+#: ../gtk/gtkframe.c:179
 msgid "Label xalign"
 msgstr "X-Ausrichtung der Beschriftung"
 
-#: ../gtk/gtkframe.c:142
+#: ../gtk/gtkframe.c:180
 msgid "The horizontal alignment of the label"
 msgstr "Die horizontale Ausrichtung der Beschriftung"
 
-#: ../gtk/gtkframe.c:150
+#: ../gtk/gtkframe.c:188
 msgid "Label yalign"
 msgstr "Y-Ausrichtung der Beschriftung"
 
-#: ../gtk/gtkframe.c:151
+#: ../gtk/gtkframe.c:189
 msgid "The vertical alignment of the label"
 msgstr "Die vertikale Ausrichtung der Beschriftung"
 
-#: ../gtk/gtkframe.c:159
+#: ../gtk/gtkframe.c:197
 msgid "Frame shadow"
 msgstr "Rahmenschatten"
 
-#: ../gtk/gtkframe.c:160
+#: ../gtk/gtkframe.c:198
 msgid "Appearance of the frame border"
 msgstr "Das Aussehen des Rahmenrandes"
 
-#: ../gtk/gtkframe.c:169
+#: ../gtk/gtkframe.c:207
 msgid "A widget to display in place of the usual frame label"
 msgstr ""
 "Ein Widget, das anstatt der üblichen Rahmenbeschriftung angezeigt werden soll"
 
-#: ../gtk/gtkgrid.c:1264 ../gtk/gtktable.c:175
+#: ../gtk/gtkgrid.c:1298 ../gtk/gtktable.c:209
 msgid "Row spacing"
 msgstr "Zeilenabstand"
 
-#: ../gtk/gtkgrid.c:1265 ../gtk/gtktable.c:176
+#: ../gtk/gtkgrid.c:1299 ../gtk/gtktable.c:210
 msgid "The amount of space between two consecutive rows"
 msgstr "Der Abstand zwischen zwei aufeinander folgenden Zeilen"
 
-#: ../gtk/gtkgrid.c:1271 ../gtk/gtktable.c:184
+#: ../gtk/gtkgrid.c:1305 ../gtk/gtktable.c:218
 msgid "Column spacing"
 msgstr "Spaltenabstand"
 
-#: ../gtk/gtkgrid.c:1272 ../gtk/gtktable.c:185
+#: ../gtk/gtkgrid.c:1306 ../gtk/gtktable.c:219
 msgid "The amount of space between two consecutive columns"
 msgstr "Der Abstand zwischen zwei aufeinander folgenden Spalten"
 
-#: ../gtk/gtkgrid.c:1278
+#: ../gtk/gtkgrid.c:1312
 msgid "Row Homogeneous"
 msgstr "Gleichmäßige Zeile"
 
-#: ../gtk/gtkgrid.c:1279
+#: ../gtk/gtkgrid.c:1313
 msgid "If TRUE, the rows are all the same height"
 msgstr "Falls WAHR, sind die Tabellenzeilen alle gleich hoch"
 
-#: ../gtk/gtkgrid.c:1285
+#: ../gtk/gtkgrid.c:1319
 msgid "Column Homogeneous"
 msgstr "Gleichmäßige Spalte"
 
-#: ../gtk/gtkgrid.c:1286
+#: ../gtk/gtkgrid.c:1320
 msgid "If TRUE, the columns are all the same width"
 msgstr "Falls WAHR, sind die Tabellenspalten alle gleich breit"
 
-#: ../gtk/gtkgrid.c:1292 ../gtk/gtktable.c:201
+#: ../gtk/gtkgrid.c:1326 ../gtk/gtktable.c:235
 msgid "Left attachment"
 msgstr "Links anhängen"
 
-#: ../gtk/gtkgrid.c:1293 ../gtk/gtkmenu.c:759 ../gtk/gtktable.c:202
+#: ../gtk/gtkgrid.c:1327 ../gtk/gtkmenu.c:761 ../gtk/gtktable.c:236
 msgid "The column number to attach the left side of the child to"
 msgstr ""
 "Die Spaltennummer, an die die linke Seite des Kinds angehängt werden soll"
 
-#: ../gtk/gtkgrid.c:1299 ../gtk/gtktable.c:215
+#: ../gtk/gtkgrid.c:1333 ../gtk/gtktable.c:249
 msgid "Top attachment"
 msgstr "Oben anhängen"
 
-#: ../gtk/gtkgrid.c:1300
+#: ../gtk/gtkgrid.c:1334
 msgid "The row number to attach the top side of a child widget to"
 msgstr ""
 "Die Spaltennummer, an die die obere Seite eines Kind-Widgets angehängt werden "
 "soll"
 
-#: ../gtk/gtkgrid.c:1306 ../gtk/gtklayout.c:660 ../gtk/gtktreeviewcolumn.c:262
+#: ../gtk/gtkgrid.c:1340 ../gtk/gtklayout.c:660 ../gtk/gtktreeviewcolumn.c:274
 msgid "Width"
 msgstr "Breite"
 
-#: ../gtk/gtkgrid.c:1307
+#: ../gtk/gtkgrid.c:1341
 msgid "The number of columns that a child spans"
 msgstr "Die Anzahl der Spalten, über die sich ein Kindelement erstreckt"
 
-#: ../gtk/gtkgrid.c:1313 ../gtk/gtklayout.c:669
+#: ../gtk/gtkgrid.c:1347 ../gtk/gtklayout.c:669
 msgid "Height"
 msgstr "Höhe"
 
-#: ../gtk/gtkgrid.c:1314
+#: ../gtk/gtkgrid.c:1348
 msgid "The number of rows that a child spans"
 msgstr "Die Anzahl der Zeilen, über die sich ein Kindelement erstreckt"
 
-#: ../gtk/gtkhandlebox.c:191
+#: ../gtk/gtkhandlebox.c:219
 msgid "Appearance of the shadow that surrounds the container"
 msgstr "Aussehen des Schattens, der den Container umgibt"
 
-#: ../gtk/gtkhandlebox.c:199
+#: ../gtk/gtkhandlebox.c:227
 msgid "Handle position"
 msgstr "Griffposition"
 
-#: ../gtk/gtkhandlebox.c:200
+#: ../gtk/gtkhandlebox.c:228
 msgid "Position of the handle relative to the child widget"
 msgstr "Position des Griffs bezüglich des Kind-Widgets"
 
-#: ../gtk/gtkhandlebox.c:208
+#: ../gtk/gtkhandlebox.c:236
 msgid "Snap edge"
 msgstr "Einrastende Seite"
 
-#: ../gtk/gtkhandlebox.c:209
+#: ../gtk/gtkhandlebox.c:237
 msgid ""
 "Side of the handlebox that's lined up with the docking point to dock the "
 "handlebox"
@@ -3345,11 +3386,11 @@ msgstr ""
 "Die Seite der Griffbox, die in den Rastpunkt eingefädelt wird, um die "
 "Griffbox einzurasten"
 
-#: ../gtk/gtkhandlebox.c:217
+#: ../gtk/gtkhandlebox.c:245
 msgid "Snap edge set"
 msgstr "Einrastende Seite einstellen"
 
-#: ../gtk/gtkhandlebox.c:218
+#: ../gtk/gtkhandlebox.c:246
 msgid ""
 "Whether to use the value from the snap_edge property or a value derived from "
 "handle_position"
@@ -3357,11 +3398,11 @@ msgstr ""
 "Soll der Wert der Eigenschaft »snap_edge« oder ein von »handle_position« "
 "abgeleiteter Wert verwendet werden?"
 
-#: ../gtk/gtkhandlebox.c:225
+#: ../gtk/gtkhandlebox.c:253
 msgid "Child Detached"
 msgstr "Kind abgetrennt"
 
-#: ../gtk/gtkhandlebox.c:226
+#: ../gtk/gtkhandlebox.c:254
 msgid ""
 "A boolean value indicating whether the handlebox's child is attached or "
 "detached."
@@ -3369,277 +3410,277 @@ msgstr ""
 "Ein Boolescher Wert der angibt, ob das Kind-Element der Griffbox abgetrennt "
 "wurde."
 
-#: ../gtk/gtkiconview.c:529
+#: ../gtk/gtkiconview.c:527 ../gtk/gtktreeselection.c:131
 msgid "Selection mode"
 msgstr "Markierungsmodus"
 
-#: ../gtk/gtkiconview.c:530
+#: ../gtk/gtkiconview.c:528
 msgid "The selection mode"
 msgstr "Der Markierungsmodus"
 
-#: ../gtk/gtkiconview.c:548
+#: ../gtk/gtkiconview.c:546
 msgid "Pixbuf column"
 msgstr "Pixbuf-Spalte"
 
-#: ../gtk/gtkiconview.c:549
+#: ../gtk/gtkiconview.c:547
 msgid "Model column used to retrieve the icon pixbuf from"
 msgstr "Spalte des Modells, der der Symbol-Pixbuf entnommen wird"
 
-#: ../gtk/gtkiconview.c:567
+#: ../gtk/gtkiconview.c:565
 msgid "Model column used to retrieve the text from"
 msgstr "Spalte des Modells, der der Text entnommen wird"
 
-#: ../gtk/gtkiconview.c:586
+#: ../gtk/gtkiconview.c:584
 msgid "Markup column"
 msgstr "Markup-Spalte"
 
-#: ../gtk/gtkiconview.c:587
+#: ../gtk/gtkiconview.c:585
 msgid "Model column used to retrieve the text if using Pango markup"
 msgstr ""
 "Spalte des Modells, der der Text entnommen wird, falls Pango-Markup benutzt "
 "wird"
 
-#: ../gtk/gtkiconview.c:594
+#: ../gtk/gtkiconview.c:592
 msgid "Icon View Model"
 msgstr "Icon View-Modell"
 
-#: ../gtk/gtkiconview.c:595
+#: ../gtk/gtkiconview.c:593
 msgid "The model for the icon view"
 msgstr "Das Modell für die Icon View"
 
-#: ../gtk/gtkiconview.c:611
+#: ../gtk/gtkiconview.c:609
 msgid "Number of columns"
 msgstr "Spaltenanzahl"
 
-#: ../gtk/gtkiconview.c:612
+#: ../gtk/gtkiconview.c:610
 msgid "Number of columns to display"
 msgstr "Die Anzahl der anzuzeigenden Spalten"
 
-#: ../gtk/gtkiconview.c:629
+#: ../gtk/gtkiconview.c:627
 msgid "Width for each item"
 msgstr "Die Breite für jeden Eintrag"
 
-#: ../gtk/gtkiconview.c:630
+#: ../gtk/gtkiconview.c:628
 msgid "The width used for each item"
 msgstr "Die verwendete Breite für jeden Eintrag"
 
-#: ../gtk/gtkiconview.c:646
+#: ../gtk/gtkiconview.c:644
 msgid "Space which is inserted between cells of an item"
 msgstr "Der Platz, der zwischen den Zellen eines Eintrags eingefügt wird"
 
-#: ../gtk/gtkiconview.c:661
+#: ../gtk/gtkiconview.c:659
 msgid "Row Spacing"
 msgstr "Zeilenabstand"
 
-#: ../gtk/gtkiconview.c:662
+#: ../gtk/gtkiconview.c:660
 msgid "Space which is inserted between grid rows"
 msgstr "Zwischen den Gitterzeilen eingefügter Platz"
 
-#: ../gtk/gtkiconview.c:677
+#: ../gtk/gtkiconview.c:675
 msgid "Column Spacing"
 msgstr "Spaltenabstand"
 
-#: ../gtk/gtkiconview.c:678
+#: ../gtk/gtkiconview.c:676
 msgid "Space which is inserted between grid columns"
 msgstr "Zwischen den Gitterspalten eingefügter Platz"
 
-#: ../gtk/gtkiconview.c:693
+#: ../gtk/gtkiconview.c:691
 msgid "Margin"
 msgstr "Rand"
 
-#: ../gtk/gtkiconview.c:694
+#: ../gtk/gtkiconview.c:692
 msgid "Space which is inserted at the edges of the icon view"
 msgstr "Der Platz, der an den Rändern der Symbolansicht eingefügt wird"
 
-#: ../gtk/gtkiconview.c:709
+#: ../gtk/gtkiconview.c:707
 msgid "Item Orientation"
 msgstr "Objektausrichtung"
 
-#: ../gtk/gtkiconview.c:710
+#: ../gtk/gtkiconview.c:708
 msgid "How the text and icon of each item are positioned relative to each other"
 msgstr ""
 "Legt fest, wie Text und Symbol von jedem Element relativ zueinander "
 "positioniert werden"
 
-#: ../gtk/gtkiconview.c:726 ../gtk/gtktreeview.c:1022
-#: ../gtk/gtktreeviewcolumn.c:362
+#: ../gtk/gtkiconview.c:724 ../gtk/gtktreeview.c:1022
+#: ../gtk/gtktreeviewcolumn.c:374
 msgid "Reorderable"
 msgstr "Umstellbar"
 
-#: ../gtk/gtkiconview.c:727 ../gtk/gtktreeview.c:1023
+#: ../gtk/gtkiconview.c:725 ../gtk/gtktreeview.c:1023
 msgid "View is reorderable"
 msgstr "Die Ansicht kann umsortiert werden"
 
-#: ../gtk/gtkiconview.c:734 ../gtk/gtktreeview.c:1173
+#: ../gtk/gtkiconview.c:732 ../gtk/gtktreeview.c:1173
 msgid "Tooltip Column"
 msgstr "Minihilfe-Spalte"
 
 # CHECK - Spalte oder Modell, wer »enthält«?
-#: ../gtk/gtkiconview.c:735
+#: ../gtk/gtkiconview.c:733
 msgid "The column in the model containing the tooltip texts for the items"
 msgstr "Die Spalte des Modells, das die Minihilfentexte der Objekte enthält."
 
 # Padding → Auffüllung ist ein Begriff aus der Audioverarbeitung (mp3)
-#: ../gtk/gtkiconview.c:752
+#: ../gtk/gtkiconview.c:750
 msgid "Item Padding"
 msgstr "Objektauffüllung"
 
-#: ../gtk/gtkiconview.c:753
+#: ../gtk/gtkiconview.c:751
 msgid "Padding around icon view items"
 msgstr "Auffüllung um Objekte in der Symbolansicht"
 
-#: ../gtk/gtkiconview.c:784
+#: ../gtk/gtkiconview.c:782
 msgid "Selection Box Color"
 msgstr "Farbe der Markierung"
 
-#: ../gtk/gtkiconview.c:785
+#: ../gtk/gtkiconview.c:783
 msgid "Color of the selection box"
 msgstr "Farbe der Auswahlbox"
 
-#: ../gtk/gtkiconview.c:791
+#: ../gtk/gtkiconview.c:789
 msgid "Selection Box Alpha"
 msgstr "Alpha der Markierung"
 
-#: ../gtk/gtkiconview.c:792
+#: ../gtk/gtkiconview.c:790
 msgid "Opacity of the selection box"
 msgstr "Sichtbarkeit der Auswahlbox"
 
-#: ../gtk/gtkimage.c:236 ../gtk/gtkstatusicon.c:205
+#: ../gtk/gtkimage.c:237 ../gtk/gtkstatusicon.c:235
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtk/gtkimage.c:237 ../gtk/gtkstatusicon.c:206
+#: ../gtk/gtkimage.c:238 ../gtk/gtkstatusicon.c:236
 msgid "A GdkPixbuf to display"
 msgstr "Ein anzuzeigender GdkPixbuf"
 
-#: ../gtk/gtkimage.c:244 ../gtk/gtkrecentmanager.c:294
-#: ../gtk/gtkstatusicon.c:213
+#: ../gtk/gtkimage.c:245 ../gtk/gtkrecentmanager.c:294
+#: ../gtk/gtkstatusicon.c:243
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../gtk/gtkimage.c:245 ../gtk/gtkstatusicon.c:214
+#: ../gtk/gtkimage.c:246 ../gtk/gtkstatusicon.c:244
 msgid "Filename to load and display"
 msgstr "Name der zu ladenden und anzuzeigenden Datei"
 
-#: ../gtk/gtkimage.c:254 ../gtk/gtkstatusicon.c:222
+#: ../gtk/gtkimage.c:255 ../gtk/gtkstatusicon.c:252
 msgid "Stock ID for a stock image to display"
 msgstr "Repertoire-Kennung eines anzuzeigendes Repertoire-Symbols"
 
-#: ../gtk/gtkimage.c:261
+#: ../gtk/gtkimage.c:262
 msgid "Icon set"
 msgstr "Symbolsatz"
 
-#: ../gtk/gtkimage.c:262
+#: ../gtk/gtkimage.c:263
 msgid "Icon set to display"
 msgstr "Anzuzeigender Symbolsatz"
 
-#: ../gtk/gtkimage.c:269 ../gtk/gtkscalebutton.c:227 ../gtk/gtktoolbar.c:518
-#: ../gtk/gtktoolpalette.c:1039
+#: ../gtk/gtkimage.c:270 ../gtk/gtkscalebutton.c:228 ../gtk/gtktoolbar.c:530
+#: ../gtk/gtktoolpalette.c:1008
 msgid "Icon size"
 msgstr "Symbolgröße"
 
-#: ../gtk/gtkimage.c:270
+#: ../gtk/gtkimage.c:271
 msgid "Symbolic size to use for stock icon, icon set or named icon"
 msgstr ""
 "Die für ein Repertoire-Symbol, Symbolsatz oder Symbolnamen zu verwendende "
 "Größe"
 
-#: ../gtk/gtkimage.c:286
+#: ../gtk/gtkimage.c:287
 msgid "Pixel size"
 msgstr "Pixel-Größe"
 
-#: ../gtk/gtkimage.c:287
+#: ../gtk/gtkimage.c:288
 msgid "Pixel size to use for named icon"
 msgstr "Die für einen Symbolnamen zu verwendende Größe"
 
-#: ../gtk/gtkimage.c:295
+#: ../gtk/gtkimage.c:296
 msgid "Animation"
 msgstr "Animation"
 
-#: ../gtk/gtkimage.c:296
+#: ../gtk/gtkimage.c:297
 msgid "GdkPixbufAnimation to display"
 msgstr "Die Anzuzeigende GdkPixbufAnimation"
 
-#: ../gtk/gtkimage.c:336 ../gtk/gtkstatusicon.c:253
+#: ../gtk/gtkimage.c:337 ../gtk/gtkstatusicon.c:283
 msgid "Storage type"
 msgstr "Speicherform"
 
-#: ../gtk/gtkimage.c:337 ../gtk/gtkstatusicon.c:254
+#: ../gtk/gtkimage.c:338 ../gtk/gtkstatusicon.c:284
 msgid "The representation being used for image data"
 msgstr "Die für die Bilddaten verwendete Darstellung"
 
-#: ../gtk/gtkimage.c:355
+#: ../gtk/gtkimage.c:356
 msgid "Use Fallback"
 msgstr "Ersatz verwenden"
 
-#: ../gtk/gtkimage.c:356
+#: ../gtk/gtkimage.c:357
 msgid "Whether to use icon names fallback"
 msgstr ""
 "Legt fest, ob ein Ersatz für den Namen des Symbols verwendet werden soll"
 
-#: ../gtk/gtkimagemenuitem.c:150
+#: ../gtk/gtkimagemenuitem.c:161
 msgid "Child widget to appear next to the menu text"
 msgstr "Das Kind-Widget, das neben dem Menütext erscheint"
 
-#: ../gtk/gtkimagemenuitem.c:165
+#: ../gtk/gtkimagemenuitem.c:176
 msgid "Whether to use the label text to create a stock menu item"
 msgstr ""
 "Legt fest, ob der Beschriftungstext verwendet werden soll, um einen Stock-"
 "Menüeintrag zu erstellen"
 
-#: ../gtk/gtkimagemenuitem.c:198 ../gtk/gtkmenu.c:601
+#: ../gtk/gtkimagemenuitem.c:209 ../gtk/gtkmenu.c:603
 msgid "Accel Group"
 msgstr "Tastenkürzelgruppe"
 
-#: ../gtk/gtkimagemenuitem.c:199
+#: ../gtk/gtkimagemenuitem.c:210
 msgid "The Accel Group to use for stock accelerator keys"
 msgstr "Die Tastenkürzelgruppe, die für Stock-Tastenkürzel verwendet wird"
 
-#: ../gtk/gtkinfobar.c:371 ../gtk/gtkmessagedialog.c:202
+#: ../gtk/gtkinfobar.c:372 ../gtk/gtkmessagedialog.c:204
 msgid "Message Type"
 msgstr "Nachrichtentyp"
 
-#: ../gtk/gtkinfobar.c:372 ../gtk/gtkmessagedialog.c:203
+#: ../gtk/gtkinfobar.c:373 ../gtk/gtkmessagedialog.c:205
 msgid "The type of message"
 msgstr "Der Typ der Nachricht"
 
-#: ../gtk/gtkinfobar.c:427
+#: ../gtk/gtkinfobar.c:428
 msgid "Width of border around the content area"
 msgstr "Die Breite des Rands um den Inhaltsbereich"
 
-#: ../gtk/gtkinfobar.c:444
+#: ../gtk/gtkinfobar.c:445
 msgid "Spacing between elements of the area"
 msgstr "Der Abstand zwischen Elementen des Bereichs"
 
-#: ../gtk/gtkinfobar.c:476
+#: ../gtk/gtkinfobar.c:477
 msgid "Width of border around the action area"
 msgstr "Die Breite des Rands um den Aktionsbereich"
 
-#: ../gtk/gtkinvisible.c:89 ../gtk/gtkmountoperation.c:175
-#: ../gtk/gtkstatusicon.c:272 ../gtk/gtkstylecontext.c:545
-#: ../gtk/gtkwindow.c:730
+#: ../gtk/gtkinvisible.c:103 ../gtk/gtkmountoperation.c:173
+#: ../gtk/gtkstatusicon.c:302 ../gtk/gtkstylecontext.c:432
+#: ../gtk/gtkwindow.c:765
 msgid "Screen"
 msgstr "Bildschirm"
 
-#: ../gtk/gtkinvisible.c:90 ../gtk/gtkwindow.c:731
+#: ../gtk/gtkinvisible.c:104 ../gtk/gtkwindow.c:766
 msgid "The screen where this window will be displayed"
 msgstr "Der Bildschirm, auf dem dieses Fenster angezeigt werden soll"
 
-#: ../gtk/gtklabel.c:568
+#: ../gtk/gtklabel.c:730
 msgid "The text of the label"
 msgstr "Der Text der Beschriftung"
 
-#: ../gtk/gtklabel.c:575
+#: ../gtk/gtklabel.c:737
 msgid "A list of style attributes to apply to the text of the label"
 msgstr ""
 "Eine Liste der Stilattribute, die auf den Beschriftungstext angewendet werden "
 "sollen"
 
-#: ../gtk/gtklabel.c:596 ../gtk/gtktexttag.c:353 ../gtk/gtktextview.c:701
+#: ../gtk/gtklabel.c:758 ../gtk/gtktexttag.c:386 ../gtk/gtktextview.c:703
 msgid "Justification"
 msgstr "Ausrichtung"
 
-#: ../gtk/gtklabel.c:597
+#: ../gtk/gtklabel.c:759
 msgid ""
 "The alignment of the lines in the text of the label relative to each other. "
 "This does NOT affect the alignment of the label within its allocation. See "
@@ -3649,11 +3690,11 @@ msgstr ""
 "NICHT die Ausrichtung der Beschriftung innerhalb des ihr zugewiesenen Raumes; "
 "siehe hierzu auch GtkMisc::xalign"
 
-#: ../gtk/gtklabel.c:605
+#: ../gtk/gtklabel.c:767
 msgid "Pattern"
 msgstr "Muster"
 
-#: ../gtk/gtklabel.c:606
+#: ../gtk/gtklabel.c:768
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
@@ -3661,49 +3702,49 @@ msgstr ""
 "Ein »_«-Zeichen in einer Zeichenkette führt dazu, dass das nachfolgende "
 "Zeichen im Text unterstrichen wird"
 
-#: ../gtk/gtklabel.c:613
+#: ../gtk/gtklabel.c:775
 msgid "Line wrap"
 msgstr "Zeilenumbruch"
 
-#: ../gtk/gtklabel.c:614
+#: ../gtk/gtklabel.c:776
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "Falls WAHR, Zeilen umbrechen, wenn der Text zu lang wird"
 
-#: ../gtk/gtklabel.c:629
+#: ../gtk/gtklabel.c:791
 msgid "Line wrap mode"
 msgstr "Zeilenumbruchmodus"
 
-#: ../gtk/gtklabel.c:630
+#: ../gtk/gtklabel.c:792
 msgid "If wrap is set, controls how linewrapping is done"
 msgstr "Legt fest, wie Zeilen umgebrochen werden"
 
-#: ../gtk/gtklabel.c:637
+#: ../gtk/gtklabel.c:799
 msgid "Selectable"
 msgstr "Markierbar"
 
-#: ../gtk/gtklabel.c:638
+#: ../gtk/gtklabel.c:800
 msgid "Whether the label text can be selected with the mouse"
 msgstr "Soll der Beschriftungstext mit der Maus markierbar sein?"
 
-#: ../gtk/gtklabel.c:644
+#: ../gtk/gtklabel.c:806
 msgid "Mnemonic key"
 msgstr "Tastaturkürzel"
 
-#: ../gtk/gtklabel.c:645
+#: ../gtk/gtklabel.c:807
 msgid "The mnemonic accelerator key for this label"
 msgstr "Das Tastaturkürzel für diese Beschriftung"
 
-#: ../gtk/gtklabel.c:653
+#: ../gtk/gtklabel.c:815
 msgid "Mnemonic widget"
 msgstr "Kürzel-Widget"
 
-#: ../gtk/gtklabel.c:654
+#: ../gtk/gtklabel.c:816
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr ""
 "Das Widget, das aktiviert werden soll, wenn das Tastaturkürzel der "
 "Beschriftung gedrückt wird"
 
-#: ../gtk/gtklabel.c:700
+#: ../gtk/gtklabel.c:862
 msgid ""
 "The preferred place to ellipsize the string, if the label does not have "
 "enough room to display the entire string"
@@ -3711,31 +3752,31 @@ msgstr ""
 "Der bevorzugte Bereich zur Auslassung in der Zeichenkette, falls die "
 "Beschriftung nicht genug Platz hat, um sie komplett anzuzeigen"
 
-#: ../gtk/gtklabel.c:741
+#: ../gtk/gtklabel.c:903
 msgid "Single Line Mode"
 msgstr "Einzelzeilen-Modus"
 
-#: ../gtk/gtklabel.c:742
+#: ../gtk/gtklabel.c:904
 msgid "Whether the label is in single line mode"
 msgstr "Soll der Beschriftungstext im Einzelzeilen-Modus dargestellt werden?"
 
-#: ../gtk/gtklabel.c:759
+#: ../gtk/gtklabel.c:921
 msgid "Angle"
 msgstr "Winkel"
 
-#: ../gtk/gtklabel.c:760
+#: ../gtk/gtklabel.c:922
 msgid "Angle at which the label is rotated"
 msgstr "Der Winkel um den die Beschriftung rotiert wird"
 
-#: ../gtk/gtklabel.c:782
+#: ../gtk/gtklabel.c:944
 msgid "The desired maximum width of the label, in characters"
 msgstr "Die gewünschte maximale Breite der Beschriftung, in Zeichen"
 
-#: ../gtk/gtklabel.c:800
+#: ../gtk/gtklabel.c:962
 msgid "Track visited links"
 msgstr "Besuchte Verweise mitverfolgen"
 
-#: ../gtk/gtklabel.c:801
+#: ../gtk/gtklabel.c:963
 msgid "Whether visited links should be tracked"
 msgstr "Sollen besuchte Verweise mitverfolgt werden?"
 
@@ -3763,393 +3804,445 @@ msgstr "Besucht"
 msgid "Whether this link has been visited."
 msgstr "Wurde dieser Verweis besucht?"
 
-#: ../gtk/gtkmenubar.c:181
+#: ../gtk/gtklockbutton.c:278
+msgid "Permission"
+msgstr "Berechtigung"
+
+#: ../gtk/gtklockbutton.c:279
+msgid "The GPermission object controlling this button"
+msgstr "Das GPermission-Objekt, welches diesen Knopf verwaltet"
+
+#: ../gtk/gtklockbutton.c:286
+msgid "Lock Text"
+msgstr "Text sperren"
+
+#: ../gtk/gtklockbutton.c:287
+msgid "The text to display when prompting the user to lock"
+msgstr "Der Text, der dem Benutzer angezeigt wird, wenn gesperrt werden soll"
+
+#: ../gtk/gtklockbutton.c:295
+msgid "Unlock Text"
+msgstr "Text entsperren"
+
+#: ../gtk/gtklockbutton.c:296
+msgid "The text to display when prompting the user to unlock"
+msgstr "Der Text, der dem Benutzer angezeigt wird, wenn entsperrt werden soll"
+
+#: ../gtk/gtklockbutton.c:304
+msgid "Lock Tooltip"
+msgstr "Minihilfe zum Sperren"
+
+#: ../gtk/gtklockbutton.c:305
+msgid "The tooltip to display when prompting the user to lock"
+msgstr ""
+"Die Minihilfe, die dem Benutzer angezeigt wird, wenn gesperrt werden soll"
+
+#: ../gtk/gtklockbutton.c:313
+msgid "Unlock Tooltip"
+msgstr "Minihilfe zum Entsperren"
+
+#: ../gtk/gtklockbutton.c:314
+msgid "The tooltip to display when prompting the user to unlock"
+msgstr ""
+"Die Minihilfe, die dem Benutzer angezeigt wird, wenn entsperrt werden soll"
+
+#: ../gtk/gtklockbutton.c:322
+msgid "Not Authorized Tooltip"
+msgstr "Minihilfe bei gescheiterter Legitimierung"
+
+#: ../gtk/gtklockbutton.c:323
+msgid ""
+"The tooltip to display when prompting the user cannot obtain authorization"
+msgstr ""
+"Die anzuzeigende Minihilfe, wenn der Benutzer nicht legitimiert werden kann"
+
+#: ../gtk/gtkmenubar.c:192
 msgid "Pack direction"
 msgstr "Packausrichtung"
 
-#: ../gtk/gtkmenubar.c:182
+#: ../gtk/gtkmenubar.c:193
 msgid "The pack direction of the menubar"
 msgstr "Die Packausrichtung der Werkzeugleiste"
 
-#: ../gtk/gtkmenubar.c:198
+#: ../gtk/gtkmenubar.c:209
 msgid "Child Pack direction"
 msgstr "Kindergruppenausrichtung"
 
-#: ../gtk/gtkmenubar.c:199
+#: ../gtk/gtkmenubar.c:210
 msgid "The child pack direction of the menubar"
 msgstr "Die Ausrichtung einer Gruppe von Widget-Kindern in der Menüleiste"
 
-#: ../gtk/gtkmenubar.c:208
+#: ../gtk/gtkmenubar.c:219
 msgid "Style of bevel around the menubar"
 msgstr "Der Stil der Fase um die Menüleiste"
 
-#: ../gtk/gtkmenubar.c:215 ../gtk/gtktoolbar.c:568
+#: ../gtk/gtkmenubar.c:226 ../gtk/gtktoolbar.c:580
 msgid "Internal padding"
 msgstr "Interne Auffüllung"
 
-#: ../gtk/gtkmenubar.c:216
+#: ../gtk/gtkmenubar.c:227
 msgid "Amount of border space between the menubar shadow and the menu items"
 msgstr ""
 "Der Randabstand zwischen dem Schatten der Menüleiste und den Menüeinträgen"
 
-#: ../gtk/gtkmenu.c:587
+#: ../gtk/gtkmenu.c:589
 msgid "The currently selected menu item"
 msgstr "Der momentan gewählte Menüeintrag"
 
-#: ../gtk/gtkmenu.c:602
+#: ../gtk/gtkmenu.c:604
 msgid "The accel group holding accelerators for the menu"
 msgstr "Die Tastenkürzelgruppe für dieses Menü"
 
-#: ../gtk/gtkmenu.c:616 ../gtk/gtkmenuitem.c:313
+#: ../gtk/gtkmenu.c:618 ../gtk/gtkmenuitem.c:368
 msgid "Accel Path"
 msgstr "Tastenkürzelpfad"
 
-#: ../gtk/gtkmenu.c:617
+#: ../gtk/gtkmenu.c:619
 msgid "An accel path used to conveniently construct accel paths of child items"
 msgstr ""
 "Ein Tastenkürzelpfad um einfach Tastenkürzelpfade für Kinderelemente zu "
 "erstellen"
 
-#: ../gtk/gtkmenu.c:633
+#: ../gtk/gtkmenu.c:635
 msgid "Attach Widget"
 msgstr "Widget anheften"
 
-#: ../gtk/gtkmenu.c:634
+#: ../gtk/gtkmenu.c:636
 msgid "The widget the menu is attached to"
 msgstr "Das Widget, dem das Menü angeheftet ist"
 
-#: ../gtk/gtkmenu.c:642
+#: ../gtk/gtkmenu.c:644
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-off"
 msgstr ""
 "Ein Titel, der evtl. von der Fensterverwaltung angezeigt wird, wenn dieses "
 "Menü abgerissen wurde"
 
-#: ../gtk/gtkmenu.c:656
+#: ../gtk/gtkmenu.c:658
 msgid "Tearoff State"
 msgstr "Abreißstatus"
 
-#: ../gtk/gtkmenu.c:657
+#: ../gtk/gtkmenu.c:659
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "Ein Boolscher Wert der anzeigt, ob das Menü abgerissen wurde"
 
-#: ../gtk/gtkmenu.c:671
+#: ../gtk/gtkmenu.c:673
 msgid "Monitor"
 msgstr "Bildschirm"
 
-#: ../gtk/gtkmenu.c:672
+#: ../gtk/gtkmenu.c:674
 msgid "The monitor the menu will be popped up on"
 msgstr "Der Bildschirm, auf dem das Menü aufklappen wird"
 
-#: ../gtk/gtkmenu.c:678
+#: ../gtk/gtkmenu.c:680
 msgid "Vertical Padding"
 msgstr "Vertikale Auffüllung"
 
-#: ../gtk/gtkmenu.c:679
+#: ../gtk/gtkmenu.c:681
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Zusätzlicher Freiraum oberhalb und unterhalb des Menüs"
 
-#: ../gtk/gtkmenu.c:701
+#: ../gtk/gtkmenu.c:703
 msgid "Reserve Toggle Size"
 msgstr "Platz für Umschalter reservieren"
 
 # »boolescher Wert« wird tatsächlich so geschrieben, auch wenn es komisch aussieht
-#: ../gtk/gtkmenu.c:702
+#: ../gtk/gtkmenu.c:704
 msgid ""
 "A boolean that indicates whether the menu reserves space for toggles and icons"
 msgstr ""
 "Ein boolescher Wert, der anzeigt, ob das Menü Abstand für Umschalter und "
 "Symbole reserviert"
 
-#: ../gtk/gtkmenu.c:708
+#: ../gtk/gtkmenu.c:710
 msgid "Horizontal Padding"
 msgstr "Horizontale Auffüllung"
 
-#: ../gtk/gtkmenu.c:709
+#: ../gtk/gtkmenu.c:711
 msgid "Extra space at the left and right edges of the menu"
 msgstr "Zusätzlicher Freiraum an den linken und rechten Ecken des Menüs"
 
-#: ../gtk/gtkmenu.c:717
+#: ../gtk/gtkmenu.c:719
 msgid "Vertical Offset"
 msgstr "Vertikaler Versatz"
 
-#: ../gtk/gtkmenu.c:718
+#: ../gtk/gtkmenu.c:720
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr ""
 "Wenn das Menü ein Untermenü ist, wird es vertikal um so viele Pixel versetzt"
 
-#: ../gtk/gtkmenu.c:726
+#: ../gtk/gtkmenu.c:728
 msgid "Horizontal Offset"
 msgstr "Horizontaler Versatz"
 
-#: ../gtk/gtkmenu.c:727
+#: ../gtk/gtkmenu.c:729
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr ""
 "Wenn das Menü ein Untermenü ist, wird es horizontal um so viele Pixel versetzt"
 
-#: ../gtk/gtkmenu.c:735
+#: ../gtk/gtkmenu.c:737
 msgid "Double Arrows"
 msgstr "Doppelte Pfeile"
 
-#: ../gtk/gtkmenu.c:736
+#: ../gtk/gtkmenu.c:738
 msgid "When scrolling, always show both arrows."
 msgstr "Beim Rollen immer beide Pfeile anzeigen."
 
-#: ../gtk/gtkmenu.c:749
+#: ../gtk/gtkmenu.c:751
 msgid "Arrow Placement"
 msgstr "Pfeilplatzierung"
 
-#: ../gtk/gtkmenu.c:750
+#: ../gtk/gtkmenu.c:752
 msgid "Indicates where scroll arrows should be placed"
 msgstr "Legt fest, wo Rollpfeile platziert werden sollen"
 
-#: ../gtk/gtkmenu.c:758
+#: ../gtk/gtkmenu.c:760
 msgid "Left Attach"
 msgstr "Links anhängen"
 
-#: ../gtk/gtkmenu.c:766
+#: ../gtk/gtkmenu.c:768
 msgid "Right Attach"
 msgstr "Rechts anhängen"
 
-#: ../gtk/gtkmenu.c:767
+#: ../gtk/gtkmenu.c:769
 msgid "The column number to attach the right side of the child to"
 msgstr ""
 "Die Spaltennummer, an die die rechte Seite des Kinds angehängt werden soll"
 
-#: ../gtk/gtkmenu.c:774
+#: ../gtk/gtkmenu.c:776
 msgid "Top Attach"
 msgstr "Oben anhängen"
 
-#: ../gtk/gtkmenu.c:775
+#: ../gtk/gtkmenu.c:777
 msgid "The row number to attach the top of the child to"
 msgstr ""
 "Die Spaltennummer, an die die obere Seite des Kinds angehängt werden soll"
 
-#: ../gtk/gtkmenu.c:782
+#: ../gtk/gtkmenu.c:784
 msgid "Bottom Attach"
 msgstr "Unten anhängen"
 
-#: ../gtk/gtkmenu.c:783 ../gtk/gtktable.c:223
+#: ../gtk/gtkmenu.c:785 ../gtk/gtktable.c:257
 msgid "The row number to attach the bottom of the child to"
 msgstr ""
 "Die Spaltennummer, an die die untere Seite des Kinds angehängt werden soll"
 
-#: ../gtk/gtkmenu.c:797
+#: ../gtk/gtkmenu.c:799
 msgid "Arbitrary constant to scale down the size of the scroll arrow"
 msgstr ""
 "Beliebige Konstante, mit der die Größe des Rollpfeils nach unten skaliert wird"
 
-#: ../gtk/gtkmenuitem.c:281
+#: ../gtk/gtkmenuitem.c:336
 msgid "Right Justified"
 msgstr "Rechtsbündig"
 
-#: ../gtk/gtkmenuitem.c:282
+#: ../gtk/gtkmenuitem.c:337
 msgid ""
 "Sets whether the menu item appears justified at the right side of a menu bar"
 msgstr "Sollen die Menüeinträge rechtsbündig im Menü ausgerichtet werden?"
 
-#: ../gtk/gtkmenuitem.c:296
+#: ../gtk/gtkmenuitem.c:351
 msgid "Submenu"
 msgstr "Untermenü"
 
-#: ../gtk/gtkmenuitem.c:297
+#: ../gtk/gtkmenuitem.c:352
 msgid "The submenu attached to the menu item, or NULL if it has none"
 msgstr "Das zum Menü gehörende Untermenü, oder NULL falls keins vorhanden"
 
-#: ../gtk/gtkmenuitem.c:314
+#: ../gtk/gtkmenuitem.c:369
 msgid "Sets the accelerator path of the menu item"
 msgstr "Den Tastenkürzelpfad für den Menüeintrag setzen"
 
-#: ../gtk/gtkmenuitem.c:329
+#: ../gtk/gtkmenuitem.c:384
 msgid "The text for the child label"
 msgstr "Der Text der Kind-Beschriftung"
 
-#: ../gtk/gtkmenuitem.c:392
+#: ../gtk/gtkmenuitem.c:447
 msgid "Amount of space used up by arrow, relative to the menu item's font size"
 msgstr "Der vom Pfeil belegte Platz, relativ zur Schriftgröße des Menüs"
 
-#: ../gtk/gtkmenuitem.c:405
+#: ../gtk/gtkmenuitem.c:460
 msgid "Width in Characters"
 msgstr "Breite in Zeichen"
 
-#: ../gtk/gtkmenuitem.c:406
+#: ../gtk/gtkmenuitem.c:461
 msgid "The minimum desired width of the menu item in characters"
 msgstr "Die minimale gewünschte Breite des Menüeintrags, in Zeichen"
 
-#: ../gtk/gtkmenushell.c:420
+#: ../gtk/gtkmenushell.c:447
 msgid "Take Focus"
 msgstr "Fokus übernehmen"
 
-#: ../gtk/gtkmenushell.c:421
+#: ../gtk/gtkmenushell.c:448
 msgid "A boolean that determines whether the menu grabs the keyboard focus"
 msgstr ""
 "Ein Boolscher Wert der anzeigt, ob das Menü den Tastaturfokus an sich nimmt"
 
-#: ../gtk/gtkmenutoolbutton.c:257
+#: ../gtk/gtkmenutoolbutton.c:293
 msgid "Menu"
 msgstr "Menü"
 
-#: ../gtk/gtkmenutoolbutton.c:258
+#: ../gtk/gtkmenutoolbutton.c:294
 msgid "The dropdown menu"
 msgstr "Herabklapper-Menü"
 
-#: ../gtk/gtkmessagedialog.c:185
+#: ../gtk/gtkmessagedialog.c:187
 msgid "Image/label border"
 msgstr "Bild-/Beschriftungsrand"
 
-#: ../gtk/gtkmessagedialog.c:186
+#: ../gtk/gtkmessagedialog.c:188
 msgid "Width of border around the label and image in the message dialog"
 msgstr "Die Breite des Rands um die Beschriftung und das Bild im Hinweisdialog."
 
-#: ../gtk/gtkmessagedialog.c:210
+#: ../gtk/gtkmessagedialog.c:212
 msgid "Message Buttons"
 msgstr "Nachrichtenknöpfe"
 
-#: ../gtk/gtkmessagedialog.c:211
+#: ../gtk/gtkmessagedialog.c:213
 msgid "The buttons shown in the message dialog"
 msgstr "Die im Nachrichtendialogfenster angezeigten Knöpfe"
 
-#: ../gtk/gtkmessagedialog.c:228
+#: ../gtk/gtkmessagedialog.c:230
 msgid "The primary text of the message dialog"
 msgstr "Der primäre Text des Nachrichtendialogfensters"
 
-#: ../gtk/gtkmessagedialog.c:243
+#: ../gtk/gtkmessagedialog.c:245
 msgid "Use Markup"
 msgstr "Markup verwenden"
 
-#: ../gtk/gtkmessagedialog.c:244
+#: ../gtk/gtkmessagedialog.c:246
 msgid "The primary text of the title includes Pango markup."
 msgstr "Der primäre Text des Titel enthält Pango-Markup."
 
-#: ../gtk/gtkmessagedialog.c:258
+#: ../gtk/gtkmessagedialog.c:260
 msgid "Secondary Text"
 msgstr "Sekundärer Text"
 
-#: ../gtk/gtkmessagedialog.c:259
+#: ../gtk/gtkmessagedialog.c:261
 msgid "The secondary text of the message dialog"
 msgstr "Die sekundäre Text des Nachrichtendialogfensters"
 
-#: ../gtk/gtkmessagedialog.c:274
+#: ../gtk/gtkmessagedialog.c:276
 msgid "Use Markup in secondary"
 msgstr "Markup im Sekundären verwenden"
 
-#: ../gtk/gtkmessagedialog.c:275
+#: ../gtk/gtkmessagedialog.c:277
 msgid "The secondary text includes Pango markup."
 msgstr "Der sekundäre Text enthält Pango-Markup."
 
-#: ../gtk/gtkmessagedialog.c:289
+#: ../gtk/gtkmessagedialog.c:291
 msgid "Image"
 msgstr "Bild"
 
-#: ../gtk/gtkmessagedialog.c:290
+#: ../gtk/gtkmessagedialog.c:292
 msgid "The image"
 msgstr "Das Bild"
 
-#: ../gtk/gtkmessagedialog.c:306
+#: ../gtk/gtkmessagedialog.c:308
 msgid "Message area"
 msgstr "Nachrichtenbereich"
 
-#: ../gtk/gtkmessagedialog.c:307
+#: ../gtk/gtkmessagedialog.c:309
 msgid "GtkVBox that holds the dialog's primary and secondary labels"
 msgstr "GtkVBox mit den primären und sekundären Beschriftungen des Dialogs"
 
-#: ../gtk/gtkmisc.c:91
+#: ../gtk/gtkmisc.c:115
 msgid "Y align"
 msgstr "Y-Ausrichtung"
 
-#: ../gtk/gtkmisc.c:92
+#: ../gtk/gtkmisc.c:116
 msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
 msgstr "Die vertikale Ausrichtung, von 0 (oben) bis 1 (unten)"
 
-#: ../gtk/gtkmisc.c:101
+#: ../gtk/gtkmisc.c:125
 msgid "X pad"
 msgstr "X-Auffüllung"
 
-#: ../gtk/gtkmisc.c:102
+#: ../gtk/gtkmisc.c:126
 msgid ""
 "The amount of space to add on the left and right of the widget, in pixels"
 msgstr "Der links und rechts des Widget hinzugefügte Freiraum, in Pixel"
 
-#: ../gtk/gtkmisc.c:111
+#: ../gtk/gtkmisc.c:135
 msgid "Y pad"
 msgstr "Y-Auffüllung"
 
-#: ../gtk/gtkmisc.c:112
+#: ../gtk/gtkmisc.c:136
 msgid ""
 "The amount of space to add on the top and bottom of the widget, in pixels"
 msgstr "Der oben und unten des Widget hinzugefügte Freiraum, in Pixel"
 
-#: ../gtk/gtkmountoperation.c:159
+#: ../gtk/gtkmountoperation.c:157
 msgid "Parent"
 msgstr "Eltern"
 
-#: ../gtk/gtkmountoperation.c:160
+#: ../gtk/gtkmountoperation.c:158
 msgid "The parent window"
 msgstr "Das Eltern-Fenster"
 
-#: ../gtk/gtkmountoperation.c:167
+#: ../gtk/gtkmountoperation.c:165
 msgid "Is Showing"
 msgstr "Wird angezeigt"
 
-#: ../gtk/gtkmountoperation.c:168
+#: ../gtk/gtkmountoperation.c:166
 msgid "Are we showing a dialog"
 msgstr "Wird ein Dialog angezeigt?"
 
-#: ../gtk/gtkmountoperation.c:176
+#: ../gtk/gtkmountoperation.c:174
 msgid "The screen where this window will be displayed."
 msgstr "Der Bildschirm, auf dem dieses Fenster angezeigt werden soll"
 
-#: ../gtk/gtknotebook.c:685
+#: ../gtk/gtknotebook.c:694
 msgid "Page"
 msgstr "Seite"
 
-#: ../gtk/gtknotebook.c:686
+#: ../gtk/gtknotebook.c:695
 msgid "The index of the current page"
 msgstr "Der Index der aktuellen Seite"
 
-#: ../gtk/gtknotebook.c:694
+#: ../gtk/gtknotebook.c:703
 msgid "Tab Position"
 msgstr "Reiterposition"
 
-#: ../gtk/gtknotebook.c:695
+#: ../gtk/gtknotebook.c:704
 msgid "Which side of the notebook holds the tabs"
 msgstr "Die Seite des Notizbuchs, auf der die Reiter sitzen"
 
-#: ../gtk/gtknotebook.c:702
+#: ../gtk/gtknotebook.c:711
 msgid "Show Tabs"
 msgstr "Reiter anzeigen"
 
-#: ../gtk/gtknotebook.c:703
+#: ../gtk/gtknotebook.c:712
 msgid "Whether tabs should be shown"
 msgstr "Sollen die Reiter angezeigt werden?"
 
-#: ../gtk/gtknotebook.c:709
+#: ../gtk/gtknotebook.c:718
 msgid "Show Border"
 msgstr "Rand anzeigen"
 
-#: ../gtk/gtknotebook.c:710
+#: ../gtk/gtknotebook.c:719
 msgid "Whether the border should be shown"
 msgstr "Soll der Rand angezeigt werden?"
 
-#: ../gtk/gtknotebook.c:716
+#: ../gtk/gtknotebook.c:725
 msgid "Scrollable"
 msgstr "Rollbar"
 
-#: ../gtk/gtknotebook.c:717
+#: ../gtk/gtknotebook.c:726
 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
 msgstr ""
 "Falls WAHR, werden Rollpfeile hinzugefügt, falls nicht alle Reiter Platz "
 "finden"
 
-#: ../gtk/gtknotebook.c:723
+#: ../gtk/gtknotebook.c:732
 msgid "Enable Popup"
 msgstr "Einblend-Fenster aktivieren"
 
-#: ../gtk/gtknotebook.c:724
+#: ../gtk/gtknotebook.c:733
 msgid ""
 "If TRUE, pressing the right mouse button on the notebook pops up a menu that "
 "you can use to go to a page"
@@ -4157,168 +4250,176 @@ msgstr ""
 "Falls WAHR, öffnet ein Rechtsklick auf das Notizbuch ein Menü, mit dem man "
 "die Seiten ansteuern kann"
 
-#: ../gtk/gtknotebook.c:738
+#: ../gtk/gtknotebook.c:747
 msgid "Group Name"
 msgstr "Gruppenname"
 
-#: ../gtk/gtknotebook.c:739
+#: ../gtk/gtknotebook.c:748
 msgid "Group name for tab drag and drop"
 msgstr "Gruppenname für den Reiter beim Ziehen und ablegen"
 
-#: ../gtk/gtknotebook.c:746
+#: ../gtk/gtknotebook.c:755
 msgid "Tab label"
 msgstr "Reiterbeschriftung"
 
-#: ../gtk/gtknotebook.c:747
+#: ../gtk/gtknotebook.c:756
 msgid "The string displayed on the child's tab label"
 msgstr "Die auf dem Reiter des Kinds angezeigte Zeichenkette"
 
-#: ../gtk/gtknotebook.c:753
+#: ../gtk/gtknotebook.c:762
 msgid "Menu label"
 msgstr "Menü-Beschriftung"
 
-#: ../gtk/gtknotebook.c:754
+#: ../gtk/gtknotebook.c:763
 msgid "The string displayed in the child's menu entry"
 msgstr "Die im Menü des Kinds angezeigte Zeichenkette"
 
-#: ../gtk/gtknotebook.c:767
+#: ../gtk/gtknotebook.c:776
 msgid "Tab expand"
 msgstr "Reiter ausklappen"
 
-#: ../gtk/gtknotebook.c:768
+#: ../gtk/gtknotebook.c:777
 msgid "Whether to expand the child's tab"
 msgstr "Legt fest, ob der Reiter des Kinds ausgeklappt werden soll"
 
-#: ../gtk/gtknotebook.c:774
+#: ../gtk/gtknotebook.c:783
 msgid "Tab fill"
 msgstr "Reiter füllen"
 
-#: ../gtk/gtknotebook.c:775
+#: ../gtk/gtknotebook.c:784
 msgid "Whether the child's tab should fill the allocated area"
 msgstr ""
 "Legt fest, ob der Reiter des Kinds den zugewiesenen Bereich ausfüllen soll"
 
-#: ../gtk/gtknotebook.c:782
+#: ../gtk/gtknotebook.c:791
 msgid "Tab reorderable"
 msgstr "Reiter umordnerbar"
 
-#: ../gtk/gtknotebook.c:783
+#: ../gtk/gtknotebook.c:792
 msgid "Whether the tab is reorderable by user action"
 msgstr "Legt fest, ob der Reiter durch den Benutzer umgeordnet werden darf"
 
-#: ../gtk/gtknotebook.c:789
+#: ../gtk/gtknotebook.c:798
 msgid "Tab detachable"
 msgstr "Reiter abtrennbar"
 
-#: ../gtk/gtknotebook.c:790
+#: ../gtk/gtknotebook.c:799
 msgid "Whether the tab is detachable"
 msgstr "Legt fest, ob der Reiter abtrennbar ist"
 
-#: ../gtk/gtknotebook.c:805 ../gtk/gtkscrollbar.c:102
+#: ../gtk/gtknotebook.c:814 ../gtk/gtkscrollbar.c:102
 msgid "Secondary backward stepper"
 msgstr "Zweiter Schrittschalter rückwärts"
 
-#: ../gtk/gtknotebook.c:806
+#: ../gtk/gtknotebook.c:815
 msgid ""
 "Display a second backward arrow button on the opposite end of the tab area"
 msgstr ""
 "Einen zweiten Rückwärtspfeil am gegenüberliegenden Ende des Reiterbereichs "
 "anzeigen"
 
-#: ../gtk/gtknotebook.c:821 ../gtk/gtkscrollbar.c:109
+#: ../gtk/gtknotebook.c:830 ../gtk/gtkscrollbar.c:109
 msgid "Secondary forward stepper"
 msgstr "Zweiter Schrittschalter vorwärts"
 
-#: ../gtk/gtknotebook.c:822
+#: ../gtk/gtknotebook.c:831
 msgid ""
 "Display a second forward arrow button on the opposite end of the tab area"
 msgstr ""
 "Einen zweiten Vorwärtspfeil am gegenüberliegenden Ende des Reiterbereichs "
 "anzeigen"
 
-#: ../gtk/gtknotebook.c:836 ../gtk/gtkscrollbar.c:88
+#: ../gtk/gtknotebook.c:845 ../gtk/gtkscrollbar.c:88
 msgid "Backward stepper"
 msgstr "Schrittschalter rückwärts"
 
-#: ../gtk/gtknotebook.c:837 ../gtk/gtkscrollbar.c:89
+#: ../gtk/gtknotebook.c:846 ../gtk/gtkscrollbar.c:89
 msgid "Display the standard backward arrow button"
 msgstr "Den normalen Rückwärtspfeil anzeigen"
 
-#: ../gtk/gtknotebook.c:851 ../gtk/gtkscrollbar.c:95
+#: ../gtk/gtknotebook.c:860 ../gtk/gtkscrollbar.c:95
 msgid "Forward stepper"
 msgstr "Schrittschalter vorwärts"
 
-#: ../gtk/gtknotebook.c:852 ../gtk/gtkscrollbar.c:96
+#: ../gtk/gtknotebook.c:861 ../gtk/gtkscrollbar.c:96
 msgid "Display the standard forward arrow button"
 msgstr "Den normalen Vorwärtspfeil anzeigen"
 
-#: ../gtk/gtknotebook.c:866
+#: ../gtk/gtknotebook.c:875
 msgid "Tab overlap"
 msgstr "Reiterüberlappung"
 
-#: ../gtk/gtknotebook.c:867
+#: ../gtk/gtknotebook.c:876
 msgid "Size of tab overlap area"
 msgstr "Größe der überlappenden Reiterregion"
 
-#: ../gtk/gtknotebook.c:882
+#: ../gtk/gtknotebook.c:891
 msgid "Tab curvature"
 msgstr "Reiterkrümmung"
 
-#: ../gtk/gtknotebook.c:883
+#: ../gtk/gtknotebook.c:892
 msgid "Size of tab curvature"
 msgstr "Die Größe der Reiterkrümmung"
 
-#: ../gtk/gtknotebook.c:899
+#: ../gtk/gtknotebook.c:908
 msgid "Arrow spacing"
 msgstr "Pfeilabstand"
 
 # CHECK
 # Gemeint sind vermutlich die Pfeile, um in  Karteireitern weiter zu blättern
-#: ../gtk/gtknotebook.c:900
+#: ../gtk/gtknotebook.c:909
 msgid "Scroll arrow spacing"
 msgstr "Abstand des Pfeils"
 
-#: ../gtk/gtknumerableicon.c:652
+#: ../gtk/gtknotebook.c:925
+msgid "Initial gap"
+msgstr "Vorangestellter Zwischenraum"
+
+#: ../gtk/gtknotebook.c:926
+msgid "Initial gap before the first tab"
+msgstr "Der dem ersten Reiter vorangestellte Zwischenraum"
+
+#: ../gtk/gtknumerableicon.c:653
 msgid "Icon's count"
 msgstr "Symbolanzahl"
 
-#: ../gtk/gtknumerableicon.c:653
+#: ../gtk/gtknumerableicon.c:654
 msgid "The count of the emblem currently displayed"
 msgstr "Die Anzahl der aktuell angezeigten Embleme"
 
-#: ../gtk/gtknumerableicon.c:659
+#: ../gtk/gtknumerableicon.c:660
 msgid "Icon's label"
 msgstr "Symbolbezeichnung"
 
-#: ../gtk/gtknumerableicon.c:660
+#: ../gtk/gtknumerableicon.c:661
 msgid "The label to be displayed over the icon"
 msgstr "Die auf dem Symbol angezeigte Bezeichnung"
 
-#: ../gtk/gtknumerableicon.c:666
+#: ../gtk/gtknumerableicon.c:667
 msgid "Icon's style context"
 msgstr "Stilkontext des Symbols"
 
-#: ../gtk/gtknumerableicon.c:667
+#: ../gtk/gtknumerableicon.c:668
 msgid "The style context to theme the icon appearance"
 msgstr "Der Stilkontext für das Erscheinungsbild von Symbolen"
 
-#: ../gtk/gtknumerableicon.c:673
+#: ../gtk/gtknumerableicon.c:674
 msgid "Background icon"
 msgstr "Hintergrundsymbol"
 
-#: ../gtk/gtknumerableicon.c:674
+#: ../gtk/gtknumerableicon.c:675
 msgid "The icon for the number emblem background"
 msgstr "Das Symbol für den Hintergrund des Zahlenemblems"
 
-#: ../gtk/gtknumerableicon.c:680
+#: ../gtk/gtknumerableicon.c:681
 msgid "Background icon name"
 msgstr "Name des Hintergrundsymbols"
 
-#: ../gtk/gtknumerableicon.c:681
+#: ../gtk/gtknumerableicon.c:682
 msgid "The icon name for the number emblem background"
 msgstr "Der Symbolname für den Hintergrund des Zahlenemblems"
 
-#: ../gtk/gtkorientable.c:63 ../gtk/gtkstatusicon.c:312
+#: ../gtk/gtkorientable.c:63 ../gtk/gtkstatusicon.c:342
 #: ../gtk/gtktrayicon-x11.c:128
 msgid "Orientation"
 msgstr "Ausrichtung"
@@ -4327,74 +4428,74 @@ msgstr "Ausrichtung"
 msgid "The orientation of the orientable"
 msgstr "Die Ausrichtung des Orientable-Widgets"
 
-#: ../gtk/gtkpaned.c:327
+#: ../gtk/gtkpaned.c:350
 msgid ""
 "Position of paned separator in pixels (0 means all the way to the left/top)"
 msgstr "Die Position des Feldtrennbalkens in Pixel (0 heißt ganz links/oben)"
 
-#: ../gtk/gtkpaned.c:336
+#: ../gtk/gtkpaned.c:359
 msgid "Position Set"
 msgstr "Position einstellen"
 
-#: ../gtk/gtkpaned.c:337
+#: ../gtk/gtkpaned.c:360
 msgid "TRUE if the Position property should be used"
 msgstr "WAHR, falls die Eigenschaft Position verwendet werden soll"
 
-#: ../gtk/gtkpaned.c:343
+#: ../gtk/gtkpaned.c:366
 msgid "Handle Size"
 msgstr "Griffgröße"
 
-#: ../gtk/gtkpaned.c:344
+#: ../gtk/gtkpaned.c:367
 msgid "Width of handle"
 msgstr "Die Breite des Griffs"
 
-#: ../gtk/gtkpaned.c:360
+#: ../gtk/gtkpaned.c:383
 msgid "Minimal Position"
 msgstr "Minimale Position"
 
-#: ../gtk/gtkpaned.c:361
+#: ../gtk/gtkpaned.c:384
 msgid "Smallest possible value for the \"position\" property"
 msgstr "Kleinster zulässiger Wert der Eigenschaft »position«"
 
-#: ../gtk/gtkpaned.c:378
+#: ../gtk/gtkpaned.c:401
 msgid "Maximal Position"
 msgstr "Maximale Position"
 
-#: ../gtk/gtkpaned.c:379
+#: ../gtk/gtkpaned.c:402
 msgid "Largest possible value for the \"position\" property"
 msgstr "Größter zulässiger Wert der Eigenschaft »position«"
 
-#: ../gtk/gtkpaned.c:396
+#: ../gtk/gtkpaned.c:419
 msgid "Resize"
 msgstr "Größe ändern"
 
-#: ../gtk/gtkpaned.c:397
+#: ../gtk/gtkpaned.c:420
 msgid "If TRUE, the child expands and shrinks along with the paned widget"
 msgstr ""
 "Soll das Kind zusammen mit dem Feldgröße-Widget ausgedehnt und geschrumpft "
 "werden?"
 
-#: ../gtk/gtkpaned.c:412
+#: ../gtk/gtkpaned.c:435
 msgid "Shrink"
 msgstr "Schrumpfen"
 
-#: ../gtk/gtkpaned.c:413
+#: ../gtk/gtkpaned.c:436
 msgid "If TRUE, the child can be made smaller than its requisition"
 msgstr "Soll das Kind kleiner als der angeforderte Raum gemacht werden können?"
 
-#: ../gtk/gtkplug.c:201 ../gtk/gtkstatusicon.c:296
+#: ../gtk/gtkplug.c:203 ../gtk/gtkstatusicon.c:326
 msgid "Embedded"
 msgstr "Eingebettet"
 
-#: ../gtk/gtkplug.c:202
+#: ../gtk/gtkplug.c:204
 msgid "Whether the plug is embedded"
 msgstr "Legt fest, ob der Plug eingebettet ist"
 
-#: ../gtk/gtkplug.c:216
+#: ../gtk/gtkplug.c:218
 msgid "Socket Window"
 msgstr "Socket-Fenster"
 
-#: ../gtk/gtkplug.c:217
+#: ../gtk/gtkplug.c:219
 msgid "The window of the socket the plug is embedded in"
 msgstr "Das Fenster des Sockets, in den der Plug eingebettet ist"
 
@@ -4478,11 +4579,19 @@ msgstr "Aufträge annehmen"
 msgid "TRUE if this printer is accepting new jobs"
 msgstr "WAHR, falls dieser Drucker Aufträge annimmt"
 
-#: ../gtk/gtkprinteroptionwidget.c:121
+#: ../gtk/gtkprinteroption.c:105
+msgid "Option Value"
+msgstr "Optionswert"
+
+#: ../gtk/gtkprinteroption.c:106
+msgid "Value of the option"
+msgstr "Wert der Option"
+
+#: ../gtk/gtkprinteroptionwidget.c:122
 msgid "Source option"
 msgstr "Quell-Option"
 
-#: ../gtk/gtkprinteroptionwidget.c:122
+#: ../gtk/gtkprinteroptionwidget.c:123
 msgid "The PrinterOption backing this widget"
 msgstr "Die PrinterOption für dieses Widget"
 
@@ -4507,7 +4616,7 @@ msgid "Printer settings"
 msgstr "Druckereinstellungen"
 
 #: ../gtk/gtkprintjob.c:168 ../gtk/gtkprintjob.c:169
-#: ../gtk/gtkprintunixdialog.c:298
+#: ../gtk/gtkprintunixdialog.c:368
 msgid "Page Setup"
 msgstr "Seiteneinstellungen"
 
@@ -4531,11 +4640,11 @@ msgstr "Vorgabe-Seiteneinstellungen"
 msgid "The GtkPageSetup used by default"
 msgstr "Das als Vorgabe zu verwendende GtkPageSetup"
 
-#: ../gtk/gtkprintoperation.c:1097 ../gtk/gtkprintunixdialog.c:316
+#: ../gtk/gtkprintoperation.c:1097 ../gtk/gtkprintunixdialog.c:386
 msgid "Print Settings"
 msgstr "Druckeinstellungen"
 
-#: ../gtk/gtkprintoperation.c:1098 ../gtk/gtkprintunixdialog.c:317
+#: ../gtk/gtkprintoperation.c:1098 ../gtk/gtkprintunixdialog.c:387
 msgid "The GtkPrintSettings used for initializing the dialog"
 msgstr "Die beim Initialisieren des Dialogs zu verwendenden GtkPrintSettings"
 
@@ -4555,11 +4664,11 @@ msgstr "Seitenanzahl"
 msgid "The number of pages in the document."
 msgstr "Die Anzahl der Seiten des Dokuments."
 
-#: ../gtk/gtkprintoperation.c:1163 ../gtk/gtkprintunixdialog.c:306
+#: ../gtk/gtkprintoperation.c:1163 ../gtk/gtkprintunixdialog.c:376
 msgid "Current Page"
 msgstr "Aktuelle Seite"
 
-#: ../gtk/gtkprintoperation.c:1164 ../gtk/gtkprintunixdialog.c:307
+#: ../gtk/gtkprintoperation.c:1164 ../gtk/gtkprintunixdialog.c:377
 msgid "The current page in the document"
 msgstr "Die aktuelle Seite des Dokuments"
 
@@ -4637,7 +4746,7 @@ msgstr "Eigene Reiterbeschriftung"
 msgid "Label for the tab containing custom widgets."
 msgstr "Beschriftung für den Reiter mit benutzerdefinierten Widgets."
 
-#: ../gtk/gtkprintoperation.c:1360 ../gtk/gtkprintunixdialog.c:341
+#: ../gtk/gtkprintoperation.c:1360 ../gtk/gtkprintunixdialog.c:411
 msgid "Support Selection"
 msgstr "Auswahl unterstützen"
 
@@ -4645,7 +4754,7 @@ msgstr "Auswahl unterstützen"
 msgid "TRUE if the print operation will support print of selection."
 msgstr "WAHR, falls der Druckvorgang den Ausdruck einer Auswahl unterstützt."
 
-#: ../gtk/gtkprintoperation.c:1377 ../gtk/gtkprintunixdialog.c:349
+#: ../gtk/gtkprintoperation.c:1377 ../gtk/gtkprintunixdialog.c:419
 msgid "Has Selection"
 msgstr "Hat eine Auswahl"
 
@@ -4653,7 +4762,7 @@ msgstr "Hat eine Auswahl"
 msgid "TRUE if a selection exists."
 msgstr "WAHR, falls eine Auswahl getätigt wurde."
 
-#: ../gtk/gtkprintoperation.c:1393 ../gtk/gtkprintunixdialog.c:357
+#: ../gtk/gtkprintoperation.c:1393 ../gtk/gtkprintunixdialog.c:427
 msgid "Embed Page Setup"
 msgstr "Seiteneinrichtung einbetten"
 
@@ -4670,71 +4779,71 @@ msgstr "Zu druckende Seitenanzahl"
 msgid "The number of pages that will be printed."
 msgstr "Die Anzahl der Seiten, die gedruckt werden."
 
-#: ../gtk/gtkprintunixdialog.c:299
+#: ../gtk/gtkprintunixdialog.c:369
 msgid "The GtkPageSetup to use"
 msgstr "Das zu verwendende GtkPageSetup"
 
-#: ../gtk/gtkprintunixdialog.c:324
+#: ../gtk/gtkprintunixdialog.c:394
 msgid "Selected Printer"
 msgstr "Ausgewählter Drucker"
 
-#: ../gtk/gtkprintunixdialog.c:325
+#: ../gtk/gtkprintunixdialog.c:395
 msgid "The GtkPrinter which is selected"
 msgstr "Der ausgewählte GtkPrinter"
 
-#: ../gtk/gtkprintunixdialog.c:332
+#: ../gtk/gtkprintunixdialog.c:402
 msgid "Manual Capabilities"
 msgstr "Manuelle Fähigkeiten"
 
-#: ../gtk/gtkprintunixdialog.c:333
+#: ../gtk/gtkprintunixdialog.c:403
 msgid "Capabilities the application can handle"
 msgstr "Fähigkeiten, die die Anwendung beherrschen kann"
 
-#: ../gtk/gtkprintunixdialog.c:342
+#: ../gtk/gtkprintunixdialog.c:412
 msgid "Whether the dialog supports selection"
 msgstr "Soll der Dialog eine Auswahl unterstützen?"
 
-#: ../gtk/gtkprintunixdialog.c:350
+#: ../gtk/gtkprintunixdialog.c:420
 msgid "Whether the application has a selection"
 msgstr "Legt fest, ob die Anwendung eine Auswahl hat"
 
-#: ../gtk/gtkprintunixdialog.c:358
+#: ../gtk/gtkprintunixdialog.c:428
 msgid "TRUE if page setup combos are embedded in GtkPrintUnixDialog"
 msgstr ""
 "WAHR, falls die Seiteneinrichtung Auswahlfelder im GtkPrintUnixDialog "
 "einbettet"
 
-#: ../gtk/gtkprogressbar.c:161
+#: ../gtk/gtkprogressbar.c:160
 msgid "Fraction"
 msgstr "Anteil"
 
-#: ../gtk/gtkprogressbar.c:162
+#: ../gtk/gtkprogressbar.c:161
 msgid "The fraction of total work that has been completed"
 msgstr "Der fertiggestellte Anteil an der gesamten Arbeit"
 
-#: ../gtk/gtkprogressbar.c:169
+#: ../gtk/gtkprogressbar.c:168
 msgid "Pulse Step"
 msgstr "Puls-Schrittweite"
 
-#: ../gtk/gtkprogressbar.c:170
+#: ../gtk/gtkprogressbar.c:169
 msgid "The fraction of total progress to move the bouncing block when pulsed"
 msgstr ""
 "Der Anteil an der gesamten Breite, um die sich der hüpfende Balken bei jedem "
 "Aktivitätspuls bewegt"
 
-#: ../gtk/gtkprogressbar.c:178
+#: ../gtk/gtkprogressbar.c:177
 msgid "Text to be displayed in the progress bar"
 msgstr "Im Fortschrittsbalken anzuzeigender Text"
 
-#: ../gtk/gtkprogressbar.c:195
+#: ../gtk/gtkprogressbar.c:198
 msgid "Show text"
 msgstr "Text anzeigen"
 
-#: ../gtk/gtkprogressbar.c:196
+#: ../gtk/gtkprogressbar.c:199
 msgid "Whether the progress is shown as text."
 msgstr "Legt fest, ob der Arbeitsfortschritt als Text angezeigt wird."
 
-#: ../gtk/gtkprogressbar.c:218
+#: ../gtk/gtkprogressbar.c:221
 msgid ""
 "The preferred place to ellipsize the string, if the progress bar does not "
 "have enough room to display the entire string, if at all."
@@ -4742,51 +4851,51 @@ msgstr ""
 "Der bevorzugte Bereich zur Auslassung in der Zeichenkette, falls der "
 "Fortschrittsbalken nicht genug Platz hat, um sie komplett anzuzeigen."
 
-#: ../gtk/gtkprogressbar.c:225
+#: ../gtk/gtkprogressbar.c:228
 msgid "X spacing"
 msgstr "X-Freiraum"
 
-#: ../gtk/gtkprogressbar.c:226
+#: ../gtk/gtkprogressbar.c:229
 msgid "Extra spacing applied to the width of a progress bar."
 msgstr "Extra Platz, der zur Breite der Fortschrittsanzeige hinzugefügt wird."
 
-#: ../gtk/gtkprogressbar.c:231
+#: ../gtk/gtkprogressbar.c:234
 msgid "Y spacing"
 msgstr "Y-Freiraum"
 
-#: ../gtk/gtkprogressbar.c:232
+#: ../gtk/gtkprogressbar.c:235
 msgid "Extra spacing applied to the height of a progress bar."
 msgstr "Extra Platz, der zur Höhe der Fortschrittsanzeige hinzugefügt wird."
 
-#: ../gtk/gtkprogressbar.c:245
+#: ../gtk/gtkprogressbar.c:248
 msgid "Minimum horizontal bar width"
 msgstr "Minimale Breite des horizontalen Balkens"
 
-#: ../gtk/gtkprogressbar.c:246
+#: ../gtk/gtkprogressbar.c:249
 msgid "The minimum horizontal width of the progress bar"
 msgstr "Die minimale Breite der horizontalen Fortschrittsanzeige"
 
-#: ../gtk/gtkprogressbar.c:258
+#: ../gtk/gtkprogressbar.c:261
 msgid "Minimum horizontal bar height"
 msgstr "Minimale Höhe des horizontalen Balkens"
 
-#: ../gtk/gtkprogressbar.c:259
+#: ../gtk/gtkprogressbar.c:262
 msgid "Minimum horizontal height of the progress bar"
 msgstr "Minimale Höhe der horizontalen Fortschrittsanzeige"
 
-#: ../gtk/gtkprogressbar.c:271
+#: ../gtk/gtkprogressbar.c:274
 msgid "Minimum vertical bar width"
 msgstr "Minimale Breite des vertikalen Balkens"
 
-#: ../gtk/gtkprogressbar.c:272
+#: ../gtk/gtkprogressbar.c:275
 msgid "The minimum vertical width of the progress bar"
 msgstr "Die minimale Breite der vertikalen Fortschrittsanzeige"
 
-#: ../gtk/gtkprogressbar.c:284
+#: ../gtk/gtkprogressbar.c:287
 msgid "Minimum vertical bar height"
 msgstr "Minimale Höhe des vertikalen Balkens"
 
-#: ../gtk/gtkprogressbar.c:285
+#: ../gtk/gtkprogressbar.c:288
 msgid "The minimum vertical height of the progress bar"
 msgstr "Die minimale Höhe der vertikalen Fortschrittsanzeige"
 
@@ -4802,8 +4911,8 @@ msgstr ""
 "Der von »gtk_radio_action_get_current_value()« gelieferte wert, wenn diese "
 "Aktion die derzeitige Gruppenaktion ist."
 
-#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:163
-#: ../gtk/gtkradiomenuitem.c:374 ../gtk/gtkradiotoolbutton.c:65
+#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiomenuitem.c:426 ../gtk/gtkradiotoolbutton.c:85
 msgid "Group"
 msgstr "Gruppe"
 
@@ -4823,143 +4932,143 @@ msgstr ""
 "Der Wert des momentan aktiven Mitglieds der Gruppe, zu der diese Aktion "
 "gehört."
 
-#: ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiobutton.c:165
 msgid "The radio button whose group this widget belongs to."
 msgstr "Der Radioknopf, zu dessen Gruppe dieses Widget gehört."
 
-#: ../gtk/gtkradiomenuitem.c:375
+#: ../gtk/gtkradiomenuitem.c:427
 msgid "The radio menu item whose group this widget belongs to."
 msgstr "Das Radio-Menüeintrag, zu dessen Gruppe dieses Widget gehört."
 
-#: ../gtk/gtkradiotoolbutton.c:66
+#: ../gtk/gtkradiotoolbutton.c:86
 msgid "The radio tool button whose group this button belongs to."
 msgstr "Der Radiowerkzeug-Knopf, zu dessen Gruppe dieser Knopf gehört."
 
-#: ../gtk/gtkrange.c:417
+#: ../gtk/gtkrange.c:419
 msgid "The GtkAdjustment that contains the current value of this range object"
 msgstr ""
 "Das GtkAdjustment, das den aktuellen Wert dieses Bereichsobjekts enthält"
 
-#: ../gtk/gtkrange.c:425
+#: ../gtk/gtkrange.c:427
 msgid "Invert direction slider moves to increase range value"
 msgstr ""
 "Die Richtung der Schieberbewegung umkehren, um den Bereichswert zu vergrößern"
 
-#: ../gtk/gtkrange.c:432
+#: ../gtk/gtkrange.c:434
 msgid "Lower stepper sensitivity"
 msgstr "Untere Empfindlichkeit des Schrittschalters"
 
-#: ../gtk/gtkrange.c:433
+#: ../gtk/gtkrange.c:435
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's lower "
 "side"
 msgstr ""
 "Die Empfindlichkeit des Schrittschalters am unteren Ende der Möglichkeiten"
 
-#: ../gtk/gtkrange.c:441
+#: ../gtk/gtkrange.c:443
 msgid "Upper stepper sensitivity"
 msgstr "Obere Empfindlichkeit des Schrittschaltes"
 
-#: ../gtk/gtkrange.c:442
+#: ../gtk/gtkrange.c:444
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's upper "
 "side"
 msgstr ""
 "Die Empfindlichkeit des Schrittschalters am oberen Ende der Möglichkeiten"
 
-#: ../gtk/gtkrange.c:459
+#: ../gtk/gtkrange.c:461
 msgid "Show Fill Level"
 msgstr "Füllstand anzeigen"
 
-#: ../gtk/gtkrange.c:460
+#: ../gtk/gtkrange.c:462
 msgid "Whether to display a fill level indicator graphics on trough."
 msgstr "Legt fest, ob der Füllstand im Trog angezeigt wird."
 
-#: ../gtk/gtkrange.c:476
+#: ../gtk/gtkrange.c:478
 msgid "Restrict to Fill Level"
 msgstr "Auf Füllstand beschränken"
 
-#: ../gtk/gtkrange.c:477
+#: ../gtk/gtkrange.c:479
 msgid "Whether to restrict the upper boundary to the fill level."
 msgstr "Legt fest, ob der obere Rand auf den Füllstand beschränkt ist."
 
-#: ../gtk/gtkrange.c:492
+#: ../gtk/gtkrange.c:494
 msgid "Fill Level"
 msgstr "Füllstand"
 
-#: ../gtk/gtkrange.c:493
+#: ../gtk/gtkrange.c:495
 msgid "The fill level."
 msgstr "Der Füllstand."
 
-#: ../gtk/gtkrange.c:510
+#: ../gtk/gtkrange.c:512
 msgid "Round Digits"
 msgstr "Angezeigte Stellen runden"
 
-#: ../gtk/gtkrange.c:511
+#: ../gtk/gtkrange.c:513
 msgid "The number of digits to round the value to."
 msgstr "Die Anzahl der Stellen, auf die der Wert gerundet werden soll."
 
-#: ../gtk/gtkrange.c:519 ../gtk/gtkswitch.c:836
+#: ../gtk/gtkrange.c:521 ../gtk/gtkswitch.c:817
 msgid "Slider Width"
 msgstr "Schieberbreite"
 
-#: ../gtk/gtkrange.c:520
+#: ../gtk/gtkrange.c:522
 msgid "Width of scrollbar or scale thumb"
 msgstr "Die Breite der Bildlaufleiste oder des Vergrößerungsschiebers"
 
-#: ../gtk/gtkrange.c:527
+#: ../gtk/gtkrange.c:529
 msgid "Trough Border"
 msgstr "Trogrand"
 
-#: ../gtk/gtkrange.c:528
+#: ../gtk/gtkrange.c:530
 msgid "Spacing between thumb/steppers and outer trough bevel"
 msgstr ""
 "Der Abstand zwischen den Schiebern bzw. den Schrittschaltern und der äußeren "
 "Trogfase"
 
-#: ../gtk/gtkrange.c:535
+#: ../gtk/gtkrange.c:537
 msgid "Stepper Size"
 msgstr "Schrittschalter-Größe"
 
-#: ../gtk/gtkrange.c:536
+#: ../gtk/gtkrange.c:538
 msgid "Length of step buttons at ends"
 msgstr "Die Länge der Schrittschalter an den Enden"
 
-#: ../gtk/gtkrange.c:549
+#: ../gtk/gtkrange.c:551
 msgid "Stepper Spacing"
 msgstr "Schrittschalter-Abstand"
 
-#: ../gtk/gtkrange.c:550
+#: ../gtk/gtkrange.c:552
 msgid "Spacing between step buttons and thumb"
 msgstr "Der Abstand zwischen den Schrittschaltern und dem Schieber"
 
-#: ../gtk/gtkrange.c:557
+#: ../gtk/gtkrange.c:559
 msgid "Arrow X Displacement"
 msgstr "Horizontaler Versatz des Pfeiles"
 
-#: ../gtk/gtkrange.c:558
+#: ../gtk/gtkrange.c:560
 msgid ""
 "How far in the x direction to move the arrow when the button is depressed"
 msgstr ""
 "Wie weit soll der Pfeil in der horizontaler Richtung versetzt werden, wenn "
 "der Knopf gedrückt wird?"
 
-#: ../gtk/gtkrange.c:565
+#: ../gtk/gtkrange.c:567
 msgid "Arrow Y Displacement"
 msgstr "Y-Versatz des Pfeiles"
 
-#: ../gtk/gtkrange.c:566
+#: ../gtk/gtkrange.c:568
 msgid ""
 "How far in the y direction to move the arrow when the button is depressed"
 msgstr ""
 "Wie weit soll der Pfeil in der Y-Richtung versetzt werden, wenn der Knopf "
 "gedrückt wird?"
 
-#: ../gtk/gtkrange.c:582
+#: ../gtk/gtkrange.c:584
 msgid "Trough Under Steppers"
 msgstr "Trog unter Schrittzählern"
 
-#: ../gtk/gtkrange.c:583
+#: ../gtk/gtkrange.c:585
 msgid ""
 "Whether to draw trough for full length of range or exclude the steppers and "
 "spacing"
@@ -4967,11 +5076,11 @@ msgstr ""
 "Legt fest, ob der Trog über die gesamte Länge gezeichnet wird oder ob "
 "Schrittzähler und Abstände ausgenommen werden"
 
-#: ../gtk/gtkrange.c:596
+#: ../gtk/gtkrange.c:598
 msgid "Arrow scaling"
 msgstr "Pfeilskalierung"
 
-#: ../gtk/gtkrange.c:597
+#: ../gtk/gtkrange.c:599
 msgid "Arrow scaling with regard to scroll button size"
 msgstr "Pfeilskalierung bezogen zur Größe der Bildlaufleiste"
 
@@ -5068,93 +5177,93 @@ msgstr ""
 msgid "The size of the recently used resources list"
 msgstr "Die Größe der »Zuletzt verwendet«-Liste"
 
-#: ../gtk/gtkscalebutton.c:218
+#: ../gtk/gtkscalebutton.c:219
 msgid "The value of the scale"
 msgstr "Der eingestellte Skalenwert"
 
-#: ../gtk/gtkscalebutton.c:228
+#: ../gtk/gtkscalebutton.c:229
 msgid "The icon size"
 msgstr "Die Symbolgröße"
 
-#: ../gtk/gtkscalebutton.c:237
+#: ../gtk/gtkscalebutton.c:238
 msgid ""
 "The GtkAdjustment that contains the current value of this scale button object"
 msgstr "Das GtkAdjustment, das den aktuellen Wert dieses Skalenobjekts enthält"
 
-#: ../gtk/gtkscalebutton.c:265
+#: ../gtk/gtkscalebutton.c:266
 msgid "Icons"
 msgstr "Symbole"
 
-#: ../gtk/gtkscalebutton.c:266
+#: ../gtk/gtkscalebutton.c:267
 msgid "List of icon names"
 msgstr "Liste der Symbolnamen"
 
-#: ../gtk/gtkscale.c:253
+#: ../gtk/gtkscale.c:255
 msgid "The number of decimal places that are displayed in the value"
 msgstr "Die Anzahl der Nachkommastellen, die für den Wert dargestellt werden"
 
-#: ../gtk/gtkscale.c:262
+#: ../gtk/gtkscale.c:264
 msgid "Draw Value"
 msgstr "Wert anzeigen"
 
-#: ../gtk/gtkscale.c:263
+#: ../gtk/gtkscale.c:265
 msgid "Whether the current value is displayed as a string next to the slider"
 msgstr ""
 "Soll der aktuelle Wert als Zeichenkette neben dem Schieber angezeigt werden?"
 
-#: ../gtk/gtkscale.c:270
+#: ../gtk/gtkscale.c:272
 msgid "Value Position"
 msgstr "Wertposition"
 
-#: ../gtk/gtkscale.c:271
+#: ../gtk/gtkscale.c:273
 msgid "The position in which the current value is displayed"
 msgstr "Die Position, an der der aktuelle Wert angezeigt wird"
 
-#: ../gtk/gtkscale.c:278
+#: ../gtk/gtkscale.c:280
 msgid "Slider Length"
 msgstr "Schieberlänge"
 
-#: ../gtk/gtkscale.c:279
+#: ../gtk/gtkscale.c:281
 msgid "Length of scale's slider"
 msgstr "Die Länge des Schiebers der Skala"
 
-#: ../gtk/gtkscale.c:287
+#: ../gtk/gtkscale.c:289
 msgid "Value spacing"
 msgstr "Wertabstand"
 
-#: ../gtk/gtkscale.c:288
+#: ../gtk/gtkscale.c:290
 msgid "Space between value text and the slider/trough area"
 msgstr "Der Abstand zwischen der Wertangabe und dem Schieber-/Trogbereich"
 
-#: ../gtk/gtkscrollable.c:86
+#: ../gtk/gtkscrollable.c:94
 msgid "Horizontal adjustment"
 msgstr "Horizontale Stellgröße"
 
-#: ../gtk/gtkscrollable.c:87
+#: ../gtk/gtkscrollable.c:95
 msgid ""
 "Horizontal adjustment that is shared between the scrollable widget and its "
 "controller"
 msgstr "Horizontale Anpassung des rollbaren Widgets und seines Controllers"
 
-#: ../gtk/gtkscrollable.c:103
+#: ../gtk/gtkscrollable.c:111
 msgid "Vertical adjustment"
 msgstr "Vertikale Stellgröße"
 
-#: ../gtk/gtkscrollable.c:104
+#: ../gtk/gtkscrollable.c:112
 msgid ""
 "Vertical adjustment that is shared between the scrollable widget and its "
 "controller"
 msgstr "Vertikale Anpassung des rollbaren Widgets und seines Controllers"
 
-#: ../gtk/gtkscrollable.c:120
+#: ../gtk/gtkscrollable.c:128
 msgid "Horizontal Scrollable Policy"
 msgstr "Horizontale Bildlaufleistenrichtlinie"
 
-#: ../gtk/gtkscrollable.c:121 ../gtk/gtkscrollable.c:137
+#: ../gtk/gtkscrollable.c:129 ../gtk/gtkscrollable.c:145
 msgid "How the size of the content should be determined"
 msgstr "Ermittlung der Größe des Inhalts"
 
-#: ../gtk/gtkscrollable.c:136
+#: ../gtk/gtkscrollable.c:144
 msgid "Vertical Scrollable Policy"
 msgstr "Vertikale Bildlaufleistenrichtlinie"
 
@@ -5295,11 +5404,11 @@ msgstr "Anzeigen"
 msgid "Whether the separator is drawn, or just blank"
 msgstr "Soll der Trenner angezeigt werden oder einfach nur leer sein?"
 
-#: ../gtk/gtksettings.c:318
+#: ../gtk/gtksettings.c:322
 msgid "Double Click Time"
 msgstr "Doppelklick-Zeit"
 
-#: ../gtk/gtksettings.c:319
+#: ../gtk/gtksettings.c:323
 msgid ""
 "Maximum time allowed between two clicks for them to be considered a double "
 "click (in milliseconds)"
@@ -5307,11 +5416,11 @@ msgstr ""
 "Die maximale Zeit, die zwischen zwei Klicks vergehen darf, damit sie als "
 "Doppelklick erkannt werden (in Millisekunden)"
 
-#: ../gtk/gtksettings.c:326
+#: ../gtk/gtksettings.c:330
 msgid "Double Click Distance"
 msgstr "Doppelklick-Intervall"
 
-#: ../gtk/gtksettings.c:327
+#: ../gtk/gtksettings.c:331
 msgid ""
 "Maximum distance allowed between two clicks for them to be considered a "
 "double click (in pixels)"
@@ -5319,35 +5428,35 @@ msgstr ""
 "Der maximale Abstand, der zwischen zwei Klicks liegen darf, damit diese als "
 "Doppelklick interpretiert werden (in Pixel)"
 
-#: ../gtk/gtksettings.c:343
+#: ../gtk/gtksettings.c:347
 msgid "Cursor Blink"
 msgstr "Blinkender Zeiger"
 
-#: ../gtk/gtksettings.c:344
+#: ../gtk/gtksettings.c:348
 msgid "Whether the cursor should blink"
 msgstr "Soll der Zeiger blinken?"
 
-#: ../gtk/gtksettings.c:351
+#: ../gtk/gtksettings.c:355
 msgid "Cursor Blink Time"
 msgstr "Zeigerblinkdauer"
 
-#: ../gtk/gtksettings.c:352
+#: ../gtk/gtksettings.c:356
 msgid "Length of the cursor blink cycle, in milliseconds"
 msgstr "Die Länge der Cursor-Blinkperiode in Millisekunden"
 
-#: ../gtk/gtksettings.c:371
+#: ../gtk/gtksettings.c:375
 msgid "Cursor Blink Timeout"
 msgstr "Cursor-Blinkdauer"
 
-#: ../gtk/gtksettings.c:372
+#: ../gtk/gtksettings.c:376
 msgid "Time after which the cursor stops blinking, in seconds"
 msgstr "Die Zeit nach der der Cursor aufhört zu blinken, in Millisekunden"
 
-#: ../gtk/gtksettings.c:379
+#: ../gtk/gtksettings.c:383
 msgid "Split Cursor"
 msgstr "Zeiger aufteilen"
 
-#: ../gtk/gtksettings.c:380
+#: ../gtk/gtksettings.c:384
 msgid ""
 "Whether two cursors should be displayed for mixed left-to-right and right-to-"
 "left text"
@@ -5355,157 +5464,157 @@ msgstr ""
 "Sollen für gemischt linksläufigen und rechtsläufigen Text zwei Zeiger "
 "angezeigt werden?"
 
-#: ../gtk/gtksettings.c:387
+#: ../gtk/gtksettings.c:391
 msgid "Theme Name"
 msgstr "Themenname"
 
-#: ../gtk/gtksettings.c:388
+#: ../gtk/gtksettings.c:392
 msgid "Name of theme to load"
 msgstr "Name des zu ladenden Themas"
 
-#: ../gtk/gtksettings.c:396
+#: ../gtk/gtksettings.c:400
 msgid "Icon Theme Name"
 msgstr "Symbolthemenname"
 
-#: ../gtk/gtksettings.c:397
+#: ../gtk/gtksettings.c:401
 msgid "Name of icon theme to use"
 msgstr "Der Name des zu verwendenden Symbolthemas"
 
-#: ../gtk/gtksettings.c:405
+#: ../gtk/gtksettings.c:409
 msgid "Fallback Icon Theme Name"
 msgstr "Ausweich-Symbolthemenname"
 
-#: ../gtk/gtksettings.c:406
+#: ../gtk/gtksettings.c:410
 msgid "Name of a icon theme to fall back to"
 msgstr "Der Name des zu verwendenden Ausweich-Symbolthemas"
 
-#: ../gtk/gtksettings.c:414
+#: ../gtk/gtksettings.c:418
 msgid "Key Theme Name"
 msgstr "Name der Tastenbelegung"
 
-#: ../gtk/gtksettings.c:415
+#: ../gtk/gtksettings.c:419
 msgid "Name of key theme to load"
 msgstr "Name des zu ladenden Schlüsselthemas"
 
-#: ../gtk/gtksettings.c:423
+#: ../gtk/gtksettings.c:427
 msgid "Menu bar accelerator"
 msgstr "Menüleisten-Kürzel"
 
-#: ../gtk/gtksettings.c:424
+#: ../gtk/gtksettings.c:428
 msgid "Keybinding to activate the menu bar"
 msgstr "Tastaturkürzel, das die Menüleiste aktiviert"
 
-#: ../gtk/gtksettings.c:432
+#: ../gtk/gtksettings.c:436
 msgid "Drag threshold"
 msgstr "Ziehschwellwert"
 
-#: ../gtk/gtksettings.c:433
+#: ../gtk/gtksettings.c:437
 msgid "Number of pixels the cursor can move before dragging"
 msgstr ""
 "Die Anzahl der Pixel, die sich der Zeiger bewegen kann, bevor das Ziehen "
 "einsetzt"
 
-#: ../gtk/gtksettings.c:441
+#: ../gtk/gtksettings.c:445
 msgid "Font Name"
 msgstr "Schriftname"
 
-#: ../gtk/gtksettings.c:442
+#: ../gtk/gtksettings.c:446
 msgid "Name of default font to use"
 msgstr "Der Name der zu verwendenden Vorgabeschrift"
 
-#: ../gtk/gtksettings.c:464
+#: ../gtk/gtksettings.c:468
 msgid "Icon Sizes"
 msgstr "Symbolgröße"
 
-#: ../gtk/gtksettings.c:465
+#: ../gtk/gtksettings.c:469
 msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."
 msgstr "Die Liste der Symbolgrößen (gtk-menu=16,16;gtk-button=20,20 usw.)"
 
-#: ../gtk/gtksettings.c:473
+#: ../gtk/gtksettings.c:477
 msgid "GTK Modules"
 msgstr "GTK-Module"
 
-#: ../gtk/gtksettings.c:474
+#: ../gtk/gtksettings.c:478
 msgid "List of currently active GTK modules"
 msgstr "Liste der aktiven GTK-Module"
 
-#: ../gtk/gtksettings.c:482
+#: ../gtk/gtksettings.c:486
 msgid "Xft Antialias"
 msgstr "Xft-Kantenglättung"
 
-#: ../gtk/gtksettings.c:483
+#: ../gtk/gtksettings.c:487
 msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
 msgstr ""
 "Sollen die Kanten von Xft-Schriften geglättet werden? 0: nein, 1: ja, -1: "
 "Vorgabe"
 
-#: ../gtk/gtksettings.c:492
+#: ../gtk/gtksettings.c:496
 msgid "Xft Hinting"
 msgstr "Xft-Hinting"
 
-#: ../gtk/gtksettings.c:493
+#: ../gtk/gtksettings.c:497
 msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
 msgstr ""
 "Soll für Xft-Schriften Hinting verwendet werden? 0: nein, 1: ja, -1: Vorgabe"
 
-#: ../gtk/gtksettings.c:502
+#: ../gtk/gtksettings.c:506
 msgid "Xft Hint Style"
 msgstr "Xft-Hinting-Stil"
 
-#: ../gtk/gtksettings.c:503
+#: ../gtk/gtksettings.c:507
 msgid ""
 "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
 msgstr ""
 "Wie stark soll Hinting verwendet werden? none (keins), slight (leicht), "
 "medium (mittel) oder full (stark)"
 
-#: ../gtk/gtksettings.c:512
+#: ../gtk/gtksettings.c:516
 msgid "Xft RGBA"
 msgstr "Xft-RGBA"
 
-#: ../gtk/gtksettings.c:513
+#: ../gtk/gtksettings.c:517
 msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
 msgstr "Typ der Subpixel-Kantenglättung; none (keine), rgb, bgr, vrgb, vbgr"
 
-#: ../gtk/gtksettings.c:522
+#: ../gtk/gtksettings.c:526
 msgid "Xft DPI"
 msgstr "Xft-DPI"
 
-#: ../gtk/gtksettings.c:523
+#: ../gtk/gtksettings.c:527
 msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
 msgstr "Xft-Auflösung in 1024 * Punkt/Zoll. -1: Vorgabewert"
 
-#: ../gtk/gtksettings.c:532
+#: ../gtk/gtksettings.c:536
 msgid "Cursor theme name"
 msgstr "Mauszeigerthema"
 
-#: ../gtk/gtksettings.c:533
+#: ../gtk/gtksettings.c:537
 msgid "Name of the cursor theme to use, or NULL to use the default theme"
 msgstr ""
 "Der Name des zu verwendenden Zeigerthemas, oder NULL, um das Vorgabethema zu "
 "verwenden."
 
-#: ../gtk/gtksettings.c:541
+#: ../gtk/gtksettings.c:545
 msgid "Cursor theme size"
 msgstr "Größe des Zeigerthemas"
 
-#: ../gtk/gtksettings.c:542
+#: ../gtk/gtksettings.c:546
 msgid "Size to use for cursors, or 0 to use the default size"
 msgstr "Zu verwendende Zeigergröße, oder 0, um die Vorgabegröße zu verwenden."
 
-#: ../gtk/gtksettings.c:551
+#: ../gtk/gtksettings.c:555
 msgid "Alternative button order"
 msgstr "Alternative Reihenfolge für Knöpfe"
 
-#: ../gtk/gtksettings.c:552
+#: ../gtk/gtksettings.c:556
 msgid "Whether buttons in dialogs should use the alternative button order"
 msgstr "Sollen Knöpfe in Dialogen die alternative Reihenfolge verwenden?"
 
-#: ../gtk/gtksettings.c:569
+#: ../gtk/gtksettings.c:573
 msgid "Alternative sort indicator direction"
 msgstr "Vertauschte Sortierknöpfe"
 
-#: ../gtk/gtksettings.c:570
+#: ../gtk/gtksettings.c:574
 msgid ""
 "Whether the direction of the sort indicators in list and tree views is "
 "inverted compared to the default (where down means ascending)"
@@ -5513,11 +5622,11 @@ msgstr ""
 "Legt fest, ob die Aktion der Sortierknöpfe gegenüber der Vorgabe, bei der "
 "runter »aufsteigend« bedeutet, vertauscht sein soll. "
 
-#: ../gtk/gtksettings.c:578
+#: ../gtk/gtksettings.c:582
 msgid "Show the 'Input Methods' menu"
 msgstr "Menü »Eingabemethoden« anzeigen"
 
-#: ../gtk/gtksettings.c:579
+#: ../gtk/gtksettings.c:583
 msgid ""
 "Whether the context menus of entries and text views should offer to change "
 "the input method"
@@ -5525,11 +5634,11 @@ msgstr ""
 "Sollen die Kontextmenüs von Eingabe- und Textfeldern die Möglichkeit zum "
 "Ändern der Eingabemethode bieten?"
 
-#: ../gtk/gtksettings.c:587
+#: ../gtk/gtksettings.c:591
 msgid "Show the 'Insert Unicode Control Character' menu"
 msgstr "Menü »Unicode-Steuerzeichen einfügen« anzeigen"
 
-#: ../gtk/gtksettings.c:588
+#: ../gtk/gtksettings.c:592
 msgid ""
 "Whether the context menus of entries and text views should offer to insert "
 "control characters"
@@ -5537,248 +5646,248 @@ msgstr ""
 "Sollen die Kontextmenüs von Eingabe- und Textfeldern die Möglichkeit zum "
 "Einfügen von Steuerzeichen bieten?"
 
-#: ../gtk/gtksettings.c:596
+#: ../gtk/gtksettings.c:600
 msgid "Start timeout"
 msgstr "Anfangs-Zeitlimit"
 
-#: ../gtk/gtksettings.c:597
+#: ../gtk/gtksettings.c:601
 msgid "Starting value for timeouts, when button is pressed"
 msgstr "Anfangswert für Zeitlimits, wenn der Knopf gedrückt wird"
 
-#: ../gtk/gtksettings.c:606
+#: ../gtk/gtksettings.c:610
 msgid "Repeat timeout"
 msgstr "Wiederholungs-Zeitlimit"
 
-#: ../gtk/gtksettings.c:607
+#: ../gtk/gtksettings.c:611
 msgid "Repeat value for timeouts, when button is pressed"
 msgstr "Wiederholungswert für Zeitlimits, wenn der Knopf gedrückt wird"
 
-#: ../gtk/gtksettings.c:616
+#: ../gtk/gtksettings.c:620
 msgid "Expand timeout"
 msgstr "Erweiterungs-Zeitlimit"
 
-#: ../gtk/gtksettings.c:617
+#: ../gtk/gtksettings.c:621
 msgid "Expand value for timeouts, when a widget is expanding a new region"
 msgstr ""
 "Erweiterungswert für Zeitlimits, wenn ein Widget in eine neue Region "
 "expandiert"
 
-#: ../gtk/gtksettings.c:652
+#: ../gtk/gtksettings.c:656
 msgid "Color scheme"
 msgstr "Farbschema"
 
-#: ../gtk/gtksettings.c:653
+#: ../gtk/gtksettings.c:657
 msgid "A palette of named colors for use in themes"
 msgstr "Eine Palette benannter Farben zur Verwendung in Themen"
 
-#: ../gtk/gtksettings.c:662
+#: ../gtk/gtksettings.c:666
 msgid "Enable Animations"
 msgstr "Animationen aktivieren"
 
-#: ../gtk/gtksettings.c:663
+#: ../gtk/gtksettings.c:667
 msgid "Whether to enable toolkit-wide animations."
 msgstr "Sollen Toolkit-weite Animationen aktiviert werden?"
 
-#: ../gtk/gtksettings.c:681
+#: ../gtk/gtksettings.c:685
 msgid "Enable Touchscreen Mode"
 msgstr "Touchscreen-Modus aktivieren"
 
-#: ../gtk/gtksettings.c:682
+#: ../gtk/gtksettings.c:686
 msgid "When TRUE, there are no motion notify events delivered on this screen"
 msgstr ""
 "Falls WAHR, werden auf diesem Bildschirm keine Bewegungsbenachrichtigungs-"
 "Ereignisse geliefert"
 
-#: ../gtk/gtksettings.c:699
+#: ../gtk/gtksettings.c:703
 msgid "Tooltip timeout"
 msgstr "Minihilfe-Zeitlimit"
 
-#: ../gtk/gtksettings.c:700
+#: ../gtk/gtksettings.c:704
 msgid "Timeout before tooltip is shown"
 msgstr "Zeitlimit, bis eine Minihilfe angezeigt wird"
 
-#: ../gtk/gtksettings.c:725
+#: ../gtk/gtksettings.c:729
 msgid "Tooltip browse timeout"
 msgstr "Minihilfe-Auswahl-Zeitlimit"
 
-#: ../gtk/gtksettings.c:726
+#: ../gtk/gtksettings.c:730
 msgid "Timeout before tooltip is shown when browse mode is enabled"
 msgstr "Zeitlimit, bevor eine Minihilfe im Auswahlmodus angezeigt wird"
 
-#: ../gtk/gtksettings.c:747
+#: ../gtk/gtksettings.c:751
 msgid "Tooltip browse mode timeout"
 msgstr "Minihilfe-Auswahlmodus-Zeitlimit"
 
-#: ../gtk/gtksettings.c:748
+#: ../gtk/gtksettings.c:752
 msgid "Timeout after which browse mode is disabled"
 msgstr "Zeitlimit, nach dem der Auswahlmodus deaktiviert wird"
 
-#: ../gtk/gtksettings.c:767
+#: ../gtk/gtksettings.c:771
 msgid "Keynav Cursor Only"
 msgstr "Nur Cursor-Tasten-Navigation"
 
-#: ../gtk/gtksettings.c:768
+#: ../gtk/gtksettings.c:772
 msgid "When TRUE, there are only cursor keys available to navigate widgets"
 msgstr ""
 "Falls WAHR, kann nur mit den Cursor-Tasten durch Widgets navigiert werden."
 
-#: ../gtk/gtksettings.c:785
+#: ../gtk/gtksettings.c:789
 msgid "Keynav Wrap Around"
 msgstr "Umbruch bei Tastaturnavigation"
 
-#: ../gtk/gtksettings.c:786
+#: ../gtk/gtksettings.c:790
 msgid "Whether to wrap around when keyboard-navigating widgets"
 msgstr ""
 "Legt fest, ob bei Navigation mit der Tastatur unten umgebrochen werden soll."
 
-#: ../gtk/gtksettings.c:806
+#: ../gtk/gtksettings.c:810
 msgid "Error Bell"
 msgstr "Fehler-Signal"
 
-#: ../gtk/gtksettings.c:807
+#: ../gtk/gtksettings.c:811
 msgid "When TRUE, keyboard navigation and other errors will cause a beep"
 msgstr ""
 "Falls WAHR, erzeugen Tastaturnavigations- und andere Fehler einen Klang."
 
-#: ../gtk/gtksettings.c:824
+#: ../gtk/gtksettings.c:828
 msgid "Color Hash"
 msgstr "Farb-Hash"
 
-#: ../gtk/gtksettings.c:825
+#: ../gtk/gtksettings.c:829
 msgid "A hash table representation of the color scheme."
 msgstr "Eine Hash-Tabelle des Farbschemas"
 
-#: ../gtk/gtksettings.c:833
+#: ../gtk/gtksettings.c:837
 msgid "Default file chooser backend"
 msgstr "Vorgabe-Backend des Dateiwählers"
 
-#: ../gtk/gtksettings.c:834
+#: ../gtk/gtksettings.c:838
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Der Name des per Vorgabe zu verwendenden GtkFileChooser-Backends"
 
-#: ../gtk/gtksettings.c:851
+#: ../gtk/gtksettings.c:855
 msgid "Default print backend"
 msgstr "Vorgabe-Backend des Druckdialogs"
 
-#: ../gtk/gtksettings.c:852
+#: ../gtk/gtksettings.c:856
 msgid "List of the GtkPrintBackend backends to use by default"
 msgstr ""
 "Liste der Namen von per Vorgabe zu verwendenden GtkPrintBackend-Backends"
 
-#: ../gtk/gtksettings.c:875
+#: ../gtk/gtksettings.c:879
 msgid "Default command to run when displaying a print preview"
 msgstr ""
 "Vorgabebefehl, der beim Anzeigen der Druckvorschau ausgeführt werden soll"
 
-#: ../gtk/gtksettings.c:876
+#: ../gtk/gtksettings.c:880
 msgid "Command to run when displaying a print preview"
 msgstr "Befehl, der beim Anzeigen der Druckvorschau ausgeführt werden soll"
 
-#: ../gtk/gtksettings.c:892
+#: ../gtk/gtksettings.c:896
 msgid "Enable Mnemonics"
 msgstr "Mnemonics aktivieren"
 
-#: ../gtk/gtksettings.c:893
+#: ../gtk/gtksettings.c:897
 msgid "Whether labels should have mnemonics"
 msgstr "Legt fest, ob Beschriftungen Mnemonics haben sollen"
 
-#: ../gtk/gtksettings.c:909
+#: ../gtk/gtksettings.c:913
 msgid "Enable Accelerators"
 msgstr "Kürzel aktivieren"
 
-#: ../gtk/gtksettings.c:910
+#: ../gtk/gtksettings.c:914
 msgid "Whether menu items should have accelerators"
 msgstr "Legt fest, ob Menüeinträge Kürzel haben sollen"
 
-#: ../gtk/gtksettings.c:927
+#: ../gtk/gtksettings.c:931
 msgid "Recent Files Limit"
 msgstr "Limit der zuletzt verwendeten Dateien"
 
-#: ../gtk/gtksettings.c:928
+#: ../gtk/gtksettings.c:932
 msgid "Number of recently used files"
 msgstr "Anzahl der zuletzt verwendeten Dateien"
 
-#: ../gtk/gtksettings.c:946
+#: ../gtk/gtksettings.c:950
 msgid "Default IM module"
 msgstr "Vorgabe-IM-Modul"
 
-#: ../gtk/gtksettings.c:947
+#: ../gtk/gtksettings.c:951
 msgid "Which IM module should be used by default"
 msgstr "Welches IM-Modul soll verwendet werden?"
 
-#: ../gtk/gtksettings.c:965
+#: ../gtk/gtksettings.c:969
 msgid "Recent Files Max Age"
 msgstr "Maximales Alter der zuletzt verwendeten Dateien"
 
-#: ../gtk/gtksettings.c:966
+#: ../gtk/gtksettings.c:970
 msgid "Maximum age of recently used files, in days"
 msgstr "Maximales Alter der zuletzt verwendeten Dateien in Tagen"
 
-#: ../gtk/gtksettings.c:975
+#: ../gtk/gtksettings.c:979
 msgid "Fontconfig configuration timestamp"
 msgstr "Fontconfig-Einstellungs-Zeitstempel"
 
-#: ../gtk/gtksettings.c:976
+#: ../gtk/gtksettings.c:980
 msgid "Timestamp of current fontconfig configuration"
 msgstr "Zeitstempel der aktuellen Fontconfig-Einstellungen"
 
-#: ../gtk/gtksettings.c:998
+#: ../gtk/gtksettings.c:1002
 msgid "Sound Theme Name"
 msgstr "Audiothemenname"
 
-#: ../gtk/gtksettings.c:999
+#: ../gtk/gtksettings.c:1003
 msgid "XDG sound theme name"
 msgstr "XDG-Audiothemenname"
 
 #. Translators: this means sounds that are played as feedback to user input
-#: ../gtk/gtksettings.c:1021
+#: ../gtk/gtksettings.c:1025
 msgid "Audible Input Feedback"
 msgstr "Rückmeldung mit Klängen"
 
-#: ../gtk/gtksettings.c:1022
+#: ../gtk/gtksettings.c:1026
 msgid "Whether to play event sounds as feedback to user input"
 msgstr "Soll auf Ereignisse eine Rückmeldung durch Klänge erfolgen?"
 
-#: ../gtk/gtksettings.c:1043
+#: ../gtk/gtksettings.c:1047
 msgid "Enable Event Sounds"
 msgstr "Ereignis-Klänge aktivieren"
 
-#: ../gtk/gtksettings.c:1044
+#: ../gtk/gtksettings.c:1048
 msgid "Whether to play any event sounds at all"
 msgstr "Sollen Ereignis-Klänge gespielt werden?"
 
-#: ../gtk/gtksettings.c:1059
+#: ../gtk/gtksettings.c:1063
 msgid "Enable Tooltips"
 msgstr "Minihilfen aktivieren"
 
-#: ../gtk/gtksettings.c:1060
+#: ../gtk/gtksettings.c:1064
 msgid "Whether tooltips should be shown on widgets"
 msgstr "Sollen Minihilfen auf Widgets angezeigt werden?"
 
-#: ../gtk/gtksettings.c:1073
+#: ../gtk/gtksettings.c:1077
 msgid "Toolbar style"
 msgstr "Werkzeugleisten-Stil"
 
-#: ../gtk/gtksettings.c:1074
+#: ../gtk/gtksettings.c:1078
 msgid ""
 "Whether default toolbars have text only, text and icons, icons only, etc."
 msgstr ""
 "Sollen normale Werkzeugleisten nur Text, Text und Symbole, nur Symbole, etc. "
 "haben?"
 
-#: ../gtk/gtksettings.c:1088
+#: ../gtk/gtksettings.c:1092
 msgid "Toolbar Icon Size"
 msgstr "Symbolgröße in Werkzeugleiste"
 
-#: ../gtk/gtksettings.c:1089
+#: ../gtk/gtksettings.c:1093
 msgid "The size of icons in default toolbars."
 msgstr "Die Größe der Symbole in normalen Werkzeugleisten."
 
-#: ../gtk/gtksettings.c:1106
+#: ../gtk/gtksettings.c:1110
 msgid "Auto Mnemonics"
 msgstr "Automatische Mnemonics"
 
-#: ../gtk/gtksettings.c:1107
+#: ../gtk/gtksettings.c:1111
 msgid ""
 "Whether mnemonics should be automatically shown and hidden when the user "
 "presses the mnemonic activator."
@@ -5786,62 +5895,74 @@ msgstr ""
 "Sollen Tastenkürzel automatisch angezeigt oder verborgen werden, wenn der "
 "Benutzer die Tastenkürzel-Aktivierung drückt?"
 
-#: ../gtk/gtksettings.c:1132
+#: ../gtk/gtksettings.c:1127
+msgid "Visible Focus"
+msgstr "Zeiger sichtbar"
+
+#: ../gtk/gtksettings.c:1128
+msgid ""
+"Whether 'focus rectangles' should be hidden until the user starts to use the "
+"keyboard."
+msgstr ""
+"Legt fest, ob »Fokus-Boxen« verborgen werden sollen, bis der Benutzer die "
+"Tastatur bedient."
+
+#: ../gtk/gtksettings.c:1154
 msgid "Application prefers a dark theme"
 msgstr "Anwendung bevorzugt ein dunkles Thema"
 
-#: ../gtk/gtksettings.c:1133
+#: ../gtk/gtksettings.c:1155
 msgid "Whether the application prefers to have a dark theme."
 msgstr "Legt fest, ob die Anwendung ein dunkles Thema bevorzugt."
 
-#: ../gtk/gtksettings.c:1148
+#: ../gtk/gtksettings.c:1170
 msgid "Show button images"
 msgstr "Knopfbilder anzeigen"
 
-#: ../gtk/gtksettings.c:1149
+#: ../gtk/gtksettings.c:1171
 msgid "Whether images should be shown on buttons"
 msgstr "Sollen auf Knöpfen Bilder angezeigt werden?"
 
-#: ../gtk/gtksettings.c:1157 ../gtk/gtksettings.c:1251
+#: ../gtk/gtksettings.c:1179 ../gtk/gtksettings.c:1273
 msgid "Select on focus"
 msgstr "Beim Fokussieren markieren"
 
-#: ../gtk/gtksettings.c:1158
+#: ../gtk/gtksettings.c:1180
 msgid "Whether to select the contents of an entry when it is focused"
 msgstr ""
 "Soll der Inhalt eines Eintrages markiert werden, wenn er fokussiert wird?"
 
-#: ../gtk/gtksettings.c:1175
+#: ../gtk/gtksettings.c:1197
 msgid "Password Hint Timeout"
 msgstr "Zeitlimit des Passwort-Hinweises"
 
-#: ../gtk/gtksettings.c:1176
+#: ../gtk/gtksettings.c:1198
 msgid "How long to show the last input character in hidden entries"
 msgstr ""
 "Wie lange soll das zuletzt eingegebene Zeichen in versteckten Eingabefeldern "
 "angezeigt werden?"
 
-#: ../gtk/gtksettings.c:1185
+#: ../gtk/gtksettings.c:1207
 msgid "Show menu images"
 msgstr "Menübilder anzeigen"
 
-#: ../gtk/gtksettings.c:1186
+#: ../gtk/gtksettings.c:1208
 msgid "Whether images should be shown in menus"
 msgstr "Sollen in Menüs Bilder angezeigt werden?"
 
-#: ../gtk/gtksettings.c:1194
+#: ../gtk/gtksettings.c:1216
 msgid "Delay before drop down menus appear"
 msgstr "Die Verzögerung bis zum Erscheinen der Herabklapp-Menüs"
 
-#: ../gtk/gtksettings.c:1195
+#: ../gtk/gtksettings.c:1217
 msgid "Delay before the submenus of a menu bar appear"
 msgstr "Die Verzögerung bis zum Erscheinen der Untermenüs in einer Menüleiste"
 
-#: ../gtk/gtksettings.c:1212
+#: ../gtk/gtksettings.c:1234
 msgid "Scrolled Window Placement"
 msgstr "Platzierung verschobener Fenster"
 
-#: ../gtk/gtksettings.c:1213
+#: ../gtk/gtksettings.c:1235
 msgid ""
 "Where the contents of scrolled windows are located with respect to the "
 "scrollbars, if not overridden by the scrolled window's own placement."
@@ -5850,33 +5971,33 @@ msgstr ""
 "liegen, falls der Wert nicht durch die eigene Position des verschobenen "
 "Fensters überschrieben wird?"
 
-#: ../gtk/gtksettings.c:1222
+#: ../gtk/gtksettings.c:1244
 msgid "Can change accelerators"
 msgstr "Kürzel können geändert werden"
 
-#: ../gtk/gtksettings.c:1223
+#: ../gtk/gtksettings.c:1245
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Sollen Menükürzel geändert werden können, indem man eine Taste drückt, wenn "
 "der Menüeintrag markiert ist?"
 
-#: ../gtk/gtksettings.c:1231
+#: ../gtk/gtksettings.c:1253
 msgid "Delay before submenus appear"
 msgstr "Verzögerung bis zum Erscheinen der Untermenüs"
 
-#: ../gtk/gtksettings.c:1232
+#: ../gtk/gtksettings.c:1254
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Die Zeit, die sich der Mauszeiger über einem Menüeintrag befinden muss, bevor "
 "das Untermenü erscheint"
 
-#: ../gtk/gtksettings.c:1241
+#: ../gtk/gtksettings.c:1263
 msgid "Delay before hiding a submenu"
 msgstr "Verzögerung bis zum Verbergen eines Untermenüs"
 
-#: ../gtk/gtksettings.c:1242
+#: ../gtk/gtksettings.c:1264
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
@@ -5884,45 +6005,45 @@ msgstr ""
 "Die Zeit, bis ein Untermenü verborgen wird, wenn sich der Mauszeiger in "
 "dessen Richtung bewegt"
 
-#: ../gtk/gtksettings.c:1252
+#: ../gtk/gtksettings.c:1274
 msgid "Whether to select the contents of a selectable label when it is focused"
 msgstr ""
 "Soll der Inhalt einer auswählbaren Beschriftung markiert werden, wenn sie "
 "fokussiert wird?"
 
-#: ../gtk/gtksettings.c:1260
+#: ../gtk/gtksettings.c:1282
 msgid "Custom palette"
 msgstr "Eigene Palette"
 
-#: ../gtk/gtksettings.c:1261
+#: ../gtk/gtksettings.c:1283
 msgid "Palette to use in the color selector"
 msgstr "Im Farbwähler zu verwendende Palette"
 
 # CHECK
-#: ../gtk/gtksettings.c:1269
+#: ../gtk/gtksettings.c:1291
 msgid "IM Preedit style"
 msgstr "Im Voraus bearbeiteter EM-Stil"
 
 # CHECK
-#: ../gtk/gtksettings.c:1270
+#: ../gtk/gtksettings.c:1292
 msgid "How to draw the input method preedit string"
 msgstr ""
 "Wie die im Voraus bearbeitete Eingabemethoden-Zeichenkette gezeichnet werden "
 "soll"
 
-#: ../gtk/gtksettings.c:1279
+#: ../gtk/gtksettings.c:1301
 msgid "IM Status style"
 msgstr "EM-Statusstil"
 
-#: ../gtk/gtksettings.c:1280
+#: ../gtk/gtksettings.c:1302
 msgid "How to draw the input method statusbar"
 msgstr "Wie die Eingabemethoden-Statusleiste gezeichnet werden soll"
 
-#: ../gtk/gtksizegroup.c:301
+#: ../gtk/gtksizegroup.c:382 ../gtk/gtktreeselection.c:130
 msgid "Mode"
 msgstr "Modus"
 
-#: ../gtk/gtksizegroup.c:302
+#: ../gtk/gtksizegroup.c:383
 msgid ""
 "The directions in which the size group affects the requested sizes of its "
 "component widgets"
@@ -5930,26 +6051,26 @@ msgstr ""
 "Die Richtungen, in denen die Größengruppe die angeforderten Größen ihrer "
 "Komponenten-Widgets beeinflusst"
 
-#: ../gtk/gtksizegroup.c:318
+#: ../gtk/gtksizegroup.c:399
 msgid "Ignore hidden"
 msgstr "Versteckte ignorieren"
 
-#: ../gtk/gtksizegroup.c:319
+#: ../gtk/gtksizegroup.c:400
 msgid ""
 "If TRUE, unmapped widgets are ignored when determining the size of the group"
 msgstr ""
 "Wenn WAHR, werden alle nicht zugewiesenen Widgets beim Berechnen der "
 "Gruppengröße ignoriert"
 
-#: ../gtk/gtkspinbutton.c:328
+#: ../gtk/gtkspinbutton.c:331
 msgid "Climb Rate"
 msgstr "Steigrate"
 
-#: ../gtk/gtkspinbutton.c:348
+#: ../gtk/gtkspinbutton.c:351
 msgid "Snap to Ticks"
 msgstr "Auf Teilstriche einrasten"
 
-#: ../gtk/gtkspinbutton.c:349
+#: ../gtk/gtkspinbutton.c:352
 msgid ""
 "Whether erroneous values are automatically changed to a spin button's nearest "
 "step increment"
@@ -5957,93 +6078,93 @@ msgstr ""
 "Sollen abseits liegende Werte automatisch auf das nächste "
 "Schrittweitenvielfache des Spinbuttons gerundet werden?"
 
-#: ../gtk/gtkspinbutton.c:356
+#: ../gtk/gtkspinbutton.c:359
 msgid "Numeric"
 msgstr "Numerisch"
 
-#: ../gtk/gtkspinbutton.c:357
+#: ../gtk/gtkspinbutton.c:360
 msgid "Whether non-numeric characters should be ignored"
 msgstr "Sollen nicht-numerische Zeichen ignoriert werden?"
 
-#: ../gtk/gtkspinbutton.c:364
+#: ../gtk/gtkspinbutton.c:367
 msgid "Wrap"
 msgstr "Zyklisch"
 
-#: ../gtk/gtkspinbutton.c:365
+#: ../gtk/gtkspinbutton.c:368
 msgid "Whether a spin button should wrap upon reaching its limits"
 msgstr "Soll der Spinbutton beim Erreichen seiner Grenzen umbrechen?"
 
-#: ../gtk/gtkspinbutton.c:372
+#: ../gtk/gtkspinbutton.c:375
 msgid "Update Policy"
 msgstr "Aktualisierungsmethode"
 
-#: ../gtk/gtkspinbutton.c:373
+#: ../gtk/gtkspinbutton.c:376
 msgid ""
 "Whether the spin button should update always, or only when the value is legal"
 msgstr ""
 "Soll der Spinbutton immer aktualisieren, oder nur wenn der Wert zulässig ist?"
 
-#: ../gtk/gtkspinbutton.c:382
+#: ../gtk/gtkspinbutton.c:385
 msgid "Reads the current value, or sets a new value"
 msgstr "Liest den aktuellen Wert aus oder stellt einen neuen ein"
 
-#: ../gtk/gtkspinbutton.c:391
+#: ../gtk/gtkspinbutton.c:394
 msgid "Style of bevel around the spin button"
 msgstr "Der Stil der Fase um den Spinbutton"
 
-#: ../gtk/gtkspinner.c:119
+#: ../gtk/gtkspinner.c:116
 msgid "Whether the spinner is active"
 msgstr "Soll der Spinner aktiv sein?"
 
-#: ../gtk/gtkstatusbar.c:181
+#: ../gtk/gtkstatusbar.c:183
 msgid "Style of bevel around the statusbar text"
 msgstr "Stil der Fase um den Text der Statusleiste"
 
-#: ../gtk/gtkstatusicon.c:263
+#: ../gtk/gtkstatusicon.c:293
 msgid "The size of the icon"
 msgstr "Die Größe des Symbols"
 
-#: ../gtk/gtkstatusicon.c:273
+#: ../gtk/gtkstatusicon.c:303
 msgid "The screen where this status icon will be displayed"
 msgstr "Der Bildschirm, auf dem dieses Statussymbol angezeigt werden soll"
 
-#: ../gtk/gtkstatusicon.c:281
+#: ../gtk/gtkstatusicon.c:311
 msgid "Whether the status icon is visible"
 msgstr "Legt fest, ob das Statussymbol sichtbar sein soll"
 
-#: ../gtk/gtkstatusicon.c:297
+#: ../gtk/gtkstatusicon.c:327
 msgid "Whether the status icon is embedded"
 msgstr "Legt fest, ob das Statussymbol eingebettet ist"
 
-#: ../gtk/gtkstatusicon.c:313 ../gtk/gtktrayicon-x11.c:129
+#: ../gtk/gtkstatusicon.c:343 ../gtk/gtktrayicon-x11.c:129
 msgid "The orientation of the tray"
 msgstr "Die Ausrichtung des Benachrichtigungsfeldes"
 
-#: ../gtk/gtkstatusicon.c:340 ../gtk/gtkwidget.c:1072
+#: ../gtk/gtkstatusicon.c:370 ../gtk/gtkwidget.c:1091
 msgid "Has tooltip"
 msgstr "Hat Minihilfe"
 
-#: ../gtk/gtkstatusicon.c:341
+#: ../gtk/gtkstatusicon.c:371
 msgid "Whether this tray icon has a tooltip"
 msgstr "Legt fest, ob das Benachrichtigungssymbol eine Minihilfe hat"
 
-#: ../gtk/gtkstatusicon.c:366 ../gtk/gtkwidget.c:1093
+#: ../gtk/gtkstatusicon.c:396 ../gtk/gtkwidget.c:1112
 msgid "Tooltip Text"
 msgstr "Minihilfe-Text"
 
-#: ../gtk/gtkstatusicon.c:367 ../gtk/gtkwidget.c:1094 ../gtk/gtkwidget.c:1115
+#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1113 ../gtk/gtkwidget.c:1134
 msgid "The contents of the tooltip for this widget"
 msgstr "Der Inhalt der Minihilfe dieses Widgets"
 
-#: ../gtk/gtkstatusicon.c:390 ../gtk/gtkwidget.c:1114
+#: ../gtk/gtkstatusicon.c:420 ../gtk/gtkwidget.c:1133
 msgid "Tooltip markup"
 msgstr "Minihilfen-Markup"
 
-#: ../gtk/gtkstatusicon.c:391
+#: ../gtk/gtkstatusicon.c:421
 msgid "The contents of the tooltip for this tray icon"
 msgstr "Der Inhalt der Minihilfe dieses Benachrichtigungssymbols"
 
-#: ../gtk/gtkstatusicon.c:409
+#: ../gtk/gtkstatusicon.c:439
 msgid "The title of this tray icon"
 msgstr "Die Größe des Benachrichtigungssymbols"
 
@@ -6055,87 +6176,87 @@ msgstr "Stil-Kontext"
 msgid "GtkStyleContext to get style from"
 msgstr "GtkStyleContext, aus dem der Stil bezogen wird"
 
-#: ../gtk/gtkstylecontext.c:546
+#: ../gtk/gtkstylecontext.c:433
 msgid "The associated GdkScreen"
 msgstr "Der zugeordnete GdkScreen"
 
-#: ../gtk/gtkstylecontext.c:552
+#: ../gtk/gtkstylecontext.c:439
 msgid "Direction"
 msgstr "Richtung"
 
-#: ../gtk/gtkstylecontext.c:553 ../gtk/gtktexttag.c:236
+#: ../gtk/gtkstylecontext.c:440 ../gtk/gtktexttag.c:269
 msgid "Text direction"
 msgstr "Textrichtung"
 
-#: ../gtk/gtkswitch.c:802
+#: ../gtk/gtkswitch.c:784
 msgid "Whether the switch is on or off"
 msgstr "Legt fest, ob der Schalter an oder aus ist."
 
-#: ../gtk/gtkswitch.c:837
+#: ../gtk/gtkswitch.c:818
 msgid "The minimum width of the handle"
 msgstr "Die minimale Breite des Anfassers"
 
-#: ../gtk/gtktable.c:157
+#: ../gtk/gtktable.c:191
 msgid "Rows"
 msgstr "Zeilen"
 
-#: ../gtk/gtktable.c:158
+#: ../gtk/gtktable.c:192
 msgid "The number of rows in the table"
 msgstr "Die Anzahl der Zeilen in der Tabelle"
 
-#: ../gtk/gtktable.c:166
+#: ../gtk/gtktable.c:200
 msgid "Columns"
 msgstr "Spalten"
 
-#: ../gtk/gtktable.c:167
+#: ../gtk/gtktable.c:201
 msgid "The number of columns in the table"
 msgstr "Die Anzahl der Spalten in der Tabelle"
 
-#: ../gtk/gtktable.c:194
+#: ../gtk/gtktable.c:228
 msgid "If TRUE, the table cells are all the same width/height"
 msgstr "Falls WAHR, sind die Tabellenzellen alle gleich breit/hoch"
 
-#: ../gtk/gtktable.c:208
+#: ../gtk/gtktable.c:242
 msgid "Right attachment"
 msgstr "Rechts anhängen"
 
-#: ../gtk/gtktable.c:209
+#: ../gtk/gtktable.c:243
 msgid "The column number to attach the right side of a child widget to"
 msgstr ""
 "Die Spaltennummer, an die die rechte Seite eines Kind-Widgets angehängt "
 "werden soll"
 
-#: ../gtk/gtktable.c:216
+#: ../gtk/gtktable.c:250
 msgid "The row number to attach the top of a child widget to"
 msgstr ""
 "Die Spaltennummer, an die die obere Seite eines Kind-Widgets angehängt werden "
 "soll"
 
-#: ../gtk/gtktable.c:222
+#: ../gtk/gtktable.c:256
 msgid "Bottom attachment"
 msgstr "Unten anhängen"
 
-#: ../gtk/gtktable.c:229
+#: ../gtk/gtktable.c:263
 msgid "Horizontal options"
 msgstr "Horizontale Optionen"
 
-#: ../gtk/gtktable.c:230
+#: ../gtk/gtktable.c:264
 msgid "Options specifying the horizontal behaviour of the child"
 msgstr "Diese Optionen geben das horizontale Verhalten des Kindes an"
 
-#: ../gtk/gtktable.c:236
+#: ../gtk/gtktable.c:270
 msgid "Vertical options"
 msgstr "Vertikale Optionen"
 
-#: ../gtk/gtktable.c:237
+#: ../gtk/gtktable.c:271
 msgid "Options specifying the vertical behaviour of the child"
 msgstr "Diese Optionen geben das vertikale Verhalten des Kindes an"
 
-#: ../gtk/gtktable.c:243
+#: ../gtk/gtktable.c:277
 msgid "Horizontal padding"
 msgstr "Horizontale Auffüllung"
 
-#: ../gtk/gtktable.c:244
+#: ../gtk/gtktable.c:278
 msgid ""
 "Extra space to put between the child and its left and right neighbors, in "
 "pixels"
@@ -6143,11 +6264,11 @@ msgstr ""
 "Zusätzlicher Freiraum zwischen dem Kind und dessen linken und rechten "
 "Nachbarn, in Pixel"
 
-#: ../gtk/gtktable.c:250
+#: ../gtk/gtktable.c:284
 msgid "Vertical padding"
 msgstr "Vertikale Auffüllung"
 
-#: ../gtk/gtktable.c:251
+#: ../gtk/gtktable.c:285
 msgid ""
 "Extra space to put between the child and its upper and lower neighbors, in "
 "pixels"
@@ -6155,51 +6276,51 @@ msgstr ""
 "Zusätzlicher Freiraum zwischen dem Kind und dessen oberen und unteren "
 "Nachbarn, in Pixel"
 
-#: ../gtk/gtktextbuffer.c:192
+#: ../gtk/gtktextbuffer.c:203
 msgid "Tag Table"
 msgstr "Tag-Tabelle"
 
-#: ../gtk/gtktextbuffer.c:193
+#: ../gtk/gtktextbuffer.c:204
 msgid "Text Tag Table"
 msgstr "Text-Tag-Tabelle"
 
-#: ../gtk/gtktextbuffer.c:211
+#: ../gtk/gtktextbuffer.c:222
 msgid "Current text of the buffer"
 msgstr "Aktueller Text des Puffers"
 
-#: ../gtk/gtktextbuffer.c:225
+#: ../gtk/gtktextbuffer.c:236
 msgid "Has selection"
 msgstr "Hat Auswahl"
 
-#: ../gtk/gtktextbuffer.c:226
+#: ../gtk/gtktextbuffer.c:237
 msgid "Whether the buffer has some text currently selected"
 msgstr "Ob der Puffer einen momentan ausgewählten Text hat"
 
-#: ../gtk/gtktextbuffer.c:242
+#: ../gtk/gtktextbuffer.c:253
 msgid "Cursor position"
 msgstr "Zeigerposition"
 
-#: ../gtk/gtktextbuffer.c:243
+#: ../gtk/gtktextbuffer.c:254
 msgid ""
 "The position of the insert mark (as offset from the beginning of the buffer)"
 msgstr "Die Position des Einfügezeigers (Versatz zum Beginn des Puffers)"
 
-#: ../gtk/gtktextbuffer.c:258
+#: ../gtk/gtktextbuffer.c:269
 msgid "Copy target list"
 msgstr "Ziele für »Kopieren«"
 
-#: ../gtk/gtktextbuffer.c:259
+#: ../gtk/gtktextbuffer.c:270
 msgid ""
 "The list of targets this buffer supports for clipboard copying and DND source"
 msgstr ""
 "Die Liste der Ziele, die dieser Puffer für das Kopieren aus der "
 "Zwischenablage und Drag&Drop-Quellen unterstützt."
 
-#: ../gtk/gtktextbuffer.c:274
+#: ../gtk/gtktextbuffer.c:285
 msgid "Paste target list"
 msgstr "Ziele für »Einfügen«"
 
-#: ../gtk/gtktextbuffer.c:275
+#: ../gtk/gtktextbuffer.c:286
 msgid ""
 "The list of targets this buffer supports for clipboard pasting and DND "
 "destination"
@@ -6207,38 +6328,38 @@ msgstr ""
 "Die Liste der Ziele, die dieser Puffer für das Einfügen aus der "
 "Zwischenablage und durch Drag&Drop-Zielen unterstützt."
 
-#: ../gtk/gtktextmark.c:90
+#: ../gtk/gtktextmark.c:127
 msgid "Mark name"
 msgstr "Markierungsname"
 
 # CHECK
-#: ../gtk/gtktextmark.c:97
+#: ../gtk/gtktextmark.c:134
 msgid "Left gravity"
 msgstr "Linke Schwere"
 
-#: ../gtk/gtktextmark.c:98
+#: ../gtk/gtktextmark.c:135
 msgid "Whether the mark has left gravity"
 msgstr "Legt fest, ob die Markierung linke Schwere besitzt."
 
-#: ../gtk/gtktexttag.c:186
+#: ../gtk/gtktexttag.c:189
 msgid "Tag name"
 msgstr "Tagname"
 
-#: ../gtk/gtktexttag.c:187
+#: ../gtk/gtktexttag.c:190
 msgid "Name used to refer to the text tag. NULL for anonymous tags"
 msgstr ""
 "Dieser Name wird verwendet, um auf das Text-Tag Bezug zu nehmen. NULL "
 "bedeutet anonyme Tags"
 
-#: ../gtk/gtktexttag.c:205
-msgid "Background color as a (possibly unallocated) GdkColor"
-msgstr "Hintergrundfarbe als (möglicherweise nicht zugewiesene) GdkColor"
+#: ../gtk/gtktexttag.c:222
+msgid "Background RGBA"
+msgstr "RGBA-Hintergrundfarbe"
 
-#: ../gtk/gtktexttag.c:212
+#: ../gtk/gtktexttag.c:230
 msgid "Background full height"
 msgstr "Hintergrund über volle Höhe"
 
-#: ../gtk/gtktexttag.c:213
+#: ../gtk/gtktexttag.c:231
 msgid ""
 "Whether the background color fills the entire line height or only the height "
 "of the tagged characters"
@@ -6246,23 +6367,23 @@ msgstr ""
 "Soll die Hintergrundfarbe die gesamte Zeilenhöhe oder nur die Höhe der "
 "markierten Zeichen ausfüllen?"
 
-#: ../gtk/gtktexttag.c:229
-msgid "Foreground color as a (possibly unallocated) GdkColor"
-msgstr "Die Vordergrundfarbe als (möglicherweise nicht zugewiesene) GdkColor"
+#: ../gtk/gtktexttag.c:261
+msgid "Foreground RGBA"
+msgstr "RGBA-Vordergrundfarbe"
 
-#: ../gtk/gtktexttag.c:237
+#: ../gtk/gtktexttag.c:270
 msgid "Text direction, e.g. right-to-left or left-to-right"
 msgstr "Die Textrichtung, d.h. von rechts nach links oder von links nach rechts"
 
-#: ../gtk/gtktexttag.c:286
+#: ../gtk/gtktexttag.c:319
 msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
 msgstr "Der Schriftstil als PangoStyle, z.B. PANGO_STYLE_ITALIC"
 
-#: ../gtk/gtktexttag.c:295
+#: ../gtk/gtktexttag.c:328
 msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
 msgstr "Die Schriftvariation als PangoVariant, z.B. PANGO_VARIANT_SMALL_CAPS"
 
-#: ../gtk/gtktexttag.c:304
+#: ../gtk/gtktexttag.c:337
 msgid ""
 "Font weight as an integer, see predefined values in PangoWeight; for example, "
 "PANGO_WEIGHT_BOLD"
@@ -6270,15 +6391,15 @@ msgstr ""
 "Das Schriftgewicht als Ganzzahl, siehe vordefinierte Werte in PangoWeight; z."
 "B. PANGO_WEIGHT_BOLD"
 
-#: ../gtk/gtktexttag.c:315
+#: ../gtk/gtktexttag.c:348
 msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
 msgstr "Die Schriftdehnung als PangoStrech, z.B. PANGO_STRECH_CONDENSED"
 
-#: ../gtk/gtktexttag.c:324
+#: ../gtk/gtktexttag.c:357
 msgid "Font size in Pango units"
 msgstr "Schriftgröße in Pango-Einheiten"
 
-#: ../gtk/gtktexttag.c:334
+#: ../gtk/gtktexttag.c:367
 msgid ""
 "Font size as a scale factor relative to the default font size. This properly "
 "adapts to theme changes etc. so is recommended. Pango predefines some scales "
@@ -6289,11 +6410,11 @@ msgstr ""
 "empfehlenswert. Pango stellt einige vordefinierte Skalierungen zur Verfügung, "
 "so z.B. PANGO_SCALE_X_LARGE"
 
-#: ../gtk/gtktexttag.c:354 ../gtk/gtktextview.c:702
+#: ../gtk/gtktexttag.c:387 ../gtk/gtktextview.c:704
 msgid "Left, right, or center justification"
 msgstr "Den Text linksbündig, rechtsbündig oder zentriert ausrichten"
 
-#: ../gtk/gtktexttag.c:373
+#: ../gtk/gtktexttag.c:406
 msgid ""
 "The language this text is in, as an ISO code. Pango can use this as a hint "
 "when rendering the text. If not set, an appropriate default will be used."
@@ -6302,31 +6423,31 @@ msgstr ""
 "dies bei der Textdarstellung als Wink verwenden. Falls Sie diesen Parameter "
 "nicht verstehen, benötigen Sie ihn wahrscheinlich nicht."
 
-#: ../gtk/gtktexttag.c:380
+#: ../gtk/gtktexttag.c:413
 msgid "Left margin"
 msgstr "Linker Rand"
 
-#: ../gtk/gtktexttag.c:381 ../gtk/gtktextview.c:711
+#: ../gtk/gtktexttag.c:414 ../gtk/gtktextview.c:713
 msgid "Width of the left margin in pixels"
 msgstr "Die Breite des linken Rands in Pixel"
 
-#: ../gtk/gtktexttag.c:390
+#: ../gtk/gtktexttag.c:423
 msgid "Right margin"
 msgstr "Rechter Rand"
 
-#: ../gtk/gtktexttag.c:391 ../gtk/gtktextview.c:721
+#: ../gtk/gtktexttag.c:424 ../gtk/gtktextview.c:723
 msgid "Width of the right margin in pixels"
 msgstr "Die Breite des linken Rands in Pixel"
 
-#: ../gtk/gtktexttag.c:401 ../gtk/gtktextview.c:730
+#: ../gtk/gtktexttag.c:434 ../gtk/gtktextview.c:732
 msgid "Indent"
 msgstr "Einrückung"
 
-#: ../gtk/gtktexttag.c:402 ../gtk/gtktextview.c:731
+#: ../gtk/gtktexttag.c:435 ../gtk/gtktextview.c:733
 msgid "Amount to indent the paragraph, in pixels"
 msgstr "Die Einrückungstiefe des Absatzes in Pixel"
 
-#: ../gtk/gtktexttag.c:413
+#: ../gtk/gtktexttag.c:446
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative) in "
 "Pango units"
@@ -6334,235 +6455,243 @@ msgstr ""
 "Das Hochstellen des Texts über der Grundlinie (Tiefstellen, wenn der Wert "
 "negativ ist) in Pango-Einheiten"
 
-#: ../gtk/gtktexttag.c:422
+#: ../gtk/gtktexttag.c:455
 msgid "Pixels above lines"
 msgstr "Pixel über Zeilen"
 
-#: ../gtk/gtktexttag.c:423 ../gtk/gtktextview.c:655
+#: ../gtk/gtktexttag.c:456 ../gtk/gtktextview.c:657
 msgid "Pixels of blank space above paragraphs"
 msgstr "Der Leerraum über Absätzen in Pixel"
 
-#: ../gtk/gtktexttag.c:432
+#: ../gtk/gtktexttag.c:465
 msgid "Pixels below lines"
 msgstr "Pixel unter Zeilen"
 
-#: ../gtk/gtktexttag.c:433 ../gtk/gtktextview.c:665
+#: ../gtk/gtktexttag.c:466 ../gtk/gtktextview.c:667
 msgid "Pixels of blank space below paragraphs"
 msgstr "Der Leerraum unter Absätzen in Pixel"
 
-#: ../gtk/gtktexttag.c:442
+#: ../gtk/gtktexttag.c:475
 msgid "Pixels inside wrap"
 msgstr "Pixel im Umbruch"
 
 # CHECK!!!
-#: ../gtk/gtktexttag.c:443 ../gtk/gtktextview.c:675
+#: ../gtk/gtktexttag.c:476 ../gtk/gtktextview.c:677
 msgid "Pixels of blank space between wrapped lines in a paragraph"
 msgstr ""
 "Der Leerraum zwischen umgebrochenen Zeilen innerhalb eines Absatzes in Pixel"
 
-#: ../gtk/gtktexttag.c:470 ../gtk/gtktextview.c:693
+#: ../gtk/gtktexttag.c:503 ../gtk/gtktextview.c:695
 msgid ""
 "Whether to wrap lines never, at word boundaries, or at character boundaries"
 msgstr "Zeilen nie, an Wort-, oder an Zeichengrenzen umbrechen?"
 
-#: ../gtk/gtktexttag.c:479 ../gtk/gtktextview.c:740
+#: ../gtk/gtktexttag.c:512 ../gtk/gtktextview.c:742
 msgid "Tabs"
 msgstr "Reiter"
 
-#: ../gtk/gtktexttag.c:480 ../gtk/gtktextview.c:741
+#: ../gtk/gtktexttag.c:513 ../gtk/gtktextview.c:743
 msgid "Custom tabs for this text"
 msgstr "Eigene Reiter für diesen Text"
 
-#: ../gtk/gtktexttag.c:498
+#: ../gtk/gtktexttag.c:531
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../gtk/gtktexttag.c:499
+#: ../gtk/gtktexttag.c:532
 msgid "Whether this text is hidden."
 msgstr "Legt fest, ob dieser Text versteckt wird."
 
-#: ../gtk/gtktexttag.c:513
+#: ../gtk/gtktexttag.c:546
 msgid "Paragraph background color name"
 msgstr "Name der Absatzhintergrundfarbe"
 
-#: ../gtk/gtktexttag.c:514
+#: ../gtk/gtktexttag.c:547
 msgid "Paragraph background color as a string"
 msgstr "Die Absatzhintergrundfarbe als Zeichenkette"
 
-#: ../gtk/gtktexttag.c:529
+#: ../gtk/gtktexttag.c:561
 msgid "Paragraph background color"
 msgstr "Absatzhintergrundfarbe"
 
-#: ../gtk/gtktexttag.c:530
-msgid "Paragraph background color as a (possibly unallocated) GdkColor"
-msgstr "Absatzhintergrundfarbe als (möglicherweise nicht zugewiesene) GdkColor"
+#: ../gtk/gtktexttag.c:562
+msgid "Paragraph background color as a GdkColor"
+msgstr "Die Absatzhintergrundfarbe als GdkColor"
+
+#: ../gtk/gtktexttag.c:576
+msgid "Paragraph background RGBA"
+msgstr "Absatzhintergrund als RGBA"
+
+#: ../gtk/gtktexttag.c:577
+msgid "Paragraph background RGBA as a GdkRGBA"
+msgstr "Die RGBA-Absatzhintergrundfarbe als GdkRGBA"
 
-#: ../gtk/gtktexttag.c:548
+#: ../gtk/gtktexttag.c:595
 msgid "Margin Accumulates"
 msgstr "Ränder auflaufen"
 
-#: ../gtk/gtktexttag.c:549
+#: ../gtk/gtktexttag.c:596
 msgid "Whether left and right margins accumulate."
 msgstr "Legt fest, ob linke und rechte Ränder aufeinander auflaufen."
 
-#: ../gtk/gtktexttag.c:562
+#: ../gtk/gtktexttag.c:609
 msgid "Background full height set"
 msgstr "Volle Hintergrundhöhe einstellen"
 
-#: ../gtk/gtktexttag.c:563
+#: ../gtk/gtktexttag.c:610
 msgid "Whether this tag affects background height"
 msgstr "Soll dieses Tag die Höhe des Hintergrunds beeinflussen?"
 
-#: ../gtk/gtktexttag.c:602
+#: ../gtk/gtktexttag.c:649
 msgid "Justification set"
 msgstr "Ausrichtung einstellen"
 
-#: ../gtk/gtktexttag.c:603
+#: ../gtk/gtktexttag.c:650
 msgid "Whether this tag affects paragraph justification"
 msgstr "Soll dieses Tag die Absatzausrichtung beeinflussen?"
 
-#: ../gtk/gtktexttag.c:610
+#: ../gtk/gtktexttag.c:657
 msgid "Left margin set"
 msgstr "Linken Rand einstellen"
 
-#: ../gtk/gtktexttag.c:611
+#: ../gtk/gtktexttag.c:658
 msgid "Whether this tag affects the left margin"
 msgstr "Soll dieses Tag den linken Rand beeinflussen?"
 
-#: ../gtk/gtktexttag.c:614
+#: ../gtk/gtktexttag.c:661
 msgid "Indent set"
 msgstr "Einrückung einstellen"
 
-#: ../gtk/gtktexttag.c:615
+#: ../gtk/gtktexttag.c:662
 msgid "Whether this tag affects indentation"
 msgstr "Soll dieses Tag die Einrückung beeinflussen?"
 
-#: ../gtk/gtktexttag.c:622
+#: ../gtk/gtktexttag.c:669
 msgid "Pixels above lines set"
 msgstr "Pixel über Zeilen einstellen"
 
-#: ../gtk/gtktexttag.c:623 ../gtk/gtktexttag.c:627
+#: ../gtk/gtktexttag.c:670 ../gtk/gtktexttag.c:674
 msgid "Whether this tag affects the number of pixels above lines"
 msgstr "Soll dieses Tag den Leerraum über Zeilen beeinflussen?"
 
-#: ../gtk/gtktexttag.c:626
+#: ../gtk/gtktexttag.c:673
 msgid "Pixels below lines set"
 msgstr "Pixel unter Zeilen einstellen"
 
-#: ../gtk/gtktexttag.c:630
+#: ../gtk/gtktexttag.c:677
 msgid "Pixels inside wrap set"
 msgstr "Pixel im Umbruch einstellen"
 
-#: ../gtk/gtktexttag.c:631
+#: ../gtk/gtktexttag.c:678
 msgid "Whether this tag affects the number of pixels between wrapped lines"
 msgstr ""
 "Soll dieses Tag die Anzahl der Pixel zwischen umbrochenen Zeilen beeinflussen?"
 
-#: ../gtk/gtktexttag.c:638
+#: ../gtk/gtktexttag.c:685
 msgid "Right margin set"
 msgstr "Rechten Rand einstellen"
 
-#: ../gtk/gtktexttag.c:639
+#: ../gtk/gtktexttag.c:686
 msgid "Whether this tag affects the right margin"
 msgstr "Soll dieses Tag den rechten Rand beeinflussen?"
 
-#: ../gtk/gtktexttag.c:646
+#: ../gtk/gtktexttag.c:693
 msgid "Wrap mode set"
 msgstr "Umbruchmodus einstellen"
 
-#: ../gtk/gtktexttag.c:647
+#: ../gtk/gtktexttag.c:694
 msgid "Whether this tag affects line wrap mode"
 msgstr "Soll dieses Tag den Umbruchmodus beeinflussen?"
 
-#: ../gtk/gtktexttag.c:650
+#: ../gtk/gtktexttag.c:697
 msgid "Tabs set"
 msgstr "Reiter einstellen"
 
-#: ../gtk/gtktexttag.c:651
+#: ../gtk/gtktexttag.c:698
 msgid "Whether this tag affects tabs"
 msgstr "Soll dieses Tag Reiter beeinflussen?"
 
-#: ../gtk/gtktexttag.c:654
+#: ../gtk/gtktexttag.c:701
 msgid "Invisible set"
 msgstr "Unsichtbarkeit einstellen"
 
-#: ../gtk/gtktexttag.c:655
+#: ../gtk/gtktexttag.c:702
 msgid "Whether this tag affects text visibility"
 msgstr "Soll dieses Tag die Sichtbarkeit des Texts beeinflussen?"
 
-#: ../gtk/gtktexttag.c:658
+#: ../gtk/gtktexttag.c:705
 msgid "Paragraph background set"
 msgstr "Absatzhintergrund einstellen"
 
-#: ../gtk/gtktexttag.c:659
+#: ../gtk/gtktexttag.c:706
 msgid "Whether this tag affects the paragraph background color"
 msgstr "Legt fest, ob dieses Tag die Absatzhintergrundfarbe beeinflusst"
 
-#: ../gtk/gtktextview.c:654
+#: ../gtk/gtktextview.c:656
 msgid "Pixels Above Lines"
 msgstr "Pixel über Zeilen"
 
-#: ../gtk/gtktextview.c:664
+#: ../gtk/gtktextview.c:666
 msgid "Pixels Below Lines"
 msgstr "Pixel unter Zeilen"
 
-#: ../gtk/gtktextview.c:674
+#: ../gtk/gtktextview.c:676
 msgid "Pixels Inside Wrap"
 msgstr "Pixel im Umbruch"
 
-#: ../gtk/gtktextview.c:692
+#: ../gtk/gtktextview.c:694
 msgid "Wrap Mode"
 msgstr "Umbruchmodus"
 
-#: ../gtk/gtktextview.c:710
+#: ../gtk/gtktextview.c:712
 msgid "Left Margin"
 msgstr "Linker Rand"
 
-#: ../gtk/gtktextview.c:720
+#: ../gtk/gtktextview.c:722
 msgid "Right Margin"
 msgstr "Rechter Rand"
 
-#: ../gtk/gtktextview.c:748
+#: ../gtk/gtktextview.c:750
 msgid "Cursor Visible"
 msgstr "Zeiger sichtbar"
 
-#: ../gtk/gtktextview.c:749
+#: ../gtk/gtktextview.c:751
 msgid "If the insertion cursor is shown"
 msgstr "Soll der Einfügezeiger gezeigt werden?"
 
-#: ../gtk/gtktextview.c:756
+#: ../gtk/gtktextview.c:758
 msgid "Buffer"
 msgstr "Puffer"
 
-#: ../gtk/gtktextview.c:757
+#: ../gtk/gtktextview.c:759
 msgid "The buffer which is displayed"
 msgstr "Der anzuzeigende Puffer"
 
-#: ../gtk/gtktextview.c:765
+#: ../gtk/gtktextview.c:767
 msgid "Whether entered text overwrites existing contents"
 msgstr "Soll eingegebener Text vorhandenen Inhalt überschreiben?"
 
-#: ../gtk/gtktextview.c:772
+#: ../gtk/gtktextview.c:774
 msgid "Accepts tab"
 msgstr "Akzeptiert Tabulator"
 
-#: ../gtk/gtktextview.c:773
+#: ../gtk/gtktextview.c:775
 msgid "Whether Tab will result in a tab character being entered"
 msgstr ""
 "Soll das Drücken der Tab-Taste dazu führen, dass ein Tabulatorzeichen "
 "eingegeben wird?"
 
-#: ../gtk/gtktextview.c:808
+#: ../gtk/gtktextview.c:810
 msgid "Error underline color"
 msgstr "Farbe zum Unterstreichen von Fehlern"
 
-#: ../gtk/gtktextview.c:809
+#: ../gtk/gtktextview.c:811
 msgid "Color with which to draw error-indication underlines"
 msgstr ""
 "Die Farbe, in der Unterstreichungen gezeichnet werden sollen, die Fehler "
 "anzeigen"
 
-#: ../gtk/gtkthemingengine.c:249
+#: ../gtk/gtkthemingengine.c:257
 msgid "Theming engine name"
 msgstr "Name der Themen-Engine"
 
@@ -6578,107 +6707,107 @@ msgstr "Sollen die Proxys dieser Aktion wie Radio-Aktions-Proxys aussehen?"
 msgid "Whether the toggle action should be active"
 msgstr "Legt fest, ob die Umschaltaktion aktiv sein soll"
 
-#: ../gtk/gtktogglebutton.c:126 ../gtk/gtktoggletoolbutton.c:113
+#: ../gtk/gtktogglebutton.c:179 ../gtk/gtktoggletoolbutton.c:128
 msgid "If the toggle button should be pressed in"
 msgstr "Legt fest, ob der Umschaltknopf eingedrückt sein soll"
 
-#: ../gtk/gtktogglebutton.c:134
+#: ../gtk/gtktogglebutton.c:187
 msgid "If the toggle button is in an \"in between\" state"
 msgstr "Ist der Umschaltknopf in einem »Zwischen«-Zustand?"
 
-#: ../gtk/gtktogglebutton.c:141
+#: ../gtk/gtktogglebutton.c:194
 msgid "Draw Indicator"
 msgstr "Indikator zeichnen"
 
-#: ../gtk/gtktogglebutton.c:142
+#: ../gtk/gtktogglebutton.c:195
 msgid "If the toggle part of the button is displayed"
 msgstr "Soll der Umschaltteil des Knopfes dargestellt werden?"
 
-#: ../gtk/gtktoolbar.c:489 ../gtk/gtktoolpalette.c:1069
+#: ../gtk/gtktoolbar.c:501 ../gtk/gtktoolpalette.c:1038
 msgid "Toolbar Style"
 msgstr "Werkzeugleisten-Stil"
 
-#: ../gtk/gtktoolbar.c:490
+#: ../gtk/gtktoolbar.c:502
 msgid "How to draw the toolbar"
 msgstr "Wie soll die Werkzeugleiste gezeichnet werden?"
 
-#: ../gtk/gtktoolbar.c:497
+#: ../gtk/gtktoolbar.c:509
 msgid "Show Arrow"
 msgstr "Pfeil anzeigen"
 
-#: ../gtk/gtktoolbar.c:498
+#: ../gtk/gtktoolbar.c:510
 msgid "If an arrow should be shown if the toolbar doesn't fit"
 msgstr "Soll ein Pfeil angezeigt werden, falls die Werkzeugleiste nicht passt?"
 
-#: ../gtk/gtktoolbar.c:519
+#: ../gtk/gtktoolbar.c:531
 msgid "Size of icons in this toolbar"
 msgstr "Die Größe der Symbole in dieser Werkzeugleiste"
 
-#: ../gtk/gtktoolbar.c:534 ../gtk/gtktoolpalette.c:1055
+#: ../gtk/gtktoolbar.c:546 ../gtk/gtktoolpalette.c:1024
 msgid "Icon size set"
 msgstr "Symbolgröße gesetzt"
 
-#: ../gtk/gtktoolbar.c:535 ../gtk/gtktoolpalette.c:1056
+#: ../gtk/gtktoolbar.c:547 ../gtk/gtktoolpalette.c:1025
 msgid "Whether the icon-size property has been set"
 msgstr "Legt fest, ob die Eigenschaft »icon-size« gesetzt ist"
 
-#: ../gtk/gtktoolbar.c:544
+#: ../gtk/gtktoolbar.c:556
 msgid "Whether the item should receive extra space when the toolbar grows"
 msgstr ""
 "Soll dem Kind zusätzlicher Platz zugewiesen werden, wenn das Werkzeugleisten-"
 "Widget wächst?"
 
-#: ../gtk/gtktoolbar.c:552 ../gtk/gtktoolitemgroup.c:1650
+#: ../gtk/gtktoolbar.c:564 ../gtk/gtktoolitemgroup.c:1646
 msgid "Whether the item should be the same size as other homogeneous items"
 msgstr "Soll das Objekt gleich groß wie andere homogene Objekte sein?"
 
-#: ../gtk/gtktoolbar.c:559
+#: ../gtk/gtktoolbar.c:571
 msgid "Spacer size"
 msgstr "Trennergröße"
 
-#: ../gtk/gtktoolbar.c:560
+#: ../gtk/gtktoolbar.c:572
 msgid "Size of spacers"
 msgstr "Die Größe der Trenner"
 
-#: ../gtk/gtktoolbar.c:569
+#: ../gtk/gtktoolbar.c:581
 msgid "Amount of border space between the toolbar shadow and the buttons"
 msgstr ""
 "Der Randabstand zwischen dem Schatten der Werkzeugleiste und den Knöpfen"
 
-#: ../gtk/gtktoolbar.c:577
+#: ../gtk/gtktoolbar.c:589
 msgid "Maximum child expand"
 msgstr "Maximale Breite des Kindes"
 
-#: ../gtk/gtktoolbar.c:578
+#: ../gtk/gtktoolbar.c:590
 msgid "Maximum amount of space an expandable item will be given"
 msgstr "Der maximale Platz, den ein ausgeklapptes Objekt erhält"
 
-#: ../gtk/gtktoolbar.c:586
+#: ../gtk/gtktoolbar.c:598
 msgid "Space style"
 msgstr "Trennerstil"
 
-#: ../gtk/gtktoolbar.c:587
+#: ../gtk/gtktoolbar.c:599
 msgid "Whether spacers are vertical lines or just blank"
 msgstr "Sollen Trenner vertikale Balken oder einfach nur leer sein?"
 
-#: ../gtk/gtktoolbar.c:594
+#: ../gtk/gtktoolbar.c:606
 msgid "Button relief"
 msgstr "Knopfrelief"
 
-#: ../gtk/gtktoolbar.c:595
+#: ../gtk/gtktoolbar.c:607
 msgid "Type of bevel around toolbar buttons"
 msgstr "Die Art der Fase um die Knöpfe der Werkzeugleiste"
 
-#: ../gtk/gtktoolbar.c:602
+#: ../gtk/gtktoolbar.c:614
 msgid "Style of bevel around the toolbar"
 msgstr "Der Stil der Fase um die Werkzeugleiste"
 
-#: ../gtk/gtktoolbutton.c:202
+#: ../gtk/gtktoolbutton.c:233
 msgid "Text to show in the item."
 msgstr "Im Objekt anzuzeigender Text."
 
 # CHECK
-#: ../gtk/gtktoolbutton.c:209
+#: ../gtk/gtktoolbutton.c:240
 msgid ""
 "If set, an underline in the label property indicates that the next character "
 "should be used for the mnemonic accelerator key in the overflow menu"
@@ -6686,44 +6815,44 @@ msgstr ""
 "Falls eingeschaltet, bedeutet ein Unterstrich im Beschriftungstext, dass das "
 "nächste Zeichen als Tastaturkürzel im Überlaufmenü verwendet werden soll"
 
-#: ../gtk/gtktoolbutton.c:216
+#: ../gtk/gtktoolbutton.c:247
 msgid "Widget to use as the item label"
 msgstr "Als Objektbeschriftung zu verwendendes Widget"
 
-#: ../gtk/gtktoolbutton.c:222
+#: ../gtk/gtktoolbutton.c:253
 msgid "Stock Id"
 msgstr "Repertoire-Kennung"
 
-#: ../gtk/gtktoolbutton.c:223
+#: ../gtk/gtktoolbutton.c:254
 msgid "The stock icon displayed on the item"
 msgstr "Das auf dem Objekt angezeigte Repertoire-Symbol"
 
-#: ../gtk/gtktoolbutton.c:239
+#: ../gtk/gtktoolbutton.c:270
 msgid "Icon name"
 msgstr "Symbolname"
 
-#: ../gtk/gtktoolbutton.c:240
+#: ../gtk/gtktoolbutton.c:271
 msgid "The name of the themed icon displayed on the item"
 msgstr ""
 "Der Name des thematisierten Symbols, welches auf dem Objekt angezeigt wird"
 
-#: ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolbutton.c:277
 msgid "Icon widget"
 msgstr "Symbol-Widget"
 
-#: ../gtk/gtktoolbutton.c:247
+#: ../gtk/gtktoolbutton.c:278
 msgid "Icon widget to display in the item"
 msgstr "Im Objekt anzuzeigendes Symbol-Widget"
 
-#: ../gtk/gtktoolbutton.c:260
+#: ../gtk/gtktoolbutton.c:291
 msgid "Icon spacing"
 msgstr "Symbolabstand"
 
-#: ../gtk/gtktoolbutton.c:261
+#: ../gtk/gtktoolbutton.c:292
 msgid "Spacing in pixels between the icon and label"
 msgstr "Der Abstand zwischen dem Symbol und der Beschriftung in Pixel"
 
-#: ../gtk/gtktoolitem.c:210
+#: ../gtk/gtktoolitem.c:209
 msgid ""
 "Whether the toolbar item is considered important. When TRUE, toolbar buttons "
 "show text in GTK_TOOLBAR_BOTH_HORIZ mode"
@@ -6731,85 +6860,85 @@ msgstr ""
 "Wird das Werkzeugleistenobjekt als wichtig angesehen? Falls dem so ist, "
 "zeigen Knöpfe Text im Modus »GTK_TOOLBAR_BOTH_HORIZ« an"
 
-#: ../gtk/gtktoolitemgroup.c:1597
+#: ../gtk/gtktoolitemgroup.c:1593
 msgid "The human-readable title of this item group"
 msgstr "Ein verständlicher Titel dieser Objektgruppe"
 
-#: ../gtk/gtktoolitemgroup.c:1604
+#: ../gtk/gtktoolitemgroup.c:1600
 msgid "A widget to display in place of the usual label"
 msgstr "Ein Widget, das anstatt der üblichen Beschriftung angezeigt werden soll"
 
-#: ../gtk/gtktoolitemgroup.c:1610
+#: ../gtk/gtktoolitemgroup.c:1606
 msgid "Collapsed"
 msgstr "Eingeklappt"
 
-#: ../gtk/gtktoolitemgroup.c:1611
+#: ../gtk/gtktoolitemgroup.c:1607
 msgid "Whether the group has been collapsed and items are hidden"
 msgstr "Legt fest, ob die Gruppe eingeklappt und die Objekte verborgen sind"
 
-#: ../gtk/gtktoolitemgroup.c:1617
+#: ../gtk/gtktoolitemgroup.c:1613
 msgid "ellipsize"
 msgstr "Auslassungen"
 
-#: ../gtk/gtktoolitemgroup.c:1618
+#: ../gtk/gtktoolitemgroup.c:1614
 msgid "Ellipsize for item group headers"
 msgstr "Auslassungen für Objektgruppenköpfe"
 
-#: ../gtk/gtktoolitemgroup.c:1624
+#: ../gtk/gtktoolitemgroup.c:1620
 msgid "Header Relief"
 msgstr "Spaltenkopf-Relief"
 
-#: ../gtk/gtktoolitemgroup.c:1625
+#: ../gtk/gtktoolitemgroup.c:1621
 msgid "Relief of the group header button"
 msgstr "Relief des Spaltenkopf-Knopfs"
 
-#: ../gtk/gtktoolitemgroup.c:1640
+#: ../gtk/gtktoolitemgroup.c:1636
 msgid "Header Spacing"
 msgstr "Abstand im Kopf"
 
-#: ../gtk/gtktoolitemgroup.c:1641
+#: ../gtk/gtktoolitemgroup.c:1637
 msgid "Spacing between expander arrow and caption"
 msgstr "Abstand zwischen Ausklapppfeil und Beschriftung"
 
-#: ../gtk/gtktoolitemgroup.c:1657
+#: ../gtk/gtktoolitemgroup.c:1653
 msgid "Whether the item should receive extra space when the group grows"
 msgstr ""
 "Soll dem Objekt zusätzlicher Platz zugewiesen werden, wenn die Gruppe wächst?"
 
-#: ../gtk/gtktoolitemgroup.c:1664
+#: ../gtk/gtktoolitemgroup.c:1660
 msgid "Whether the item should fill the available space"
 msgstr "Soll das Objekt den verfügbaren Platz ausfüllen?"
 
-#: ../gtk/gtktoolitemgroup.c:1670
+#: ../gtk/gtktoolitemgroup.c:1666
 msgid "New Row"
 msgstr "Neue Zeile"
 
-#: ../gtk/gtktoolitemgroup.c:1671
+#: ../gtk/gtktoolitemgroup.c:1667
 msgid "Whether the item should start a new row"
 msgstr "Soll mit dem Objekt eine neue Zeile begonnen werden?"
 
-#: ../gtk/gtktoolitemgroup.c:1678
+#: ../gtk/gtktoolitemgroup.c:1674
 msgid "Position of the item within this group"
 msgstr "Die Position des Objekts in dieser Gruppe"
 
-#: ../gtk/gtktoolpalette.c:1040
+#: ../gtk/gtktoolpalette.c:1009
 msgid "Size of icons in this tool palette"
 msgstr "Die Größe der Symbole in dieser Werkzeugpalette"
 
-#: ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktoolpalette.c:1039
 msgid "Style of items in the tool palette"
 msgstr "Der Stil der Symbole in dieser Werkzeugpalette"
 
-#: ../gtk/gtktoolpalette.c:1086
+#: ../gtk/gtktoolpalette.c:1055
 msgid "Exclusive"
 msgstr "Exklusiv"
 
-#: ../gtk/gtktoolpalette.c:1087
+#: ../gtk/gtktoolpalette.c:1056
 msgid "Whether the item group should be the only expanded at a given time"
 msgstr ""
 "Soll stets nur eine Objektgruppe innerhalb eines Zeitraums ausgeklappt sein?"
 
-#: ../gtk/gtktoolpalette.c:1102
+#: ../gtk/gtktoolpalette.c:1071
 msgid "Whether the item group should receive extra space when the palette grows"
 msgstr ""
 "Soll der Objektgruppe zusätzlicher Platz zugewiesen werden, wenn die Palette "
@@ -6889,11 +7018,11 @@ msgstr "Umbruchbreite"
 msgid "Wrap width for laying out items in a grid"
 msgstr "Umbruchbreite zum Anordnen der Objekte in einem Gitter"
 
-#: ../gtk/gtktreemodelsort.c:312
+#: ../gtk/gtktreemodelsort.c:491
 msgid "TreeModelSort Model"
 msgstr "TreeModelSort-Modell"
 
-#: ../gtk/gtktreemodelsort.c:313
+#: ../gtk/gtktreemodelsort.c:492
 msgid "The model for the TreeModelSort to sort"
 msgstr "Das von TreeModelSort zum Sortieren verwendete Modell"
 
@@ -7113,122 +7242,126 @@ msgstr "Muster der Baumlinie"
 msgid "Dash pattern used to draw the tree view lines"
 msgstr "Das zum Zeichnen der Linien einer Baumansicht zu verwendende Muster"
 
-#: ../gtk/gtktreeviewcolumn.c:247
+#: ../gtk/gtktreeviewcolumn.c:249
 msgid "Whether to display the column"
 msgstr "Soll die Spalte angezeigt werden?"
 
-#: ../gtk/gtktreeviewcolumn.c:254 ../gtk/gtkwindow.c:646
+#: ../gtk/gtktreeviewcolumn.c:256 ../gtk/gtkwindow.c:650
 msgid "Resizable"
 msgstr "Größe veränderlich"
 
-#: ../gtk/gtktreeviewcolumn.c:255
+#: ../gtk/gtktreeviewcolumn.c:257
 msgid "Column is user-resizable"
 msgstr "Ist die Größe der Spalte vom Benutzer veränderbar?"
 
-#: ../gtk/gtktreeviewcolumn.c:263
+#: ../gtk/gtktreeviewcolumn.c:265
+msgid "Current X position of the column"
+msgstr "Aktuelle X-Position der Spalte"
+
+#: ../gtk/gtktreeviewcolumn.c:275
 msgid "Current width of the column"
 msgstr "Die momentane Breite der Spalte"
 
-#: ../gtk/gtktreeviewcolumn.c:280
+#: ../gtk/gtktreeviewcolumn.c:292
 msgid "Sizing"
 msgstr "Größenänderung"
 
-#: ../gtk/gtktreeviewcolumn.c:281
+#: ../gtk/gtktreeviewcolumn.c:293
 msgid "Resize mode of the column"
 msgstr "Der Größenänderungs-Modus der Spalte"
 
-#: ../gtk/gtktreeviewcolumn.c:289
+#: ../gtk/gtktreeviewcolumn.c:301
 msgid "Fixed Width"
 msgstr "Feste Breite"
 
-#: ../gtk/gtktreeviewcolumn.c:290
+#: ../gtk/gtktreeviewcolumn.c:302
 msgid "Current fixed width of the column"
 msgstr "Die momentane feste Breite der Spalte"
 
-#: ../gtk/gtktreeviewcolumn.c:300
+#: ../gtk/gtktreeviewcolumn.c:312
 msgid "Minimum allowed width of the column"
 msgstr "Die minimal erforderliche Spaltenbreite"
 
-#: ../gtk/gtktreeviewcolumn.c:309
+#: ../gtk/gtktreeviewcolumn.c:321
 msgid "Maximum Width"
 msgstr "Maximale Breite"
 
-#: ../gtk/gtktreeviewcolumn.c:310
+#: ../gtk/gtktreeviewcolumn.c:322
 msgid "Maximum allowed width of the column"
 msgstr "Die maximal zulässige Spaltenbreite"
 
-#: ../gtk/gtktreeviewcolumn.c:320
+#: ../gtk/gtktreeviewcolumn.c:332
 msgid "Title to appear in column header"
 msgstr "Der Titel, der im Spaltenkopf erscheinen soll"
 
-#: ../gtk/gtktreeviewcolumn.c:328
+#: ../gtk/gtktreeviewcolumn.c:340
 msgid "Column gets share of extra width allocated to the widget"
 msgstr "Spalte erhält Anteil der dem Widget zugewiesenen, zusätzlichen Breite"
 
-#: ../gtk/gtktreeviewcolumn.c:335
+#: ../gtk/gtktreeviewcolumn.c:347
 msgid "Clickable"
 msgstr "Klickbar"
 
-#: ../gtk/gtktreeviewcolumn.c:336
+#: ../gtk/gtktreeviewcolumn.c:348
 msgid "Whether the header can be clicked"
 msgstr "Soll der Kopf angeklickt werden können?"
 
-#: ../gtk/gtktreeviewcolumn.c:344
+#: ../gtk/gtktreeviewcolumn.c:356
 msgid "Widget"
 msgstr "Widget"
 
-#: ../gtk/gtktreeviewcolumn.c:345
+#: ../gtk/gtktreeviewcolumn.c:357
 msgid "Widget to put in column header button instead of column title"
 msgstr ""
 "Das Widget, das statt des Spaltentitels im Spaltenkopf-Knopf erscheinen soll"
 
-#: ../gtk/gtktreeviewcolumn.c:353
+#: ../gtk/gtktreeviewcolumn.c:365
 msgid "X Alignment of the column header text or widget"
 msgstr "Die horizontale Ausrichtung des Spaltenkopftextes oder -widgets"
 
-#: ../gtk/gtktreeviewcolumn.c:363
+#: ../gtk/gtktreeviewcolumn.c:375
 msgid "Whether the column can be reordered around the headers"
 msgstr "Kann die Spalte um die Köpfe umsortiert werden?"
 
-#: ../gtk/gtktreeviewcolumn.c:370
+#: ../gtk/gtktreeviewcolumn.c:382
 msgid "Sort indicator"
 msgstr "Sortierungsanzeiger"
 
-#: ../gtk/gtktreeviewcolumn.c:371
+#: ../gtk/gtktreeviewcolumn.c:383
 msgid "Whether to show a sort indicator"
 msgstr "Soll ein Sortierungsanzeiger dargestellt werden?"
 
-#: ../gtk/gtktreeviewcolumn.c:378
+#: ../gtk/gtktreeviewcolumn.c:390
 msgid "Sort order"
 msgstr "Sortierreihenfolge"
 
-#: ../gtk/gtktreeviewcolumn.c:379
+#: ../gtk/gtktreeviewcolumn.c:391
 msgid "Sort direction the sort indicator should indicate"
 msgstr "Die Richtung, in die der Sortierungsanzeiger zeigen soll"
 
-#: ../gtk/gtktreeviewcolumn.c:395
+#: ../gtk/gtktreeviewcolumn.c:407
 msgid "Sort column ID"
 msgstr "Sortierspaltenkennung"
 
-#: ../gtk/gtktreeviewcolumn.c:396
+#: ../gtk/gtktreeviewcolumn.c:408
 msgid "Logical sort column ID this column sorts on when selected for sorting"
 msgstr ""
 "Logische Sortierspaltenkennung, nach der diese Spalte bei Auswahl sortiert "
 "wird"
 
-#: ../gtk/gtkuimanager.c:226
+#: ../gtk/gtkuimanager.c:480
 msgid "Whether tearoff menu items should be added to menus"
 msgstr "Sollen Abreiß-Menüeinträge zu Menüs hinzugefügt werden?"
 
-#: ../gtk/gtkuimanager.c:233
+#: ../gtk/gtkuimanager.c:487
 msgid "Merged UI definition"
 msgstr "Zusammengeführte UI-Definition"
 
-#: ../gtk/gtkuimanager.c:234
+#: ../gtk/gtkuimanager.c:488
 msgid "An XML string describing the merged UI"
 msgstr "Eine XML-Zeichenkette, die die zusammengeführte UI beschreibt"
 
-#: ../gtk/gtkviewport.c:154
+#: ../gtk/gtkviewport.c:156
 msgid "Determines how the shadowed box around the viewport is drawn"
 msgstr "Legt fest, wie der schattierte Rahmen um das Sichtfeld dargestellt wird"
 
@@ -7240,27 +7373,27 @@ msgstr "Symbolische Symbole verwenden"
 msgid "Whether to use symbolic icons"
 msgstr "Legt fest, ob symbolische Symbole verwendet werden sollen."
 
-#: ../gtk/gtkwidget.c:931
+#: ../gtk/gtkwidget.c:950
 msgid "Widget name"
 msgstr "Widget-Name"
 
-#: ../gtk/gtkwidget.c:932
+#: ../gtk/gtkwidget.c:951
 msgid "The name of the widget"
 msgstr "Der Name des Widgets"
 
-#: ../gtk/gtkwidget.c:938
+#: ../gtk/gtkwidget.c:957
 msgid "Parent widget"
 msgstr "Eltern-Widget"
 
-#: ../gtk/gtkwidget.c:939
+#: ../gtk/gtkwidget.c:958
 msgid "The parent widget of this widget. Must be a Container widget"
 msgstr "Das Eltern-Widget dieses Widgets. Muss ein Container-Widget sein"
 
-#: ../gtk/gtkwidget.c:946
+#: ../gtk/gtkwidget.c:965
 msgid "Width request"
 msgstr "Breitenanforderung"
 
-#: ../gtk/gtkwidget.c:947
+#: ../gtk/gtkwidget.c:966
 msgid ""
 "Override for width request of the widget, or -1 if natural request should be "
 "used"
@@ -7268,11 +7401,11 @@ msgstr ""
 "Direkte Angabe für die Breitenanforderung des Widgets; -1, falls die "
 "natürliche Anforderung verwendet werden soll"
 
-#: ../gtk/gtkwidget.c:955
+#: ../gtk/gtkwidget.c:974
 msgid "Height request"
 msgstr "Höhenanforderung"
 
-#: ../gtk/gtkwidget.c:956
+#: ../gtk/gtkwidget.c:975
 msgid ""
 "Override for height request of the widget, or -1 if natural request should be "
 "used"
@@ -7280,84 +7413,84 @@ msgstr ""
 "Direkte Angabe für die Höhenanforderung des Widgets; -1, falls die natürliche "
 "Anforderung verwendet werden soll"
 
-#: ../gtk/gtkwidget.c:965
+#: ../gtk/gtkwidget.c:984
 msgid "Whether the widget is visible"
 msgstr "Soll das Widget sichtbar sein?"
 
-#: ../gtk/gtkwidget.c:972
+#: ../gtk/gtkwidget.c:991
 msgid "Whether the widget responds to input"
 msgstr "Soll das Widget auf Eingaben reagieren?"
 
-#: ../gtk/gtkwidget.c:978
+#: ../gtk/gtkwidget.c:997
 msgid "Application paintable"
 msgstr "Direktes Zeichnen"
 
-#: ../gtk/gtkwidget.c:979
+#: ../gtk/gtkwidget.c:998
 msgid "Whether the application will paint directly on the widget"
 msgstr "Kann die Anwendung direkt auf das Widget zeichnen?"
 
-#: ../gtk/gtkwidget.c:985
+#: ../gtk/gtkwidget.c:1004
 msgid "Can focus"
 msgstr "Fokussierbar"
 
-#: ../gtk/gtkwidget.c:986
+#: ../gtk/gtkwidget.c:1005
 msgid "Whether the widget can accept the input focus"
 msgstr "Soll das Widget den Eingabefokus akzeptieren können?"
 
-#: ../gtk/gtkwidget.c:992
+#: ../gtk/gtkwidget.c:1011
 msgid "Has focus"
 msgstr "Hat Fokus"
 
-#: ../gtk/gtkwidget.c:993
+#: ../gtk/gtkwidget.c:1012
 msgid "Whether the widget has the input focus"
 msgstr "Soll das Widget den Eingabefokus haben?"
 
-#: ../gtk/gtkwidget.c:999
+#: ../gtk/gtkwidget.c:1018
 msgid "Is focus"
 msgstr "Ist Fokus"
 
-#: ../gtk/gtkwidget.c:1000
+#: ../gtk/gtkwidget.c:1019
 msgid "Whether the widget is the focus widget within the toplevel"
 msgstr "Ist das Widget das fokussierte Widget innerhalb der obersten Ebene?"
 
-#: ../gtk/gtkwidget.c:1006
+#: ../gtk/gtkwidget.c:1025
 msgid "Can default"
 msgstr "Kann Vorgabe"
 
-#: ../gtk/gtkwidget.c:1007
+#: ../gtk/gtkwidget.c:1026
 msgid "Whether the widget can be the default widget"
 msgstr "Soll das Widget das Vorgabe-Widget sein können?"
 
-#: ../gtk/gtkwidget.c:1013
+#: ../gtk/gtkwidget.c:1032
 msgid "Has default"
 msgstr "Ist Vorgabe"
 
-#: ../gtk/gtkwidget.c:1014
+#: ../gtk/gtkwidget.c:1033
 msgid "Whether the widget is the default widget"
 msgstr "Soll das Widget das Vorgabe-Widget sein?"
 
-#: ../gtk/gtkwidget.c:1020
+#: ../gtk/gtkwidget.c:1039
 msgid "Receives default"
 msgstr "Vorgabe erhalten"
 
-#: ../gtk/gtkwidget.c:1021
+#: ../gtk/gtkwidget.c:1040
 msgid "If TRUE, the widget will receive the default action when it is focused"
 msgstr ""
 "Falls WAHR, erhält das Widget die Vorgabe-Aktion, wenn es fokussiert ist"
 
-#: ../gtk/gtkwidget.c:1027
+#: ../gtk/gtkwidget.c:1046
 msgid "Composite child"
 msgstr "Zusammengesetztes Kind"
 
-#: ../gtk/gtkwidget.c:1028
+#: ../gtk/gtkwidget.c:1047
 msgid "Whether the widget is part of a composite widget"
 msgstr "Ist das Widget Teil eines zusammengesetzten Widgets?"
 
-#: ../gtk/gtkwidget.c:1034
+#: ../gtk/gtkwidget.c:1053
 msgid "Style"
 msgstr "Stil"
 
-#: ../gtk/gtkwidget.c:1035
+#: ../gtk/gtkwidget.c:1054
 msgid ""
 "The style of the widget, which contains information about how it will look "
 "(colors etc)"
@@ -7365,177 +7498,177 @@ msgstr ""
 "Der Stil des Widgets, der Informationen zu seinem Aussehen enthält (Farben "
 "etc.)"
 
-#: ../gtk/gtkwidget.c:1041
+#: ../gtk/gtkwidget.c:1060
 msgid "Events"
 msgstr "Ereignisse"
 
-#: ../gtk/gtkwidget.c:1042
+#: ../gtk/gtkwidget.c:1061
 msgid "The event mask that decides what kind of GdkEvents this widget gets"
 msgstr ""
 "Die Ereignismaske, die entscheidet, welche GdkEvents dieses Widget erhält"
 
-#: ../gtk/gtkwidget.c:1049
+#: ../gtk/gtkwidget.c:1068
 msgid "No show all"
 msgstr "Kein Show-All"
 
-#: ../gtk/gtkwidget.c:1050
+#: ../gtk/gtkwidget.c:1069
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Soll »gtk_widget_show_all()« dieses Widget nicht betreffen?"
 
-#: ../gtk/gtkwidget.c:1073
+#: ../gtk/gtkwidget.c:1092
 msgid "Whether this widget has a tooltip"
 msgstr "Legt fest, ob das Widget eine Minihilfe hat"
 
-#: ../gtk/gtkwidget.c:1129
+#: ../gtk/gtkwidget.c:1148
 msgid "Window"
 msgstr "Fenster"
 
-#: ../gtk/gtkwidget.c:1130
+#: ../gtk/gtkwidget.c:1149
 msgid "The widget's window if it is realized"
 msgstr "Das Fenster des Widgets, sofern es erkannt wurde"
 
-#: ../gtk/gtkwidget.c:1144
+#: ../gtk/gtkwidget.c:1163
 msgid "Double Buffered"
 msgstr "Doppelt gepuffert"
 
-#: ../gtk/gtkwidget.c:1145
+#: ../gtk/gtkwidget.c:1164
 msgid "Whether the widget is double buffered"
 msgstr "Legt fest, ob das Widget doppelt gepuffert wird"
 
-#: ../gtk/gtkwidget.c:1160
+#: ../gtk/gtkwidget.c:1179
 msgid "How to position in extra horizontal space"
 msgstr "Positionierung in zusätzlichem horizontalem Platz"
 
-#: ../gtk/gtkwidget.c:1176
+#: ../gtk/gtkwidget.c:1195
 msgid "How to position in extra vertical space"
 msgstr "Positionierung in zusätzlichem vertikalem Platz"
 
-#: ../gtk/gtkwidget.c:1195
+#: ../gtk/gtkwidget.c:1214
 msgid "Margin on Left"
 msgstr "Linker Rand"
 
-#: ../gtk/gtkwidget.c:1196
+#: ../gtk/gtkwidget.c:1215
 msgid "Pixels of extra space on the left side"
 msgstr "Zusätzlicher Platz in Pixel an der linken Seite"
 
-#: ../gtk/gtkwidget.c:1216
+#: ../gtk/gtkwidget.c:1235
 msgid "Margin on Right"
 msgstr "Rechter Rand"
 
-#: ../gtk/gtkwidget.c:1217
+#: ../gtk/gtkwidget.c:1236
 msgid "Pixels of extra space on the right side"
 msgstr "Zusätzlicher Platz in Pixeln an der rechten Seite"
 
-#: ../gtk/gtkwidget.c:1237
+#: ../gtk/gtkwidget.c:1256
 msgid "Margin on Top"
 msgstr "Oberer Rand"
 
-#: ../gtk/gtkwidget.c:1238
+#: ../gtk/gtkwidget.c:1257
 msgid "Pixels of extra space on the top side"
 msgstr "Zusätzlicher Platz in Pixeln an der oberen Seite"
 
-#: ../gtk/gtkwidget.c:1258
+#: ../gtk/gtkwidget.c:1277
 msgid "Margin on Bottom"
 msgstr "Unterer Rand"
 
-#: ../gtk/gtkwidget.c:1259
+#: ../gtk/gtkwidget.c:1278
 msgid "Pixels of extra space on the bottom side"
 msgstr "Zusätzlicher Platz in Pixeln an der unteren Seite"
 
-#: ../gtk/gtkwidget.c:1276
+#: ../gtk/gtkwidget.c:1295
 msgid "All Margins"
 msgstr "Alle Ränder"
 
-#: ../gtk/gtkwidget.c:1277
+#: ../gtk/gtkwidget.c:1296
 msgid "Pixels of extra space on all four sides"
 msgstr "Zusätzlicher Platz in Pixel an allen vier Seiten"
 
-#: ../gtk/gtkwidget.c:1310
+#: ../gtk/gtkwidget.c:1329
 msgid "Horizontal Expand"
 msgstr "Horizontal ausbreiten"
 
-#: ../gtk/gtkwidget.c:1311
+#: ../gtk/gtkwidget.c:1330
 msgid "Whether widget wants more horizontal space"
 msgstr "Soll das Widget mehr horizontalen Platz benötigen?"
 
-#: ../gtk/gtkwidget.c:1325
+#: ../gtk/gtkwidget.c:1344
 msgid "Horizontal Expand Set"
 msgstr "Horizontale Ausbreitung gesetzt"
 
-#: ../gtk/gtkwidget.c:1326
+#: ../gtk/gtkwidget.c:1345
 msgid "Whether to use the hexpand property"
 msgstr "Soll die hexpand-Eigenschaft gesetzt werden?"
 
-#: ../gtk/gtkwidget.c:1340
+#: ../gtk/gtkwidget.c:1359
 msgid "Vertical Expand"
 msgstr "Vertikal ausbreiten"
 
-#: ../gtk/gtkwidget.c:1341
+#: ../gtk/gtkwidget.c:1360
 msgid "Whether widget wants more vertical space"
 msgstr "Soll das Widget mehr vertikalen Platz benötigen?"
 
-#: ../gtk/gtkwidget.c:1355
+#: ../gtk/gtkwidget.c:1374
 msgid "Vertical Expand Set"
 msgstr "Vertikale Ausbreitung gesetzt"
 
-#: ../gtk/gtkwidget.c:1356
+#: ../gtk/gtkwidget.c:1375
 msgid "Whether to use the vexpand property"
 msgstr "Soll die vexpand-Eigenschaft verwendet werden?"
 
-#: ../gtk/gtkwidget.c:1370
+#: ../gtk/gtkwidget.c:1389
 msgid "Expand Both"
 msgstr "Beide ausbreiten"
 
-#: ../gtk/gtkwidget.c:1371
+#: ../gtk/gtkwidget.c:1390
 msgid "Whether widget wants to expand in both directions"
 msgstr "Soll das Widget in beide Richtungen ausgebreitet werden?"
 
-#: ../gtk/gtkwidget.c:3008
+#: ../gtk/gtkwidget.c:3029
 msgid "Interior Focus"
 msgstr "Interner Fokus"
 
-#: ../gtk/gtkwidget.c:3009
+#: ../gtk/gtkwidget.c:3030
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Soll der Fokusanzeiger in Widgets dargestellt werden?"
 
-#: ../gtk/gtkwidget.c:3015
+#: ../gtk/gtkwidget.c:3036
 msgid "Focus linewidth"
 msgstr "Länge der Fokuszeile"
 
-#: ../gtk/gtkwidget.c:3016
+#: ../gtk/gtkwidget.c:3037
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Die Breite der Fokusanzeiger-Linie in Pixel"
 
-#: ../gtk/gtkwidget.c:3022
+#: ../gtk/gtkwidget.c:3043
 msgid "Focus line dash pattern"
 msgstr "Strichelmuster der Fokuszeile"
 
-#: ../gtk/gtkwidget.c:3023
+#: ../gtk/gtkwidget.c:3044
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Das zum Zeichnen des Fokusanzeigers zu verwendende Strichelmuster"
 
-#: ../gtk/gtkwidget.c:3028
+#: ../gtk/gtkwidget.c:3049
 msgid "Focus padding"
 msgstr "Fokus-Auffüllung"
 
-#: ../gtk/gtkwidget.c:3029
+#: ../gtk/gtkwidget.c:3050
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr ""
 "Der Abstand zwischen dem Fokusanzeiger und dem »Kasten« um das Widget in Pixel"
 
-#: ../gtk/gtkwidget.c:3034
+#: ../gtk/gtkwidget.c:3055
 msgid "Cursor color"
 msgstr "Zeigerfarbe"
 
-#: ../gtk/gtkwidget.c:3035
+#: ../gtk/gtkwidget.c:3056
 msgid "Color with which to draw insertion cursor"
 msgstr "Die Farbe, in der der Einfügezeiger gezeichnet werden soll"
 
-#: ../gtk/gtkwidget.c:3040
+#: ../gtk/gtkwidget.c:3061
 msgid "Secondary cursor color"
 msgstr "Zweite Zeigerfarbe"
 
-#: ../gtk/gtkwidget.c:3041
+#: ../gtk/gtkwidget.c:3062
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -7543,44 +7676,44 @@ msgstr ""
 "Die Farbe des zweiten Einfügezeigers, wenn rechts- und linksläufiger Text "
 "gemischt bearbeitet werden."
 
-#: ../gtk/gtkwidget.c:3046
+#: ../gtk/gtkwidget.c:3067
 msgid "Cursor line aspect ratio"
 msgstr "Seitenverhältnis der Zeigerzeile"
 
-#: ../gtk/gtkwidget.c:3047
+#: ../gtk/gtkwidget.c:3068
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Das Seitenverhältnis, in dem der Einfügezeiger gezeichnet werden soll"
 
-#: ../gtk/gtkwidget.c:3053
+#: ../gtk/gtkwidget.c:3074
 msgid "Window dragging"
 msgstr "Ziehen von Fenstern"
 
-#: ../gtk/gtkwidget.c:3054
+#: ../gtk/gtkwidget.c:3075
 msgid "Whether windows can be dragged by clicking on empty areas"
 msgstr ""
 "Sollen Ziehen von Fenstern durch Klicken in leere Bereiche möglich sein?"
 
-#: ../gtk/gtkwidget.c:3067
+#: ../gtk/gtkwidget.c:3088
 msgid "Unvisited Link Color"
 msgstr "Farbe für unbesuchte Links"
 
-#: ../gtk/gtkwidget.c:3068
+#: ../gtk/gtkwidget.c:3089
 msgid "Color of unvisited links"
 msgstr "Farbe für unbesuchte Verweise"
 
-#: ../gtk/gtkwidget.c:3081
+#: ../gtk/gtkwidget.c:3102
 msgid "Visited Link Color"
 msgstr "Farbe für besuchte Verweise"
 
-#: ../gtk/gtkwidget.c:3082
+#: ../gtk/gtkwidget.c:3103
 msgid "Color of visited links"
 msgstr "Farbe für besuchte Verweise"
 
-#: ../gtk/gtkwidget.c:3096
+#: ../gtk/gtkwidget.c:3117
 msgid "Wide Separators"
 msgstr "Breite Trennbalken"
 
-#: ../gtk/gtkwidget.c:3097
+#: ../gtk/gtkwidget.c:3118
 msgid ""
 "Whether separators have configurable width and should be drawn using a box "
 "instead of a line"
@@ -7588,83 +7721,83 @@ msgstr ""
 "Sollen Trennbalken eine festlegbare Breite haben und als Fläche anstatt einer "
 "Linie dargestellt werden?"
 
-#: ../gtk/gtkwidget.c:3111
+#: ../gtk/gtkwidget.c:3132
 msgid "Separator Width"
 msgstr "Breite der Trennbalken"
 
-#: ../gtk/gtkwidget.c:3112
+#: ../gtk/gtkwidget.c:3133
 msgid "The width of separators if wide-separators is TRUE"
 msgstr "Die Breite der Trennbalken falls »wide-separators« WAHR ist"
 
-#: ../gtk/gtkwidget.c:3126
+#: ../gtk/gtkwidget.c:3147
 msgid "Separator Height"
 msgstr "Höhe der Trennbalken"
 
-#: ../gtk/gtkwidget.c:3127
+#: ../gtk/gtkwidget.c:3148
 msgid "The height of separators if \"wide-separators\" is TRUE"
 msgstr "Die Höhe der Trennbalken falls »wide-separators« WAHR ist"
 
-#: ../gtk/gtkwidget.c:3141
+#: ../gtk/gtkwidget.c:3162
 msgid "Horizontal Scroll Arrow Length"
 msgstr "Länge horizontaler Rollpfeile"
 
-#: ../gtk/gtkwidget.c:3142
+#: ../gtk/gtkwidget.c:3163
 msgid "The length of horizontal scroll arrows"
 msgstr "Die Länge horizontaler Rollpfeile"
 
-#: ../gtk/gtkwidget.c:3156
+#: ../gtk/gtkwidget.c:3177
 msgid "Vertical Scroll Arrow Length"
 msgstr "Länge vertikaler Rollpfeile"
 
-#: ../gtk/gtkwidget.c:3157
+#: ../gtk/gtkwidget.c:3178
 msgid "The length of vertical scroll arrows"
 msgstr "Die Länge vertikaler Rollpfeile"
 
-#: ../gtk/gtkwindow.c:604
+#: ../gtk/gtkwindow.c:608
 msgid "Window Type"
 msgstr "Fenstertyp"
 
-#: ../gtk/gtkwindow.c:605
+#: ../gtk/gtkwindow.c:609
 msgid "The type of the window"
 msgstr "Der Typ des Fensters"
 
-#: ../gtk/gtkwindow.c:613
+#: ../gtk/gtkwindow.c:617
 msgid "Window Title"
 msgstr "Fenstertitel"
 
-#: ../gtk/gtkwindow.c:614
+#: ../gtk/gtkwindow.c:618
 msgid "The title of the window"
 msgstr "Der Titel des Fensters"
 
-#: ../gtk/gtkwindow.c:621
+#: ../gtk/gtkwindow.c:625
 msgid "Window Role"
 msgstr "Fensterrolle"
 
-#: ../gtk/gtkwindow.c:622
+#: ../gtk/gtkwindow.c:626
 msgid "Unique identifier for the window to be used when restoring a session"
 msgstr ""
 "Eindeutige Zeichenkette, die das Fenster beim Wiederherstellen einer Sitzung "
 "identifiziert"
 
-#: ../gtk/gtkwindow.c:638
+#: ../gtk/gtkwindow.c:642
 msgid "Startup ID"
 msgstr "Start-ID"
 
-#: ../gtk/gtkwindow.c:639
+#: ../gtk/gtkwindow.c:643
 msgid "Unique startup identifier for the window used by startup-notification"
 msgstr ""
 "Eindeutige Zeichenkette, die das Fenster beim Starten mittels startup-"
 "notification identifiziert."
 
-#: ../gtk/gtkwindow.c:647
+#: ../gtk/gtkwindow.c:651
 msgid "If TRUE, users can resize the window"
 msgstr "Falls WAHR, können Benutzer die Fenstergröße verändern"
 
-#: ../gtk/gtkwindow.c:654
+#: ../gtk/gtkwindow.c:658
 msgid "Modal"
 msgstr "Modal"
 
-#: ../gtk/gtkwindow.c:655
+#: ../gtk/gtkwindow.c:659
 msgid ""
 "If TRUE, the window is modal (other windows are not usable while this one is "
 "up)"
@@ -7672,80 +7805,88 @@ msgstr ""
 "Falls WAHR, ist das Fenster modal (alle anderen Fenster sind nicht "
 "verwendbar, während dieses geöffnet ist)"
 
-#: ../gtk/gtkwindow.c:662
+#: ../gtk/gtkwindow.c:666
 msgid "Window Position"
 msgstr "Fensterposition"
 
-#: ../gtk/gtkwindow.c:663
+#: ../gtk/gtkwindow.c:667
 msgid "The initial position of the window"
 msgstr "Die Anfangsposition des Fensters"
 
-#: ../gtk/gtkwindow.c:671
+#: ../gtk/gtkwindow.c:675
 msgid "Default Width"
 msgstr "Vorgabebreite"
 
-#: ../gtk/gtkwindow.c:672
+#: ../gtk/gtkwindow.c:676
 msgid "The default width of the window, used when initially showing the window"
 msgstr ""
 "Die Vorgabebreite des Fensters. Sie wird beim ersten Anzeigen des Fensters "
 "verwendet"
 
-#: ../gtk/gtkwindow.c:681
+#: ../gtk/gtkwindow.c:685
 msgid "Default Height"
 msgstr "Vorgabehöhe"
 
-#: ../gtk/gtkwindow.c:682
+#: ../gtk/gtkwindow.c:686
 msgid "The default height of the window, used when initially showing the window"
 msgstr ""
 "Die Vorgabebreite des Fensters. Sie wird beim ersten Anzeigen des Fensters "
 "verwendet."
 
-#: ../gtk/gtkwindow.c:691
+#: ../gtk/gtkwindow.c:695
 msgid "Destroy with Parent"
 msgstr "Mit Eltern-Widget zerstören"
 
-#: ../gtk/gtkwindow.c:692
+#: ../gtk/gtkwindow.c:696
 msgid "If this window should be destroyed when the parent is destroyed"
 msgstr ""
 "Soll dieses Fenster zerstört werden, wenn das Eltern-Widget zerstört wird?"
 
-#: ../gtk/gtkwindow.c:700
+#: ../gtk/gtkwindow.c:704
 msgid "Icon for this window"
 msgstr "Symbol für dieses Fenster"
 
-#: ../gtk/gtkwindow.c:706
+#: ../gtk/gtkwindow.c:722
 msgid "Mnemonics Visible"
 msgstr "Tastaturkürzel sind sichtbar"
 
-#: ../gtk/gtkwindow.c:707
+#: ../gtk/gtkwindow.c:723
 msgid "Whether mnemonics are currently visible in this window"
 msgstr "Sind Tastenkürzel gegenwärtig in diesem Fenster sichtbar?"
 
-#: ../gtk/gtkwindow.c:723
+#: ../gtk/gtkwindow.c:741
+msgid "Focus Visible"
+msgstr "Zeiger sichtbar"
+
+#: ../gtk/gtkwindow.c:742
+msgid "Whether focus rectangles are currently visible in this window"
+msgstr "Legt fest, ob »Fokus-Boxen« in diesem Fenster gegenwärtig sichtbar sind"
+
+#: ../gtk/gtkwindow.c:758
 msgid "Name of the themed icon for this window"
 msgstr "Name des Themen-Symbols für dieses Fenster"
 
-#: ../gtk/gtkwindow.c:738
+#: ../gtk/gtkwindow.c:773
 msgid "Is Active"
 msgstr "Ist Aktiv"
 
-#: ../gtk/gtkwindow.c:739
+#: ../gtk/gtkwindow.c:774
 msgid "Whether the toplevel is the current active window"
 msgstr "Ist das momentan aktive Fenster die oberste Ebene?"
 
-#: ../gtk/gtkwindow.c:746
+#: ../gtk/gtkwindow.c:781
 msgid "Focus in Toplevel"
 msgstr "Fokus in der obersten Ebene"
 
-#: ../gtk/gtkwindow.c:747
+#: ../gtk/gtkwindow.c:782
 msgid "Whether the input focus is within this GtkWindow"
 msgstr "Liegt der Eingabefokus innerhalb dieses GtkWindows?"
 
-#: ../gtk/gtkwindow.c:754
+#: ../gtk/gtkwindow.c:789
 msgid "Type hint"
 msgstr "Typ-Hinweis"
 
-#: ../gtk/gtkwindow.c:755
+#: ../gtk/gtkwindow.c:790
 msgid ""
 "Hint to help the desktop environment understand what kind of window this is "
 "and how to treat it."
@@ -7753,647 +7894,135 @@ msgstr ""
 "Hinweis, der der Arbeitsumgebung dabei hilft, den Typ und die erforderliche "
 "Behandlung dieses Fensters zu bestimmen."
 
-#: ../gtk/gtkwindow.c:763
+#: ../gtk/gtkwindow.c:798
 msgid "Skip taskbar"
 msgstr "Fensterliste übergehen"
 
-#: ../gtk/gtkwindow.c:764
+#: ../gtk/gtkwindow.c:799
 msgid "TRUE if the window should not be in the task bar."
 msgstr ""
 "WAHR, falls das Fenster nicht in der Fensterliste aufgeführt werden soll."
 
-#: ../gtk/gtkwindow.c:771
+#: ../gtk/gtkwindow.c:806
 msgid "Skip pager"
 msgstr "Arbeitsflächen-Umschalter übergehen"
 
-#: ../gtk/gtkwindow.c:772
+#: ../gtk/gtkwindow.c:807
 msgid "TRUE if the window should not be in the pager."
 msgstr ""
 "WAHR, falls das Fenster nicht im Arbeitsflächen-Umschalter aufgeführt werden "
 "soll."
 
-#: ../gtk/gtkwindow.c:779
+#: ../gtk/gtkwindow.c:814
 msgid "Urgent"
 msgstr "Aufdringlich"
 
-#: ../gtk/gtkwindow.c:780
+#: ../gtk/gtkwindow.c:815
 msgid "TRUE if the window should be brought to the user's attention."
 msgstr ""
 "WAHR, falls das Fenster in den Aufmerksamkeitsbereich des Benutzers gebracht "
 "werden soll."
 
-#: ../gtk/gtkwindow.c:794
+#: ../gtk/gtkwindow.c:829
 msgid "Accept focus"
 msgstr "Fokus annehmen"
 
-#: ../gtk/gtkwindow.c:795
+#: ../gtk/gtkwindow.c:830
 msgid "TRUE if the window should receive the input focus."
 msgstr "WAHR, falls das Fenster den Eingabefokus erhalten soll."
 
 # CHECK
-#: ../gtk/gtkwindow.c:809
+#: ../gtk/gtkwindow.c:844
 msgid "Focus on map"
 msgstr "Fokus beim Zuweisen"
 
 # CHECK
-#: ../gtk/gtkwindow.c:810
+#: ../gtk/gtkwindow.c:845
 msgid "TRUE if the window should receive the input focus when mapped."
 msgstr "WAHR, falls das Fenster beim Zuweisen den Eingabefokus erhalten soll."
 
-#: ../gtk/gtkwindow.c:824
+#: ../gtk/gtkwindow.c:859
 msgid "Decorated"
 msgstr "Dekoriert"
 
-#: ../gtk/gtkwindow.c:825
+#: ../gtk/gtkwindow.c:860
 msgid "Whether the window should be decorated by the window manager"
 msgstr "Soll das Fenster von der Fensterverwaltung dekoriert werden?"
 
-#: ../gtk/gtkwindow.c:839
+#: ../gtk/gtkwindow.c:874
 msgid "Deletable"
 msgstr "Entfernbar"
 
-#: ../gtk/gtkwindow.c:840
+#: ../gtk/gtkwindow.c:875
 msgid "Whether the window frame should have a close button"
 msgstr "Soll der Fensterrahmen einen »Schließen«-Knopf haben?"
 
-#: ../gtk/gtkwindow.c:859
+#: ../gtk/gtkwindow.c:894
 msgid "Resize grip"
 msgstr "Anfasser zur Größenänderung"
 
-#: ../gtk/gtkwindow.c:860
+#: ../gtk/gtkwindow.c:895
 msgid "Specifies whether the window should have a resize grip"
 msgstr "Legt fest, ob das Fenster einen Anfasser zur Größenänderung hat"
 
-#: ../gtk/gtkwindow.c:874
+#: ../gtk/gtkwindow.c:909
 msgid "Resize grip is visible"
 msgstr "Anfasser zur Größenänderung ist sichtbar"
 
-#: ../gtk/gtkwindow.c:875
+#: ../gtk/gtkwindow.c:910
 msgid "Specifies whether the window's resize grip is visible."
 msgstr ""
 "Legt fest, ob der Anfasser zur Größenänderung des Fensters sichtbar ist."
 
 # CHECK
-#: ../gtk/gtkwindow.c:891
+#: ../gtk/gtkwindow.c:926
 msgid "Gravity"
 msgstr "Schwere"
 
 # CHECK
-#: ../gtk/gtkwindow.c:892
+#: ../gtk/gtkwindow.c:927
 msgid "The window gravity of the window"
 msgstr "Die Fensterschwere des Fensters"
 
 # CHECK
-#: ../gtk/gtkwindow.c:909
+#: ../gtk/gtkwindow.c:944
 msgid "Transient for Window"
 msgstr "Flüchtig für Fenster"
 
-#: ../gtk/gtkwindow.c:910
+#: ../gtk/gtkwindow.c:945
 msgid "The transient parent of the dialog"
 msgstr "Das vorübergehende Eltern-Widget des Dialogs"
 
 # CHECK
-#: ../gtk/gtkwindow.c:925
+#: ../gtk/gtkwindow.c:960
 msgid "Opacity for Window"
 msgstr "Transparenz des Fensters"
 
-#: ../gtk/gtkwindow.c:926
+#: ../gtk/gtkwindow.c:961
 msgid "The opacity of the window, from 0 to 1"
 msgstr "Die Transparenz des Fensters, von 0 bis 1"
 
-#: ../gtk/gtkwindow.c:936 ../gtk/gtkwindow.c:937
+#: ../gtk/gtkwindow.c:971 ../gtk/gtkwindow.c:972
 msgid "Width of resize grip"
 msgstr "Breite des Anfassers zur Größenänderung"
 
-#: ../gtk/gtkwindow.c:942 ../gtk/gtkwindow.c:943
+#: ../gtk/gtkwindow.c:977 ../gtk/gtkwindow.c:978
 msgid "Height of resize grip"
 msgstr "Höhe des Anfassers zur Größenänderung"
 
-#: ../gtk/gtkwindow.c:965
+#: ../gtk/gtkwindow.c:1000
 msgid "GtkApplication"
 msgstr "GtkApplication"
 
-#: ../gtk/gtkwindow.c:966
+#: ../gtk/gtkwindow.c:1001
 msgid "The GtkApplication for the window"
 msgstr "Die GtkApplication des Fensters"
 
-#~ msgid ""
-#~ "The label for the link to the website of the program. If this is not set, "
-#~ "it defaults to the URL"
-#~ msgstr ""
-#~ "Die Beschriftung für die Webseite des Programms. Wird dies leer gelassen, "
-#~ "so hat sie den Wert der Adresse"
-
-#~ msgid "Tab pack type"
-#~ msgstr "Reiter-Packtyp"
-
-#~ msgid "Update policy"
-#~ msgstr "Aktualisierungsmethode"
-
-#~ msgid "How the range should be updated on the screen"
-#~ msgstr ""
-#~ "Die Art und Weise, auf die der Bereich auf dem Bildschirm aktualisiert "
-#~ "werden soll"
-
-#~ msgid "Lower"
-#~ msgstr "Untergrenze"
-
-#~ msgid "Lower limit of ruler"
-#~ msgstr "Die Untergrenze des Lineals"
-
-#~ msgid "Upper"
-#~ msgstr "Obergrenze"
-
-#~ msgid "Upper limit of ruler"
-#~ msgstr "Die Obergrenze des Lineals"
-
-#~ msgid "Position of mark on the ruler"
-#~ msgstr "Die Position der Markierung auf dem Lineal"
-
-#~ msgid "Max Size"
-#~ msgstr "Max. Länge"
-
-#~ msgid "Maximum size of the ruler"
-#~ msgstr "Die maximale Länge des Lineals"
-
-#~ msgid "Metric"
-#~ msgstr "Metrisch"
-
-#~ msgid "The metric used for the ruler"
-#~ msgstr "Die metrische Einheit des Lineals"
-
-#~ msgid "Number of steps"
-#~ msgstr "Anzahl der Schritte"
-
-#~ msgid ""
-#~ "The number of steps for the spinner to complete a full loop. The animation "
-#~ "will complete a full cycle in one second by default (see #GtkSpinner:cycle-"
-#~ "duration)."
-#~ msgstr ""
-#~ "Die Anzahl der Schritte des Spinners für eine volle Drehung. Die Animation "
-#~ "legt per Vorgabe eine volle Umdrehung in einer Sekunde zurück (siehe "
-#~ "#GtkSpinner:cycle-duration)."
-
-#~ msgid "Animation duration"
-#~ msgstr "Dauer der Animation"
-
-#~ msgid ""
-#~ "The length of time in milliseconds for the spinner to complete a full loop"
-#~ msgstr "Die Zeit in Millisekunden für eine volle Umdrehung des Spinners"
-
-# CHECK - toplevel unübersetzt
-#~ msgid "Whether the statusbar has a grip for resizing the toplevel"
-#~ msgstr "Soll die Statusleiste einen Anfasser zur Größenänderung haben?"
-
-#~ msgid "Horizontal Adjustment for the widget"
-#~ msgstr "Die horizontale Stellgröße für das Widget"
-
-#~ msgid "Vertical Adjustment for the widget"
-#~ msgstr "Die vertikale Stellgröße für das Widget"
-
-#~ msgid ""
-#~ "The GtkAdjustment that determines the values of the horizontal position "
-#~ "for this viewport"
-#~ msgstr ""
-#~ "Das GtkAdjustment, das die horizontalen Positionswerte dieses Sichtfelds "
-#~ "bestimmt"
-
-#~ msgid ""
-#~ "The GtkAdjustment that determines the values of the vertical position for "
-#~ "this viewport"
-#~ msgstr ""
-#~ "Das GtkAdjustment, das die vertikalen Positionswerte dieses Sichtfelds "
-#~ "bestimmt"
-
-#~ msgid "Extension events"
-#~ msgstr "Erweiterungsereignisse"
-
-#~ msgid "The mask that decides what kind of extension events this widget gets"
-#~ msgstr ""
-#~ "Die Maske, die festlegt, welche Erweiterungsereignisse dieses Widget erhält"
-
-#~ msgid "Pixmap"
-#~ msgstr "Pixmap"
-
-#~ msgid "A GdkPixmap to display"
-#~ msgstr "Eine anzuzeigende GdkPixmap"
-
-#~ msgid "Mask"
-#~ msgstr "Maske"
-
-#~ msgid "Mask bitmap to use with GdkPixmap"
-#~ msgstr "Das Maskenbitmap für GdkPixmap"
-
-#~ msgid "the GdkScreen for the renderer"
-#~ msgstr "Der GdkScreen für den Renderer"
-
-#~ msgid "The adjustment that holds the value of the spinbutton."
-#~ msgstr "Die Stellgröße, die den Wert des Spinnbuttons enthält"
-
-#~ msgid "Has separator"
-#~ msgstr "Hat Trennbalken"
-
-#~ msgid "The dialog has a separator bar above its buttons"
-#~ msgstr "Der Dialog hat einen Trennbalken über seinen Knöpfen"
-
-#~ msgid "Invisible char set"
-#~ msgstr "Unsichtbares Zeichen aktivieren"
-
-#~ msgid "State Hint"
-#~ msgstr "Status-Hinweis"
-
-#~ msgid "Whether to pass a proper state when drawing shadow or background"
-#~ msgstr ""
-#~ "Legt fest, ob beim Zeichnen von Schatten oder Hintergrund ein Status "
-#~ "weitergegeben wird"
-
-#~ msgid "Deprecated property, use shadow_type instead"
-#~ msgstr "Veraltete Eigenschaft, verwenden Sie stattdessen shadow_type."
-
-#~ msgid "A GdkImage to display"
-#~ msgstr "Ein anzuzeigendes GdkImage"
-
-#~ msgid "Use separator"
-#~ msgstr "Trennbalken verwenden"
-
-#~ msgid ""
-#~ "Whether to put a separator between the message dialog's text and the "
-#~ "buttons"
-#~ msgstr ""
-#~ "Soll eine Trennlinie zwischen dem Text des Nachrichtendialog und den "
-#~ "Knöpfen eingefügt werden?"
-
-#~ msgid "Draw slider ACTIVE during drag"
-#~ msgstr "Schieber beim Ziehen als »aktiv« darstellen"
-
-#~ msgid ""
-#~ "With this option set to TRUE, sliders will be drawn ACTIVE and with shadow "
-#~ "IN while they are dragged"
-#~ msgstr ""
-#~ "Falls diese Eigenschaft WAHR ist, werden Schieber als »aktiv« und mit "
-#~ "Schatten nach innen dargestellt, wenn sie gezogen werden"
-
-#~ msgid "Trough Side Details"
-#~ msgstr "Details der Trogseiten"
-
-#~ msgid ""
-#~ "When TRUE, the parts of the trough on the two sides of the slider are "
-#~ "drawn with different details"
-#~ msgstr ""
-#~ "Falls diese Option WAHR ist, werden die Teile des Trogs auf den beiden "
-#~ "Seiten des Schiebers mit verschiedenen Details dargestellt"
-
-#~| msgid "Position Set"
-#~ msgid "Stepper Position Details"
-#~ msgstr "Details zur Stepper-Position"
-
-#~ msgid "Blinking"
-#~ msgstr "Blinken"
-
-#~ msgid "Whether or not the status icon is blinking"
-#~ msgstr "Soll das Statussymbol blinken?"
-
-#~ msgid "Background stipple mask"
-#~ msgstr "Hintergrund-Schraffurmaske"
-
-#~ msgid "Bitmap to use as a mask when drawing the text background"
-#~ msgstr ""
-#~ "Die als Maske beim Zeichnen des Texthintergrundes zu verwendende Bitmap"
-
-#~ msgid "Foreground stipple mask"
-#~ msgstr "Vordergrund-Schraffurmaske"
-
-#~ msgid "Bitmap to use as a mask when drawing the text foreground"
-#~ msgstr ""
-#~ "Die als Maske beim Zeichnen des Textvordergrundes zu verwendende Bitmap"
-
-#~ msgid "Background stipple set"
-#~ msgstr "Hintergrundschraffur einstellen"
-
-#~ msgid "Whether this tag affects the background stipple"
-#~ msgstr "Soll dieses Tag die Hintergrundschraffur beeinflussen?"
-
-#~ msgid "Foreground stipple set"
-#~ msgstr "Vordergrundschraffur einstellen"
-
-#~ msgid "Whether this tag affects the foreground stipple"
-#~ msgstr "Soll dieses Tag die Vordergrundschraffur beeinflussen?"
-
-#~ msgid "Row Ending details"
-#~ msgstr "Details der Zeilenenden"
-
-#~ msgid "Enable extended row background theming"
-#~ msgstr "Erweitertes Festlegen des Spaltenhintergrunds aktivieren"
-
-#~ msgid "Draw Border"
-#~ msgstr "Rand zeichnen"
-
-#~ msgid "Size of areas outside the widget's allocation to draw"
-#~ msgstr "Größe der Zonen außerhalb des Widget-Belegung die gezeichnet wird"
-
-# Endlosschleife haben wir schon in Totem.
-#~ msgid "Loop"
-#~ msgstr "Endlosschleife"
-
-#~ msgid "Whether the animation should loop when it reaches the end"
-#~ msgstr "Soll die Animation ständig wiederholt werden?"
-
-#~ msgid "Number of Channels"
-#~ msgstr "Kanalanzahl"
-
-#~ msgid "The number of samples per pixel"
-#~ msgstr "Die Sample-Anzahl pro Pixel"
-
-#~ msgid "Colorspace"
-#~ msgstr "Farbraum"
-
-#~ msgid "The colorspace in which the samples are interpreted"
-#~ msgstr "Der Farbraum, in dem die Samples interpretiert werden"
-
-#~ msgid "Has Alpha"
-#~ msgstr "Hat Transparenz"
-
-#~ msgid "Whether the pixbuf has an alpha channel"
-#~ msgstr "Soll die Pixbuf einen Alpha-Kanal haben?"
-
-#~ msgid "Bits per Sample"
-#~ msgstr "Bit pro Sample"
-
-#~ msgid "The number of bits per sample"
-#~ msgstr "Die Bit-Anzahl pro Sample"
-
-#~ msgid "The number of columns of the pixbuf"
-#~ msgstr "Die Anzahl der Spalten in der Pixbuf"
-
-#~ msgid "The number of rows of the pixbuf"
-#~ msgstr "Die Anzahl der Zeilen in der Pixbuf"
-
-#~ msgid "Rowstride"
-#~ msgstr "Zeilenschritt"
-
-# CHECK
-#~ msgid ""
-#~ "The number of bytes between the start of a row and the start of the next "
-#~ "row"
-#~ msgstr ""
-#~ "Die Anzahl der Byte zwischen dem Anfang einer Zeile und dem Anfang der "
-#~ "nächsten Zeile"
-
-#~ msgid "Pixels"
-#~ msgstr "Pixel"
-
-#~ msgid "A pointer to the pixel data of the pixbuf"
-#~ msgstr "Ein Zeiger zu den Pixel-Daten des Pixbuf"
-
-#~ msgid "The GdkFont that is currently selected"
-#~ msgstr "Die momentan gewählte GdkFont"
-
-#~ msgid "Activity mode"
-#~ msgstr "Aktivitätsmodus"
-
-#~ msgid ""
-#~ "If TRUE, the GtkProgress is in activity mode, meaning that it signals "
-#~ "something is happening, but not how much of the activity is finished. This "
-#~ "is used when you're doing something but don't know how long it will take."
-#~ msgstr ""
-#~ "Falls WAHR, ist GtkProgress im Aktivitätsmodus, was bedeutet, dass eine "
-#~ "Aktivität zwar dargestellt wird, nicht aber ihr Fortschritt. Dies wird "
-#~ "verwendet, wenn die Anwendung etwas durchführt, von dem Sie nicht wissen, "
-#~ "wie lang es dauert."
-
-#~ msgid ""
-#~ "The maximum number of items to be returned by gtk_recent_manager_get_items"
-#~ "()"
-#~ msgstr ""
-#~ "Die maximale Anzahl an Einträgen, die von gtk_recent_manager_get_items() "
-#~ "zurück gegeben wird"
-
-#~ msgid "Allow Shrink"
-#~ msgstr "Schrumpfen erlauben"
-
-#~ msgid ""
-#~ "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of "
-#~ "the time a bad idea"
-#~ msgstr ""
-#~ "Falls WAHR, hat das Fenster keine Mindestgröße. Dies auf WAHR zu setzen, "
-#~ "ist in 99% aller Fälle keine gute Idee"
-
-#~ msgid "Allow Grow"
-#~ msgstr "Wachstum erlauben"
-
-#~ msgid "If TRUE, users can expand the window beyond its minimum size"
-#~ msgstr ""
-#~ "Falls WAHR, können Benutzer das Fenster über seine Mindestgröße hinaus "
-#~ "vergrößern"
-
-#~ msgid "Enable arrow keys"
-#~ msgstr "Pfeiltasten aktivieren"
-
-#~ msgid "Whether the arrow keys move through the list of items"
-#~ msgstr "Sollen die Pfeiltasten durch die Eintragsliste führen?"
-
-#~ msgid "Always enable arrows"
-#~ msgstr "Pfeile immer aktivieren"
-
-#~ msgid "Obsolete property, ignored"
-#~ msgstr "Überflüssige Eigenschaft, ignoriert"
-
-#~ msgid "Case sensitive"
-#~ msgstr "Groß-/Kleinschreibung berücksichtigen"
-
-#~ msgid "Whether list item matching is case sensitive"
-#~ msgstr ""
-#~ "Soll die Erkennung von Listeneinträgen unter Berücksichtigung der Groß-/"
-#~ "Kleinschreibung erfolgen?"
-
-#~ msgid "Allow empty"
-#~ msgstr "Darf leer sein"
-
-#~ msgid "Whether an empty value may be entered in this field"
-#~ msgstr "Darf ein leerer Wert in dieses Feld eingetragen werden?"
-
-#~ msgid "Value in list"
-#~ msgstr "Wert in Liste"
-
-#~ msgid "Whether entered values must already be present in the list"
-#~ msgstr "Müssen eingetragene Werte bereits in der Liste vorhanden sein?"
-
-#~ msgid "Is this curve linear, spline interpolated, or free-form"
-#~ msgstr "Ist diese Kurve e-linear, spline-interpoliert oder unregelmäßig?"
-
-#~ msgid "Minimum X"
-#~ msgstr "Minimales X"
-
-#~ msgid "Minimum possible value for X"
-#~ msgstr "Der minimale für X zugelassene Wert"
-
-#~ msgid "Maximum X"
-#~ msgstr "Maximales X"
-
-#~ msgid "Maximum possible X value"
-#~ msgstr "Der maximale für X zugelassene Wert"
-
-#~ msgid "Minimum Y"
-#~ msgstr "Minimales Y"
-
-#~ msgid "Minimum possible value for Y"
-#~ msgstr "Der minimale für Y zugelassene Wert"
-
-#~ msgid "Maximum Y"
-#~ msgstr "Maximales Y"
-
-#~ msgid "Maximum possible value for Y"
-#~ msgstr "Der maximale für Y zugelassene Wert"
-
-#~ msgid "File System Backend"
-#~ msgstr "Dateisystem-Backend"
-
-#~ msgid "Name of file system backend to use"
-#~ msgstr "Der Name des zu verwendenden Dateisystem-Backends"
-
-#~ msgid "The currently selected filename"
-#~ msgstr "Der momentan gewählte Dateiname"
-
-#~ msgid "Show file operations"
-#~ msgstr "Dateiaktionen anzeigen"
-
-#~ msgid "Whether buttons for creating/manipulating files should be displayed"
-#~ msgstr ""
-#~ "Sollen Knöpfe zum Erstellen und Verwalten von Dateien angezeigt werden?"
-
-#~ msgid "Tab Border"
-#~ msgstr "Reiterrand"
-
-#~ msgid "Width of the border around the tab labels"
-#~ msgstr "Die Breite des Rands um Reiterbeschriftungen"
-
-#~ msgid "Horizontal Tab Border"
-#~ msgstr "Horizontaler Reiterrand"
-
-#~ msgid "Width of the horizontal border of tab labels"
-#~ msgstr "Die Breite des horizontalen Rands um Reiterbeschriftungen"
-
-#~ msgid "Vertical Tab Border"
-#~ msgstr "Vertikaler Reiterrand"
-
-#~ msgid "Width of the vertical border of tab labels"
-#~ msgstr "Die Breite des vertikalen Rands um Reiterbeschriftungen"
-
-#~ msgid "Whether tabs should have homogeneous sizes"
-#~ msgstr "Sollen alle Reiter gleich groß sein?"
-
-#~ msgid "Group ID for tabs drag and drop"
-#~ msgstr "Gruppen-ID für Reiter beim Drag&Drop"
-
-#~ msgid "User Data"
-#~ msgstr "Benutzerdaten"
-
-#~ msgid "Anonymous User Data Pointer"
-#~ msgstr "Zeiger auf anonyme Benutzerdaten"
-
-#~ msgid "The menu of options"
-#~ msgstr "Das Optionsmenü"
-
-#~ msgid "Size of dropdown indicator"
-#~ msgstr "Die Größe des Herabklapp-Indikators"
-
-#~ msgid "Spacing around indicator"
-#~ msgstr "Freiraum um Indikator"
-
-#~ msgid ""
-#~ "Whether the preview widget should take up the entire space it is allocated"
-#~ msgstr ""
-#~ "Soll das Vorschau-Widget den gesamten ihm zugewiesenen Raum einnehmen?"
-
-#~ msgid "The GtkAdjustment connected to the progress bar (Deprecated)"
-#~ msgstr "Die mit dem Fortschrittsbalken verbundene Stellgröße (veraltet)"
-
-#~ msgid "Bar style"
-#~ msgstr "Balkenstil"
-
-#~ msgid "Specifies the visual style of the bar in percentage mode (Deprecated)"
-#~ msgstr "Gibt das Aussehen des Balkens im Prozentmodus an (veraltet)"
-
-#~ msgid "Activity Step"
-#~ msgstr "Aktivitäts-Schrittweite"
-
-#~ msgid "The increment used for each iteration in activity mode (Deprecated)"
-#~ msgstr "Die Schrittweite jedes Durchlaufs im Aktivitätsmodus (veraltet)"
-
-#~ msgid "Activity Blocks"
-#~ msgstr "Aktivitätsblöcke"
-
-#~ msgid ""
-#~ "The number of blocks which can fit in the progress bar area in activity "
-#~ "mode (Deprecated)"
-#~ msgstr ""
-#~ "Die Anzahl der Blöcke, die im Aktivitätsmodus in die Fläche des "
-#~ "Fortschrittsbalkens passen (veraltet)"
-
-#~ msgid "Discrete Blocks"
-#~ msgstr "Getrennte Blöcke"
-
-#~ msgid ""
-#~ "The number of discrete blocks in a progress bar (when shown in the "
-#~ "discrete style)"
-#~ msgstr ""
-#~ "Die Anzahl getrennter Blöcke in einem Fortschrittsbalken (wenn im "
-#~ "Blockmodus dargestellt)"
-
-#~ msgid "Horizontal adjustment for the text widget"
-#~ msgstr "Die horizontale Stellgröße für das Text-Widget"
-
-#~ msgid "Vertical adjustment for the text widget"
-#~ msgstr "Die vertikale Stellgröße für das Text-Widget"
-
-#~ msgid "Line Wrap"
-#~ msgstr "Zeilenumbruch"
-
-#~ msgid "Whether lines are wrapped at widget edges"
-#~ msgstr "Sollen Zeilen an den Widget-Kanten umbrochen werden?"
-
-#~ msgid "Word Wrap"
-#~ msgstr "Wortumbruch"
-
-#~ msgid "Whether words are wrapped at widget edges"
-#~ msgstr "Sollen Wörter an den Widget-Kanten umbrochen werden?"
-
-#~ msgid "Tooltips"
-#~ msgstr "Minihilfen"
-
-#~ msgid "If the tooltips of the toolbar should be active or not"
-#~ msgstr "Legt fest, ob die Minihilfen der Werkzeugleiste angezeigt werden"
-
-#~ msgid "The orientation of the toolbar"
-#~ msgstr "Die Ausrichtung der Werkzeugleiste"
-
-#~ msgid "Whether stock icons should be shown in buttons"
-#~ msgstr "Sollen in Knöpfen Repertoire-Symbole angezeigt werden?"
-
-#~ msgid "Whether or not the operation has been successfully cancelled"
-#~ msgstr "Legt fest, ob die Operation erfolgreich abgebrochen wurde"
-
-#~ msgid ""
-#~ "A number between 0.0 and 1.0 specifying the horizontal alignment of the "
-#~ "text in the progress widget"
-#~ msgstr ""
-#~ "Eine Zahl zwischen 0.0 und 1.0, die die horizontale Ausrichtung des Texts "
-#~ "im Fortschritts-Widget angibt"
-
-#~ msgid ""
-#~ "A number between 0.0 and 1.0 specifying the vertical alignment of the text "
-#~ "in the progress widget"
-#~ msgstr ""
-#~ "Eine Zahl zwischen 0.0 und 1.0, die die vertikale Ausrichtung des Texts im "
-#~ "Fortschritts-Widget angibt"
-
-#, fuzzy
-#~ msgid "The current page in the document."
-#~ msgstr "Die Seitengröße der Stellgröße"
+#: ../modules/printbackends/cups/gtkprintercups.c:95
+msgid "Color Profile Title"
+msgstr "Titel des Farbprofils"
 
-#~ msgid "Homogenous"
-#~ msgstr "Gleichmäßig"
+#: ../modules/printbackends/cups/gtkprintercups.c:96
+msgid "The title of the color profile to use"
+msgstr "Der Titel des zu verwendenden Farbprofils"
 
-#, fuzzy
-#~ msgid "Show Preview"
-#~ msgstr "Text anzeigen"
diff --git a/po-properties/es.po b/po-properties/es.po
index 3faab458b3..170b2039ae 100644
--- a/po-properties/es.po
+++ b/po-properties/es.po
@@ -16,10 +16,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-properties.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
-"%2b&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-16 06:22+0000\n"
-"PO-Revision-Date: 2011-08-17 01:34+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%"
+"2b&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-08-23 19:56+0000\n"
+"PO-Revision-Date: 2011-08-24 12:27+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -313,7 +313,7 @@ msgid "A unique name for the action."
 msgstr "Un nombre único para la acción."
 
 #: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:228 ../gtk/gtkexpander.c:290
-#: ../gtk/gtkframe.c:171 ../gtk/gtklabel.c:744 ../gtk/gtkmenuitem.c:383
+#: ../gtk/gtkframe.c:171 ../gtk/gtklabel.c:729 ../gtk/gtkmenuitem.c:383
 #: ../gtk/gtktoolbutton.c:232 ../gtk/gtktoolitemgroup.c:1592
 msgid "Label"
 msgstr "Etiqueta"
@@ -976,12 +976,12 @@ msgstr ""
 "Texto del etiqueta del widget dentro del botón, si el botón contiene una "
 "etiqueta del widget"
 
-#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:298 ../gtk/gtklabel.c:765
+#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:298 ../gtk/gtklabel.c:750
 #: ../gtk/gtkmenuitem.c:398 ../gtk/gtktoolbutton.c:239
 msgid "Use underline"
 msgstr "Utilizar subrayado"
 
-#: ../gtk/gtkbutton.c:237 ../gtk/gtkexpander.c:299 ../gtk/gtklabel.c:766
+#: ../gtk/gtkbutton.c:237 ../gtk/gtkexpander.c:299 ../gtk/gtklabel.c:751
 #: ../gtk/gtkmenuitem.c:399
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
@@ -1490,8 +1490,7 @@ msgstr "Tiene entrada"
 
 #: ../gtk/gtkcellrenderercombo.c:172
 msgid "If FALSE, don't allow to enter strings other than the chosen ones"
-msgstr ""
-"Si es «FALSE», no permitir introducir cadenas distintas de las elegidas"
+msgstr "Si es «FALSE», no permitir introducir cadenas distintas de las elegidas"
 
 #: ../gtk/gtkcellrendererpixbuf.c:140
 msgid "Pixbuf Object"
@@ -1672,7 +1671,7 @@ msgstr "Marcado"
 msgid "Marked up text to render"
 msgstr "Texto resaltado a renderizar"
 
-#: ../gtk/gtkcellrenderertext.c:270 ../gtk/gtklabel.c:751
+#: ../gtk/gtkcellrenderertext.c:270 ../gtk/gtklabel.c:736
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -1760,8 +1759,7 @@ msgstr "Tipografía"
 
 #: ../gtk/gtkcellrenderertext.c:358 ../gtk/gtktexttag.c:295
 msgid "Font description as a string, e.g. \"Sans Italic 12\""
-msgstr ""
-"Descripción de la tipografía como una cadena, ejemplo: «Sans Italic 12»"
+msgstr "Descripción de la tipografía como una cadena, ejemplo: «Sans Italic 12»"
 
 #: ../gtk/gtkcellrenderertext.c:366 ../gtk/gtktexttag.c:303
 msgid "Font description as a PangoFontDescription struct"
@@ -1858,7 +1856,7 @@ msgstr ""
 "como una ayuda cuando está renderizando el texto. Si no comprende este "
 "parámetro probablemente no lo necesite"
 
-#: ../gtk/gtkcellrenderertext.c:499 ../gtk/gtklabel.c:876
+#: ../gtk/gtkcellrenderertext.c:499 ../gtk/gtklabel.c:861
 #: ../gtk/gtkprogressbar.c:220
 msgid "Ellipsize"
 msgstr "Elipsis"
@@ -1872,15 +1870,15 @@ msgstr ""
 "celda no tiene espacio suficiente para mostrar la cadena completa"
 
 #: ../gtk/gtkcellrenderertext.c:519 ../gtk/gtkfilechooserbutton.c:454
-#: ../gtk/gtklabel.c:897
+#: ../gtk/gtklabel.c:882
 msgid "Width In Characters"
 msgstr "Anchura en caracteres"
 
-#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtklabel.c:898
+#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtklabel.c:883
 msgid "The desired width of the label, in characters"
 msgstr "La anchura deseada de la etiqueta, en caracteres"
 
-#: ../gtk/gtkcellrenderertext.c:544 ../gtk/gtklabel.c:958
+#: ../gtk/gtkcellrenderertext.c:544 ../gtk/gtklabel.c:943
 msgid "Maximum Width In Characters"
 msgstr "Anchura máxima en caracteres"
 
@@ -2529,19 +2527,19 @@ msgstr "Búfer de texto"
 msgid "Text buffer object which actually stores entry text"
 msgstr "Objeto de búfer de texto que realmente almacena la entrada de texto"
 
-#: ../gtk/gtkentry.c:741 ../gtk/gtklabel.c:839
+#: ../gtk/gtkentry.c:741 ../gtk/gtklabel.c:824
 msgid "Cursor Position"
 msgstr "Posición del cursor"
 
-#: ../gtk/gtkentry.c:742 ../gtk/gtklabel.c:840
+#: ../gtk/gtkentry.c:742 ../gtk/gtklabel.c:825
 msgid "The current position of the insertion cursor in chars"
 msgstr "La posición actual del cursor de inserción en caracteres"
 
-#: ../gtk/gtkentry.c:751 ../gtk/gtklabel.c:849
+#: ../gtk/gtkentry.c:751 ../gtk/gtklabel.c:834
 msgid "Selection Bound"
 msgstr "Límite de selección"
 
-#: ../gtk/gtkentry.c:752 ../gtk/gtklabel.c:850
+#: ../gtk/gtkentry.c:752 ../gtk/gtklabel.c:835
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars"
 msgstr ""
@@ -2978,11 +2976,11 @@ msgstr "Indica si el expansor ha sido abierto para revelar el widget hijo"
 msgid "Text of the expander's label"
 msgstr "Texto de la etiqueta del expansor"
 
-#: ../gtk/gtkexpander.c:306 ../gtk/gtklabel.c:758
+#: ../gtk/gtkexpander.c:306 ../gtk/gtklabel.c:743
 msgid "Use markup"
 msgstr "Usar marcado"
 
-#: ../gtk/gtkexpander.c:307 ../gtk/gtklabel.c:759
+#: ../gtk/gtkexpander.c:307 ../gtk/gtklabel.c:744
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "El texto de la etiqueta incluye marcado XML. Vea pango_parse_markup()"
 
@@ -3171,11 +3169,11 @@ msgid "Y position of child widget"
 msgstr "Posición Y del widget hijo"
 
 #: ../gtk/gtkfontbutton.c:151
-#| msgid "The title of the file chooser dialog."
 msgid "The title of the font chooser dialog"
 msgstr "El título del diálogo de selección de tipografía"
 
-#: ../gtk/gtkfontbutton.c:166 ../gtk/gtkfontsel.c:244
+#: ../gtk/gtkfontbutton.c:166 ../gtk/gtkfontchooser.c:182
+#: ../gtk/gtkfontsel.c:244
 msgid "Font name"
 msgstr "Nombre de la tipografía"
 
@@ -3221,18 +3219,28 @@ msgid "Whether selected font size is shown in the label"
 msgstr ""
 "Indica si el tamaño de tipografía seleccionado se muestra en la etiqueta"
 
-#: ../gtk/gtkfontsel.c:245
+#: ../gtk/gtkfontchooser.c:183 ../gtk/gtkfontsel.c:245
 msgid "The string that represents this font"
 msgstr "La cadena que representa esta tipografía"
 
-#: ../gtk/gtkfontsel.c:251
+#: ../gtk/gtkfontchooser.c:189 ../gtk/gtkfontsel.c:251
 msgid "Preview text"
 msgstr "Vista previa del texto"
 
-#: ../gtk/gtkfontsel.c:252
+#: ../gtk/gtkfontchooser.c:190 ../gtk/gtkfontsel.c:252
 msgid "The text to display in order to demonstrate the selected font"
 msgstr "El texto que mostrar como demostración de la tipografía seleccionada"
 
+#: ../gtk/gtkfontchooser.c:197
+#| msgid "Preview text"
+msgid "Show preview text entry"
+msgstr "Mostrar la vista previa de la entrada de texto"
+
+#: ../gtk/gtkfontchooser.c:198
+#| msgid "Whether the switch is on or off"
+msgid "Whether the preview text entry is shown or not"
+msgstr "Indica si se muestra o no la vista previa de la entrada texto"
+
 #: ../gtk/gtkframe.c:172
 msgid "Text of the frame's label"
 msgstr "Texto de la etiqueta del marco"
@@ -3631,19 +3639,19 @@ msgstr "Pantalla"
 msgid "The screen where this window will be displayed"
 msgstr "La pantalla donde se mostrará esta ventana"
 
-#: ../gtk/gtklabel.c:745
+#: ../gtk/gtklabel.c:730
 msgid "The text of the label"
 msgstr "El texto de la etiqueta"
 
-#: ../gtk/gtklabel.c:752
+#: ../gtk/gtklabel.c:737
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "Un lista de atributos de estilos para aplicar al texto de la etiqueta"
 
-#: ../gtk/gtklabel.c:773 ../gtk/gtktexttag.c:386 ../gtk/gtktextview.c:703
+#: ../gtk/gtklabel.c:758 ../gtk/gtktexttag.c:386 ../gtk/gtktextview.c:703
 msgid "Justification"
 msgstr "Justificación"
 
-#: ../gtk/gtklabel.c:774
+#: ../gtk/gtklabel.c:759
 msgid ""
 "The alignment of the lines in the text of the label relative to each other. "
 "This does NOT affect the alignment of the label within its allocation. See "
@@ -3653,11 +3661,11 @@ msgstr ""
 "Esto NO afecta la alineación de la etiqueta dentro de su ubicación.  Ver "
 "GtkMisc::xalign para ello"
 
-#: ../gtk/gtklabel.c:782
+#: ../gtk/gtklabel.c:767
 msgid "Pattern"
 msgstr "Patrón"
 
-#: ../gtk/gtklabel.c:783
+#: ../gtk/gtklabel.c:768
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
@@ -3665,50 +3673,50 @@ msgstr ""
 "Un cadena con caracteres _ en posiciones correspondientes a caracteres en el "
 "texto a subrayar"
 
-#: ../gtk/gtklabel.c:790
+#: ../gtk/gtklabel.c:775
 msgid "Line wrap"
 msgstr "Ajuste de línea"
 
-#: ../gtk/gtklabel.c:791
+#: ../gtk/gtklabel.c:776
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr ""
 "Si esta definido, ajustar las líneas si el texto se vuelve demasiado ancho"
 
-#: ../gtk/gtklabel.c:806
+#: ../gtk/gtklabel.c:791
 msgid "Line wrap mode"
 msgstr "Modo de ajuste de línea"
 
-#: ../gtk/gtklabel.c:807
+#: ../gtk/gtklabel.c:792
 msgid "If wrap is set, controls how linewrapping is done"
 msgstr "Si se establece el ajuste, controla cómo se hace el ajuste de línea"
 
-#: ../gtk/gtklabel.c:814
+#: ../gtk/gtklabel.c:799
 msgid "Selectable"
 msgstr "Seleccionable"
 
-#: ../gtk/gtklabel.c:815
+#: ../gtk/gtklabel.c:800
 msgid "Whether the label text can be selected with the mouse"
 msgstr "Indica si el texto de la etiqueta puede ser seleccionado con el ratón"
 
-#: ../gtk/gtklabel.c:821
+#: ../gtk/gtklabel.c:806
 msgid "Mnemonic key"
 msgstr "Tecla nemónica"
 
-#: ../gtk/gtklabel.c:822
+#: ../gtk/gtklabel.c:807
 msgid "The mnemonic accelerator key for this label"
 msgstr "La tecla nemotécnica del acelerador para esta etiqueta"
 
-#: ../gtk/gtklabel.c:830
+#: ../gtk/gtklabel.c:815
 msgid "Mnemonic widget"
 msgstr "Widget nemónico"
 
-#: ../gtk/gtklabel.c:831
+#: ../gtk/gtklabel.c:816
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr ""
 "El widget que se activará cuando se presione la tecla mnemotécnica de la "
 "etiqueta"
 
-#: ../gtk/gtklabel.c:877
+#: ../gtk/gtklabel.c:862
 msgid ""
 "The preferred place to ellipsize the string, if the label does not have "
 "enough room to display the entire string"
@@ -3716,31 +3724,31 @@ msgstr ""
 "El lugar preferido para la elipsis de la cadena, si la etiqueta no tiene "
 "suficiente espacio para mostrar la cadena completa"
 
-#: ../gtk/gtklabel.c:918
+#: ../gtk/gtklabel.c:903
 msgid "Single Line Mode"
 msgstr "Modo de línea única"
 
-#: ../gtk/gtklabel.c:919
+#: ../gtk/gtklabel.c:904
 msgid "Whether the label is in single line mode"
 msgstr "Indica si la etiqueta está en modo de línea única"
 
-#: ../gtk/gtklabel.c:936
+#: ../gtk/gtklabel.c:921
 msgid "Angle"
 msgstr "�ngulo"
 
-#: ../gtk/gtklabel.c:937
+#: ../gtk/gtklabel.c:922
 msgid "Angle at which the label is rotated"
 msgstr "�ngulo al cual la etiqueta se rota"
 
-#: ../gtk/gtklabel.c:959
+#: ../gtk/gtklabel.c:944
 msgid "The desired maximum width of the label, in characters"
 msgstr "La anchura máxima deseada de la etiqueta, en caracteres"
 
-#: ../gtk/gtklabel.c:977
+#: ../gtk/gtklabel.c:962
 msgid "Track visited links"
 msgstr "Seguir los enlaces visitados"
 
-#: ../gtk/gtklabel.c:978
+#: ../gtk/gtklabel.c:963
 msgid "Whether visited links should be tracked"
 msgstr "Indica si deben seguir los enlaces visitados"
 
@@ -5520,8 +5528,8 @@ msgstr "Suavizado Xft"
 #: ../gtk/gtksettings.c:487
 msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
 msgstr ""
-"Indica si se deben suavizar los bordes de las tipografías Xft; 0=no,1=sí, "
-"-1=predeterminado"
+"Indica si se deben suavizar los bordes de las tipografías Xft; 0=no,1=sí, -"
+"1=predeterminado"
 
 #: ../gtk/gtksettings.c:496
 msgid "Xft Hinting"
@@ -7011,11 +7019,11 @@ msgstr "Ajustar anchura"
 msgid "Wrap width for laying out items in a grid"
 msgstr "Ajustar la anchura para distribuir los elementos en una rejilla"
 
-#: ../gtk/gtktreemodelsort.c:419
+#: ../gtk/gtktreemodelsort.c:491
 msgid "TreeModelSort Model"
 msgstr "Modelo TreeModelSort"
 
-#: ../gtk/gtktreemodelsort.c:420
+#: ../gtk/gtktreemodelsort.c:492
 msgid "The model for the TreeModelSort to sort"
 msgstr "El modelo para el TreeModelSort a ordenar"
 
diff --git a/po-properties/gl.po b/po-properties/gl.po
index ffa255dc2f..c5e0bd7745 100644
--- a/po-properties/gl.po
+++ b/po-properties/gl.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-master-po-properties-gl-77816____.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-16 13:31+0200\n"
-"PO-Revision-Date: 2011-08-16 13:30+0200\n"
+"POT-Creation-Date: 2011-08-24 21:02+0200\n"
+"PO-Revision-Date: 2011-08-24 21:03+0200\n"
 "Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -316,7 +316,7 @@ msgid "A unique name for the action."
 msgstr "Un nome único para a acción."
 
 #: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:228 ../gtk/gtkexpander.c:290
-#: ../gtk/gtkframe.c:171 ../gtk/gtklabel.c:744 ../gtk/gtkmenuitem.c:383
+#: ../gtk/gtkframe.c:171 ../gtk/gtklabel.c:729 ../gtk/gtkmenuitem.c:383
 #: ../gtk/gtktoolbutton.c:232 ../gtk/gtktoolitemgroup.c:1592
 msgid "Label"
 msgstr "Etiqueta"
@@ -626,11 +626,11 @@ msgstr "Recheo á dereita"
 msgid "The padding to insert at the right of the widget."
 msgstr "O recheo para introducir á dereita do widget."
 
-#: ../gtk/gtkappchooserbutton.c:555
+#: ../gtk/gtkappchooserbutton.c:557
 msgid "Include an 'Other...' item"
 msgstr "Incluír un elemento «Outro…»"
 
-#: ../gtk/gtkappchooserbutton.c:556
+#: ../gtk/gtkappchooserbutton.c:558
 msgid ""
 "Whether the combobox should include an item that triggers a "
 "GtkAppChooserDialog"
@@ -638,11 +638,11 @@ msgstr ""
 "Indica se a caixa de combo debería incluír un elemento que dispare un "
 "GtkAppChooserDialog"
 
-#: ../gtk/gtkappchooserbutton.c:568 ../gtk/gtkappchooserdialog.c:722
+#: ../gtk/gtkappchooserbutton.c:570 ../gtk/gtkappchooserdialog.c:707
 msgid "Heading"
 msgstr "Mostrar a cabeceira"
 
-#: ../gtk/gtkappchooserbutton.c:569 ../gtk/gtkappchooserdialog.c:723
+#: ../gtk/gtkappchooserbutton.c:571 ../gtk/gtkappchooserdialog.c:708
 msgid "The text to show at the top of the dialog"
 msgstr "O recheo para introducir por encima do widget."
 
@@ -654,11 +654,11 @@ msgstr "Tipo de contido"
 msgid "The content type used by the open with object"
 msgstr "O tipo de contido usado polo «abrir con obxecto»"
 
-#: ../gtk/gtkappchooserdialog.c:708
+#: ../gtk/gtkappchooserdialog.c:693
 msgid "GFile"
 msgstr "GFile"
 
-#: ../gtk/gtkappchooserdialog.c:709
+#: ../gtk/gtkappchooserdialog.c:694
 msgid "The GFile used by the app chooser dialog"
 msgstr "O GFile usado polo diálogo de selección de aplicativo"
 
@@ -974,12 +974,12 @@ msgstr ""
 "Texto da etiqueta do widget dentro do botón, se o botón contén unha etiqueta "
 "widget"
 
-#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:298 ../gtk/gtklabel.c:765
+#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:298 ../gtk/gtklabel.c:750
 #: ../gtk/gtkmenuitem.c:398 ../gtk/gtktoolbutton.c:239
 msgid "Use underline"
 msgstr "Usar subliñado"
 
-#: ../gtk/gtkbutton.c:237 ../gtk/gtkexpander.c:299 ../gtk/gtklabel.c:766
+#: ../gtk/gtkbutton.c:237 ../gtk/gtkexpander.c:299 ../gtk/gtklabel.c:751
 #: ../gtk/gtkmenuitem.c:399
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
@@ -1665,7 +1665,7 @@ msgstr "Marcación"
 msgid "Marked up text to render"
 msgstr "Texto marcado para renderizar"
 
-#: ../gtk/gtkcellrenderertext.c:270 ../gtk/gtklabel.c:751
+#: ../gtk/gtkcellrenderertext.c:270 ../gtk/gtklabel.c:736
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -1852,7 +1852,7 @@ msgstr ""
 "isto como unha axuda cando está renderizando o texto. Se non comprende este "
 "parámetro probabelmente non o necesite"
 
-#: ../gtk/gtkcellrenderertext.c:499 ../gtk/gtklabel.c:876
+#: ../gtk/gtkcellrenderertext.c:499 ../gtk/gtklabel.c:861
 #: ../gtk/gtkprogressbar.c:220
 msgid "Ellipsize"
 msgstr "Elipsis"
@@ -1866,15 +1866,15 @@ msgstr ""
 "espazo suficiente para mostrar a cadea completa"
 
 #: ../gtk/gtkcellrenderertext.c:519 ../gtk/gtkfilechooserbutton.c:454
-#: ../gtk/gtklabel.c:897
+#: ../gtk/gtklabel.c:882
 msgid "Width In Characters"
 msgstr "Largura en caracteres"
 
-#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtklabel.c:898
+#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtklabel.c:883
 msgid "The desired width of the label, in characters"
 msgstr "A largura desexada da etiqueta, en caracteres"
 
-#: ../gtk/gtkcellrenderertext.c:544 ../gtk/gtklabel.c:958
+#: ../gtk/gtkcellrenderertext.c:544 ../gtk/gtklabel.c:943
 msgid "Maximum Width In Characters"
 msgstr "Largura máxima en caracteres"
 
@@ -2524,19 +2524,19 @@ msgstr "Búfer de texto"
 msgid "Text buffer object which actually stores entry text"
 msgstr "Obxecto de búfer de texto que almacena actualmente a entrada de texto"
 
-#: ../gtk/gtkentry.c:741 ../gtk/gtklabel.c:839
+#: ../gtk/gtkentry.c:741 ../gtk/gtklabel.c:824
 msgid "Cursor Position"
 msgstr "Posición do cursor"
 
-#: ../gtk/gtkentry.c:742 ../gtk/gtklabel.c:840
+#: ../gtk/gtkentry.c:742 ../gtk/gtklabel.c:825
 msgid "The current position of the insertion cursor in chars"
 msgstr "A posición actual do cursor de inserción en caracteres"
 
-#: ../gtk/gtkentry.c:751 ../gtk/gtklabel.c:849
+#: ../gtk/gtkentry.c:751 ../gtk/gtklabel.c:834
 msgid "Selection Bound"
 msgstr "Límite da selección"
 
-#: ../gtk/gtkentry.c:752 ../gtk/gtklabel.c:850
+#: ../gtk/gtkentry.c:752 ../gtk/gtklabel.c:835
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars"
 msgstr "A posición en caracteres do extremo oposto da selección desde o cursor"
@@ -2968,11 +2968,11 @@ msgstr "Indica se o expansor foi aberto para deixar ver o widget fillo"
 msgid "Text of the expander's label"
 msgstr "Texto da etiqueta do expansor"
 
-#: ../gtk/gtkexpander.c:306 ../gtk/gtklabel.c:758
+#: ../gtk/gtkexpander.c:306 ../gtk/gtklabel.c:743
 msgid "Use markup"
 msgstr "Usar a marcación"
 
-#: ../gtk/gtkexpander.c:307 ../gtk/gtklabel.c:759
+#: ../gtk/gtkexpander.c:307 ../gtk/gtklabel.c:744
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "O texto da etiqueta inclúe marcación XML. Vexa pango_parse_markup()"
 
@@ -3162,7 +3162,8 @@ msgstr "Posición Y do widget fillo"
 msgid "The title of the font chooser dialog"
 msgstr "O título do diálogo de selección de tipos de letra."
 
-#: ../gtk/gtkfontbutton.c:166 ../gtk/gtkfontsel.c:244
+#: ../gtk/gtkfontbutton.c:166 ../gtk/gtkfontchooser.c:189
+#: ../gtk/gtkfontsel.c:244
 msgid "Font name"
 msgstr "Nome do tipo de letra"
 
@@ -3206,19 +3207,27 @@ msgstr "Mostrar o tamaño"
 msgid "Whether selected font size is shown in the label"
 msgstr "Indica se o tamaño de tipo de letra seleccionado se mostra na etiqueta"
 
-#: ../gtk/gtkfontsel.c:245
+#: ../gtk/gtkfontchooser.c:190 ../gtk/gtkfontsel.c:245
 msgid "The string that represents this font"
 msgstr "A cadea que representa este tipo de letra"
 
-#: ../gtk/gtkfontsel.c:251
+#: ../gtk/gtkfontchooser.c:196 ../gtk/gtkfontsel.c:251
 msgid "Preview text"
 msgstr "Previsualizar o texto"
 
-#: ../gtk/gtkfontsel.c:252
+#: ../gtk/gtkfontchooser.c:197 ../gtk/gtkfontsel.c:252
 msgid "The text to display in order to demonstrate the selected font"
 msgstr ""
 "O texto que mostrar como exemplo para indicar o tipo de letra seleccionado"
 
+#: ../gtk/gtkfontchooser.c:204
+msgid "Show preview text entry"
+msgstr "Mostrar a vista previa da entrada de texto"
+
+#: ../gtk/gtkfontchooser.c:205
+msgid "Whether the preview text entry is shown or not"
+msgstr "Indica se se mostra ou non a vista previa da entrada texto"
+
 #: ../gtk/gtkframe.c:172
 msgid "Text of the frame's label"
 msgstr "Texto da etiqueta do marco"
@@ -3616,19 +3625,19 @@ msgstr "Pantalla"
 msgid "The screen where this window will be displayed"
 msgstr "A pantalla onde se mostrará esta xanela"
 
-#: ../gtk/gtklabel.c:745
+#: ../gtk/gtklabel.c:730
 msgid "The text of the label"
 msgstr "O texto da etiqueta"
 
-#: ../gtk/gtklabel.c:752
+#: ../gtk/gtklabel.c:737
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "Unha lista de atributos de estilos para aplicar ao texto da etiqueta"
 
-#: ../gtk/gtklabel.c:773 ../gtk/gtktexttag.c:386 ../gtk/gtktextview.c:703
+#: ../gtk/gtklabel.c:758 ../gtk/gtktexttag.c:386 ../gtk/gtktextview.c:703
 msgid "Justification"
 msgstr "Xustificación"
 
-#: ../gtk/gtklabel.c:774
+#: ../gtk/gtklabel.c:759
 msgid ""
 "The alignment of the lines in the text of the label relative to each other. "
 "This does NOT affect the alignment of the label within its allocation. See "
@@ -3638,11 +3647,11 @@ msgstr ""
 "NON afecta ao aliñamento da etiqueta dentro da súa asignación Ver GtkMisc::"
 "xalign para iso"
 
-#: ../gtk/gtklabel.c:782
+#: ../gtk/gtklabel.c:767
 msgid "Pattern"
 msgstr "Patrón"
 
-#: ../gtk/gtklabel.c:783
+#: ../gtk/gtklabel.c:768
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
@@ -3650,47 +3659,47 @@ msgstr ""
 "Unha cadea con caracteres _ en posicións correspondentes a caracteres no "
 "texto para subliñar"
 
-#: ../gtk/gtklabel.c:790
+#: ../gtk/gtklabel.c:775
 msgid "Line wrap"
 msgstr "Axuste de liña"
 
-#: ../gtk/gtklabel.c:791
+#: ../gtk/gtklabel.c:776
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "Se se define, axusta a liña se o texto se volve demasiado largo"
 
-#: ../gtk/gtklabel.c:806
+#: ../gtk/gtklabel.c:791
 msgid "Line wrap mode"
 msgstr "Modo de axuste de liña"
 
-#: ../gtk/gtklabel.c:807
+#: ../gtk/gtklabel.c:792
 msgid "If wrap is set, controls how linewrapping is done"
 msgstr "Se se estabelece o axuste, controla como se fai o axuste de liña"
 
-#: ../gtk/gtklabel.c:814
+#: ../gtk/gtklabel.c:799
 msgid "Selectable"
 msgstr "Seleccionábel"
 
-#: ../gtk/gtklabel.c:815
+#: ../gtk/gtklabel.c:800
 msgid "Whether the label text can be selected with the mouse"
 msgstr "Indica se o texto da etiqueta pode ser seleccionado co rato"
 
-#: ../gtk/gtklabel.c:821
+#: ../gtk/gtklabel.c:806
 msgid "Mnemonic key"
 msgstr "Tecla mnemónica"
 
-#: ../gtk/gtklabel.c:822
+#: ../gtk/gtklabel.c:807
 msgid "The mnemonic accelerator key for this label"
 msgstr "A tecla rápida mnemónica para esta etiqueta"
 
-#: ../gtk/gtklabel.c:830
+#: ../gtk/gtklabel.c:815
 msgid "Mnemonic widget"
 msgstr "Widget mnemónico"
 
-#: ../gtk/gtklabel.c:831
+#: ../gtk/gtklabel.c:816
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr "O widget que se activará cando se prema a tecla mnemónica da etiqueta"
 
-#: ../gtk/gtklabel.c:877
+#: ../gtk/gtklabel.c:862
 msgid ""
 "The preferred place to ellipsize the string, if the label does not have "
 "enough room to display the entire string"
@@ -3698,31 +3707,31 @@ msgstr ""
 "O lugar preferido para a elipse da cadea, se a etiqueta non ten suficiente "
 "espazo para mostrar a cadea completa"
 
-#: ../gtk/gtklabel.c:918
+#: ../gtk/gtklabel.c:903
 msgid "Single Line Mode"
 msgstr "Modo de liña única"
 
-#: ../gtk/gtklabel.c:919
+#: ../gtk/gtklabel.c:904
 msgid "Whether the label is in single line mode"
 msgstr "Indica se a etiqueta está no modo de liña única"
 
-#: ../gtk/gtklabel.c:936
+#: ../gtk/gtklabel.c:921
 msgid "Angle"
 msgstr "�ngulo"
 
-#: ../gtk/gtklabel.c:937
+#: ../gtk/gtklabel.c:922
 msgid "Angle at which the label is rotated"
 msgstr "�ngulo sobre o que se rota a etiqueta"
 
-#: ../gtk/gtklabel.c:959
+#: ../gtk/gtklabel.c:944
 msgid "The desired maximum width of the label, in characters"
 msgstr "A largura máxima desexada da etiqueta, en caracteres"
 
-#: ../gtk/gtklabel.c:977
+#: ../gtk/gtklabel.c:962
 msgid "Track visited links"
 msgstr "Rexistrar as ligazóns visitadas"
 
-#: ../gtk/gtklabel.c:978
+#: ../gtk/gtklabel.c:963
 msgid "Whether visited links should be tracked"
 msgstr "Indica se as ligazóns visitadas deberían ser rexistradas"
 
@@ -6987,11 +6996,11 @@ msgstr "Axustar largura"
 msgid "Wrap width for laying out items in a grid"
 msgstr "Axustar a largura para distribuír os elementos nunha grella"
 
-#: ../gtk/gtktreemodelsort.c:419
+#: ../gtk/gtktreemodelsort.c:491
 msgid "TreeModelSort Model"
 msgstr "Modelo TreeModelSort"
 
-#: ../gtk/gtktreemodelsort.c:420
+#: ../gtk/gtktreemodelsort.c:492
 msgid "The model for the TreeModelSort to sort"
 msgstr "O modelo para o TreeModelSort que ordenar"
 
diff --git a/po-properties/gu.po b/po-properties/gu.po
index fab176beb4..fdc35dcb0c 100644
--- a/po-properties/gu.po
+++ b/po-properties/gu.po
@@ -1,20 +1,21 @@
 # translation of gtk+-properties.master.gu.po to Gujarati
 # Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
 # Ankit Patel <ankit@redhat.com>, 2007, 2009.
-# Sweta Kothari <swkothar@redhat.com>, 2009.
+# Sweta Kothari <swkothar@redhat.com>, 2009, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-properties.master.gu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 15:54-0400\n"
-"PO-Revision-Date: 2009-09-16 10:49+0530\n"
-"Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
-"Language-Team: Gujarati\n"
-"Language: \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=gtk%2b&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-08-19 14:58+0000\n"
+"PO-Revision-Date: 2011-08-23 14:43+0000\n"
+"Last-Translator: \n"
+"Language-Team: gu_IN <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: \n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
@@ -48,234 +49,251 @@ msgstr ""
 "\n"
 "\n"
 
-#: gdk/gdkdevice.c:97
+#: ../gdk/gdkapplaunchcontext.c:129 ../gdk/gdkcursor.c:136
+#: ../gdk/gdkdevicemanager.c:146
+msgid "Display"
+msgstr "દર�શાવ"
+
+#: ../gdk/gdkcursor.c:128
+#| msgid "Cursor"
+msgid "Cursor type"
+msgstr "કર�સર પ�રકાર"
+
+#: ../gdk/gdkcursor.c:129
+#| msgid "Secondary storage type"
+msgid "Standard cursor type"
+msgstr "મૂળભૂત કર�સર પ�રકાર"
+
+#: ../gdk/gdkcursor.c:137
+#, fuzzy
+#| msgid "Display the cell"
+msgid "Display of this cursor"
+msgstr "કોષ દર�શાવો"
+
+#: ../gdk/gdkdevice.c:111
 #, fuzzy
 msgid "Device Display"
 msgstr "મૂળભૂત ડિસ�પ�લે"
 
-#: gdk/gdkdevice.c:98
+#: ../gdk/gdkdevice.c:112
 #, fuzzy
 msgid "Display which the device belongs to"
 msgstr "કોષ સંવેદનશીલ દર�શાવો"
 
-#: gdk/gdkdevice.c:112
+#: ../gdk/gdkdevice.c:126
 #, fuzzy
 msgid "Device manager"
 msgstr "છેલ�લો વ�યવસ�થાપક"
 
-#: gdk/gdkdevice.c:113
+#: ../gdk/gdkdevice.c:127
 msgid "Device manager which the device belongs to"
 msgstr ""
 
-#: gdk/gdkdevice.c:127 gdk/gdkdevice.c:128
+#: ../gdk/gdkdevice.c:141 ../gdk/gdkdevice.c:142
 #, fuzzy
 msgid "Device name"
 msgstr "વિજેટ નામ"
 
-#: gdk/gdkdevice.c:142
+#: ../gdk/gdkdevice.c:156
 #, fuzzy
 msgid "Device type"
 msgstr "વળાંકનો પ�રકાર"
 
-#: gdk/gdkdevice.c:143
+#: ../gdk/gdkdevice.c:157
 msgid "Device role in the device manager"
-msgstr ""
+msgstr "ઉપકરણ સંચાલકમાં ઉપકરણ ભૂમિકા"
 
-#: gdk/gdkdevice.c:159
+#: ../gdk/gdkdevice.c:173
 msgid "Associated device"
-msgstr ""
+msgstr "સંકળાયેલ ઉપકરણ"
 
-#: gdk/gdkdevice.c:160
+#: ../gdk/gdkdevice.c:174
 msgid "Associated pointer or keyboard with this device"
-msgstr ""
+msgstr "આ ઉપકરણ સાથે સંકળાયેલ પોઇંટર અથવા કિબોર�ડ"
 
-#: gdk/gdkdevice.c:173
+#: ../gdk/gdkdevice.c:187
 msgid "Input source"
-msgstr ""
+msgstr "ઇનપ�ટ સ�ત�રોત"
 
-#: gdk/gdkdevice.c:174
-#, fuzzy
+#: ../gdk/gdkdevice.c:188
 msgid "Source type for the device"
-msgstr "ટ�રીના રૂપમાં દર�શન કરવા માટેન�ં મોડલ"
+msgstr "ઉપકરણ માટે સ�ત�રોત પ�રકાર"
 
-#: gdk/gdkdevice.c:189 gdk/gdkdevice.c:190
-#, fuzzy
+#: ../gdk/gdkdevice.c:203 ../gdk/gdkdevice.c:204
 msgid "Input mode for the device"
-msgstr "ટ�રીના રૂપમાં દર�શન કરવા માટેન�ં મોડલ"
+msgstr "ઉપકરણ માટે ઇનપ�ટ સ�થિતિ"
 
-#: gdk/gdkdevice.c:205
+#: ../gdk/gdkdevice.c:219
 #, fuzzy
 msgid "Whether the device has a cursor"
 msgstr "શ�ં વિજેટની પાસે પ�રકાશિત ઈનપ�ટ છે"
 
-#: gdk/gdkdevice.c:206
+#: ../gdk/gdkdevice.c:220
 #, fuzzy
 msgid "Whether there is a visible cursor following device motion"
 msgstr "ક�યાં તો અદૃશ�ય અક�ષર ને સ�યોજિત કરી દેવામાં આવ�ય� છે"
 
-#: gdk/gdkdevice.c:220 gdk/gdkdevice.c:221
+#: ../gdk/gdkdevice.c:234 ../gdk/gdkdevice.c:235
 #, fuzzy
 msgid "Number of axes in the device"
 msgstr "દસ�તાવેજમાં પાનાંઓની સંખ�યા."
 
-#: gdk/gdkdevicemanager.c:134
-#, fuzzy
-msgid "Display"
-msgstr "મૂળભૂત ડિસ�પ�લે"
-
-#: gdk/gdkdevicemanager.c:135
-#, fuzzy
+#: ../gdk/gdkdevicemanager.c:147
 msgid "Display for the device manager"
-msgstr "કોષ દર�શાવો"
+msgstr "ઉપકરણ સંચાલક માટે પ�રદર�શન"
 
-#: gdk/gdkdisplaymanager.c:102
+#: ../gdk/gdkdisplaymanager.c:162
 msgid "Default Display"
 msgstr "મૂળભૂત ડિસ�પ�લે"
 
-#: gdk/gdkdisplaymanager.c:103
+#: ../gdk/gdkdisplaymanager.c:163
 msgid "The default display for GDK"
 msgstr "GDK માટેનો મૂળભૂત ડિસ�પ�લે"
 
-#: gdk/gdkscreen.c:72
+#: ../gdk/gdkscreen.c:92
 msgid "Font options"
 msgstr "ફોન�ટ વિકલ�પો"
 
-#: gdk/gdkscreen.c:73
+#: ../gdk/gdkscreen.c:93
 msgid "The default font options for the screen"
 msgstr "સ�ક�રીન માટે મૂળભ�ત ફોન�ટ વિકલ�પો"
 
-#: gdk/gdkscreen.c:80
+#: ../gdk/gdkscreen.c:100
 msgid "Font resolution"
 msgstr "ફોન�ટ રી�ોલ�ય�શન"
 
-#: gdk/gdkscreen.c:81
+#: ../gdk/gdkscreen.c:101
 msgid "The resolution for fonts on the screen"
 msgstr "સ�ક�રીન પર ફોન�ટ માટેન�ં રી�ોલ�ય�શન"
 
-#: gdk/gdkwindow.c:392 gdk/gdkwindow.c:393
+#: ../gdk/gdkwindow.c:376 ../gdk/gdkwindow.c:377
 msgid "Cursor"
 msgstr "કર�સર"
 
-#: gdk/x11/gdkdevice-xi.c:132 gdk/x11/gdkdevice-xi.c:133
-#: gdk/x11/gdkdevice-xi2.c:111
-msgid "Device ID"
-msgstr ""
+#: ../gdk/x11/gdkdevicemanager-xi2.c:119
+#| msgid "mode"
+msgid "Opcode"
+msgstr "Opcode"
 
-#: gdk/x11/gdkdevice-xi2.c:112
-msgid "Device identifier"
-msgstr ""
+#: ../gdk/x11/gdkdevicemanager-xi2.c:120
+msgid "Opcode for XInput2 requests"
+msgstr "XInput2 માંગણીઓ માટે Opcode"
 
-#: gdk/x11/gdkdevicemanager-xi.c:84
+#: ../gdk/x11/gdkdevicemanager-xi.c:100
 #, fuzzy
 msgid "Event base"
 msgstr "ઘટનાઓ"
 
-#: gdk/x11/gdkdevicemanager-xi.c:85
+#: ../gdk/x11/gdkdevicemanager-xi.c:101
 msgid "Event base for XInput events"
 msgstr ""
 
-#: gtk/gtkaboutdialog.c:269
+#: ../gdk/x11/gdkdevice-xi2.c:130 ../gdk/x11/gdkdevice-xi.c:140
+#: ../gdk/x11/gdkdevice-xi.c:141
+msgid "Device ID"
+msgstr "ઉપકરણ ID"
+
+#: ../gdk/x11/gdkdevice-xi2.c:131
+msgid "Device identifier"
+msgstr ""
+
+#: ../gtk/gtkaboutdialog.c:275
 msgid "Program name"
 msgstr "કાર�યક�રમ નામ"
 
-#: gtk/gtkaboutdialog.c:270
+#: ../gtk/gtkaboutdialog.c:276
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
-msgstr ""
-"કાર�યક�રમન�ં નામ. જો આ સ�યોજિત નહિં હોય, તો તેમાં g_get_application_name() મૂળભ�ત થઈ જશે"
+msgstr "કાર�યક�રમન�ં નામ. જો આ સ�યોજિત નહિં હોય, તો તેમાં g_get_application_name() મૂળભ�ત થઈ જશે"
 
-#: gtk/gtkaboutdialog.c:284
+#: ../gtk/gtkaboutdialog.c:290
 msgid "Program version"
 msgstr "કાર�યક�રમ આવૃત�તિ"
 
-#: gtk/gtkaboutdialog.c:285
+#: ../gtk/gtkaboutdialog.c:291
 msgid "The version of the program"
 msgstr "કાર�યક�રમની આવૃત�તિ"
 
-#: gtk/gtkaboutdialog.c:299
+#: ../gtk/gtkaboutdialog.c:305
 msgid "Copyright string"
 msgstr "કોપીરાઈટ શબ�દમાળા"
 
-#: gtk/gtkaboutdialog.c:300
+#: ../gtk/gtkaboutdialog.c:306
 msgid "Copyright information for the program"
 msgstr "કાર�યક�રમ માટે કોપીરાઈટ જાણકારી"
 
-#: gtk/gtkaboutdialog.c:317
+#: ../gtk/gtkaboutdialog.c:323
 msgid "Comments string"
 msgstr "ટિપ�પણીઓ શબ�દમાળા"
 
-#: gtk/gtkaboutdialog.c:318
+#: ../gtk/gtkaboutdialog.c:324
 msgid "Comments about the program"
 msgstr "કાર�યક�રમ વિશે ટિપ�પણીઓ"
 
-#: gtk/gtkaboutdialog.c:368
-#, fuzzy
+#: ../gtk/gtkaboutdialog.c:374
 msgid "License Type"
-msgstr "સંદેશા પ�રકાર"
+msgstr "લાઇસન�સ પ�રકાર"
 
-#: gtk/gtkaboutdialog.c:369
-#, fuzzy
+#: ../gtk/gtkaboutdialog.c:375
 msgid "The license type of the program"
-msgstr "કાર�યક�રમની આવૃત�તિ"
+msgstr "કાર�યક�રમ માટે લાઇસન�સ પ�રકાર"
 
-#: gtk/gtkaboutdialog.c:385
+#: ../gtk/gtkaboutdialog.c:391
 msgid "Website URL"
 msgstr "વેબસાઈટ URL"
 
-#: gtk/gtkaboutdialog.c:386
+#: ../gtk/gtkaboutdialog.c:392
 msgid "The URL for the link to the website of the program"
 msgstr "કાર�યક�રમની વેબસાઈટ માટે URL ની કડી"
 
-#: gtk/gtkaboutdialog.c:401
+#: ../gtk/gtkaboutdialog.c:406
 msgid "Website label"
 msgstr "વેબસાઈટ લેબલ"
 
-#: gtk/gtkaboutdialog.c:402
-msgid ""
-"The label for the link to the website of the program. If this is not set, it "
-"defaults to the URL"
-msgstr ""
-"કાર�યક�રમની વેબસાઈટ માટે કડી માટેન�ં લેબલ. જો આ સ�યોજિત નહિં હોય, તો તેમાં URL મૂળભ�ત થઈ જશે"
+#: ../gtk/gtkaboutdialog.c:407
+#, fuzzy
+#| msgid "The URL for the link to the website of the program"
+msgid "The label for the link to the website of the program"
+msgstr "કાર�યક�રમની વેબસાઈટ માટે URL ની કડી"
 
-#: gtk/gtkaboutdialog.c:418
+#: ../gtk/gtkaboutdialog.c:423
 msgid "Authors"
 msgstr "લેખકો"
 
-#: gtk/gtkaboutdialog.c:419
+#: ../gtk/gtkaboutdialog.c:424
 msgid "List of authors of the program"
 msgstr "કાર�યક�રમના લેખકોની યાદી"
 
-#: gtk/gtkaboutdialog.c:435
+#: ../gtk/gtkaboutdialog.c:440
 msgid "Documenters"
 msgstr "દસ�તાવેજકારકો"
 
-#: gtk/gtkaboutdialog.c:436
+#: ../gtk/gtkaboutdialog.c:441
 msgid "List of people documenting the program"
 msgstr "કાર�યક�રમન�ં દસ�તાવેજીકરણ કરતા લોકોની યાદી"
 
-#: gtk/gtkaboutdialog.c:452
+#: ../gtk/gtkaboutdialog.c:457
 msgid "Artists"
 msgstr "કલાકારો"
 
-#: gtk/gtkaboutdialog.c:453
+#: ../gtk/gtkaboutdialog.c:458
 msgid "List of people who have contributed artwork to the program"
 msgstr "કાર�યક�રમની કલાકૃતિમાં ફાળો આપનાર લોકોની યાદી"
 
-#: gtk/gtkaboutdialog.c:470
+#: ../gtk/gtkaboutdialog.c:475
 msgid "Translator credits"
 msgstr "અન�વાદક શ�રેય"
 
-#: gtk/gtkaboutdialog.c:471
-msgid ""
-"Credits to the translators. This string should be marked as translatable"
+#: ../gtk/gtkaboutdialog.c:476
+msgid "Credits to the translators. This string should be marked as translatable"
 msgstr "અન�વાદકોનો શ�રેય. આ શબ�દમાળા અન�વાદ કરી શકાય તે રીતે ચિહ�નિત થવી જોઈ�"
 
-#: gtk/gtkaboutdialog.c:486
+#: ../gtk/gtkaboutdialog.c:491
 msgid "Logo"
 msgstr "લોગો"
 
-#: gtk/gtkaboutdialog.c:487
+#: ../gtk/gtkaboutdialog.c:492
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
@@ -283,115 +301,116 @@ msgstr ""
 "વિશે બોક�સ માટે લોગો. જો આ સ�યોજિત નહિં હોય, તો તેમાં "
 "gtk_window_get_default_icon_list() મૂળભ�ત થશે"
 
-#: gtk/gtkaboutdialog.c:502
+#: ../gtk/gtkaboutdialog.c:507
 msgid "Logo Icon Name"
 msgstr "લોગો ચિહ�ન નામ"
 
-#: gtk/gtkaboutdialog.c:503
+#: ../gtk/gtkaboutdialog.c:508
 msgid "A named icon to use as the logo for the about box."
 msgstr "વિશે બોક�સ માટે લોગો તરીકે વાપરવાન�ં નામવાળ�ં ચિહ�ન."
 
-#: gtk/gtkaboutdialog.c:516
+#: ../gtk/gtkaboutdialog.c:521
 msgid "Wrap license"
 msgstr "લાઈસન�સ લપેટો"
 
-#: gtk/gtkaboutdialog.c:517
+#: ../gtk/gtkaboutdialog.c:522
 msgid "Whether to wrap the license text."
 msgstr "શ�ં લાઈસન�સ લખાણ લપેટવાન�ં છે."
 
-#: gtk/gtkaccellabel.c:189
+#: ../gtk/gtkaccellabel.c:187
 msgid "Accelerator Closure"
 msgstr "પ�રવેગ બંધ કરો"
 
-#: gtk/gtkaccellabel.c:190
+#: ../gtk/gtkaccellabel.c:188
 msgid "The closure to be monitored for accelerator changes"
 msgstr "પ�રવેગમાં થતા બદલાવો માટે બંધ કરવાની પ�રક�રિયાન�ં નિરીક�ષણ કરો"
 
-#: gtk/gtkaccellabel.c:196
+#: ../gtk/gtkaccellabel.c:194
 msgid "Accelerator Widget"
 msgstr "પ�રવેગ વિજેટ"
 
-#: gtk/gtkaccellabel.c:197
+#: ../gtk/gtkaccellabel.c:195
 msgid "The widget to be monitored for accelerator changes"
 msgstr "પ�રવેગમાં થતા બદલાવો માટે વિજેટન�ં નિરીક�ષણ કરો"
 
-#: gtk/gtkaction.c:222 gtk/gtkactiongroup.c:228 gtk/gtkprinter.c:125
-#: gtk/gtktextmark.c:89
+#: ../gtk/gtkaction.c:222 ../gtk/gtkactiongroup.c:228 ../gtk/gtkprinter.c:125
+#: ../gtk/gtktextmark.c:126 ../gtk/gtkthemingengine.c:256
 msgid "Name"
 msgstr "નામ"
 
-#: gtk/gtkaction.c:223
+#: ../gtk/gtkaction.c:223
 msgid "A unique name for the action."
 msgstr "ક�રિયાન�ં �કલ નામ."
 
-#: gtk/gtkaction.c:241 gtk/gtkbutton.c:238 gtk/gtkexpander.c:209
-#: gtk/gtkframe.c:130 gtk/gtklabel.c:549 gtk/gtkmenuitem.c:333
-#: gtk/gtktoolbutton.c:202 gtk/gtktoolitemgroup.c:1571
+#: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:228 ../gtk/gtkexpander.c:290
+#: ../gtk/gtkframe.c:171 ../gtk/gtklabel.c:744 ../gtk/gtkmenuitem.c:383
+#: ../gtk/gtktoolbutton.c:232 ../gtk/gtktoolitemgroup.c:1592
 msgid "Label"
 msgstr "લેબલ"
 
-#: gtk/gtkaction.c:242
+#: ../gtk/gtkaction.c:242
 msgid "The label used for menu items and buttons that activate this action."
 msgstr "મેન� વસ�ત�ઓ અને બટનો માટે વપરાત�ં લેબલ કે જે આ ક�રિયાને સક�રિય કરે છે."
 
-#: gtk/gtkaction.c:258
+#: ../gtk/gtkaction.c:258
 msgid "Short label"
 msgstr "ટેબન� લેબલ"
 
-#: gtk/gtkaction.c:259
+#: ../gtk/gtkaction.c:259
 msgid "A shorter label that may be used on toolbar buttons."
 msgstr "નાન�ં લેબલ કે જે સાધનપટ�ટી બટનો માટે ઉપયોગી થાય છે."
 
-#: gtk/gtkaction.c:267
+#: ../gtk/gtkaction.c:267
 msgid "Tooltip"
 msgstr "સાધન ટીપ�પણી"
 
-#: gtk/gtkaction.c:268
+#: ../gtk/gtkaction.c:268
 msgid "A tooltip for this action."
 msgstr "આ ક�રિયા માટે સાધનટિપ�પણી."
 
-#: gtk/gtkaction.c:283
+#: ../gtk/gtkaction.c:283
 msgid "Stock Icon"
 msgstr "જથ�થાની ઓળખ"
 
-#: gtk/gtkaction.c:284
+#: ../gtk/gtkaction.c:284
 msgid "The stock icon displayed in widgets representing this action."
 msgstr "આ કાર�યમાં રજૂઆત કરવા દરમ�યાન વિજેટોમાં સ�ટોક આઇકોન ને દર�શાવેલ છે."
 
-#: gtk/gtkaction.c:304 gtk/gtkstatusicon.c:252
+#: ../gtk/gtkaction.c:304 ../gtk/gtkstatusicon.c:275
 msgid "GIcon"
 msgstr "GIcon"
 
-#: gtk/gtkaction.c:305 gtk/gtkcellrendererpixbuf.c:215 gtk/gtkimage.c:320
-#: gtk/gtkstatusicon.c:253
+#: ../gtk/gtkaction.c:305 ../gtk/gtkcellrendererpixbuf.c:235
+#: ../gtk/gtkimage.c:330 ../gtk/gtkstatusicon.c:276
 msgid "The GIcon being displayed"
 msgstr "GIcon ને દર�શાવેલ છે"
 
-#: gtk/gtkaction.c:325 gtk/gtkcellrendererpixbuf.c:180 gtk/gtkimage.c:302
-#: gtk/gtkprinter.c:174 gtk/gtkstatusicon.c:236 gtk/gtkwindow.c:685
+#: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:200
+#: ../gtk/gtkimage.c:312 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:259
+#: ../gtk/gtkwindow.c:757
 msgid "Icon Name"
 msgstr "ચિહ�ન નામ"
 
-#: gtk/gtkaction.c:326 gtk/gtkcellrendererpixbuf.c:181 gtk/gtkimage.c:303
-#: gtk/gtkstatusicon.c:237
+#: ../gtk/gtkaction.c:326 ../gtk/gtkcellrendererpixbuf.c:201
+#: ../gtk/gtkimage.c:313 ../gtk/gtkstatusicon.c:260
 msgid "The name of the icon from the icon theme"
 msgstr "ચિહ�ન નામમાથી ચિહ�નન�ં નામ"
 
-#: gtk/gtkaction.c:333 gtk/gtktoolitem.c:186
+#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:194
 msgid "Visible when horizontal"
 msgstr "આડ�ં હોય ત�યારે દૃશ�યમાન"
 
-#: gtk/gtkaction.c:334 gtk/gtktoolitem.c:187
+#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:195
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a horizontal "
 "orientation."
 msgstr "શ�ં સાધનપટ�ટી વસ�ત� દૃશ�યમાન થશે જ�યારે સાધનપટ�ટી આડી દિશામાં છે."
 
-#: gtk/gtkaction.c:349
+#: ../gtk/gtkaction.c:349
 msgid "Visible when overflown"
 msgstr "વધ� ભરાઈ જાય ત�યારે દૃશ�યમાન"
 
-#: gtk/gtkaction.c:350
+#: ../gtk/gtkaction.c:350
 msgid ""
 "When TRUE, toolitem proxies for this action are represented in the toolbar "
 "overflow menu."
@@ -399,21 +418,21 @@ msgstr ""
 "જ�યારે સાચ�ં હોય, ત�યારે સાધનવસ�ત� પ�રોક�સીઓ માટે આ ક�રિયા સાધનપટ�ટી વધારેભરાઈ જાય તે મેન� રજૂ "
 "થાય છે."
 
-#: gtk/gtkaction.c:357 gtk/gtktoolitem.c:193
+#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:201
 msgid "Visible when vertical"
 msgstr "ઉભ�ં હોય ત�યારે દૃશ�યમાન"
 
-#: gtk/gtkaction.c:358 gtk/gtktoolitem.c:194
+#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:202
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a vertical "
 "orientation."
 msgstr "જ�યારે સાધનપટ�ટી ઊભી દિશામાં હોય ત�યારે શ�ં સાધનપટ�ટી વસ�ત� દૃશ�યમાન થશે."
 
-#: gtk/gtkaction.c:365 gtk/gtktoolitem.c:200
+#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:208
 msgid "Is important"
 msgstr "જર�રી છે"
 
-#: gtk/gtkaction.c:366
+#: ../gtk/gtkaction.c:366
 msgid ""
 "Whether the action is considered important. When TRUE, toolitem proxies for "
 "this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
@@ -421,133 +440,133 @@ msgstr ""
 "શ�ં ક�રિયા મહત�વની હોય � જરૂરી છે. જ�યારે સાચ�ં હોય, ત�યારે આ ક�રિયા માટેની સાધનવસ�ત� "
 "પ�રોક�સીઓ GTK_TOOLBAR_BOTH_HORIZ સ�થિતિમાં લખાણ બતાવે છે."
 
-#: gtk/gtkaction.c:374
+#: ../gtk/gtkaction.c:374
 msgid "Hide if empty"
 msgstr "જો ખાલી હોય તો છ�પાવો"
 
-#: gtk/gtkaction.c:375
+#: ../gtk/gtkaction.c:375
 msgid "When TRUE, empty menu proxies for this action are hidden."
 msgstr "જ�યારે સાચ�ં હોય, ત�યારે આ ક�રિયા માટેની ખાલી મેન� પ�રોક�સીઓ છ�પાયેલ હોય છે."
 
-#: gtk/gtkaction.c:381 gtk/gtkactiongroup.c:235 gtk/gtkcellrenderer.c:242
-#: gtk/gtkwidget.c:754
+#: ../gtk/gtkaction.c:381 ../gtk/gtkactiongroup.c:235
+#: ../gtk/gtkcellrenderer.c:290 ../gtk/gtkwidget.c:990
 msgid "Sensitive"
 msgstr "સંવેદનશીલ"
 
-#: gtk/gtkaction.c:382
+#: ../gtk/gtkaction.c:382
 msgid "Whether the action is enabled."
 msgstr "શ�ં વિજેટ દૃશ�યમાન છે."
 
-#: gtk/gtkaction.c:388 gtk/gtkactiongroup.c:242 gtk/gtkstatusicon.c:287
-#: gtk/gtktreeviewcolumn.c:195 gtk/gtkwidget.c:747
+#: ../gtk/gtkaction.c:388 ../gtk/gtkactiongroup.c:242
+#: ../gtk/gtkstatusicon.c:310 ../gtk/gtktreeviewcolumn.c:248
+#: ../gtk/gtkwidget.c:983
 msgid "Visible"
 msgstr "દૃશ�યમાન"
 
-#: gtk/gtkaction.c:389
+#: ../gtk/gtkaction.c:389
 msgid "Whether the action is visible."
 msgstr "શ�ં વિજેટ દૃશ�યમાન છે."
 
-#: gtk/gtkaction.c:395
+#: ../gtk/gtkaction.c:395
 msgid "Action Group"
 msgstr "કાર�યશીલ વિસ�તારની કિનારી"
 
-#: gtk/gtkaction.c:396
+#: ../gtk/gtkaction.c:396
 msgid ""
 "The GtkActionGroup this GtkAction is associated with, or NULL (for internal "
 "use)."
-msgstr ""
-"GtkActionGroup આ GtkAction સાથે સંકળાયેલ છે, અથવા NULL સાથે (આંતરિક વપરાશ માટે)."
+msgstr "GtkActionGroup આ GtkAction સાથે સંકળાયેલ છે, અથવા NULL સાથે (આંતરિક વપરાશ માટે)."
 
-#: gtk/gtkaction.c:414 gtk/gtkimagemenuitem.c:172
+#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:194
 msgid "Always show image"
 msgstr "હંમેશા ચિત�ર ને બતાવો"
 
-#: gtk/gtkaction.c:415 gtk/gtkimagemenuitem.c:173
+#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:195
 msgid "Whether the image will always be shown"
 msgstr "ક�યાંતો ઇમેજ � હંમેશા બતાવેલ હશે"
 
-#: gtk/gtkactiongroup.c:229
+#: ../gtk/gtkactiongroup.c:229
 msgid "A name for the action group."
 msgstr "ક�રિયા જૂથ માટે નામ."
 
-#: gtk/gtkactiongroup.c:236
+#: ../gtk/gtkactiongroup.c:236
 msgid "Whether the action group is enabled."
 msgstr "શ�ં ક�રિયા જૂથ સક�રિય કરેલ છે."
 
-#: gtk/gtkactiongroup.c:243
+#: ../gtk/gtkactiongroup.c:243
 msgid "Whether the action group is visible."
 msgstr "શ�ં ક�રિયા જૂથ દૃશ�યમાન છે."
 
-#: gtk/gtkactivatable.c:290
+#: ../gtk/gtkactivatable.c:289
 msgid "Related Action"
 msgstr "સંબંધિત ક�રિયા"
 
-#: gtk/gtkactivatable.c:291
+#: ../gtk/gtkactivatable.c:290
 msgid "The action this activatable will activate and receive updates from"
 msgstr "આ સક�રિય કરી શકાય તેવી ક�રિયા તેમાંથી સ�ધારાઓને મેળવશે અને સક�રિય કરશે"
 
-#: gtk/gtkactivatable.c:313
+#: ../gtk/gtkactivatable.c:312
 msgid "Use Action Appearance"
 msgstr "Action Appearance ને વાપરો"
 
-#: gtk/gtkactivatable.c:314
+#: ../gtk/gtkactivatable.c:313
 msgid "Whether to use the related actions appearance properties"
 msgstr "ક�યાંતો સંબંધિત ક�રિયાઓ દેખાતા ગ�ણધર�મોને વાપરે છે"
 
-#: gtk/gtkadjustment.c:93 gtk/gtkcellrendererprogress.c:126
-#: gtk/gtkscalebutton.c:220 gtk/gtkspinbutton.c:289
+#: ../gtk/gtkadjustment.c:123 ../gtk/gtkcellrendererprogress.c:138
+#: ../gtk/gtkscalebutton.c:218 ../gtk/gtkspinbutton.c:384
 msgid "Value"
 msgstr "કિંમત"
 
-#: gtk/gtkadjustment.c:94
+#: ../gtk/gtkadjustment.c:124
 msgid "The value of the adjustment"
 msgstr "ગોઠવણની કિંમત"
 
-#: gtk/gtkadjustment.c:110
+#: ../gtk/gtkadjustment.c:140
 msgid "Minimum Value"
 msgstr "ન�યૂનતમ x"
 
-#: gtk/gtkadjustment.c:111
+#: ../gtk/gtkadjustment.c:141
 msgid "The minimum value of the adjustment"
 msgstr "સ�તંભ માટે ન�યૂનતમ માન�ય રાખેલી પહોળાઈ"
 
-#: gtk/gtkadjustment.c:130
+#: ../gtk/gtkadjustment.c:160
 msgid "Maximum Value"
 msgstr "મહત�તમ લંબાઈ"
 
-#: gtk/gtkadjustment.c:131
+#: ../gtk/gtkadjustment.c:161
 msgid "The maximum value of the adjustment"
 msgstr "સ�તંભ માટે મહત�તમ માન�ય રાખેલી પહોળાઈ"
 
-#: gtk/gtkadjustment.c:147
+#: ../gtk/gtkadjustment.c:177
 msgid "Step Increment"
 msgstr "સ�ક�રીન"
 
-#: gtk/gtkadjustment.c:148
+#: ../gtk/gtkadjustment.c:178
 msgid "The step increment of the adjustment"
 msgstr "પ�રવેશના સમાવિષ�ટો"
 
-#: gtk/gtkadjustment.c:164
+#: ../gtk/gtkadjustment.c:194
 msgid "Page Increment"
 msgstr "પાના વધારો"
 
-#: gtk/gtkadjustment.c:165
+#: ../gtk/gtkadjustment.c:195
 msgid "The page increment of the adjustment"
 msgstr "પ�રવેશના સમાવિષ�ટો"
 
-#: gtk/gtkadjustment.c:184
+#: ../gtk/gtkadjustment.c:214
 msgid "Page Size"
 msgstr "પાનાન�ં માપ"
 
-#: gtk/gtkadjustment.c:185
+#: ../gtk/gtkadjustment.c:215
 msgid "The page size of the adjustment"
 msgstr "બટનની ફેરબદલની સ�થિતિ"
 
-#: gtk/gtkalignment.c:123
+#: ../gtk/gtkalignment.c:137
 msgid "Horizontal alignment"
 msgstr "આડી કતારબંધ ગોઠવણી"
 
-#: gtk/gtkalignment.c:124 gtk/gtkbutton.c:289
+#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:279
 msgid ""
 "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
 "right aligned"
@@ -555,11 +574,11 @@ msgstr ""
 "પ�રાપ�ય જગ�યામાં બાળની આડી સ�થિતિ.0.0 ડાબી બાજ�, અને 1.0 જમણી બાજ� કતારબંધ રીતે "
 "ગોઠવાયેલી છે"
 
-#: gtk/gtkalignment.c:133
+#: ../gtk/gtkalignment.c:147
 msgid "Vertical alignment"
 msgstr "ઊભી કતારબંધ ગોઠવણી"
 
-#: gtk/gtkalignment.c:134 gtk/gtkbutton.c:308
+#: ../gtk/gtkalignment.c:148 ../gtk/gtkbutton.c:298
 msgid ""
 "Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
 "bottom aligned"
@@ -567,11 +586,11 @@ msgstr ""
 "પ�રાપ�ય જગ�યામાં બાળની ઊભી સ�થિતિ.0.0 ઉપરની બાજ�,1.0 નીચેની બાજ� કતારબંધ રીતે ગોઠવાયેલી "
 "છે"
 
-#: gtk/gtkalignment.c:142
+#: ../gtk/gtkalignment.c:156
 msgid "Horizontal scale"
 msgstr "આડ� માપદંડ"
 
-#: gtk/gtkalignment.c:143
+#: ../gtk/gtkalignment.c:157
 msgid ""
 "If available horizontal space is bigger than needed for the child, how much "
 "of it to use for the child. 0.0 means none, 1.0 means all"
@@ -579,11 +598,11 @@ msgstr ""
 "જો પ�રાપ�ય આડી જગ�યા બાળને જર�ર કરતા વધારે હોય તો, બાળ માટે તેનો કેટલોઉપયોગ થયો. 0.0 "
 "�ટલે જરા પણ નહિ, 1.0 �ટલે બધી"
 
-#: gtk/gtkalignment.c:151
+#: ../gtk/gtkalignment.c:165
 msgid "Vertical scale"
 msgstr "ઉભ� માપદંડ"
 
-#: gtk/gtkalignment.c:152
+#: ../gtk/gtkalignment.c:166
 msgid ""
 "If available vertical space is bigger than needed for the child, how much of "
 "it to use for the child. 0.0 means none, 1.0 means all"
@@ -591,289 +610,403 @@ msgstr ""
 "જો પ�રાપ�ય ઉભી જગ�યા બાળને જર�ર કરતા વધારે હોય તો, બાળ માટે તેનો કેટલો ઉપયોગ થયો. 0.0 "
 "�ટલે જરાપણ નહિ, 1.0 �ટલે બધી"
 
-#: gtk/gtkalignment.c:169
+#: ../gtk/gtkalignment.c:183
 msgid "Top Padding"
 msgstr "ખાલી જગ�યા ભરો"
 
-#: gtk/gtkalignment.c:170
+#: ../gtk/gtkalignment.c:184
 msgid "The padding to insert at the top of the widget."
 msgstr "બાળ વિજેટની ઉપરની બાજ� જોડવા માટેનો હરોળનો ક�રમાંક."
 
-#: gtk/gtkalignment.c:186
+#: ../gtk/gtkalignment.c:200
 msgid "Bottom Padding"
 msgstr "ખાલી જગ�યા ભરો"
 
-#: gtk/gtkalignment.c:187
+#: ../gtk/gtkalignment.c:201
 msgid "The padding to insert at the bottom of the widget."
 msgstr "બાળને નીચેથી જોડવાની હરોળની સંખ�યા."
 
-#: gtk/gtkalignment.c:203
+#: ../gtk/gtkalignment.c:217
 msgid "Left Padding"
 msgstr "ખાલી જગ�યા ભરો"
 
-#: gtk/gtkalignment.c:204
+#: ../gtk/gtkalignment.c:218
 msgid "The padding to insert at the left of the widget."
 msgstr "બાળની ડાબી બાજ� જોડવા માટેનો સ�તંભનો ક�રમાંક."
 
-#: gtk/gtkalignment.c:220
+#: ../gtk/gtkalignment.c:234
 msgid "Right Padding"
 msgstr "જમણો હાંસ�યો"
 
-#: gtk/gtkalignment.c:221
+#: ../gtk/gtkalignment.c:235
 msgid "The padding to insert at the right of the widget."
 msgstr "વિજેટની ડાબી અને જમણી બાજ�ને ઉમેરવામાં આવતી જગ�યા પિક�સેલમાં."
 
-#: gtk/gtkarrow.c:110
+#: ../gtk/gtkappchooserbutton.c:555
+msgid "Include an 'Other...' item"
+msgstr ""
+
+#: ../gtk/gtkappchooserbutton.c:556
+msgid ""
+"Whether the combobox should include an item that triggers a "
+"GtkAppChooserDialog"
+msgstr ""
+
+#: ../gtk/gtkappchooserbutton.c:568 ../gtk/gtkappchooserdialog.c:722
+#| msgid "Show Heading"
+msgid "Heading"
+msgstr "મથાળ�ં"
+
+#: ../gtk/gtkappchooserbutton.c:569 ../gtk/gtkappchooserdialog.c:723
+#, fuzzy
+#| msgid "The padding to insert at the top of the widget."
+msgid "The text to show at the top of the dialog"
+msgstr "બાળ વિજેટની ઉપરની બાજ� જોડવા માટેનો હરોળનો ક�રમાંક."
+
+#: ../gtk/gtkappchooser.c:61
+#| msgid "Font style"
+msgid "Content type"
+msgstr "સમાવિષ�ટ પ�રકાર"
+
+#: ../gtk/gtkappchooser.c:62
+#, fuzzy
+#| msgid "The contents of the entry"
+msgid "The content type used by the open with object"
+msgstr "પ�રવેશના સમાવિષ�ટો"
+
+#: ../gtk/gtkappchooserdialog.c:708
+#| msgid "Filter"
+msgid "GFile"
+msgstr "GFile"
+
+#: ../gtk/gtkappchooserdialog.c:709
+#, fuzzy
+#| msgid "The title of the file chooser dialog."
+msgid "The GFile used by the app chooser dialog"
+msgstr "ફાઈલ પસંદગીકારક સંવાદન�ં શીર�ષક."
+
+#: ../gtk/gtkappchooserwidget.c:1016
+msgid "Show default app"
+msgstr "મૂળભૂત કાર�યક�રમને બતાવો"
+
+#: ../gtk/gtkappchooserwidget.c:1017
+#, fuzzy
+#| msgid "Whether the widget is the default widget"
+msgid "Whether the widget should show the default application"
+msgstr "શ�ં આ વિજેટ મૂળભૂત વિજેટ છે"
+
+#: ../gtk/gtkappchooserwidget.c:1030
+msgid "Show recommended apps"
+msgstr "અગ�રહણીય કાર�યક�રમો બતાવો"
+
+#: ../gtk/gtkappchooserwidget.c:1031
+#, fuzzy
+#| msgid "Whether images should be shown on buttons"
+msgid "Whether the widget should show recommended applications"
+msgstr "ક�યાંતો બટનો પર ચિત�રોને બતાવેલ હોવા જોઇ�"
+
+#: ../gtk/gtkappchooserwidget.c:1044
+msgid "Show fallback apps"
+msgstr "ફોલબૅક કાર�યક�રમો બતાવો"
+
+#: ../gtk/gtkappchooserwidget.c:1045
+#, fuzzy
+msgid "Whether the widget should show fallback applications"
+msgstr "શ�ં બધા બાળકો સરખા માપના હોવા જોઈ�"
+
+#: ../gtk/gtkappchooserwidget.c:1057
+#| msgid "Show Tooltips"
+msgid "Show other apps"
+msgstr "બીજા કાર�યક�રમો બતાવો"
+
+#: ../gtk/gtkappchooserwidget.c:1058
+#, fuzzy
+#| msgid "Whether the widget has the input focus"
+msgid "Whether the widget should show other applications"
+msgstr "શ�ં વિજેટની પાસે પ�રકાશિત ઈનપ�ટ છે"
+
+#: ../gtk/gtkappchooserwidget.c:1071
+#| msgid "Show Day Names"
+msgid "Show all apps"
+msgstr "બધા કાર�યક�રમો બતાવો"
+
+#: ../gtk/gtkappchooserwidget.c:1072
+#, fuzzy
+msgid "Whether the widget should show all applications"
+msgstr "શ�ં બધા બાળકો સરખા માપના હોવા જોઈ�"
+
+#: ../gtk/gtkappchooserwidget.c:1085
+msgid "Widget's default text"
+msgstr "વિજેટન�ં મૂળભૂત લખાણ"
+
+#: ../gtk/gtkappchooserwidget.c:1086
+msgid "The default text appearing when there are no applications"
+msgstr ""
+
+#: ../gtk/gtkarrow.c:112
 msgid "Arrow direction"
 msgstr "તીરની દિશા"
 
-#: gtk/gtkarrow.c:111
+#: ../gtk/gtkarrow.c:113
 msgid "The direction the arrow should point"
 msgstr "દિશા કે જે તીરે દર�શાવવી જોઈ�"
 
-#: gtk/gtkarrow.c:119
+#: ../gtk/gtkarrow.c:121
 msgid "Arrow shadow"
 msgstr "તીરનો પડછાયો"
 
-#: gtk/gtkarrow.c:120
+#: ../gtk/gtkarrow.c:122
 msgid "Appearance of the shadow surrounding the arrow"
 msgstr "તીરની આજ�બાજ� તેના પડછાયાનો દેખાવ"
 
-#: gtk/gtkarrow.c:127 gtk/gtkmenu.c:735 gtk/gtkmenuitem.c:396
+#: ../gtk/gtkarrow.c:129 ../gtk/gtkcombobox.c:986 ../gtk/gtkmenu.c:798
+#: ../gtk/gtkmenuitem.c:446
 msgid "Arrow Scaling"
 msgstr "તીરન�ં માપન"
 
-#: gtk/gtkarrow.c:128
+#: ../gtk/gtkarrow.c:130
 msgid "Amount of space used up by arrow"
 msgstr "તીર દ�વારા વાપરવામાં આવતી જગ�યાનો જથ�થો"
 
-#: gtk/gtkaspectframe.c:109 gtk/gtkwidget.c:950
+#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1178
 msgid "Horizontal Alignment"
 msgstr "આડી કતારબંધ ગોઠવણી"
 
-#: gtk/gtkaspectframe.c:110
+#: ../gtk/gtkaspectframe.c:110
 msgid "X alignment of the child"
 msgstr "બાળની X દિશામાં ગોઠવણી"
 
-#: gtk/gtkaspectframe.c:116 gtk/gtkwidget.c:966
+#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1194
 msgid "Vertical Alignment"
 msgstr "ઉભી કતારબંધ ગોઠવણી"
 
-#: gtk/gtkaspectframe.c:117
+#: ../gtk/gtkaspectframe.c:117
 msgid "Y alignment of the child"
 msgstr "બાળની Y દિશામાં ગોઠવણી"
 
-#: gtk/gtkaspectframe.c:123
+#: ../gtk/gtkaspectframe.c:123
 msgid "Ratio"
 msgstr "ગ�ણોત�તર"
 
-#: gtk/gtkaspectframe.c:124
+#: ../gtk/gtkaspectframe.c:124
 msgid "Aspect ratio if obey_child is FALSE"
 msgstr "ધારેલો ગ�ણોત�તર જો આજ�ઞાંકિત બાળ ખોટો હોય તો.(_c)"
 
-#: gtk/gtkaspectframe.c:130
+#: ../gtk/gtkaspectframe.c:130
 msgid "Obey child"
 msgstr "આજ�ઞાંકિત બાળ"
 
-#: gtk/gtkaspectframe.c:131
+#: ../gtk/gtkaspectframe.c:131
 msgid "Force aspect ratio to match that of the frame's child"
 msgstr "ધારેલા ગ�ણોત�તરને ચોકઠાના બાળ સાથે બંધબેસવા માટે મજબૂર કરો"
 
-#: gtk/gtkassistant.c:310
+#: ../gtk/gtkassistant.c:310
 msgid "Header Padding"
 msgstr "હેડર ભરો"
 
-#: gtk/gtkassistant.c:311
+#: ../gtk/gtkassistant.c:311
 msgid "Number of pixels around the header."
 msgstr "હેડરની આસપાસ પિક�સેલોની સંખ�યા."
 
-#: gtk/gtkassistant.c:318
+#: ../gtk/gtkassistant.c:318
 msgid "Content Padding"
 msgstr "સમાવિષ�ટ ભરો"
 
-#: gtk/gtkassistant.c:319
+#: ../gtk/gtkassistant.c:319
 msgid "Number of pixels around the content pages."
 msgstr "સમાવિષ�ટ પાનાંઓ ફરતે પિક�સેલોની સંખ�યા."
 
-#: gtk/gtkassistant.c:335
+#: ../gtk/gtkassistant.c:335
 msgid "Page type"
 msgstr "પાનાં પ�રકાર"
 
-#: gtk/gtkassistant.c:336
+#: ../gtk/gtkassistant.c:336
 msgid "The type of the assistant page"
 msgstr "સહાયક પાનાંનો પ�રકાર"
 
-#: gtk/gtkassistant.c:353
+#: ../gtk/gtkassistant.c:351
 msgid "Page title"
 msgstr "પાનાં શીર�ષક"
 
-#: gtk/gtkassistant.c:354
+#: ../gtk/gtkassistant.c:352
 msgid "The title of the assistant page"
 msgstr "સહાયક પાનાંન�ં શીર�ષક"
 
-#: gtk/gtkassistant.c:370
+#: ../gtk/gtkassistant.c:369
 msgid "Header image"
 msgstr "હેડર ઈમેજ"
 
-#: gtk/gtkassistant.c:371
+#: ../gtk/gtkassistant.c:370
 msgid "Header image for the assistant page"
 msgstr "સહાયક પાનાં માટે હેડર ઈમેજ"
 
-#: gtk/gtkassistant.c:387
+#: ../gtk/gtkassistant.c:386
 msgid "Sidebar image"
 msgstr "બાજ�પટ�ટી ઈમેજ"
 
-#: gtk/gtkassistant.c:388
+#: ../gtk/gtkassistant.c:387
 msgid "Sidebar image for the assistant page"
 msgstr "સહાયક પાનાં માટે બાજ�પટ�ટી ઈમેજ"
 
-#: gtk/gtkassistant.c:403
+#: ../gtk/gtkassistant.c:403
 msgid "Page complete"
 msgstr "પાન�ં સમાપ�ત"
 
-#: gtk/gtkassistant.c:404
+#: ../gtk/gtkassistant.c:404
 msgid "Whether all required fields on the page have been filled out"
 msgstr "શ�ં પાનાં પરના બધા જરૂરી ક�ષેત�રો ભરાઈ ગયેલ છે"
 
-#: gtk/gtkbbox.c:135
+#: ../gtk/gtkbbox.c:159
 msgid "Minimum child width"
 msgstr "બાળની ન�યૂનત�તમ પહોળાઈ"
 
-#: gtk/gtkbbox.c:136
+#: ../gtk/gtkbbox.c:160
 msgid "Minimum width of buttons inside the box"
 msgstr "પેટીની અંદરના બટનની ન�યૂનત�તમ પહોળાઈ"
 
-#: gtk/gtkbbox.c:144
+#: ../gtk/gtkbbox.c:168
 msgid "Minimum child height"
 msgstr "બાળની ન�યૂનત�તમ ઊંચાઈ"
 
-#: gtk/gtkbbox.c:145
+#: ../gtk/gtkbbox.c:169
 msgid "Minimum height of buttons inside the box"
 msgstr "પેટીની અંદરના બટનની ન�યૂનત�તમ ઊંચાઈ"
 
-#: gtk/gtkbbox.c:153
+#: ../gtk/gtkbbox.c:177
 msgid "Child internal width padding"
 msgstr "બાળની આંતરિક પહોળાઈની ખાલી જગ�યા ભરો"
 
-#: gtk/gtkbbox.c:154
+#: ../gtk/gtkbbox.c:178
 msgid "Amount to increase child's size on either side"
 msgstr "બંને બાજ� વધારવા માટેન�ં બાળના માપન�ં પ�રમાણ"
 
-#: gtk/gtkbbox.c:162
+#: ../gtk/gtkbbox.c:186
 msgid "Child internal height padding"
 msgstr "બાળની આંતરિક ઊંચાઈની ખાલી જગ�યા ભરો"
 
-#: gtk/gtkbbox.c:163
+#: ../gtk/gtkbbox.c:187
 msgid "Amount to increase child's size on the top and bottom"
 msgstr "ઉપર અને નીચે વધારવા માટેના બાળના માપન�ં પ�રમાણ"
 
-#: gtk/gtkbbox.c:171
+#: ../gtk/gtkbbox.c:195
 msgid "Layout style"
 msgstr "દેખાવની શૈલી"
 
-#: gtk/gtkbbox.c:172
+#: ../gtk/gtkbbox.c:196
 #, fuzzy
 msgid ""
 "How to lay out the buttons in the box. Possible values are: spread, edge, "
 "start and end"
 msgstr "પેટીમાં બટનોને કેવી રીતે દેખાડવા. શક�ય કિંમતો મૂળભૂત, ફેલાયેલીબાજ�, શરૂઆત અને અંત છે"
 
-#: gtk/gtkbbox.c:180
+#: ../gtk/gtkbbox.c:204
 msgid "Secondary"
 msgstr "ગૌણ"
 
-#: gtk/gtkbbox.c:181
+#: ../gtk/gtkbbox.c:205
 msgid ""
 "If TRUE, the child appears in a secondary group of children, suitable for, e."
 "g., help buttons"
 msgstr "જો ખર� હોય તો બાળ ગૌણ જૂથમાં દેખાશે, દા.ત. મદદ બટનો માટે યોગ�ય છે"
 
-#: gtk/gtkbox.c:227 gtk/gtkexpander.c:233 gtk/gtkiconview.c:666
-#: gtk/gtktreeviewcolumn.c:220
+#: ../gtk/gtkbbox.c:212
+#, fuzzy
+#| msgid "Homogeneous"
+msgid "Non-Homogeneous"
+msgstr "�ક જ સરખાં "
+
+#: ../gtk/gtkbbox.c:213
+#, fuzzy
+#| msgid "If TRUE, the child can be made smaller than its requisition"
+msgid "If TRUE, the child will not be subject to homogeneous sizing"
+msgstr "જો સાચ�ં હોય, તો બાળ તેની અરજી કરતાં નાન�ં બનાવી શકાય છે"
+
+#: ../gtk/gtkbox.c:241 ../gtk/gtkcellareabox.c:317 ../gtk/gtkexpander.c:314
+#: ../gtk/gtkiconview.c:643 ../gtk/gtktreeviewcolumn.c:283
 msgid "Spacing"
 msgstr "છોડેલી જગ�યા"
 
-#: gtk/gtkbox.c:228
+#: ../gtk/gtkbox.c:242
 msgid "The amount of space between children"
 msgstr "બાળકો વચ�ચે છોડેલી જગ�યાન�ં પ�રમાણ"
 
-#: gtk/gtkbox.c:237 gtk/gtktable.c:184 gtk/gtktoolbar.c:527
-#: gtk/gtktoolitemgroup.c:1624
+#: ../gtk/gtkbox.c:251 ../gtk/gtktable.c:227 ../gtk/gtktoolbar.c:563
+#: ../gtk/gtktoolitemgroup.c:1645
 msgid "Homogeneous"
 msgstr "�ક જ સરખાં "
 
-#: gtk/gtkbox.c:238
+#: ../gtk/gtkbox.c:252
 msgid "Whether the children should all be the same size"
 msgstr "શ�ં બધા બાળકો સરખા માપના હોવા જોઈ�"
 
-#: gtk/gtkbox.c:254 gtk/gtktoolbar.c:519 gtk/gtktoolitemgroup.c:1631
-#: gtk/gtktoolpalette.c:1065 gtk/gtktreeviewcolumn.c:276
+#: ../gtk/gtkbox.c:272 ../gtk/gtkcellareabox.c:337 ../gtk/gtktoolbar.c:555
+#: ../gtk/gtktoolitemgroup.c:1652 ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktreeviewcolumn.c:339
 msgid "Expand"
 msgstr "ફેલાવો"
 
-#: gtk/gtkbox.c:255
+#: ../gtk/gtkbox.c:273
 msgid "Whether the child should receive extra space when the parent grows"
 msgstr "શ�ં પિતૃનો વિકાસ થાય ત�યારે બાળને વધારાની જગ�યા મળવી જોઈ�"
 
-#: gtk/gtkbox.c:271 gtk/gtktoolitemgroup.c:1638
+#: ../gtk/gtkbox.c:289 ../gtk/gtktoolitemgroup.c:1659
 msgid "Fill"
 msgstr "ભરો"
 
-#: gtk/gtkbox.c:272
+#: ../gtk/gtkbox.c:290
 msgid ""
 "Whether extra space given to the child should be allocated to the child or "
 "used as padding"
 msgstr "શ�ં બાળને અપાયેલી વધારાની જગ�યા બાળને ફાળવવી શ�ં તેને ભરી કાઢવી"
 
-#: gtk/gtkbox.c:279 gtk/gtktrayicon-x11.c:165
+#: ../gtk/gtkbox.c:297 ../gtk/gtktrayicon-x11.c:169
 msgid "Padding"
 msgstr "ખાલી જગ�યા ભરો"
 
-#: gtk/gtkbox.c:280
+#: ../gtk/gtkbox.c:298
 msgid "Extra space to put between the child and its neighbors, in pixels"
 msgstr "પીક�સેલની અંદર, બાળ અને પડોશીની વચ�ચે મૂકવાની વધારાની જગ�યા"
 
-#: gtk/gtkbox.c:286
+#: ../gtk/gtkbox.c:304
 msgid "Pack type"
 msgstr "પેક પ�રકાર"
 
-#: gtk/gtkbox.c:287 gtk/gtknotebook.c:692
+#: ../gtk/gtkbox.c:305
 msgid ""
 "A GtkPackType indicating whether the child is packed with reference to the "
 "start or end of the parent"
-msgstr ""
-"બાળ � પિતૃના શર�આતના શ�ં અંતના સંદર�ભમાં બંધાય� છે કે નહિ તે દર�શાવવા માટેન�ંGtkPackType"
+msgstr "બાળ � પિતૃના શર�આતના શ�ં અંતના સંદર�ભમાં બંધાય� છે કે નહિ તે દર�શાવવા માટેન�ંGtkPackType"
 
-#: gtk/gtkbox.c:293 gtk/gtknotebook.c:670 gtk/gtkpaned.c:270
-#: gtk/gtkruler.c:158 gtk/gtktoolitemgroup.c:1652
+#: ../gtk/gtkbox.c:311 ../gtk/gtknotebook.c:769 ../gtk/gtkpaned.c:349
+#: ../gtk/gtktoolitemgroup.c:1673
 msgid "Position"
 msgstr "સ�થિતિ"
 
-#: gtk/gtkbox.c:294 gtk/gtknotebook.c:671
+#: ../gtk/gtkbox.c:312 ../gtk/gtknotebook.c:770
 msgid "The index of the child in the parent"
 msgstr "પિતૃમાં બાળનો અન�ક�રમાંક "
 
-#: gtk/gtkbuilder.c:315
+#: ../gtk/gtkbuilder.c:319
 msgid "Translation Domain"
 msgstr "અન�વાદ ડોમેઈન"
 
-#: gtk/gtkbuilder.c:316
+#: ../gtk/gtkbuilder.c:320
 msgid "The translation domain used by gettext"
 msgstr "gettext દ�વારા વપરાત�ં અન�વાદ ડોમેઈન"
 
-#: gtk/gtkbutton.c:239
+#: ../gtk/gtkbutton.c:229
 msgid ""
 "Text of the label widget inside the button, if the button contains a label "
 "widget"
 msgstr "જો બટન લેબલ વિજેટ ધરાવત� હોય તો, બટનની અંદર લેબલ વિજેટન�ં લેખન"
 
-#: gtk/gtkbutton.c:246 gtk/gtkexpander.c:217 gtk/gtklabel.c:570
-#: gtk/gtkmenuitem.c:348 gtk/gtktoolbutton.c:209
+#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:298 ../gtk/gtklabel.c:765
+#: ../gtk/gtkmenuitem.c:398 ../gtk/gtktoolbutton.c:239
 msgid "Use underline"
 msgstr "નીચે લીટી કરવાન�ં રાખો"
 
-#: gtk/gtkbutton.c:247 gtk/gtkexpander.c:218 gtk/gtklabel.c:571
-#: gtk/gtkmenuitem.c:349
+#: ../gtk/gtkbutton.c:237 ../gtk/gtkexpander.c:299 ../gtk/gtklabel.c:766
+#: ../gtk/gtkmenuitem.c:399
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -881,149 +1014,138 @@ msgstr ""
 "જો સ�યોજિત હોય તો, શબ�દની નીચેની લીટી � સૂચવે છે શ�ંનો શબ�દ સંજ�ઞાસૂચિની પ�રવેગ કી માટે "
 "વાપરવો જોઇ�"
 
-#: gtk/gtkbutton.c:254 gtk/gtkimagemenuitem.c:153
+#: ../gtk/gtkbutton.c:244 ../gtk/gtkimagemenuitem.c:175
 msgid "Use stock"
 msgstr "જથ�થાનો ઉપયોગ કરવો"
 
-#: gtk/gtkbutton.c:255
-msgid ""
-"If set, the label is used to pick a stock item instead of being displayed"
-msgstr ""
-"જો સ�યોજિત હોય તો, દર�શાવવાની જગ�યા� લેબલનો ઉપયોગ જથ�થાની વસ�ત�ને પસંદ કરવા માટે થાય છે"
+#: ../gtk/gtkbutton.c:245
+msgid "If set, the label is used to pick a stock item instead of being displayed"
+msgstr "જો સ�યોજિત હોય તો, દર�શાવવાની જગ�યા� લેબલનો ઉપયોગ જથ�થાની વસ�ત�ને પસંદ કરવા માટે થાય છે"
 
-#: gtk/gtkbutton.c:262 gtk/gtkcombobox.c:811 gtk/gtkfilechooserbutton.c:385
+#: ../gtk/gtkbutton.c:252 ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkfilechooserbutton.c:426
 msgid "Focus on click"
 msgstr "ક�લિક પર ફોકસ"
 
-#: gtk/gtkbutton.c:263 gtk/gtkfilechooserbutton.c:386
+#: ../gtk/gtkbutton.c:253 ../gtk/gtkfilechooserbutton.c:427
 msgid "Whether the button grabs focus when it is clicked with the mouse"
 msgstr "જ�યારે માઉસ વડે ક�લિક થાય ત�યારે શ�ં બટન ફોક�સ મેળવે"
 
-#: gtk/gtkbutton.c:270
+#: ../gtk/gtkbutton.c:260
 msgid "Border relief"
 msgstr "કિનારી મ�ક�તિ"
 
-#: gtk/gtkbutton.c:271
+#: ../gtk/gtkbutton.c:261
 msgid "The border relief style"
 msgstr "કિનારીમ�ક�તની રીત"
 
-#: gtk/gtkbutton.c:288
+#: ../gtk/gtkbutton.c:278
 msgid "Horizontal alignment for child"
 msgstr "આડી કતારબંધ ગોઠવણી"
 
-#: gtk/gtkbutton.c:307
+#: ../gtk/gtkbutton.c:297
 msgid "Vertical alignment for child"
 msgstr "ઊભી કતારબંધ ગોઠવણી"
 
-#: gtk/gtkbutton.c:324 gtk/gtkimagemenuitem.c:138
+#: ../gtk/gtkbutton.c:314 ../gtk/gtkimagemenuitem.c:160
 msgid "Image widget"
 msgstr "ચિત�ર વિજેટ"
 
-#: gtk/gtkbutton.c:325
+#: ../gtk/gtkbutton.c:315
 msgid "Child widget to appear next to the button text"
 msgstr "બટન લખાણની આગળ દેખાડવા માટે બાળ વિજેટ"
 
-#: gtk/gtkbutton.c:339
+#: ../gtk/gtkbutton.c:329
 msgid "Image position"
 msgstr "ચિત�ર સ�થિતિ"
 
-#: gtk/gtkbutton.c:340
+#: ../gtk/gtkbutton.c:330
 msgid "The position of the image relative to the text"
 msgstr "લખાણને અન�લક�ષીને ચિત�રની સ�થિતિ"
 
-#: gtk/gtkbutton.c:460
+#: ../gtk/gtkbutton.c:450
 msgid "Default Spacing"
 msgstr "છોડાયેલી મૂળભૂત જગ�યા"
 
-#: gtk/gtkbutton.c:461
+#: ../gtk/gtkbutton.c:451
 #, fuzzy
 msgid "Extra space to add for GTK_CAN_DEFAULT buttons"
 msgstr "CAN_DEFAULT બટન માટે ઉમેરવાની વધારાની જગ�યા"
 
-#: gtk/gtkbutton.c:475
+#: ../gtk/gtkbutton.c:465
 msgid "Default Outside Spacing"
 msgstr "છોડાયેલી મૂળભૂત બહારની જગ�યા"
 
-#: gtk/gtkbutton.c:476
+#: ../gtk/gtkbutton.c:466
 #, fuzzy
 msgid ""
 "Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside "
 "the border"
 msgstr "CAN_DEFAULT બટન માટે વધારાની જગ�યા હંમેશા કિનારીની બહારના વિસ�તારમાં મૂકવી"
 
-#: gtk/gtkbutton.c:481
+#: ../gtk/gtkbutton.c:471
 msgid "Child X Displacement"
 msgstr "બાળ X સ�થળાંતર"
 
-#: gtk/gtkbutton.c:482
-msgid ""
-"How far in the x direction to move the child when the button is depressed"
+#: ../gtk/gtkbutton.c:472
+msgid "How far in the x direction to move the child when the button is depressed"
 msgstr "બટનને દબાવવામાં આવે ત�યારે બાળને X ની દિશામાં કેટલો દૂર સ�ધી ખસેડવી"
 
-#: gtk/gtkbutton.c:489
+#: ../gtk/gtkbutton.c:479
 msgid "Child Y Displacement"
 msgstr "બાળ Y સ�થળાંતર"
 
-#: gtk/gtkbutton.c:490
-msgid ""
-"How far in the y direction to move the child when the button is depressed"
+#: ../gtk/gtkbutton.c:480
+msgid "How far in the y direction to move the child when the button is depressed"
 msgstr "બટનને દબાવવામાં આવે ત�યારે બાળને y ની દિશામાં કેટલે દૂર સ�ધી ખસેડવી"
 
-#: gtk/gtkbutton.c:506
+#: ../gtk/gtkbutton.c:496
 msgid "Displace focus"
 msgstr "ડિસ�પ�લે ફોકસ"
 
-#: gtk/gtkbutton.c:507
+#: ../gtk/gtkbutton.c:497
 msgid ""
 "Whether the child_displacement_x/_y properties should also affect the focus "
 "rectangle"
 msgstr "શ�ં child_displacement_x/_y ગ�ણધર�મો ફોકસ લંબચોરસને પણ અસર કરવા જોઈ�"
 
-#: gtk/gtkbutton.c:520 gtk/gtkentry.c:696 gtk/gtkentry.c:1741
+#: ../gtk/gtkbutton.c:510 ../gtk/gtkentry.c:794 ../gtk/gtkentry.c:1869
 msgid "Inner Border"
 msgstr "અંદરની કિનારી"
 
-#: gtk/gtkbutton.c:521
+#: ../gtk/gtkbutton.c:511
 msgid "Border between button edges and child."
 msgstr "બટન બાજ�ઓ અને બાળ વચ�ચેની કિનારી."
 
-#: gtk/gtkbutton.c:534
+#: ../gtk/gtkbutton.c:524
 msgid "Image spacing"
 msgstr "ચિત�ર વચ�ચેની જગ�યા"
 
-#: gtk/gtkbutton.c:535
+#: ../gtk/gtkbutton.c:525
 msgid "Spacing in pixels between the image and label"
 msgstr "ચિત�ર અને લેબલ વચ�ચેની જગ�યા પિક�સેલોમાં"
 
-#: gtk/gtkbutton.c:549
-msgid "Show button images"
-msgstr "બટન ઈમેજો બતાવો"
-
-#: gtk/gtkbutton.c:550
-msgid "Whether images should be shown on buttons"
-msgstr "ક�યાંતો બટનો પર ચિત�રોને બતાવેલ હોવા જોઇ�"
-
-#: gtk/gtkcalendar.c:478
+#: ../gtk/gtkcalendar.c:470
 msgid "Year"
 msgstr "વર�ષ"
 
-#: gtk/gtkcalendar.c:479
+#: ../gtk/gtkcalendar.c:471
 msgid "The selected year"
 msgstr "પસંદ કરેલ વર�ષ"
 
-#: gtk/gtkcalendar.c:492
+#: ../gtk/gtkcalendar.c:484
 msgid "Month"
 msgstr "મહિનો"
 
-#: gtk/gtkcalendar.c:493
+#: ../gtk/gtkcalendar.c:485
 msgid "The selected month (as a number between 0 and 11)"
 msgstr "પસંદ કરેલ મહિનો (૦ અને ૧૧ વચ�ચેની સંખ�યા)"
 
-#: gtk/gtkcalendar.c:507
+#: ../gtk/gtkcalendar.c:499
 msgid "Day"
 msgstr "દિવસ"
 
-#: gtk/gtkcalendar.c:508
+#: ../gtk/gtkcalendar.c:500
 msgid ""
 "The selected day (as a number between 1 and 31, or 0 to unselect the "
 "currently selected day)"
@@ -1031,353 +1153,475 @@ msgstr ""
 "પસંદ કરેલ દિવસ (૧ અને ૩૧ વચ�ચેની સંખ�યા, અથવા વર�તમાનમાં પસંદ થયેલ દિવસની પસંદગી દૂર કરવા "
 "માટે ૦)"
 
-#: gtk/gtkcalendar.c:522
+#: ../gtk/gtkcalendar.c:514
 msgid "Show Heading"
 msgstr "મથાળ�ં બતાવો"
 
-#: gtk/gtkcalendar.c:523
+#: ../gtk/gtkcalendar.c:515
 msgid "If TRUE, a heading is displayed"
 msgstr "જો સાચ�ં હોય, તો મથાળ�ં દર�શાવાય છે"
 
-#: gtk/gtkcalendar.c:537
+#: ../gtk/gtkcalendar.c:529
 msgid "Show Day Names"
 msgstr "દિવસ નામો બતાવો"
 
-#: gtk/gtkcalendar.c:538
+#: ../gtk/gtkcalendar.c:530
 msgid "If TRUE, day names are displayed"
 msgstr "જો સાચ�ં હોય, તો દિવસ નામો દર�શાવાય છે"
 
-#: gtk/gtkcalendar.c:551
+#: ../gtk/gtkcalendar.c:543
 msgid "No Month Change"
 msgstr "કોઈ મહિનો બદલાયો નથી"
 
-#: gtk/gtkcalendar.c:552
+#: ../gtk/gtkcalendar.c:544
 msgid "If TRUE, the selected month cannot be changed"
 msgstr "જો સાચ�ં હોય, તો પસંદ કરેલ મહિનો બદલી શકાતો નથી"
 
-#: gtk/gtkcalendar.c:566
+#: ../gtk/gtkcalendar.c:558
 msgid "Show Week Numbers"
 msgstr "અઠવાડિયા નંબરો બતાવો"
 
-#: gtk/gtkcalendar.c:567
+#: ../gtk/gtkcalendar.c:559
 msgid "If TRUE, week numbers are displayed"
 msgstr "જો સાચ�ં હોય, તો અઠવાડિયા નંબરો દર�શાવાય છે"
 
-#: gtk/gtkcalendar.c:582
+#: ../gtk/gtkcalendar.c:574
 msgid "Details Width"
 msgstr "પહોળાઇની વિગતો"
 
-#: gtk/gtkcalendar.c:583
+#: ../gtk/gtkcalendar.c:575
 msgid "Details width in characters"
 msgstr "અક�ષરોમાં વિગતોની પહોળાઇ"
 
-#: gtk/gtkcalendar.c:598
+#: ../gtk/gtkcalendar.c:590
 msgid "Details Height"
 msgstr "ઊંચાઇની વિગતો"
 
-#: gtk/gtkcalendar.c:599
+#: ../gtk/gtkcalendar.c:591
 msgid "Details height in rows"
 msgstr "હરોળમાં ઊંચાઇની વિગતો"
 
-#: gtk/gtkcalendar.c:615
+#: ../gtk/gtkcalendar.c:607
 msgid "Show Details"
 msgstr "વિગતો ને બતાવો"
 
-#: gtk/gtkcalendar.c:616
+#: ../gtk/gtkcalendar.c:608
 msgid "If TRUE, details are shown"
 msgstr "જો TRUE હોય તો, વિગતો બતાવેલ છે"
 
-#: gtk/gtkcalendar.c:628
-#, fuzzy
+#: ../gtk/gtkcalendar.c:620
 msgid "Inner border"
 msgstr "અંદરની કિનારી"
 
-#: gtk/gtkcalendar.c:629
+#: ../gtk/gtkcalendar.c:621
 #, fuzzy
 msgid "Inner border space"
 msgstr "અંદરની કિનારી"
 
-#: gtk/gtkcalendar.c:640
+#: ../gtk/gtkcalendar.c:632
 #, fuzzy
 msgid "Vertical separation"
 msgstr "ઉભા વિકલ�પો"
 
-#: gtk/gtkcalendar.c:641
+#: ../gtk/gtkcalendar.c:633
 #, fuzzy
 msgid "Space between day headers and main area"
 msgstr "વિસ�તારક તીરની આસપાસની જગ�યા"
 
-#: gtk/gtkcalendar.c:652
+#: ../gtk/gtkcalendar.c:644
 #, fuzzy
 msgid "Horizontal separation"
 msgstr "આડા વિકલ�પો"
 
-#: gtk/gtkcalendar.c:653
+#: ../gtk/gtkcalendar.c:645
 #, fuzzy
 msgid "Space between week headers and main area"
 msgstr "મ�ખ�ય સંવાદ વિસ�તારનાં ઘટકો વચ�ચે જગ�યા છોડો"
 
-#: gtk/gtkcelleditable.c:53
+#: ../gtk/gtkcellareabox.c:318 ../gtk/gtktreeviewcolumn.c:284
+msgid "Space which is inserted between cells"
+msgstr "જગ�યા કે જે ખાનાંઓ વચ�ચે દાખલ થયેલ છે"
+
+#: ../gtk/gtkcellareabox.c:338
+#, fuzzy
+#| msgid "Whether the widget responds to input"
+msgid "Whether the cell expands"
+msgstr "શ�ં વિજેટ ઈનપ�ટને પ�રતિસાદ આપે છે"
+
+#: ../gtk/gtkcellareabox.c:353
+#, fuzzy
+#| msgid "xalign"
+msgid "Align"
+msgstr "xalign"
+
+#: ../gtk/gtkcellareabox.c:354
+#, fuzzy
+msgid "Whether cell should align with adjacent rows"
+msgstr "શ�ં વસ�ત�ઓ સંખ�યા સાથે દર�શાવવી જોઈ�"
+
+#: ../gtk/gtkcellareabox.c:370
+#, fuzzy
+#| msgid "Pixel size"
+msgid "Fixed Size"
+msgstr "પિક�સેલ માપ"
+
+#: ../gtk/gtkcellareabox.c:371
+#, fuzzy
+#| msgid "Whether the children should all be the same size"
+msgid "Whether cells should be the same size in all rows"
+msgstr "શ�ં બધા બાળકો સરખા માપના હોવા જોઈ�"
+
+#: ../gtk/gtkcellareabox.c:387
+#, fuzzy
+#| msgid "Pack type"
+msgid "Pack Type"
+msgstr "પેક પ�રકાર"
+
+#: ../gtk/gtkcellareabox.c:388
+#, fuzzy
+#| msgid ""
+#| "A GtkPackType indicating whether the child is packed with reference to "
+#| "the start or end of the parent"
+msgid ""
+"A GtkPackType indicating whether the cell is packed with reference to the "
+"start or end of the cell area"
+msgstr "બાળ � પિતૃના શર�આતના શ�ં અંતના સંદર�ભમાં બંધાય� છે કે નહિ તે દર�શાવવા માટેન�ંGtkPackType"
+
+#: ../gtk/gtkcellarea.c:803
+msgid "Focus Cell"
+msgstr ""
+
+#: ../gtk/gtkcellarea.c:804
+#, fuzzy
+#| msgid "The item which is currently active"
+msgid "The cell which currently has focus"
+msgstr "વસ�ત� કે જે વર�તમાનમાં ક�રિયાશીલ છે"
+
+#: ../gtk/gtkcellarea.c:822
+msgid "Edited Cell"
+msgstr ""
+
+#: ../gtk/gtkcellarea.c:823
+#, fuzzy
+#| msgid "The item which is currently active"
+msgid "The cell which is currently being edited"
+msgstr "વસ�ત� કે જે વર�તમાનમાં ક�રિયાશીલ છે"
+
+#: ../gtk/gtkcellarea.c:841
+#| msgid "Widget"
+msgid "Edit Widget"
+msgstr "વિજેટમાં ફેરફાર કરો"
+
+#: ../gtk/gtkcellarea.c:842
+#, fuzzy
+#| msgid "The current page in the document"
+msgid "The widget currently editing the edited cell"
+msgstr "દસ�તાવેજમાં વર�તમાન પાન�ં"
+
+#: ../gtk/gtkcellareacontext.c:119
+msgid "Area"
+msgstr "વિસ�તાર"
+
+#: ../gtk/gtkcellareacontext.c:120
+msgid "The Cell Area this context was created for"
+msgstr ""
+
+#: ../gtk/gtkcellareacontext.c:136 ../gtk/gtkcellareacontext.c:155
+#: ../gtk/gtktreeviewcolumn.c:311
+msgid "Minimum Width"
+msgstr "ન�યૂનતમ પહોળાઈ"
+
+#: ../gtk/gtkcellareacontext.c:137 ../gtk/gtkcellareacontext.c:156
+#| msgid "Minimum child width"
+msgid "Minimum cached width"
+msgstr "ન�યૂનત�તમ કેશ પહોળાઈ"
+
+#: ../gtk/gtkcellareacontext.c:174 ../gtk/gtkcellareacontext.c:193
+#| msgid "Minimum child height"
+msgid "Minimum Height"
+msgstr "ન�યૂનત�તમ ઊંચાઈ"
+
+#: ../gtk/gtkcellareacontext.c:175 ../gtk/gtkcellareacontext.c:194
+#| msgid "Minimum child height"
+msgid "Minimum cached height"
+msgstr "ન�યૂનત�તમ કેશ ઊંચાઈ"
+
+#: ../gtk/gtkcelleditable.c:53
 #, fuzzy
 msgid "Editing Canceled"
 msgstr "ફેરફાર કરી રહ�યા છે"
 
-#: gtk/gtkcelleditable.c:54
+#: ../gtk/gtkcelleditable.c:54
 msgid "Indicates that editing has been canceled"
 msgstr ""
 
-#: gtk/gtkcellrendereraccel.c:138
+#: ../gtk/gtkcellrendereraccel.c:152
 msgid "Accelerator key"
 msgstr "પ�રવેગક કી"
 
-#: gtk/gtkcellrendereraccel.c:139
+#: ../gtk/gtkcellrendereraccel.c:153
 msgid "The keyval of the accelerator"
 msgstr "પ�રવેગકની કી કિંમત"
 
-#: gtk/gtkcellrendereraccel.c:155
+#: ../gtk/gtkcellrendereraccel.c:169
 msgid "Accelerator modifiers"
 msgstr "પ�રવેગક સ�ધારકો"
 
-#: gtk/gtkcellrendereraccel.c:156
+#: ../gtk/gtkcellrendereraccel.c:170
 msgid "The modifier mask of the accelerator"
 msgstr "પ�રવેગકન�ં સ�ધારક માસ�ક"
 
-#: gtk/gtkcellrendereraccel.c:173
+#: ../gtk/gtkcellrendereraccel.c:187
 msgid "Accelerator keycode"
 msgstr "પ�રવેગક કીકોડ"
 
-#: gtk/gtkcellrendereraccel.c:174
+#: ../gtk/gtkcellrendereraccel.c:188
 msgid "The hardware keycode of the accelerator"
 msgstr "પ�રવેગકનો હાર�ડવેર કીકોડ"
 
-#: gtk/gtkcellrendereraccel.c:193
+#: ../gtk/gtkcellrendereraccel.c:207
 msgid "Accelerator Mode"
 msgstr "પ�રવેગક સ�થિતિ"
 
-#: gtk/gtkcellrendereraccel.c:194
+#: ../gtk/gtkcellrendereraccel.c:208
 msgid "The type of accelerators"
 msgstr "પ�રવેગકનો પ�રકાર"
 
-#: gtk/gtkcellrenderer.c:226
+#: ../gtk/gtkcellrenderer.c:274
 msgid "mode"
 msgstr "સ�થિતિ"
 
-#: gtk/gtkcellrenderer.c:227
+#: ../gtk/gtkcellrenderer.c:275
 msgid "Editable mode of the CellRenderer"
 msgstr "CellRenderer માટે બદલી શકાય તેવી સ�થિતિ"
 
-#: gtk/gtkcellrenderer.c:235
+#: ../gtk/gtkcellrenderer.c:283
 msgid "visible"
 msgstr "દૃશ�યમાન"
 
-#: gtk/gtkcellrenderer.c:236
+#: ../gtk/gtkcellrenderer.c:284
 msgid "Display the cell"
 msgstr "કોષ દર�શાવો"
 
-#: gtk/gtkcellrenderer.c:243
+#: ../gtk/gtkcellrenderer.c:291
 msgid "Display the cell sensitive"
 msgstr "કોષ સંવેદનશીલ દર�શાવો"
 
-#: gtk/gtkcellrenderer.c:250
+#: ../gtk/gtkcellrenderer.c:298
 msgid "xalign"
 msgstr "xalign"
 
-#: gtk/gtkcellrenderer.c:251
+#: ../gtk/gtkcellrenderer.c:299
 msgid "The x-align"
 msgstr "x-align"
 
-#: gtk/gtkcellrenderer.c:260
+#: ../gtk/gtkcellrenderer.c:308
 msgid "yalign"
 msgstr "yalign"
 
-#: gtk/gtkcellrenderer.c:261
+#: ../gtk/gtkcellrenderer.c:309
 msgid "The y-align"
 msgstr "y-align"
 
-#: gtk/gtkcellrenderer.c:270
+#: ../gtk/gtkcellrenderer.c:318
 msgid "xpad"
 msgstr "xpad"
 
-#: gtk/gtkcellrenderer.c:271
+#: ../gtk/gtkcellrenderer.c:319
 msgid "The xpad"
 msgstr "xpad"
 
-#: gtk/gtkcellrenderer.c:280
+#: ../gtk/gtkcellrenderer.c:328
 msgid "ypad"
 msgstr "ypad"
 
-#: gtk/gtkcellrenderer.c:281
+#: ../gtk/gtkcellrenderer.c:329
 msgid "The ypad"
 msgstr "ypad"
 
-#: gtk/gtkcellrenderer.c:290
+#: ../gtk/gtkcellrenderer.c:338
 msgid "width"
 msgstr "પહોળાઈ"
 
-#: gtk/gtkcellrenderer.c:291
+#: ../gtk/gtkcellrenderer.c:339
 msgid "The fixed width"
 msgstr "ચોક�કસ પહોળાઈ"
 
-#: gtk/gtkcellrenderer.c:300
+#: ../gtk/gtkcellrenderer.c:348
 msgid "height"
 msgstr "ઊંચાઈ"
 
-#: gtk/gtkcellrenderer.c:301
+#: ../gtk/gtkcellrenderer.c:349
 msgid "The fixed height"
 msgstr "ચોક�કસ ઊંચાઈ"
 
-#: gtk/gtkcellrenderer.c:310
+#: ../gtk/gtkcellrenderer.c:358
 msgid "Is Expander"
 msgstr "વધારનાર છે"
 
-#: gtk/gtkcellrenderer.c:311
+#: ../gtk/gtkcellrenderer.c:359
 msgid "Row has children"
 msgstr "હરોળને બાળક છે"
 
-#: gtk/gtkcellrenderer.c:319
+#: ../gtk/gtkcellrenderer.c:367
 msgid "Is Expanded"
 msgstr "વિસ�તારેલ�ં છે"
 
-#: gtk/gtkcellrenderer.c:320
+#: ../gtk/gtkcellrenderer.c:368
 msgid "Row is an expander row, and is expanded"
 msgstr "હરોળ � �ક ફેલાવનાર હરોળ છે અને તેને ફેલાવી દેવાઇ છે"
 
-#: gtk/gtkcellrenderer.c:327
+#: ../gtk/gtkcellrenderer.c:375
 msgid "Cell background color name"
 msgstr "કોષના પાશ�વ ભાગના રંગન� નામ"
 
-#: gtk/gtkcellrenderer.c:328
+#: ../gtk/gtkcellrenderer.c:376
 msgid "Cell background color as a string"
 msgstr "કોષના પાશ�વ ભાગનો રંગ શબ�દમાળા તરીકે"
 
-#: gtk/gtkcellrenderer.c:335
+#: ../gtk/gtkcellrenderer.c:383
 msgid "Cell background color"
 msgstr "કોષના પાશ�વ ભાગનો રંગ"
 
-#: gtk/gtkcellrenderer.c:336
+#: ../gtk/gtkcellrenderer.c:384
 msgid "Cell background color as a GdkColor"
 msgstr "કોષના પાશ�વ ભાગનો રંગ Gdk રંગ તરીકે"
 
-#: gtk/gtkcellrenderer.c:343
+#: ../gtk/gtkcellrenderer.c:397
+#, fuzzy
+#| msgid "Cell background color"
+msgid "Cell background RGBA color"
+msgstr "કોષના પાશ�વ ભાગનો રંગ"
+
+#: ../gtk/gtkcellrenderer.c:398
+#, fuzzy
+#| msgid "Cell background color as a GdkColor"
+msgid "Cell background color as a GdkRGBA"
+msgstr "કોષના પાશ�વ ભાગનો રંગ Gdk રંગ તરીકે"
+
+#: ../gtk/gtkcellrenderer.c:405
 msgid "Editing"
 msgstr "ફેરફાર કરી રહ�યા છે"
 
-#: gtk/gtkcellrenderer.c:344
+#: ../gtk/gtkcellrenderer.c:406
 msgid "Whether the cell renderer is currently in editing mode"
 msgstr "શ�ં રેન�ડર થયેલ ખાન�ં વર�તમાનમાં સંપાદન સ�થિતિમાં છે"
 
-#: gtk/gtkcellrenderer.c:352
+#: ../gtk/gtkcellrenderer.c:414
 msgid "Cell background set"
 msgstr "કોષનો પાશ�વ ભાગ સ�યોજિત છે"
 
-#: gtk/gtkcellrenderer.c:353
+#: ../gtk/gtkcellrenderer.c:415
 msgid "Whether this tag affects the cell background color"
 msgstr "શ�ં આ નિશાની કોષના પાશ�વ ભાગના રંગને અસર કરે છે"
 
-#: gtk/gtkcellrenderercombo.c:110
+#: ../gtk/gtkcellrenderercombo.c:130
 msgid "Model"
 msgstr "મોડેલ"
 
-#: gtk/gtkcellrenderercombo.c:111
+#: ../gtk/gtkcellrenderercombo.c:131
 msgid "The model containing the possible values for the combo box"
 msgstr "કમ�બો બોક�સ માટે શક�ય કિંમતો સમાવત�ં મોડેલ"
 
-#: gtk/gtkcellrenderercombo.c:133 gtk/gtkcomboboxentry.c:104
+#: ../gtk/gtkcellrenderercombo.c:153
 msgid "Text Column"
 msgstr "લખાણ સ�તંભ"
 
-#: gtk/gtkcellrenderercombo.c:134 gtk/gtkcomboboxentry.c:105
+#: ../gtk/gtkcellrenderercombo.c:154
 msgid "A column in the data source model to get the strings from"
 msgstr "માંથી શબ�દમાળા મેળવવા માટે માહિતી સ�રોતમાં સ�તંભ"
 
-#: gtk/gtkcellrenderercombo.c:151
+#: ../gtk/gtkcellrenderercombo.c:171 ../gtk/gtkcombobox.c:859
 msgid "Has Entry"
 msgstr "પાસે પ�રવેશ છે"
 
-#: gtk/gtkcellrenderercombo.c:152
+#: ../gtk/gtkcellrenderercombo.c:172
 msgid "If FALSE, don't allow to enter strings other than the chosen ones"
 msgstr "જો ખોટ�ં હોય, તો પસંદ થયેલની જગ�યા� શબ�દમાળાઓ દાખલ કરવા માટે પરવાનગી આપશો નહિં"
 
-#: gtk/gtkcellrendererpixbuf.c:120
+#: ../gtk/gtkcellrendererpixbuf.c:140
 msgid "Pixbuf Object"
 msgstr "pixbuf ઓબ�જેક�ટ"
 
-#: gtk/gtkcellrendererpixbuf.c:121
+#: ../gtk/gtkcellrendererpixbuf.c:141
 msgid "The pixbuf to render"
 msgstr "ઘાટ આપવા માટેન�ં pixbuf"
 
-#: gtk/gtkcellrendererpixbuf.c:128
+#: ../gtk/gtkcellrendererpixbuf.c:148
 msgid "Pixbuf Expander Open"
 msgstr "Pixbufને ફેલાવનાર ખ�લ�લ� છે"
 
-#: gtk/gtkcellrendererpixbuf.c:129
+#: ../gtk/gtkcellrendererpixbuf.c:149
 msgid "Pixbuf for open expander"
 msgstr "ખ�લ�લા ફેલાવનાર માટે Pixbuf"
 
-#: gtk/gtkcellrendererpixbuf.c:136
+#: ../gtk/gtkcellrendererpixbuf.c:156
 msgid "Pixbuf Expander Closed"
 msgstr "Pixbuf ફેલાવનાર બંધ છે"
 
-#: gtk/gtkcellrendererpixbuf.c:137
+#: ../gtk/gtkcellrendererpixbuf.c:157
 msgid "Pixbuf for closed expander"
 msgstr "બંધ કરાયેલા ફેલાવનાર માટેન�ં Pixbuf"
 
-#: gtk/gtkcellrendererpixbuf.c:144 gtk/gtkimage.c:244 gtk/gtkstatusicon.c:228
+#: ../gtk/gtkcellrendererpixbuf.c:164 ../gtk/gtkimage.c:254
+#: ../gtk/gtkstatusicon.c:251
 msgid "Stock ID"
 msgstr "સ�ટોક ID"
 
-#: gtk/gtkcellrendererpixbuf.c:145
+#: ../gtk/gtkcellrendererpixbuf.c:165
 msgid "The stock ID of the stock icon to render"
 msgstr "રેન�ડર કરવા માટે સ�ટોક ID ન�ં સ�ટોક ચિહ�ન"
 
-#: gtk/gtkcellrendererpixbuf.c:152 gtk/gtkcellrendererspinner.c:153
-#: gtk/gtkrecentmanager.c:305 gtk/gtkstatusicon.c:269
+#: ../gtk/gtkcellrendererpixbuf.c:172 ../gtk/gtkcellrendererspinner.c:151
+#: ../gtk/gtkrecentmanager.c:309 ../gtk/gtkstatusicon.c:292
 msgid "Size"
 msgstr "માપ"
 
-#: gtk/gtkcellrendererpixbuf.c:153
+#: ../gtk/gtkcellrendererpixbuf.c:173
 msgid "The GtkIconSize value that specifies the size of the rendered icon"
 msgstr "GtkIconSize કિંમત કે જે રેન�ડર થયેલ ચિહ�નન�ં માપ સ�પષ�ટ કરે છે"
 
-#: gtk/gtkcellrendererpixbuf.c:162
+#: ../gtk/gtkcellrendererpixbuf.c:182
 msgid "Detail"
 msgstr "વિગત"
 
-#: gtk/gtkcellrendererpixbuf.c:163
+#: ../gtk/gtkcellrendererpixbuf.c:183
 msgid "Render detail to pass to the theme engine"
 msgstr "થીમયંત�રને મોકલાયેલી ઘાટ આપવા માટેની વિગત મોકલવી"
 
-#: gtk/gtkcellrendererpixbuf.c:196
+#: ../gtk/gtkcellrendererpixbuf.c:216
 msgid "Follow State"
 msgstr "સ�થિતિ અન�સરો"
 
-#: gtk/gtkcellrendererpixbuf.c:197
+#: ../gtk/gtkcellrendererpixbuf.c:217
 msgid "Whether the rendered pixbuf should be colorized according to the state"
 msgstr "શ�ં રેન�ડર થયેલ pixbuf સ�થિતિ અન�સાર રંગ અપાયેલ હોવ�ં જોઈ�"
 
-#: gtk/gtkcellrendererpixbuf.c:214 gtk/gtkimage.c:319 gtk/gtkwindow.c:662
+#: ../gtk/gtkcellrendererpixbuf.c:234 ../gtk/gtkimage.c:329
+#: ../gtk/gtkwindow.c:703
 msgid "Icon"
 msgstr "ચિહ�ન"
 
-#: gtk/gtkcellrendererprogress.c:127
+#: ../gtk/gtkcellrendererprogress.c:139
 msgid "Value of the progress bar"
 msgstr "પ�રગતિદર�શક પટ�ટીની કિંમત"
 
-#: gtk/gtkcellrendererprogress.c:144 gtk/gtkcellrenderertext.c:231
-#: gtk/gtkentry.c:739 gtk/gtkentrybuffer.c:352 gtk/gtkmessagedialog.c:226
-#: gtk/gtkprogressbar.c:150 gtk/gtktextbuffer.c:210
+#: ../gtk/gtkcellrendererprogress.c:156 ../gtk/gtkcellrenderertext.c:254
+#: ../gtk/gtkentrybuffer.c:352 ../gtk/gtkentry.c:837
+#: ../gtk/gtkmessagedialog.c:229 ../gtk/gtkprogressbar.c:176
+#: ../gtk/gtktextbuffer.c:221
 msgid "Text"
 msgstr "લખાણ"
 
-#: gtk/gtkcellrendererprogress.c:145
+#: ../gtk/gtkcellrendererprogress.c:157
 msgid "Text on the progress bar"
 msgstr "પ�રગતિદર�શક પટ�ટી પરન�ં લખાણ"
 
-#: gtk/gtkcellrendererprogress.c:168 gtk/gtkcellrendererspinner.c:139
+#: ../gtk/gtkcellrendererprogress.c:180 ../gtk/gtkcellrendererspinner.c:137
 msgid "Pulse"
 msgstr "ધબકાર"
 
-#: gtk/gtkcellrendererprogress.c:169
+#: ../gtk/gtkcellrendererprogress.c:181
 msgid ""
 "Set this to positive values to indicate that some progress is made, but you "
 "don't know how much."
@@ -1385,244 +1629,272 @@ msgstr ""
 "કંઈક પ�રગતિ થઈ છે, પરંત� તમને ખબર નથી કે કેટલી, �મ સૂચવવા માટે આને ધન કિંમતોમાં સ�યોજિત "
 "કરો."
 
-#: gtk/gtkcellrendererprogress.c:185
+#: ../gtk/gtkcellrendererprogress.c:197
 msgid "Text x alignment"
 msgstr "લખાણને x દિશામાં કતારબંધ ગોઠવો"
 
-#: gtk/gtkcellrendererprogress.c:186
+#: ../gtk/gtkcellrendererprogress.c:198
 msgid ""
 "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
 msgstr "આડી લખાણ ગોઠવણ, 0 (ડાબે) થી 1 (જમણે). RTL દેખાવો માટે આરક�ષિત."
 
-#: gtk/gtkcellrendererprogress.c:202
+#: ../gtk/gtkcellrendererprogress.c:214
 msgid "Text y alignment"
 msgstr "લખાણને y દિશામાં કતારબંધ ગોઠવો"
 
-#: gtk/gtkcellrendererprogress.c:203
+#: ../gtk/gtkcellrendererprogress.c:215
 msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
 msgstr "ઊભી લખાણ ગોઠવણ, 0 (ટોચ) થી 1 (તળિયે)."
 
-#: gtk/gtkcellrendererprogress.c:214 gtk/gtkprogressbar.c:126
-#: gtk/gtkrange.c:427
+#: ../gtk/gtkcellrendererprogress.c:226 ../gtk/gtkprogressbar.c:152
+#: ../gtk/gtkrange.c:426
 msgid "Inverted"
 msgstr "ઉલટ� કરાયેલ�ં"
 
-#: gtk/gtkcellrendererprogress.c:215 gtk/gtkprogressbar.c:127
+#: ../gtk/gtkcellrendererprogress.c:227 ../gtk/gtkprogressbar.c:153
 #, fuzzy
 msgid "Invert the direction in which the progress bar grows"
 msgstr "પ�રગતિ દર�શક પટ�ટીની દિશા અને વિકાસ"
 
-#: gtk/gtkcellrendererspin.c:91 gtk/gtkrange.c:419 gtk/gtkscalebutton.c:239
-#: gtk/gtkspinbutton.c:228
+#: ../gtk/gtkcellrendererspin.c:113 ../gtk/gtkrange.c:418
+#: ../gtk/gtkscalebutton.c:237 ../gtk/gtkspinbutton.c:323
 msgid "Adjustment"
 msgstr "બંધ બેસત� કરો"
 
-#: gtk/gtkcellrendererspin.c:92 gtk/gtkspinbutton.c:229
+#: ../gtk/gtkcellrendererspin.c:114 ../gtk/gtkspinbutton.c:324
 #, fuzzy
 msgid "The adjustment that holds the value of the spin button"
 msgstr "� વ�યવસ�થિત ગોઠવણી કે જે સ�પીન બટનની કિંમતને પકડી રાખે છે"
 
-#: gtk/gtkcellrendererspin.c:107
+#: ../gtk/gtkcellrendererspin.c:129
 msgid "Climb rate"
 msgstr "વૃદ�ધિ દર"
 
-#: gtk/gtkcellrendererspin.c:108 gtk/gtkspinbutton.c:237
+#: ../gtk/gtkcellrendererspin.c:130 ../gtk/gtkspinbutton.c:332
 msgid "The acceleration rate when you hold down a button"
 msgstr "તમે જ�યારે બટનને પકડી રાખ�ય�ં હોય ત�યારે પ�રવેગનો દર"
 
-#: gtk/gtkcellrendererspin.c:121 gtk/gtkscale.c:244 gtk/gtkspinbutton.c:246
+#: ../gtk/gtkcellrendererspin.c:143 ../gtk/gtkscale.c:254
+#: ../gtk/gtkspinbutton.c:341
 msgid "Digits"
 msgstr "આંકડા"
 
-#: gtk/gtkcellrendererspin.c:122 gtk/gtkspinbutton.c:247
+#: ../gtk/gtkcellrendererspin.c:144 ../gtk/gtkspinbutton.c:342
 msgid "The number of decimal places to display"
 msgstr "દશાંશ પછી પ�રદર�શિત કરવા માટે આંકડાની સંખ�યા"
 
-#: gtk/gtkcellrendererspinner.c:119 gtk/gtkcheckmenuitem.c:105
-#: gtk/gtkmenu.c:525 gtk/gtkspinner.c:131 gtk/gtktoggleaction.c:133
-#: gtk/gtktogglebutton.c:115 gtk/gtktoggletoolbutton.c:112
+#: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkmenu.c:588 ../gtk/gtkspinner.c:115 ../gtk/gtkswitch.c:783
+#: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:178
+#: ../gtk/gtktoggletoolbutton.c:127
 msgid "Active"
 msgstr "કાર�યશીલ"
 
-#: gtk/gtkcellrendererspinner.c:120
+#: ../gtk/gtkcellrendererspinner.c:120
 #, fuzzy
 msgid "Whether the spinner is active (ie. shown) in the cell"
 msgstr "શ�ં પસંદિત ફોન�ટ શૈલી લેબલમાં બતાવાય છે"
 
-#: gtk/gtkcellrendererspinner.c:140
+#: ../gtk/gtkcellrendererspinner.c:138
 #, fuzzy
 msgid "Pulse of the spinner"
 msgstr "પ�રિન�ટરન�ં નામ"
 
-#: gtk/gtkcellrendererspinner.c:154
+#: ../gtk/gtkcellrendererspinner.c:152
 #, fuzzy
 msgid "The GtkIconSize value that specifies the size of the rendered spinner"
 msgstr "GtkIconSize કિંમત કે જે રેન�ડર થયેલ ચિહ�નન�ં માપ સ�પષ�ટ કરે છે"
 
-#: gtk/gtkcellrenderertext.c:232
+#: ../gtk/gtkcellrenderertext.c:255
 msgid "Text to render"
 msgstr "ઘાટ આપવા માટેન�ં લખાણ"
 
-#: gtk/gtkcellrenderertext.c:239
+#: ../gtk/gtkcellrenderertext.c:262
 msgid "Markup"
 msgstr "નિશાન કરવ�"
 
-#: gtk/gtkcellrenderertext.c:240
+#: ../gtk/gtkcellrenderertext.c:263
 msgid "Marked up text to render"
 msgstr "ઘાટ આપવા માટે નિશાનીત કરાયેલ� લેખન"
 
-#: gtk/gtkcellrenderertext.c:247 gtk/gtklabel.c:556
+#: ../gtk/gtkcellrenderertext.c:270 ../gtk/gtklabel.c:751
 msgid "Attributes"
 msgstr "લાક�ષણિકતાઓ"
 
-#: gtk/gtkcellrenderertext.c:248
+#: ../gtk/gtkcellrenderertext.c:271
 msgid "A list of style attributes to apply to the text of the renderer"
 msgstr "લેખનને ઘાટ આપનાર પર અમલમાં મ�કવા માટેની શૈલીની લાક�ષણિકતાઓની યાદી"
 
-#: gtk/gtkcellrenderertext.c:255
+#: ../gtk/gtkcellrenderertext.c:278
 msgid "Single Paragraph Mode"
 msgstr "�ક ફકરા સ�થિતિ"
 
-#: gtk/gtkcellrenderertext.c:256
+#: ../gtk/gtkcellrenderertext.c:279
 #, fuzzy
 msgid "Whether to keep all text in a single paragraph"
 msgstr "બધા લખાણને �ક જ ફકરામાં રાખવી કે નહિં"
 
-#: gtk/gtkcellrenderertext.c:264 gtk/gtkcellview.c:178 gtk/gtktexttag.c:178
+#: ../gtk/gtkcellrenderertext.c:287 ../gtk/gtkcellview.c:191
+#: ../gtk/gtktexttag.c:199
 msgid "Background color name"
 msgstr "પાશ�વ ભાગના રંગન� નામ"
 
-#: gtk/gtkcellrenderertext.c:265 gtk/gtkcellview.c:179 gtk/gtktexttag.c:179
+#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:192
+#: ../gtk/gtktexttag.c:200
 msgid "Background color as a string"
 msgstr "પાશ�વ ભાગના રંગને વાક�ય તરીકે"
 
-#: gtk/gtkcellrenderertext.c:272 gtk/gtkcellview.c:185 gtk/gtktexttag.c:186
+#: ../gtk/gtkcellrenderertext.c:295 ../gtk/gtkcellview.c:198
+#: ../gtk/gtktexttag.c:207
 msgid "Background color"
 msgstr "પાશ�વ ભાગનો રંગ"
 
-#: gtk/gtkcellrenderertext.c:273 gtk/gtkcellview.c:186
+#: ../gtk/gtkcellrenderertext.c:296 ../gtk/gtkcellview.c:199
+#: ../gtk/gtktexttag.c:208
 msgid "Background color as a GdkColor"
 msgstr "પાશ�વ ભાગનો રંગ GdkColor તરીકે"
 
-#: gtk/gtkcellrenderertext.c:280 gtk/gtktexttag.c:202
+#: ../gtk/gtkcellrenderertext.c:310
+#| msgid "Background color name"
+msgid "Background color as RGBA"
+msgstr "RGBA પ�રમાણે પાશ�વભાગ રંગ"
+
+#: ../gtk/gtkcellrenderertext.c:311 ../gtk/gtkcellview.c:213
+#: ../gtk/gtktexttag.c:223
+#| msgid "Background color as a GdkColor"
+msgid "Background color as a GdkRGBA"
+msgstr "GdkRGBA પ�રમાણે પાશ�ર�વભાગ રંગ"
+
+#: ../gtk/gtkcellrenderertext.c:317 ../gtk/gtktexttag.c:238
 msgid "Foreground color name"
 msgstr "અગ�ર ભાગના રંગન� નામ"
 
-#: gtk/gtkcellrenderertext.c:281 gtk/gtktexttag.c:203
+#: ../gtk/gtkcellrenderertext.c:318 ../gtk/gtktexttag.c:239
 msgid "Foreground color as a string"
 msgstr "અગ�ર ભાગના રંગને વાક�ય તરીકે"
 
-#: gtk/gtkcellrenderertext.c:288 gtk/gtktexttag.c:210
-#: gtk/gtktrayicon-x11.c:133
+#: ../gtk/gtkcellrenderertext.c:325 ../gtk/gtktexttag.c:246
+#: ../gtk/gtktrayicon-x11.c:137
 msgid "Foreground color"
 msgstr "અગ�ર ભાગનો રંગ"
 
-#: gtk/gtkcellrenderertext.c:289
+#: ../gtk/gtkcellrenderertext.c:326 ../gtk/gtktexttag.c:247
 msgid "Foreground color as a GdkColor"
 msgstr "અગ�ર ભાગનો રંગ GdkColor તરીકે"
 
-#: gtk/gtkcellrenderertext.c:297 gtk/gtkentry.c:663 gtk/gtktexttag.c:227
-#: gtk/gtktextview.c:668
+#: ../gtk/gtkcellrenderertext.c:340
+#| msgid "Foreground color name"
+msgid "Foreground color as RGBA"
+msgstr "RGBA પ�રમાણે અગ�રભાગ રંગ"
+
+#: ../gtk/gtkcellrenderertext.c:341 ../gtk/gtktexttag.c:262
+#, fuzzy
+#| msgid "Foreground color as a GdkColor"
+msgid "Foreground color as a GdkRGBA"
+msgstr "અગ�ર ભાગનો રંગ GdkColor તરીકે"
+
+#: ../gtk/gtkcellrenderertext.c:349 ../gtk/gtkentry.c:761
+#: ../gtk/gtktexttag.c:278 ../gtk/gtktextview.c:686
 msgid "Editable"
 msgstr "બદલી શકાય તેવ�"
 
-#: gtk/gtkcellrenderertext.c:298 gtk/gtktexttag.c:228 gtk/gtktextview.c:669
+#: ../gtk/gtkcellrenderertext.c:350 ../gtk/gtktexttag.c:279
+#: ../gtk/gtktextview.c:687
 msgid "Whether the text can be modified by the user"
 msgstr "શ�ં વપરાશકર�તા દ�વારા લખાણ બદલી શકાય છે"
 
-#: gtk/gtkcellrenderertext.c:305 gtk/gtkcellrenderertext.c:313
-#: gtk/gtktexttag.c:243 gtk/gtktexttag.c:251
+#: ../gtk/gtkcellrenderertext.c:357 ../gtk/gtkcellrenderertext.c:365
+#: ../gtk/gtktexttag.c:294 ../gtk/gtktexttag.c:302
 msgid "Font"
 msgstr "ફોન�ટ"
 
-#: gtk/gtkcellrenderertext.c:306 gtk/gtktexttag.c:244
+#: ../gtk/gtkcellrenderertext.c:358 ../gtk/gtktexttag.c:295
 msgid "Font description as a string, e.g. \"Sans Italic 12\""
 msgstr "ફોન�ટન� વર�ણન શબ�દમાળા તરીકે દા.ત. \"Sans Italic 12\""
 
-#: gtk/gtkcellrenderertext.c:314 gtk/gtktexttag.c:252
+#: ../gtk/gtkcellrenderertext.c:366 ../gtk/gtktexttag.c:303
 msgid "Font description as a PangoFontDescription struct"
 msgstr "ફોન�ટન� વર�ણન પેન�ગોફોન�ટના વર�ણનની સંરચના તરીકે"
 
-#: gtk/gtkcellrenderertext.c:322 gtk/gtktexttag.c:259
+#: ../gtk/gtkcellrenderertext.c:374 ../gtk/gtktexttag.c:310
 msgid "Font family"
 msgstr "ફોન�ટન� ક�ટ�ંબ"
 
-#: gtk/gtkcellrenderertext.c:323 gtk/gtktexttag.c:260
+#: ../gtk/gtkcellrenderertext.c:375 ../gtk/gtktexttag.c:311
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "ફોન�ટના ક�ટ�ંબન� નામ દા.ત. સાંસ, હેલવેટીકા, ટાઈમ�સ, મોનોસ�પેસ"
 
-#: gtk/gtkcellrenderertext.c:330 gtk/gtkcellrenderertext.c:331
-#: gtk/gtktexttag.c:267
+#: ../gtk/gtkcellrenderertext.c:382 ../gtk/gtkcellrenderertext.c:383
+#: ../gtk/gtktexttag.c:318
 msgid "Font style"
 msgstr "ફોન�ટ શૈલી"
 
-#: gtk/gtkcellrenderertext.c:339 gtk/gtkcellrenderertext.c:340
-#: gtk/gtktexttag.c:276
+#: ../gtk/gtkcellrenderertext.c:391 ../gtk/gtkcellrenderertext.c:392
+#: ../gtk/gtktexttag.c:327
 msgid "Font variant"
 msgstr "ફોન�ટ ચલ"
 
-#: gtk/gtkcellrenderertext.c:348 gtk/gtkcellrenderertext.c:349
-#: gtk/gtktexttag.c:285
+#: ../gtk/gtkcellrenderertext.c:400 ../gtk/gtkcellrenderertext.c:401
+#: ../gtk/gtktexttag.c:336
 msgid "Font weight"
 msgstr "ફોન�ટની જાડાઈ"
 
-#: gtk/gtkcellrenderertext.c:358 gtk/gtkcellrenderertext.c:359
-#: gtk/gtktexttag.c:296
+#: ../gtk/gtkcellrenderertext.c:410 ../gtk/gtkcellrenderertext.c:411
+#: ../gtk/gtktexttag.c:347
 msgid "Font stretch"
 msgstr "ફોન�ટન�ં ખેંચાણ"
 
-#: gtk/gtkcellrenderertext.c:367 gtk/gtkcellrenderertext.c:368
-#: gtk/gtktexttag.c:305
+#: ../gtk/gtkcellrenderertext.c:419 ../gtk/gtkcellrenderertext.c:420
+#: ../gtk/gtktexttag.c:356
 msgid "Font size"
 msgstr "ફોન�ટન�ં માપ"
 
-#: gtk/gtkcellrenderertext.c:377 gtk/gtktexttag.c:325
+#: ../gtk/gtkcellrenderertext.c:429 ../gtk/gtktexttag.c:376
 msgid "Font points"
 msgstr "ફોન�ટના બિંદ�ઓ"
 
-#: gtk/gtkcellrenderertext.c:378 gtk/gtktexttag.c:326
+#: ../gtk/gtkcellrenderertext.c:430 ../gtk/gtktexttag.c:377
 msgid "Font size in points"
 msgstr "બિંદ�ઓમાં ફોન�ટન�ં માપ"
 
-#: gtk/gtkcellrenderertext.c:387 gtk/gtktexttag.c:315
+#: ../gtk/gtkcellrenderertext.c:439 ../gtk/gtktexttag.c:366
 msgid "Font scale"
 msgstr "ફોન�ટન� માપદંડ"
 
-#: gtk/gtkcellrenderertext.c:388
+#: ../gtk/gtkcellrenderertext.c:440
 msgid "Font scaling factor"
 msgstr "ફોન�ટના માપદંડ માટેન� પરિમાણ"
 
-#: gtk/gtkcellrenderertext.c:397 gtk/gtktexttag.c:394
+#: ../gtk/gtkcellrenderertext.c:449 ../gtk/gtktexttag.c:445
 msgid "Rise"
 msgstr "ઉગવ�"
 
-#: gtk/gtkcellrenderertext.c:398
-msgid ""
-"Offset of text above the baseline (below the baseline if rise is negative)"
+#: ../gtk/gtkcellrenderertext.c:450
+msgid "Offset of text above the baseline (below the baseline if rise is negative)"
 msgstr "આધારભૂત લાઈનથી લખાણની દૂરી(જો દૂરી નકારાત�મક હોય તો આધારભૂત લાઈનની નીચે)"
 
-#: gtk/gtkcellrenderertext.c:409 gtk/gtktexttag.c:434
+#: ../gtk/gtkcellrenderertext.c:461 ../gtk/gtktexttag.c:485
 msgid "Strikethrough"
 msgstr "છેંકી નાખો"
 
-#: gtk/gtkcellrenderertext.c:410 gtk/gtktexttag.c:435
+#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:486
 msgid "Whether to strike through the text"
 msgstr "શ�ં તમારા લખાણને છેંકી નાખવ� છે"
 
-#: gtk/gtkcellrenderertext.c:417 gtk/gtktexttag.c:442
+#: ../gtk/gtkcellrenderertext.c:469 ../gtk/gtktexttag.c:493
 msgid "Underline"
 msgstr "નીચે લીટી કરો"
 
-#: gtk/gtkcellrenderertext.c:418 gtk/gtktexttag.c:443
+#: ../gtk/gtkcellrenderertext.c:470 ../gtk/gtktexttag.c:494
 msgid "Style of underline for this text"
 msgstr "આ લેખન માટે નીચે લીટી કરવાની રીત"
 
-#: gtk/gtkcellrenderertext.c:426 gtk/gtktexttag.c:354
+#: ../gtk/gtkcellrenderertext.c:478 ../gtk/gtktexttag.c:405
 msgid "Language"
 msgstr "ભાષા"
 
-#: gtk/gtkcellrenderertext.c:427
+#: ../gtk/gtkcellrenderertext.c:479
 msgid ""
 "The language this text is in, as an ISO code. Pango can use this as a hint "
 "when rendering the text. If you don't understand this parameter, you "
@@ -1631,11 +1903,12 @@ msgstr ""
 "આ લખાણ જે ભાષામાં છે, ISO ના કોડ તરીકે. પેન�ગો લખાણને ઘાટ આપતી વખતેતેનો ઉપયોગ સંકેત "
 "તરીકે કરી શકે છે. જો તમે આ પરિમાણને સમજી ના શકો, તો કઈ નહિતમારે તેની જર�ર નહિ પડે"
 
-#: gtk/gtkcellrenderertext.c:447 gtk/gtklabel.c:681 gtk/gtkprogressbar.c:180
+#: ../gtk/gtkcellrenderertext.c:499 ../gtk/gtklabel.c:876
+#: ../gtk/gtkprogressbar.c:220
 msgid "Ellipsize"
 msgstr "�લીપ�સાઈ�"
 
-#: gtk/gtkcellrenderertext.c:448
+#: ../gtk/gtkcellrenderertext.c:500
 msgid ""
 "The preferred place to ellipsize the string, if the cell renderer does not "
 "have enough room to display the entire string"
@@ -1643,29 +1916,29 @@ msgstr ""
 "શબ�દમાળા ઈલીપ�સાઈ� કરવા માટેન�ં પ�રાધાન�યવાળ�ં સ�થાન, જો ખાન�ં રેન�ડર કરનાર પાસે પૂરતી "
 "શબ�દમાળા દર�શાવવા માટે પૂરતી જગ�યા નહિં હોય"
 
-#: gtk/gtkcellrenderertext.c:467 gtk/gtkfilechooserbutton.c:413
-#: gtk/gtklabel.c:702
+#: ../gtk/gtkcellrenderertext.c:519 ../gtk/gtkfilechooserbutton.c:454
+#: ../gtk/gtklabel.c:897
 msgid "Width In Characters"
 msgstr "અક�ષરોમાં પહોળાઈ"
 
-#: gtk/gtkcellrenderertext.c:468 gtk/gtklabel.c:703
+#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtklabel.c:898
 msgid "The desired width of the label, in characters"
 msgstr "લેબલની જરૂરી પહોળાઈ, અક�ષરોમાં"
 
-#: gtk/gtkcellrenderertext.c:492 gtk/gtklabel.c:763
+#: ../gtk/gtkcellrenderertext.c:544 ../gtk/gtklabel.c:958
 msgid "Maximum Width In Characters"
 msgstr "મહત�તમ પહોળાઈ અક�ષરોમાં"
 
-#: gtk/gtkcellrenderertext.c:493
+#: ../gtk/gtkcellrenderertext.c:545
 #, fuzzy
 msgid "The maximum width of the cell, in characters"
 msgstr "લેબલની જરૂરી મહત�તમ પહોળાઈ, અક�ષરોમાં"
 
-#: gtk/gtkcellrenderertext.c:511 gtk/gtktexttag.c:451
+#: ../gtk/gtkcellrenderertext.c:563 ../gtk/gtktexttag.c:502
 msgid "Wrap mode"
 msgstr "લપેટવાની સ�થિતિ"
 
-#: gtk/gtkcellrenderertext.c:512
+#: ../gtk/gtkcellrenderertext.c:564
 msgid ""
 "How to break the string into multiple lines, if the cell renderer does not "
 "have enough room to display the entire string"
@@ -1673,659 +1946,784 @@ msgstr ""
 "કેવી રીતે શબ�દમાળાને ઘણી લીટીઓમાં તોડવી, જો કોષ રેન�ડર કરનાર પાસે વર�તમાન શબ�દમાળા "
 "દર�શાવવા માટે પૂરતી જગ�યા નહિં હોય"
 
-#: gtk/gtkcellrenderertext.c:531 gtk/gtkcombobox.c:700
+#: ../gtk/gtkcellrenderertext.c:583 ../gtk/gtkcombobox.c:681
 msgid "Wrap width"
 msgstr "પહોળાઈ લપેટો"
 
-#: gtk/gtkcellrenderertext.c:532
+#: ../gtk/gtkcellrenderertext.c:584
 msgid "The width at which the text is wrapped"
 msgstr "પહોળાઈ કે જે માપમાં લખાણ લપેટાય છે"
 
-#: gtk/gtkcellrenderertext.c:552 gtk/gtktreeviewcolumn.c:301
+#: ../gtk/gtkcellrenderertext.c:604 ../gtk/gtktreeviewcolumn.c:364
 msgid "Alignment"
 msgstr "કતારબંધ ગોઠવણી"
 
-#: gtk/gtkcellrenderertext.c:553
+#: ../gtk/gtkcellrenderertext.c:605
 msgid "How to align the lines"
 msgstr "લીટીઓ કેવી રીતે ગોઠવવી"
 
-#: gtk/gtkcellrenderertext.c:565 gtk/gtkcellview.c:208 gtk/gtktexttag.c:540
+#: ../gtk/gtkcellrenderertext.c:617 ../gtk/gtkcellview.c:317
+#: ../gtk/gtktexttag.c:605
 msgid "Background set"
 msgstr "પાશ�વ ભાગ સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:566 gtk/gtkcellview.c:209 gtk/gtktexttag.c:541
+#: ../gtk/gtkcellrenderertext.c:618 ../gtk/gtkcellview.c:318
+#: ../gtk/gtktexttag.c:606
 msgid "Whether this tag affects the background color"
 msgstr "શ�ં આ નિશાની પાશ�વ ભાગના રંગને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:569 gtk/gtktexttag.c:548
+#: ../gtk/gtkcellrenderertext.c:621 ../gtk/gtktexttag.c:613
 msgid "Foreground set"
 msgstr "અગ�ર ભાગને સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:570 gtk/gtktexttag.c:549
+#: ../gtk/gtkcellrenderertext.c:622 ../gtk/gtktexttag.c:614
 msgid "Whether this tag affects the foreground color"
 msgstr "શ�ં આ નિશાની અગ�ર ભાગને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:573 gtk/gtktexttag.c:552
+#: ../gtk/gtkcellrenderertext.c:625 ../gtk/gtktexttag.c:617
 msgid "Editability set"
 msgstr "ફેરફાર કરી શકાય તેવી ગોઠવણ છે"
 
-#: gtk/gtkcellrenderertext.c:574 gtk/gtktexttag.c:553
+#: ../gtk/gtkcellrenderertext.c:626 ../gtk/gtktexttag.c:618
 msgid "Whether this tag affects text editability"
 msgstr "શ�ં આ નિશાની લેખનમાં ફેરફાર કરવાની ક�ષમતા પર અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:577 gtk/gtktexttag.c:556
+#: ../gtk/gtkcellrenderertext.c:629 ../gtk/gtktexttag.c:621
 msgid "Font family set"
 msgstr "ફોન�ટના ક�ટ�ંબને સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:578 gtk/gtktexttag.c:557
+#: ../gtk/gtkcellrenderertext.c:630 ../gtk/gtktexttag.c:622
 msgid "Whether this tag affects the font family"
 msgstr "શ�ં આ નિશાની ફોન�ટના ક�ટ�ંબને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:581 gtk/gtktexttag.c:560
+#: ../gtk/gtkcellrenderertext.c:633 ../gtk/gtktexttag.c:625
 msgid "Font style set"
 msgstr "ફોન�ટની શૈલી સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:582 gtk/gtktexttag.c:561
+#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtktexttag.c:626
 msgid "Whether this tag affects the font style"
 msgstr "શ�ં આ નિશાની ફોન�ટની રીતને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:585 gtk/gtktexttag.c:564
+#: ../gtk/gtkcellrenderertext.c:637 ../gtk/gtktexttag.c:629
 msgid "Font variant set"
 msgstr "ફોન�ટ ચલ સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:586 gtk/gtktexttag.c:565
+#: ../gtk/gtkcellrenderertext.c:638 ../gtk/gtktexttag.c:630
 msgid "Whether this tag affects the font variant"
 msgstr "શ�ં આ નિશાની ફોન�ટના ચલને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:589 gtk/gtktexttag.c:568
+#: ../gtk/gtkcellrenderertext.c:641 ../gtk/gtktexttag.c:633
 msgid "Font weight set"
 msgstr "ફોન�ટની જાડાઈનો સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:590 gtk/gtktexttag.c:569
+#: ../gtk/gtkcellrenderertext.c:642 ../gtk/gtktexttag.c:634
 msgid "Whether this tag affects the font weight"
 msgstr "શ�ં આ નિશાની ફોન�ટની જાડાઈને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:593 gtk/gtktexttag.c:572
+#: ../gtk/gtkcellrenderertext.c:645 ../gtk/gtktexttag.c:637
 msgid "Font stretch set"
 msgstr "ફોન�ટને ખેંચો વિકલ�પ સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:594 gtk/gtktexttag.c:573
+#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtktexttag.c:638
 msgid "Whether this tag affects the font stretch"
 msgstr "શ�ં આ નિશાની ફોન�ટના ખેંચાણને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:597 gtk/gtktexttag.c:576
+#: ../gtk/gtkcellrenderertext.c:649 ../gtk/gtktexttag.c:641
 msgid "Font size set"
 msgstr "ફોન�ટના માપનો વિકલ�પ સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:598 gtk/gtktexttag.c:577
+#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:642
 msgid "Whether this tag affects the font size"
 msgstr "શ�ં આ નિશાની ફોન�ટના માપને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:601 gtk/gtktexttag.c:580
+#: ../gtk/gtkcellrenderertext.c:653 ../gtk/gtktexttag.c:645
 msgid "Font scale set"
 msgstr "ફોન�ટના માપદંડનો વિકલ�પ સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:602 gtk/gtktexttag.c:581
+#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:646
 msgid "Whether this tag scales the font size by a factor"
 msgstr "શ�ં આ નિશાની ફોન�ટન�ં માપ કોઈ પ�રમાણ વડે બદલે છે"
 
-#: gtk/gtkcellrenderertext.c:605 gtk/gtktexttag.c:600
+#: ../gtk/gtkcellrenderertext.c:657 ../gtk/gtktexttag.c:665
 msgid "Rise set"
 msgstr "રાઇ� વિકલ�પ સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:606 gtk/gtktexttag.c:601
+#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:666
 msgid "Whether this tag affects the rise"
 msgstr "શ�ં આ નિશાની રાઇ�ને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:609 gtk/gtktexttag.c:616
+#: ../gtk/gtkcellrenderertext.c:661 ../gtk/gtktexttag.c:681
 msgid "Strikethrough set"
 msgstr "છેંકી નાખવાનો વિકલ�પ સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:610 gtk/gtktexttag.c:617
+#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:682
 msgid "Whether this tag affects strikethrough"
 msgstr "શ�ં આ નિશાની છેંકી નાખવાના વિકલ�પને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:613 gtk/gtktexttag.c:624
+#: ../gtk/gtkcellrenderertext.c:665 ../gtk/gtktexttag.c:689
 msgid "Underline set"
 msgstr "નીચેલીટી કરવાનો વિકલ�પ સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:614 gtk/gtktexttag.c:625
+#: ../gtk/gtkcellrenderertext.c:666 ../gtk/gtktexttag.c:690
 msgid "Whether this tag affects underlining"
 msgstr "શ�ં આ નિશાની નીચેલીટી કરવાના વિકલ�પને અસર કરે છે"
 
-#: gtk/gtkcellrenderertext.c:617 gtk/gtktexttag.c:588
+#: ../gtk/gtkcellrenderertext.c:669 ../gtk/gtktexttag.c:653
 msgid "Language set"
 msgstr "ભાષા સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:618 gtk/gtktexttag.c:589
+#: ../gtk/gtkcellrenderertext.c:670 ../gtk/gtktexttag.c:654
 msgid "Whether this tag affects the language the text is rendered as"
 msgstr "શ�ં આ નિશાની � ભાષાને અસર કરે છે જેમા લખાણને ઘાટ આપાય� છે"
 
-#: gtk/gtkcellrenderertext.c:621
+#: ../gtk/gtkcellrenderertext.c:673
 msgid "Ellipsize set"
 msgstr "�લીપ�સાઈ� સ�યોજિત છે"
 
-#: gtk/gtkcellrenderertext.c:622
+#: ../gtk/gtkcellrenderertext.c:674
 msgid "Whether this tag affects the ellipsize mode"
 msgstr "શ�ં આ ટેગ �લીપ�સાઈ� સ�થિતિને અસ કરે છે"
 
-#: gtk/gtkcellrenderertext.c:625
+#: ../gtk/gtkcellrenderertext.c:677
 msgid "Align set"
 msgstr "કતારબંધ ગોઠવણી"
 
-#: gtk/gtkcellrenderertext.c:626
+#: ../gtk/gtkcellrenderertext.c:678
 msgid "Whether this tag affects the alignment mode"
 msgstr "શ�ં આ ટેગ ગોઠવણ સ�થિતિને અસર કરે છે"
 
-#: gtk/gtkcellrenderertoggle.c:128
+#: ../gtk/gtkcellrenderertoggle.c:140
 msgid "Toggle state"
 msgstr "ફેરબદલ સ�થિતિ"
 
-#: gtk/gtkcellrenderertoggle.c:129
+#: ../gtk/gtkcellrenderertoggle.c:141
 msgid "The toggle state of the button"
 msgstr "બટનની ફેરબદલની સ�થિતિ"
 
-#: gtk/gtkcellrenderertoggle.c:136
+#: ../gtk/gtkcellrenderertoggle.c:148
 msgid "Inconsistent state"
 msgstr "અસંગત સ�થિતિ"
 
-#: gtk/gtkcellrenderertoggle.c:137
+#: ../gtk/gtkcellrenderertoggle.c:149
 msgid "The inconsistent state of the button"
 msgstr "બટનની અસંગત સ�થિતિ"
 
-#: gtk/gtkcellrenderertoggle.c:144
+#: ../gtk/gtkcellrenderertoggle.c:156
 msgid "Activatable"
 msgstr "કાર�યશીલ કરી શકાય તેવ�"
 
-#: gtk/gtkcellrenderertoggle.c:145
+#: ../gtk/gtkcellrenderertoggle.c:157
 msgid "The toggle button can be activated"
 msgstr "ફેરબદલી માટેન�ં બટન કાર�યશીલ કરી શકાય છે"
 
-#: gtk/gtkcellrenderertoggle.c:152
+#: ../gtk/gtkcellrenderertoggle.c:164
 msgid "Radio state"
 msgstr "રેડિયો સ�થિતિ"
 
-#: gtk/gtkcellrenderertoggle.c:153
+#: ../gtk/gtkcellrenderertoggle.c:165
 msgid "Draw the toggle button as a radio button"
 msgstr "ફેરબદલી માટેન�ં બટનને રેડિયો બટન તરીકે દોરો"
 
-#: gtk/gtkcellrenderertoggle.c:160
+#: ../gtk/gtkcellrenderertoggle.c:172
 msgid "Indicator size"
 msgstr "સૂચક માપ"
 
-#: gtk/gtkcellrenderertoggle.c:161 gtk/gtkcheckbutton.c:72
-#: gtk/gtkcheckmenuitem.c:129
+#: ../gtk/gtkcellrenderertoggle.c:173 ../gtk/gtkcheckbutton.c:95
+#: ../gtk/gtkcheckmenuitem.c:146
 msgid "Size of check or radio indicator"
 msgstr "ચેક અથવા રેડિયો માટેના સૂચકન�ં માપ"
 
-#: gtk/gtkcellview.c:200
+#: ../gtk/gtkcellview.c:212
+#, fuzzy
+#| msgid "Background color"
+msgid "Background RGBA color"
+msgstr "પાશ�વ ભાગનો રંગ"
+
+#: ../gtk/gtkcellview.c:227
 msgid "CellView model"
 msgstr "CellView મોડલ"
 
-#: gtk/gtkcellview.c:201
+#: ../gtk/gtkcellview.c:228
 msgid "The model for cell view"
 msgstr "ખાનાં દેખાવ માટેન�ં મોડેલ"
 
-#: gtk/gtkcheckbutton.c:71 gtk/gtkcheckmenuitem.c:128
+#: ../gtk/gtkcellview.c:246 ../gtk/gtkcombobox.c:945
+#: ../gtk/gtkentrycompletion.c:448 ../gtk/gtkiconview.c:768
+#: ../gtk/gtktreemenu.c:329 ../gtk/gtktreeviewcolumn.c:427
+msgid "Cell Area"
+msgstr ""
+
+#: ../gtk/gtkcellview.c:247 ../gtk/gtkcombobox.c:946
+#: ../gtk/gtkentrycompletion.c:449 ../gtk/gtkiconview.c:769
+#: ../gtk/gtktreemenu.c:330 ../gtk/gtktreeviewcolumn.c:428
+msgid "The GtkCellArea used to layout cells"
+msgstr ""
+
+#: ../gtk/gtkcellview.c:270
+msgid "Cell Area Context"
+msgstr ""
+
+#: ../gtk/gtkcellview.c:271
+msgid "The GtkCellAreaContext used to compute the geometry of the cell view"
+msgstr ""
+
+#: ../gtk/gtkcellview.c:288
+#, fuzzy
+#| msgid "Sensitive"
+msgid "Draw Sensitive"
+msgstr "સંવેદનશીલ"
+
+#: ../gtk/gtkcellview.c:289
+#, fuzzy
+#| msgid "Whether tree lines should be drawn in the tree view"
+msgid "Whether to force cells to be drawn in a sensitive state"
+msgstr "શ�ં વૃક�ષ લીટીઓ વૃક�ષ દેખાવમાં દોરાયેલ હોવી જોઈ�"
+
+#: ../gtk/gtkcellview.c:307
+#, fuzzy
+#| msgid "Model"
+msgid "Fit Model"
+msgstr "મોડેલ"
+
+#: ../gtk/gtkcellview.c:308
+msgid "Whether to request enough space for every row in the model"
+msgstr ""
+
+#: ../gtk/gtkcheckbutton.c:94 ../gtk/gtkcheckmenuitem.c:145
 msgid "Indicator Size"
 msgstr "સૂચકન� માપ"
 
-#: gtk/gtkcheckbutton.c:79 gtk/gtkexpander.c:267
+#: ../gtk/gtkcheckbutton.c:102 ../gtk/gtkexpander.c:364
 msgid "Indicator Spacing"
 msgstr "સૂચક માટેની જગ�યા"
 
-#: gtk/gtkcheckbutton.c:80
+#: ../gtk/gtkcheckbutton.c:103
 msgid "Spacing around check or radio indicator"
 msgstr "ચેક અથવા રેડિયો સૂચકની આસપાસની જગ�યા"
 
-#: gtk/gtkcheckmenuitem.c:106
+#: ../gtk/gtkcheckmenuitem.c:123
 msgid "Whether the menu item is checked"
 msgstr "શ�ં મેન�ની વસ�ત�ઓ ચકાસાયેલી છે"
 
-#: gtk/gtkcheckmenuitem.c:113 gtk/gtktogglebutton.c:123
+#: ../gtk/gtkcheckmenuitem.c:130 ../gtk/gtktogglebutton.c:186
 msgid "Inconsistent"
 msgstr "અસંગત"
 
-#: gtk/gtkcheckmenuitem.c:114
+#: ../gtk/gtkcheckmenuitem.c:131
 msgid "Whether to display an \"inconsistent\" state"
 msgstr "શ�ં \"અસંગત\" સ�થિતિ દર�શાવી"
 
-#: gtk/gtkcheckmenuitem.c:121
+#: ../gtk/gtkcheckmenuitem.c:138
 msgid "Draw as radio menu item"
 msgstr "રેડિયો મેન� વસ�ત� તરીકે દોરો"
 
-#: gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkcheckmenuitem.c:139
 msgid "Whether the menu item looks like a radio menu item"
 msgstr "શ�ં મેન�ની વસ�ત�ઓ તેની રેડિયો મેન� વસ�ત� ચકાસાયેલી છે �મ દેખાય છે"
 
-#: gtk/gtkcolorbutton.c:159
+#: ../gtk/gtkcolorbutton.c:170
 msgid "Use alpha"
 msgstr "આલ�ફા વાપરો"
 
-#: gtk/gtkcolorbutton.c:160
+#: ../gtk/gtkcolorbutton.c:171
 #, fuzzy
 msgid "Whether to give the color an alpha value"
 msgstr "શ�ં રંગને આલ�ફા કિંમત આપવી કે નહિં"
 
-#: gtk/gtkcolorbutton.c:174 gtk/gtkfilechooserbutton.c:399
-#: gtk/gtkfontbutton.c:140 gtk/gtkprintjob.c:115 gtk/gtkstatusicon.c:415
-#: gtk/gtktreeviewcolumn.c:268
+#: ../gtk/gtkcolorbutton.c:185 ../gtk/gtkfilechooserbutton.c:440
+#: ../gtk/gtkfontbutton.c:150 ../gtk/gtkprintjob.c:141
+#: ../gtk/gtkstatusicon.c:438 ../gtk/gtktreeviewcolumn.c:331
 msgid "Title"
 msgstr "શીર�ષક"
 
-#: gtk/gtkcolorbutton.c:175
+#: ../gtk/gtkcolorbutton.c:186
 msgid "The title of the color selection dialog"
 msgstr "રંગ પસંદગી સંવાદન�ં શીર�ષક"
 
-#: gtk/gtkcolorbutton.c:189 gtk/gtkcolorsel.c:323
+#: ../gtk/gtkcolorbutton.c:200 ../gtk/gtkcolorsel.c:336
 msgid "Current Color"
 msgstr "વર�તમાન રંગ"
 
-#: gtk/gtkcolorbutton.c:190
+#: ../gtk/gtkcolorbutton.c:201
 msgid "The selected color"
 msgstr "પસંદિત રંગ"
 
-#: gtk/gtkcolorbutton.c:204 gtk/gtkcolorsel.c:330
+#: ../gtk/gtkcolorbutton.c:215 ../gtk/gtkcolorsel.c:343
 msgid "Current Alpha"
 msgstr "વર�તમાન આલ�ફા"
 
-#: gtk/gtkcolorbutton.c:205
+#: ../gtk/gtkcolorbutton.c:216
 msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr "વર�તમાન અપારદર�શકતાન�ં કિંમત (૦ આખ�ં પારદર�શક, ૬૫૫૩૫ આખ�ં અપારદર�શક)"
 
-#: gtk/gtkcolorsel.c:309
+#: ../gtk/gtkcolorbutton.c:230
+#| msgid "Current Color"
+msgid "Current RGBA Color"
+msgstr "વર�તમાન RGBA રંગ"
+
+#: ../gtk/gtkcolorbutton.c:231
+#| msgid "The selected color"
+msgid "The selected RGBA color"
+msgstr "પસંદિત RGBA રંગ"
+
+#: ../gtk/gtkcolorsel.c:322
 msgid "Has Opacity Control"
 msgstr "અપારદર�શકતા માટેન� નિયંત�રણ ધરાવે છે"
 
-#: gtk/gtkcolorsel.c:310
+#: ../gtk/gtkcolorsel.c:323
 msgid "Whether the color selector should allow setting opacity"
 msgstr "શ�ં પસંદ કરનારે રંગ અપારદર�શકતાની ગોઠવણી માટે પરવાનગી આપવી જોઇ� છે"
 
-#: gtk/gtkcolorsel.c:316
+#: ../gtk/gtkcolorsel.c:329
 msgid "Has palette"
 msgstr "પેલેટ છે"
 
-#: gtk/gtkcolorsel.c:317
+#: ../gtk/gtkcolorsel.c:330
 msgid "Whether a palette should be used"
 msgstr "શ�ં પેલેટનો ઉપયોગ કરવો જોઈ�"
 
-#: gtk/gtkcolorsel.c:324
+#: ../gtk/gtkcolorsel.c:337
 msgid "The current color"
 msgstr "વર�તમાન રંગ"
 
-#: gtk/gtkcolorsel.c:331
+#: ../gtk/gtkcolorsel.c:344
 msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr "વર�તમાન અપારદર�શકતાન�ં કિંમત (૦ આખ�ં પારદર�શક, ૬૫૫૩૫ આખ�ં અપારદર�શક)"
 
-#: gtk/gtkcolorsel.c:345
-msgid "Custom palette"
-msgstr "વૈવિધ�યપૂર�ણ પેલેટ"
+#: ../gtk/gtkcolorsel.c:358
+#| msgid "Current Alpha"
+msgid "Current RGBA"
+msgstr "વર�તમાન RGBA"
 
-#: gtk/gtkcolorsel.c:346
-msgid "Palette to use in the color selector"
-msgstr "રંગની પસંદગીમાં પેલેટનો ઉપયોગ કરવો"
+#: ../gtk/gtkcolorsel.c:359
+#| msgid "The current color"
+msgid "The current RGBA color"
+msgstr "વર�તમાન RGBA રંગ"
 
-#: gtk/gtkcolorseldialog.c:110
+#: ../gtk/gtkcolorseldialog.c:136
 msgid "Color Selection"
 msgstr "રંગ પસંદગી"
 
-#: gtk/gtkcolorseldialog.c:111
+#: ../gtk/gtkcolorseldialog.c:137
 msgid "The color selection embedded in the dialog."
 msgstr "સંવાદમાં �મ�બેડેડ થયેલ રંગ પસંદગી."
 
-#: gtk/gtkcolorseldialog.c:117
+#: ../gtk/gtkcolorseldialog.c:143
 msgid "OK Button"
 msgstr "બરાબર બટન"
 
-#: gtk/gtkcolorseldialog.c:118
+#: ../gtk/gtkcolorseldialog.c:144
 msgid "The OK button of the dialog."
 msgstr "સંવાદન�ં બરાબર બટન."
 
-#: gtk/gtkcolorseldialog.c:124
+#: ../gtk/gtkcolorseldialog.c:150
 msgid "Cancel Button"
 msgstr "બટન ને રદ કરો"
 
-#: gtk/gtkcolorseldialog.c:125
+#: ../gtk/gtkcolorseldialog.c:151
 msgid "The cancel button of the dialog."
 msgstr "સંવાદન�ં રદ કરો બટન."
 
-#: gtk/gtkcolorseldialog.c:131
+#: ../gtk/gtkcolorseldialog.c:157
 msgid "Help Button"
 msgstr "મદદ બટન"
 
-#: gtk/gtkcolorseldialog.c:132
+#: ../gtk/gtkcolorseldialog.c:158
 msgid "The help button of the dialog."
 msgstr "સંવાદન�ં મદદ બટન."
 
-#: gtk/gtkcombobox.c:683
+#: ../gtk/gtkcombobox.c:664
 msgid "ComboBox model"
 msgstr "ComboBox મોડેલ"
 
-#: gtk/gtkcombobox.c:684
+#: ../gtk/gtkcombobox.c:665
 msgid "The model for the combo box"
 msgstr "કમ�બો બોક�સ માટે મોડેલ"
 
-#: gtk/gtkcombobox.c:701
+#: ../gtk/gtkcombobox.c:682
 msgid "Wrap width for laying out the items in a grid"
 msgstr "જાળીમાં વસ�ત�ઓ ગોઠવવા માટે લપેટવાની પહોળાઈ"
 
-#: gtk/gtkcombobox.c:723
+#: ../gtk/gtkcombobox.c:704 ../gtk/gtktreemenu.c:383
 msgid "Row span column"
 msgstr "હરોળ વચ�ચેની જગ�યા"
 
-#: gtk/gtkcombobox.c:724
+#: ../gtk/gtkcombobox.c:705 ../gtk/gtktreemenu.c:384
 msgid "TreeModel column containing the row span values"
 msgstr "હરોળ વિસ�તારક કિંમતો સમાવતો TreeModel સ�તંભ"
 
-#: gtk/gtkcombobox.c:745
+#: ../gtk/gtkcombobox.c:726 ../gtk/gtktreemenu.c:404
 msgid "Column span column"
 msgstr "સ�તંભ વચ�ચેની જગ�યા"
 
-#: gtk/gtkcombobox.c:746
+#: ../gtk/gtkcombobox.c:727 ../gtk/gtktreemenu.c:405
 msgid "TreeModel column containing the column span values"
 msgstr "સ�તંભ વિસ�તારતી કિંમતો સમાવતી TreeModel સ�તંભ"
 
-#: gtk/gtkcombobox.c:767
+#: ../gtk/gtkcombobox.c:748
 msgid "Active item"
 msgstr "ક�રિયાશીલ વસ�ત�"
 
-#: gtk/gtkcombobox.c:768
+#: ../gtk/gtkcombobox.c:749
 msgid "The item which is currently active"
 msgstr "વસ�ત� કે જે વર�તમાનમાં ક�રિયાશીલ છે"
 
-#: gtk/gtkcombobox.c:787 gtk/gtkuimanager.c:224
+#: ../gtk/gtkcombobox.c:768 ../gtk/gtkuimanager.c:479
 msgid "Add tearoffs to menus"
 msgstr "મેન�ઓમાં ટ�રેડઓફ ઉમેરો"
 
-#: gtk/gtkcombobox.c:788
+#: ../gtk/gtkcombobox.c:769
 msgid "Whether dropdowns should have a tearoff menu item"
 msgstr "શ�ં ડ�રોપડાઉન પાસે ટીયરઓફ મેન� વસ�ત�ઓ હોવી જોઈ�"
 
-#: gtk/gtkcombobox.c:803 gtk/gtkentry.c:688
+#: ../gtk/gtkcombobox.c:784 ../gtk/gtkentry.c:786
 msgid "Has Frame"
 msgstr "ચોકઠ� ધરાવે છે"
 
-#: gtk/gtkcombobox.c:804
+#: ../gtk/gtkcombobox.c:785
 msgid "Whether the combo box draws a frame around the child"
 msgstr "શ�ં હેડરોની આસપાસ સ�તંભને ફરીથી ક�રમબધ કરી શકાય છે"
 
-#: gtk/gtkcombobox.c:812
+#: ../gtk/gtkcombobox.c:793
 msgid "Whether the combo box grabs focus when it is clicked with the mouse"
 msgstr "શ�ં કમ�બો બોક�સ ફોકસ મેળવે છે જ�યારે તે માઉસ સાથે ક�લિક થાય છે"
 
-#: gtk/gtkcombobox.c:827 gtk/gtkmenu.c:580
+#: ../gtk/gtkcombobox.c:808 ../gtk/gtkmenu.c:643
 msgid "Tearoff Title"
 msgstr "Tearoff શીર�ષક"
 
-#: gtk/gtkcombobox.c:828
+#: ../gtk/gtkcombobox.c:809
 msgid ""
 "A title that may be displayed by the window manager when the popup is torn-"
 "off"
 msgstr "શીર�ષક કે જે વિન�ડો વ�યવસ�થાપક દ�રારા દર�શાવવામાં આવશે જ�યારે પોપઅપ � બંધ હોય"
 
-#: gtk/gtkcombobox.c:845
+#: ../gtk/gtkcombobox.c:826
 msgid "Popup shown"
 msgstr "પોપઅપ બતાવાયેલ"
 
-#: gtk/gtkcombobox.c:846
+#: ../gtk/gtkcombobox.c:827
 msgid "Whether the combo's dropdown is shown"
 msgstr "શ�ં કમ�બોન�ં ડ�રોપડાઉન બતાવાયેલ છે"
 
-#: gtk/gtkcombobox.c:862
+#: ../gtk/gtkcombobox.c:843
 msgid "Button Sensitivity"
 msgstr "બટન સંવેદનશીલ"
 
-#: gtk/gtkcombobox.c:863
+#: ../gtk/gtkcombobox.c:844
 msgid "Whether the dropdown button is sensitive when the model is empty"
 msgstr "જ�યારે મોડેલ ખાલી હોય ત�યારે શ�ં નીચેઆવત�ં બટન સંવેદનશીલ હોય"
 
-#: gtk/gtkcombobox.c:870
+#: ../gtk/gtkcombobox.c:860
+#, fuzzy
+#| msgid "Whether the combo box draws a frame around the child"
+msgid "Whether combo box has an entry"
+msgstr "શ�ં હેડરોની આસપાસ સ�તંભને ફરીથી ક�રમબધ કરી શકાય છે"
+
+#: ../gtk/gtkcombobox.c:875
+#, fuzzy
+#| msgid "Text Column"
+msgid "Entry Text Column"
+msgstr "લખાણ સ�તંભ"
+
+#: ../gtk/gtkcombobox.c:876
+msgid ""
+"The column in the combo box's model to associate with strings from the entry "
+"if the combo was created with #GtkComboBox:has-entry = %TRUE"
+msgstr ""
+
+#: ../gtk/gtkcombobox.c:893
+#| msgid "Columns"
+msgid "ID Column"
+msgstr "ID સ�તંભ"
+
+#: ../gtk/gtkcombobox.c:894
+msgid ""
+"The column in the combo box's model that provides string IDs for the values "
+"in the model"
+msgstr ""
+
+#: ../gtk/gtkcombobox.c:909
+#| msgid "Active"
+msgid "Active id"
+msgstr "સક�રિય id"
+
+#: ../gtk/gtkcombobox.c:910
+#, fuzzy
+#| msgid "The name of the icon from the icon theme"
+msgid "The value of the id column for the active row"
+msgstr "ચિહ�ન નામમાથી ચિહ�નન�ં નામ"
+
+#: ../gtk/gtkcombobox.c:925
+#, fuzzy
+#| msgid "Fixed Width"
+msgid "Popup Fixed Width"
+msgstr "ચોક�કસ પહોળાઈ"
+
+#: ../gtk/gtkcombobox.c:926
+msgid ""
+"Whether the popup's width should be a fixed width matching the allocated "
+"width of the combo box"
+msgstr ""
+
+#: ../gtk/gtkcombobox.c:952
 msgid "Appears as list"
 msgstr "યાદી તરીકે દેખાય છે"
 
-#: gtk/gtkcombobox.c:871
+#: ../gtk/gtkcombobox.c:953
 msgid "Whether dropdowns should look like lists rather than menus"
 msgstr "શ�ં ડ�રોપડાઉનો મેન�ઓની જગ�યા� યાદીઓ તરીકે દેખાવા જોઈ�"
 
-#: gtk/gtkcombobox.c:887
+#: ../gtk/gtkcombobox.c:969
 msgid "Arrow Size"
 msgstr "તીર માપ"
 
-#: gtk/gtkcombobox.c:888
+#: ../gtk/gtkcombobox.c:970
 msgid "The minimum size of the arrow in the combo box"
 msgstr "કમ�બો બોક�સમાં તીરન�ં ન�યૂનતમ માપ"
 
-#: gtk/gtkcombobox.c:903 gtk/gtkentry.c:788 gtk/gtkhandlebox.c:182
-#: gtk/gtkmenubar.c:189 gtk/gtkstatusbar.c:244 gtk/gtktoolbar.c:577
-#: gtk/gtkviewport.c:158
+#: ../gtk/gtkcombobox.c:987
+#, fuzzy
+#| msgid "Amount of space used up by arrow"
+msgid "The amount of space used by the arrow"
+msgstr "તીર દ�વારા વાપરવામાં આવતી જગ�યાનો જથ�થો"
+
+#: ../gtk/gtkcombobox.c:1002 ../gtk/gtkentry.c:886 ../gtk/gtkhandlebox.c:218
+#: ../gtk/gtkmenubar.c:218 ../gtk/gtkstatusbar.c:182 ../gtk/gtktoolbar.c:613
+#: ../gtk/gtkviewport.c:155
 msgid "Shadow type"
 msgstr "પડછાયાનો પ�રકાર"
 
-#: gtk/gtkcombobox.c:904
+#: ../gtk/gtkcombobox.c:1003
 msgid "Which kind of shadow to draw around the combo box"
 msgstr "કમ�બો બોક�સની ફરતે કયા પ�રકારનો પડછાયો દોરવો"
 
-#: gtk/gtkcontainer.c:259
+#: ../gtk/gtkcontainer.c:457
 msgid "Resize mode"
 msgstr "માપબદલવા માટેની સ�થિતિ"
 
-#: gtk/gtkcontainer.c:260
+#: ../gtk/gtkcontainer.c:458
 msgid "Specify how resize events are handled"
 msgstr "સ�પષ�ટ કરો કે માપ બદલવા માટેના બનાવો કઈ રીતે સંચાલિત થાય છે"
 
-#: gtk/gtkcontainer.c:267
+#: ../gtk/gtkcontainer.c:465
 msgid "Border width"
 msgstr "કિનારીની પહોળાઈ"
 
-#: gtk/gtkcontainer.c:268
+#: ../gtk/gtkcontainer.c:466
 msgid "The width of the empty border outside the containers children"
 msgstr "સમાવનારના બાળની બહાર ખાલી કિનારીની પહોળાઈ"
 
-#: gtk/gtkcontainer.c:276
+#: ../gtk/gtkcontainer.c:474
 msgid "Child"
 msgstr "બાળ"
 
-#: gtk/gtkcontainer.c:277
+#: ../gtk/gtkcontainer.c:475
 msgid "Can be used to add a new child to the container"
 msgstr "સમાવનારમાં �ક નવા બાળને ઉમેરવા માટે ઉપયોગ કરી શકાય છે"
 
-#: gtk/gtkdialog.c:165 gtk/gtkinfobar.c:430
+#: ../gtk/gtkdialog.c:291 ../gtk/gtkinfobar.c:427
 msgid "Content area border"
 msgstr "સમાવિષ�ટ વિસ�તારની કિનારી"
 
-#: gtk/gtkdialog.c:166
+#: ../gtk/gtkdialog.c:292
 msgid "Width of border around the main dialog area"
 msgstr "મ�ખ�ય સંવાદ વિસ�તારની આસપાસ કિનારીની પહોળાઈ"
 
-#: gtk/gtkdialog.c:183 gtk/gtkinfobar.c:447
+#: ../gtk/gtkdialog.c:309 ../gtk/gtkinfobar.c:444
 msgid "Content area spacing"
 msgstr "સમાવિષ�ટ વિસ�તાર વચ�ચે જગ�યા છોડો"
 
-#: gtk/gtkdialog.c:184
+#: ../gtk/gtkdialog.c:310
 msgid "Spacing between elements of the main dialog area"
 msgstr "મ�ખ�ય સંવાદ વિસ�તારનાં ઘટકો વચ�ચે જગ�યા છોડો"
 
-#: gtk/gtkdialog.c:191 gtk/gtkinfobar.c:463
+#: ../gtk/gtkdialog.c:317 ../gtk/gtkinfobar.c:460
 msgid "Button spacing"
 msgstr "બટન વચ�ચે છોડેલી જગ�યા"
 
-#: gtk/gtkdialog.c:192 gtk/gtkinfobar.c:464
+#: ../gtk/gtkdialog.c:318 ../gtk/gtkinfobar.c:461
 msgid "Spacing between buttons"
 msgstr "બટનો વચ�ચેની જગ�યા"
 
-#: gtk/gtkdialog.c:200 gtk/gtkinfobar.c:479
+#: ../gtk/gtkdialog.c:326 ../gtk/gtkinfobar.c:476
 msgid "Action area border"
 msgstr "કાર�યશીલ વિસ�તારની કિનારી"
 
-#: gtk/gtkdialog.c:201
+#: ../gtk/gtkdialog.c:327
 msgid "Width of border around the button area at the bottom of the dialog"
 msgstr "સંવાદના નીચલા ભાગમાં બટનની આસપાસ કિનારીની પહોળાઈ"
 
-#: gtk/gtkentry.c:635
+#: ../gtk/gtkentrybuffer.c:353
+msgid "The contents of the buffer"
+msgstr "બફરનાં સમાવિષ�ટો"
+
+#: ../gtk/gtkentrybuffer.c:367 ../gtk/gtkentry.c:917
+msgid "Text length"
+msgstr "લખાણની લંબાઇ"
+
+#: ../gtk/gtkentrybuffer.c:368
+msgid "Length of the text currently in the buffer"
+msgstr "બફરમાં હાલનાં લખાણની લંબાઇ"
+
+#: ../gtk/gtkentrybuffer.c:382 ../gtk/gtkentry.c:769
+msgid "Maximum length"
+msgstr "મહત�તમ લંબાઈ"
+
+#: ../gtk/gtkentrybuffer.c:383 ../gtk/gtkentry.c:770
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr "આ પ�રવેશ માટે મહત�તમ શબ�દોની સંખ�યા. શૂન�ય જો મહત�તમ ના હોય"
+
+#: ../gtk/gtkentry.c:733
 msgid "Text Buffer"
 msgstr "લખાણ બફર"
 
-#: gtk/gtkentry.c:636
+#: ../gtk/gtkentry.c:734
 msgid "Text buffer object which actually stores entry text"
 msgstr "લખાણ બફર ઓબ�જેક�ટ કે જે ખરેખર રીતે નોંધણી લખાણ માં સંગ�રહ થાય છે"
 
-#: gtk/gtkentry.c:643 gtk/gtklabel.c:644
+#: ../gtk/gtkentry.c:741 ../gtk/gtklabel.c:839
 msgid "Cursor Position"
 msgstr "કર�સરન�ં સ�થાન"
 
-#: gtk/gtkentry.c:644 gtk/gtklabel.c:645
+#: ../gtk/gtkentry.c:742 ../gtk/gtklabel.c:840
 msgid "The current position of the insertion cursor in chars"
 msgstr "શબ�દોમાં લખાણ ઉમેરવા માટેના કર�સરની વર�તમાન સ�થિતિ"
 
-#: gtk/gtkentry.c:653 gtk/gtklabel.c:654
+#: ../gtk/gtkentry.c:751 ../gtk/gtklabel.c:849
 msgid "Selection Bound"
 msgstr "પસંદ કરવા માટેની સીમા"
 
-#: gtk/gtkentry.c:654 gtk/gtklabel.c:655
-msgid ""
-"The position of the opposite end of the selection from the cursor in chars"
+#: ../gtk/gtkentry.c:752 ../gtk/gtklabel.c:850
+msgid "The position of the opposite end of the selection from the cursor in chars"
 msgstr "શબ�દોમાં તેને પસંદ કરતી વખતે કર�સરની વિર�ધ�ધ દિશાની સ�થિતિ"
 
-#: gtk/gtkentry.c:664
+#: ../gtk/gtkentry.c:762
 msgid "Whether the entry contents can be edited"
 msgstr "શ�ં સમાવિષ�ટ પ�રવેશોને બદલી શકાય છે"
 
-#: gtk/gtkentry.c:671 gtk/gtkentrybuffer.c:382
-msgid "Maximum length"
-msgstr "મહત�તમ લંબાઈ"
-
-#: gtk/gtkentry.c:672 gtk/gtkentrybuffer.c:383
-msgid "Maximum number of characters for this entry. Zero if no maximum"
-msgstr "આ પ�રવેશ માટે મહત�તમ શબ�દોની સંખ�યા. શૂન�ય જો મહત�તમ ના હોય"
-
-#: gtk/gtkentry.c:680
+#: ../gtk/gtkentry.c:778
 msgid "Visibility"
 msgstr "દૃશ�યમાનતા"
 
-#: gtk/gtkentry.c:681
+#: ../gtk/gtkentry.c:779
 msgid ""
 "FALSE displays the \"invisible char\" instead of the actual text (password "
 "mode)"
 msgstr "FALSE વિકલ�પ મૂળ લખાણ (પાસવર�ડ સ�થિતિ) ને બદલે \"અદૃશ�ય અક�ષરો\" દર�શાવે છે"
 
-#: gtk/gtkentry.c:689
+#: ../gtk/gtkentry.c:787
 msgid "FALSE removes outside bevel from entry"
 msgstr "FALSE વિકલ�પ પ�રવેશમાંથી બહારનો ઊઠાવ કાઢી નાંખે છે"
 
-#: gtk/gtkentry.c:697
-msgid ""
-"Border between text and frame. Overrides the inner-border style property"
+#: ../gtk/gtkentry.c:795
+msgid "Border between text and frame. Overrides the inner-border style property"
 msgstr "લખાણ અને ચોકઠાં વચ�ચેની કિનારી. આંતર-કિનારી શૈલી પર ફરીથી લખે છે"
 
-#: gtk/gtkentry.c:704 gtk/gtkentry.c:1270
+#: ../gtk/gtkentry.c:802 ../gtk/gtkentry.c:1398
 msgid "Invisible character"
 msgstr "અદૃશ�ય અક�ષર"
 
-#: gtk/gtkentry.c:705 gtk/gtkentry.c:1271
+#: ../gtk/gtkentry.c:803 ../gtk/gtkentry.c:1399
 msgid "The character to use when masking entry contents (in \"password mode\")"
-msgstr ""
-"જ�યારે પ�રવેશના સમાવિષ�ટોને સંતાડો ત�યારે વાપરવા માટેના અક�ષર (\"પાસવર�ડ સ�થિતિ\" માં)"
+msgstr "જ�યારે પ�રવેશના સમાવિષ�ટોને સંતાડો ત�યારે વાપરવા માટેના અક�ષર (\"પાસવર�ડ સ�થિતિ\" માં)"
 
-#: gtk/gtkentry.c:712
+#: ../gtk/gtkentry.c:810
 msgid "Activates default"
 msgstr "મૂળભૂતને કાર�યશીલ કરે છે"
 
-#: gtk/gtkentry.c:713
+#: ../gtk/gtkentry.c:811
 msgid ""
 "Whether to activate the default widget (such as the default button in a "
 "dialog) when Enter is pressed"
 msgstr ""
 "શ�ં Enter બટન દબાવી� ત�યારે મૂળભૂત વિજેટ (જેમ કે �ક સંવાદમાં મૂળભૂત બટન) ને કાર�યશીલ કરવ�ં"
 
-#: gtk/gtkentry.c:719
+#: ../gtk/gtkentry.c:817
 msgid "Width in chars"
 msgstr "અક�ષરોમાં પહોળાઈ"
 
-#: gtk/gtkentry.c:720
+#: ../gtk/gtkentry.c:818
 msgid "Number of characters to leave space for in the entry"
 msgstr "આ પ�રવેશ વખતે કેટલા અક�ષરોની સંખ�યા માટે જગ�યા છોડવામાં આવે"
 
-#: gtk/gtkentry.c:729
+#: ../gtk/gtkentry.c:827
 msgid "Scroll offset"
 msgstr "ખસેડવા માટેન� ઓફસેટ"
 
-#: gtk/gtkentry.c:730
+#: ../gtk/gtkentry.c:828
 msgid "Number of pixels of the entry scrolled off the screen to the left"
 msgstr "આ પ�રવેશના કેટલા પિક�સેલ સ�ક�રીનની ડાબી બાજ� ખસેડાય છે"
 
-#: gtk/gtkentry.c:740
+#: ../gtk/gtkentry.c:838
 msgid "The contents of the entry"
 msgstr "પ�રવેશના સમાવિષ�ટો"
 
-#: gtk/gtkentry.c:755 gtk/gtkmisc.c:81
+#: ../gtk/gtkentry.c:853 ../gtk/gtkmisc.c:105
 msgid "X align"
 msgstr "X align"
 
-#: gtk/gtkentry.c:756 gtk/gtkmisc.c:82
+#: ../gtk/gtkentry.c:854 ../gtk/gtkmisc.c:106
 msgid ""
 "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
 msgstr "આડી ગોઠવણી, ૦ (ડાબે) થી ૧ (જમણે). RTL દેખાવો માટે આરક�ષિત છે."
 
-#: gtk/gtkentry.c:772
+#: ../gtk/gtkentry.c:870
 msgid "Truncate multiline"
 msgstr "મલ�ટીલાઈન અવગણો"
 
-#: gtk/gtkentry.c:773
+#: ../gtk/gtkentry.c:871
 msgid "Whether to truncate multiline pastes to one line."
 msgstr "શ�ં �ક લીટીમાં મલ�ટીલાઈન ચોંટાડવાન�ં અવગણવ�ં છે."
 
-#: gtk/gtkentry.c:789
+#: ../gtk/gtkentry.c:887
 msgid "Which kind of shadow to draw around the entry when has-frame is set"
 msgstr "પ�રવેશ ફરતે કયા પ�રકારનો પડછાયો દોરવો જ�યારે has-frame સ�યોજિત હોય"
 
-#: gtk/gtkentry.c:804 gtk/gtktextview.c:748
+#: ../gtk/gtkentry.c:902 ../gtk/gtktextview.c:766
 msgid "Overwrite mode"
 msgstr "માપબદલવા માટેની સ�થિતિ"
 
-#: gtk/gtkentry.c:805
+#: ../gtk/gtkentry.c:903
 msgid "Whether new text overwrites existing text"
 msgstr "ક�યાં તો દાખલ થયેલ લખાણ વર�તમાન સમાવિષ�ટો પર ફરીથી લખે છે"
 
-#: gtk/gtkentry.c:819 gtk/gtkentrybuffer.c:367
-msgid "Text length"
-msgstr "લખાણની લંબાઇ"
-
-#: gtk/gtkentry.c:820
+#: ../gtk/gtkentry.c:918
 msgid "Length of the text currently in the entry"
 msgstr "પ�રવેશ માં હાલનાં લખાણની લંબાઇ"
 
-#: gtk/gtkentry.c:835
+#: ../gtk/gtkentry.c:933
 #, fuzzy
 msgid "Invisible character set"
 msgstr "અદૃશ�ય અક�ષર"
 
-#: gtk/gtkentry.c:836
+#: ../gtk/gtkentry.c:934
 #, fuzzy
 msgid "Whether the invisible character has been set"
 msgstr "ક�યાં તો અદૃશ�ય અક�ષર ને સ�યોજિત કરી દેવામાં આવ�ય� છે"
 
-#: gtk/gtkentry.c:854
+#: ../gtk/gtkentry.c:952
 msgid "Caps Lock warning"
 msgstr "Caps Lock ચેતવણી"
 
-#: gtk/gtkentry.c:855
+#: ../gtk/gtkentry.c:953
 msgid "Whether password entries will show a warning when Caps Lock is on"
 msgstr "ક�યાં તો પાસવર�ડ પ�રવેશો � ચેતવણી ને બતાવશે જ�યારે Caps Lock � ચાલ� હોય"
 
-#: gtk/gtkentry.c:869
+#: ../gtk/gtkentry.c:967
 msgid "Progress Fraction"
 msgstr "પ�રગતિ ભાગ"
 
-#: gtk/gtkentry.c:870
+#: ../gtk/gtkentry.c:968
 msgid "The current fraction of the task that's been completed"
 msgstr "ક�રિયા કે જે પતી ગઈ હોય તેનો વર�તમાન અંશ"
 
-#: gtk/gtkentry.c:887
+#: ../gtk/gtkentry.c:985
 msgid "Progress Pulse Step"
 msgstr "પ�રગતિ ધબકાર સ�યોજન"
 
-#: gtk/gtkentry.c:888
+#: ../gtk/gtkentry.c:986
 msgid ""
 "The fraction of total entry width to move the progress bouncing block for "
 "each call to gtk_entry_progress_pulse()"
@@ -2333,263 +2731,256 @@ msgstr ""
 "gtk_entry_progress_pulse() ના દરેક કોલ માટે પછડાતા બ�લોકની પ�રગતિ ખસેડવા માટે ક�લ "
 "પ�રવેશ પહોળાઈનો અંશ"
 
-#: gtk/gtkentry.c:904
+#: ../gtk/gtkentry.c:1002
+msgid "Placeholder text"
+msgstr ""
+
+#: ../gtk/gtkentry.c:1003
+msgid "Show text in the entry when it's empty and unfocused"
+msgstr ""
+
+#: ../gtk/gtkentry.c:1017
 msgid "Primary pixbuf"
 msgstr "પ�રાથમિક Pixbuf"
 
-#: gtk/gtkentry.c:905
+#: ../gtk/gtkentry.c:1018
 msgid "Primary pixbuf for the entry"
 msgstr "પ�રવેશ માટે પ�રાથમિક pixbuf"
 
-#: gtk/gtkentry.c:919
+#: ../gtk/gtkentry.c:1032
 msgid "Secondary pixbuf"
 msgstr "ગૌણ pixbuf"
 
-#: gtk/gtkentry.c:920
+#: ../gtk/gtkentry.c:1033
 msgid "Secondary pixbuf for the entry"
 msgstr "પ�રવેશ માટે ગૌણ pixbuf"
 
-#: gtk/gtkentry.c:934
+#: ../gtk/gtkentry.c:1047
 msgid "Primary stock ID"
 msgstr "પ�રાથમિક સ�ટોક ID"
 
-#: gtk/gtkentry.c:935
+#: ../gtk/gtkentry.c:1048
 msgid "Stock ID for primary icon"
 msgstr "પ�રાથમિક આઇકોન માટે સ�ટોક ID"
 
-#: gtk/gtkentry.c:949
+#: ../gtk/gtkentry.c:1062
 msgid "Secondary stock ID"
 msgstr "ગૌણ સ�ટોક ID"
 
-#: gtk/gtkentry.c:950
+#: ../gtk/gtkentry.c:1063
 msgid "Stock ID for secondary icon"
 msgstr "માધ�યમિક આઇકોન માટે સ�ટોક ID"
 
-#: gtk/gtkentry.c:964
+#: ../gtk/gtkentry.c:1077
 msgid "Primary icon name"
 msgstr "પ�રાથમિક આઇકોન નામ"
 
-#: gtk/gtkentry.c:965
+#: ../gtk/gtkentry.c:1078
 msgid "Icon name for primary icon"
 msgstr "પ�રાથમિક આઇકોન માટે આઇકોન નામ"
 
-#: gtk/gtkentry.c:979
+#: ../gtk/gtkentry.c:1092
 msgid "Secondary icon name"
 msgstr "ગૌણ આઇકોન નામ"
 
-#: gtk/gtkentry.c:980
+#: ../gtk/gtkentry.c:1093
 msgid "Icon name for secondary icon"
 msgstr "માધ�યમિક આઇકોન માટે આઇકોન નામ"
 
-#: gtk/gtkentry.c:994
+#: ../gtk/gtkentry.c:1107
 msgid "Primary GIcon"
 msgstr "પ�રાથમિક GIcon"
 
-#: gtk/gtkentry.c:995
+#: ../gtk/gtkentry.c:1108
 msgid "GIcon for primary icon"
 msgstr "પ�રાથમિક આઇકોન માટે GIcon"
 
-#: gtk/gtkentry.c:1009
+#: ../gtk/gtkentry.c:1122
 msgid "Secondary GIcon"
 msgstr "ગૌણ GIcon"
 
-#: gtk/gtkentry.c:1010
+#: ../gtk/gtkentry.c:1123
 msgid "GIcon for secondary icon"
 msgstr "માધ�યમિક આઇકોન માટે GIcon"
 
-#: gtk/gtkentry.c:1024
+#: ../gtk/gtkentry.c:1137
 msgid "Primary storage type"
 msgstr "પ�રાથમિક સંગ�રહ પ�રકાર"
 
-#: gtk/gtkentry.c:1025
+#: ../gtk/gtkentry.c:1138
 msgid "The representation being used for primary icon"
 msgstr "પ�રાથમિક ચિહ�ન માટે વપરાતી રજૂઆત"
 
-#: gtk/gtkentry.c:1040
+#: ../gtk/gtkentry.c:1153
 msgid "Secondary storage type"
 msgstr "ગૌણ સંગ�રહ પ�રકાર"
 
-#: gtk/gtkentry.c:1041
+#: ../gtk/gtkentry.c:1154
 msgid "The representation being used for secondary icon"
 msgstr "ગૌણ ચિહ�ન માટે વપરાતી રજૂઆત"
 
-#: gtk/gtkentry.c:1062
+#: ../gtk/gtkentry.c:1175
 msgid "Primary icon activatable"
 msgstr "પ�રાથમિક આઇકોન ને સક�રિય કરેલ છે"
 
-#: gtk/gtkentry.c:1063
+#: ../gtk/gtkentry.c:1176
 msgid "Whether the primary icon is activatable"
 msgstr "ક�યાં તો પ�રાથમિક આઇકોન � સક�રિય હોય"
 
-#: gtk/gtkentry.c:1083
+#: ../gtk/gtkentry.c:1196
 msgid "Secondary icon activatable"
 msgstr "ગૌણ આઇકોન સક�રિય થયેલ છે"
 
-#: gtk/gtkentry.c:1084
+#: ../gtk/gtkentry.c:1197
 msgid "Whether the secondary icon is activatable"
 msgstr "ક�યાં તો ગૌણ આઇકોન � સક�રિય થયેલ હોય તો"
 
-#: gtk/gtkentry.c:1106
+#: ../gtk/gtkentry.c:1219
 msgid "Primary icon sensitive"
 msgstr "પ�રાથમિક આઇકોન સંવેદનશીલ"
 
-#: gtk/gtkentry.c:1107
+#: ../gtk/gtkentry.c:1220
 msgid "Whether the primary icon is sensitive"
 msgstr "ક�યાંતો પ�રાથમિક આઇકોન સંવેદનશીલ છે"
 
-#: gtk/gtkentry.c:1128
+#: ../gtk/gtkentry.c:1241
 msgid "Secondary icon sensitive"
 msgstr "ગૌણ આઇકોન સંવેદનશીલ"
 
-#: gtk/gtkentry.c:1129
+#: ../gtk/gtkentry.c:1242
 msgid "Whether the secondary icon is sensitive"
 msgstr "ક�યાં તો ગૌણ આઇકોન � સંવેદનશીલ છે"
 
-#: gtk/gtkentry.c:1145
+#: ../gtk/gtkentry.c:1258
 msgid "Primary icon tooltip text"
 msgstr "પ�રાથમિક આઇકોન સાધનમદદ લખાણ"
 
-#: gtk/gtkentry.c:1146 gtk/gtkentry.c:1182
+#: ../gtk/gtkentry.c:1259 ../gtk/gtkentry.c:1295
 msgid "The contents of the tooltip on the primary icon"
 msgstr "પ�રાથમિક આઇકોન પર સાધનમદદનાં સમાવિષ�ટો"
 
-#: gtk/gtkentry.c:1162
+#: ../gtk/gtkentry.c:1275
 msgid "Secondary icon tooltip text"
 msgstr "ગૌણ આઇકોન સાધનમદદ લખાણ"
 
-#: gtk/gtkentry.c:1163 gtk/gtkentry.c:1201
+#: ../gtk/gtkentry.c:1276 ../gtk/gtkentry.c:1314
 msgid "The contents of the tooltip on the secondary icon"
 msgstr "ગૌણ આઇકોન પર સાધનમદદનાં સમાવિષ�ટો"
 
-#: gtk/gtkentry.c:1181
+#: ../gtk/gtkentry.c:1294
 msgid "Primary icon tooltip markup"
 msgstr "પ�રાથમિક ચિહ�ન ટ�લટીપ માર�કઅપ"
 
-#: gtk/gtkentry.c:1200
+#: ../gtk/gtkentry.c:1313
 msgid "Secondary icon tooltip markup"
 msgstr "ગૌણ ચિહ�ન સાધન મદદ માર�કઅપ"
 
-#: gtk/gtkentry.c:1220 gtk/gtktextview.c:776
+#: ../gtk/gtkentry.c:1333 ../gtk/gtktextview.c:794
 msgid "IM module"
 msgstr "IM મોડ�ય�લ"
 
-#: gtk/gtkentry.c:1221 gtk/gtktextview.c:777
+#: ../gtk/gtkentry.c:1334 ../gtk/gtktextview.c:795
 msgid "Which IM module should be used"
 msgstr "ક�ય� IM મોડ�ય�લ ને વાપરવ� જોઇ�"
 
-#: gtk/gtkentry.c:1235
+#: ../gtk/gtkentry.c:1348
+#| msgid "Completion Model"
+msgid "Completion"
+msgstr "સમાપ�તિ"
+
+#: ../gtk/gtkentry.c:1349
+msgid "The auxiliary completion object"
+msgstr ""
+
+#: ../gtk/gtkentry.c:1363
 msgid "Icon Prelight"
 msgstr "ચિહ�ન પૂર�વપ�રકાશ"
 
-#: gtk/gtkentry.c:1236
+#: ../gtk/gtkentry.c:1364
 msgid "Whether activatable icons should prelight when hovered"
 msgstr "શ�ં સક�રિય કરી શકાય તેવા ચિહ�નોન�ં પૂર�વપ�રકાશન થવ�ં જોઈ� જ�યારે તેના પર માઉસ આવે"
 
-#: gtk/gtkentry.c:1249
+#: ../gtk/gtkentry.c:1377
 msgid "Progress Border"
 msgstr "પ�રગતિ કિનારી"
 
-#: gtk/gtkentry.c:1250
+#: ../gtk/gtkentry.c:1378
 msgid "Border around the progress bar"
 msgstr "પ�રગતિદર�શક પટ�ટી ફરતેની કિનારી"
 
-#: gtk/gtkentry.c:1742
+#: ../gtk/gtkentry.c:1870
 msgid "Border between text and frame."
 msgstr "લખાણ અને ચોકઠાં વચ�ચેની કિનારી."
 
-#: gtk/gtkentry.c:1747 gtk/gtklabel.c:903
-msgid "Select on focus"
-msgstr "ફોકસ કરવા પર પસંદ કરો"
-
-#: gtk/gtkentry.c:1748
-msgid "Whether to select the contents of an entry when it is focused"
-msgstr "શ�ં ફોકસ થયા હોય ત�યારે પ�રવેશની સમાવિષ�ટ માહિતીને પસંદ કરવી"
-
-#: gtk/gtkentry.c:1762
-msgid "Password Hint Timeout"
-msgstr "પાસવર�ડ સંકેત સમયસમાપ�તિ"
-
-#: gtk/gtkentry.c:1763
-msgid "How long to show the last input character in hidden entries"
-msgstr "છ�પા પ�રવેશોમાં કેટલા સમય સ�ધી છેલ�લો દાખલ થયેલ અક�ષર બતાવવો"
-
-#: gtk/gtkentrybuffer.c:353
-msgid "The contents of the buffer"
-msgstr "બફરનાં સમાવિષ�ટો"
-
-#: gtk/gtkentrybuffer.c:368
-msgid "Length of the text currently in the buffer"
-msgstr "બફરમાં હાલનાં લખાણની લંબાઇ"
-
-#: gtk/gtkentrycompletion.c:280
+#: ../gtk/gtkentrycompletion.c:320
 msgid "Completion Model"
 msgstr "પૂર�ણતા મોડેલ"
 
-#: gtk/gtkentrycompletion.c:281
+#: ../gtk/gtkentrycompletion.c:321
 msgid "The model to find matches in"
 msgstr "સરખામણીઓ શોધવા માટે મોડેલ"
 
-#: gtk/gtkentrycompletion.c:287
+#: ../gtk/gtkentrycompletion.c:327
 msgid "Minimum Key Length"
 msgstr "ન�યૂનતમ કી લંબાઈ"
 
-#: gtk/gtkentrycompletion.c:288
+#: ../gtk/gtkentrycompletion.c:328
 msgid "Minimum length of the search key in order to look up matches"
 msgstr "સરખામણીઓ માટે જોવા માટે શોધ કીની ન�યૂનતમ લંબાઈ"
 
-#: gtk/gtkentrycompletion.c:304 gtk/gtkiconview.c:587
+#: ../gtk/gtkentrycompletion.c:344 ../gtk/gtkiconview.c:564
 msgid "Text column"
 msgstr "લખાણ સ�તંભ"
 
-#: gtk/gtkentrycompletion.c:305
+#: ../gtk/gtkentrycompletion.c:345
 msgid "The column of the model containing the strings."
 msgstr "શબ�દમાળાઓ સમાવતા સ�તંભન�ં મોડેલ."
 
-#: gtk/gtkentrycompletion.c:324
+#: ../gtk/gtkentrycompletion.c:364
 msgid "Inline completion"
 msgstr "વાક�યમાં પૂર�ણતા"
 
-#: gtk/gtkentrycompletion.c:325
+#: ../gtk/gtkentrycompletion.c:365
 msgid "Whether the common prefix should be inserted automatically"
 msgstr "શ�ં સામાન�ય પૂર�વગ આપોઆપ દાખલ થવો જોઈ�"
 
-#: gtk/gtkentrycompletion.c:339
+#: ../gtk/gtkentrycompletion.c:379
 msgid "Popup completion"
 msgstr "પોપઅપ પૂર�ણતા"
 
-#: gtk/gtkentrycompletion.c:340
+#: ../gtk/gtkentrycompletion.c:380
 msgid "Whether the completions should be shown in a popup window"
 msgstr "શ�ં પોપઅપ વિન�ડોમાં પૂર�ણતા બતાવવી જોઈ�"
 
-#: gtk/gtkentrycompletion.c:355
+#: ../gtk/gtkentrycompletion.c:395
 msgid "Popup set width"
 msgstr "પોપઅપ સેટ પહોળાઈ"
 
-#: gtk/gtkentrycompletion.c:356
+#: ../gtk/gtkentrycompletion.c:396
 msgid "If TRUE, the popup window will have the same size as the entry"
 msgstr "જો સાચ�ં હોય, તો પોપઅપ વિન�ડો પાસે પ�રવેશ તરીકે સરખ�ં માપ હશે"
 
-#: gtk/gtkentrycompletion.c:374
+#: ../gtk/gtkentrycompletion.c:414
 msgid "Popup single match"
 msgstr "પોપઅપ �ક જોડણી"
 
-#: gtk/gtkentrycompletion.c:375
+#: ../gtk/gtkentrycompletion.c:415
 msgid "If TRUE, the popup window will appear for a single match."
 msgstr "જો સાચ�ં હોય, તો પોપઅપ વિન�ડો �ક જોડણી માટે દૃશ�યમાન થશે."
 
-#: gtk/gtkentrycompletion.c:389
+#: ../gtk/gtkentrycompletion.c:429
 msgid "Inline selection"
 msgstr "લીટીમાં પસંદગી"
 
-#: gtk/gtkentrycompletion.c:390
+#: ../gtk/gtkentrycompletion.c:430
 msgid "Your description here"
 msgstr "તમાર�ં વર�ણન અંહિ"
 
-#: gtk/gtkeventbox.c:93
+#: ../gtk/gtkeventbox.c:109
 msgid "Visible Window"
 msgstr "દૃશ�યમાન વિન�ડો"
 
-#: gtk/gtkeventbox.c:94
+#: ../gtk/gtkeventbox.c:110
 msgid ""
 "Whether the event box is visible, as opposed to invisible and only used to "
 "trap events."
@@ -2597,165 +2988,177 @@ msgstr ""
 "શ�ં ઘટના બોક�સ દૃશ�યમાન છે, જેમ અદૃશ�ય તરીકે વિરોધ થયેલ છે અને માત�ર ઘટનાઓ પકડવા માટે વપરાય "
 "છે."
 
-#: gtk/gtkeventbox.c:100
+#: ../gtk/gtkeventbox.c:116
 msgid "Above child"
 msgstr "ઉપરનો બાળ"
 
-#: gtk/gtkeventbox.c:101
+#: ../gtk/gtkeventbox.c:117
 msgid ""
 "Whether the event-trapping window of the eventbox is above the window of the "
 "child widget as opposed to below it."
 msgstr "શ�ં ઘટનાબોક�સની ઘટના-પકડતી વિન�ડો � બાળ વિજેટની ઉપર હોય જેમ નીચે દર�શાવ�ય�ં છે."
 
-#: gtk/gtkexpander.c:201
+#: ../gtk/gtkexpander.c:282
 msgid "Expanded"
 msgstr "વિસ�તૃત"
 
-#: gtk/gtkexpander.c:202
+#: ../gtk/gtkexpander.c:283
 msgid "Whether the expander has been opened to reveal the child widget"
 msgstr "શ�ં વિસ�તારક બાળ વિજેટ રીવેલ કરવા માટે ખોલવામાં આવેલ છે"
 
-#: gtk/gtkexpander.c:210
+#: ../gtk/gtkexpander.c:291
 msgid "Text of the expander's label"
 msgstr "ચોકઠાના લેબલન�ં લખાણ"
 
-#: gtk/gtkexpander.c:225 gtk/gtklabel.c:563
+#: ../gtk/gtkexpander.c:306 ../gtk/gtklabel.c:758
 msgid "Use markup"
 msgstr "માર�કઅપ વાપરો"
 
-#: gtk/gtkexpander.c:226 gtk/gtklabel.c:564
+#: ../gtk/gtkexpander.c:307 ../gtk/gtklabel.c:759
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "લેબલન�ં લખાણ XML માર�કઅપનો સમાવેશ કરે છે. Pango-Parse_markup() જ�ઓ"
 
-#: gtk/gtkexpander.c:234
+#: ../gtk/gtkexpander.c:315
 msgid "Space to put between the label and the child"
 msgstr "લેબલ અને બાળની વચ�ચે મૂકવાની જગ�યા"
 
-#: gtk/gtkexpander.c:243 gtk/gtkframe.c:165 gtk/gtktoolbutton.c:216
-#: gtk/gtktoolitemgroup.c:1578
+#: ../gtk/gtkexpander.c:324 ../gtk/gtkframe.c:206 ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolitemgroup.c:1599
 msgid "Label widget"
 msgstr "લેબલ વિજેટ"
 
-#: gtk/gtkexpander.c:244
+#: ../gtk/gtkexpander.c:325
 msgid "A widget to display in place of the usual expander label"
 msgstr "ચોકઠાના સામાન�ય લેબલની જગ�યા� વિજેટ દર�શાવો"
 
-#: gtk/gtkexpander.c:251
-#, fuzzy
+#: ../gtk/gtkexpander.c:332
 msgid "Label fill"
-msgstr "ટેબને ભરવ�"
+msgstr "લેબલને ભરવ�"
 
-#: gtk/gtkexpander.c:252
+#: ../gtk/gtkexpander.c:333
 #, fuzzy
 msgid "Whether the label widget should fill all available horizontal space"
 msgstr "શ�ં બધા બાળકો સરખા માપના હોવા જોઈ�"
 
-#: gtk/gtkexpander.c:258 gtk/gtktoolitemgroup.c:1606 gtk/gtktreeview.c:776
+#: ../gtk/gtkexpander.c:348
+#, fuzzy
+#| msgid "Resize mode"
+msgid "Resize toplevel"
+msgstr "માપબદલવા માટેની સ�થિતિ"
+
+#: ../gtk/gtkexpander.c:349
+msgid ""
+"Whether the expander will resize the toplevel window upon expanding and "
+"collapsing"
+msgstr ""
+
+#: ../gtk/gtkexpander.c:355 ../gtk/gtktoolitemgroup.c:1627
+#: ../gtk/gtktreeview.c:1187
 msgid "Expander Size"
 msgstr "વિસ�તારકન�ં માપ"
 
-#: gtk/gtkexpander.c:259 gtk/gtktoolitemgroup.c:1607 gtk/gtktreeview.c:777
+#: ../gtk/gtkexpander.c:356 ../gtk/gtktoolitemgroup.c:1628
+#: ../gtk/gtktreeview.c:1188
 msgid "Size of the expander arrow"
 msgstr "વિસ�તારક તીરન�ં માપ"
 
-#: gtk/gtkexpander.c:268
+#: ../gtk/gtkexpander.c:365
 msgid "Spacing around expander arrow"
 msgstr "વિસ�તારક તીરની આસપાસની જગ�યા"
 
-#: gtk/gtkfilechooserbutton.c:368
+#: ../gtk/gtkfilechooserbutton.c:409
 msgid "Dialog"
 msgstr "સંવાદ"
 
-#: gtk/gtkfilechooserbutton.c:369
+#: ../gtk/gtkfilechooserbutton.c:410
 msgid "The file chooser dialog to use."
 msgstr "વાપરવા માટે ફાઈલ પસંદગીકારક સંવાદ."
 
-#: gtk/gtkfilechooserbutton.c:400
+#: ../gtk/gtkfilechooserbutton.c:441
 msgid "The title of the file chooser dialog."
 msgstr "ફાઈલ પસંદગીકારક સંવાદન�ં શીર�ષક."
 
-#: gtk/gtkfilechooserbutton.c:414
+#: ../gtk/gtkfilechooserbutton.c:455
 msgid "The desired width of the button widget, in characters."
 msgstr "બટન વિજેટની જરૂરી પહોળાઈ, અક�ષરોમાં."
 
-#: gtk/gtkfilechooser.c:740
+#: ../gtk/gtkfilechooser.c:747
 msgid "Action"
 msgstr "ક�રિયા"
 
-#: gtk/gtkfilechooser.c:741
+#: ../gtk/gtkfilechooser.c:748
 msgid "The type of operation that the file selector is performing"
 msgstr "પ�રક�રિયાનો પ�રકાર કે જે ફાઈલ પસંદગીકારક કરી રહ�ય�ં છે"
 
-#: gtk/gtkfilechooser.c:747 gtk/gtkrecentchooser.c:264
+#: ../gtk/gtkfilechooser.c:754 ../gtk/gtkrecentchooser.c:264
 msgid "Filter"
 msgstr "ગાળક"
 
-#: gtk/gtkfilechooser.c:748
+#: ../gtk/gtkfilechooser.c:755
 msgid "The current filter for selecting which files are displayed"
 msgstr "કઈ ફાઈલો દર�શાવાયેલ છે તે પસંદ કરવા માટે વર�તમાન ગાળક"
 
-#: gtk/gtkfilechooser.c:753
+#: ../gtk/gtkfilechooser.c:760
 msgid "Local Only"
 msgstr "માત�ર સ�થાનિક"
 
-#: gtk/gtkfilechooser.c:754
+#: ../gtk/gtkfilechooser.c:761
 msgid "Whether the selected file(s) should be limited to local file: URLs"
 msgstr "શ�ં પસંદિત ફાઈલો સ�થાનિક ફાઈલ સ�ધી જ મર�યાદિત હોવી જોઈ�: URL"
 
-#: gtk/gtkfilechooser.c:759
+#: ../gtk/gtkfilechooser.c:766
 msgid "Preview widget"
 msgstr "વિજેટન�ં પૂર�વદર�શન"
 
-#: gtk/gtkfilechooser.c:760
+#: ../gtk/gtkfilechooser.c:767
 msgid "Application supplied widget for custom previews."
 msgstr "વૈવિધ�યપૂર�ણ પૂર�વદર�શન માટે કાર�યક�રમને પૂરો પાડવામાં આવેલ વિજેટ."
 
-#: gtk/gtkfilechooser.c:765
+#: ../gtk/gtkfilechooser.c:772
 msgid "Preview Widget Active"
 msgstr "પૂર�વદર�શન વિજેટ સક�રિય"
 
-#: gtk/gtkfilechooser.c:766
-msgid ""
-"Whether the application supplied widget for custom previews should be shown."
+#: ../gtk/gtkfilechooser.c:773
+msgid "Whether the application supplied widget for custom previews should be shown."
 msgstr "શ�ં કાર�યક�રમને વૈવિધ�યપૂર�ણ પૂર�વદર�શનો બતાવવા માટે વિજેટ પૂરો પાડવો જોઈ�."
 
-#: gtk/gtkfilechooser.c:771
+#: ../gtk/gtkfilechooser.c:778
 msgid "Use Preview Label"
 msgstr "પૂર�વદર�શન લેબલ વાપરો"
 
-#: gtk/gtkfilechooser.c:772
+#: ../gtk/gtkfilechooser.c:779
 msgid "Whether to display a stock label with the name of the previewed file."
 msgstr "શ�ં પૂર�વદર�શનવાળીન�ં નામ સાથે સ�ટોક લેબલ દર�શાવવાન�ં છે."
 
-#: gtk/gtkfilechooser.c:777
+#: ../gtk/gtkfilechooser.c:784
 msgid "Extra widget"
 msgstr "વધારાન�ં વિજેટ"
 
-#: gtk/gtkfilechooser.c:778
+#: ../gtk/gtkfilechooser.c:785
 msgid "Application supplied widget for extra options."
 msgstr "વધારાના વિકલ�પો માટે કાર�યક�રમને વિજેટ પૂર�ં પાડવામાં આવેલ છે."
 
-#: gtk/gtkfilechooser.c:783 gtk/gtkrecentchooser.c:203
+#: ../gtk/gtkfilechooser.c:790 ../gtk/gtkrecentchooser.c:203
 msgid "Select Multiple"
 msgstr "�ક કરતાં વધારે પસંદ કરો"
 
-#: gtk/gtkfilechooser.c:784
+#: ../gtk/gtkfilechooser.c:791
 msgid "Whether to allow multiple files to be selected"
 msgstr "શ�ં �ક કરતાં વધારે ફાઈલને પસંદ કરવા માટેની પરવાનગી આપવી"
 
-#: gtk/gtkfilechooser.c:790
+#: ../gtk/gtkfilechooser.c:797
 msgid "Show Hidden"
 msgstr "છ�પ� બતાવો"
 
-#: gtk/gtkfilechooser.c:791
+#: ../gtk/gtkfilechooser.c:798
 msgid "Whether the hidden files and folders should be displayed"
 msgstr "શ�ં છ�પી ફાઈલો અને ફોલ�ડરો દર�શાવવા જોઈ�"
 
-#: gtk/gtkfilechooser.c:806
+#: ../gtk/gtkfilechooser.c:813
 msgid "Do overwrite confirmation"
 msgstr "ઉપર ફરીથી લખવામાં ખાતરી"
 
-#: gtk/gtkfilechooser.c:807
+#: ../gtk/gtkfilechooser.c:814
 msgid ""
 "Whether a file chooser in save mode will present an overwrite confirmation "
 "dialog if necessary."
@@ -2763,12 +3166,11 @@ msgstr ""
 "શ�ં ફાઈલ પસંદગીકારક � સંગ�રહો સ�થિતિમાં જો જરૂરી હોય ત�યારે ઉપર ફરીથી લખવા માટેની "
 "ખાતરીવાળો સંવાદ દર�શાવશે."
 
-#: gtk/gtkfilechooser.c:823
-#, fuzzy
+#: ../gtk/gtkfilechooser.c:830
 msgid "Allow folder creation"
-msgstr "ફોલ�ડરો પસંદગી ને પરવાનગી આપો"
+msgstr "ફોલ�ડર બનાવવા પરવાનગી આપો"
 
-#: gtk/gtkfilechooser.c:824
+#: ../gtk/gtkfilechooser.c:831
 msgid ""
 "Whether a file chooser not in open mode will offer the user to create new "
 "folders."
@@ -2776,414 +3178,499 @@ msgstr ""
 "ક�યાંતો ફાઇલ પસંદગીકારક ખ�લ�લી સ�થિતિમાં નથી તે નવા ફોલ�ડરોને બનાવવા માટે વપરાશકર�તાને "
 "માંગણી કરશે."
 
-#: gtk/gtkfixed.c:98 gtk/gtklayout.c:605
+#: ../gtk/gtkfixed.c:152 ../gtk/gtklayout.c:634 ../gtk/gtktreeviewcolumn.c:264
 msgid "X position"
 msgstr "X સ�થિતિ"
 
-#: gtk/gtkfixed.c:99 gtk/gtklayout.c:606
+#: ../gtk/gtkfixed.c:153 ../gtk/gtklayout.c:635
 msgid "X position of child widget"
 msgstr "બાળ વિજેટ માટેની X સ�થિતિ"
 
-#: gtk/gtkfixed.c:108 gtk/gtklayout.c:615
+#: ../gtk/gtkfixed.c:160 ../gtk/gtklayout.c:644
 msgid "Y position"
 msgstr "Y સ�થિતિ"
 
-#: gtk/gtkfixed.c:109 gtk/gtklayout.c:616
+#: ../gtk/gtkfixed.c:161 ../gtk/gtklayout.c:645
 msgid "Y position of child widget"
 msgstr "બાળ વિજેટ માટેની Y સ�થિતિ"
 
-#: gtk/gtkfontbutton.c:141
-msgid "The title of the font selection dialog"
-msgstr "ફોન�ટ પસંદગી સંવાદન�ં શીર�ષક"
+#: ../gtk/gtkfontbutton.c:151
+#, fuzzy
+#| msgid "The title of the file chooser dialog."
+msgid "The title of the font chooser dialog"
+msgstr "ફાઈલ પસંદગીકારક સંવાદન�ં શીર�ષક."
 
-#: gtk/gtkfontbutton.c:156 gtk/gtkfontsel.c:223
+#: ../gtk/gtkfontbutton.c:166 ../gtk/gtkfontsel.c:244
 msgid "Font name"
 msgstr "ફોન�ટ નામ"
 
-#: gtk/gtkfontbutton.c:157
+#: ../gtk/gtkfontbutton.c:167
 msgid "The name of the selected font"
 msgstr "પસંદિત ફોન�ટન�ં નામ"
 
-#: gtk/gtkfontbutton.c:158
+#: ../gtk/gtkfontbutton.c:168
 msgid "Sans 12"
 msgstr "સાન�સ ૧૨"
 
-#: gtk/gtkfontbutton.c:173
+#: ../gtk/gtkfontbutton.c:183
 msgid "Use font in label"
 msgstr "લેબલમાં ફોન�ટ વાપરો"
 
-#: gtk/gtkfontbutton.c:174
+#: ../gtk/gtkfontbutton.c:184
 msgid "Whether the label is drawn in the selected font"
 msgstr "શ�ં પસંદિત ફોન�ટમાં લેબલ દોરવામાં આવવ�ં જોઈ�"
 
-#: gtk/gtkfontbutton.c:189
+#: ../gtk/gtkfontbutton.c:199
 msgid "Use size in label"
 msgstr "લેબલમાં માપ વાપરો"
 
-#: gtk/gtkfontbutton.c:190
+#: ../gtk/gtkfontbutton.c:200
 msgid "Whether the label is drawn with the selected font size"
 msgstr "શ�ં લેબલ પસંદિત ફોન�ટ માપ સાથે દોરવામાં આવે છે"
 
-#: gtk/gtkfontbutton.c:206
+#: ../gtk/gtkfontbutton.c:216
 msgid "Show style"
 msgstr "શૈલી બતાવો"
 
-#: gtk/gtkfontbutton.c:207
+#: ../gtk/gtkfontbutton.c:217
 msgid "Whether the selected font style is shown in the label"
 msgstr "શ�ં પસંદિત ફોન�ટ શૈલી લેબલમાં બતાવાય છે"
 
-#: gtk/gtkfontbutton.c:222
+#: ../gtk/gtkfontbutton.c:232
 msgid "Show size"
 msgstr "માપ બતાવો"
 
-#: gtk/gtkfontbutton.c:223
+#: ../gtk/gtkfontbutton.c:233
 msgid "Whether selected font size is shown in the label"
 msgstr "શ�ં પસંદિત ફોન�ટ માપ લેબલમાં બતાવાય છે"
 
-#: gtk/gtkfontsel.c:224
+#: ../gtk/gtkfontsel.c:245
 msgid "The string that represents this font"
 msgstr "શબ�દમાળા કે જે આ ફોન�ટને રજૂ કરે છે"
 
-#: gtk/gtkfontsel.c:230
+#: ../gtk/gtkfontsel.c:251
 msgid "Preview text"
 msgstr "લખાણન�ં પૂર�વદર�શન"
 
-#: gtk/gtkfontsel.c:231
+#: ../gtk/gtkfontsel.c:252
 msgid "The text to display in order to demonstrate the selected font"
 msgstr "પસંદ કરેલા ફોન�ટને રજૂ કરવા માટે દર�શાવવાન�ં લેખન"
 
-#: gtk/gtkframe.c:131
+#: ../gtk/gtkframe.c:172
 msgid "Text of the frame's label"
 msgstr "ચોકઠાના લેબલન�ં લખાણ"
 
-#: gtk/gtkframe.c:138
+#: ../gtk/gtkframe.c:179
 msgid "Label xalign"
 msgstr "લેબલ xalign"
 
-#: gtk/gtkframe.c:139
+#: ../gtk/gtkframe.c:180
 msgid "The horizontal alignment of the label"
 msgstr "લેબલની આડી દિશામાં કતારબંધ ગોઠવણી"
 
-#: gtk/gtkframe.c:147
+#: ../gtk/gtkframe.c:188
 msgid "Label yalign"
 msgstr "લેબલ yalign"
 
-#: gtk/gtkframe.c:148
+#: ../gtk/gtkframe.c:189
 msgid "The vertical alignment of the label"
 msgstr "લેબલની ઊભી દિશામાં કતારબંધ ગોઠવણી"
 
-#: gtk/gtkframe.c:156
+#: ../gtk/gtkframe.c:197
 msgid "Frame shadow"
 msgstr "ચોકઠાનો પડછાયો"
 
-#: gtk/gtkframe.c:157
+#: ../gtk/gtkframe.c:198
 msgid "Appearance of the frame border"
 msgstr "ચોકઠાની કિનારીનો દેખાવ"
 
-#: gtk/gtkframe.c:166
+#: ../gtk/gtkframe.c:207
 msgid "A widget to display in place of the usual frame label"
 msgstr "ચોકઠાના સામાન�ય લેબલની જગ�યા� દર�શાવવાન�ં વિજેટ"
 
-#: gtk/gtkhandlebox.c:183
+#: ../gtk/gtkgrid.c:1298 ../gtk/gtktable.c:209
+msgid "Row spacing"
+msgstr "હરોળ વચ�ચે જગ�યા"
+
+#: ../gtk/gtkgrid.c:1299 ../gtk/gtktable.c:210
+msgid "The amount of space between two consecutive rows"
+msgstr "બે સળંગ હરોળોની વચ�ચેની જગ�યા"
+
+#: ../gtk/gtkgrid.c:1305 ../gtk/gtktable.c:218
+msgid "Column spacing"
+msgstr "સ�તંભ વચ�ચે જગ�યા"
+
+#: ../gtk/gtkgrid.c:1306 ../gtk/gtktable.c:219
+msgid "The amount of space between two consecutive columns"
+msgstr "બે સળંગ સ�તંભો વચ�ચેની જગ�યા"
+
+#: ../gtk/gtkgrid.c:1312
+#, fuzzy
+#| msgid "Homogeneous"
+msgid "Row Homogeneous"
+msgstr "�ક જ સરખાં "
+
+#: ../gtk/gtkgrid.c:1313
+#, fuzzy
+#| msgid "If TRUE, the table cells are all the same width/height"
+msgid "If TRUE, the rows are all the same height"
+msgstr "જો TRUE હોય, તો કોષ�ટક ખાનાંઓને સરખી પહોળાઈ/ઊંચાઈ હોય છે"
+
+#: ../gtk/gtkgrid.c:1319
+#, fuzzy
+#| msgid "Homogeneous"
+msgid "Column Homogeneous"
+msgstr "�ક જ સરખાં "
+
+#: ../gtk/gtkgrid.c:1320
+#, fuzzy
+#| msgid "If TRUE, the table cells are all the same width/height"
+msgid "If TRUE, the columns are all the same width"
+msgstr "જો TRUE હોય, તો કોષ�ટક ખાનાંઓને સરખી પહોળાઈ/ઊંચાઈ હોય છે"
+
+#: ../gtk/gtkgrid.c:1326 ../gtk/gtktable.c:235
+msgid "Left attachment"
+msgstr "ડાબેથી જોડાયેલ�"
+
+#: ../gtk/gtkgrid.c:1327 ../gtk/gtkmenu.c:761 ../gtk/gtktable.c:236
+msgid "The column number to attach the left side of the child to"
+msgstr "બાળની ડાબી બાજ� જોડવા માટેનો સ�તંભનો ક�રમાંક"
+
+#: ../gtk/gtkgrid.c:1333 ../gtk/gtktable.c:249
+msgid "Top attachment"
+msgstr "ઉપરથી જોડાયેલ�"
+
+#: ../gtk/gtkgrid.c:1334
+#, fuzzy
+#| msgid "The row number to attach the top of a child widget to"
+msgid "The row number to attach the top side of a child widget to"
+msgstr "બાળ વિજેટની ઉપરની બાજ� જોડવા માટેનો હરોળનો ક�રમાંક"
+
+#: ../gtk/gtkgrid.c:1340 ../gtk/gtklayout.c:660 ../gtk/gtktreeviewcolumn.c:274
+msgid "Width"
+msgstr "પહોળાઈ"
+
+#: ../gtk/gtkgrid.c:1341
+#, fuzzy
+#| msgid "The number of columns in the table"
+msgid "The number of columns that a child spans"
+msgstr "ટેબલમાં સ�તંભોની સંખ�યા"
+
+#: ../gtk/gtkgrid.c:1347 ../gtk/gtklayout.c:669
+msgid "Height"
+msgstr "ઊંચાઈ"
+
+#: ../gtk/gtkgrid.c:1348
+#, fuzzy
+#| msgid "The number of rows in the table"
+msgid "The number of rows that a child spans"
+msgstr "કોષ�ટકમાં હરોળોની સંખ�યા"
+
+#: ../gtk/gtkhandlebox.c:219
 msgid "Appearance of the shadow that surrounds the container"
 msgstr "સમાવનારની આસપાસના પડછાયાનો દેખાવ"
 
-#: gtk/gtkhandlebox.c:191
+#: ../gtk/gtkhandlebox.c:227
 msgid "Handle position"
 msgstr "હેન�ડલની સ�થિતિ"
 
-#: gtk/gtkhandlebox.c:192
+#: ../gtk/gtkhandlebox.c:228
 msgid "Position of the handle relative to the child widget"
 msgstr "બાળ વિજેટને સંબધિત હેન�ડલની સ�થિતિ"
 
-#: gtk/gtkhandlebox.c:200
+#: ../gtk/gtkhandlebox.c:236
 msgid "Snap edge"
 msgstr "સ�નેપ �ડ�જ"
 
-#: gtk/gtkhandlebox.c:201
+#: ../gtk/gtkhandlebox.c:237
 msgid ""
 "Side of the handlebox that's lined up with the docking point to dock the "
 "handlebox"
 msgstr "હેન�ડલબોક�સની બાજ� જે હેન�ડલબોક�સમાં સંગ�રહ કરવા માટે સંગ�રહબિંદ� સાથે હારબંધ કરાઈ છે"
 
-#: gtk/gtkhandlebox.c:209
+#: ../gtk/gtkhandlebox.c:245
 msgid "Snap edge set"
 msgstr "સ�નેપ �ડ�જ સ�યોજિત છે"
 
-#: gtk/gtkhandlebox.c:210
+#: ../gtk/gtkhandlebox.c:246
 msgid ""
 "Whether to use the value from the snap_edge property or a value derived from "
 "handle_position"
 msgstr ""
 "શ�ં સ�નેપ_�ડ�જ ના ગ�ણધર�મોમાંથી કિંમત મેળવેલી કે પછી હેન�ડલની સ�થિતિમાંથી તારવેલી કિંમત વાપરવી"
 
-#: gtk/gtkhandlebox.c:217
+#: ../gtk/gtkhandlebox.c:253
 msgid "Child Detached"
 msgstr "બાળ ને અલગ પાડેલ છે"
 
-#: gtk/gtkhandlebox.c:218
+#: ../gtk/gtkhandlebox.c:254
 msgid ""
 "A boolean value indicating whether the handlebox's child is attached or "
 "detached."
 msgstr "બ�લિયન કિંમત � સૂચવે છે કે ક�યાંતો બાળ ન�ં હેન�ડલ બોક�સ � જોડાયેલ અથવા અલગ છે કે નહિં."
 
-#: gtk/gtkiconview.c:550
+#: ../gtk/gtkiconview.c:527 ../gtk/gtktreeselection.c:131
 msgid "Selection mode"
 msgstr "પસંદગી સ�થિતિ"
 
-#: gtk/gtkiconview.c:551
+#: ../gtk/gtkiconview.c:528
 msgid "The selection mode"
 msgstr "પસંદગી સ�થિતિ"
 
-#: gtk/gtkiconview.c:569
+#: ../gtk/gtkiconview.c:546
 msgid "Pixbuf column"
 msgstr "Pixbuf સ�તંભ"
 
-#: gtk/gtkiconview.c:570
+#: ../gtk/gtkiconview.c:547
 msgid "Model column used to retrieve the icon pixbuf from"
 msgstr "ચિહ�ન pixbuf આમાંથી મેળવવા માટે વપરાયેલ નમૂના સ�તંભ"
 
-#: gtk/gtkiconview.c:588
+#: ../gtk/gtkiconview.c:565
 msgid "Model column used to retrieve the text from"
 msgstr "આમાંથી લખાણ મેળવવા માટે વપરાયેલ નમૂના સ�તંભ"
 
-#: gtk/gtkiconview.c:607
+#: ../gtk/gtkiconview.c:584
 msgid "Markup column"
 msgstr "સ�તંભને નિશાન કરો"
 
-#: gtk/gtkiconview.c:608
+#: ../gtk/gtkiconview.c:585
 msgid "Model column used to retrieve the text if using Pango markup"
 msgstr "જો પેન�ગો માર�કઅપ વાપરી રહ�યા હોય તો લખાણ મેળવવા માટે વપરાત�ં નમૂના સ�તંભ"
 
-#: gtk/gtkiconview.c:615
+#: ../gtk/gtkiconview.c:592
 msgid "Icon View Model"
 msgstr "ચિહ�ન દેખાવ મોડેલ"
 
-#: gtk/gtkiconview.c:616
+#: ../gtk/gtkiconview.c:593
 msgid "The model for the icon view"
 msgstr "ચિહ�ન દેખાવ માટેન�ં મોડેલ"
 
-#: gtk/gtkiconview.c:632
+#: ../gtk/gtkiconview.c:609
 msgid "Number of columns"
 msgstr "સ�તંભોની સંખ�યા"
 
-#: gtk/gtkiconview.c:633
+#: ../gtk/gtkiconview.c:610
 msgid "Number of columns to display"
 msgstr "દર�શાવવા માટેના સ�તંભોની સંખ�યા"
 
-#: gtk/gtkiconview.c:650
+#: ../gtk/gtkiconview.c:627
 msgid "Width for each item"
 msgstr "દરેક વસ�ત� માટે પહોળાઈ"
 
-#: gtk/gtkiconview.c:651
+#: ../gtk/gtkiconview.c:628
 msgid "The width used for each item"
 msgstr "દરેક વસ�ત� માટે વપરાતી પહોળાઈ"
 
-#: gtk/gtkiconview.c:667
+#: ../gtk/gtkiconview.c:644
 msgid "Space which is inserted between cells of an item"
 msgstr "જગ�યા કે જે વસ�ત�ના ખાનાંઓ વચ�ચે દાખલ થાય છે"
 
-#: gtk/gtkiconview.c:682
+#: ../gtk/gtkiconview.c:659
 msgid "Row Spacing"
 msgstr "હરોળ વચ�ચે જગ�યા"
 
-#: gtk/gtkiconview.c:683
+#: ../gtk/gtkiconview.c:660
 msgid "Space which is inserted between grid rows"
 msgstr "જગ�યા કે જે હરોળ જાળીઓ વચ�ચે દાખલ થયેલ છે"
 
-#: gtk/gtkiconview.c:698
+#: ../gtk/gtkiconview.c:675
 msgid "Column Spacing"
 msgstr "સ�તંભ વચ�ચે જગ�યા"
 
-#: gtk/gtkiconview.c:699
+#: ../gtk/gtkiconview.c:676
 msgid "Space which is inserted between grid columns"
 msgstr "જગ�યા કે જે જાળી સ�તંભો વચ�ચે દાખલ થયેલ છે"
 
-#: gtk/gtkiconview.c:714
+#: ../gtk/gtkiconview.c:691
 msgid "Margin"
 msgstr "હાંસ�યો"
 
-#: gtk/gtkiconview.c:715
+#: ../gtk/gtkiconview.c:692
 msgid "Space which is inserted at the edges of the icon view"
 msgstr "જગ�યા કે જે ચિહ�ન દેખાવની બાજ�ઓ વચ�ચે દાખલ થયેલ છે"
 
-#: gtk/gtkiconview.c:730
+#: ../gtk/gtkiconview.c:707
 #, fuzzy
 msgid "Item Orientation"
 msgstr "દિશા"
 
-#: gtk/gtkiconview.c:731
-msgid ""
-"How the text and icon of each item are positioned relative to each other"
+#: ../gtk/gtkiconview.c:708
+msgid "How the text and icon of each item are positioned relative to each other"
 msgstr "કેવી રીતે દરેક વસ�ત�ન�ં લખાણ અને ચિહ�ન �કબીજાને અન�લક�ષીને ગોઠવાય છે"
 
-#: gtk/gtkiconview.c:747 gtk/gtktreeview.c:611 gtk/gtktreeviewcolumn.c:311
+#: ../gtk/gtkiconview.c:724 ../gtk/gtktreeview.c:1022
+#: ../gtk/gtktreeviewcolumn.c:374
 msgid "Reorderable"
 msgstr "ફરીથી ગોઠવી શકાય તેવ�ં"
 
-#: gtk/gtkiconview.c:748 gtk/gtktreeview.c:612
+#: ../gtk/gtkiconview.c:725 ../gtk/gtktreeview.c:1023
 msgid "View is reorderable"
 msgstr "ફરીથી ગોઠવી શકાય � રીતે જ�ઓ"
 
-#: gtk/gtkiconview.c:755 gtk/gtktreeview.c:762
+#: ../gtk/gtkiconview.c:732 ../gtk/gtktreeview.c:1173
 msgid "Tooltip Column"
 msgstr "સાધનમદદ સ�તંભ"
 
-#: gtk/gtkiconview.c:756
+#: ../gtk/gtkiconview.c:733
 msgid "The column in the model containing the tooltip texts for the items"
 msgstr "વસ�ત�ઓમાંથી સાધનમદદ લખાણો સમાવતો મોડેલમાંનો સ�તંભ"
 
-#: gtk/gtkiconview.c:773
+#: ../gtk/gtkiconview.c:750
 msgid "Item Padding"
 msgstr "વસ�ત� પેડિંગ"
 
-#: gtk/gtkiconview.c:774
+#: ../gtk/gtkiconview.c:751
 msgid "Padding around icon view items"
 msgstr "ચિહ�ન દૃશ�ય વસ�ત�ઓની આસપાસ પેડિંગ"
 
-#: gtk/gtkiconview.c:783
+#: ../gtk/gtkiconview.c:782
 msgid "Selection Box Color"
 msgstr "પસંદગી બોક�સ રંગ"
 
-#: gtk/gtkiconview.c:784
+#: ../gtk/gtkiconview.c:783
 msgid "Color of the selection box"
 msgstr "પસંદગી બોક�સનો રંગ"
 
-#: gtk/gtkiconview.c:790
+#: ../gtk/gtkiconview.c:789
 msgid "Selection Box Alpha"
 msgstr "પસંદગી બોક�સ આલ�ફા"
 
-#: gtk/gtkiconview.c:791
+#: ../gtk/gtkiconview.c:790
 msgid "Opacity of the selection box"
 msgstr "પસંદગી બોક�સની અપારદર�શકતા"
 
-#: gtk/gtkimage.c:227 gtk/gtkstatusicon.c:212
+#: ../gtk/gtkimage.c:237 ../gtk/gtkstatusicon.c:235
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: gtk/gtkimage.c:228 gtk/gtkstatusicon.c:213
+#: ../gtk/gtkimage.c:238 ../gtk/gtkstatusicon.c:236
 msgid "A GdkPixbuf to display"
 msgstr "પ�રદર�શિત કરવા માટે GdkPixbuf"
 
-#: gtk/gtkimage.c:235 gtk/gtkrecentmanager.c:290 gtk/gtkstatusicon.c:220
+#: ../gtk/gtkimage.c:245 ../gtk/gtkrecentmanager.c:294
+#: ../gtk/gtkstatusicon.c:243
 msgid "Filename"
 msgstr "ફાઈલ નામ"
 
-#: gtk/gtkimage.c:236 gtk/gtkstatusicon.c:221
+#: ../gtk/gtkimage.c:246 ../gtk/gtkstatusicon.c:244
 msgid "Filename to load and display"
 msgstr "લાવવા અને દર�શાવવા માટેન�ં ફાઈલન�ં નામ"
 
-#: gtk/gtkimage.c:245 gtk/gtkstatusicon.c:229
+#: ../gtk/gtkimage.c:255 ../gtk/gtkstatusicon.c:252
 msgid "Stock ID for a stock image to display"
 msgstr "સ�ટોક ઈમેજ માટે દર�શાવવાન�ં સ�ટોક ID"
 
-#: gtk/gtkimage.c:252
+#: ../gtk/gtkimage.c:262
 msgid "Icon set"
 msgstr "ચિહ�ન સમૂહ"
 
-#: gtk/gtkimage.c:253
+#: ../gtk/gtkimage.c:263
 msgid "Icon set to display"
 msgstr "દર�શાવવા માટેનો ચિહ�ન સમૂહ"
 
-#: gtk/gtkimage.c:260 gtk/gtkscalebutton.c:230 gtk/gtktoolbar.c:494
-#: gtk/gtktoolpalette.c:1003
+#: ../gtk/gtkimage.c:270 ../gtk/gtkscalebutton.c:228 ../gtk/gtktoolbar.c:530
+#: ../gtk/gtktoolpalette.c:1008
 msgid "Icon size"
 msgstr "ચિહ�નન�ં માપ"
 
-#: gtk/gtkimage.c:261
+#: ../gtk/gtkimage.c:271
 msgid "Symbolic size to use for stock icon, icon set or named icon"
 msgstr "સ�ટોક ચિહ�ન માટે વાપરવાન�ં સંજ�ઞાકીય માપ, ચિહ�ન સમૂહ અથવા નામવાળ�ં ચિહ�ન"
 
-#: gtk/gtkimage.c:277
+#: ../gtk/gtkimage.c:287
 msgid "Pixel size"
 msgstr "પિક�સેલ માપ"
 
-#: gtk/gtkimage.c:278
+#: ../gtk/gtkimage.c:288
 msgid "Pixel size to use for named icon"
 msgstr "નામવાળા ચિહ�ન માટે વાપરવાન�ં પિક�સેલ માપ"
 
-#: gtk/gtkimage.c:286
+#: ../gtk/gtkimage.c:296
 msgid "Animation"
 msgstr "�નીમેશન"
 
-#: gtk/gtkimage.c:287
+#: ../gtk/gtkimage.c:297
 msgid "GdkPixbufAnimation to display"
 msgstr "પ�રદર�શિત કરવા માટે GdkPixbufAnimation"
 
-#: gtk/gtkimage.c:327 gtk/gtkstatusicon.c:260
+#: ../gtk/gtkimage.c:337 ../gtk/gtkstatusicon.c:283
 msgid "Storage type"
 msgstr "સંગ�રહનો પ�રકાર"
 
-#: gtk/gtkimage.c:328 gtk/gtkstatusicon.c:261
+#: ../gtk/gtkimage.c:338 ../gtk/gtkstatusicon.c:284
 msgid "The representation being used for image data"
 msgstr "ચિત�રની માહિતી માટે વપરાતી રજૂઆત"
 
-#: gtk/gtkimagemenuitem.c:139
+#: ../gtk/gtkimage.c:356
+#, fuzzy
+#| msgid "Use alpha"
+msgid "Use Fallback"
+msgstr "આલ�ફા વાપરો"
+
+#: ../gtk/gtkimage.c:357
+#, fuzzy
+msgid "Whether to use icon names fallback"
+msgstr "શ�ં પરિસ�થિતિ ચિહ�ન � દૃશ�યમાન છે કે નહિં"
+
+#: ../gtk/gtkimagemenuitem.c:161
 msgid "Child widget to appear next to the menu text"
 msgstr "મેન�ના લેખાણ પછી દેખાત�ં બાળ વિજેટ"
 
-#: gtk/gtkimagemenuitem.c:154
+#: ../gtk/gtkimagemenuitem.c:176
 msgid "Whether to use the label text to create a stock menu item"
 msgstr "ક�યાંતો સ�ટોક મેન� વસ�ત� ને બનાવવા માટે લેબલ લખાણ ને વાપરો"
 
-#: gtk/gtkimagemenuitem.c:187 gtk/gtkmenu.c:540
+#: ../gtk/gtkimagemenuitem.c:209 ../gtk/gtkmenu.c:603
 msgid "Accel Group"
 msgstr "�ક�સેલ જૂથ"
 
-#: gtk/gtkimagemenuitem.c:188
+#: ../gtk/gtkimagemenuitem.c:210
 msgid "The Accel Group to use for stock accelerator keys"
 msgstr "સ�ટોક પ�રવેગ કીઓ માટે વપરાત� �ક�સેલ જૂથ"
 
-#: gtk/gtkimagemenuitem.c:193
-msgid "Show menu images"
-msgstr "મેન� ઈમેજો બતાવો"
-
-#: gtk/gtkimagemenuitem.c:194
-msgid "Whether images should be shown in menus"
-msgstr "શ�ં ઈમેજો મેન�ઓમાં બતાવવી જોઈ�"
-
-#: gtk/gtkinfobar.c:375 gtk/gtkmessagedialog.c:201
+#: ../gtk/gtkinfobar.c:372 ../gtk/gtkmessagedialog.c:204
 msgid "Message Type"
 msgstr "સંદેશા પ�રકાર"
 
-#: gtk/gtkinfobar.c:376 gtk/gtkmessagedialog.c:202
+#: ../gtk/gtkinfobar.c:373 ../gtk/gtkmessagedialog.c:205
 msgid "The type of message"
 msgstr "સંદેશાનો પ�રકાર"
 
-#: gtk/gtkinfobar.c:431
+#: ../gtk/gtkinfobar.c:428
 msgid "Width of border around the content area"
 msgstr "સમાવિષ�ટ વિસ�તારની આસપાસ કિનારીની પહોળાઈ"
 
-#: gtk/gtkinfobar.c:448
+#: ../gtk/gtkinfobar.c:445
 msgid "Spacing between elements of the area"
 msgstr "વિસ�તારનાં ઘટકો વચ�ચે જગ�યા છોડી રહ�યા છે"
 
-#: gtk/gtkinfobar.c:480
+#: ../gtk/gtkinfobar.c:477
 msgid "Width of border around the action area"
 msgstr "ક�રિયા વિસ�તાર આસપાસ કિનારીની પહોળાઈ"
 
-#: gtk/gtkinvisible.c:89 gtk/gtkmountoperation.c:175 gtk/gtkstatusicon.c:279
-#: gtk/gtkwindow.c:693
+#: ../gtk/gtkinvisible.c:103 ../gtk/gtkmountoperation.c:173
+#: ../gtk/gtkstatusicon.c:302 ../gtk/gtkstylecontext.c:432
+#: ../gtk/gtkwindow.c:765
 msgid "Screen"
 msgstr "સ�ક�રીન"
 
-#: gtk/gtkinvisible.c:90 gtk/gtkwindow.c:694
+#: ../gtk/gtkinvisible.c:104 ../gtk/gtkwindow.c:766
 msgid "The screen where this window will be displayed"
 msgstr "સ�ક�રિન કે જ�યાં વિન�ડો દેખાડવામાં આવશે"
 
-#: gtk/gtklabel.c:550
+#: ../gtk/gtklabel.c:745
 msgid "The text of the label"
 msgstr "લેબલન�ં લખાણ"
 
-#: gtk/gtklabel.c:557
+#: ../gtk/gtklabel.c:752
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "લેબલના લખાણ પર અમલમાં મૂકવા માટેની શૈલીના ગ�ણધર�મોની યાદી"
 
-#: gtk/gtklabel.c:578 gtk/gtktexttag.c:335 gtk/gtktextview.c:685
+#: ../gtk/gtklabel.c:773 ../gtk/gtktexttag.c:386 ../gtk/gtktextview.c:703
 msgid "Justification"
 msgstr "સમર�થન"
 
-#: gtk/gtklabel.c:579
+#: ../gtk/gtklabel.c:774
 msgid ""
 "The alignment of the lines in the text of the label relative to each other. "
 "This does NOT affect the alignment of the label within its allocation. See "
@@ -3192,57 +3679,57 @@ msgstr ""
 "લેબલના લખાણમાં �કબીજા સાથે સંકળાયેલી લીટીઓની ગોઠવણી. આ લેબલની ફાળવણીની અંદરની �ની "
 "ગોઠવણીને અસર કરત�ં નથી. આના માટે GtkMisc::xalign જ�ઓ"
 
-#: gtk/gtklabel.c:587
+#: ../gtk/gtklabel.c:782
 msgid "Pattern"
 msgstr "ભાત"
 
-#: gtk/gtklabel.c:588
+#: ../gtk/gtklabel.c:783
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
 msgstr "શબ�દમાળા સાથે અક�ષરોની નીચે લીટી (_) કરવા માટેના લખાણમાંના અક�ષરોને અન�ર�પ સ�થિતિ"
 
-#: gtk/gtklabel.c:595
+#: ../gtk/gtklabel.c:790
 msgid "Line wrap"
 msgstr "લીટી લપેટો"
 
-#: gtk/gtklabel.c:596
+#: ../gtk/gtklabel.c:791
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "જો સ�યોજિત હોય તો, લખાણ બહ�ં મોટ�ં થઈ જાય તો લીટીઓને લપેટી દો"
 
-#: gtk/gtklabel.c:611
+#: ../gtk/gtklabel.c:806
 msgid "Line wrap mode"
 msgstr "લીટી લપેટો સ�થિતિ"
 
-#: gtk/gtklabel.c:612
+#: ../gtk/gtklabel.c:807
 msgid "If wrap is set, controls how linewrapping is done"
 msgstr "જો લપેટો સ�યોજિત હોય, તો તે કેવી રીતે લીટી લપેટવાન�ં થાય તે નિયંત�રિત કરે છે"
 
-#: gtk/gtklabel.c:619
+#: ../gtk/gtklabel.c:814
 msgid "Selectable"
 msgstr "પસંદ કરી શકાય તેવ�ં"
 
-#: gtk/gtklabel.c:620
+#: ../gtk/gtklabel.c:815
 msgid "Whether the label text can be selected with the mouse"
 msgstr "શ�ં લેબલન�ં લખાણ માઉસથી પસંદ કરી શકાય"
 
-#: gtk/gtklabel.c:626
+#: ../gtk/gtklabel.c:821
 msgid "Mnemonic key"
 msgstr "સંજ�ઞાસૂચિ કી"
 
-#: gtk/gtklabel.c:627
+#: ../gtk/gtklabel.c:822
 msgid "The mnemonic accelerator key for this label"
 msgstr "આ લેબલ માટે સંજ�ઞાસૂચી પ�રવેગક કી"
 
-#: gtk/gtklabel.c:635
+#: ../gtk/gtklabel.c:830
 msgid "Mnemonic widget"
 msgstr "સંજ�ઞાસૂચી વિજેટ"
 
-#: gtk/gtklabel.c:636
+#: ../gtk/gtklabel.c:831
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr "જ�યારે લેબલની સંજ�ઞાસૂચી કી દબાવવામાં આવે ત�યારે કાર�યશીલ કરવામાં આવત� વિજેટ"
 
-#: gtk/gtklabel.c:682
+#: ../gtk/gtklabel.c:877
 msgid ""
 "The preferred place to ellipsize the string, if the label does not have "
 "enough room to display the entire string"
@@ -3250,502 +3737,484 @@ msgstr ""
 "શબ�દમાળા ઈલીપ�સાઈ� કરવા માટેની પ�રાધાન�યવાળી જગ�યા, જો લેબલ પાસે પૂરતી આખી શબ�દમાળા "
 "દર�શાવવા માટે પૂરતી જગ�યા નહિં હોય"
 
-#: gtk/gtklabel.c:723
+#: ../gtk/gtklabel.c:918
 msgid "Single Line Mode"
 msgstr "�ક લીટી સ�થિતિ"
 
-#: gtk/gtklabel.c:724
+#: ../gtk/gtklabel.c:919
 msgid "Whether the label is in single line mode"
 msgstr "શ�ં લેબલ �ક લીટી સ�થિતિમાં છે"
 
-#: gtk/gtklabel.c:741
+#: ../gtk/gtklabel.c:936
 msgid "Angle"
 msgstr "કોણ"
 
-#: gtk/gtklabel.c:742
+#: ../gtk/gtklabel.c:937
 msgid "Angle at which the label is rotated"
 msgstr "કોણ કે જે માપે લેબલ ફરશે"
 
-#: gtk/gtklabel.c:764
+#: ../gtk/gtklabel.c:959
 msgid "The desired maximum width of the label, in characters"
 msgstr "લેબલની જરૂરી મહત�તમ પહોળાઈ, અક�ષરોમાં"
 
-#: gtk/gtklabel.c:782
+#: ../gtk/gtklabel.c:977
 msgid "Track visited links"
 msgstr "મ�લાકાત લેવાયેલ કડીઓનો ટ�રેક કરો"
 
-#: gtk/gtklabel.c:783
+#: ../gtk/gtklabel.c:978
 msgid "Whether visited links should be tracked"
 msgstr "ક�યાંતો મ�લાકાત થયેલ કડીઓ ટ�રેક થયેલ હોવી જોઇ�"
 
-#: gtk/gtklabel.c:904
-msgid "Whether to select the contents of a selectable label when it is focused"
-msgstr ""
-"શ�ં પસંદ કરી શકાય તેવા લેબલના સમાવિષ�ટોને જ�યારે તેઓ ફોકસ થયેલ હોય ત�યારે પસંદ કરવા કે નહિં"
-
-#: gtk/gtklayout.c:625 gtk/gtkviewport.c:142
-msgid "Horizontal adjustment"
-msgstr "આડી ગોઠવણી"
-
-#: gtk/gtklayout.c:626 gtk/gtkscrolledwindow.c:244
-msgid "The GtkAdjustment for the horizontal position"
-msgstr "આડી સ�થિતિ માટે GtkAdjustment"
-
-#: gtk/gtklayout.c:633 gtk/gtkviewport.c:150
-msgid "Vertical adjustment"
-msgstr "ઊભી ગોઠવણી"
-
-#: gtk/gtklayout.c:634 gtk/gtkscrolledwindow.c:251
-msgid "The GtkAdjustment for the vertical position"
-msgstr "ઊભી સ�થિતિ માટે GtkAdjustment"
-
-#: gtk/gtklayout.c:641 gtk/gtktreeviewcolumn.c:211
-msgid "Width"
-msgstr "પહોળાઈ"
-
-#: gtk/gtklayout.c:642
+#: ../gtk/gtklayout.c:661
 msgid "The width of the layout"
 msgstr "દેખાવની પહોળાઈ"
 
-#: gtk/gtklayout.c:650
-msgid "Height"
-msgstr "ઊંચાઈ"
-
-#: gtk/gtklayout.c:651
+#: ../gtk/gtklayout.c:670
 msgid "The height of the layout"
 msgstr "દેખાવની ઊંચાઈ"
 
-#: gtk/gtklinkbutton.c:162
+#: ../gtk/gtklinkbutton.c:173
 msgid "URI"
 msgstr "URI"
 
-#: gtk/gtklinkbutton.c:163
+#: ../gtk/gtklinkbutton.c:174
 msgid "The URI bound to this button"
 msgstr "આ બટન માં URI બાઉન�ડ"
 
-#: gtk/gtklinkbutton.c:177
+#: ../gtk/gtklinkbutton.c:188
 msgid "Visited"
 msgstr "મ�લાકાત થયેલ છે"
 
-#: gtk/gtklinkbutton.c:178
+#: ../gtk/gtklinkbutton.c:189
 msgid "Whether this link has been visited."
 msgstr "ક�યાં તો આ કડીની મ�લાકાત કરી દેવામાં આવી છે."
 
-#: gtk/gtkmenubar.c:163
+#: ../gtk/gtklockbutton.c:278
+msgid "Permission"
+msgstr ""
+
+#: ../gtk/gtklockbutton.c:279
+msgid "The GPermission object controlling this button"
+msgstr ""
+
+#: ../gtk/gtklockbutton.c:286
+#| msgid "Text"
+msgid "Lock Text"
+msgstr "લખાણને તાળ� મારો"
+
+#: ../gtk/gtklockbutton.c:287
+#, fuzzy
+#| msgid "The text to display in order to demonstrate the selected font"
+msgid "The text to display when prompting the user to lock"
+msgstr "પસંદ કરેલા ફોન�ટને રજૂ કરવા માટે દર�શાવવાન�ં લેખન"
+
+#: ../gtk/gtklockbutton.c:295
+msgid "Unlock Text"
+msgstr ""
+
+#: ../gtk/gtklockbutton.c:296
+#, fuzzy
+#| msgid "The text to display in order to demonstrate the selected font"
+msgid "The text to display when prompting the user to unlock"
+msgstr "પસંદ કરેલા ફોન�ટને રજૂ કરવા માટે દર�શાવવાન�ં લેખન"
+
+#: ../gtk/gtklockbutton.c:304
+#| msgid "Tooltip"
+msgid "Lock Tooltip"
+msgstr "ટ�લટીપને તાળ� મારો"
+
+#: ../gtk/gtklockbutton.c:305
+msgid "The tooltip to display when prompting the user to lock"
+msgstr ""
+
+#: ../gtk/gtklockbutton.c:313
+#| msgid "Enable Tooltips"
+msgid "Unlock Tooltip"
+msgstr "ટ�લટીપન�ં તાળ� ખોલો"
+
+#: ../gtk/gtklockbutton.c:314
+msgid "The tooltip to display when prompting the user to unlock"
+msgstr ""
+
+#: ../gtk/gtklockbutton.c:322
+msgid "Not Authorized Tooltip"
+msgstr "ટ�લટીપ સત�તાધિકારીત થયેલ નથી"
+
+#: ../gtk/gtklockbutton.c:323
+msgid "The tooltip to display when prompting the user cannot obtain authorization"
+msgstr ""
+
+#: ../gtk/gtkmenubar.c:192
 msgid "Pack direction"
 msgstr "પેક દિશા"
 
-#: gtk/gtkmenubar.c:164
+#: ../gtk/gtkmenubar.c:193
 msgid "The pack direction of the menubar"
 msgstr "મેન�પટ�ટીની પેક દિશા"
 
-#: gtk/gtkmenubar.c:180
+#: ../gtk/gtkmenubar.c:209
 msgid "Child Pack direction"
 msgstr "બાળ પેક દિશા"
 
-#: gtk/gtkmenubar.c:181
+#: ../gtk/gtkmenubar.c:210
 msgid "The child pack direction of the menubar"
 msgstr "મેન�પટ�ટીની બાળ પેક દિશા"
 
-#: gtk/gtkmenubar.c:190
+#: ../gtk/gtkmenubar.c:219
 msgid "Style of bevel around the menubar"
 msgstr "મેન�બાર ની આસપાસ ઉઠાવ(bevel) નો પ�રકાર"
 
-#: gtk/gtkmenubar.c:197 gtk/gtktoolbar.c:544
+#: ../gtk/gtkmenubar.c:226 ../gtk/gtktoolbar.c:580
 msgid "Internal padding"
 msgstr "આંતરિક જગ�યાઓને ભરવી"
 
-#: gtk/gtkmenubar.c:198
+#: ../gtk/gtkmenubar.c:227
 msgid "Amount of border space between the menubar shadow and the menu items"
 msgstr "મેન�બાર પડછાયા અને મેન�ની વસ�ત�ઓની કિનારી વચ�ચે રહેલી જગ�યા"
 
-#: gtk/gtkmenubar.c:205
-msgid "Delay before drop down menus appear"
-msgstr "નીચે આવત� મેન� દેખાય તે પહેલાનો વિલંબ"
-
-#: gtk/gtkmenubar.c:206
-msgid "Delay before the submenus of a menu bar appear"
-msgstr "મેન�બારની ઉપમેન� દેખાય તે પહેલાનો વિલંબ"
-
-#: gtk/gtkmenu.c:526
+#: ../gtk/gtkmenu.c:589
 msgid "The currently selected menu item"
 msgstr "વર�તમાનમાં પસંદ કરેલી મેન� વસ�ત�"
 
-#: gtk/gtkmenu.c:541
+#: ../gtk/gtkmenu.c:604
 msgid "The accel group holding accelerators for the menu"
 msgstr "મેન� માટે �ક�સેલ જૂથ � પ�રવોગકો ને પકડી રહ�ય� છે"
 
-#: gtk/gtkmenu.c:555 gtk/gtkmenuitem.c:318
+#: ../gtk/gtkmenu.c:618 ../gtk/gtkmenuitem.c:368
 msgid "Accel Path"
 msgstr "�ક�સેલ પાથ"
 
-#: gtk/gtkmenu.c:556
+#: ../gtk/gtkmenu.c:619
 msgid "An accel path used to conveniently construct accel paths of child items"
 msgstr "�કસેલ પાથ � બાળ વસ�ત�ઓનાં �ક�સેલ પાથો ને બાંધવા સ�લભ રીતે વપરાયેલ હતા"
 
-#: gtk/gtkmenu.c:572
+#: ../gtk/gtkmenu.c:635
 msgid "Attach Widget"
 msgstr "જોડાયેલી વિજેટ"
 
-#: gtk/gtkmenu.c:573
+#: ../gtk/gtkmenu.c:636
 msgid "The widget the menu is attached to"
 msgstr "શ�ં મેન�ની વિજેટ જોડાયેલ છે"
 
-#: gtk/gtkmenu.c:581
+#: ../gtk/gtkmenu.c:644
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr "જ�યારે આ મેન� બંધ કરવામાં આવે ત�યારે વિન�ડો મેનેજર દ�વારા આ શીર�ષક દર�શાવવામાં આવે છે"
 
-#: gtk/gtkmenu.c:595
+#: ../gtk/gtkmenu.c:658
 msgid "Tearoff State"
 msgstr "Tearoff શીર�ષક"
 
-#: gtk/gtkmenu.c:596
+#: ../gtk/gtkmenu.c:659
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "જ�યારે આ મેન� બંધ કરવામાં આવે ત�યારે વિન�ડો મેનેજર દ�વારા આ શીર�ષક દર�શાવવામાં આવે છે"
 
-#: gtk/gtkmenu.c:610
+#: ../gtk/gtkmenu.c:673
 msgid "Monitor"
 msgstr "મોનિટર"
 
-#: gtk/gtkmenu.c:611
+#: ../gtk/gtkmenu.c:674
 msgid "The monitor the menu will be popped up on"
 msgstr "મેન� ન�ં મોનિટર ન�ં પોપઅપ ચાલ� હશે"
 
-#: gtk/gtkmenu.c:617
+#: ../gtk/gtkmenu.c:680
 msgid "Vertical Padding"
 msgstr "ઊભી દિશામાં ખાલી જગ�યાઓ ભરવી"
 
-#: gtk/gtkmenu.c:618
+#: ../gtk/gtkmenu.c:681
 msgid "Extra space at the top and bottom of the menu"
 msgstr "વિજેટની ઉપર અને નીચે બાજ�ને ઉમેરવામાં આવતી જગ�યા પિક�સેલમાં"
 
-#: gtk/gtkmenu.c:640
+#: ../gtk/gtkmenu.c:703
 msgid "Reserve Toggle Size"
 msgstr "ટોગલ માપ ને આરક�ષિત કરો"
 
-#: gtk/gtkmenu.c:641
+#: ../gtk/gtkmenu.c:704
 msgid ""
 "A boolean that indicates whether the menu reserves space for toggles and "
 "icons"
 msgstr "બ�લિયન કે જે સૂચવે છે કે ક�યાંતો મેન� ટોગલો અને ચિહ�નો માટે આરક�ષિત રાખે છે"
 
-#: gtk/gtkmenu.c:647
+#: ../gtk/gtkmenu.c:710
 msgid "Horizontal Padding"
 msgstr "આડી દિશામાં ખાલી જગ�યાઓ ભરવી"
 
-#: gtk/gtkmenu.c:648
+#: ../gtk/gtkmenu.c:711
 msgid "Extra space at the left and right edges of the menu"
 msgstr "મેન�ની ડાબી અને જમણી બાજ�� વધારાની જગ�યા"
 
-#: gtk/gtkmenu.c:656
+#: ../gtk/gtkmenu.c:719
 msgid "Vertical Offset"
 msgstr "ઉભ� માપદંડ"
 
-#: gtk/gtkmenu.c:657
+#: ../gtk/gtkmenu.c:720
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr "જ�યારે મેન� � ઉપમેન� હોય, તો તેને આ પિક�સેલોની સંખ�યાનો ઓફસેટ ઊભી રીતે ગોઠવો"
 
-#: gtk/gtkmenu.c:665
+#: ../gtk/gtkmenu.c:728
 msgid "Horizontal Offset"
 msgstr "આડ� માપદંડ"
 
-#: gtk/gtkmenu.c:666
+#: ../gtk/gtkmenu.c:729
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr "જ�યારે મેન� � ઉપમેન� હોય, તો તેને આ પિક�સેલોની સંખ�યાનો ઓફસેટ આડી રીતે ગોઠવો"
 
-#: gtk/gtkmenu.c:674
+#: ../gtk/gtkmenu.c:737
 msgid "Double Arrows"
 msgstr "દ�વિ તીરો"
 
-#: gtk/gtkmenu.c:675
+#: ../gtk/gtkmenu.c:738
 msgid "When scrolling, always show both arrows."
 msgstr "જ�યારે સરકાવી રહ�યા હોય, ત�યારે હંમેશા બંને તીરો બતાવો."
 
-#: gtk/gtkmenu.c:688
+#: ../gtk/gtkmenu.c:751
 msgid "Arrow Placement"
 msgstr "તીરની નિય�ક�તિ"
 
-#: gtk/gtkmenu.c:689
+#: ../gtk/gtkmenu.c:752
 msgid "Indicates where scroll arrows should be placed"
 msgstr "સૂચવે છે કે ક�યાં સ�ક�રોલ તીરો સ�થાપિત થયેલ છે"
 
-#: gtk/gtkmenu.c:697
+#: ../gtk/gtkmenu.c:760
 msgid "Left Attach"
 msgstr "ડાબેથી જોડાયેલ�"
 
-#: gtk/gtkmenu.c:698 gtk/gtktable.c:193
-msgid "The column number to attach the left side of the child to"
-msgstr "બાળની ડાબી બાજ� જોડવા માટેનો સ�તંભનો ક�રમાંક"
-
-#: gtk/gtkmenu.c:705
+#: ../gtk/gtkmenu.c:768
 msgid "Right Attach"
 msgstr "જમણેથી જોડાયેલ�"
 
-#: gtk/gtkmenu.c:706
+#: ../gtk/gtkmenu.c:769
 msgid "The column number to attach the right side of the child to"
 msgstr "બાળની ડાબી બાજ� જોડવા માટેનો સ�તંભનો ક�રમાંક"
 
-#: gtk/gtkmenu.c:713
+#: ../gtk/gtkmenu.c:776
 msgid "Top Attach"
 msgstr "ઉપરથી જોડાયેલ�"
 
-#: gtk/gtkmenu.c:714
+#: ../gtk/gtkmenu.c:777
 msgid "The row number to attach the top of the child to"
 msgstr "બાળને નીચેથી જોડવાની હરોળની સંખ�યા"
 
-#: gtk/gtkmenu.c:721
+#: ../gtk/gtkmenu.c:784
 msgid "Bottom Attach"
 msgstr "નીચેથી જોડાયેલ�"
 
-#: gtk/gtkmenu.c:722 gtk/gtktable.c:214
+#: ../gtk/gtkmenu.c:785 ../gtk/gtktable.c:257
 msgid "The row number to attach the bottom of the child to"
 msgstr "બાળને નીચેથી જોડવાની હરોળની સંખ�યા"
 
-#: gtk/gtkmenu.c:736
+#: ../gtk/gtkmenu.c:799
 msgid "Arbitrary constant to scale down the size of the scroll arrow"
 msgstr "સરક તીરના માપને નીચે કરવા માટેનો અંશતઃ અચળ"
 
-#: gtk/gtkmenu.c:823
-msgid "Can change accelerators"
-msgstr "પ�રવેગકો બદલી શકે છે"
-
-#: gtk/gtkmenu.c:824
-msgid ""
-"Whether menu accelerators can be changed by pressing a key over the menu item"
-msgstr "શ�ં મેન�ની વસ�ત� ઉપર કી દબાવવાથી મેન�નો પ�રવેગક બદલી શકાય છે"
-
-#: gtk/gtkmenu.c:829
-msgid "Delay before submenus appear"
-msgstr "ઉપમેન� ઓવે તે પહેલાનો વિલંબ"
-
-#: gtk/gtkmenu.c:830
-msgid ""
-"Minimum time the pointer must stay over a menu item before the submenu appear"
-msgstr "ઉપમેન� આવતાં પહેલા ન�યૂનતમ સમય કે જ�યાં સ�ધી નિર�દેશક મેન� પર રહેવ� જોઈ�"
-
-#: gtk/gtkmenu.c:837
-msgid "Delay before hiding a submenu"
-msgstr "ઉપમેન� છૂપાવતા પહેલાનો વિલંબ"
-
-#: gtk/gtkmenu.c:838
-msgid ""
-"The time before hiding a submenu when the pointer is moving towards the "
-"submenu"
-msgstr "જ�યારે નિર�દેશક ઉપમેન� તરફ જતો હોય ત�યારે તેને છૂપાવતા પહેલાનો વિલંબ"
-
-#: gtk/gtkmenuitem.c:285
+#: ../gtk/gtkmenuitem.c:336
 msgid "Right Justified"
 msgstr "જમણેથી ગોઠવાયેલ"
 
-#: gtk/gtkmenuitem.c:286
-msgid ""
-"Sets whether the menu item appears justified at the right side of a menu bar"
+#: ../gtk/gtkmenuitem.c:337
+msgid "Sets whether the menu item appears justified at the right side of a menu bar"
 msgstr "શ�ં મેન� વસ�ત� મેન� પટ�ટીની જમણી બાજ�� ગોઠવાયેલ દેખાશે કે નહિં તે સ�યોજીત કરે છે"
 
-#: gtk/gtkmenuitem.c:300
+#: ../gtk/gtkmenuitem.c:351
 msgid "Submenu"
 msgstr "ઉપમેન�"
 
-#: gtk/gtkmenuitem.c:301
+#: ../gtk/gtkmenuitem.c:352
 msgid "The submenu attached to the menu item, or NULL if it has none"
 msgstr "મેન� વસ�ત� સાથે જોડાયેલ ઉપમેન�, અથવા NULL જો તેની પાસે કંઈ નહિં હોય"
 
-#: gtk/gtkmenuitem.c:319
+#: ../gtk/gtkmenuitem.c:369
 msgid "Sets the accelerator path of the menu item"
 msgstr "મેન� વસ�ત�નાં પ�રવેગક પાથ ને સ�યોજિત કરો"
 
-#: gtk/gtkmenuitem.c:334
+#: ../gtk/gtkmenuitem.c:384
 msgid "The text for the child label"
 msgstr "બાળ લેબલ માટે લખાણ"
 
-#: gtk/gtkmenuitem.c:397
+#: ../gtk/gtkmenuitem.c:447
 msgid "Amount of space used up by arrow, relative to the menu item's font size"
 msgstr "તીર દ�વારા વાપરવામાં આવતી જગ�યાનો જથ�થો, ફોન�ટ માપની મેન� વસ�ત�ને સંબંધિત"
 
-#: gtk/gtkmenuitem.c:410
+#: ../gtk/gtkmenuitem.c:460
 msgid "Width in Characters"
 msgstr "અક�ષરોમાં પહોળાઈ"
 
-#: gtk/gtkmenuitem.c:411
+#: ../gtk/gtkmenuitem.c:461
 msgid "The minimum desired width of the menu item in characters"
 msgstr "અક�ષરોમાં મેન� વસ�ત�ની ન�યૂનત�તમ ઇચ�છિત પહોળાઇ"
 
-#: gtk/gtkmenushell.c:379
+#: ../gtk/gtkmenushell.c:421
 msgid "Take Focus"
 msgstr "ફોકસ કરો"
 
-#: gtk/gtkmenushell.c:380
+#: ../gtk/gtkmenushell.c:422
 msgid "A boolean that determines whether the menu grabs the keyboard focus"
 msgstr "બ�લિયન કે જે નક�કી કરે છે કે શ�ં મેન� કીબોર�ડ ટ�ંકાણો મેળવે છે"
 
-#: gtk/gtkmenutoolbutton.c:246
+#: ../gtk/gtkmenutoolbutton.c:293
 msgid "Menu"
 msgstr "મેન�"
 
-#: gtk/gtkmenutoolbutton.c:247
+#: ../gtk/gtkmenutoolbutton.c:294
 msgid "The dropdown menu"
 msgstr "નીચે આવત� મેન�"
 
-#: gtk/gtkmessagedialog.c:184
+#: ../gtk/gtkmessagedialog.c:187
 msgid "Image/label border"
 msgstr "ચિત�ર/લેબલની કિનારી"
 
-#: gtk/gtkmessagedialog.c:185
+#: ../gtk/gtkmessagedialog.c:188
 msgid "Width of border around the label and image in the message dialog"
 msgstr "સંદેશાના સંવાદમાં લેબલ અને ચિત�રની કિનારીની આસપાસની પહોળાઈ"
 
-#: gtk/gtkmessagedialog.c:209
+#: ../gtk/gtkmessagedialog.c:212
 msgid "Message Buttons"
 msgstr "સંદેશના બટનો"
 
-#: gtk/gtkmessagedialog.c:210
+#: ../gtk/gtkmessagedialog.c:213
 msgid "The buttons shown in the message dialog"
 msgstr "સંદેશા સંવાદમાં બતાવેલા બટનો"
 
-#: gtk/gtkmessagedialog.c:227
+#: ../gtk/gtkmessagedialog.c:230
 msgid "The primary text of the message dialog"
 msgstr "સંદેશા સંવાદન�ં પ�રાથમિક લખાણ"
 
-#: gtk/gtkmessagedialog.c:242
+#: ../gtk/gtkmessagedialog.c:245
 msgid "Use Markup"
 msgstr "માર�કઅપ વાપરો"
 
-#: gtk/gtkmessagedialog.c:243
+#: ../gtk/gtkmessagedialog.c:246
 msgid "The primary text of the title includes Pango markup."
 msgstr "શીર�ષકન�ં પ�રાથમિક લખાણ પેન�ગો માર�કઅપનો સમાવેશ કરે છે."
 
-#: gtk/gtkmessagedialog.c:257
+#: ../gtk/gtkmessagedialog.c:260
 msgid "Secondary Text"
 msgstr "ગૌણ લખાણ"
 
-#: gtk/gtkmessagedialog.c:258
+#: ../gtk/gtkmessagedialog.c:261
 msgid "The secondary text of the message dialog"
 msgstr "સંદેશા સંવાદન�ં ગૌણ લખાણ"
 
-#: gtk/gtkmessagedialog.c:273
+#: ../gtk/gtkmessagedialog.c:276
 msgid "Use Markup in secondary"
 msgstr "ગૌણમાં માર�કઅપ વાપરો"
 
-#: gtk/gtkmessagedialog.c:274
+#: ../gtk/gtkmessagedialog.c:277
 msgid "The secondary text includes Pango markup."
 msgstr "ગૌણ લખાણ પેન�ગો માર�કઅપ સમાવે છે."
 
-#: gtk/gtkmessagedialog.c:288
+#: ../gtk/gtkmessagedialog.c:291
 msgid "Image"
 msgstr "ચિત�ર"
 
-#: gtk/gtkmessagedialog.c:289
+#: ../gtk/gtkmessagedialog.c:292
 msgid "The image"
 msgstr "ચિત�ર"
 
-#: gtk/gtkmessagedialog.c:305
-#, fuzzy
+#: ../gtk/gtkmessagedialog.c:308
 msgid "Message area"
-msgstr "સંદેશા પ�રકાર"
+msgstr "સંદેશા વિસ�તાર"
 
-#: gtk/gtkmessagedialog.c:306
+#: ../gtk/gtkmessagedialog.c:309
 msgid "GtkVBox that holds the dialog's primary and secondary labels"
 msgstr ""
 
-#: gtk/gtkmisc.c:91
+#: ../gtk/gtkmisc.c:115
 msgid "Y align"
 msgstr "Yની દિશામાં"
 
-#: gtk/gtkmisc.c:92
+#: ../gtk/gtkmisc.c:116
 msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
 msgstr "ઊભી દિશામાં, ૦ (ઉપર) થી ૧(નીચે)"
 
-#: gtk/gtkmisc.c:101
+#: ../gtk/gtkmisc.c:125
 msgid "X pad"
 msgstr "X પેડ"
 
-#: gtk/gtkmisc.c:102
-msgid ""
-"The amount of space to add on the left and right of the widget, in pixels"
+#: ../gtk/gtkmisc.c:126
+msgid "The amount of space to add on the left and right of the widget, in pixels"
 msgstr "વિજેટની ડાબી અને જમણી બાજ�ને ઉમેરવામાં આવતી જગ�યા પિક�સેલમાં"
 
-#: gtk/gtkmisc.c:111
+#: ../gtk/gtkmisc.c:135
 msgid "Y pad"
 msgstr "Y પેડ"
 
-#: gtk/gtkmisc.c:112
-msgid ""
-"The amount of space to add on the top and bottom of the widget, in pixels"
+#: ../gtk/gtkmisc.c:136
+msgid "The amount of space to add on the top and bottom of the widget, in pixels"
 msgstr "વિજેટની ઉપર અને નીચે બાજ�ને ઉમેરવામાં આવતી જગ�યા પિક�સેલમાં"
 
-#: gtk/gtkmountoperation.c:159
+#: ../gtk/gtkmountoperation.c:157
 msgid "Parent"
 msgstr "પિતૃ"
 
-#: gtk/gtkmountoperation.c:160
+#: ../gtk/gtkmountoperation.c:158
 msgid "The parent window"
 msgstr "પિતૃ વિન�ડો"
 
-#: gtk/gtkmountoperation.c:167
+#: ../gtk/gtkmountoperation.c:165
 msgid "Is Showing"
 msgstr "બતાવી રહ�યા છે"
 
-#: gtk/gtkmountoperation.c:168
+#: ../gtk/gtkmountoperation.c:166
 msgid "Are we showing a dialog"
 msgstr "શ�ં આપણે સંવાદ ને બતાવી રહ�યા છે"
 
-#: gtk/gtkmountoperation.c:176
+#: ../gtk/gtkmountoperation.c:174
 msgid "The screen where this window will be displayed."
 msgstr "સ�ક�રિન કે જ�યાં વિન�ડો દેખાડવામાં આવશે."
 
-#: gtk/gtknotebook.c:595
+#: ../gtk/gtknotebook.c:694
 msgid "Page"
 msgstr "પાન�ં"
 
-#: gtk/gtknotebook.c:596
+#: ../gtk/gtknotebook.c:695
 msgid "The index of the current page"
 msgstr "વર�તમાન પાનાનો અન�ક�રમાંક"
 
-#: gtk/gtknotebook.c:604
+#: ../gtk/gtknotebook.c:703
 msgid "Tab Position"
 msgstr "ટેબની સ�થિતિ"
 
-#: gtk/gtknotebook.c:605
+#: ../gtk/gtknotebook.c:704
 msgid "Which side of the notebook holds the tabs"
 msgstr "નોટબ�કની કઈ બાજ�ઓ ટેબો રાખે છે"
 
-#: gtk/gtknotebook.c:612
+#: ../gtk/gtknotebook.c:711
 msgid "Show Tabs"
 msgstr "ટેબો બતાવો"
 
-#: gtk/gtknotebook.c:613
+#: ../gtk/gtknotebook.c:712
 #, fuzzy
 msgid "Whether tabs should be shown"
 msgstr "શ�ં ટેબોને બતાવવી જોઈ� કે નહિ"
 
-#: gtk/gtknotebook.c:619
+#: ../gtk/gtknotebook.c:718
 msgid "Show Border"
 msgstr "કિનારી બતાવો"
 
-#: gtk/gtknotebook.c:620
+#: ../gtk/gtknotebook.c:719
 #, fuzzy
 msgid "Whether the border should be shown"
 msgstr "શ�ં કિનારીને બતાવવી જોઈ� કે નહિં"
 
-#: gtk/gtknotebook.c:626
+#: ../gtk/gtknotebook.c:725
 msgid "Scrollable"
 msgstr "સરકપટ�ટી"
 
-#: gtk/gtknotebook.c:627
+#: ../gtk/gtknotebook.c:726
 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
 msgstr "જો ખર� હોય તો, સરક તીરો ઉમેરાય છે જો ત�યાં ઘણી ટેબો બંધબેસતી હોય"
 
-#: gtk/gtknotebook.c:633
+#: ../gtk/gtknotebook.c:732
 msgid "Enable Popup"
 msgstr "પૉપ-અપ સક�રિય કરો"
 
-#: gtk/gtknotebook.c:634
+#: ../gtk/gtknotebook.c:733
 msgid ""
 "If TRUE, pressing the right mouse button on the notebook pops up a menu that "
 "you can use to go to a page"
@@ -3753,324 +4222,388 @@ msgstr ""
 "જો ખર� હોય તો, નોટબ�કમાં માઉસની જમણી બાજ�ન�ં બટન દબાવવાથી મેન� ખ�લશે જેનો ઉપયોગ તમે પાના "
 "ઉપર જવા માટે કરી શકો છો"
 
-#: gtk/gtknotebook.c:648
-#, fuzzy
+#: ../gtk/gtknotebook.c:747
 msgid "Group Name"
-msgstr "જૂથ ID"
+msgstr "જૂથ નામ"
 
-#: gtk/gtknotebook.c:649
+#: ../gtk/gtknotebook.c:748
 #, fuzzy
 msgid "Group name for tab drag and drop"
 msgstr "ખેંચો અને મૂકો ટેબો માટેના જૂથો"
 
-#: gtk/gtknotebook.c:656
+#: ../gtk/gtknotebook.c:755
 msgid "Tab label"
 msgstr "ટેબન� લેબલ"
 
-#: gtk/gtknotebook.c:657
+#: ../gtk/gtknotebook.c:756
 msgid "The string displayed on the child's tab label"
 msgstr "બાળના ટેબ લેબલ પર દર�શાવાયે શબ�દમાળા"
 
-#: gtk/gtknotebook.c:663
+#: ../gtk/gtknotebook.c:762
 msgid "Menu label"
 msgstr "મેન�ન�ં લેબલ"
 
-#: gtk/gtknotebook.c:664
+#: ../gtk/gtknotebook.c:763
 msgid "The string displayed in the child's menu entry"
 msgstr "બાળના મેન� પ�રવેશમાં પ�રદર�શિત કરાયેલી શબ�દમાળા"
 
-#: gtk/gtknotebook.c:677
+#: ../gtk/gtknotebook.c:776
 msgid "Tab expand"
 msgstr "ટેબ વિસ�તરણ"
 
-#: gtk/gtknotebook.c:678
+#: ../gtk/gtknotebook.c:777
 #, fuzzy
 msgid "Whether to expand the child's tab"
 msgstr "શ�ં બાળની ટેબને વિસ�તારવી કે નહિ"
 
-#: gtk/gtknotebook.c:684
+#: ../gtk/gtknotebook.c:783
 msgid "Tab fill"
 msgstr "ટેબને ભરવ�"
 
-#: gtk/gtknotebook.c:685
+#: ../gtk/gtknotebook.c:784
 #, fuzzy
 msgid "Whether the child's tab should fill the allocated area"
 msgstr "શ�ં બાળની ટેબ ફાળવેલી જગ�યાને ભરવી જોઈ� કે નહિ"
 
-#: gtk/gtknotebook.c:691
-msgid "Tab pack type"
-msgstr "ટેબ પેકનો પ�રકાર"
-
-#: gtk/gtknotebook.c:698
+#: ../gtk/gtknotebook.c:791
 msgid "Tab reorderable"
 msgstr "ટેબ પ�નઃગોઠવી શકાય તેવી"
 
-#: gtk/gtknotebook.c:699
+#: ../gtk/gtknotebook.c:792
 #, fuzzy
 msgid "Whether the tab is reorderable by user action"
 msgstr "શ�ં ટેબ � વપરાશકર�તા ક�રિયા દ�વારા પ�નઃગોઠવી શકાય કે નહિં"
 
-#: gtk/gtknotebook.c:705
+#: ../gtk/gtknotebook.c:798
 msgid "Tab detachable"
 msgstr "ટેબ જોડાણ તોડી શકાય તેવી"
 
-#: gtk/gtknotebook.c:706
+#: ../gtk/gtknotebook.c:799
 msgid "Whether the tab is detachable"
 msgstr "શ�ં ટેબન�ં જોડાણ તોડી શકાય"
 
-#: gtk/gtknotebook.c:721 gtk/gtkscrollbar.c:80
+#: ../gtk/gtknotebook.c:814 ../gtk/gtkscrollbar.c:102
 msgid "Secondary backward stepper"
 msgstr "પાછા ફરવાન�ં ગૌણ સ�ટેપર"
 
-#: gtk/gtknotebook.c:722
-msgid ""
-"Display a second backward arrow button on the opposite end of the tab area"
+#: ../gtk/gtknotebook.c:815
+msgid "Display a second backward arrow button on the opposite end of the tab area"
 msgstr "ખસેડવાની પટ�ટીના બીજા છેડા પર પાછા આવવા માટેન�ં �ક બીજ� બટન દર�શાવો"
 
-#: gtk/gtknotebook.c:737 gtk/gtkscrollbar.c:87
+#: ../gtk/gtknotebook.c:830 ../gtk/gtkscrollbar.c:109
 msgid "Secondary forward stepper"
 msgstr "આગળ જવાન�ં ગૌણ સ�ટેપર"
 
-#: gtk/gtknotebook.c:738
-msgid ""
-"Display a second forward arrow button on the opposite end of the tab area"
+#: ../gtk/gtknotebook.c:831
+msgid "Display a second forward arrow button on the opposite end of the tab area"
 msgstr "ખસેડવાની પટ�ટીના બીજા છેડા પર આગળ જવા માટેન� બીજ� બટન દર�શાવો"
 
-#: gtk/gtknotebook.c:752 gtk/gtkscrollbar.c:66
+#: ../gtk/gtknotebook.c:845 ../gtk/gtkscrollbar.c:88
 msgid "Backward stepper"
 msgstr "પાછા ફરવાન�ં સ�ટેપર"
 
-#: gtk/gtknotebook.c:753 gtk/gtkscrollbar.c:67
+#: ../gtk/gtknotebook.c:846 ../gtk/gtkscrollbar.c:89
 msgid "Display the standard backward arrow button"
 msgstr "પાછા આવવા માટેન�ં મૂળભૂત તીરન�ં બટન દર�શાવો"
 
-#: gtk/gtknotebook.c:767 gtk/gtkscrollbar.c:73
+#: ../gtk/gtknotebook.c:860 ../gtk/gtkscrollbar.c:95
 msgid "Forward stepper"
 msgstr "આગળ જવા માટેન�ં સ�ટેપર"
 
-#: gtk/gtknotebook.c:768 gtk/gtkscrollbar.c:74
+#: ../gtk/gtknotebook.c:861 ../gtk/gtkscrollbar.c:96
 msgid "Display the standard forward arrow button"
 msgstr "આગળ જવા માટેન�ં મૂળભૂત તીરન�ં બટન દર�શાવો"
 
-#: gtk/gtknotebook.c:782
+#: ../gtk/gtknotebook.c:875
 msgid "Tab overlap"
 msgstr "ટેબ ઓવરલેપ"
 
-#: gtk/gtknotebook.c:783
+#: ../gtk/gtknotebook.c:876
 msgid "Size of tab overlap area"
 msgstr "ટેબ ઓવરલેપ વિસ�તારન�ં માપ"
 
-#: gtk/gtknotebook.c:798
+#: ../gtk/gtknotebook.c:891
 msgid "Tab curvature"
 msgstr "ટેબ વણાંક"
 
-#: gtk/gtknotebook.c:799
+#: ../gtk/gtknotebook.c:892
 msgid "Size of tab curvature"
 msgstr "ટેબ વળાંકન�ં માપ"
 
-#: gtk/gtknotebook.c:815
+#: ../gtk/gtknotebook.c:908
 msgid "Arrow spacing"
 msgstr "તીરની વચ�ચે જગ�યા છોડો"
 
-#: gtk/gtknotebook.c:816
+#: ../gtk/gtknotebook.c:909
 msgid "Scroll arrow spacing"
 msgstr "ખસેડવાનાં તીર વચ�ચેની જગ�યા"
 
-#: gtk/gtkorientable.c:63 gtk/gtkstatusicon.c:319 gtk/gtktrayicon-x11.c:124
+#: ../gtk/gtknotebook.c:925
+msgid "Initial gap"
+msgstr ""
+
+#: ../gtk/gtknotebook.c:926
+msgid "Initial gap before the first tab"
+msgstr ""
+
+#: ../gtk/gtknumerableicon.c:653
+#| msgid "Icon set"
+msgid "Icon's count"
+msgstr "ચિહ�નની ગણતરી"
+
+#: ../gtk/gtknumerableicon.c:654
+#, fuzzy
+#| msgid "The index of the current page"
+msgid "The count of the emblem currently displayed"
+msgstr "વર�તમાન પાનાનો અન�ક�રમાંક"
+
+#: ../gtk/gtknumerableicon.c:660
+#| msgid "Icon Name"
+msgid "Icon's label"
+msgstr "ચિહ�નન�ં લેબલ"
+
+#: ../gtk/gtknumerableicon.c:661
+#, fuzzy
+#| msgid "The stock icon displayed on the item"
+msgid "The label to be displayed over the icon"
+msgstr "બાળના ટેબના લેબલ ઉપર દેખાતી શબ�દમાળા"
+
+#: ../gtk/gtknumerableicon.c:667
+#, fuzzy
+#| msgid "Font style set"
+msgid "Icon's style context"
+msgstr "ફોન�ટની શૈલી સ�યોજિત છે"
+
+#: ../gtk/gtknumerableicon.c:668
+msgid "The style context to theme the icon appearance"
+msgstr ""
+
+#: ../gtk/gtknumerableicon.c:674
+#| msgid "Background color"
+msgid "Background icon"
+msgstr "પાશ�વભાગ ચિહ�ન"
+
+#: ../gtk/gtknumerableicon.c:675
+msgid "The icon for the number emblem background"
+msgstr ""
+
+#: ../gtk/gtknumerableicon.c:681
+#| msgid "Background color name"
+msgid "Background icon name"
+msgstr "પાશ�વભાગન�ં ચિહ�ન નામ"
+
+#: ../gtk/gtknumerableicon.c:682
+#, fuzzy
+#| msgid "The icon name to use for the printer"
+msgid "The icon name for the number emblem background"
+msgstr "પ�રિન�ટર માટે વાપરવાન�ં ચિહ�ન નામ"
+
+#: ../gtk/gtkorientable.c:63 ../gtk/gtkstatusicon.c:342
+#: ../gtk/gtktrayicon-x11.c:128
 msgid "Orientation"
 msgstr "દિશા"
 
-#: gtk/gtkorientable.c:64
+#: ../gtk/gtkorientable.c:64
 msgid "The orientation of the orientable"
 msgstr "દિશા થયેલ ની દિશા"
 
-#: gtk/gtkpaned.c:271
-msgid ""
-"Position of paned separator in pixels (0 means all the way to the left/top)"
+#: ../gtk/gtkpaned.c:350
+msgid "Position of paned separator in pixels (0 means all the way to the left/top)"
 msgstr "પિક�સેલમાં તક�તી જેવા વિભાજકની સ�થિતિ (૦ �ટલે સીધા ડાબે/ઉપર)"
 
-#: gtk/gtkpaned.c:280
+#: ../gtk/gtkpaned.c:359
 msgid "Position Set"
 msgstr "સ�થિતિ સ�યોજિત છે"
 
-#: gtk/gtkpaned.c:281
+#: ../gtk/gtkpaned.c:360
 msgid "TRUE if the Position property should be used"
 msgstr "જો સ�થિતિ ગ�ણધર�મનો ઉપયોગનો કરવાનો હોય તો ખર�"
 
-#: gtk/gtkpaned.c:287
+#: ../gtk/gtkpaned.c:366
 msgid "Handle Size"
 msgstr "હેન�ડલ માપ"
 
-#: gtk/gtkpaned.c:288
+#: ../gtk/gtkpaned.c:367
 msgid "Width of handle"
 msgstr "હેન�ડલની પહોળાઈ"
 
-#: gtk/gtkpaned.c:304
+#: ../gtk/gtkpaned.c:383
 msgid "Minimal Position"
 msgstr "ન�યૂનતમ સ�થાન"
 
-#: gtk/gtkpaned.c:305
+#: ../gtk/gtkpaned.c:384
 msgid "Smallest possible value for the \"position\" property"
 msgstr "\"સ�થાન\" ગ�ણધર�મ માટે નાનામાં નાની શક�ય કિંમત"
 
-#: gtk/gtkpaned.c:322
+#: ../gtk/gtkpaned.c:401
 msgid "Maximal Position"
 msgstr "મહત�તમ સ�થાન"
 
-#: gtk/gtkpaned.c:323
+#: ../gtk/gtkpaned.c:402
 msgid "Largest possible value for the \"position\" property"
 msgstr "\"સ�થાન\" ગ�ણધર�મ માટે મોટામાં મોટી શક�ય કિંમત"
 
-#: gtk/gtkpaned.c:340
+#: ../gtk/gtkpaned.c:419
 msgid "Resize"
 msgstr "માપ બદલો"
 
-#: gtk/gtkpaned.c:341
+#: ../gtk/gtkpaned.c:420
 msgid "If TRUE, the child expands and shrinks along with the paned widget"
 msgstr "જો સાચ�ં હોય, તો બાળ પેનવાળા વિજેટો સાથે વિસ�તૃત થાય છે અને સંક�ચિત થાય છે"
 
-#: gtk/gtkpaned.c:356
+#: ../gtk/gtkpaned.c:435
 msgid "Shrink"
 msgstr "સંકોચો"
 
-#: gtk/gtkpaned.c:357
+#: ../gtk/gtkpaned.c:436
 msgid "If TRUE, the child can be made smaller than its requisition"
 msgstr "જો સાચ�ં હોય, તો બાળ તેની અરજી કરતાં નાન�ં બનાવી શકાય છે"
 
-#: gtk/gtkplug.c:171 gtk/gtkstatusicon.c:303
+#: ../gtk/gtkplug.c:203 ../gtk/gtkstatusicon.c:326
 msgid "Embedded"
 msgstr "જડિત"
 
-#: gtk/gtkplug.c:172
+#: ../gtk/gtkplug.c:204
 #, fuzzy
 msgid "Whether the plug is embedded"
 msgstr "શ�ં પ�લગ જડિત છે કે નહિં"
 
-#: gtk/gtkplug.c:186
+#: ../gtk/gtkplug.c:218
 msgid "Socket Window"
 msgstr "સોકેટ વિન�ડો"
 
-#: gtk/gtkplug.c:187
+#: ../gtk/gtkplug.c:219
 msgid "The window of the socket the plug is embedded in"
 msgstr "પ�લગનાં સોકેટની વિન�ડોમાં પલ�ગ જડિત છે"
 
-#: gtk/gtkprinter.c:126
+#: ../gtk/gtkprinter.c:126
 msgid "Name of the printer"
 msgstr "પ�રિન�ટરન�ં નામ"
 
-#: gtk/gtkprinter.c:132
+#: ../gtk/gtkprinter.c:132
 msgid "Backend"
 msgstr "પાશ�વ ભાગ"
 
-#: gtk/gtkprinter.c:133
+#: ../gtk/gtkprinter.c:133
 msgid "Backend for the printer"
 msgstr "પ�રિન�ટર માટે પાશ�વ ભાગ"
 
-#: gtk/gtkprinter.c:139
+#: ../gtk/gtkprinter.c:139
 msgid "Is Virtual"
 msgstr "વર�ચ�ય�અલ છે"
 
-#: gtk/gtkprinter.c:140
+#: ../gtk/gtkprinter.c:140
 msgid "FALSE if this represents a real hardware printer"
 msgstr "FALSE જો આ વાસ�તવિક હાર�ડવેર પ�રિન�ટરને રજૂ કરે"
 
-#: gtk/gtkprinter.c:146
+#: ../gtk/gtkprinter.c:146
 msgid "Accepts PDF"
 msgstr "PDF સ�વીકારે છે"
 
-#: gtk/gtkprinter.c:147
+#: ../gtk/gtkprinter.c:147
 msgid "TRUE if this printer can accept PDF"
 msgstr "TRUE જો આ પ�રિન�ટર PDF સ�વીકારી શકે"
 
-#: gtk/gtkprinter.c:153
+#: ../gtk/gtkprinter.c:153
 msgid "Accepts PostScript"
 msgstr "PostScript સ�વીકારે છે"
 
-#: gtk/gtkprinter.c:154
+#: ../gtk/gtkprinter.c:154
 msgid "TRUE if this printer can accept PostScript"
 msgstr "TRUE જો આ પ�રિન�ટર PostScript સ�વીકારી શકે"
 
-#: gtk/gtkprinter.c:160
+#: ../gtk/gtkprinter.c:160
 msgid "State Message"
 msgstr "પરિસ�થિતિ સંદેશો"
 
-#: gtk/gtkprinter.c:161
+#: ../gtk/gtkprinter.c:161
 msgid "String giving the current state of the printer"
 msgstr "પ�રિન�ટરની વર�તમાન સ�થિતિ આપતી શબ�દમાળા"
 
-#: gtk/gtkprinter.c:167
+#: ../gtk/gtkprinter.c:167
 msgid "Location"
 msgstr "સ�થાન"
 
-#: gtk/gtkprinter.c:168
+#: ../gtk/gtkprinter.c:168
 msgid "The location of the printer"
 msgstr "પ�રિન�ટરન�ં સ�થાન"
 
-#: gtk/gtkprinter.c:175
+#: ../gtk/gtkprinter.c:175
 msgid "The icon name to use for the printer"
 msgstr "પ�રિન�ટર માટે વાપરવાન�ં ચિહ�ન નામ"
 
-#: gtk/gtkprinter.c:181
+#: ../gtk/gtkprinter.c:181
 msgid "Job Count"
 msgstr "જોબ ગણતરી"
 
-#: gtk/gtkprinter.c:182
+#: ../gtk/gtkprinter.c:182
 msgid "Number of jobs queued in the printer"
 msgstr "પ�રિન�ટરમાં કતાર થયેલ જોબની સંખ�યા"
 
-#: gtk/gtkprinter.c:200
+#: ../gtk/gtkprinter.c:200
 msgid "Paused Printer"
 msgstr "અટકાવેલ પ�રિન�ટર"
 
-#: gtk/gtkprinter.c:201
+#: ../gtk/gtkprinter.c:201
 msgid "TRUE if this printer is paused"
 msgstr "TRUE જો આ પ�રિન�ટર અટકેલ હોય તો"
 
-#: gtk/gtkprinter.c:214
+#: ../gtk/gtkprinter.c:214
 msgid "Accepting Jobs"
 msgstr "કાર�યો ને સ�વીકારી રહ�ય� છે"
 
-#: gtk/gtkprinter.c:215
+#: ../gtk/gtkprinter.c:215
 msgid "TRUE if this printer is accepting new jobs"
 msgstr "TRUE જો આ પ�રિન�ટર � નવા કાર�ય ને સ�વીકારી રહ�ય� હોય તો"
 
-#: gtk/gtkprinteroptionwidget.c:122
+#: ../gtk/gtkprinteroption.c:105
+#| msgid "Minimum Value"
+msgid "Option Value"
+msgstr "વિકલ�પ કિંમત"
+
+#: ../gtk/gtkprinteroption.c:106
+#| msgid "Name of the printer"
+msgid "Value of the option"
+msgstr "વિકલ�પની કિંમત"
+
+#: ../gtk/gtkprinteroptionwidget.c:122
 msgid "Source option"
 msgstr "સ�રોત વિકલ�પ"
 
-#: gtk/gtkprinteroptionwidget.c:123
+#: ../gtk/gtkprinteroptionwidget.c:123
 msgid "The PrinterOption backing this widget"
 msgstr "PrinterOption આ વિજેટને બેક કરી રહ�ય�ં છે"
 
-#: gtk/gtkprintjob.c:116
+#: ../gtk/gtkprintjob.c:142
 msgid "Title of the print job"
 msgstr "છાપન ક�રિયાન�ં શીર�ષક"
 
-#: gtk/gtkprintjob.c:124
+#: ../gtk/gtkprintjob.c:150
 msgid "Printer"
 msgstr "પ�રિન�ટર"
 
-#: gtk/gtkprintjob.c:125
+#: ../gtk/gtkprintjob.c:151
 msgid "Printer to print the job to"
 msgstr "ક�રિયાને છાપવા માટેન�ં પ�રિન�ટર"
 
-#: gtk/gtkprintjob.c:133
+#: ../gtk/gtkprintjob.c:159
 msgid "Settings"
 msgstr "સ�યોજનો"
 
-#: gtk/gtkprintjob.c:134
+#: ../gtk/gtkprintjob.c:160
 msgid "Printer settings"
 msgstr "પ�રિન�ટર સ�યોજનો"
 
-#: gtk/gtkprintjob.c:142 gtk/gtkprintjob.c:143 gtk/gtkprintunixdialog.c:298
+#: ../gtk/gtkprintjob.c:168 ../gtk/gtkprintjob.c:169
+#: ../gtk/gtkprintunixdialog.c:368
 msgid "Page Setup"
 msgstr "પાનાં સ�યોજન"
 
-#: gtk/gtkprintjob.c:151 gtk/gtkprintoperation.c:1133
+#: ../gtk/gtkprintjob.c:177 ../gtk/gtkprintoperation.c:1206
 msgid "Track Print Status"
 msgstr "છાપન પરિસ�થિતિ ટ�રેક કરો"
 
-#: gtk/gtkprintjob.c:152
+#: ../gtk/gtkprintjob.c:178
 msgid ""
 "TRUE if the print job will continue to emit status-changed signals after the "
 "print data has been sent to the printer or print server."
@@ -4078,57 +4611,57 @@ msgstr ""
 "TRUE જો છાપન ક�રિયા પરિસ�થિતિ-બદલાયેલ સંકેતોને છાપન  માહિતી પ�રિન�ટર અથવા પ�રિન�ટ "
 "સર�વરને મોકલાઈ ગયા પછી મોકલવાન�ં ચાલ� રાખશે."
 
-#: gtk/gtkprintoperation.c:1005
+#: ../gtk/gtkprintoperation.c:1078
 msgid "Default Page Setup"
 msgstr "મૂળભૂત પાનાં સ�યોજન"
 
-#: gtk/gtkprintoperation.c:1006
+#: ../gtk/gtkprintoperation.c:1079
 msgid "The GtkPageSetup used by default"
 msgstr "GtkPageSetup મૂળભૂત રીતે વપરાય છે"
 
-#: gtk/gtkprintoperation.c:1024 gtk/gtkprintunixdialog.c:316
+#: ../gtk/gtkprintoperation.c:1097 ../gtk/gtkprintunixdialog.c:386
 msgid "Print Settings"
 msgstr "છાપન સ�યોજનો"
 
-#: gtk/gtkprintoperation.c:1025 gtk/gtkprintunixdialog.c:317
+#: ../gtk/gtkprintoperation.c:1098 ../gtk/gtkprintunixdialog.c:387
 msgid "The GtkPrintSettings used for initializing the dialog"
 msgstr "GtkPrintSettings � સંવાદનો આરંભ કરવા માટે વપરાય છે"
 
-#: gtk/gtkprintoperation.c:1043
+#: ../gtk/gtkprintoperation.c:1116
 msgid "Job Name"
 msgstr "ક�રિયા નામ"
 
-#: gtk/gtkprintoperation.c:1044
+#: ../gtk/gtkprintoperation.c:1117
 msgid "A string used for identifying the print job."
 msgstr "છાપન ક�રિયા ઓળખવા માટે વપરાતી શબ�દમાળા."
 
-#: gtk/gtkprintoperation.c:1068
+#: ../gtk/gtkprintoperation.c:1141
 msgid "Number of Pages"
 msgstr "પાનાંઓની સંખ�યા"
 
-#: gtk/gtkprintoperation.c:1069
+#: ../gtk/gtkprintoperation.c:1142
 msgid "The number of pages in the document."
 msgstr "દસ�તાવેજમાં પાનાંઓની સંખ�યા."
 
-#: gtk/gtkprintoperation.c:1090 gtk/gtkprintunixdialog.c:306
+#: ../gtk/gtkprintoperation.c:1163 ../gtk/gtkprintunixdialog.c:376
 msgid "Current Page"
 msgstr "વર�તમાન પાન�ં"
 
-#: gtk/gtkprintoperation.c:1091 gtk/gtkprintunixdialog.c:307
+#: ../gtk/gtkprintoperation.c:1164 ../gtk/gtkprintunixdialog.c:377
 msgid "The current page in the document"
 msgstr "દસ�તાવેજમાં વર�તમાન પાન�ં"
 
-#: gtk/gtkprintoperation.c:1112
+#: ../gtk/gtkprintoperation.c:1185
 msgid "Use full page"
 msgstr "આખ�ં પાન�ં વાપરો"
 
-#: gtk/gtkprintoperation.c:1113
+#: ../gtk/gtkprintoperation.c:1186
 msgid ""
 "TRUE if the origin of the context should be at the corner of the page and "
 "not the corner of the imageable area"
 msgstr "TRUE જો સંદર�ભન�ં મૂળ પાનાંના ખૂણે હોવ�ં જોઈ� અને ચિત�રવાળા વિસ�તારના ખૂણે નહિં"
 
-#: gtk/gtkprintoperation.c:1134
+#: ../gtk/gtkprintoperation.c:1207
 msgid ""
 "TRUE if the print operation will continue to report on the print job status "
 "after the print data has been sent to the printer or print server."
@@ -4136,153 +4669,151 @@ msgstr ""
 "જો TRUE હોય તો છાપન માહિતી પ�રિન�ટર અથવા પ�રિન�ટ સર�વરને મોકલાઈ જાય પછી છાપન "
 "પ�રક�રિયા છાપન ક�રિયા પરિસ�થિતિ પર અહેવાલ આપવા માટે ચાલ� રહેશે."
 
-#: gtk/gtkprintoperation.c:1151
+#: ../gtk/gtkprintoperation.c:1224
 msgid "Unit"
 msgstr "�કમ"
 
-#: gtk/gtkprintoperation.c:1152
+#: ../gtk/gtkprintoperation.c:1225
 msgid "The unit in which distances can be measured in the context"
 msgstr "�કમ કે જેમાં અંતરો સંદર�ભમાં માપી શકાય છે"
 
-#: gtk/gtkprintoperation.c:1169
+#: ../gtk/gtkprintoperation.c:1242
 msgid "Show Dialog"
 msgstr "સંવાદ બતાવો"
 
-#: gtk/gtkprintoperation.c:1170
+#: ../gtk/gtkprintoperation.c:1243
 msgid "TRUE if a progress dialog is shown while printing."
 msgstr "TRUE જો છાપતી વખતે પ�રગતિ સંવાદ બતાવાયેલ હોય."
 
-#: gtk/gtkprintoperation.c:1193
+#: ../gtk/gtkprintoperation.c:1266
 msgid "Allow Async"
 msgstr "અસ�મેળને પરવાનગી આપો"
 
-#: gtk/gtkprintoperation.c:1194
+#: ../gtk/gtkprintoperation.c:1267
 msgid "TRUE if print process may run asynchronous."
 msgstr "જો છાપન પ�રક�રિયા અસ�મેળ રીતે ચાલશે તો TRUE."
 
-#: gtk/gtkprintoperation.c:1216 gtk/gtkprintoperation.c:1217
+#: ../gtk/gtkprintoperation.c:1289 ../gtk/gtkprintoperation.c:1290
 msgid "Export filename"
 msgstr "નિકાસ ફાઈલનામ"
 
-#: gtk/gtkprintoperation.c:1231
+#: ../gtk/gtkprintoperation.c:1304
 msgid "Status"
 msgstr "પરિસ�થિતિ"
 
-#: gtk/gtkprintoperation.c:1232
+#: ../gtk/gtkprintoperation.c:1305
 msgid "The status of the print operation"
 msgstr "છાપન પ�રક�રિયાની પરિસ�થિતિ"
 
-#: gtk/gtkprintoperation.c:1252
+#: ../gtk/gtkprintoperation.c:1325
 msgid "Status String"
 msgstr "પરિસ�થિતિ શબ�દમાળા"
 
-#: gtk/gtkprintoperation.c:1253
+#: ../gtk/gtkprintoperation.c:1326
 msgid "A human-readable description of the status"
 msgstr "પરિસ�થિતિન�ં માનવીય-વાંચનીય વર�ણન"
 
-#: gtk/gtkprintoperation.c:1271
+#: ../gtk/gtkprintoperation.c:1344
 msgid "Custom tab label"
 msgstr "વૈવિધ�યપૂર�ણ ટેબ લેબલ"
 
-#: gtk/gtkprintoperation.c:1272
+#: ../gtk/gtkprintoperation.c:1345
 msgid "Label for the tab containing custom widgets."
 msgstr "વૈવિધ�યપૂર�ણ વિજેટોને સમાવતી ટેબ માટેન�ં લેબલ."
 
-#: gtk/gtkprintoperation.c:1287 gtk/gtkprintunixdialog.c:341
+#: ../gtk/gtkprintoperation.c:1360 ../gtk/gtkprintunixdialog.c:411
 msgid "Support Selection"
 msgstr "આધાર પસંદગી"
 
-#: gtk/gtkprintoperation.c:1288
+#: ../gtk/gtkprintoperation.c:1361
 msgid "TRUE if the print operation will support print of selection."
 msgstr "TRUE જો છાપવાની ક�રિયયા � પસંદગીને છાપવા માટે આધાર આપશે."
 
-#: gtk/gtkprintoperation.c:1304 gtk/gtkprintunixdialog.c:349
+#: ../gtk/gtkprintoperation.c:1377 ../gtk/gtkprintunixdialog.c:419
 msgid "Has Selection"
 msgstr "પસંદગી છે"
 
-#: gtk/gtkprintoperation.c:1305
-#, fuzzy
+#: ../gtk/gtkprintoperation.c:1378
 msgid "TRUE if a selection exists."
 msgstr "TRUE જો પસંદગી અસ�તિત�વ ધરાવે તો."
 
-#: gtk/gtkprintoperation.c:1320 gtk/gtkprintunixdialog.c:357
+#: ../gtk/gtkprintoperation.c:1393 ../gtk/gtkprintunixdialog.c:427
 msgid "Embed Page Setup"
 msgstr "�મ�બેડ પાનાં સ�યોજન"
 
-#: gtk/gtkprintoperation.c:1321
+#: ../gtk/gtkprintoperation.c:1394
 msgid "TRUE if page setup combos are embedded in GtkPrintDialog"
 msgstr "TRUE જો પાનાં સ�યોજન કોમ�બો � GtkPrintDialog માં �મ�બેડેડ થયેલ હોય તો"
 
-#: gtk/gtkprintoperation.c:1342
+#: ../gtk/gtkprintoperation.c:1415
 msgid "Number of Pages To Print"
 msgstr "છાપવા માટે પાનાંઓની સંખ�યા"
 
-#: gtk/gtkprintoperation.c:1343
+#: ../gtk/gtkprintoperation.c:1416
 msgid "The number of pages that will be printed."
 msgstr "પાનાંઓની સંખ�યા કે જે છપાશે."
 
-#: gtk/gtkprintunixdialog.c:299
+#: ../gtk/gtkprintunixdialog.c:369
 msgid "The GtkPageSetup to use"
 msgstr "વાપરવા માટેન�ં GtkPageSetup"
 
-#: gtk/gtkprintunixdialog.c:324
+#: ../gtk/gtkprintunixdialog.c:394
 msgid "Selected Printer"
 msgstr "પસંદ કરેલ પ�રિન�ટર"
 
-#: gtk/gtkprintunixdialog.c:325
+#: ../gtk/gtkprintunixdialog.c:395
 msgid "The GtkPrinter which is selected"
 msgstr "GtkPrinter કે જે પસંદ થયેલ છે"
 
-#: gtk/gtkprintunixdialog.c:332
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:402
 msgid "Manual Capabilities"
 msgstr "પ�સ�તિકા ક�ષમતાઓ"
 
-#: gtk/gtkprintunixdialog.c:333
+#: ../gtk/gtkprintunixdialog.c:403
 msgid "Capabilities the application can handle"
 msgstr "કાર�યક�રમ સંભાળી શકે છે તેની ક�ષમતા ધરાવે છે"
 
-#: gtk/gtkprintunixdialog.c:342
+#: ../gtk/gtkprintunixdialog.c:412
 msgid "Whether the dialog supports selection"
 msgstr "ક�યાંતો સંવાદ પસંદગીને આધાર આપે છે"
 
-#: gtk/gtkprintunixdialog.c:350
+#: ../gtk/gtkprintunixdialog.c:420
 msgid "Whether the application has a selection"
 msgstr "ક�યાંતો કાર�યક�રમ પાસે પસંદગી છે"
 
-#: gtk/gtkprintunixdialog.c:358
+#: ../gtk/gtkprintunixdialog.c:428
 msgid "TRUE if page setup combos are embedded in GtkPrintUnixDialog"
 msgstr "TRUE જો પાન�ં સ�યોજન કોમ�બો � GtkPrintUnixDialog માં �મ�બેડેડ થયેલ છે"
 
-#: gtk/gtkprogressbar.c:134
+#: ../gtk/gtkprogressbar.c:160
 msgid "Fraction"
 msgstr "ભાગ"
 
-#: gtk/gtkprogressbar.c:135
+#: ../gtk/gtkprogressbar.c:161
 msgid "The fraction of total work that has been completed"
 msgstr "પૂરા થઇ ગયેલ કામનો કેટલોક ભાગ જે પૂરો થયો છે"
 
-#: gtk/gtkprogressbar.c:142
+#: ../gtk/gtkprogressbar.c:168
 msgid "Pulse Step"
 msgstr "કંપન પગલ�ં"
 
-#: gtk/gtkprogressbar.c:143
+#: ../gtk/gtkprogressbar.c:169
 msgid "The fraction of total progress to move the bouncing block when pulsed"
 msgstr "કંપનની સ�થિતિમાં ઉછળતા ખાનાને ખસેડવા માટેનો ક�લ પ�રગતિનો ભાગ"
 
-#: gtk/gtkprogressbar.c:151
+#: ../gtk/gtkprogressbar.c:177
 msgid "Text to be displayed in the progress bar"
 msgstr "પ�રગતિ દર�શક પટ�ટીમાં દર�શાવવા માટેન�ં લખાણ"
 
-#: gtk/gtkprogressbar.c:158
+#: ../gtk/gtkprogressbar.c:198
 msgid "Show text"
 msgstr "લખાણ બતાવો"
 
-#: gtk/gtkprogressbar.c:159
+#: ../gtk/gtkprogressbar.c:199
 msgid "Whether the progress is shown as text."
 msgstr "શ�ં પ�રગતિ લખાણ તરીકે બતાવેલ છે."
 
-#: gtk/gtkprogressbar.c:181
+#: ../gtk/gtkprogressbar.c:221
 msgid ""
 "The preferred place to ellipsize the string, if the progress bar does not "
 "have enough room to display the entire string, if at all."
@@ -4290,65 +4821,65 @@ msgstr ""
 "શબ�દમાળા પ�રકાશિત કરવા માટેન�ં પ�રાધાન�યવાળ�ં સ�થળ, જો પ�રગતિદર�રશક પટ�ટી પાસે વર�તમાન "
 "શબ�દમાળા દર�શાવવા માટે પૂરતી જગ�યા નહિં હોય, કોઈપણ હિસાબે."
 
-#: gtk/gtkprogressbar.c:188
+#: ../gtk/gtkprogressbar.c:228
 #, fuzzy
 msgid "X spacing"
 msgstr "XSpacing"
 
-#: gtk/gtkprogressbar.c:189
+#: ../gtk/gtkprogressbar.c:229
 msgid "Extra spacing applied to the width of a progress bar."
 msgstr "પ�રગતિદર�શક પટ�ટીની પહોળાઈને વધારાની જગ�યા લાગ� પાડવામાં આવેલ છે."
 
-#: gtk/gtkprogressbar.c:194
+#: ../gtk/gtkprogressbar.c:234
 #, fuzzy
 msgid "Y spacing"
 msgstr "YSpacing"
 
-#: gtk/gtkprogressbar.c:195
+#: ../gtk/gtkprogressbar.c:235
 msgid "Extra spacing applied to the height of a progress bar."
 msgstr "પ�રગતિદર�શક પટ�ટીની ઊંચાઇને વધારાની જગ�યા લાગ� પાડવામાં આવેલ છે."
 
-#: gtk/gtkprogressbar.c:208
+#: ../gtk/gtkprogressbar.c:248
 #, fuzzy
 msgid "Minimum horizontal bar width"
 msgstr "ન�યૂનત�તમ આડી પટ�ટીની પહોળાઇ"
 
-#: gtk/gtkprogressbar.c:209
+#: ../gtk/gtkprogressbar.c:249
 msgid "The minimum horizontal width of the progress bar"
 msgstr "પ�રગતિદર�શક પટ�ટી ની ન�યૂનત�તમ આડી પહોળાઇ"
 
-#: gtk/gtkprogressbar.c:221
+#: ../gtk/gtkprogressbar.c:261
 #, fuzzy
 msgid "Minimum horizontal bar height"
 msgstr "ન�યૂનત�તમ આડી પટ�ટીની ઊંચાઇ"
 
-#: gtk/gtkprogressbar.c:222
+#: ../gtk/gtkprogressbar.c:262
 msgid "Minimum horizontal height of the progress bar"
 msgstr "પ�રગતિદર�શક પટ�ટીની ન�યૂનત�તમ આડી ઊંચાઇ"
 
-#: gtk/gtkprogressbar.c:234
+#: ../gtk/gtkprogressbar.c:274
 #, fuzzy
 msgid "Minimum vertical bar width"
 msgstr "ન�યૂનત�તમ ઊભી પટ�ટીની પહોળાઇ"
 
-#: gtk/gtkprogressbar.c:235
+#: ../gtk/gtkprogressbar.c:275
 msgid "The minimum vertical width of the progress bar"
 msgstr "પ�રગતિદર�શક પટ�ટી ની ન�યૂનત�તમ ઊભી પહોળાઇ"
 
-#: gtk/gtkprogressbar.c:247
+#: ../gtk/gtkprogressbar.c:287
 #, fuzzy
 msgid "Minimum vertical bar height"
 msgstr "ન�યૂનત�તમ ઊભી પટ�ટીની ઊંચાઈ"
 
-#: gtk/gtkprogressbar.c:248
+#: ../gtk/gtkprogressbar.c:288
 msgid "The minimum vertical height of the progress bar"
 msgstr "પ�રગતિદર�શક પટ�ટીની ન�યૂનત�તમ ઊભી ઊંચાઇ"
 
-#: gtk/gtkradioaction.c:118
+#: ../gtk/gtkradioaction.c:118
 msgid "The value"
 msgstr "કિંમત"
 
-#: gtk/gtkradioaction.c:119
+#: ../gtk/gtkradioaction.c:119
 msgid ""
 "The value returned by gtk_radio_action_get_current_value() when this action "
 "is the current action of its group."
@@ -4356,401 +4887,408 @@ msgstr ""
 "gtk_radio_action_get_current_value() દ�વારા મળેલી કિંમત જ�યારે આ ક�રિયા � તેના જૂથની "
 "વર�તમાન ક�રિયા હોય છે."
 
-#: gtk/gtkradioaction.c:135 gtk/gtkradiobutton.c:160
-#: gtk/gtkradiomenuitem.c:373 gtk/gtkradiotoolbutton.c:65
+#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiomenuitem.c:426 ../gtk/gtkradiotoolbutton.c:85
 msgid "Group"
 msgstr "જૂથ"
 
-#: gtk/gtkradioaction.c:136
+#: ../gtk/gtkradioaction.c:136
 msgid "The radio action whose group this action belongs to."
 msgstr "રેડિયો ક�રિયા કે જેના જૂથને આ ક�રિયા અન�સરે છે."
 
-#: gtk/gtkradioaction.c:151
+#: ../gtk/gtkradioaction.c:151
 msgid "The current value"
 msgstr "વર�તમાન કિંમત"
 
-#: gtk/gtkradioaction.c:152
+#: ../gtk/gtkradioaction.c:152
 msgid ""
 "The value property of the currently active member of the group to which this "
 "action belongs."
 msgstr "જૂથના વર�તમાનમાં સક�રિય સભ�યનો કિંમત ગ�ણધર�મ કે જેમાં આ ક�રિયા અન�લક�ષે છે."
 
-#: gtk/gtkradiobutton.c:161
+#: ../gtk/gtkradiobutton.c:165
 msgid "The radio button whose group this widget belongs to."
 msgstr "રેડિયો બટન કે જેન�ં જૂથ આ વિજેટને અન�સરે છે."
 
-#: gtk/gtkradiomenuitem.c:374
+#: ../gtk/gtkradiomenuitem.c:427
 msgid "The radio menu item whose group this widget belongs to."
 msgstr "રેડિયો મેન� વસ�ત� કે જેન�ં જૂથમાં આ વિજેટ અન�લક�ષે છે."
 
-#: gtk/gtkradiotoolbutton.c:66
+#: ../gtk/gtkradiotoolbutton.c:86
 msgid "The radio tool button whose group this button belongs to."
 msgstr "રેડિયો સાધન બટન કે જેન�ં જૂથ આ બટનને અન�સરે છે."
 
-#: gtk/gtkrange.c:410
-msgid "Update policy"
-msgstr "સ�ધારા પોલિસી"
-
-#: gtk/gtkrange.c:411
-msgid "How the range should be updated on the screen"
-msgstr "સ�ક�રીન પર વિસ�તારને કેવી રીતે બદલવી"
-
-#: gtk/gtkrange.c:420
+#: ../gtk/gtkrange.c:419
 msgid "The GtkAdjustment that contains the current value of this range object"
 msgstr "GtkAdjustment કે જે આ વિસ�તારની વસ�ત�ની વર�તમાન કિંમત ધરાવે છે"
 
-#: gtk/gtkrange.c:428
+#: ../gtk/gtkrange.c:427
 msgid "Invert direction slider moves to increase range value"
 msgstr "વિસ�તારની કિંમત વધારવા માટે દિશાના સરકપટ�ટીને ઉલટ� ફેરવો"
 
-#: gtk/gtkrange.c:435
+#: ../gtk/gtkrange.c:434
 msgid "Lower stepper sensitivity"
 msgstr "નીચી ઊંડી સંવેદનશીલતા"
 
-#: gtk/gtkrange.c:436
+#: ../gtk/gtkrange.c:435
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's lower "
 "side"
 msgstr "ઊંડી માટે સંવેદનશીલતા પોલિસી કે જે સંત�લનને નીચી બાજ�� નિર�દેશ કરે છે"
 
-#: gtk/gtkrange.c:444
+#: ../gtk/gtkrange.c:443
 msgid "Upper stepper sensitivity"
 msgstr "ઉપરની ઊંડી સંવેદનશીલતા"
 
-#: gtk/gtkrange.c:445
+#: ../gtk/gtkrange.c:444
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's upper "
 "side"
 msgstr "ઊંડાણ માટે સંવેદનશીલતા પોલિસી કે જે સંત�લનની ઉપરની બાજ�ને નિર�દેશ કરે છે"
 
-#: gtk/gtkrange.c:462
+#: ../gtk/gtkrange.c:461
 msgid "Show Fill Level"
 msgstr "ભરવાનાં સ�તરો બતાવો"
 
-#: gtk/gtkrange.c:463
+#: ../gtk/gtkrange.c:462
 msgid "Whether to display a fill level indicator graphics on trough."
 msgstr "શ�ં ભરવાન�ં સ�તર સૂચક ગ�રાફિક�સ દર�શાવવ�ં કે નહિં."
 
-#: gtk/gtkrange.c:479
+#: ../gtk/gtkrange.c:478
 msgid "Restrict to Fill Level"
 msgstr "ભરવાનાં સ�તરો બાંધો"
 
-#: gtk/gtkrange.c:480
+#: ../gtk/gtkrange.c:479
 msgid "Whether to restrict the upper boundary to the fill level."
 msgstr "શ�ં ભરવાના સ�તરોની ઉપરની કિનારી બંધિત કરવી."
 
-#: gtk/gtkrange.c:495
+#: ../gtk/gtkrange.c:494
 msgid "Fill Level"
 msgstr "ભરવાનાં સ�તર"
 
-#: gtk/gtkrange.c:496
+#: ../gtk/gtkrange.c:495
 msgid "The fill level."
 msgstr "ભરવાન�ં સ�તર."
 
-#: gtk/gtkrange.c:504
+#: ../gtk/gtkrange.c:512
+#, fuzzy
+#| msgid "Digits"
+msgid "Round Digits"
+msgstr "આંકડા"
+
+#: ../gtk/gtkrange.c:513
+#, fuzzy
+#| msgid "The number of pages in the document."
+msgid "The number of digits to round the value to."
+msgstr "દસ�તાવેજમાં પાનાંઓની સંખ�યા."
+
+#: ../gtk/gtkrange.c:521 ../gtk/gtkswitch.c:817
 msgid "Slider Width"
 msgstr "સરકપટ�ટીની પહોળાઈ"
 
-#: gtk/gtkrange.c:505
+#: ../gtk/gtkrange.c:522
 msgid "Width of scrollbar or scale thumb"
 msgstr "ખસાડવાની પટ�ટી કે સ�કેલ થમ�બની પહોળાઈ"
 
-#: gtk/gtkrange.c:512
+#: ../gtk/gtkrange.c:529
 msgid "Trough Border"
 msgstr "ગર�તની કિનારી"
 
-#: gtk/gtkrange.c:513
+#: ../gtk/gtkrange.c:530
 msgid "Spacing between thumb/steppers and outer trough bevel"
 msgstr "બહારના ગર�તના બેવેલ અને થમ�બ/સ�ટેપર વચ�ચેની જગ�યા"
 
-#: gtk/gtkrange.c:520
+#: ../gtk/gtkrange.c:537
 msgid "Stepper Size"
 msgstr "સ�ટેપરન� માપ"
 
-#: gtk/gtkrange.c:521
+#: ../gtk/gtkrange.c:538
 msgid "Length of step buttons at ends"
 msgstr "છેડા પર સ�ટેપ બટન ની લંબાઈ"
 
-#: gtk/gtkrange.c:536
+#: ../gtk/gtkrange.c:551
 msgid "Stepper Spacing"
 msgstr "સ�ટેપરની જગ�યા"
 
-#: gtk/gtkrange.c:537
+#: ../gtk/gtkrange.c:552
 msgid "Spacing between step buttons and thumb"
 msgstr "સ�ટેપ બટન અને થમ�બ વચ�ચેની જગ�યા"
 
-#: gtk/gtkrange.c:544
+#: ../gtk/gtkrange.c:559
 msgid "Arrow X Displacement"
 msgstr "તીરન�ં X દિશામાં સ�થળાંતર"
 
-#: gtk/gtkrange.c:545
-msgid ""
-"How far in the x direction to move the arrow when the button is depressed"
+#: ../gtk/gtkrange.c:560
+msgid "How far in the x direction to move the arrow when the button is depressed"
 msgstr "જ�યારે બટન દબાવવામાં આવે ત�યારે તીરને x દિશામાં કેટલી દૂર લઈ જવ�"
 
-#: gtk/gtkrange.c:552
+#: ../gtk/gtkrange.c:567
 msgid "Arrow Y Displacement"
 msgstr "તીરન� Y દિશામાં સ�થળાંતર"
 
-#: gtk/gtkrange.c:553
-msgid ""
-"How far in the y direction to move the arrow when the button is depressed"
+#: ../gtk/gtkrange.c:568
+msgid "How far in the y direction to move the arrow when the button is depressed"
 msgstr "જ�યારે બટન દબાવવામાં આવે ત�યારે તીરને Y દિશામાં કેટલી દૂર લઈ જવી "
 
-#: gtk/gtkrange.c:571
+#: ../gtk/gtkrange.c:584
 msgid "Trough Under Steppers"
 msgstr "Trough પગલાંઓ નીચે"
 
-#: gtk/gtkrange.c:572
+#: ../gtk/gtkrange.c:585
 msgid ""
 "Whether to draw trough for full length of range or exclude the steppers and "
 "spacing"
 msgstr "શ�ં વિસ�તારની સંપૂર�ણ લંબાઈ માટે દોરવ�ં કે આગળ આવનારાઓને અને જગ�યા છોડવા માટે દોરવ�ં"
 
-#: gtk/gtkrange.c:585
+#: ../gtk/gtkrange.c:598
 msgid "Arrow scaling"
 msgstr "તીરન�ં માપન"
 
-#: gtk/gtkrange.c:586
+#: ../gtk/gtkrange.c:599
 msgid "Arrow scaling with regard to scroll button size"
 msgstr "સરક બટન માપને સંબંધિત તીર ખેંચવાન�ં"
 
-#: gtk/gtkrecentaction.c:635 gtk/gtkrecentchoosermenu.c:252
+#: ../gtk/gtkrecentaction.c:635 ../gtk/gtkrecentchoosermenu.c:246
 msgid "Show Numbers"
 msgstr "નંબરો બતાવો"
 
-#: gtk/gtkrecentaction.c:636 gtk/gtkrecentchoosermenu.c:253
+#: ../gtk/gtkrecentaction.c:636 ../gtk/gtkrecentchoosermenu.c:247
 msgid "Whether the items should be displayed with a number"
 msgstr "શ�ં વસ�ત�ઓ સંખ�યા સાથે દર�શાવવી જોઈ�"
 
-#: gtk/gtkrecentchooser.c:132
+#: ../gtk/gtkrecentchooser.c:132
 msgid "Recent Manager"
 msgstr "છેલ�લો વ�યવસ�થાપક"
 
-#: gtk/gtkrecentchooser.c:133
+#: ../gtk/gtkrecentchooser.c:133
 msgid "The RecentManager object to use"
 msgstr "વાપરવા માટેનો RecentManager ઓબ�જેક�ટ"
 
-#: gtk/gtkrecentchooser.c:147
+#: ../gtk/gtkrecentchooser.c:147
 msgid "Show Private"
 msgstr "ખાનગી બતાવો"
 
-#: gtk/gtkrecentchooser.c:148
+#: ../gtk/gtkrecentchooser.c:148
 msgid "Whether the private items should be displayed"
 msgstr "શ�ં ખાનગી વસ�ત�ઓ દર�શાવવી જોઈ�"
 
-#: gtk/gtkrecentchooser.c:161
+#: ../gtk/gtkrecentchooser.c:161
 msgid "Show Tooltips"
 msgstr "સાધનમદદો બતાવો"
 
-#: gtk/gtkrecentchooser.c:162
+#: ../gtk/gtkrecentchooser.c:162
 msgid "Whether there should be a tooltip on the item"
 msgstr "શ�ં ત�યાં વસ�ત� પર સાધનમદદ હોવી જોઈ�"
 
-#: gtk/gtkrecentchooser.c:174
+#: ../gtk/gtkrecentchooser.c:174
 msgid "Show Icons"
 msgstr "ચિહ�નો બતાવો"
 
-#: gtk/gtkrecentchooser.c:175
+#: ../gtk/gtkrecentchooser.c:175
 msgid "Whether there should be an icon near the item"
 msgstr "શ�ં ત�યાં વસ�ત�ની નજીક ચિહ�ન હોવ�ં જોઈ�"
 
-#: gtk/gtkrecentchooser.c:190
+#: ../gtk/gtkrecentchooser.c:190
 msgid "Show Not Found"
 msgstr "મળ�યન�ં નહિં બતાવો"
 
-#: gtk/gtkrecentchooser.c:191
+#: ../gtk/gtkrecentchooser.c:191
 msgid "Whether the items pointing to unavailable resources should be displayed"
 msgstr "શ�ં ઉપલબ�ધ નહિં �વા સ�રોતોનો નિર�દેશ કરતી વસ�ત�ઓ દર�શાવવી જોઈ�"
 
-#: gtk/gtkrecentchooser.c:204
+#: ../gtk/gtkrecentchooser.c:204
 msgid "Whether to allow multiple items to be selected"
 msgstr "શ�ં ઘણી વસ�ત�ઓને પસંદ થયેલ પરવાનગી આપવી જોઈ�"
 
-#: gtk/gtkrecentchooser.c:217
+#: ../gtk/gtkrecentchooser.c:217
 msgid "Local only"
 msgstr "માત�ર સ�થાનિક"
 
-#: gtk/gtkrecentchooser.c:218
+#: ../gtk/gtkrecentchooser.c:218
 msgid "Whether the selected resource(s) should be limited to local file: URIs"
 msgstr "શ�ં પસંદ કરેલ સ�રોતો માત�ર સ�થાનિક ફાઈલ પૂરતા જ મર�યાદિત હોવા જોઈ�: URIs"
 
-#: gtk/gtkrecentchooser.c:234
+#: ../gtk/gtkrecentchooser.c:234
 msgid "Limit"
 msgstr "મર�યાદા"
 
-#: gtk/gtkrecentchooser.c:235
+#: ../gtk/gtkrecentchooser.c:235
 msgid "The maximum number of items to be displayed"
 msgstr "દર�શાવવા માટેની મહત�તમ સંખ�યાની વસ�ત�ઓ"
 
-#: gtk/gtkrecentchooser.c:249
+#: ../gtk/gtkrecentchooser.c:249
 msgid "Sort Type"
 msgstr "ક�રમમાં ગોઠવવાનો પ�રકાર"
 
-#: gtk/gtkrecentchooser.c:250
+#: ../gtk/gtkrecentchooser.c:250
 msgid "The sorting order of the items displayed"
 msgstr "દર�શાવાયેલ વસ�ત�ઓને ક�રમમાં ગોઠવવાનો પ�રકાર"
 
-#: gtk/gtkrecentchooser.c:265
+#: ../gtk/gtkrecentchooser.c:265
 msgid "The current filter for selecting which resources are displayed"
 msgstr "કયા સ�રોતો દર�શાવાયેલ છે તે પસંદ કરવા માટેન�ં વર�તમાન ગાળક"
 
-#: gtk/gtkrecentmanager.c:291
+#: ../gtk/gtkrecentmanager.c:295
 msgid "The full path to the file to be used to store and read the list"
 msgstr "યાદી સંગ�રહવા અને વાંચવા માટે વાપરવા માટેની ફાઈલનો આખો પાથ"
 
-#: gtk/gtkrecentmanager.c:306
+#: ../gtk/gtkrecentmanager.c:310
 msgid "The size of the recently used resources list"
 msgstr "છેલ�લે વપરાયેલ સ�રોતો યાદીન�ં માપ"
 
-#: gtk/gtkruler.c:138
-msgid "Lower"
-msgstr "નીચેન�ં"
-
-#: gtk/gtkruler.c:139
-msgid "Lower limit of ruler"
-msgstr "માપપટ�ટીની નીચેની હદ"
-
-#: gtk/gtkruler.c:148
-msgid "Upper"
-msgstr "ઉપરન�"
-
-#: gtk/gtkruler.c:149
-msgid "Upper limit of ruler"
-msgstr "માપપટ�ટીની ઉપરની હદ"
-
-#: gtk/gtkruler.c:159
-msgid "Position of mark on the ruler"
-msgstr "માપપટ�ટી ઉપર નિશાનીન� સ�થાન"
-
-#: gtk/gtkruler.c:168
-msgid "Max Size"
-msgstr "મહત�તમ માપ"
-
-#: gtk/gtkruler.c:169
-msgid "Maximum size of the ruler"
-msgstr "માપપટ�ટી ન� મહત�તમ માપ"
-
-#: gtk/gtkruler.c:184
-msgid "Metric"
-msgstr "મેટ�રિક"
-
-#: gtk/gtkruler.c:185
-msgid "The metric used for the ruler"
-msgstr "માપપટ�ટી માટે વપરાયેલ મેટ�રિક"
-
-#: gtk/gtkscalebutton.c:221
+#: ../gtk/gtkscalebutton.c:219
 msgid "The value of the scale"
 msgstr "માપદંડની કિંમત"
 
-#: gtk/gtkscalebutton.c:231
+#: ../gtk/gtkscalebutton.c:229
 msgid "The icon size"
 msgstr "ચિહ�ન માપ"
 
-#: gtk/gtkscalebutton.c:240
-msgid ""
-"The GtkAdjustment that contains the current value of this scale button object"
+#: ../gtk/gtkscalebutton.c:238
+msgid "The GtkAdjustment that contains the current value of this scale button object"
 msgstr "GtkAdjustment કે જે આ માપદંડ બટન ઓબ�જેક�ટની વર�તમાન કિંમત સમાવે છે"
 
-#: gtk/gtkscalebutton.c:268
+#: ../gtk/gtkscalebutton.c:266
 msgid "Icons"
 msgstr "ચિહ�નો"
 
-#: gtk/gtkscalebutton.c:269
+#: ../gtk/gtkscalebutton.c:267
 msgid "List of icon names"
 msgstr "ચિહ�ન નામોની યાદી"
 
-#: gtk/gtkscale.c:245
+#: ../gtk/gtkscale.c:255
 msgid "The number of decimal places that are displayed in the value"
 msgstr "દશાંશ સ�થળોની સંખ�યા કે જેઓ કિંમતમાં દર�શાવાયેલ છે"
 
-#: gtk/gtkscale.c:254
+#: ../gtk/gtkscale.c:264
 msgid "Draw Value"
 msgstr "કિંમત દોરો"
 
-#: gtk/gtkscale.c:255
+#: ../gtk/gtkscale.c:265
 msgid "Whether the current value is displayed as a string next to the slider"
 msgstr "શ�ં વર�તમાન કિંમત સરકપટ�ટીની બાજ�ની શબ�દમાળા તરીકે દર�શાવાયી છે"
 
-#: gtk/gtkscale.c:262
+#: ../gtk/gtkscale.c:272
 msgid "Value Position"
 msgstr "કિંમતની સ�થિતિ"
 
-#: gtk/gtkscale.c:263
+#: ../gtk/gtkscale.c:273
 msgid "The position in which the current value is displayed"
 msgstr "� સ�થાન કે જ�યાં વર�તમાન કિંમત દર�શાવાયી છે"
 
-#: gtk/gtkscale.c:270
+#: ../gtk/gtkscale.c:280
 msgid "Slider Length"
 msgstr "સરકપટ�ટીની લંબાઈ"
 
-#: gtk/gtkscale.c:271
+#: ../gtk/gtkscale.c:281
 msgid "Length of scale's slider"
 msgstr "માપપટ�ટીની સરકપટ�ટીની લંબાઈ"
 
-#: gtk/gtkscale.c:279
+#: ../gtk/gtkscale.c:289
 msgid "Value spacing"
 msgstr "કિંમતની વચ�ચેની જગ�યા"
 
-#: gtk/gtkscale.c:280
+#: ../gtk/gtkscale.c:290
 msgid "Space between value text and the slider/trough area"
 msgstr "લખાણની કિંમત અને સરકપટ�ટી/ગર�તના વિસ�તાર વચ�ચેની જગ�યા"
 
-#: gtk/gtkscrollbar.c:50
+#: ../gtk/gtkscrollable.c:94
+msgid "Horizontal adjustment"
+msgstr "આડી ગોઠવણી"
+
+#: ../gtk/gtkscrollable.c:95
+msgid ""
+"Horizontal adjustment that is shared between the scrollable widget and its "
+"controller"
+msgstr ""
+
+#: ../gtk/gtkscrollable.c:111
+msgid "Vertical adjustment"
+msgstr "ઊભી ગોઠવણી"
+
+#: ../gtk/gtkscrollable.c:112
+msgid ""
+"Vertical adjustment that is shared between the scrollable widget and its "
+"controller"
+msgstr ""
+
+#: ../gtk/gtkscrollable.c:128
+#, fuzzy
+#| msgid "Horizontal Scrollbar Policy"
+msgid "Horizontal Scrollable Policy"
+msgstr "આડી ખસેડવાની પટ�ટીની નીતિ"
+
+#: ../gtk/gtkscrollable.c:129 ../gtk/gtkscrollable.c:145
+msgid "How the size of the content should be determined"
+msgstr ""
+
+#: ../gtk/gtkscrollable.c:144
+#, fuzzy
+#| msgid "Vertical Scrollbar Policy"
+msgid "Vertical Scrollable Policy"
+msgstr "ઊભી ખસેડવાની પટ�ટીની નીતિ"
+
+#: ../gtk/gtkscrollbar.c:72
 msgid "Minimum Slider Length"
 msgstr "સરકપટ�ટીની ન�યૂનતમ લંબાઈ"
 
-#: gtk/gtkscrollbar.c:51
+#: ../gtk/gtkscrollbar.c:73
 msgid "Minimum length of scrollbar slider"
 msgstr "ખસેડવાની પટ�ટીની સરકપટ�ટીની ન�યૂનતમ લંબાઈ"
 
-#: gtk/gtkscrollbar.c:59
+#: ../gtk/gtkscrollbar.c:81
 msgid "Fixed slider size"
 msgstr "સરકપટ�ટીન�ં ચોક�કસ માપ"
 
-#: gtk/gtkscrollbar.c:60
+#: ../gtk/gtkscrollbar.c:82
 msgid "Don't change slider size, just lock it to the minimum length"
 msgstr "સરકપટ�ટીન�ં માપ બદલો નહિ, તેને ફક�ત ન�યૂનતમ લંબાઈ પર સ�થિર રાખો"
 
-#: gtk/gtkscrollbar.c:81
-msgid ""
-"Display a second backward arrow button on the opposite end of the scrollbar"
+#: ../gtk/gtkscrollbar.c:103
+msgid "Display a second backward arrow button on the opposite end of the scrollbar"
 msgstr "ખસેડવાની પટ�ટીના બીજા છેડા પર પાછા આવવા માટેન�ં �ક બીજ� બટન દર�શાવો"
 
-#: gtk/gtkscrollbar.c:88
-msgid ""
-"Display a second forward arrow button on the opposite end of the scrollbar"
+#: ../gtk/gtkscrollbar.c:110
+msgid "Display a second forward arrow button on the opposite end of the scrollbar"
 msgstr "બીજ�ં આગળ ધપાવો તીર બટન સરકપટ�ટીના વિર�દ�ધ અંત પર દર�શાવો"
 
-#: gtk/gtkscrolledwindow.c:243 gtk/gtktreeview.c:571
+#: ../gtk/gtkscrolledwindow.c:296
 msgid "Horizontal Adjustment"
 msgstr "આડી વ�યવસ�થિત ગોઠવણી"
 
-#: gtk/gtkscrolledwindow.c:250 gtk/gtktreeview.c:579
+#: ../gtk/gtkscrolledwindow.c:297
+msgid "The GtkAdjustment for the horizontal position"
+msgstr "આડી સ�થિતિ માટે GtkAdjustment"
+
+#: ../gtk/gtkscrolledwindow.c:303
 msgid "Vertical Adjustment"
 msgstr "ઊભી વ�યવસ�થિત ગોઠવણી"
 
-#: gtk/gtkscrolledwindow.c:257
+#: ../gtk/gtkscrolledwindow.c:304
+msgid "The GtkAdjustment for the vertical position"
+msgstr "ઊભી સ�થિતિ માટે GtkAdjustment"
+
+#: ../gtk/gtkscrolledwindow.c:310
 msgid "Horizontal Scrollbar Policy"
 msgstr "આડી ખસેડવાની પટ�ટીની નીતિ"
 
-#: gtk/gtkscrolledwindow.c:258
+#: ../gtk/gtkscrolledwindow.c:311
 msgid "When the horizontal scrollbar is displayed"
 msgstr "આડી ખસેડવાની પટ�ટી ક�યારે દર�શાવવામાં આવે છે"
 
-#: gtk/gtkscrolledwindow.c:265
+#: ../gtk/gtkscrolledwindow.c:318
 msgid "Vertical Scrollbar Policy"
 msgstr "ઊભી ખસેડવાની પટ�ટીની નીતિ"
 
-#: gtk/gtkscrolledwindow.c:266
+#: ../gtk/gtkscrolledwindow.c:319
 msgid "When the vertical scrollbar is displayed"
 msgstr "ઊભી ખસેડવાની પટ�ટીને ક�યારે દર�શાવવામાં આવે છે"
 
-#: gtk/gtkscrolledwindow.c:274
+#: ../gtk/gtkscrolledwindow.c:327
 msgid "Window Placement"
 msgstr "વિન�ડોની ગોઠવણી"
 
-#: gtk/gtkscrolledwindow.c:275
+#: ../gtk/gtkscrolledwindow.c:328
 msgid ""
 "Where the contents are located with respect to the scrollbars. This property "
 "only takes effect if \"window-placement-set\" is TRUE."
@@ -4758,11 +5296,11 @@ msgstr ""
 "સરકપટ�ટીઓને સંબંધિત સમાવિષ�ટો ક�યાં સ�થિત થયેલ છે. આ ગ�ણધર�મ માત�ર ત�યારે જ અસરમાં આવે છે જો "
 "\"window-placement-set\" � TRUE ખર�ં તરીકે સ�યોજિત થયેલ હોય."
 
-#: gtk/gtkscrolledwindow.c:292
+#: ../gtk/gtkscrolledwindow.c:345
 msgid "Window Placement Set"
 msgstr "વિન�ડોની ગોઠવણી સમૂહ"
 
-#: gtk/gtkscrolledwindow.c:293
+#: ../gtk/gtkscrolledwindow.c:346
 msgid ""
 "Whether \"window-placement\" should be used to determine the location of the "
 "contents with respect to the scrollbars."
@@ -4770,55 +5308,63 @@ msgstr ""
 "શ�ં \"વિન�ડો-ગોઠવણી\" � સરકપટ�ટીઓને અન�લક�ષીને સમાવિષ�ટોન�ં સ�થાન નક�કી કરવા માટે વપરાવ�ં "
 "જોઈ�."
 
-#: gtk/gtkscrolledwindow.c:299
+#: ../gtk/gtkscrolledwindow.c:352
 msgid "Shadow Type"
 msgstr "પડછાયાનો પ�રકાર"
 
-#: gtk/gtkscrolledwindow.c:300
+#: ../gtk/gtkscrolledwindow.c:353
 msgid "Style of bevel around the contents"
 msgstr "સમાવિષ�ટ વસ�ત�ની આસપાસ ઉઠાવનો પ�રકાર"
 
-#: gtk/gtkscrolledwindow.c:314
+#: ../gtk/gtkscrolledwindow.c:367
 msgid "Scrollbars within bevel"
 msgstr "bevel માં સરકપટ�ટીઓ"
 
-#: gtk/gtkscrolledwindow.c:315
+#: ../gtk/gtkscrolledwindow.c:368
 msgid "Place scrollbars within the scrolled window's bevel"
 msgstr "સરકાવાયેલ વિન�ડોની bevel માં સરકપટ�ટીઓ મૂકો"
 
-#: gtk/gtkscrolledwindow.c:321
+#: ../gtk/gtkscrolledwindow.c:374
 msgid "Scrollbar spacing"
 msgstr "ખસેડવાની પટ�ટી વચ�ચેની જગ�યા"
 
-#: gtk/gtkscrolledwindow.c:322
+#: ../gtk/gtkscrolledwindow.c:375
 msgid "Number of pixels between the scrollbars and the scrolled window"
 msgstr "ખસેડવાની પટ�ટી અને ખસેડાયેલી વિન�ડો વચ�ચે પિક�સેલની સંખ�યા"
 
-#: gtk/gtkscrolledwindow.c:337
-msgid "Scrolled Window Placement"
-msgstr "સરકાવાયેલ વિન�ડો ગોઠવણી"
+#: ../gtk/gtkscrolledwindow.c:391
+#, fuzzy
+#| msgid "Minimum Width"
+msgid "Minimum Content Width"
+msgstr "ન�યૂનતમ પહોળાઈ"
 
-#: gtk/gtkscrolledwindow.c:338
-msgid ""
-"Where the contents of scrolled windows are located with respect to the "
-"scrollbars, if not overridden by the scrolled window's own placement."
+#: ../gtk/gtkscrolledwindow.c:392
+msgid "The minimum width that the scrolled window will allocate to its content"
+msgstr ""
+
+#: ../gtk/gtkscrolledwindow.c:406
+#, fuzzy
+#| msgid "Minimum child height"
+msgid "Minimum Content Height"
+msgstr "બાળની ન�યૂનત�તમ ઊંચાઈ"
+
+#: ../gtk/gtkscrolledwindow.c:407
+msgid "The minimum height that the scrolled window will allocate to its content"
 msgstr ""
-"સરકપટ�ટીઓને અન�લક�ષીને સરકાવાયેલ વિન�ડોના સમાવિષ�ટો ક�યાં સ�થિત થયેલ હશે, જો સરકાવાયેલ "
-"વિન�ડોની પોતાની ગોઠવણી દ�વારા નહિં ફરીથી લખાયેલ હોય."
 
-#: gtk/gtkseparatortoolitem.c:138
+#: ../gtk/gtkseparatortoolitem.c:143
 msgid "Draw"
 msgstr "દોરો"
 
-#: gtk/gtkseparatortoolitem.c:139
+#: ../gtk/gtkseparatortoolitem.c:144
 msgid "Whether the separator is drawn, or just blank"
 msgstr "શ�ં વિભાજક દોરાયેલ છે, અથવા ખાલી જ છે"
 
-#: gtk/gtksettings.c:225
+#: ../gtk/gtksettings.c:322
 msgid "Double Click Time"
 msgstr "બમણા ક�લિક માટેનો સમય"
 
-#: gtk/gtksettings.c:226
+#: ../gtk/gtksettings.c:323
 msgid ""
 "Maximum time allowed between two clicks for them to be considered a double "
 "click (in milliseconds)"
@@ -4826,11 +5372,11 @@ msgstr ""
 "બમણા ક�લિક તરીકે ગણાવા માટે કરાયેલા બે ક�લિક વચ�ચે પરવાનગી આપવાનો મહત�તમ સમય"
 "(મિલીસેકન�ડમાં)"
 
-#: gtk/gtksettings.c:233
+#: ../gtk/gtksettings.c:330
 msgid "Double Click Distance"
 msgstr "બમણા ક�લિક માટેન�ં અંતર"
 
-#: gtk/gtksettings.c:234
+#: ../gtk/gtksettings.c:331
 msgid ""
 "Maximum distance allowed between two clicks for them to be considered a "
 "double click (in pixels)"
@@ -4838,183 +5384,184 @@ msgstr ""
 "બમણા ક�લિક તરીકે ગણાવા માટે કરાયેલા બે ક�લિક વચ�ચે પરવાનગી આપવાનો મહત�તમ સમય"
 "(મિલીસેકન�ડમાં)"
 
-#: gtk/gtksettings.c:250
+#: ../gtk/gtksettings.c:347
 msgid "Cursor Blink"
 msgstr "કર�સરન�ં �બકવ�"
 
-#: gtk/gtksettings.c:251
+#: ../gtk/gtksettings.c:348
 msgid "Whether the cursor should blink"
 msgstr "શ�ં કર�સરને �બકત� કરવ� જોઈ�"
 
-#: gtk/gtksettings.c:258
+#: ../gtk/gtksettings.c:355
 msgid "Cursor Blink Time"
 msgstr "કર�સરને �બકવાનો સમય"
 
-#: gtk/gtksettings.c:259
+#: ../gtk/gtksettings.c:356
 msgid "Length of the cursor blink cycle, in milliseconds"
 msgstr "કર�સરને �બૂકવાના ચક�રની લંબાઈ, મિલીસેકન�ડમાં"
 
-#: gtk/gtksettings.c:278
+#: ../gtk/gtksettings.c:375
 msgid "Cursor Blink Timeout"
 msgstr "કર�સરને �બૂકવાનો સમયસમાપ�તિ ગાળો"
 
-#: gtk/gtksettings.c:279
+#: ../gtk/gtksettings.c:376
 msgid "Time after which the cursor stops blinking, in seconds"
 msgstr "કર�સર �બૂકવાન�ં બંધ કરે પછીનો સમય, સેકન�ડોમાં"
 
-#: gtk/gtksettings.c:286
+#: ../gtk/gtksettings.c:383
 msgid "Split Cursor"
 msgstr "કર�સર વિભાજન"
 
-#: gtk/gtksettings.c:287
+#: ../gtk/gtksettings.c:384
 msgid ""
 "Whether two cursors should be displayed for mixed left-to-right and right-to-"
 "left text"
 msgstr "શ�ં ડાબેથી જમણે અને જમણેથી ડાબે લખાણને મિશ�રણ માટે બે કર�સરને પ�રદર�શિત કરવો જોઈ�"
 
-#: gtk/gtksettings.c:294
+#: ../gtk/gtksettings.c:391
 msgid "Theme Name"
 msgstr "થીમન�ં નામ"
 
-#: gtk/gtksettings.c:295
-msgid "Name of theme RC file to load"
+#: ../gtk/gtksettings.c:392
+#, fuzzy
+#| msgid "Name of theme RC file to load"
+msgid "Name of theme to load"
 msgstr "RC ફાઈલને લાવવા માટેના થીમન�ં નામ"
 
-#: gtk/gtksettings.c:303
+#: ../gtk/gtksettings.c:400
 msgid "Icon Theme Name"
 msgstr "ચિહ�ન થીમન�ં નામ"
 
-#: gtk/gtksettings.c:304
+#: ../gtk/gtksettings.c:401
 msgid "Name of icon theme to use"
 msgstr "વાપરવા માટેન ચિહ�ન થીમન�ં નામ"
 
-#: gtk/gtksettings.c:312
+#: ../gtk/gtksettings.c:409
 msgid "Fallback Icon Theme Name"
 msgstr "ફોલબેક ચિહ�ન થીમ નામ"
 
-#: gtk/gtksettings.c:313
+#: ../gtk/gtksettings.c:410
 msgid "Name of a icon theme to fall back to"
 msgstr "માં ફોલબેક કરવા માટેની ચિહ�ન થીમન�ં નામ"
 
-#: gtk/gtksettings.c:321
+#: ../gtk/gtksettings.c:418
 msgid "Key Theme Name"
 msgstr "મ�ખ�ય થીમન� નામ"
 
-#: gtk/gtksettings.c:322
-msgid "Name of key theme RC file to load"
-msgstr "લાવવા માટેની મ�ખ�ય થીમની RC ફાઈલન�ં નામ"
+#: ../gtk/gtksettings.c:419
+#| msgid "Name of key theme RC file to load"
+msgid "Name of key theme to load"
+msgstr "લાવવા માટેની મ�ખ�ય થીમન�ં નામ"
 
-#: gtk/gtksettings.c:330
+#: ../gtk/gtksettings.c:427
 msgid "Menu bar accelerator"
 msgstr "મેન�ની પટ�ટીનો પ�રવેગ"
 
-#: gtk/gtksettings.c:331
+#: ../gtk/gtksettings.c:428
 msgid "Keybinding to activate the menu bar"
 msgstr "મેન�ની પટ�ટીને કાર�યશીલ કરવા માટે ફાળવાયેલી કી"
 
-#: gtk/gtksettings.c:339
+#: ../gtk/gtksettings.c:436
 msgid "Drag threshold"
 msgstr "થ�રેશોલ�ડ ઘસેડો"
 
-#: gtk/gtksettings.c:340
+#: ../gtk/gtksettings.c:437
 msgid "Number of pixels the cursor can move before dragging"
 msgstr "ઘસેડતા પહેલા કર�સર ખસી શકે તેટલા પિક�સેલની સંખ�યા"
 
-#: gtk/gtksettings.c:348
+#: ../gtk/gtksettings.c:445
 msgid "Font Name"
 msgstr "ફોન�ટન�ં નામ"
 
-#: gtk/gtksettings.c:349
+#: ../gtk/gtksettings.c:446
 msgid "Name of default font to use"
 msgstr "ઉપયોગમાં લેવાના મૂળભૂત ફોન�ટન�ં નામ"
 
-#: gtk/gtksettings.c:371
+#: ../gtk/gtksettings.c:468
 msgid "Icon Sizes"
 msgstr "ચિહ�ન માપો"
 
-#: gtk/gtksettings.c:372
+#: ../gtk/gtksettings.c:469
 msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."
 msgstr "ચિહ�ન માપોની યાદી (gtk-menu=16,16:gtk-button=20,20..."
 
-#: gtk/gtksettings.c:380
+#: ../gtk/gtksettings.c:477
 msgid "GTK Modules"
 msgstr "GTK મોડ�ય�લો"
 
-#: gtk/gtksettings.c:381
+#: ../gtk/gtksettings.c:478
 msgid "List of currently active GTK modules"
 msgstr "વર�તમાનમાં સક�રિય GTK મોડ�ય�લોની યાદી"
 
-#: gtk/gtksettings.c:390
+#: ../gtk/gtksettings.c:486
 msgid "Xft Antialias"
 msgstr "Xft �ન�ટી�લીયાસ"
 
-#: gtk/gtksettings.c:391
+#: ../gtk/gtksettings.c:487
 msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
 msgstr "શ�ં Xft ફોન�ટને �ન�ટી�લિઆ� કરવા છે; ૦=ના, ૧=હા, -૧=મૂળભ�ત"
 
-#: gtk/gtksettings.c:400
+#: ../gtk/gtksettings.c:496
 msgid "Xft Hinting"
 msgstr "Xft હિંટીંગ"
 
-#: gtk/gtksettings.c:401
+#: ../gtk/gtksettings.c:497
 msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
 msgstr "શ�ં Xft ફોન�ટ હિંટ કરવા છે; ૦=ના, ૧=હા, -૧=મૂળભ�ત"
 
-#: gtk/gtksettings.c:410
+#: ../gtk/gtksettings.c:506
 msgid "Xft Hint Style"
 msgstr "Xft હિંટ શૈલી"
 
-#: gtk/gtksettings.c:411
-msgid ""
-"What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
-msgstr ""
-"હિંટીંગની કેટલી ડિગ�રી વાપરવી; hintnone, hintslight, hintmedium, અથવા hintfull"
+#: ../gtk/gtksettings.c:507
+msgid "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
+msgstr "હિંટીંગની કેટલી ડિગ�રી વાપરવી; hintnone, hintslight, hintmedium, અથવા hintfull"
 
-#: gtk/gtksettings.c:420
+#: ../gtk/gtksettings.c:516
 msgid "Xft RGBA"
 msgstr "Xft RGBA"
 
-#: gtk/gtksettings.c:421
+#: ../gtk/gtksettings.c:517
 msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
 msgstr "subpixel �ન�ટી�લિઆ�ીંગનો પ�રકાર; none, rgb, bgr, vrgb, vbgr"
 
-#: gtk/gtksettings.c:430
+#: ../gtk/gtksettings.c:526
 msgid "Xft DPI"
 msgstr "Xft DPI"
 
-#: gtk/gtksettings.c:431
+#: ../gtk/gtksettings.c:527
 msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
 msgstr "Xft માટે રી�ોલ�ય�શન, 1024 * dots/inch માં. મૂળભ�ત કિંમત માટે -૧ વાપરો"
 
-#: gtk/gtksettings.c:440
+#: ../gtk/gtksettings.c:536
 msgid "Cursor theme name"
 msgstr "કર�સર થીમ નામ"
 
-#: gtk/gtksettings.c:441
+#: ../gtk/gtksettings.c:537
 msgid "Name of the cursor theme to use, or NULL to use the default theme"
 msgstr "વાપરવા માટેની કર�સર થીમન�ં નામ, અથવા મૂળભૂત થીમ વાપરવા માટે NULL"
 
-#: gtk/gtksettings.c:449
+#: ../gtk/gtksettings.c:545
 msgid "Cursor theme size"
 msgstr "કર�સર થીમ માપ"
 
-#: gtk/gtksettings.c:450
+#: ../gtk/gtksettings.c:546
 msgid "Size to use for cursors, or 0 to use the default size"
 msgstr "કર�સરો માટે વાપરવાન�ં માપ, અથવા મૂળભૂત માપ વાપરવા માટે ૦"
 
-#: gtk/gtksettings.c:460
+#: ../gtk/gtksettings.c:555
 msgid "Alternative button order"
 msgstr "વૈકલ�પિક બટન ક�રમ"
 
-#: gtk/gtksettings.c:461
+#: ../gtk/gtksettings.c:556
 msgid "Whether buttons in dialogs should use the alternative button order"
 msgstr "શ�ં સંવાદમાંના બટનો� વૈકલ�પિક બટન ક�રમ વાપરવો જોઈ�"
 
-#: gtk/gtksettings.c:478
+#: ../gtk/gtksettings.c:573
 msgid "Alternative sort indicator direction"
 msgstr "વૈકલ�પિક સૂચક દિશા ક�રમમાં કરો"
 
-#: gtk/gtksettings.c:479
+#: ../gtk/gtksettings.c:574
 msgid ""
 "Whether the direction of the sort indicators in list and tree views is "
 "inverted compared to the default (where down means ascending)"
@@ -5022,634 +5569,716 @@ msgstr ""
 "શ�ં સૂચકોને યાદીમાં ક�રમમાં ગોઠવવાની દિશા અને વૃક�ષ દર�શોમાં તે મૂળભૂતની સરખામણીમાં ઉલટાવી "
 "દેવાયેલ છે (કે જ�યાં નીચે �ટલે કે ચડતો ક�રમ)"
 
-#: gtk/gtksettings.c:487
+#: ../gtk/gtksettings.c:582
 msgid "Show the 'Input Methods' menu"
 msgstr "'ઈનપ�ટ પદ�ધતિઓ' મેન� બતાવો"
 
-#: gtk/gtksettings.c:488
+#: ../gtk/gtksettings.c:583
 msgid ""
 "Whether the context menus of entries and text views should offer to change "
 "the input method"
 msgstr "શ�ં પ�રવેશોના સંદર�ભ મેન�ઓ અને લખાણ દૃશ�યો� ઈનપ�ટ પદ�ધતિ બદલવા માટે તક આપવી જોઈ�"
 
-#: gtk/gtksettings.c:496
+#: ../gtk/gtksettings.c:591
 msgid "Show the 'Insert Unicode Control Character' menu"
 msgstr "'ય�નિકોડ નિયંત�રણ અક�ષર દાખલ કરો' મેન� બતાવો"
 
-#: gtk/gtksettings.c:497
+#: ../gtk/gtksettings.c:592
 msgid ""
 "Whether the context menus of entries and text views should offer to insert "
 "control characters"
-msgstr ""
-"શ�ં પ�રવેશોના સંદર�ભ મેન�ઓ અને લખાણ દૃશ�યો� નિયંત�રણ અક�ષરો દાખલ કરવા માટે તક આપવી જોઈ�"
+msgstr "શ�ં પ�રવેશોના સંદર�ભ મેન�ઓ અને લખાણ દૃશ�યો� નિયંત�રણ અક�ષરો દાખલ કરવા માટે તક આપવી જોઈ�"
 
-#: gtk/gtksettings.c:505
+#: ../gtk/gtksettings.c:600
 msgid "Start timeout"
 msgstr "શરૂઆત સમયસમાપ�તિ"
 
-#: gtk/gtksettings.c:506
+#: ../gtk/gtksettings.c:601
 msgid "Starting value for timeouts, when button is pressed"
 msgstr "સમયસમાપ�તિઓ માટે શરૂઆતની કિંમત, જ�યારે બટન દબાયેલ હોય"
 
-#: gtk/gtksettings.c:515
+#: ../gtk/gtksettings.c:610
 msgid "Repeat timeout"
 msgstr "સમયસમાપ�તિ પ�નરાવર�તન"
 
-#: gtk/gtksettings.c:516
+#: ../gtk/gtksettings.c:611
 msgid "Repeat value for timeouts, when button is pressed"
 msgstr "સમયસમાપ�તિઓ માટે પ�નરાવર�તન કિંમત, જ�યારે બટન દબાયેલ હોય"
 
-#: gtk/gtksettings.c:525
+#: ../gtk/gtksettings.c:620
 msgid "Expand timeout"
 msgstr "સમયસમાપ�તિ વિસ�તારો"
 
-#: gtk/gtksettings.c:526
+#: ../gtk/gtksettings.c:621
 msgid "Expand value for timeouts, when a widget is expanding a new region"
 msgstr "સમયસમાપ�તિઓ માટે કિંમત વિસ�તારો, જ�યારે વિજેટ � નવો વિસ�તાર વિસ�તૃત કરી રહ�યો હોય"
 
-#: gtk/gtksettings.c:561
+#: ../gtk/gtksettings.c:656
 msgid "Color scheme"
 msgstr "રંગ પદ�ધતિ"
 
-#: gtk/gtksettings.c:562
+#: ../gtk/gtksettings.c:657
 msgid "A palette of named colors for use in themes"
 msgstr "થીમોમાં વાપરવા માટેના નામવાળા રંગોની તકતી"
 
-#: gtk/gtksettings.c:571
+#: ../gtk/gtksettings.c:666
 msgid "Enable Animations"
 msgstr "�નીમેશનો સક�રિય કરો"
 
-#: gtk/gtksettings.c:572
+#: ../gtk/gtksettings.c:667
 msgid "Whether to enable toolkit-wide animations."
 msgstr "શ�ં ટ�લકીટ-પ�રમાણે �નીમેશનો સક�રિય કરવા છે."
 
-#: gtk/gtksettings.c:590
+#: ../gtk/gtksettings.c:685
 msgid "Enable Touchscreen Mode"
 msgstr "ટચસ�ક�રીન સ�થિતિ સક�રિય કરો"
 
-#: gtk/gtksettings.c:591
+#: ../gtk/gtksettings.c:686
 msgid "When TRUE, there are no motion notify events delivered on this screen"
 msgstr "જ�યારે TRUE હોય, ત�યારે આ સ�ક�રીન પર કોઈ ગતિ સૂચન ઘટનાઓ હોતી નથી"
 
-#: gtk/gtksettings.c:608
+#: ../gtk/gtksettings.c:703
 msgid "Tooltip timeout"
 msgstr "સાધનમદદ સમયસમાપ�તિ ગાળો"
 
-#: gtk/gtksettings.c:609
+#: ../gtk/gtksettings.c:704
 msgid "Timeout before tooltip is shown"
 msgstr "સાધનમદદ બતાવાય તે પહેલાં સમયસમાપ�ત"
 
-#: gtk/gtksettings.c:634
+#: ../gtk/gtksettings.c:729
 msgid "Tooltip browse timeout"
 msgstr "સાધનમદદ શોધ સમયસમાપ�તિ ગાળો"
 
-#: gtk/gtksettings.c:635
+#: ../gtk/gtksettings.c:730
 msgid "Timeout before tooltip is shown when browse mode is enabled"
 msgstr "સાધનમદદ બતાવાય તે પહેલાં સમયસમાપ�તિ જ�યારે શોધ સ�થિતિ સક�રિય કરવામાં આવે"
 
-#: gtk/gtksettings.c:656
+#: ../gtk/gtksettings.c:751
 msgid "Tooltip browse mode timeout"
 msgstr "સાધનમદદ શોધ સ�થિતિ સમયસમાપ�તિ"
 
-#: gtk/gtksettings.c:657
+#: ../gtk/gtksettings.c:752
 msgid "Timeout after which browse mode is disabled"
 msgstr "સમયસમાપ�તિ ગાળો કે જેના પછી શોધ સ�થિતિ નિષ�ક�રિય થઈ જાય"
 
-#: gtk/gtksettings.c:676
+#: ../gtk/gtksettings.c:771
 msgid "Keynav Cursor Only"
 msgstr "Keynav કર�સર માત�ર"
 
-#: gtk/gtksettings.c:677
+#: ../gtk/gtksettings.c:772
 msgid "When TRUE, there are only cursor keys available to navigate widgets"
-msgstr ""
-"જ�યારે TRUE હોય, ત�યારે ત�યાં માત�ર કર�સર કીઓ જ વિજેટો શોધવા માટે ઉપલબ�ધ હોવી જોઈ�"
+msgstr "જ�યારે TRUE હોય, ત�યારે ત�યાં માત�ર કર�સર કીઓ જ વિજેટો શોધવા માટે ઉપલબ�ધ હોવી જોઈ�"
 
-#: gtk/gtksettings.c:694
+#: ../gtk/gtksettings.c:789
 msgid "Keynav Wrap Around"
 msgstr "Keynav ફરતે લપેટો"
 
-#: gtk/gtksettings.c:695
+#: ../gtk/gtksettings.c:790
 msgid "Whether to wrap around when keyboard-navigating widgets"
 msgstr "શ�ં કીબોર�ડ-શોધ વિજેટો ફરતે લપેટવ�ં"
 
-#: gtk/gtksettings.c:715
+#: ../gtk/gtksettings.c:810
 msgid "Error Bell"
 msgstr "ભૂલ ઘંટડી"
 
-#: gtk/gtksettings.c:716
+#: ../gtk/gtksettings.c:811
 msgid "When TRUE, keyboard navigation and other errors will cause a beep"
 msgstr "જ�યારે TRUE હોય, ત�યારે કીબોર�ડ શોધ અને અન�ય ભૂલો બીપન�ં કારણ બનશે"
 
-#: gtk/gtksettings.c:733
+#: ../gtk/gtksettings.c:828
 msgid "Color Hash"
 msgstr "રંગ હેશ"
 
-#: gtk/gtksettings.c:734
+#: ../gtk/gtksettings.c:829
 msgid "A hash table representation of the color scheme."
 msgstr "રંગ પદ�ધતિની હેશ કોષ�ટક રજૂઆત."
 
-#: gtk/gtksettings.c:742
+#: ../gtk/gtksettings.c:837
 msgid "Default file chooser backend"
 msgstr "મૂળભ�ત ફાઈલ પસંદગીકારક પાશ�વ ભાગ"
 
-#: gtk/gtksettings.c:743
+#: ../gtk/gtksettings.c:838
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "મૂળભ�ત રીતે વાપરવા માટેના GtkFileChooser પાશ�વભાગન�ં નામ"
 
-#: gtk/gtksettings.c:760
+#: ../gtk/gtksettings.c:855
 msgid "Default print backend"
 msgstr "મૂળભૂત છાપન પાશ�વ ભાગ"
 
-#: gtk/gtksettings.c:761
+#: ../gtk/gtksettings.c:856
 msgid "List of the GtkPrintBackend backends to use by default"
 msgstr "મૂળભૂત રીતે વાપરવા માટેના GtkPrintBackend પાશ�વ ભાગોની યાદી"
 
-#: gtk/gtksettings.c:784
+#: ../gtk/gtksettings.c:879
 msgid "Default command to run when displaying a print preview"
 msgstr "જ�યારે છાપન પૂર�વદર�શન દર�શાવી રહ�યા હોય ત�યારે ચલાવવાનો મૂળભૂત આદેશ"
 
-#: gtk/gtksettings.c:785
+#: ../gtk/gtksettings.c:880
 msgid "Command to run when displaying a print preview"
 msgstr "જ�યારે છાપન પૂર�વદર�શન દર�શાવી રહ�યા હોય ત�યારે ચલાવવાનો આદેશ"
 
-#: gtk/gtksettings.c:801
+#: ../gtk/gtksettings.c:896
 msgid "Enable Mnemonics"
 msgstr "સાંકેતિક ચિહ�નો સક�રિય કરો"
 
-#: gtk/gtksettings.c:802
+#: ../gtk/gtksettings.c:897
 msgid "Whether labels should have mnemonics"
 msgstr "શ�ં લેબલોને સાંકેતિક ચિહ�નો હોવા જોઈ�"
 
-#: gtk/gtksettings.c:818
+#: ../gtk/gtksettings.c:913
 msgid "Enable Accelerators"
 msgstr "પ�રવેગકો સક�રિય કરો"
 
-#: gtk/gtksettings.c:819
+#: ../gtk/gtksettings.c:914
 msgid "Whether menu items should have accelerators"
 msgstr "શ�ં મેન� વસ�ત�ઓને પ�રવેગકો હોવા જોઈ�"
 
-#: gtk/gtksettings.c:836
+#: ../gtk/gtksettings.c:931
 msgid "Recent Files Limit"
 msgstr "છેલ�લી ફાઈલો મર�યાદા"
 
-#: gtk/gtksettings.c:837
+#: ../gtk/gtksettings.c:932
 msgid "Number of recently used files"
 msgstr "છેલ�લે વપરાયેલ ફાઈલોની સંખ�યા"
 
-#: gtk/gtksettings.c:855
+#: ../gtk/gtksettings.c:950
 msgid "Default IM module"
 msgstr "મૂળભૂત IM મોડ�ય�લ"
 
-#: gtk/gtksettings.c:856
+#: ../gtk/gtksettings.c:951
 msgid "Which IM module should be used by default"
 msgstr "મૂળભૂત દ�દારા ક�ય�ં IM મોડ�ય�લ વપરાયેલ હોવ� જોઇ�"
 
-#: gtk/gtksettings.c:874
+#: ../gtk/gtksettings.c:969
 msgid "Recent Files Max Age"
 msgstr "તાજેતરની ફાઇલો ની મહત�તમ ઉંમર"
 
-#: gtk/gtksettings.c:875
+#: ../gtk/gtksettings.c:970
 msgid "Maximum age of recently used files, in days"
 msgstr "તાજેતરની વપરાયેલ ફાઇલો ની મહત�તમ ઉંમર, દિવસોમાં"
 
-#: gtk/gtksettings.c:884
+#: ../gtk/gtksettings.c:979
 msgid "Fontconfig configuration timestamp"
 msgstr "Fontconfig રૂપરેખાંકન ટાઇમસ�ટેમ�પ"
 
-#: gtk/gtksettings.c:885
+#: ../gtk/gtksettings.c:980
 msgid "Timestamp of current fontconfig configuration"
 msgstr "હાલનાં fontconfig રૂપરેખાંકન ન�ં ટાઇમસ�ટેમ�પ"
 
-#: gtk/gtksettings.c:907
+#: ../gtk/gtksettings.c:1002
 msgid "Sound Theme Name"
 msgstr "સાઉન�ડ થીમ નામ"
 
-#: gtk/gtksettings.c:908
+#: ../gtk/gtksettings.c:1003
 msgid "XDG sound theme name"
 msgstr "XDG સાઉન�ડ થીમ નામ"
 
 #. Translators: this means sounds that are played as feedback to user input
-#: gtk/gtksettings.c:930
+#: ../gtk/gtksettings.c:1025
 msgid "Audible Input Feedback"
 msgstr "ઓડિબલ ઇનપ�ટ ફિડબેક"
 
-#: gtk/gtksettings.c:931
+#: ../gtk/gtksettings.c:1026
 msgid "Whether to play event sounds as feedback to user input"
 msgstr "ક�યાંતો વપરાશકર�તાનાં ઇનપ�ટનાં ફિડબેક તરીકે ઘટના અવાજો ને વગાડશો કે નહિં"
 
-#: gtk/gtksettings.c:952
+#: ../gtk/gtksettings.c:1047
 msgid "Enable Event Sounds"
 msgstr "ઘટના સાઉન�ડો ને સક�રિય કરો"
 
-#: gtk/gtksettings.c:953
+#: ../gtk/gtksettings.c:1048
 msgid "Whether to play any event sounds at all"
 msgstr "ક�યાંતો કોઇપણ રીતે ઘટના અવાજો ને વગાડો કે નહિં"
 
-#: gtk/gtksettings.c:968
+#: ../gtk/gtksettings.c:1063
 msgid "Enable Tooltips"
 msgstr "સાધનમદદો ને સક�રિય કરો"
 
-#: gtk/gtksettings.c:969
+#: ../gtk/gtksettings.c:1064
 msgid "Whether tooltips should be shown on widgets"
 msgstr "વિજેટો પર ક�યાંતો સાધનમદદો ને બતાવેલ હોવ� જોઇ�"
 
-#: gtk/gtksettings.c:982
+#: ../gtk/gtksettings.c:1077
 msgid "Toolbar style"
 msgstr "સાધન દર�શાવવાની શૈલી"
 
-#: gtk/gtksettings.c:983
-msgid ""
-"Whether default toolbars have text only, text and icons, icons only, etc."
+#: ../gtk/gtksettings.c:1078
+msgid "Whether default toolbars have text only, text and icons, icons only, etc."
 msgstr "શ�ં મૂળભૂત સાધન દર�શક પટ�ટીમાં ફક�ત લખાણ, લખાણ અને ચિહ�નો, ફક�ત ચિહ�નો વગેરે હોય છે."
 
-#: gtk/gtksettings.c:997
-#, fuzzy
+#: ../gtk/gtksettings.c:1092
 msgid "Toolbar Icon Size"
-msgstr "સાધન દર�શક પટ�ટીના ચિહ�નન�ં માપ"
+msgstr "સાધનપટ�ટીનાં ચિહ�નન�ં માપ"
 
-#: gtk/gtksettings.c:998
+#: ../gtk/gtksettings.c:1093
 #, fuzzy
 msgid "The size of icons in default toolbars."
 msgstr "મૂળભૂત સાધન દર�શક પટ�ટીમાં ચિહ�નોનં� માપ"
 
-#: gtk/gtksettings.c:1015
+#: ../gtk/gtksettings.c:1110
 #, fuzzy
 msgid "Auto Mnemonics"
 msgstr "સાંકેતિક ચિહ�નો સક�રિય કરો"
 
-#: gtk/gtksettings.c:1016
+#: ../gtk/gtksettings.c:1111
 msgid ""
 "Whether mnemonics should be automatically shown and hidden when the user "
 "presses the mnemonic activator."
 msgstr ""
 
-#: gtk/gtksettings.c:1041
+#: ../gtk/gtksettings.c:1127
 #, fuzzy
+#| msgid "Visible"
+msgid "Visible Focus"
+msgstr "દૃશ�યમાન"
+
+#: ../gtk/gtksettings.c:1128
+msgid ""
+"Whether 'focus rectangles' should be hidden until the user starts to use the "
+"keyboard."
+msgstr ""
+
+#: ../gtk/gtksettings.c:1154
 msgid "Application prefers a dark theme"
-msgstr "દોરી શકાય તેવો કાર�યક�રમ"
+msgstr "કાર�યક�રમ કાળી થીમને પસંદ કરે છે"
 
-#: gtk/gtksettings.c:1042
+#: ../gtk/gtksettings.c:1155
 #, fuzzy
 msgid "Whether the application prefers to have a dark theme."
 msgstr "ક�યાંતો કાર�યક�રમ પાસે પસંદગી છે"
 
-#: gtk/gtksizegroup.c:341
+#: ../gtk/gtksettings.c:1170
+msgid "Show button images"
+msgstr "બટન ઈમેજો બતાવો"
+
+#: ../gtk/gtksettings.c:1171
+msgid "Whether images should be shown on buttons"
+msgstr "ક�યાંતો બટનો પર ચિત�રોને બતાવેલ હોવા જોઇ�"
+
+#: ../gtk/gtksettings.c:1179 ../gtk/gtksettings.c:1273
+msgid "Select on focus"
+msgstr "ફોકસ કરવા પર પસંદ કરો"
+
+#: ../gtk/gtksettings.c:1180
+msgid "Whether to select the contents of an entry when it is focused"
+msgstr "શ�ં ફોકસ થયા હોય ત�યારે પ�રવેશની સમાવિષ�ટ માહિતીને પસંદ કરવી"
+
+#: ../gtk/gtksettings.c:1197
+msgid "Password Hint Timeout"
+msgstr "પાસવર�ડ સંકેત સમયસમાપ�તિ"
+
+#: ../gtk/gtksettings.c:1198
+msgid "How long to show the last input character in hidden entries"
+msgstr "છ�પા પ�રવેશોમાં કેટલા સમય સ�ધી છેલ�લો દાખલ થયેલ અક�ષર બતાવવો"
+
+#: ../gtk/gtksettings.c:1207
+msgid "Show menu images"
+msgstr "મેન� ઈમેજો બતાવો"
+
+#: ../gtk/gtksettings.c:1208
+msgid "Whether images should be shown in menus"
+msgstr "શ�ં ઈમેજો મેન�ઓમાં બતાવવી જોઈ�"
+
+#: ../gtk/gtksettings.c:1216
+msgid "Delay before drop down menus appear"
+msgstr "નીચે આવત� મેન� દેખાય તે પહેલાનો વિલંબ"
+
+#: ../gtk/gtksettings.c:1217
+msgid "Delay before the submenus of a menu bar appear"
+msgstr "મેન�બારની ઉપમેન� દેખાય તે પહેલાનો વિલંબ"
+
+#: ../gtk/gtksettings.c:1234
+msgid "Scrolled Window Placement"
+msgstr "સરકાવાયેલ વિન�ડો ગોઠવણી"
+
+#: ../gtk/gtksettings.c:1235
+msgid ""
+"Where the contents of scrolled windows are located with respect to the "
+"scrollbars, if not overridden by the scrolled window's own placement."
+msgstr ""
+"સરકપટ�ટીઓને અન�લક�ષીને સરકાવાયેલ વિન�ડોના સમાવિષ�ટો ક�યાં સ�થિત થયેલ હશે, જો સરકાવાયેલ "
+"વિન�ડોની પોતાની ગોઠવણી દ�વારા નહિં ફરીથી લખાયેલ હોય."
+
+#: ../gtk/gtksettings.c:1244
+msgid "Can change accelerators"
+msgstr "પ�રવેગકો બદલી શકે છે"
+
+#: ../gtk/gtksettings.c:1245
+msgid "Whether menu accelerators can be changed by pressing a key over the menu item"
+msgstr "શ�ં મેન�ની વસ�ત� ઉપર કી દબાવવાથી મેન�નો પ�રવેગક બદલી શકાય છે"
+
+#: ../gtk/gtksettings.c:1253
+msgid "Delay before submenus appear"
+msgstr "ઉપમેન� ઓવે તે પહેલાનો વિલંબ"
+
+#: ../gtk/gtksettings.c:1254
+msgid "Minimum time the pointer must stay over a menu item before the submenu appear"
+msgstr "ઉપમેન� આવતાં પહેલા ન�યૂનતમ સમય કે જ�યાં સ�ધી નિર�દેશક મેન� પર રહેવ� જોઈ�"
+
+#: ../gtk/gtksettings.c:1263
+msgid "Delay before hiding a submenu"
+msgstr "ઉપમેન� છૂપાવતા પહેલાનો વિલંબ"
+
+#: ../gtk/gtksettings.c:1264
+msgid ""
+"The time before hiding a submenu when the pointer is moving towards the "
+"submenu"
+msgstr "જ�યારે નિર�દેશક ઉપમેન� તરફ જતો હોય ત�યારે તેને છૂપાવતા પહેલાનો વિલંબ"
+
+#: ../gtk/gtksettings.c:1274
+msgid "Whether to select the contents of a selectable label when it is focused"
+msgstr ""
+"શ�ં પસંદ કરી શકાય તેવા લેબલના સમાવિષ�ટોને જ�યારે તેઓ ફોકસ થયેલ હોય ત�યારે પસંદ કરવા કે નહિં"
+
+#: ../gtk/gtksettings.c:1282
+msgid "Custom palette"
+msgstr "વૈવિધ�યપૂર�ણ પેલેટ"
+
+#: ../gtk/gtksettings.c:1283
+msgid "Palette to use in the color selector"
+msgstr "રંગની પસંદગીમાં પેલેટનો ઉપયોગ કરવો"
+
+#: ../gtk/gtksettings.c:1291
+msgid "IM Preedit style"
+msgstr "IM ફરીથી ફેરફાર કરવાની રીત"
+
+#: ../gtk/gtksettings.c:1292
+msgid "How to draw the input method preedit string"
+msgstr "કેવી રીતે ઇનપ�ટ પદ�દતિ પિડીટ શબ�દમાળા ને દોરાય"
+
+#: ../gtk/gtksettings.c:1301
+msgid "IM Status style"
+msgstr "IM સ�થિતિનો પ�રકાર"
+
+#: ../gtk/gtksettings.c:1302
+msgid "How to draw the input method statusbar"
+msgstr "ઈનપ�ટ પધ�ધતિની સ�થિતિ દર�શાવતી પટ�ટી કેવી રીતે દોરવી"
+
+#: ../gtk/gtksizegroup.c:382 ../gtk/gtktreeselection.c:130
 msgid "Mode"
 msgstr "સ�થિતિ"
 
-#: gtk/gtksizegroup.c:342
+#: ../gtk/gtksizegroup.c:383
 msgid ""
 "The directions in which the size group affects the requested sizes of its "
 "component widgets"
 msgstr "દિશાઓ કે જેમાં માપ જૂથ તેના ઘટક વિજેટોના અરજી થયેલ માપોને અસર કરે છે"
 
-#: gtk/gtksizegroup.c:358
+#: ../gtk/gtksizegroup.c:399
 msgid "Ignore hidden"
 msgstr "છ�પ� હોય �ને અવગણો"
 
-#: gtk/gtksizegroup.c:359
-msgid ""
-"If TRUE, unmapped widgets are ignored when determining the size of the group"
-msgstr ""
-"જો TRUE હોય, તો મેપ થયા વિનાના વિજેટો અવગણાય છે જ�યારે જૂથન�ં માપ નક�કી કરી રહ�યા હોય"
+#: ../gtk/gtksizegroup.c:400
+msgid "If TRUE, unmapped widgets are ignored when determining the size of the group"
+msgstr "જો TRUE હોય, તો મેપ થયા વિનાના વિજેટો અવગણાય છે જ�યારે જૂથન�ં માપ નક�કી કરી રહ�યા હોય"
 
-#: gtk/gtkspinbutton.c:236
+#: ../gtk/gtkspinbutton.c:331
 msgid "Climb Rate"
 msgstr "વૃદ�ધિનો દર"
 
-#: gtk/gtkspinbutton.c:256
+#: ../gtk/gtkspinbutton.c:351
 msgid "Snap to Ticks"
 msgstr "સ�નેપથી ટીક�સ"
 
-#: gtk/gtkspinbutton.c:257
+#: ../gtk/gtkspinbutton.c:352
 msgid ""
 "Whether erroneous values are automatically changed to a spin button's "
 "nearest step increment"
 msgstr "શ�ં ભૂલવાળી કિંમતો તેની જાતેજ સ�પીન બટનના નજીકનાં વધારામાં બદલાઈ જાય છે"
 
-#: gtk/gtkspinbutton.c:264
+#: ../gtk/gtkspinbutton.c:359
 msgid "Numeric"
 msgstr "આંકડાકીય"
 
-#: gtk/gtkspinbutton.c:265
+#: ../gtk/gtkspinbutton.c:360
 msgid "Whether non-numeric characters should be ignored"
 msgstr "શ�ં બિન-આંકડાકીય શબ�દોને અવગણવા"
 
-#: gtk/gtkspinbutton.c:272
+#: ../gtk/gtkspinbutton.c:367
 msgid "Wrap"
 msgstr "લપેટો"
 
-#: gtk/gtkspinbutton.c:273
+#: ../gtk/gtkspinbutton.c:368
 msgid "Whether a spin button should wrap upon reaching its limits"
 msgstr "શ�ં સ�પીન બટને તેની મર�યાદા� પહોંચી જાય ત�યારે લપેટાઇ જવ� જોઇ�"
 
-#: gtk/gtkspinbutton.c:280
+#: ../gtk/gtkspinbutton.c:375
 msgid "Update Policy"
 msgstr "નીતિ બદલો"
 
-#: gtk/gtkspinbutton.c:281
-msgid ""
-"Whether the spin button should update always, or only when the value is legal"
+#: ../gtk/gtkspinbutton.c:376
+msgid "Whether the spin button should update always, or only when the value is legal"
 msgstr "શ�ં સ�પીન બટનને હંમેશા બદલવ�ં જાેઇ� કે પછી જ�યારે કિંમત સાચી હોય ત�યારે બદલવી"
 
-#: gtk/gtkspinbutton.c:290
+#: ../gtk/gtkspinbutton.c:385
 msgid "Reads the current value, or sets a new value"
 msgstr "વર�તમાન કિંમતને વાંચે છે, અથવા નવી કિંમત પર સ�યોજીત કરે છે"
 
-#: gtk/gtkspinbutton.c:299
+#: ../gtk/gtkspinbutton.c:394
 msgid "Style of bevel around the spin button"
 msgstr "સમાવિષ�ટ વસ�ત�ની આસપાસ ઉઠાવનો પ�રકાર"
 
-#: gtk/gtkspinner.c:132
-#, fuzzy
+#: ../gtk/gtkspinner.c:116
 msgid "Whether the spinner is active"
-msgstr "ક�યાં તો પ�રાથમિક આઇકોન � સક�રિય હોય"
-
-#: gtk/gtkspinner.c:146
-#, fuzzy
-msgid "Number of steps"
-msgstr "પાનાંઓની સંખ�યા"
-
-#: gtk/gtkspinner.c:147
-msgid ""
-"The number of steps for the spinner to complete a full loop. The animation "
-"will complete a full cycle in one second by default (see #GtkSpinner:cycle-"
-"duration)."
-msgstr ""
-
-#: gtk/gtkspinner.c:162
-#, fuzzy
-msgid "Animation duration"
-msgstr "�નીમેશન"
-
-#: gtk/gtkspinner.c:163
-msgid ""
-"The length of time in milliseconds for the spinner to complete a full loop"
-msgstr ""
-
-#: gtk/gtkstatusbar.c:199
-msgid "Has Resize Grip"
-msgstr "પાસે માપબદલવાની ગ�રીપ છે"
-
-#: gtk/gtkstatusbar.c:200
-msgid "Whether the statusbar has a grip for resizing the toplevel"
-msgstr "શ�ં આ વિજેટ ઉંચાસ�તરમાં પ�રકાશિત વિજેટ છે"
+msgstr "શ�ં આ સ�પિનર ​​સક�રિય છે"
 
-#: gtk/gtkstatusbar.c:245
+#: ../gtk/gtkstatusbar.c:183
 msgid "Style of bevel around the statusbar text"
 msgstr "સ�થિતિ દર�શક પટ�ટીના લેખનની આજ�બાજ�ના ઉઠાવનો પ�રકાર"
 
-#: gtk/gtkstatusicon.c:270
+#: ../gtk/gtkstatusicon.c:293
 msgid "The size of the icon"
 msgstr "ચિહ�નન�ં માપ"
 
-#: gtk/gtkstatusicon.c:280
+#: ../gtk/gtkstatusicon.c:303
 msgid "The screen where this status icon will be displayed"
 msgstr "સ�ક�રીન કે જ�યાં આ પરિસ�થિતિ ચિહ�ન દર�શાવવામાં આવશે"
 
-#: gtk/gtkstatusicon.c:288
-#, fuzzy
+#: ../gtk/gtkstatusicon.c:311
 msgid "Whether the status icon is visible"
-msgstr "શ�ં પરિસ�થિતિ ચિહ�ન � દૃશ�યમાન છે કે નહિં"
+msgstr "શ�ં પરિસ�થિતિ ચિહ�ન � દૃશ�યમાન છે"
 
-#: gtk/gtkstatusicon.c:304
+#: ../gtk/gtkstatusicon.c:327
 #, fuzzy
 msgid "Whether the status icon is embedded"
 msgstr "શ�ં પરિસ�થિતિ ચિહ�ન જડિત છે કે નહિં"
 
-#: gtk/gtkstatusicon.c:320 gtk/gtktrayicon-x11.c:125
+#: ../gtk/gtkstatusicon.c:343 ../gtk/gtktrayicon-x11.c:129
 msgid "The orientation of the tray"
 msgstr "ટ�રેની દિશા"
 
-#: gtk/gtkstatusicon.c:347 gtk/gtkwidget.c:863
+#: ../gtk/gtkstatusicon.c:370 ../gtk/gtkwidget.c:1091
 msgid "Has tooltip"
 msgstr "ને સાધનમદદ છે"
 
-#: gtk/gtkstatusicon.c:348
+#: ../gtk/gtkstatusicon.c:371
 msgid "Whether this tray icon has a tooltip"
 msgstr "ક�યાં તો આ ટ�રે આઇકોન પાસે સાધનમદદ હોય"
 
-#: gtk/gtkstatusicon.c:373 gtk/gtkwidget.c:884
+#: ../gtk/gtkstatusicon.c:396 ../gtk/gtkwidget.c:1112
 msgid "Tooltip Text"
 msgstr "સાધનમદદ લખાણ"
 
-#: gtk/gtkstatusicon.c:374 gtk/gtkwidget.c:885 gtk/gtkwidget.c:906
+#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1113 ../gtk/gtkwidget.c:1134
 msgid "The contents of the tooltip for this widget"
 msgstr "આ વિજેટ માટે સાધનમદદના સમાવિષ�ટો"
 
-#: gtk/gtkstatusicon.c:397 gtk/gtkwidget.c:905
+#: ../gtk/gtkstatusicon.c:420 ../gtk/gtkwidget.c:1133
 msgid "Tooltip markup"
 msgstr "સાધનમદદ ચિહ�ન"
 
-#: gtk/gtkstatusicon.c:398
+#: ../gtk/gtkstatusicon.c:421
 msgid "The contents of the tooltip for this tray icon"
 msgstr "આ ટ�રે આઇકોન માટે સાધનમદદના સમાવિષ�ટો"
 
-#: gtk/gtkstatusicon.c:416
+#: ../gtk/gtkstatusicon.c:439
 msgid "The title of this tray icon"
 msgstr "આ ટ�રે ચિહ�નન�ં શિર�ષક"
 
-#: gtk/gtktable.c:148
+#: ../gtk/gtkstyle.c:471
+msgid "Style context"
+msgstr ""
+
+#: ../gtk/gtkstyle.c:472
+msgid "GtkStyleContext to get style from"
+msgstr ""
+
+#: ../gtk/gtkstylecontext.c:433
+msgid "The associated GdkScreen"
+msgstr "સંકળાયેલ GdkScreen"
+
+#: ../gtk/gtkstylecontext.c:439
+#| msgid "Fraction"
+msgid "Direction"
+msgstr "દિશા"
+
+#: ../gtk/gtkstylecontext.c:440 ../gtk/gtktexttag.c:269
+msgid "Text direction"
+msgstr "લખાણની દિશા"
+
+#: ../gtk/gtkswitch.c:784
+#, fuzzy
+msgid "Whether the switch is on or off"
+msgstr "ક�યાંતો વિજેટ � બમણી બફર થયેલ છે કે નહિં"
+
+#: ../gtk/gtkswitch.c:818
+#, fuzzy
+#| msgid "The minimum value of the adjustment"
+msgid "The minimum width of the handle"
+msgstr "સ�તંભ માટે ન�યૂનતમ માન�ય રાખેલી પહોળાઈ"
+
+#: ../gtk/gtktable.c:191
 msgid "Rows"
 msgstr "હરોળો"
 
-#: gtk/gtktable.c:149
+#: ../gtk/gtktable.c:192
 msgid "The number of rows in the table"
 msgstr "કોષ�ટકમાં હરોળોની સંખ�યા"
 
-#: gtk/gtktable.c:157
+#: ../gtk/gtktable.c:200
 msgid "Columns"
 msgstr "સ�તંભો"
 
-#: gtk/gtktable.c:158
+#: ../gtk/gtktable.c:201
 msgid "The number of columns in the table"
 msgstr "ટેબલમાં સ�તંભોની સંખ�યા"
 
-#: gtk/gtktable.c:166
-msgid "Row spacing"
-msgstr "હરોળ વચ�ચે જગ�યા"
-
-#: gtk/gtktable.c:167
-msgid "The amount of space between two consecutive rows"
-msgstr "બે સળંગ હરોળોની વચ�ચેની જગ�યા"
-
-#: gtk/gtktable.c:175
-msgid "Column spacing"
-msgstr "સ�તંભ વચ�ચે જગ�યા"
-
-#: gtk/gtktable.c:176
-msgid "The amount of space between two consecutive columns"
-msgstr "બે સળંગ સ�તંભો વચ�ચેની જગ�યા"
-
-#: gtk/gtktable.c:185
+#: ../gtk/gtktable.c:228
 msgid "If TRUE, the table cells are all the same width/height"
 msgstr "જો TRUE હોય, તો કોષ�ટક ખાનાંઓને સરખી પહોળાઈ/ઊંચાઈ હોય છે"
 
-#: gtk/gtktable.c:192
-msgid "Left attachment"
-msgstr "ડાબેથી જોડાયેલ�"
-
-#: gtk/gtktable.c:199
+#: ../gtk/gtktable.c:242
 msgid "Right attachment"
 msgstr "જમણેથી જોડાયેલ�"
 
-#: gtk/gtktable.c:200
+#: ../gtk/gtktable.c:243
 msgid "The column number to attach the right side of a child widget to"
 msgstr "બાળ વિજેટની જમણી બાજ� જોડવા માટેનો સ�તંભનો ક�રમાંક"
 
-#: gtk/gtktable.c:206
-msgid "Top attachment"
-msgstr "ઉપરથી જોડાયેલ�"
-
-#: gtk/gtktable.c:207
+#: ../gtk/gtktable.c:250
 msgid "The row number to attach the top of a child widget to"
 msgstr "બાળ વિજેટની ઉપરની બાજ� જોડવા માટેનો હરોળનો ક�રમાંક"
 
-#: gtk/gtktable.c:213
+#: ../gtk/gtktable.c:256
 msgid "Bottom attachment"
 msgstr "નીચેથી જોડાયેલ�"
 
-#: gtk/gtktable.c:220
+#: ../gtk/gtktable.c:263
 msgid "Horizontal options"
 msgstr "આડા વિકલ�પો"
 
-#: gtk/gtktable.c:221
+#: ../gtk/gtktable.c:264
 msgid "Options specifying the horizontal behaviour of the child"
 msgstr "બાળન�ં આડ� વર�તન સ�પષ�ટ કરતા વિકલ�પો"
 
-#: gtk/gtktable.c:227
+#: ../gtk/gtktable.c:270
 msgid "Vertical options"
 msgstr "ઉભા વિકલ�પો"
 
-#: gtk/gtktable.c:228
+#: ../gtk/gtktable.c:271
 msgid "Options specifying the vertical behaviour of the child"
 msgstr "બાળન�ં ઉભ� વર�તન સ�પષ�ટ કરતા વિકલ�પો"
 
-#: gtk/gtktable.c:234
+#: ../gtk/gtktable.c:277
 msgid "Horizontal padding"
 msgstr "આડી દિશામાં ખાલી જગ�યાઓ ભરવી"
 
-#: gtk/gtktable.c:235
+#: ../gtk/gtktable.c:278
 msgid ""
 "Extra space to put between the child and its left and right neighbors, in "
 "pixels"
 msgstr "બાળ અને તેના ડાબા અને જમણા પડોશીની વચ�ચે મૂકવાની વધારાની જગ�યા, પીક�સેલમાં"
 
-#: gtk/gtktable.c:241
+#: ../gtk/gtktable.c:284
 msgid "Vertical padding"
 msgstr "ઊભી દિશામાં ખાલી જગ�યાઓ ભરવી"
 
-#: gtk/gtktable.c:242
+#: ../gtk/gtktable.c:285
 msgid ""
 "Extra space to put between the child and its upper and lower neighbors, in "
 "pixels"
 msgstr "બાળ અને તેના ઉપર અને નીચેના પાડોશીઓની વચ�ચે મૂકવાની વધારાની જગ�યા, પીક�સેલમાં"
 
-#: gtk/gtktextbuffer.c:192
+#: ../gtk/gtktextbuffer.c:203
 msgid "Tag Table"
 msgstr "નિશાનીઓનો કોઠો"
 
-#: gtk/gtktextbuffer.c:193
+#: ../gtk/gtktextbuffer.c:204
 msgid "Text Tag Table"
 msgstr "લખાણની નિશાનીઓનો કોઠો"
 
-#: gtk/gtktextbuffer.c:211
+#: ../gtk/gtktextbuffer.c:222
 msgid "Current text of the buffer"
 msgstr "બફરન�ં વર�તમાન લખાણ"
 
-#: gtk/gtktextbuffer.c:225
+#: ../gtk/gtktextbuffer.c:236
 msgid "Has selection"
 msgstr "ને પસંદગી છે"
 
-#: gtk/gtktextbuffer.c:226
+#: ../gtk/gtktextbuffer.c:237
 msgid "Whether the buffer has some text currently selected"
 msgstr "શ�ં બફરને અમ�ક લખાણ વર�તમાનમાં પસંદ કરેલ છે કે નહિં"
 
-#: gtk/gtktextbuffer.c:242
+#: ../gtk/gtktextbuffer.c:253
 msgid "Cursor position"
 msgstr "કર�સરન�ં સ�થાન"
 
-#: gtk/gtktextbuffer.c:243
-msgid ""
-"The position of the insert mark (as offset from the beginning of the buffer)"
+#: ../gtk/gtktextbuffer.c:254
+msgid "The position of the insert mark (as offset from the beginning of the buffer)"
 msgstr "દાખલ કરો ચિહ�નન�ં સ�થાન (બફરની શરૂઆતથી ઓફસેટ)"
 
-#: gtk/gtktextbuffer.c:258
+#: ../gtk/gtktextbuffer.c:269
 msgid "Copy target list"
 msgstr "લક�ષ�ય યાદીની નકલ કરો"
 
-#: gtk/gtktextbuffer.c:259
-msgid ""
-"The list of targets this buffer supports for clipboard copying and DND source"
+#: ../gtk/gtktextbuffer.c:270
+msgid "The list of targets this buffer supports for clipboard copying and DND source"
 msgstr "લક�ષ�યોની યાદી કે જેને આ બફર ક�લિપબોર�ડ નકલ કરવા અને DND સ�રોત માટે વાપરે છે"
 
-#: gtk/gtktextbuffer.c:274
+#: ../gtk/gtktextbuffer.c:285
 msgid "Paste target list"
 msgstr "લક�ષ�ય યાદી ચોંટાડો"
 
-#: gtk/gtktextbuffer.c:275
+#: ../gtk/gtktextbuffer.c:286
 msgid ""
 "The list of targets this buffer supports for clipboard pasting and DND "
 "destination"
 msgstr "ક�લિપબોર�ડ ચોંટાડવા અને DND લક�ષ�ય માટે લક�ષ�યોની યાદી કે જેને આ બફર આધાર આપે છે"
 
-#: gtk/gtktextmark.c:90
+#: ../gtk/gtktextmark.c:127
 msgid "Mark name"
 msgstr "ચિહ�ન નામ"
 
-#: gtk/gtktextmark.c:97
+#: ../gtk/gtktextmark.c:134
 msgid "Left gravity"
 msgstr "ડાબ�ં ગ�ર�ત�વાકર�ષણ"
 
-#: gtk/gtktextmark.c:98
+#: ../gtk/gtktextmark.c:135
 msgid "Whether the mark has left gravity"
 msgstr "શ�ં ચિહ�નને ડાબ�ં ગ�ર�ત�વાકર�ષણ હોય છે"
 
-#: gtk/gtktexttag.c:168
+#: ../gtk/gtktexttag.c:189
 msgid "Tag name"
 msgstr "નિશાનીન� નામ"
 
-#: gtk/gtktexttag.c:169
+#: ../gtk/gtktexttag.c:190
 msgid "Name used to refer to the text tag. NULL for anonymous tags"
-msgstr ""
-"લખાણની નિશાનીઓને ઉલ�લેખ કરતી વખતે ઉપયોગમાં લેવાયેલ નામ, અનામી નિશાની માટે NULL વાપરો"
+msgstr "લખાણની નિશાનીઓને ઉલ�લેખ કરતી વખતે ઉપયોગમાં લેવાયેલ નામ, અનામી નિશાની માટે NULL વાપરો"
 
-#: gtk/gtktexttag.c:187
-msgid "Background color as a (possibly unallocated) GdkColor"
-msgstr "પાશ�વ ભાગનો રંગ GdkColor તરીકે (સંભવિત રીતે ફાળવ�યા વગરનો)"
+#: ../gtk/gtktexttag.c:222
+#| msgid "Background set"
+msgid "Background RGBA"
+msgstr "પાશ�વભાગ RGBA"
 
-#: gtk/gtktexttag.c:194
+#: ../gtk/gtktexttag.c:230
 msgid "Background full height"
 msgstr "પાશ�વ ભાગની પૂરેપૂરી ઊંચાઈ"
 
-#: gtk/gtktexttag.c:195
+#: ../gtk/gtktexttag.c:231
 msgid ""
 "Whether the background color fills the entire line height or only the height "
 "of the tagged characters"
 msgstr ""
 "શ�ં પાશ�વ ભાગનો રંગ પૂરેપૂરી લીટીને રંગથી ભરી દે છે કે ફક�ત નિશાનીત કરેલાઅક�ષરોની ઊંચાઈ સ�ધી જ"
 
-#: gtk/gtktexttag.c:211
-msgid "Foreground color as a (possibly unallocated) GdkColor"
-msgstr "અગ�ર રંગ GdkColor તરીકે (સંભવિત રીતે ફાળવ�યા વગરનો)"
+#: ../gtk/gtktexttag.c:261
+#| msgid "Foreground set"
+msgid "Foreground RGBA"
+msgstr "અગ�રભાગ RGBA"
 
-#: gtk/gtktexttag.c:218
-msgid "Text direction"
-msgstr "લખાણની દિશા"
-
-#: gtk/gtktexttag.c:219
+#: ../gtk/gtktexttag.c:270
 msgid "Text direction, e.g. right-to-left or left-to-right"
 msgstr "લખાણની દિશા દા.ત. જમણેથી ડાબે કે ડાબેથી જમણે"
 
-#: gtk/gtktexttag.c:268
+#: ../gtk/gtktexttag.c:319
 msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
 msgstr "ફોન�ટની રીત પેન�ગો શૈલી તરીકે, દા.ત. PANGO_STYLE_ITALIC"
 
-#: gtk/gtktexttag.c:277
+#: ../gtk/gtktexttag.c:328
 msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
 msgstr "ફોન�ટ ચલ પેન�ગો ચલ તરીકે, દા.ત PANGO_VARIANT_SMALL_CAPS"
 
-#: gtk/gtktexttag.c:286
+#: ../gtk/gtktexttag.c:337
 msgid ""
 "Font weight as an integer, see predefined values in PangoWeight; for "
 "example, PANGO_WEIGHT_BOLD"
@@ -5657,15 +6286,15 @@ msgstr ""
 "ફોન�ટની જાડાઈ પૂર�ણાંક તરીકે, PangoWeight માં પહેલેથી નક�કી કરાયેલી કિંમત જ�ઓ. દા.ત "
 "PANGO_WEIGHT_BOLD"
 
-#: gtk/gtktexttag.c:297
+#: ../gtk/gtktexttag.c:348
 msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
 msgstr "ફોન�ટન�ં ખેચાણ પેન�ગો ખેંચાણ તરીકે, દા.ત PANGO_STRETCH_CONDENSED"
 
-#: gtk/gtktexttag.c:306
+#: ../gtk/gtktexttag.c:357
 msgid "Font size in Pango units"
 msgstr "ફોન�ટન�ં માપ પેન�ગોના �કમમાં"
 
-#: gtk/gtktexttag.c:316
+#: ../gtk/gtktexttag.c:367
 msgid ""
 "Font size as a scale factor relative to the default font size. This properly "
 "adapts to theme changes etc. so is recommended. Pango predefines some scales "
@@ -5675,11 +6304,11 @@ msgstr ""
 "બદલાવો વગેરે માટે અન�રૂપ છે. તેથી તેનો ઉપયોગ સ�ચવાયો છે. પેન�ગો� પહેલેથી માપદંડ નક�કી કરેલા "
 "છે. જેવો કે PANGO_SCALE_X_LARGE"
 
-#: gtk/gtktexttag.c:336 gtk/gtktextview.c:686
+#: ../gtk/gtktexttag.c:387 ../gtk/gtktextview.c:704
 msgid "Left, right, or center justification"
 msgstr "ડાબ�, જમણ� કે મધ�યની ગોઠવણી"
 
-#: gtk/gtktexttag.c:355
+#: ../gtk/gtktexttag.c:406
 msgid ""
 "The language this text is in, as an ISO code. Pango can use this as a hint "
 "when rendering the text. If not set, an appropriate default will be used."
@@ -5687,369 +6316,387 @@ msgstr ""
 "આ લખાણ જે ભાષામાં છે, ISO ના કોડ તરીકે. પેન�ગો લખાણને ઘાટ આપતી વખતેતેનો ઉપયોગ સંકેત "
 "તરીકે કરી શકે છે. જો તમે આ પરિમાણને સમજી ના શકો, તો કઈ નહિતમારે તેની જર�ર નહિ પડે."
 
-#: gtk/gtktexttag.c:362
+#: ../gtk/gtktexttag.c:413
 msgid "Left margin"
 msgstr "ડાબી બાજ�નો હાંસ�યો"
 
-#: gtk/gtktexttag.c:363 gtk/gtktextview.c:695
+#: ../gtk/gtktexttag.c:414 ../gtk/gtktextview.c:713
 msgid "Width of the left margin in pixels"
 msgstr "ડાબી બાજ�ના હાંસ�યોની પિક�સેલમાં પહોળાઈ"
 
-#: gtk/gtktexttag.c:372
+#: ../gtk/gtktexttag.c:423
 msgid "Right margin"
 msgstr "જમણી બાજ�નો હાંસ�યો"
 
-#: gtk/gtktexttag.c:373 gtk/gtktextview.c:705
+#: ../gtk/gtktexttag.c:424 ../gtk/gtktextview.c:723
 msgid "Width of the right margin in pixels"
 msgstr "જમણી બાજ�ના હાંસ�યોની પિક�સેલમાં પહોળાઈ"
 
-#: gtk/gtktexttag.c:383 gtk/gtktextview.c:714
+#: ../gtk/gtktexttag.c:434 ../gtk/gtktextview.c:732
 msgid "Indent"
 msgstr "હાંસ�યોથી અંતર"
 
-#: gtk/gtktexttag.c:384 gtk/gtktextview.c:715
+#: ../gtk/gtktexttag.c:435 ../gtk/gtktextview.c:733
 msgid "Amount to indent the paragraph, in pixels"
 msgstr "હાંસ�યોથી ફકરાન�ં અંતર છે, પિક�સેલમાં"
 
-#: gtk/gtktexttag.c:395
+#: ../gtk/gtktexttag.c:446
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative) "
 "in Pango units"
-msgstr ""
-"પેન�ગો �કમોમાં આધારરેખા ઉપરના લખાણનો ઓફસેટ (જો ઉન�નતી ઋણ હોય તો આધારરેખાની નીચે)"
+msgstr "પેન�ગો �કમોમાં આધારરેખા ઉપરના લખાણનો ઓફસેટ (જો ઉન�નતી ઋણ હોય તો આધારરેખાની નીચે)"
 
-#: gtk/gtktexttag.c:404
+#: ../gtk/gtktexttag.c:455
 msgid "Pixels above lines"
 msgstr "લીટીની ઉપરના પિક�સેલ"
 
-#: gtk/gtktexttag.c:405 gtk/gtktextview.c:639
+#: ../gtk/gtktexttag.c:456 ../gtk/gtktextview.c:657
 msgid "Pixels of blank space above paragraphs"
 msgstr "ફકરાની ઉપર ખાલી જગ�યાના પિક�સેલ"
 
-#: gtk/gtktexttag.c:414
+#: ../gtk/gtktexttag.c:465
 msgid "Pixels below lines"
 msgstr "લીટીની નીચેના પિક�સેલ"
 
-#: gtk/gtktexttag.c:415 gtk/gtktextview.c:649
+#: ../gtk/gtktexttag.c:466 ../gtk/gtktextview.c:667
 msgid "Pixels of blank space below paragraphs"
 msgstr "ફકરાની નીચેની ખાલી જગ�યાના પિક�સેલ"
 
-#: gtk/gtktexttag.c:424
+#: ../gtk/gtktexttag.c:475
 msgid "Pixels inside wrap"
 msgstr "લપેટાયેલા ભાગની અંદરના પિક�સેલ"
 
-#: gtk/gtktexttag.c:425 gtk/gtktextview.c:659
+#: ../gtk/gtktexttag.c:476 ../gtk/gtktextview.c:677
 msgid "Pixels of blank space between wrapped lines in a paragraph"
 msgstr "ફકરામાં લપેટાયેલી લીટીઓની વચ�ચેની ખાલી જગ�યાના પિક�સેલ"
 
-#: gtk/gtktexttag.c:452 gtk/gtktextview.c:677
-msgid ""
-"Whether to wrap lines never, at word boundaries, or at character boundaries"
+#: ../gtk/gtktexttag.c:503 ../gtk/gtktextview.c:695
+msgid "Whether to wrap lines never, at word boundaries, or at character boundaries"
 msgstr "શ�ં ક�યારેપણ લીટીઓ લપેટવી નહિ, શબ�દોની કિનારી� કે અક�ષરોની કિનારી� પણ નહિ"
 
-#: gtk/gtktexttag.c:461 gtk/gtktextview.c:724
+#: ../gtk/gtktexttag.c:512 ../gtk/gtktextview.c:742
 msgid "Tabs"
 msgstr "ટેબ"
 
-#: gtk/gtktexttag.c:462 gtk/gtktextview.c:725
+#: ../gtk/gtktexttag.c:513 ../gtk/gtktextview.c:743
 msgid "Custom tabs for this text"
 msgstr "આ લખાણ માટેના કસ�ટમ ટેબ"
 
-#: gtk/gtktexttag.c:480
+#: ../gtk/gtktexttag.c:531
 msgid "Invisible"
 msgstr "અદૃશ�ય"
 
-#: gtk/gtktexttag.c:481
+#: ../gtk/gtktexttag.c:532
 msgid "Whether this text is hidden."
 msgstr "શ�ં લખાણ છ�પ� છે."
 
-#: gtk/gtktexttag.c:495
+#: ../gtk/gtktexttag.c:546
 msgid "Paragraph background color name"
 msgstr "ફકરાના પાશ�વ ભાગના રંગન�ં નામ"
 
-#: gtk/gtktexttag.c:496
+#: ../gtk/gtktexttag.c:547
 msgid "Paragraph background color as a string"
 msgstr "ફકરાનો પાશ�વ ભાગનો રંગ શબ�દમાળા તરીકે"
 
-#: gtk/gtktexttag.c:511
+#: ../gtk/gtktexttag.c:561
 msgid "Paragraph background color"
 msgstr "ફકરાના પાશ�વ ભાગનો રંગ"
 
-#: gtk/gtktexttag.c:512
-msgid "Paragraph background color as a (possibly unallocated) GdkColor"
-msgstr "ફકરાના પાશ�વ ભાગનો રંગ (સંભવિત છે ફાળવેલ નહિં હોય તે) GdkColor તરીકે"
+#: ../gtk/gtktexttag.c:562
+#, fuzzy
+#| msgid "Paragraph background color as a string"
+msgid "Paragraph background color as a GdkColor"
+msgstr "ફકરાનો પાશ�વ ભાગનો રંગ શબ�દમાળા તરીકે"
+
+#: ../gtk/gtktexttag.c:576
+#, fuzzy
+#| msgid "Paragraph background set"
+msgid "Paragraph background RGBA"
+msgstr "ફકરાનો પાશ�વ ભાગ સ�યોજિત છે"
+
+#: ../gtk/gtktexttag.c:577
+#, fuzzy
+#| msgid "Paragraph background color as a string"
+msgid "Paragraph background RGBA as a GdkRGBA"
+msgstr "ફકરાનો પાશ�વ ભાગનો રંગ શબ�દમાળા તરીકે"
 
-#: gtk/gtktexttag.c:530
+#: ../gtk/gtktexttag.c:595
 msgid "Margin Accumulates"
 msgstr "હાંસિયા સંગ�રહો"
 
-#: gtk/gtktexttag.c:531
+#: ../gtk/gtktexttag.c:596
 msgid "Whether left and right margins accumulate."
 msgstr "શ�ં ડાબા અને જમણા હાંસિયાઓ સંગ�રહ કરે છે."
 
-#: gtk/gtktexttag.c:544
+#: ../gtk/gtktexttag.c:609
 msgid "Background full height set"
 msgstr "પાશ�વ ભાગની પૂરે પૂરી ઊંચાઈ સ�યોજીત છે"
 
-#: gtk/gtktexttag.c:545
+#: ../gtk/gtktexttag.c:610
 msgid "Whether this tag affects background height"
 msgstr "શ�ં આ નિશાની પાશ�વ ભાગની ઊંચાઈને અસર કરે છે"
 
-#: gtk/gtktexttag.c:584
+#: ../gtk/gtktexttag.c:649
 msgid "Justification set"
 msgstr "ની સાપેક�ષે વિકલ�પ સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:585
+#: ../gtk/gtktexttag.c:650
 msgid "Whether this tag affects paragraph justification"
 msgstr "શ�ં આ નિશાની ફકરાની સાપેક�ષ ગોઠવણીને અસર કરે છે"
 
-#: gtk/gtktexttag.c:592
+#: ../gtk/gtktexttag.c:657
 msgid "Left margin set"
 msgstr "ડાબી બાજ�નો હાંસ�યો સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:593
+#: ../gtk/gtktexttag.c:658
 msgid "Whether this tag affects the left margin"
 msgstr "શ�ં ડાબી બાજ�ના હાંસ�યોને અસર કરે છે"
 
-#: gtk/gtktexttag.c:596
+#: ../gtk/gtktexttag.c:661
 msgid "Indent set"
 msgstr "હાંસ�યોથી અંતર સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:597
+#: ../gtk/gtktexttag.c:662
 msgid "Whether this tag affects indentation"
 msgstr "શ�ં પછી આ નિશાની હાંસ�યોથી રખાયેલા અંતરને અસર કરે છે"
 
-#: gtk/gtktexttag.c:604
+#: ../gtk/gtktexttag.c:669
 msgid "Pixels above lines set"
 msgstr "લીટીઓની ઉપરના પિક�સેલ સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:605 gtk/gtktexttag.c:609
+#: ../gtk/gtktexttag.c:670 ../gtk/gtktexttag.c:674
 msgid "Whether this tag affects the number of pixels above lines"
 msgstr "શ�ં આ નિશાની લીટીઓની ઉપર રહેલા પિક�સેલની સંખ�યાને અસર કરે છે"
 
-#: gtk/gtktexttag.c:608
+#: ../gtk/gtktexttag.c:673
 msgid "Pixels below lines set"
 msgstr "લીટીઅોની નીચેના પિક�સેલ સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:612
+#: ../gtk/gtktexttag.c:677
 msgid "Pixels inside wrap set"
 msgstr "લપેટાયેલા ભાગની અંદર આવેલા પિક�સેલ સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:613
+#: ../gtk/gtktexttag.c:678
 msgid "Whether this tag affects the number of pixels between wrapped lines"
 msgstr "શ�ં આ નિશાની લપેયાયેલી લીટીઓની વચ�ચે રહેલા પિક�સેલની સંખ�યાને અસર કરે છે"
 
-#: gtk/gtktexttag.c:620
+#: ../gtk/gtktexttag.c:685
 msgid "Right margin set"
 msgstr "જમણી બાજ�નાં હાંસ�યોનો સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:621
+#: ../gtk/gtktexttag.c:686
 msgid "Whether this tag affects the right margin"
 msgstr "શ�ં આ નિશાની જમણી બાજ�ના હાંસ�યોને અસર કરે છે"
 
-#: gtk/gtktexttag.c:628
+#: ../gtk/gtktexttag.c:693
 msgid "Wrap mode set"
 msgstr "લીટી લપેટવાની સ�થિતિ સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:629
+#: ../gtk/gtktexttag.c:694
 msgid "Whether this tag affects line wrap mode"
 msgstr "શ�ં આ નિશાની લીટી લપેટવાની સ�થિતિ ને અસર કરે છે"
 
-#: gtk/gtktexttag.c:632
+#: ../gtk/gtktexttag.c:697
 msgid "Tabs set"
 msgstr "ટેબ સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:633
+#: ../gtk/gtktexttag.c:698
 msgid "Whether this tag affects tabs"
 msgstr "શ�ં આ નિશાની ટેબને અસર કરે છે"
 
-#: gtk/gtktexttag.c:636
+#: ../gtk/gtktexttag.c:701
 msgid "Invisible set"
 msgstr "અદૃશ�ય સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:637
+#: ../gtk/gtktexttag.c:702
 msgid "Whether this tag affects text visibility"
 msgstr "શ�ં આ નિશાની લખાણના દેખાવને અસર કરે છે"
 
-#: gtk/gtktexttag.c:640
+#: ../gtk/gtktexttag.c:705
 msgid "Paragraph background set"
 msgstr "ફકરાનો પાશ�વ ભાગ સ�યોજિત છે"
 
-#: gtk/gtktexttag.c:641
+#: ../gtk/gtktexttag.c:706
 msgid "Whether this tag affects the paragraph background color"
 msgstr "શ�ં આ ટેગ ફકરાના પાશ�વ ભાગના રંગને અસર કરે છે"
 
-#: gtk/gtktextview.c:638
+#: ../gtk/gtktextview.c:656
 msgid "Pixels Above Lines"
 msgstr "લીટીઓની ઉપરના પિક�સેલ"
 
-#: gtk/gtktextview.c:648
+#: ../gtk/gtktextview.c:666
 msgid "Pixels Below Lines"
 msgstr "લીટાઓની નીચેના પિકસેલ"
 
-#: gtk/gtktextview.c:658
+#: ../gtk/gtktextview.c:676
 msgid "Pixels Inside Wrap"
 msgstr "લપેટાયેલા ભાગની અંદરના પિક�સેલ"
 
-#: gtk/gtktextview.c:676
+#: ../gtk/gtktextview.c:694
 msgid "Wrap Mode"
 msgstr "લપેટવાની સ�થિતિ"
 
-#: gtk/gtktextview.c:694
+#: ../gtk/gtktextview.c:712
 msgid "Left Margin"
 msgstr "ડાબો હાંસ�યો"
 
-#: gtk/gtktextview.c:704
+#: ../gtk/gtktextview.c:722
 msgid "Right Margin"
 msgstr "જમણો હાંસ�યો"
 
-#: gtk/gtktextview.c:732
+#: ../gtk/gtktextview.c:750
 msgid "Cursor Visible"
 msgstr "કર�સર દૃશ�યમાન છે"
 
-#: gtk/gtktextview.c:733
+#: ../gtk/gtktextview.c:751
 msgid "If the insertion cursor is shown"
 msgstr "જો દાખલ કરવા માટેન� કર�સર બતાવેલ� હોય તો"
 
-#: gtk/gtktextview.c:740
+#: ../gtk/gtktextview.c:758
 msgid "Buffer"
 msgstr "બફર"
 
-#: gtk/gtktextview.c:741
+#: ../gtk/gtktextview.c:759
 msgid "The buffer which is displayed"
 msgstr "બફર કે જે દર�શાવાય છે"
 
-#: gtk/gtktextview.c:749
+#: ../gtk/gtktextview.c:767
 msgid "Whether entered text overwrites existing contents"
 msgstr "શ�ં દાખલ થયેલ લખાણ વર�તમાન સમાવિષ�ટો પર ફરીથી લખે છે"
 
-#: gtk/gtktextview.c:756
+#: ../gtk/gtktextview.c:774
 msgid "Accepts tab"
 msgstr "ટેબ સ�વીકારે છે"
 
-#: gtk/gtktextview.c:757
+#: ../gtk/gtktextview.c:775
 msgid "Whether Tab will result in a tab character being entered"
 msgstr "શ�ં ટેબ ટેબ અક�ષરો દાખલ થાય તેમાં પરિણમશે"
 
-#: gtk/gtktextview.c:786
+#: ../gtk/gtktextview.c:810
 msgid "Error underline color"
 msgstr "અગ�ર ભાગનો રંગ"
 
-#: gtk/gtktextview.c:787
+#: ../gtk/gtktextview.c:811
 msgid "Color with which to draw error-indication underlines"
 msgstr "રંગ કે જેનાથી દાખલ કરવા માટેન�ં કર�સર દોરાય છે"
 
-#: gtk/gtktoggleaction.c:118
+#: ../gtk/gtkthemingengine.c:257
+#, fuzzy
+#| msgid "Theme Name"
+msgid "Theming engine name"
+msgstr "થીમન�ં નામ"
+
+#: ../gtk/gtktoggleaction.c:118
 msgid "Create the same proxies as a radio action"
 msgstr "ફેરબદલી માટેન�ં બટનને રેડિયો બટન તરીકે દોરો"
 
-#: gtk/gtktoggleaction.c:119
+#: ../gtk/gtktoggleaction.c:119
 msgid "Whether the proxies for this action look like radio action proxies"
 msgstr "શ�ં આ ક�રિયા માટેના પ�રોક�સીઓ રેડિયો ક�રિયા પ�રોક�સીઓની જેમ દેખાય છે"
 
-#: gtk/gtktoggleaction.c:134
+#: ../gtk/gtktoggleaction.c:134
 #, fuzzy
 msgid "Whether the toggle action should be active"
 msgstr "શ�ં બદલો ક�રિયા સક�રિય હોવી જોઈ� કે નહિં"
 
-#: gtk/gtktogglebutton.c:116 gtk/gtktoggletoolbutton.c:113
+#: ../gtk/gtktogglebutton.c:179 ../gtk/gtktoggletoolbutton.c:128
 #, fuzzy
 msgid "If the toggle button should be pressed in"
 msgstr "શ�ં ફેરબદલી માટેન�ં બટન દબાવવ�ં જોઈ� કે નહિં"
 
-#: gtk/gtktogglebutton.c:124
+#: ../gtk/gtktogglebutton.c:187
 msgid "If the toggle button is in an \"in between\" state"
 msgstr "શ�ં ફેરબદલી માટેન�ં બટન \"વચ�ચેની\" સ�થિતિમાં છે"
 
-#: gtk/gtktogglebutton.c:131
+#: ../gtk/gtktogglebutton.c:194
 msgid "Draw Indicator"
 msgstr "સૂચક દોરો"
 
-#: gtk/gtktogglebutton.c:132
+#: ../gtk/gtktogglebutton.c:195
 msgid "If the toggle part of the button is displayed"
 msgstr "શ�ં બટનનો ફેરબદલી માટેનો ભાગ પ�રદર�શિત કરાયેલો છે"
 
-#: gtk/gtktoolbar.c:465 gtk/gtktoolpalette.c:1033
+#: ../gtk/gtktoolbar.c:501 ../gtk/gtktoolpalette.c:1038
 msgid "Toolbar Style"
 msgstr "સાધનપટ�ટીની શૈલી"
 
-#: gtk/gtktoolbar.c:466
+#: ../gtk/gtktoolbar.c:502
 msgid "How to draw the toolbar"
 msgstr "સાધનપટ�ટીને કેવી રીતે દોરવી"
 
-#: gtk/gtktoolbar.c:473
+#: ../gtk/gtktoolbar.c:509
 msgid "Show Arrow"
 msgstr "તીર બતાવો"
 
-#: gtk/gtktoolbar.c:474
+#: ../gtk/gtktoolbar.c:510
 msgid "If an arrow should be shown if the toolbar doesn't fit"
 msgstr "શ�ં તીર બતાવવ�ં જોઈ� જો સાધનપટ�ટી બંધબેસે નહિં"
 
-#: gtk/gtktoolbar.c:495
+#: ../gtk/gtktoolbar.c:531
 msgid "Size of icons in this toolbar"
 msgstr "આ સાધનપટ�ટીમાંના ચિહ�નોન�ં માપ"
 
-#: gtk/gtktoolbar.c:510 gtk/gtktoolpalette.c:1019
+#: ../gtk/gtktoolbar.c:546 ../gtk/gtktoolpalette.c:1024
 msgid "Icon size set"
 msgstr "ચિહ�ન માપ સમૂહ"
 
-#: gtk/gtktoolbar.c:511 gtk/gtktoolpalette.c:1020
+#: ../gtk/gtktoolbar.c:547 ../gtk/gtktoolpalette.c:1025
 msgid "Whether the icon-size property has been set"
 msgstr "શ�ં ચિહ�ન-માપ ગ�ણધર�મ સ�યોજિત થયેલ છેt"
 
-#: gtk/gtktoolbar.c:520
+#: ../gtk/gtktoolbar.c:556
 msgid "Whether the item should receive extra space when the toolbar grows"
 msgstr "શ�ં પિતૃનો વિકાસ થાય ત�યારે બાળને વધારાની જગ�યા મળવી જોઈ�"
 
-#: gtk/gtktoolbar.c:528 gtk/gtktoolitemgroup.c:1625
+#: ../gtk/gtktoolbar.c:564 ../gtk/gtktoolitemgroup.c:1646
 msgid "Whether the item should be the same size as other homogeneous items"
 msgstr "શ�ં બધા બાળકો સરખા માપના હોવા જોઈ�"
 
-#: gtk/gtktoolbar.c:535
+#: ../gtk/gtktoolbar.c:571
 msgid "Spacer size"
 msgstr "જગ�યા છોડનારન�ં માપ"
 
-#: gtk/gtktoolbar.c:536
+#: ../gtk/gtktoolbar.c:572
 msgid "Size of spacers"
 msgstr "જગ�યા છોડનારન�ં માપ"
 
-#: gtk/gtktoolbar.c:545
+#: ../gtk/gtktoolbar.c:581
 msgid "Amount of border space between the toolbar shadow and the buttons"
 msgstr "સાધન દર�શક પટ�ટીના છાંયા અને બટનોની કિનારી વચ�ચેની જગ�યા"
 
-#: gtk/gtktoolbar.c:553
+#: ../gtk/gtktoolbar.c:589
 msgid "Maximum child expand"
 msgstr "મહત�તમ બાળ વિસ�તાર"
 
-#: gtk/gtktoolbar.c:554
+#: ../gtk/gtktoolbar.c:590
 msgid "Maximum amount of space an expandable item will be given"
 msgstr "જગ�યાનો મહત�તમ જથ�થો કે જે વિસ�તારી શકાય તેવી વસ�ત�ને આપવામાં આવશે"
 
-#: gtk/gtktoolbar.c:562
+#: ../gtk/gtktoolbar.c:598
 msgid "Space style"
 msgstr "જગ�યા છોડવાની શૈલી"
 
-#: gtk/gtktoolbar.c:563
+#: ../gtk/gtktoolbar.c:599
 msgid "Whether spacers are vertical lines or just blank"
 msgstr "શ�ં જગ�યા છોડનાર ઊભી લીટીઓ ના જેવી છે કે પછી ખલી જગ�યા છે"
 
-#: gtk/gtktoolbar.c:570
+#: ../gtk/gtktoolbar.c:606
 msgid "Button relief"
 msgstr "બટન છોડો"
 
-#: gtk/gtktoolbar.c:571
+#: ../gtk/gtktoolbar.c:607
 msgid "Type of bevel around toolbar buttons"
 msgstr "સાધન દર�શક પટ�ટીની ચારેબાજ�ના ઉઠાવ નો પ�રકાર"
 
-#: gtk/gtktoolbar.c:578
+#: ../gtk/gtktoolbar.c:614
 msgid "Style of bevel around the toolbar"
 msgstr "સાધન દર�શક પટ�ટીની ચારેબાજ�ના ઉઠાવ નો પ�રકાર"
 
-#: gtk/gtktoolbutton.c:203
+#: ../gtk/gtktoolbutton.c:233
 msgid "Text to show in the item."
 msgstr "કોષ�ટકમાં હરોળની સંખ�યા."
 
-#: gtk/gtktoolbutton.c:210
+#: ../gtk/gtktoolbutton.c:240
 msgid ""
 "If set, an underline in the label property indicates that the next character "
 "should be used for the mnemonic accelerator key in the overflow menu"
@@ -6057,43 +6704,43 @@ msgstr ""
 "જો સ�યોજિત હોય તો, શબ�દની નીચેની લીટી � સૂચવે છે શ�ંનો શબ�દ સંજ�ઞાસૂચિની પ�રવેગ કી માટે "
 "વાપરવો જોઇ�"
 
-#: gtk/gtktoolbutton.c:217
+#: ../gtk/gtktoolbutton.c:247
 msgid "Widget to use as the item label"
 msgstr "ટેબ લેબલના આજ�બાજ�ની કિનારીની પહોળાઈ"
 
-#: gtk/gtktoolbutton.c:223
+#: ../gtk/gtktoolbutton.c:253
 msgid "Stock Id"
 msgstr "જથ�થાની ઓળખ"
 
-#: gtk/gtktoolbutton.c:224
+#: ../gtk/gtktoolbutton.c:254
 msgid "The stock icon displayed on the item"
 msgstr "બાળના ટેબના લેબલ ઉપર દેખાતી શબ�દમાળા"
 
-#: gtk/gtktoolbutton.c:240
+#: ../gtk/gtktoolbutton.c:270
 msgid "Icon name"
 msgstr "ચિહ�ન નામ"
 
-#: gtk/gtktoolbutton.c:241
+#: ../gtk/gtktoolbutton.c:271
 msgid "The name of the themed icon displayed on the item"
 msgstr "વસ�ત� પર દર�શાવાયેલ થીમવાળા ચિહ�નન�ં નામ"
 
-#: gtk/gtktoolbutton.c:247
+#: ../gtk/gtktoolbutton.c:277
 msgid "Icon widget"
 msgstr "ચિહ�ન વિજેટ"
 
-#: gtk/gtktoolbutton.c:248
+#: ../gtk/gtktoolbutton.c:278
 msgid "Icon widget to display in the item"
 msgstr "દર�શાવવા માટે ચિહ�ન સ�યોજિત છે"
 
-#: gtk/gtktoolbutton.c:261
+#: ../gtk/gtktoolbutton.c:291
 msgid "Icon spacing"
 msgstr "ચિહ�ન વચ�ચે જગ�યા"
 
-#: gtk/gtktoolbutton.c:262
+#: ../gtk/gtktoolbutton.c:292
 msgid "Spacing in pixels between the icon and label"
 msgstr "ચિહ�ન અને લેબલ વચ�ચેની જગ�યા પિક�સેલોમાં"
 
-#: gtk/gtktoolitem.c:201
+#: ../gtk/gtktoolitem.c:209
 msgid ""
 "Whether the toolbar item is considered important. When TRUE, toolbar buttons "
 "show text in GTK_TOOLBAR_BOTH_HORIZ mode"
@@ -6101,605 +6748,641 @@ msgstr ""
 "શ�ં સાધનપટ�ટી વસ�ત� � મહત�વની તરીકે સમજાયેલ છે. જ�યારે સાચ�ં હોય, તો સાધનપટ�ટી બટનો "
 "GTK_TOOLBAR_BOTH_HORIZ સ�થિતિમાં બતાવો"
 
-#: gtk/gtktoolitemgroup.c:1572
+#: ../gtk/gtktoolitemgroup.c:1593
 #, fuzzy
 msgid "The human-readable title of this item group"
 msgstr "પરિસ�થિતિન�ં માનવીય-વાંચનીય વર�ણન"
 
-#: gtk/gtktoolitemgroup.c:1579
+#: ../gtk/gtktoolitemgroup.c:1600
 #, fuzzy
 msgid "A widget to display in place of the usual label"
 msgstr "ચોકઠાના સામાન�ય લેબલની જગ�યા� દર�શાવવાન�ં વિજેટ"
 
-#: gtk/gtktoolitemgroup.c:1585
+#: ../gtk/gtktoolitemgroup.c:1606
 msgid "Collapsed"
 msgstr ""
 
-#: gtk/gtktoolitemgroup.c:1586
+#: ../gtk/gtktoolitemgroup.c:1607
 #, fuzzy
 msgid "Whether the group has been collapsed and items are hidden"
 msgstr "શ�ં વિસ�તારક બાળ વિજેટ રીવેલ કરવા માટે ખોલવામાં આવેલ છે"
 
-#: gtk/gtktoolitemgroup.c:1592
-#, fuzzy
+#: ../gtk/gtktoolitemgroup.c:1613
 msgid "ellipsize"
 msgstr "�લીપ�સાઈ�"
 
-#: gtk/gtktoolitemgroup.c:1593
+#: ../gtk/gtktoolitemgroup.c:1614
 msgid "Ellipsize for item group headers"
 msgstr ""
 
-#: gtk/gtktoolitemgroup.c:1599
+#: ../gtk/gtktoolitemgroup.c:1620
 #, fuzzy
 msgid "Header Relief"
 msgstr "હેડર ઈમેજ"
 
-#: gtk/gtktoolitemgroup.c:1600
+#: ../gtk/gtktoolitemgroup.c:1621
 #, fuzzy
 msgid "Relief of the group header button"
 msgstr "સ�તંભ હેડર માટેના બટન બતાવો"
 
-#: gtk/gtktoolitemgroup.c:1615
+#: ../gtk/gtktoolitemgroup.c:1636
 #, fuzzy
 msgid "Header Spacing"
 msgstr "હેડર ભરો"
 
-#: gtk/gtktoolitemgroup.c:1616
+#: ../gtk/gtktoolitemgroup.c:1637
 #, fuzzy
 msgid "Spacing between expander arrow and caption"
 msgstr "વિસ�તારક તીરની આસપાસની જગ�યા"
 
-#: gtk/gtktoolitemgroup.c:1632
+#: ../gtk/gtktoolitemgroup.c:1653
 #, fuzzy
 msgid "Whether the item should receive extra space when the group grows"
 msgstr "શ�ં પિતૃનો વિકાસ થાય ત�યારે બાળને વધારાની જગ�યા મળવી જોઈ�"
 
-#: gtk/gtktoolitemgroup.c:1639
+#: ../gtk/gtktoolitemgroup.c:1660
 #, fuzzy
 msgid "Whether the item should fill the available space"
 msgstr "શ�ં બધા બાળકો સરખા માપના હોવા જોઈ�"
 
-#: gtk/gtktoolitemgroup.c:1645
+#: ../gtk/gtktoolitemgroup.c:1666
 msgid "New Row"
-msgstr ""
+msgstr "નવી હારમાળા"
 
-#: gtk/gtktoolitemgroup.c:1646
+#: ../gtk/gtktoolitemgroup.c:1667
 #, fuzzy
 msgid "Whether the item should start a new row"
 msgstr "શ�ં વસ�ત�ઓ સંખ�યા સાથે દર�શાવવી જોઈ�"
 
-#: gtk/gtktoolitemgroup.c:1653
+#: ../gtk/gtktoolitemgroup.c:1674
 #, fuzzy
 msgid "Position of the item within this group"
 msgstr "માપપટ�ટી ઉપર નિશાનીન� સ�થાન"
 
-#: gtk/gtktoolpalette.c:1004
+#: ../gtk/gtktoolpalette.c:1009
 #, fuzzy
 msgid "Size of icons in this tool palette"
 msgstr "આ સાધનપટ�ટીમાંના ચિહ�નોન�ં માપ"
 
-#: gtk/gtktoolpalette.c:1034
+#: ../gtk/gtktoolpalette.c:1039
 #, fuzzy
 msgid "Style of items in the tool palette"
 msgstr "સાધન દર�શક પટ�ટીની ચારેબાજ�ના ઉઠાવ નો પ�રકાર"
 
-#: gtk/gtktoolpalette.c:1050
+#: ../gtk/gtktoolpalette.c:1055
 msgid "Exclusive"
 msgstr ""
 
-#: gtk/gtktoolpalette.c:1051
+#: ../gtk/gtktoolpalette.c:1056
 #, fuzzy
 msgid "Whether the item group should be the only expanded at a given time"
 msgstr "શ�ં વસ�ત�ઓ સંખ�યા સાથે દર�શાવવી જોઈ�"
 
-#: gtk/gtktoolpalette.c:1066
+#: ../gtk/gtktoolpalette.c:1071
 #, fuzzy
-msgid ""
-"Whether the item group should receive extra space when the palette grows"
+msgid "Whether the item group should receive extra space when the palette grows"
 msgstr "શ�ં પિતૃનો વિકાસ થાય ત�યારે બાળને વધારાની જગ�યા મળવી જોઈ�"
 
-#: gtk/gtktrayicon-x11.c:134
+#: ../gtk/gtktrayicon-x11.c:138
 #, fuzzy
 msgid "Foreground color for symbolic icons"
 msgstr "અગ�ર ભાગના રંગને વાક�ય તરીકે"
 
-#: gtk/gtktrayicon-x11.c:141
+#: ../gtk/gtktrayicon-x11.c:145
 #, fuzzy
 msgid "Error color"
 msgstr "કર�સર નો રંગ"
 
-#: gtk/gtktrayicon-x11.c:142
+#: ../gtk/gtktrayicon-x11.c:146
 msgid "Error color for symbolic icons"
-msgstr ""
+msgstr "સાંકેતિક ચિહ�નો માટે ભૂલ રંગ"
 
-#: gtk/gtktrayicon-x11.c:149
-#, fuzzy
+#: ../gtk/gtktrayicon-x11.c:153
 msgid "Warning color"
-msgstr "પાશ�વ ભાગનો રંગ"
+msgstr "ચેતવણી રંગ"
 
-#: gtk/gtktrayicon-x11.c:150
+#: ../gtk/gtktrayicon-x11.c:154
 msgid "Warning color for symbolic icons"
 msgstr ""
 
-#: gtk/gtktrayicon-x11.c:157
+#: ../gtk/gtktrayicon-x11.c:161
 #, fuzzy
 msgid "Success color"
 msgstr "કર�સર નો રંગ"
 
-#: gtk/gtktrayicon-x11.c:158
+#: ../gtk/gtktrayicon-x11.c:162
 msgid "Success color for symbolic icons"
 msgstr ""
 
-#: gtk/gtktrayicon-x11.c:166
+#: ../gtk/gtktrayicon-x11.c:170
 #, fuzzy
 msgid "Padding that should be put around icons in the tray"
 msgstr "શ�ં ત�યાં વસ�ત�ની નજીક ચિહ�ન હોવ�ં જોઈ�"
 
-#: gtk/gtktreemodelsort.c:278
+#: ../gtk/gtktrayicon-x11.c:179
+#, fuzzy
+#| msgid "Icon Sizes"
+msgid "Icon Size"
+msgstr "ચિહ�ન માપો"
+
+#: ../gtk/gtktrayicon-x11.c:180
+msgid "The pixel size that icons should be forced to, or zero"
+msgstr ""
+
+#: ../gtk/gtktreemenu.c:287
+#, fuzzy
+#| msgid "TreeView Model"
+msgid "TreeMenu model"
+msgstr "TreeView મોડલ"
+
+#: ../gtk/gtktreemenu.c:288
+#, fuzzy
+#| msgid "The model for the tree view"
+msgid "The model for the tree menu"
+msgstr "ટ�રીના રૂપમાં દર�શન કરવા માટેન�ં મોડલ"
+
+#: ../gtk/gtktreemenu.c:310
+msgid "TreeMenu root row"
+msgstr ""
+
+#: ../gtk/gtktreemenu.c:311
+msgid "The TreeMenu will display children of the specified root"
+msgstr ""
+
+#: ../gtk/gtktreemenu.c:344
+#, fuzzy
+#| msgid "Tearoff Title"
+msgid "Tearoff"
+msgstr "Tearoff શીર�ષક"
+
+#: ../gtk/gtktreemenu.c:345
+#, fuzzy
+#| msgid "Whether the mark has left gravity"
+msgid "Whether the menu has a tearoff item"
+msgstr "શ�ં ચિહ�નને ડાબ�ં ગ�ર�ત�વાકર�ષણ હોય છે"
+
+#: ../gtk/gtktreemenu.c:361
+#, fuzzy
+#| msgid "Wrap width"
+msgid "Wrap Width"
+msgstr "પહોળાઈ લપેટો"
+
+#: ../gtk/gtktreemenu.c:362
+#, fuzzy
+#| msgid "Wrap width for laying out the items in a grid"
+msgid "Wrap width for laying out items in a grid"
+msgstr "જાળીમાં વસ�ત�ઓ ગોઠવવા માટે લપેટવાની પહોળાઈ"
+
+#: ../gtk/gtktreemodelsort.c:419
 msgid "TreeModelSort Model"
 msgstr "TreeModelSort મોડલ"
 
-#: gtk/gtktreemodelsort.c:279
+#: ../gtk/gtktreemodelsort.c:420
 msgid "The model for the TreeModelSort to sort"
 msgstr "ક�રમમાં ગોઠવવા માટે TreeModelSort મોડલ"
 
-#: gtk/gtktreeview.c:563
+#: ../gtk/gtktreeview.c:985
 msgid "TreeView Model"
 msgstr "TreeView મોડલ"
 
-#: gtk/gtktreeview.c:564
+#: ../gtk/gtktreeview.c:986
 msgid "The model for the tree view"
 msgstr "ટ�રીના રૂપમાં દર�શન કરવા માટેન�ં મોડલ"
 
-#: gtk/gtktreeview.c:572
-msgid "Horizontal Adjustment for the widget"
-msgstr "વિજેટ માટે વ�યવસ�થિત આડી ગોઠવણી"
-
-#: gtk/gtktreeview.c:580
-msgid "Vertical Adjustment for the widget"
-msgstr "વિજેટ માટે વ�યવસ�થિત ઊભી ગોઠવણી"
-
-#: gtk/gtktreeview.c:587
+#: ../gtk/gtktreeview.c:998
 msgid "Headers Visible"
 msgstr "હેડરો દૃશ�યમાન છે"
 
-#: gtk/gtktreeview.c:588
+#: ../gtk/gtktreeview.c:999
 msgid "Show the column header buttons"
 msgstr "સ�તંભ હેડર માટેના બટન બતાવો"
 
-#: gtk/gtktreeview.c:595
+#: ../gtk/gtktreeview.c:1006
 msgid "Headers Clickable"
 msgstr "હેડરો ક�લિક કરી શકાય તેવા છે"
 
-#: gtk/gtktreeview.c:596
+#: ../gtk/gtktreeview.c:1007
 msgid "Column headers respond to click events"
 msgstr "સ�તંભ હેડર ક�લિકની ઘટના સામે પ�રતિક�રીયા આપે છે"
 
-#: gtk/gtktreeview.c:603
+#: ../gtk/gtktreeview.c:1014
 msgid "Expander Column"
 msgstr "વિસ�તારકનો સ�તંભ"
 
-#: gtk/gtktreeview.c:604
+#: ../gtk/gtktreeview.c:1015
 msgid "Set the column for the expander column"
 msgstr "વિસ�તારક સ�તંભ માટે �ક સ�તંભની ગોઠવણ કરો"
 
-#: gtk/gtktreeview.c:619
+#: ../gtk/gtktreeview.c:1030
 msgid "Rules Hint"
 msgstr "નિયમો માટેના સંકેત"
 
-#: gtk/gtktreeview.c:620
+#: ../gtk/gtktreeview.c:1031
 msgid "Set a hint to the theme engine to draw rows in alternating colors"
 msgstr "હરોળને �કપછી�ક રંગમાં દર�શાવવા માટે થીમયંત�રમાં સંકેતની ગોઠવણી કરો"
 
-#: gtk/gtktreeview.c:627
+#: ../gtk/gtktreeview.c:1038
 msgid "Enable Search"
 msgstr "શોધવાન�ં સક�રિય બનાવો"
 
-#: gtk/gtktreeview.c:628
+#: ../gtk/gtktreeview.c:1039
 msgid "View allows user to search through columns interactively"
 msgstr "આ દેખાવ વપરાશકર�તાને સ�તંભમાં પારસ�પરિક રીતે શોધવાની પરવાનગી આપે છે"
 
-#: gtk/gtktreeview.c:635
+#: ../gtk/gtktreeview.c:1046
 msgid "Search Column"
 msgstr "સ�તંભમાં શોધો"
 
-#: gtk/gtktreeview.c:636
+#: ../gtk/gtktreeview.c:1047
 msgid "Model column to search through during interactive search"
 msgstr "અરસપરસ શોધ દરમ�યાન મારફતે શોધવા માટે મોડેલ સ�તંભ"
 
-#: gtk/gtktreeview.c:656
+#: ../gtk/gtktreeview.c:1067
 msgid "Fixed Height Mode"
 msgstr "ચોક�કસ ઊંચાઈ"
 
-#: gtk/gtktreeview.c:657
+#: ../gtk/gtktreeview.c:1068
 msgid "Speeds up GtkTreeView by assuming that all rows have the same height"
 msgstr "GtkTreeView ને બધી હરોળોની ઊંચાઈ સરખી છે �મ ધારીને �ડપી બનાવે છે"
 
-#: gtk/gtktreeview.c:677
+#: ../gtk/gtktreeview.c:1088
 msgid "Hover Selection"
 msgstr "ઉપરથી પસંદગી"
 
-#: gtk/gtktreeview.c:678
+#: ../gtk/gtktreeview.c:1089
 msgid "Whether the selection should follow the pointer"
 msgstr "શ�ં પસંદ કરનારે રંગ અપારદર�શકતાની ગોઠવણી માટે પરવાનગી આપવી જોઇ� છે"
 
-#: gtk/gtktreeview.c:697
+#: ../gtk/gtktreeview.c:1108
 msgid "Hover Expand"
 msgstr "ઉપરથી વિસ�તારો"
 
-#: gtk/gtktreeview.c:698
-msgid ""
-"Whether rows should be expanded/collapsed when the pointer moves over them"
+#: ../gtk/gtktreeview.c:1109
+msgid "Whether rows should be expanded/collapsed when the pointer moves over them"
 msgstr "શ�ં હરોળો જ�યારે નિર�દેશક તેમના ઉપર ખસે ત�યારે વિસ�તૃત થવી જોઈ�/સંકોચાવી જોઈ�"
 
-#: gtk/gtktreeview.c:712
+#: ../gtk/gtktreeview.c:1123
 msgid "Show Expanders"
 msgstr "વિસ�તારકો બતાવો"
 
-#: gtk/gtktreeview.c:713
+#: ../gtk/gtktreeview.c:1124
 msgid "View has expanders"
 msgstr "દૃશ�યને વિસ�તારકો છે"
 
-#: gtk/gtktreeview.c:727
+#: ../gtk/gtktreeview.c:1138
 msgid "Level Indentation"
 msgstr "સ�તર ગોઠવણી"
 
-#: gtk/gtktreeview.c:728
+#: ../gtk/gtktreeview.c:1139
 msgid "Extra indentation for each level"
 msgstr "દરેક સ�તર માટે વધારાની ગોઠવણી"
 
-#: gtk/gtktreeview.c:737
+#: ../gtk/gtktreeview.c:1148
 msgid "Rubber Banding"
 msgstr "રબર બેન�ડીંગ"
 
-#: gtk/gtktreeview.c:738
-msgid ""
-"Whether to enable selection of multiple items by dragging the mouse pointer"
+#: ../gtk/gtktreeview.c:1149
+msgid "Whether to enable selection of multiple items by dragging the mouse pointer"
 msgstr "શ�ં ઘણી વસ�ત�ઓની પસંદગી માઉસ નિર�દેશક ખેંચીને પસંદ કરવા માટે સક�રિય કરવ�ં જોઈ�"
 
-#: gtk/gtktreeview.c:745
+#: ../gtk/gtktreeview.c:1156
 msgid "Enable Grid Lines"
 msgstr "જાળી લીટીઓ સક�રિય કરો"
 
-#: gtk/gtktreeview.c:746
+#: ../gtk/gtktreeview.c:1157
 msgid "Whether grid lines should be drawn in the tree view"
 msgstr "શ�ં જાળી લીટીઓ વૃક�ષ દૃશ�યમાં દોરાયેલ હોવી જોઈ�"
 
-#: gtk/gtktreeview.c:754
+#: ../gtk/gtktreeview.c:1165
 msgid "Enable Tree Lines"
 msgstr "વૃક�ષ લીટીઓ સક�રિય કરો"
 
-#: gtk/gtktreeview.c:755
+#: ../gtk/gtktreeview.c:1166
 msgid "Whether tree lines should be drawn in the tree view"
 msgstr "શ�ં વૃક�ષ લીટીઓ વૃક�ષ દેખાવમાં દોરાયેલ હોવી જોઈ�"
 
-#: gtk/gtktreeview.c:763
+#: ../gtk/gtktreeview.c:1174
 msgid "The column in the model containing the tooltip texts for the rows"
 msgstr "હરોળો માટે સાધનમદદ લખાણો સમાવત� સ�તંભમાંન�ં મોડેલ"
 
-#: gtk/gtktreeview.c:785
+#: ../gtk/gtktreeview.c:1196
 msgid "Vertical Separator Width"
 msgstr "ઊભા વિભાજકની પહોળાઈ"
 
-#: gtk/gtktreeview.c:786
+#: ../gtk/gtktreeview.c:1197
 msgid "Vertical space between cells.  Must be an even number"
 msgstr "કોષની વચ�ચેની ઊભી જગ�યા. બેકી સંખ�યામાં હોવી જોઈ�"
 
-#: gtk/gtktreeview.c:794
+#: ../gtk/gtktreeview.c:1205
 msgid "Horizontal Separator Width"
 msgstr "આડા વિભાજકની પહોળાઈ"
 
-#: gtk/gtktreeview.c:795
+#: ../gtk/gtktreeview.c:1206
 msgid "Horizontal space between cells.  Must be an even number"
 msgstr "કોષની વચ�ચેની ઊભી જગ�યા. બેકી સંખ�યામાં હોવી જોઈ� કોષ"
 
-#: gtk/gtktreeview.c:803
+#: ../gtk/gtktreeview.c:1214
 msgid "Allow Rules"
 msgstr "નિયમોની પરવાનગી આપો"
 
-#: gtk/gtktreeview.c:804
+#: ../gtk/gtktreeview.c:1215
 msgid "Allow drawing of alternating color rows"
 msgstr "�ક પછી �ક રંગની હરોળને દોરવાની પરવાનગી"
 
-#: gtk/gtktreeview.c:810
+#: ../gtk/gtktreeview.c:1221
 msgid "Indent Expanders"
 msgstr "વિસ�તારકો વચ�ચે અંતર લાવો"
 
-#: gtk/gtktreeview.c:811
+#: ../gtk/gtktreeview.c:1222
 msgid "Make the expanders indented"
 msgstr "વિસ�તારકો વચ�ચે અંતર લાવો"
 
-#: gtk/gtktreeview.c:817
+#: ../gtk/gtktreeview.c:1228
 msgid "Even Row Color"
 msgstr "બેકી હોય તેવી હરોળનો રંગ"
 
-#: gtk/gtktreeview.c:818
+#: ../gtk/gtktreeview.c:1229
 msgid "Color to use for even rows"
 msgstr "બેકી હોય તેવી આડી હરોળ માટે ઉપયોગમાં લેવાતો રંગ"
 
-#: gtk/gtktreeview.c:824
+#: ../gtk/gtktreeview.c:1235
 msgid "Odd Row Color"
 msgstr "�કી હોય તેવી હરોળનો રંગ "
 
-#: gtk/gtktreeview.c:825
+#: ../gtk/gtktreeview.c:1236
 msgid "Color to use for odd rows"
 msgstr "�કી હોય તેવી આડી હરોળ માટે ઉપયોગમાં લેવાતો રંગ "
 
-#: gtk/gtktreeview.c:831
+#: ../gtk/gtktreeview.c:1242
 msgid "Grid line width"
 msgstr "જાળી લીટી પહોળાઈ"
 
-#: gtk/gtktreeview.c:832
+#: ../gtk/gtktreeview.c:1243
 msgid "Width, in pixels, of the tree view grid lines"
 msgstr "વૃક�ષ દેખાવ જાળી લીટીઓની પહોળાઈ, પિક�સેલોમાં"
 
-#: gtk/gtktreeview.c:838
+#: ../gtk/gtktreeview.c:1249
 msgid "Tree line width"
 msgstr "વૃક�ષ લીટી પહોળાઈ"
 
-#: gtk/gtktreeview.c:839
+#: ../gtk/gtktreeview.c:1250
 msgid "Width, in pixels, of the tree view lines"
 msgstr "વૃક�ષ દેખાવ લીટીઓની પહોળાઈ, પિક�સેલોમાં"
 
-#: gtk/gtktreeview.c:845
+#: ../gtk/gtktreeview.c:1256
 msgid "Grid line pattern"
 msgstr "જાળી લીટી ભાત"
 
-#: gtk/gtktreeview.c:846
+#: ../gtk/gtktreeview.c:1257
 msgid "Dash pattern used to draw the tree view grid lines"
 msgstr "વૃક�ષ દેખાવ જાળી લીટીઓ દોરવા માટે વપરાતી ડેશ ભાત"
 
-#: gtk/gtktreeview.c:852
+#: ../gtk/gtktreeview.c:1263
 msgid "Tree line pattern"
 msgstr "વૃક�ષ લીટી ભાત"
 
-#: gtk/gtktreeview.c:853
+#: ../gtk/gtktreeview.c:1264
 msgid "Dash pattern used to draw the tree view lines"
 msgstr "વૃક�ષ દેખાવ લીટીઓ દોરવા માટે વપરાતી ડેશ ભાત"
 
-#: gtk/gtktreeviewcolumn.c:196
+#: ../gtk/gtktreeviewcolumn.c:249
 msgid "Whether to display the column"
 msgstr "શ�ં સ�તંભને દર�શાવવી છે"
 
-#: gtk/gtktreeviewcolumn.c:203 gtk/gtkwindow.c:609
+#: ../gtk/gtktreeviewcolumn.c:256 ../gtk/gtkwindow.c:650
 msgid "Resizable"
 msgstr "માપ બદલી શકાય તેવ�"
 
-#: gtk/gtktreeviewcolumn.c:204
+#: ../gtk/gtktreeviewcolumn.c:257
 msgid "Column is user-resizable"
 msgstr "સ�તંભના માપને વપરાશકર�તા બદલી શકે છે"
 
-#: gtk/gtktreeviewcolumn.c:212
-msgid "Current width of the column"
+#: ../gtk/gtktreeviewcolumn.c:265
+#, fuzzy
+#| msgid "Current width of the column"
+msgid "Current X position of the column"
 msgstr "સ�તંભની વર�તમાન પહોળાઈ"
 
-#: gtk/gtktreeviewcolumn.c:221
-msgid "Space which is inserted between cells"
-msgstr "જગ�યા કે જે ખાનાંઓ વચ�ચે દાખલ થયેલ છે"
+#: ../gtk/gtktreeviewcolumn.c:275
+msgid "Current width of the column"
+msgstr "સ�તંભની વર�તમાન પહોળાઈ"
 
-#: gtk/gtktreeviewcolumn.c:229
+#: ../gtk/gtktreeviewcolumn.c:292
 msgid "Sizing"
 msgstr "માપ"
 
-#: gtk/gtktreeviewcolumn.c:230
+#: ../gtk/gtktreeviewcolumn.c:293
 msgid "Resize mode of the column"
 msgstr "સ�તંભન� માપ બદલી શકાય તેવી સ�થિતિ"
 
-#: gtk/gtktreeviewcolumn.c:238
+#: ../gtk/gtktreeviewcolumn.c:301
 msgid "Fixed Width"
 msgstr "ચોક�કસ પહોળાઈ"
 
-#: gtk/gtktreeviewcolumn.c:239
+#: ../gtk/gtktreeviewcolumn.c:302
 msgid "Current fixed width of the column"
 msgstr "સ�તંભની ચોક�ક�સ વર�તમાન પહોળાઈ"
 
-#: gtk/gtktreeviewcolumn.c:248
-msgid "Minimum Width"
-msgstr "ન�યૂનતમ પહોળાઈ"
-
-#: gtk/gtktreeviewcolumn.c:249
+#: ../gtk/gtktreeviewcolumn.c:312
 msgid "Minimum allowed width of the column"
 msgstr "સ�તંભ માટે ન�યૂનતમ માન�ય રાખેલી પહોળાઈ"
 
-#: gtk/gtktreeviewcolumn.c:258
+#: ../gtk/gtktreeviewcolumn.c:321
 msgid "Maximum Width"
 msgstr "મહત�તમ પહોળાઈ"
 
-#: gtk/gtktreeviewcolumn.c:259
+#: ../gtk/gtktreeviewcolumn.c:322
 msgid "Maximum allowed width of the column"
 msgstr "સ�તંભ માટે મહત�તમ માન�ય રાખેલી પહોળાઈ"
 
-#: gtk/gtktreeviewcolumn.c:269
+#: ../gtk/gtktreeviewcolumn.c:332
 msgid "Title to appear in column header"
 msgstr "સ�તંભ હેડરમાં દર�શાવવાન�ં શીર�ષક"
 
-#: gtk/gtktreeviewcolumn.c:277
+#: ../gtk/gtktreeviewcolumn.c:340
 msgid "Column gets share of extra width allocated to the widget"
 msgstr "સ�તંભો વિજેટને ફાળવેલ વધારાની પહેળાઈને વહેંચવાન�ં મેળવે છે"
 
-#: gtk/gtktreeviewcolumn.c:284
+#: ../gtk/gtktreeviewcolumn.c:347
 msgid "Clickable"
 msgstr "ક�લિક કરી શકાય તેવ�"
 
-#: gtk/gtktreeviewcolumn.c:285
+#: ../gtk/gtktreeviewcolumn.c:348
 msgid "Whether the header can be clicked"
 msgstr "ક�યાં તો હેડરને ક�લિક કરી શકાય છે"
 
-#: gtk/gtktreeviewcolumn.c:293
+#: ../gtk/gtktreeviewcolumn.c:356
 msgid "Widget"
 msgstr "વિજેટ"
 
-#: gtk/gtktreeviewcolumn.c:294
+#: ../gtk/gtktreeviewcolumn.c:357
 msgid "Widget to put in column header button instead of column title"
 msgstr "સ�તંભના હેડરના બટનમાં સ�તંભના શીર�ષકની જગ�યા� વિજેટ મૂકવાન�ં છે"
 
-#: gtk/gtktreeviewcolumn.c:302
+#: ../gtk/gtktreeviewcolumn.c:365
 msgid "X Alignment of the column header text or widget"
 msgstr "સ�તંભના હેડરના લખાણ કે વિજેટની X દિશામાં કતારબંધ ગોઠવણી"
 
-#: gtk/gtktreeviewcolumn.c:312
+#: ../gtk/gtktreeviewcolumn.c:375
 msgid "Whether the column can be reordered around the headers"
 msgstr "શ�ં હેડરોની આસપાસ સ�તંભને ફરીથી ક�રમબધ કરી શકાય છે"
 
-#: gtk/gtktreeviewcolumn.c:319
+#: ../gtk/gtktreeviewcolumn.c:382
 msgid "Sort indicator"
 msgstr "ક�રમબધ કરવા માટેન�ં સૂચક"
 
-#: gtk/gtktreeviewcolumn.c:320
+#: ../gtk/gtktreeviewcolumn.c:383
 msgid "Whether to show a sort indicator"
 msgstr "શ�ં ક�રમબધ કરવા માટેના સૂચકને બતાવ� કે નહિ"
 
-#: gtk/gtktreeviewcolumn.c:327
+#: ../gtk/gtktreeviewcolumn.c:390
 msgid "Sort order"
 msgstr "ક�રમબધ કરવા માટેનો ક�રમ"
 
-#: gtk/gtktreeviewcolumn.c:328
+#: ../gtk/gtktreeviewcolumn.c:391
 msgid "Sort direction the sort indicator should indicate"
 msgstr "ક�રમબધ કરવા માટેના સૂચક દ�વારા ક�રમબધ કરવા માટેની દર�શાવવાની દિશાનો"
 
-#: gtk/gtktreeviewcolumn.c:344
+#: ../gtk/gtktreeviewcolumn.c:407
 msgid "Sort column ID"
 msgstr "ટૂંક�ં સ�તંભ ID"
 
-#: gtk/gtktreeviewcolumn.c:345
+#: ../gtk/gtktreeviewcolumn.c:408
 msgid "Logical sort column ID this column sorts on when selected for sorting"
 msgstr "લોજીકલ ટૂંકા સ�તંભ ID જો આ સ�તંભને ટૂંક� કરે છે જ�યારે ટૂંક� કરવા માટે પસંદ કરેલ છે"
 
-#: gtk/gtkuimanager.c:225
+#: ../gtk/gtkuimanager.c:480
 msgid "Whether tearoff menu items should be added to menus"
 msgstr "શ�ં મેન�ની વસ�ત�ઓ ચકાસાયેલી છે"
 
-#: gtk/gtkuimanager.c:232
+#: ../gtk/gtkuimanager.c:487
 msgid "Merged UI definition"
 msgstr "ભેળવેલ UI વ�યાખ�યા"
 
-#: gtk/gtkuimanager.c:233
+#: ../gtk/gtkuimanager.c:488
 msgid "An XML string describing the merged UI"
 msgstr "XML વાક�ય કે જે ભેળવેલ UI ન�ં વર�ણન કરે છે"
 
-#: gtk/gtkviewport.c:143
-msgid ""
-"The GtkAdjustment that determines the values of the horizontal position for "
-"this viewport"
-msgstr "Gtk ગોઠવણી જે વ�ય�પોર�ટ માટેની આડી સ�થિતિની કિંમત નક�કી કરે છે"
-
-#: gtk/gtkviewport.c:151
-msgid ""
-"The GtkAdjustment that determines the values of the vertical position for "
-"this viewport"
-msgstr "Gtk ગોઠવણી જે વ�ય�પોર�ટ માટેની ઊભી સ�થિતિની કિંમત નક�કી કરે છે"
-
-#: gtk/gtkviewport.c:159
+#: ../gtk/gtkviewport.c:156
 msgid "Determines how the shadowed box around the viewport is drawn"
 msgstr "વ�ય�પોર�ટની આસપાસ છાયા પેટી કેવી રીતે દોરાઇ છે તે નક�કી કરે છે"
 
-#: gtk/gtkwidget.c:714
+#: ../gtk/gtkvolumebutton.c:156
+#, fuzzy
+msgid "Use symbolic icons"
+msgstr "અગ�ર ભાગના રંગને વાક�ય તરીકે"
+
+#: ../gtk/gtkvolumebutton.c:157
+#, fuzzy
+#| msgid "Whether the cursor should blink"
+msgid "Whether to use symbolic icons"
+msgstr "શ�ં કર�સરને �બકત� કરવ� જોઈ�"
+
+#: ../gtk/gtkwidget.c:950
 msgid "Widget name"
 msgstr "વિજેટ નામ"
 
-#: gtk/gtkwidget.c:715
+#: ../gtk/gtkwidget.c:951
 msgid "The name of the widget"
 msgstr "વિન�ડોનો પ�રકાર"
 
-#: gtk/gtkwidget.c:721
+#: ../gtk/gtkwidget.c:957
 msgid "Parent widget"
 msgstr "પિતૃ વિજેટ"
 
-#: gtk/gtkwidget.c:722
+#: ../gtk/gtkwidget.c:958
 msgid "The parent widget of this widget. Must be a Container widget"
 msgstr "આ વિજેટન�ં પિતૃ વિજેટ. આ �ક સમાવનાર વિજેટ હોવો જોઈ�"
 
-#: gtk/gtkwidget.c:729
+#: ../gtk/gtkwidget.c:965
 msgid "Width request"
 msgstr "પહોળાઈ માટેની વિનંતી"
 
-#: gtk/gtkwidget.c:730
+#: ../gtk/gtkwidget.c:966
 msgid ""
 "Override for width request of the widget, or -1 if natural request should be "
 "used"
-msgstr ""
-"વિજેટને પહોળ� કરવાની વિનંતીને દબાવી દો, અથવા તો જો ક�દરતી વિનંતી હોય તો -૧વાપરવ� જાેઇ�"
+msgstr "વિજેટને પહોળ� કરવાની વિનંતીને દબાવી દો, અથવા તો જો ક�દરતી વિનંતી હોય તો -૧વાપરવ� જાેઇ�"
 
-#: gtk/gtkwidget.c:738
+#: ../gtk/gtkwidget.c:974
 msgid "Height request"
 msgstr "ઊંચાઈ માટેની વિનંતી"
 
-#: gtk/gtkwidget.c:739
+#: ../gtk/gtkwidget.c:975
 msgid ""
 "Override for height request of the widget, or -1 if natural request should "
 "be used"
-msgstr ""
-"વિજેટને ઊંચ� કરવાની વિનંતીને દબાવી દો, અથવા તો જો � ક�દરતી વિનંતી હોય તો -૧વાપરવ� જાેઇ�"
+msgstr "વિજેટને ઊંચ� કરવાની વિનંતીને દબાવી દો, અથવા તો જો � ક�દરતી વિનંતી હોય તો -૧વાપરવ� જાેઇ�"
 
-#: gtk/gtkwidget.c:748
+#: ../gtk/gtkwidget.c:984
 msgid "Whether the widget is visible"
 msgstr "શ�ં વિજેટ દૃશ�યમાન છે"
 
-#: gtk/gtkwidget.c:755
+#: ../gtk/gtkwidget.c:991
 msgid "Whether the widget responds to input"
 msgstr "શ�ં વિજેટ ઈનપ�ટને પ�રતિસાદ આપે છે"
 
-#: gtk/gtkwidget.c:761
+#: ../gtk/gtkwidget.c:997
 msgid "Application paintable"
 msgstr "દોરી શકાય તેવો કાર�યક�રમ"
 
-#: gtk/gtkwidget.c:762
+#: ../gtk/gtkwidget.c:998
 msgid "Whether the application will paint directly on the widget"
 msgstr "શ�ં કાર�યક�રમ વિજેટની ઉપર સીધ� દોરશે"
 
-#: gtk/gtkwidget.c:768
+#: ../gtk/gtkwidget.c:1004
 msgid "Can focus"
 msgstr "પ�રકાશિત કરી શકાય છે"
 
-#: gtk/gtkwidget.c:769
+#: ../gtk/gtkwidget.c:1005
 msgid "Whether the widget can accept the input focus"
 msgstr "શ�ં વિજેટ પ�રકાશિત ઈનપ�ટને સ�વીકાર કરશે"
 
-#: gtk/gtkwidget.c:775
+#: ../gtk/gtkwidget.c:1011
 msgid "Has focus"
 msgstr "પ�રકાશિત કરેલ�"
 
-#: gtk/gtkwidget.c:776
+#: ../gtk/gtkwidget.c:1012
 msgid "Whether the widget has the input focus"
 msgstr "શ�ં વિજેટની પાસે પ�રકાશિત ઈનપ�ટ છે"
 
-#: gtk/gtkwidget.c:782
+#: ../gtk/gtkwidget.c:1018
 msgid "Is focus"
 msgstr "પ�રકાશિત કરેલ�"
 
-#: gtk/gtkwidget.c:783
+#: ../gtk/gtkwidget.c:1019
 msgid "Whether the widget is the focus widget within the toplevel"
 msgstr "શ�ં આ વિજેટ ઉંચાસ�તરમાં પ�રકાશિત વિજેટ છે"
 
-#: gtk/gtkwidget.c:789
+#: ../gtk/gtkwidget.c:1025
 msgid "Can default"
 msgstr "મૂળભૂત કરી શકાય છે"
 
-#: gtk/gtkwidget.c:790
+#: ../gtk/gtkwidget.c:1026
 msgid "Whether the widget can be the default widget"
 msgstr "શ�ં આ વિજેટ મૂળભૂત વિજેટ હોઇ શકે"
 
-#: gtk/gtkwidget.c:796
+#: ../gtk/gtkwidget.c:1032
 msgid "Has default"
 msgstr "મૂળભૂત કરેલ�"
 
-#: gtk/gtkwidget.c:797
+#: ../gtk/gtkwidget.c:1033
 msgid "Whether the widget is the default widget"
 msgstr "શ�ં આ વિજેટ મૂળભૂત વિજેટ છે"
 
-#: gtk/gtkwidget.c:803
+#: ../gtk/gtkwidget.c:1039
 msgid "Receives default"
 msgstr "મૂળભૂત મેળવે છે"
 
-#: gtk/gtkwidget.c:804
+#: ../gtk/gtkwidget.c:1040
 msgid "If TRUE, the widget will receive the default action when it is focused"
 msgstr "જો ખર� હોય તો, વિજેટ જ�યારે પ�રકાશિત થયેલ� હશે ત�યારે મૂળભૂત કાર�ય મેળવશે"
 
-#: gtk/gtkwidget.c:810
+#: ../gtk/gtkwidget.c:1046
 msgid "Composite child"
 msgstr "સંય�ક�ત બાળ પ�રક�રિયા"
 
-#: gtk/gtkwidget.c:811
+#: ../gtk/gtkwidget.c:1047
 msgid "Whether the widget is part of a composite widget"
 msgstr "શ�ં આ વિજેટ સંય�ક�ત વિજેટનેા ભાગ છે"
 
@@ -6712,159 +7395,210 @@ msgstr "શà«�ં આ વિજેટ સંયà«�કà«�ત વિજેટનà«
 # libgnomeprintui/gnome-font-dialog.c:217
 # #-#-#-#-#  libgnomeprintui.HEAD.hi.po (libgnomeprintui )  #-#-#-#-#
 # libgnomeprintui/gnome-font-dialog.c:217
-#: gtk/gtkwidget.c:817
+#: ../gtk/gtkwidget.c:1053
 msgid "Style"
 msgstr "શૈલી"
 
-#: gtk/gtkwidget.c:818
+#: ../gtk/gtkwidget.c:1054
 msgid ""
 "The style of the widget, which contains information about how it will look "
 "(colors etc)"
 msgstr "વિજેટની શૈલી કે જે તે કેવ�ં દેખાશે તેના વિશેની માહિતી ધરાવે છે(રંગ વગેરે)"
 
-#: gtk/gtkwidget.c:824
+#: ../gtk/gtkwidget.c:1060
 msgid "Events"
 msgstr "ઘટનાઓ"
 
-#: gtk/gtkwidget.c:825
+#: ../gtk/gtkwidget.c:1061
 msgid "The event mask that decides what kind of GdkEvents this widget gets"
 msgstr "સંતાડવાની � ઘટનાને કે જે નક�કી કરશે કે આ વિજેટ ક�યા પ�રકારની Gdk ઘટના મેળવશે"
 
-#: gtk/gtkwidget.c:832
-msgid "Extension events"
-msgstr "ઘટનાન�ં વિસ�તરણ"
-
-#: gtk/gtkwidget.c:833
-msgid "The mask that decides what kind of extension events this widget gets"
-msgstr "માસ�ક કે જે નક�કી કરશે કે આ વિજેટને કયા વિસ�તરણ વાળી ઘટના મળશે"
-
-#: gtk/gtkwidget.c:840
+#: ../gtk/gtkwidget.c:1068
 msgid "No show all"
 msgstr "બધ�ં બતાવો નહિં"
 
-#: gtk/gtkwidget.c:841
+#: ../gtk/gtkwidget.c:1069
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "શ�ં gtk_widget_show_all() � આ વિજેટને અસર કરવ�ં જોઈ� નહિં"
 
-#: gtk/gtkwidget.c:864
+#: ../gtk/gtkwidget.c:1092
 msgid "Whether this widget has a tooltip"
 msgstr "શ�ં આ વિજેટને સાધનમદદ છે"
 
-#: gtk/gtkwidget.c:920
+#: ../gtk/gtkwidget.c:1148
 msgid "Window"
 msgstr "વિન�ડો"
 
-#: gtk/gtkwidget.c:921
+#: ../gtk/gtkwidget.c:1149
 msgid "The widget's window if it is realized"
 msgstr "જો તે સાચે જ રજૂ કરેલ હોય તો વિજેટની વિન�ડો"
 
-#: gtk/gtkwidget.c:935
+#: ../gtk/gtkwidget.c:1163
 msgid "Double Buffered"
 msgstr "બમણ�ં બફર થયેલ છે"
 
-#: gtk/gtkwidget.c:936
+#: ../gtk/gtkwidget.c:1164
 #, fuzzy
 msgid "Whether the widget is double buffered"
 msgstr "ક�યાંતો વિજેટ � બમણી બફર થયેલ છે કે નહિં"
 
-#: gtk/gtkwidget.c:951
+#: ../gtk/gtkwidget.c:1179
 msgid "How to position in extra horizontal space"
 msgstr ""
 
-#: gtk/gtkwidget.c:967
+#: ../gtk/gtkwidget.c:1195
 msgid "How to position in extra vertical space"
 msgstr ""
 
-#: gtk/gtkwidget.c:986
+#: ../gtk/gtkwidget.c:1214
 #, fuzzy
 msgid "Margin on Left"
 msgstr "હાંસ�યો"
 
-#: gtk/gtkwidget.c:987
+#: ../gtk/gtkwidget.c:1215
 msgid "Pixels of extra space on the left side"
 msgstr ""
 
-#: gtk/gtkwidget.c:1007
+#: ../gtk/gtkwidget.c:1235
 msgid "Margin on Right"
 msgstr ""
 
-#: gtk/gtkwidget.c:1008
+#: ../gtk/gtkwidget.c:1236
 #, fuzzy
 msgid "Pixels of extra space on the right side"
 msgstr "ફકરાની ઉપર ખાલી જગ�યાના પિક�સેલ"
 
-#: gtk/gtkwidget.c:1028
+#: ../gtk/gtkwidget.c:1256
 #, fuzzy
 msgid "Margin on Top"
 msgstr "હાંસ�યો"
 
-#: gtk/gtkwidget.c:1029
+#: ../gtk/gtkwidget.c:1257
 #, fuzzy
 msgid "Pixels of extra space on the top side"
 msgstr "ફકરાની ઉપર ખાલી જગ�યાના પિક�સેલ"
 
-#: gtk/gtkwidget.c:1049
+#: ../gtk/gtkwidget.c:1277
 msgid "Margin on Bottom"
 msgstr ""
 
-#: gtk/gtkwidget.c:1050
+#: ../gtk/gtkwidget.c:1278
 msgid "Pixels of extra space on the bottom side"
 msgstr ""
 
-#: gtk/gtkwidget.c:1067
+#: ../gtk/gtkwidget.c:1295
 #, fuzzy
 msgid "All Margins"
 msgstr "હાંસ�યો"
 
-#: gtk/gtkwidget.c:1068
+#: ../gtk/gtkwidget.c:1296
 msgid "Pixels of extra space on all four sides"
 msgstr ""
 
-#: gtk/gtkwidget.c:2741
+#: ../gtk/gtkwidget.c:1329
+#, fuzzy
+#| msgid "Horizontal padding"
+msgid "Horizontal Expand"
+msgstr "આડી દિશામાં ખાલી જગ�યાઓ ભરવી"
+
+#: ../gtk/gtkwidget.c:1330
+#, fuzzy
+msgid "Whether widget wants more horizontal space"
+msgstr "શ�ં બધા બાળકો સરખા માપના હોવા જોઈ�"
+
+#: ../gtk/gtkwidget.c:1344
+#, fuzzy
+#| msgid "Horizontal alignment"
+msgid "Horizontal Expand Set"
+msgstr "આડી કતારબંધ ગોઠવણી"
+
+#: ../gtk/gtkwidget.c:1345
+#, fuzzy
+#| msgid "Whether to use the related actions appearance properties"
+msgid "Whether to use the hexpand property"
+msgstr "ક�યાંતો સંબંધિત ક�રિયાઓ દેખાતા ગ�ણધર�મોને વાપરે છે"
+
+#: ../gtk/gtkwidget.c:1359
+#, fuzzy
+#| msgid "Vertical padding"
+msgid "Vertical Expand"
+msgstr "ઊભી દિશામાં ખાલી જગ�યાઓ ભરવી"
+
+#: ../gtk/gtkwidget.c:1360
+#, fuzzy
+#| msgid "Whether the widget is visible"
+msgid "Whether widget wants more vertical space"
+msgstr "શ�ં વિજેટ દૃશ�યમાન છે"
+
+#: ../gtk/gtkwidget.c:1374
+#, fuzzy
+#| msgid "Vertical alignment"
+msgid "Vertical Expand Set"
+msgstr "ઊભી કતારબંધ ગોઠવણી"
+
+#: ../gtk/gtkwidget.c:1375
+#, fuzzy
+#| msgid "Whether to use the related actions appearance properties"
+msgid "Whether to use the vexpand property"
+msgstr "ક�યાંતો સંબંધિત ક�રિયાઓ દેખાતા ગ�ણધર�મોને વાપરે છે"
+
+#: ../gtk/gtkwidget.c:1389
+#, fuzzy
+#| msgid "Expand timeout"
+msgid "Expand Both"
+msgstr "સમયસમાપ�તિ વિસ�તારો"
+
+#: ../gtk/gtkwidget.c:1390
+#, fuzzy
+#| msgid "Whether the widget has the input focus"
+msgid "Whether widget wants to expand in both directions"
+msgstr "શ�ં વિજેટની પાસે પ�રકાશિત ઈનપ�ટ છે"
+
+#: ../gtk/gtkwidget.c:3029
 msgid "Interior Focus"
 msgstr "આંતરીક પ�રકાશન"
 
-#: gtk/gtkwidget.c:2742
+#: ../gtk/gtkwidget.c:3030
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "શ�ં પ�રકાશન માટેના સૂચકને વિજેટની અંદર દેખાડવ� છે"
 
-#: gtk/gtkwidget.c:2748
+#: ../gtk/gtkwidget.c:3036
 msgid "Focus linewidth"
 msgstr "લીટીની પહોળાઈને પ�રકાશિત કરો"
 
-#: gtk/gtkwidget.c:2749
+#: ../gtk/gtkwidget.c:3037
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "પ�રકાશન સૂચક લીટીની, પહોળાઈ, પિક�સેલમાં"
 
-#: gtk/gtkwidget.c:2755
+#: ../gtk/gtkwidget.c:3043
 msgid "Focus line dash pattern"
 msgstr "લીટીની તૂટક ભાતને પ�રકાશિત કરો"
 
-#: gtk/gtkwidget.c:2756
+#: ../gtk/gtkwidget.c:3044
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "પ�રકાશન સૂચકને દોરવા માટે તૂટક ભાતનો ઉપયોગ થાય છે"
 
-#: gtk/gtkwidget.c:2761
+#: ../gtk/gtkwidget.c:3049
 msgid "Focus padding"
 msgstr "પૂરાયેલી ખાલી જગ�યાને પ�રકાશિત કરો"
 
-#: gtk/gtkwidget.c:2762
+#: ../gtk/gtkwidget.c:3050
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "પ�રકાશિત સૂચક અને વિજેટ પેટીની વચ�ચેની,પહોળાઈ,પિક�સેલમાં"
 
-#: gtk/gtkwidget.c:2767
+#: ../gtk/gtkwidget.c:3055
 msgid "Cursor color"
 msgstr "કર�સર નો રંગ"
 
-#: gtk/gtkwidget.c:2768
+#: ../gtk/gtkwidget.c:3056
 msgid "Color with which to draw insertion cursor"
 msgstr "રંગ કે જેનાથી દાખલ કરવા માટેન�ં કર�સર દોરાય છે"
 
-#: gtk/gtkwidget.c:2773
+#: ../gtk/gtkwidget.c:3061
 msgid "Secondary cursor color"
 msgstr "કર�સરનો ગૌણ રંગ"
 
-#: gtk/gtkwidget.c:2774
+#: ../gtk/gtkwidget.c:3062
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -6872,44 +7606,44 @@ msgstr ""
 "જ�યારે મિશ�રિત જમણેથી-ડાબે કે ડાબેથી-જમણે લખાણન�ં ફેરફાર કરતા હોઈ� ત�યારેદાખલ કરવા માટેના "
 "ગૌણ કર�સરને દોરવા માટેનો રંગ"
 
-#: gtk/gtkwidget.c:2779
+#: ../gtk/gtkwidget.c:3067
 msgid "Cursor line aspect ratio"
 msgstr "કર�સર લીટી માટેનો ધારેલો ગ�ણોત�તર"
 
-#: gtk/gtkwidget.c:2780
+#: ../gtk/gtkwidget.c:3068
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "ધારેલો ગ�ણોત�તર કે જેનાથી દાખલ કરવા માટેન� કર�સર દોરાય છે"
 
-#: gtk/gtkwidget.c:2786
+#: ../gtk/gtkwidget.c:3074
 #, fuzzy
 msgid "Window dragging"
 msgstr "વિન�ડોની સ�થિતિ"
 
-#: gtk/gtkwidget.c:2787
+#: ../gtk/gtkwidget.c:3075
 msgid "Whether windows can be dragged by clicking on empty areas"
 msgstr ""
 
-#: gtk/gtkwidget.c:2800
+#: ../gtk/gtkwidget.c:3088
 msgid "Unvisited Link Color"
 msgstr "નહિં મ�લાકાત લેવાયેલ કડીનો રંગ"
 
-#: gtk/gtkwidget.c:2801
+#: ../gtk/gtkwidget.c:3089
 msgid "Color of unvisited links"
 msgstr "નહિં મ�લાકાત લેવાયેલ કડીઓનો રંગ"
 
-#: gtk/gtkwidget.c:2814
+#: ../gtk/gtkwidget.c:3102
 msgid "Visited Link Color"
 msgstr "મ�લાકાત લેવાયેલ કડીનો રંગ"
 
-#: gtk/gtkwidget.c:2815
+#: ../gtk/gtkwidget.c:3103
 msgid "Color of visited links"
 msgstr "મ�લાકાત લેવાયેલ કડીઓનો રંગ"
 
-#: gtk/gtkwidget.c:2829
+#: ../gtk/gtkwidget.c:3117
 msgid "Wide Separators"
 msgstr "મોટા વિભાજકો"
 
-#: gtk/gtkwidget.c:2830
+#: ../gtk/gtkwidget.c:3118
 msgid ""
 "Whether separators have configurable width and should be drawn using a box "
 "instead of a line"
@@ -6917,81 +7651,81 @@ msgstr ""
 "શ�ં વિભાજકો પાસે રૂપરેખાંકન કરી શકાય તેવી પહોળાઈ છે અને તે લીટીની જગ�યા� બોક�સથી દોરાવી "
 "જોઈ�"
 
-#: gtk/gtkwidget.c:2844
+#: ../gtk/gtkwidget.c:3132
 msgid "Separator Width"
 msgstr "વિભાજક પહોળાઈ"
 
-#: gtk/gtkwidget.c:2845
+#: ../gtk/gtkwidget.c:3133
 msgid "The width of separators if wide-separators is TRUE"
 msgstr "જો મોટા-વિભાજકો � TRUE હોય તો વિભાજકોની પહોળાઈ"
 
-#: gtk/gtkwidget.c:2859
+#: ../gtk/gtkwidget.c:3147
 msgid "Separator Height"
 msgstr "વિભાજક ઊંચાઈ"
 
-#: gtk/gtkwidget.c:2860
+#: ../gtk/gtkwidget.c:3148
 msgid "The height of separators if \"wide-separators\" is TRUE"
 msgstr "જો \"મોટા-વિભાજકો\" � TRUE હોય તો વિભાજકોની ઊંચાઈ"
 
-#: gtk/gtkwidget.c:2874
+#: ../gtk/gtkwidget.c:3162
 msgid "Horizontal Scroll Arrow Length"
 msgstr "આડી સરકાવવાની તીરની લંબાઈ"
 
-#: gtk/gtkwidget.c:2875
+#: ../gtk/gtkwidget.c:3163
 msgid "The length of horizontal scroll arrows"
 msgstr "આડી સરકાવવાની તીરોની લંબાઈ"
 
-#: gtk/gtkwidget.c:2889
+#: ../gtk/gtkwidget.c:3177
 msgid "Vertical Scroll Arrow Length"
 msgstr "ઊભી સરકાવવાની તીરની લંબાઈ"
 
-#: gtk/gtkwidget.c:2890
+#: ../gtk/gtkwidget.c:3178
 msgid "The length of vertical scroll arrows"
 msgstr "ઊભી સરકાવવાની તીરોની લંબાઈ"
 
-#: gtk/gtkwindow.c:567
+#: ../gtk/gtkwindow.c:608
 msgid "Window Type"
 msgstr "વિન�ડો પ�રકાર"
 
-#: gtk/gtkwindow.c:568
+#: ../gtk/gtkwindow.c:609
 msgid "The type of the window"
 msgstr "વિન�ડોનો પ�રકાર"
 
-#: gtk/gtkwindow.c:576
+#: ../gtk/gtkwindow.c:617
 msgid "Window Title"
 msgstr "વિન�ડો શીર�ષક"
 
-#: gtk/gtkwindow.c:577
+#: ../gtk/gtkwindow.c:618
 msgid "The title of the window"
 msgstr "વિન�ડોન�ં શીર�ષક"
 
-#: gtk/gtkwindow.c:584
+#: ../gtk/gtkwindow.c:625
 msgid "Window Role"
 msgstr "વિન�ડો શીર�ષક"
 
-#: gtk/gtkwindow.c:585
+#: ../gtk/gtkwindow.c:626
 msgid "Unique identifier for the window to be used when restoring a session"
 msgstr "જ�યારે સત�રનો પ�નઃસંગ�રહ કરી રહ�યા હોય ત�યારે વારવા માટેની વિન�ડોની અનન�ય ઓળખ"
 
-#: gtk/gtkwindow.c:601
+#: ../gtk/gtkwindow.c:642
 msgid "Startup ID"
 msgstr "શરૂઆત ID"
 
-#: gtk/gtkwindow.c:602
+#: ../gtk/gtkwindow.c:643
 msgid "Unique startup identifier for the window used by startup-notification"
 msgstr "શરૂઆત-સૂચક દ�વારા વપરાતી વિનાડો માટે અનન�ય શરૂઆત સૂચક"
 
-#: gtk/gtkwindow.c:610
+#: ../gtk/gtkwindow.c:651
 msgid "If TRUE, users can resize the window"
 msgstr "જો ખર� હોય તો, વપરાશકર�તા વિન�ડોન�ં માપ બદલી શકે છે"
 
 # #-#-#-#-#  libgnomeui.HEAD.hi.po (libgnomeui-2.0.hi)  #-#-#-#-#
 # libgnomeui/gnome-file-entry.c:216
-#: gtk/gtkwindow.c:617
+#: ../gtk/gtkwindow.c:658
 msgid "Modal"
 msgstr "આજે"
 
-#: gtk/gtkwindow.c:618
+#: ../gtk/gtkwindow.c:659
 msgid ""
 "If TRUE, the window is modal (other windows are not usable while this one is "
 "up)"
@@ -6999,78 +7733,88 @@ msgstr ""
 "જો ખર� હોય તો, વિન�ડો નમૂનારૂપી છે. (જ�યારે આ હોય ત�યારે બીજી બધી વિન�ડોનો ઉપયોગ કરી "
 "શકાય નહિ)"
 
-#: gtk/gtkwindow.c:625
+#: ../gtk/gtkwindow.c:666
 msgid "Window Position"
 msgstr "વિન�ડોની સ�થિતિ"
 
-#: gtk/gtkwindow.c:626
+#: ../gtk/gtkwindow.c:667
 msgid "The initial position of the window"
 msgstr "વિન�ડોની શર�આતની સ�થિતિ"
 
-#: gtk/gtkwindow.c:634
+#: ../gtk/gtkwindow.c:675
 msgid "Default Width"
 msgstr "મૂળભૂત પહોળાઈ"
 
-#: gtk/gtkwindow.c:635
+#: ../gtk/gtkwindow.c:676
 msgid "The default width of the window, used when initially showing the window"
 msgstr "વિન�ડોની મૂળભૂત પહોળાઈ, આનો ઉપયોગ વિન�ડોને શર�આતમાં દર�શાવતી વખતે કરવામાં આવશે"
 
-#: gtk/gtkwindow.c:644
+#: ../gtk/gtkwindow.c:685
 msgid "Default Height"
 msgstr "મૂળભૂત ઊંચાઈ"
 
-#: gtk/gtkwindow.c:645
-msgid ""
-"The default height of the window, used when initially showing the window"
+#: ../gtk/gtkwindow.c:686
+msgid "The default height of the window, used when initially showing the window"
 msgstr "વિન�ડોની મૂળભૂત ઊંચાઈ, આનો ઉપોયોગ વિન�ડોને શર�આતમાં દર�શાવતી વખતે કરવામાં આવશે"
 
-#: gtk/gtkwindow.c:654
+#: ../gtk/gtkwindow.c:695
 msgid "Destroy with Parent"
 msgstr "પિતૃની સાથે નાશ કરો"
 
-#: gtk/gtkwindow.c:655
+#: ../gtk/gtkwindow.c:696
 msgid "If this window should be destroyed when the parent is destroyed"
 msgstr "શ�ં પિતૃનો નાશ કરવામાં આવે ત�યારે આ વિન�ડોનો નાશ કરવો"
 
-#: gtk/gtkwindow.c:663
+#: ../gtk/gtkwindow.c:704
 msgid "Icon for this window"
 msgstr "આ વિન�ડો માટેન� ચિહ�ન"
 
-#: gtk/gtkwindow.c:669
+#: ../gtk/gtkwindow.c:722
 #, fuzzy
 msgid "Mnemonics Visible"
 msgstr "સંજ�ઞાસૂચિ કી"
 
-#: gtk/gtkwindow.c:670
+#: ../gtk/gtkwindow.c:723
 #, fuzzy
 msgid "Whether mnemonics are currently visible in this window"
 msgstr "શ�ં ઉચ�ચસ�તર � આપણ�ં વર�તમાન કાર�યશીલ વિન�ડો છે"
 
-#: gtk/gtkwindow.c:686
+#: ../gtk/gtkwindow.c:741
+#, fuzzy
+#| msgid "Cursor Visible"
+msgid "Focus Visible"
+msgstr "કર�સર દૃશ�યમાન છે"
+
+#: ../gtk/gtkwindow.c:742
+#, fuzzy
+msgid "Whether focus rectangles are currently visible in this window"
+msgstr "શ�ં ઉચ�ચસ�તર � આપણ�ં વર�તમાન કાર�યશીલ વિન�ડો છે"
+
+#: ../gtk/gtkwindow.c:758
 msgid "Name of the themed icon for this window"
 msgstr "આ વિન�ડો માટેન� ચિહ�ન"
 
-#: gtk/gtkwindow.c:701
+#: ../gtk/gtkwindow.c:773
 msgid "Is Active"
 msgstr "ક�રિયાશીલ છે"
 
-#: gtk/gtkwindow.c:702
+#: ../gtk/gtkwindow.c:774
 msgid "Whether the toplevel is the current active window"
 msgstr "શ�ં ઉચ�ચસ�તર � આપણ�ં વર�તમાન કાર�યશીલ વિન�ડો છે"
 
-#: gtk/gtkwindow.c:709
+#: ../gtk/gtkwindow.c:781
 msgid "Focus in Toplevel"
 msgstr "ઉચ�ચસ�તર પ�રકાશિત છે"
 
-#: gtk/gtkwindow.c:710
+#: ../gtk/gtkwindow.c:782
 msgid "Whether the input focus is within this GtkWindow"
 msgstr "શ�ં ઈનપ�ટન�ં પ�રકાશન આ Gtk વિન�ડોમાં છે"
 
-#: gtk/gtkwindow.c:717
+#: ../gtk/gtkwindow.c:789
 msgid "Type hint"
 msgstr "પ�રકાર વિશે સંકેત"
 
-#: gtk/gtkwindow.c:718
+#: ../gtk/gtkwindow.c:790
 msgid ""
 "Hint to help the desktop environment understand what kind of window this is "
 "and how to treat it."
@@ -7078,101 +7822,224 @@ msgstr ""
 "ડેસ�કટોપના વાતાવરણને આ વિન�ડો કયા પ�રકારની છે અને તેની સાથે કઈ રીતે વર�તન કરવ�� માટેની "
 "મદદ માટેનો સંકેત."
 
-#: gtk/gtkwindow.c:726
+#: ../gtk/gtkwindow.c:798
 msgid "Skip taskbar"
 msgstr "કાર�ય દર�શક પટ�ટી છોડી દો"
 
-#: gtk/gtkwindow.c:727
+#: ../gtk/gtkwindow.c:799
 msgid "TRUE if the window should not be in the task bar."
 msgstr "ખર� જો વિન�ડો કાર�ય દર�શક પટ�ટીમાં ન હોવી જોઈ�."
 
-#: gtk/gtkwindow.c:734
+#: ../gtk/gtkwindow.c:806
 msgid "Skip pager"
 msgstr "પેજર છોડી દો"
 
-#: gtk/gtkwindow.c:735
+#: ../gtk/gtkwindow.c:807
 msgid "TRUE if the window should not be in the pager."
 msgstr "ખર� જો વિન�ડો પેજરમાં ન હોવી જોઈ�."
 
-#: gtk/gtkwindow.c:742
+#: ../gtk/gtkwindow.c:814
 msgid "Urgent"
 msgstr "તાત�કાલિક"
 
-#: gtk/gtkwindow.c:743
+#: ../gtk/gtkwindow.c:815
 msgid "TRUE if the window should be brought to the user's attention."
 msgstr "જો વિન�ડો વપરાશકર�તાના ધ�યાનમાં લેવાવ�ં જોઈ� તો ખર�ં."
 
-#: gtk/gtkwindow.c:757
+#: ../gtk/gtkwindow.c:829
 msgid "Accept focus"
 msgstr "પ�રકાશિત કરેલ�"
 
-#: gtk/gtkwindow.c:758
+#: ../gtk/gtkwindow.c:830
 msgid "TRUE if the window should receive the input focus."
 msgstr "ખર� જો વિન�ડો પેજરમાં ન હોવી જોઈ�."
 
-#: gtk/gtkwindow.c:772
+#: ../gtk/gtkwindow.c:844
 msgid "Focus on map"
 msgstr "ઉચ�ચસ�તર પ�રકાશિત છે"
 
-#: gtk/gtkwindow.c:773
+#: ../gtk/gtkwindow.c:845
 msgid "TRUE if the window should receive the input focus when mapped."
 msgstr "ખર� જો વિન�ડો પેજરમાં ન હોવી જોઈ�."
 
-#: gtk/gtkwindow.c:787
+#: ../gtk/gtkwindow.c:859
 msgid "Decorated"
 msgstr "શણગારાયેલ"
 
-#: gtk/gtkwindow.c:788
+#: ../gtk/gtkwindow.c:860
 msgid "Whether the window should be decorated by the window manager"
 msgstr "ખર� જો વિન�ડો પેજરમાં ન હોવી જોઈ�"
 
-#: gtk/gtkwindow.c:802
+#: ../gtk/gtkwindow.c:874
 msgid "Deletable"
 msgstr "કાઢી શકાય તેવ�ં"
 
-#: gtk/gtkwindow.c:803
+#: ../gtk/gtkwindow.c:875
 msgid "Whether the window frame should have a close button"
 msgstr "શ�ં વિન�ડો ચોકઠાંને બંધ કરો બટન હોવ�ં જોઈ�"
 
-#: gtk/gtkwindow.c:819
+#: ../gtk/gtkwindow.c:894
+#, fuzzy
+#| msgid "Has Resize Grip"
+msgid "Resize grip"
+msgstr "પાસે માપબદલવાની ગ�રીપ છે"
+
+#: ../gtk/gtkwindow.c:895
+#, fuzzy
+#| msgid "Whether the window frame should have a close button"
+msgid "Specifies whether the window should have a resize grip"
+msgstr "શ�ં વિન�ડો ચોકઠાંને બંધ કરો બટન હોવ�ં જોઈ�"
+
+#: ../gtk/gtkwindow.c:909
+msgid "Resize grip is visible"
+msgstr ""
+
+#: ../gtk/gtkwindow.c:910
+#, fuzzy
+#| msgid "Whether the action group is visible."
+msgid "Specifies whether the window's resize grip is visible."
+msgstr "શ�ં ક�રિયા જૂથ દૃશ�યમાન છે."
+
+#: ../gtk/gtkwindow.c:926
 msgid "Gravity"
 msgstr "ગ�ર�ત�વાકર�ષણ"
 
-#: gtk/gtkwindow.c:820
+#: ../gtk/gtkwindow.c:927
 msgid "The window gravity of the window"
 msgstr "વિન�ડોનો પ�રકાર"
 
-#: gtk/gtkwindow.c:837
+#: ../gtk/gtkwindow.c:944
 msgid "Transient for Window"
 msgstr "વિન�ડો માટે પારદર�શક"
 
-#: gtk/gtkwindow.c:838
+#: ../gtk/gtkwindow.c:945
 msgid "The transient parent of the dialog"
 msgstr "સંવાદનો પારદર�શક પિતૃ"
 
-#: gtk/gtkwindow.c:853
+#: ../gtk/gtkwindow.c:960
 msgid "Opacity for Window"
 msgstr "વિન�ડો માટે અપારદર�શકતા"
 
-#: gtk/gtkwindow.c:854
+#: ../gtk/gtkwindow.c:961
 msgid "The opacity of the window, from 0 to 1"
 msgstr "વિન�ડોની અપારદર�શકતા, ૦ થી ૧ સ�ધી"
 
-#: modules/input/gtkimcontextxim.c:334
-msgid "IM Preedit style"
-msgstr "IM ફરીથી ફેરફાર કરવાની રીત"
+#: ../gtk/gtkwindow.c:971 ../gtk/gtkwindow.c:972
+msgid "Width of resize grip"
+msgstr ""
 
-#: modules/input/gtkimcontextxim.c:335
-msgid "How to draw the input method preedit string"
-msgstr "કેવી રીતે ઇનપ�ટ પદ�દતિ પિડીટ શબ�દમાળા ને દોરાય"
+#: ../gtk/gtkwindow.c:977 ../gtk/gtkwindow.c:978
+#, fuzzy
+#| msgid "Has Resize Grip"
+msgid "Height of resize grip"
+msgstr "પાસે માપબદલવાની ગ�રીપ છે"
 
-#: modules/input/gtkimcontextxim.c:343
-msgid "IM Status style"
-msgstr "IM સ�થિતિનો પ�રકાર"
+#: ../gtk/gtkwindow.c:1000
+#| msgid "Application paintable"
+msgid "GtkApplication"
+msgstr "GtkApplication"
 
-#: modules/input/gtkimcontextxim.c:344
-msgid "How to draw the input method statusbar"
-msgstr "ઈનપ�ટ પધ�ધતિની સ�થિતિ દર�શાવતી પટ�ટી કેવી રીતે દોરવી"
+#: ../gtk/gtkwindow.c:1001
+#| msgid "The initial position of the window"
+msgid "The GtkApplication for the window"
+msgstr "વિન�ડો માટે GtkApplication"
+
+#: ../modules/printbackends/cups/gtkprintercups.c:95
+msgid "Color Profile Title"
+msgstr "રંગ રૂપરેખા શીર�ષક"
+
+#: ../modules/printbackends/cups/gtkprintercups.c:96
+#| msgid "The title of the color selection dialog"
+msgid "The title of the color profile to use"
+msgstr "વાપરવા માટે રંગ રૂપરેખાન�ં શીર�ષક"
+
+#~ msgid ""
+#~ "The label for the link to the website of the program. If this is not set, "
+#~ "it defaults to the URL"
+#~ msgstr ""
+#~ "કાર�યક�રમની વેબસાઈટ માટે કડી માટેન�ં લેબલ. જો આ સ�યોજિત નહિં હોય, તો તેમાં URL મૂળભ�ત "
+#~ "થઈ જશે"
+
+#~ msgid "The title of the font selection dialog"
+#~ msgstr "ફોન�ટ પસંદગી સંવાદન�ં શીર�ષક"
+
+#~ msgid "Tab pack type"
+#~ msgstr "ટેબ પેકનો પ�રકાર"
+
+#~ msgid "Update policy"
+#~ msgstr "સ�ધારા પોલિસી"
+
+#~ msgid "How the range should be updated on the screen"
+#~ msgstr "સ�ક�રીન પર વિસ�તારને કેવી રીતે બદલવી"
+
+#~ msgid "Lower"
+#~ msgstr "નીચેન�ં"
+
+#~ msgid "Lower limit of ruler"
+#~ msgstr "માપપટ�ટીની નીચેની હદ"
+
+#~ msgid "Upper"
+#~ msgstr "ઉપરન�"
+
+#~ msgid "Upper limit of ruler"
+#~ msgstr "માપપટ�ટીની ઉપરની હદ"
+
+#~ msgid "Position of mark on the ruler"
+#~ msgstr "માપપટ�ટી ઉપર નિશાનીન� સ�થાન"
+
+#~ msgid "Max Size"
+#~ msgstr "મહત�તમ માપ"
+
+#~ msgid "Maximum size of the ruler"
+#~ msgstr "માપપટ�ટી ન� મહત�તમ માપ"
+
+#~ msgid "Metric"
+#~ msgstr "મેટ�રિક"
+
+#~ msgid "The metric used for the ruler"
+#~ msgstr "માપપટ�ટી માટે વપરાયેલ મેટ�રિક"
+
+#, fuzzy
+#~ msgid "Number of steps"
+#~ msgstr "પાનાંઓની સંખ�યા"
+
+#, fuzzy
+#~ msgid "Animation duration"
+#~ msgstr "�નીમેશન"
+
+#~ msgid "Whether the statusbar has a grip for resizing the toplevel"
+#~ msgstr "શ�ં આ વિજેટ ઉંચાસ�તરમાં પ�રકાશિત વિજેટ છે"
+
+#~ msgid "Background color as a (possibly unallocated) GdkColor"
+#~ msgstr "પાશ�વ ભાગનો રંગ GdkColor તરીકે (સંભવિત રીતે ફાળવ�યા વગરનો)"
+
+#~ msgid "Foreground color as a (possibly unallocated) GdkColor"
+#~ msgstr "અગ�ર રંગ GdkColor તરીકે (સંભવિત રીતે ફાળવ�યા વગરનો)"
+
+#~ msgid "Paragraph background color as a (possibly unallocated) GdkColor"
+#~ msgstr "ફકરાના પાશ�વ ભાગનો રંગ (સંભવિત છે ફાળવેલ નહિં હોય તે) GdkColor તરીકે"
+
+#~ msgid "Horizontal Adjustment for the widget"
+#~ msgstr "વિજેટ માટે વ�યવસ�થિત આડી ગોઠવણી"
+
+#~ msgid "Vertical Adjustment for the widget"
+#~ msgstr "વિજેટ માટે વ�યવસ�થિત ઊભી ગોઠવણી"
+
+#~ msgid ""
+#~ "The GtkAdjustment that determines the values of the horizontal position "
+#~ "for this viewport"
+#~ msgstr "Gtk ગોઠવણી જે વ�ય�પોર�ટ માટેની આડી સ�થિતિની કિંમત નક�કી કરે છે"
+
+#~ msgid ""
+#~ "The GtkAdjustment that determines the values of the vertical position for "
+#~ "this viewport"
+#~ msgstr "Gtk ગોઠવણી જે વ�ય�પોર�ટ માટેની ઊભી સ�થિતિની કિંમત નક�કી કરે છે"
+
+#~ msgid "Extension events"
+#~ msgstr "ઘટનાન�ં વિસ�તરણ"
+
+#~ msgid "The mask that decides what kind of extension events this widget gets"
+#~ msgstr "માસ�ક કે જે નક�કી કરશે કે આ વિજેટને કયા વિસ�તરણ વાળી ઘટના મળશે"
 
 #~ msgid "Loop"
 #~ msgstr "લ�પ"
diff --git a/po-properties/id.po b/po-properties/id.po
index db15f027b0..6b42659c9e 100644
--- a/po-properties/id.po
+++ b/po-properties/id.po
@@ -2,19 +2,19 @@
 # Copyright (C) 2003 THE gtk+'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gtk+ package.
 #
-# Ahmad Riza H Nst  <rizahnst@id.gnome.org>
-# Mohammad DAMT <mdamt@bisnisweb.com>, 2003.
-# Andika Triwidada <andika@gmail.com>, 2010.
+# Mohammad DAMT <mdamt@bisnisweb.com>, 2003, 2005.
+# Ahmad Riza H Nst  <rizahnst@id.gnome.org>, 2006.
+# Andika Triwidada <andika@gmail.com>, 2010, 2011.
 # Dirgita <dirgitadevina@yahoo.co.id>, 2010.
 # Dirgita Devina <dirgitadevina@yahoo.co.id>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-properties master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2b&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-19 22:46+0000\n"
-"PO-Revision-Date: 2011-03-21 11:16+0700\n"
+"POT-Creation-Date: 2011-08-16 06:22+0000\n"
+"PO-Revision-Date: 2011-08-23 05:31+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
-"Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
+"Language-Team: Indonesian <gnome@i15n.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -110,11 +110,11 @@ msgstr "Jumlah sumbu pada perangkat"
 msgid "Display for the device manager"
 msgstr "Tampilan manajer perangkat"
 
-#: ../gdk/gdkdisplaymanager.c:158
+#: ../gdk/gdkdisplaymanager.c:162
 msgid "Default Display"
 msgstr "Tampilan Baku"
 
-#: ../gdk/gdkdisplaymanager.c:159
+#: ../gdk/gdkdisplaymanager.c:163
 msgid "The default display for GDK"
 msgstr "Tampilan baku untuk GDK"
 
@@ -134,26 +134,16 @@ msgstr "Resolusi fonta"
 msgid "The resolution for fonts on the screen"
 msgstr "Resolusi fonta pada layar"
 
-#: ../gdk/gdkwindow.c:373
-#: ../gdk/gdkwindow.c:374
+#: ../gdk/gdkwindow.c:376
+#: ../gdk/gdkwindow.c:377
 msgid "Cursor"
 msgstr "Kursor"
 
-#: ../gdk/x11/gdkdevice-xi.c:140
-#: ../gdk/x11/gdkdevice-xi.c:141
-#: ../gdk/x11/gdkdevice-xi2.c:130
-msgid "Device ID"
-msgstr "ID Perangkat"
-
-#: ../gdk/x11/gdkdevice-xi2.c:131
-msgid "Device identifier"
-msgstr "Identifair Perangkat"
-
-#: ../gdk/x11/gdkdevicemanager-xi2.c:118
+#: ../gdk/x11/gdkdevicemanager-xi2.c:119
 msgid "Opcode"
 msgstr "Opcode"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:119
+#: ../gdk/x11/gdkdevicemanager-xi2.c:120
 msgid "Opcode for XInput2 requests"
 msgstr "Opcode bagi permintaan XInput"
 
@@ -165,115 +155,125 @@ msgstr "Basis kejadian"
 msgid "Event base for XInput events"
 msgstr "Basis kejadian bagi kejadian XInput"
 
-#: ../gtk/gtkaboutdialog.c:276
+#: ../gdk/x11/gdkdevice-xi2.c:130
+#: ../gdk/x11/gdkdevice-xi.c:140
+#: ../gdk/x11/gdkdevice-xi.c:141
+msgid "Device ID"
+msgstr "ID Perangkat"
+
+#: ../gdk/x11/gdkdevice-xi2.c:131
+msgid "Device identifier"
+msgstr "Identifair Perangkat"
+
+#: ../gtk/gtkaboutdialog.c:275
 msgid "Program name"
 msgstr "Nama program"
 
-#: ../gtk/gtkaboutdialog.c:277
+#: ../gtk/gtkaboutdialog.c:276
 msgid "The name of the program. If this is not set, it defaults to g_get_application_name()"
 msgstr "Nama program. Jika tidak ada isinya, maka mengacu pada g_get_application_name()"
 
-#: ../gtk/gtkaboutdialog.c:291
+#: ../gtk/gtkaboutdialog.c:290
 msgid "Program version"
 msgstr "Versi program"
 
-#: ../gtk/gtkaboutdialog.c:292
+#: ../gtk/gtkaboutdialog.c:291
 msgid "The version of the program"
 msgstr "Versi program ini"
 
-#: ../gtk/gtkaboutdialog.c:306
+#: ../gtk/gtkaboutdialog.c:305
 msgid "Copyright string"
 msgstr "Kalimat hak cipta"
 
-#: ../gtk/gtkaboutdialog.c:307
+#: ../gtk/gtkaboutdialog.c:306
 msgid "Copyright information for the program"
 msgstr "Informasi hak cipta program"
 
-#: ../gtk/gtkaboutdialog.c:324
+#: ../gtk/gtkaboutdialog.c:323
 msgid "Comments string"
 msgstr "Teks keterangan"
 
-#: ../gtk/gtkaboutdialog.c:325
+#: ../gtk/gtkaboutdialog.c:324
 msgid "Comments about the program"
 msgstr "Keterangan mengenai program"
 
-#: ../gtk/gtkaboutdialog.c:375
+#: ../gtk/gtkaboutdialog.c:374
 msgid "License Type"
 msgstr "Jenis Lisensi"
 
-#: ../gtk/gtkaboutdialog.c:376
+#: ../gtk/gtkaboutdialog.c:375
 msgid "The license type of the program"
 msgstr "Jenis lisensi pada program"
 
-#: ../gtk/gtkaboutdialog.c:392
+#: ../gtk/gtkaboutdialog.c:391
 msgid "Website URL"
 msgstr "URL situs web"
 
-#: ../gtk/gtkaboutdialog.c:393
+#: ../gtk/gtkaboutdialog.c:392
 msgid "The URL for the link to the website of the program"
 msgstr "URL taut situs web program ini"
 
-#: ../gtk/gtkaboutdialog.c:407
+#: ../gtk/gtkaboutdialog.c:406
 msgid "Website label"
 msgstr "Label situs web"
 
-#: ../gtk/gtkaboutdialog.c:408
+#: ../gtk/gtkaboutdialog.c:407
 msgid "The label for the link to the website of the program"
 msgstr "Label bagi taut ke situs web program ini"
 
-#: ../gtk/gtkaboutdialog.c:424
+#: ../gtk/gtkaboutdialog.c:423
 msgid "Authors"
 msgstr "Penulis"
 
-#: ../gtk/gtkaboutdialog.c:425
+#: ../gtk/gtkaboutdialog.c:424
 msgid "List of authors of the program"
 msgstr "Daftar penyusun program ini"
 
-#: ../gtk/gtkaboutdialog.c:441
+#: ../gtk/gtkaboutdialog.c:440
 msgid "Documenters"
 msgstr "Pendokumentasi"
 
-#: ../gtk/gtkaboutdialog.c:442
+#: ../gtk/gtkaboutdialog.c:441
 msgid "List of people documenting the program"
 msgstr "Daftar orang yang menulis dokumentasi program ini"
 
-#: ../gtk/gtkaboutdialog.c:458
+#: ../gtk/gtkaboutdialog.c:457
 msgid "Artists"
 msgstr "Seniman"
 
-#: ../gtk/gtkaboutdialog.c:459
+#: ../gtk/gtkaboutdialog.c:458
 msgid "List of people who have contributed artwork to the program"
 msgstr "Daftar orang yang menyumbangkan karya seninya pada program ini"
 
-#: ../gtk/gtkaboutdialog.c:476
+#: ../gtk/gtkaboutdialog.c:475
 msgid "Translator credits"
 msgstr "Kredit penerjemah"
 
-#: ../gtk/gtkaboutdialog.c:477
+#: ../gtk/gtkaboutdialog.c:476
 msgid "Credits to the translators. This string should be marked as translatable"
 msgstr "Penghargaan ke para pengalih bahasa. Kalimat ini harus dibuat agar dapat diterjemahkan"
 
-#: ../gtk/gtkaboutdialog.c:492
+#: ../gtk/gtkaboutdialog.c:491
 msgid "Logo"
 msgstr "Logo"
 
-#: ../gtk/gtkaboutdialog.c:493
+#: ../gtk/gtkaboutdialog.c:492
 msgid "A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"
 msgstr "Lambang untuk kotak keterangan program. Jika tidak ada isinya, maka mengacu ke gtk_window_get_default_icon_list()"
 
-#: ../gtk/gtkaboutdialog.c:508
+#: ../gtk/gtkaboutdialog.c:507
 msgid "Logo Icon Name"
 msgstr "Nama Ikon Logo"
 
-#: ../gtk/gtkaboutdialog.c:509
+#: ../gtk/gtkaboutdialog.c:508
 msgid "A named icon to use as the logo for the about box."
 msgstr "Nama ikon yang digunakan sebagai lambang pada kotak keterangan program."
 
-#: ../gtk/gtkaboutdialog.c:522
+#: ../gtk/gtkaboutdialog.c:521
 msgid "Wrap license"
 msgstr "Lipat lisensi"
 
-#: ../gtk/gtkaboutdialog.c:523
+#: ../gtk/gtkaboutdialog.c:522
 msgid "Whether to wrap the license text."
 msgstr "Menentukan apakah teks lisensi dilipat isi barisnya dan dipindah ke baris berikutnya"
 
@@ -296,8 +296,8 @@ msgstr "Widget yang dipantau untuk perubahan akselerator"
 #: ../gtk/gtkaction.c:222
 #: ../gtk/gtkactiongroup.c:228
 #: ../gtk/gtkprinter.c:125
-#: ../gtk/gtktextmark.c:89
-#: ../gtk/gtkthemingengine.c:248
+#: ../gtk/gtktextmark.c:126
+#: ../gtk/gtkthemingengine.c:256
 msgid "Name"
 msgstr "Nama"
 
@@ -306,13 +306,13 @@ msgid "A unique name for the action."
 msgstr "Nama unik untuk aksi ini."
 
 #: ../gtk/gtkaction.c:241
-#: ../gtk/gtkbutton.c:227
-#: ../gtk/gtkexpander.c:287
-#: ../gtk/gtkframe.c:133
-#: ../gtk/gtklabel.c:567
-#: ../gtk/gtkmenuitem.c:328
-#: ../gtk/gtktoolbutton.c:201
-#: ../gtk/gtktoolitemgroup.c:1596
+#: ../gtk/gtkbutton.c:228
+#: ../gtk/gtkexpander.c:290
+#: ../gtk/gtkframe.c:171
+#: ../gtk/gtklabel.c:744
+#: ../gtk/gtkmenuitem.c:383
+#: ../gtk/gtktoolbutton.c:232
+#: ../gtk/gtktoolitemgroup.c:1592
 msgid "Label"
 msgstr "Label"
 
@@ -345,40 +345,40 @@ msgid "The stock icon displayed in widgets representing this action."
 msgstr "Ikon stok yang ditampilkan pada widget untuk melambangkan aksi ini."
 
 #: ../gtk/gtkaction.c:304
-#: ../gtk/gtkstatusicon.c:244
+#: ../gtk/gtkstatusicon.c:275
 msgid "GIcon"
 msgstr "GIcon"
 
 #: ../gtk/gtkaction.c:305
-#: ../gtk/gtkcellrendererpixbuf.c:215
-#: ../gtk/gtkimage.c:329
-#: ../gtk/gtkstatusicon.c:245
+#: ../gtk/gtkcellrendererpixbuf.c:235
+#: ../gtk/gtkimage.c:330
+#: ../gtk/gtkstatusicon.c:276
 msgid "The GIcon being displayed"
 msgstr "GIcon yang sedang ditampilkan"
 
 #: ../gtk/gtkaction.c:325
-#: ../gtk/gtkcellrendererpixbuf.c:180
-#: ../gtk/gtkimage.c:311
+#: ../gtk/gtkcellrendererpixbuf.c:200
+#: ../gtk/gtkimage.c:312
 #: ../gtk/gtkprinter.c:174
-#: ../gtk/gtkstatusicon.c:228
-#: ../gtk/gtkwindow.c:718
+#: ../gtk/gtkstatusicon.c:259
+#: ../gtk/gtkwindow.c:757
 msgid "Icon Name"
 msgstr "Icon Name"
 
 #: ../gtk/gtkaction.c:326
-#: ../gtk/gtkcellrendererpixbuf.c:181
-#: ../gtk/gtkimage.c:312
-#: ../gtk/gtkstatusicon.c:229
+#: ../gtk/gtkcellrendererpixbuf.c:201
+#: ../gtk/gtkimage.c:313
+#: ../gtk/gtkstatusicon.c:260
 msgid "The name of the icon from the icon theme"
 msgstr "Nama ikon dari tema ikon"
 
 #: ../gtk/gtkaction.c:333
-#: ../gtk/gtktoolitem.c:195
+#: ../gtk/gtktoolitem.c:194
 msgid "Visible when horizontal"
 msgstr "Nampak pada kondisi horisontal"
 
 #: ../gtk/gtkaction.c:334
-#: ../gtk/gtktoolitem.c:196
+#: ../gtk/gtktoolitem.c:195
 msgid "Whether the toolbar item is visible when the toolbar is in a horizontal orientation."
 msgstr "Menentukan apakah isi batang alat ditunjukkan pada saat batang alat dalam keadaan horisontal."
 
@@ -391,17 +391,17 @@ msgid "When TRUE, toolitem proxies for this action are represented in the toolba
 msgstr "Jika diisi TRUE, maka proksi tooltiem untuk aksi ini dilambangkan dalam menu overflow pada batang alat."
 
 #: ../gtk/gtkaction.c:357
-#: ../gtk/gtktoolitem.c:202
+#: ../gtk/gtktoolitem.c:201
 msgid "Visible when vertical"
 msgstr "Nampak dalam kondisi vertikal"
 
 #: ../gtk/gtkaction.c:358
-#: ../gtk/gtktoolitem.c:203
+#: ../gtk/gtktoolitem.c:202
 msgid "Whether the toolbar item is visible when the toolbar is in a vertical orientation."
 msgstr "Menentukan apakah isi batang alat ditunjukkan pada saat batang alat dalam keadaan vertikal."
 
 #: ../gtk/gtkaction.c:365
-#: ../gtk/gtktoolitem.c:209
+#: ../gtk/gtktoolitem.c:208
 msgid "Is important"
 msgstr "Penting?"
 
@@ -420,7 +420,7 @@ msgstr "Jika diisi TRUE, maka proksi menu yang kosong untuk aksi ini akan disemb
 #: ../gtk/gtkaction.c:381
 #: ../gtk/gtkactiongroup.c:235
 #: ../gtk/gtkcellrenderer.c:290
-#: ../gtk/gtkwidget.c:966
+#: ../gtk/gtkwidget.c:990
 msgid "Sensitive"
 msgstr "Sensitif"
 
@@ -430,9 +430,9 @@ msgstr "Menentukan apkaah aksi diaktifkan"
 
 #: ../gtk/gtkaction.c:388
 #: ../gtk/gtkactiongroup.c:242
-#: ../gtk/gtkstatusicon.c:279
-#: ../gtk/gtktreeviewcolumn.c:246
-#: ../gtk/gtkwidget.c:959
+#: ../gtk/gtkstatusicon.c:310
+#: ../gtk/gtktreeviewcolumn.c:248
+#: ../gtk/gtkwidget.c:983
 msgid "Visible"
 msgstr "Terlihat"
 
@@ -449,12 +449,12 @@ msgid "The GtkActionGroup this GtkAction is associated with, or NULL (for intern
 msgstr "GtkActionGroup yang digunakan pada GtkAction ini, atau isi saja NULL (untuk keperluan internal)."
 
 #: ../gtk/gtkaction.c:414
-#: ../gtk/gtkimagemenuitem.c:183
+#: ../gtk/gtkimagemenuitem.c:194
 msgid "Always show image"
 msgstr "Selalu tampilkan citra"
 
 #: ../gtk/gtkaction.c:415
-#: ../gtk/gtkimagemenuitem.c:184
+#: ../gtk/gtkimagemenuitem.c:195
 msgid "Whether the image will always be shown"
 msgstr "Apakah citra selalu ditampilkan atau tidak"
 
@@ -487,9 +487,9 @@ msgid "Whether to use the related actions appearance properties"
 msgstr "Apakah menggunakan properti penampilan aksi yang terkait"
 
 #: ../gtk/gtkadjustment.c:123
-#: ../gtk/gtkcellrendererprogress.c:126
-#: ../gtk/gtkscalebutton.c:217
-#: ../gtk/gtkspinbutton.c:381
+#: ../gtk/gtkcellrendererprogress.c:138
+#: ../gtk/gtkscalebutton.c:218
+#: ../gtk/gtkspinbutton.c:384
 msgid "Value"
 msgstr "Nilai"
 
@@ -542,7 +542,7 @@ msgid "Horizontal alignment"
 msgstr "Perataan horisontal"
 
 #: ../gtk/gtkalignment.c:138
-#: ../gtk/gtkbutton.c:278
+#: ../gtk/gtkbutton.c:279
 msgid "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is right aligned"
 msgstr "Posisi anak horisontal pada ruangan yang tersedia. 0.0 adalah penyesuaian kiri, 1.0 adalah penyesuaian kanan"
 
@@ -551,7 +551,7 @@ msgid "Vertical alignment"
 msgstr "Perataan vertikal"
 
 #: ../gtk/gtkalignment.c:148
-#: ../gtk/gtkbutton.c:297
+#: ../gtk/gtkbutton.c:298
 msgid "Vertical position of child in available space. 0.0 is top aligned, 1.0 is bottom aligned"
 msgstr "Posisi anak vertikal pada ruangan yang tersedia. 0.0 adalah penyesuaian atas, 1.0 adalah penyesuaian bawah"
 
@@ -603,124 +603,117 @@ msgstr "Isian Kanan"
 msgid "The padding to insert at the right of the widget."
 msgstr "Bidang yang diisikan pada bagian sebelah kanan widget."
 
-#: ../gtk/gtkappchooserbutton.c:551
+#: ../gtk/gtkappchooserbutton.c:555
 msgid "Include an 'Other...' item"
 msgstr "Sertakan butir 'Lainnya...'"
 
-#: ../gtk/gtkappchooserbutton.c:552
+#: ../gtk/gtkappchooserbutton.c:556
 msgid "Whether the combobox should include an item that triggers a GtkAppChooserDialog"
 msgstr "Apakah kotak kombo mesti menyertakan butir yang memicu suatu GtkAppChooserDialog"
 
-#: ../gtk/gtkappchooserbutton.c:564
-#: ../gtk/gtkappchooserdialog.c:714
+#: ../gtk/gtkappchooserbutton.c:568
+#: ../gtk/gtkappchooserdialog.c:722
 msgid "Heading"
 msgstr "Tajuk"
 
-#: ../gtk/gtkappchooserbutton.c:565
-#: ../gtk/gtkappchooserdialog.c:715
+#: ../gtk/gtkappchooserbutton.c:569
+#: ../gtk/gtkappchooserdialog.c:723
 msgid "The text to show at the top of the dialog"
 msgstr "Teks yang ditampilkan di bagian puncak dialog"
 
-#: ../gtk/gtkappchooser.c:58
+#: ../gtk/gtkappchooser.c:61
 msgid "Content type"
 msgstr "Jenis isi"
 
-#: ../gtk/gtkappchooser.c:59
+#: ../gtk/gtkappchooser.c:62
 msgid "The content type used by the open with object"
 msgstr "Jenis isi yang dipakai oleh membuka dengan objek"
 
-#: ../gtk/gtkappchooserdialog.c:700
+#: ../gtk/gtkappchooserdialog.c:708
 msgid "GFile"
 msgstr "GFile"
 
-#: ../gtk/gtkappchooserdialog.c:701
+#: ../gtk/gtkappchooserdialog.c:709
 msgid "The GFile used by the app chooser dialog"
 msgstr "GFile yang dipakai oleh dialog pemilih app"
 
-#: ../gtk/gtkappchooserwidget.c:1015
+#: ../gtk/gtkappchooserwidget.c:1016
 msgid "Show default app"
 msgstr "Tampilkan app bawaan"
 
-#: ../gtk/gtkappchooserwidget.c:1016
+#: ../gtk/gtkappchooserwidget.c:1017
 msgid "Whether the widget should show the default application"
 msgstr "Menentukan apakah widget mesti menampilkan aplikasi bawaan"
 
-#: ../gtk/gtkappchooserwidget.c:1029
+#: ../gtk/gtkappchooserwidget.c:1030
 msgid "Show recommended apps"
 msgstr "Tampilkan aplikasi yang disarankan"
 
-#: ../gtk/gtkappchooserwidget.c:1030
-#, fuzzy
+#: ../gtk/gtkappchooserwidget.c:1031
 msgid "Whether the widget should show recommended applications"
-msgstr "Apakah citra akan ditampilkan pada tombol"
+msgstr "Apalah widget perlu menampilkan aplikasi yang disarankan"
 
-#: ../gtk/gtkappchooserwidget.c:1043
+#: ../gtk/gtkappchooserwidget.c:1044
 msgid "Show fallback apps"
-msgstr ""
+msgstr "Tampilkan aplikasi cadangan"
 
-#: ../gtk/gtkappchooserwidget.c:1044
-#, fuzzy
+#: ../gtk/gtkappchooserwidget.c:1045
 msgid "Whether the widget should show fallback applications"
-msgstr "Apakah butir mesti mengisi ruang tersedia"
+msgstr "Apakah widget perlu menampilkan aplikasi cadangan"
 
-#: ../gtk/gtkappchooserwidget.c:1056
-#, fuzzy
+#: ../gtk/gtkappchooserwidget.c:1057
 msgid "Show other apps"
 msgstr "Tampilkan aplikasi lain"
 
-#: ../gtk/gtkappchooserwidget.c:1057
-#, fuzzy
+#: ../gtk/gtkappchooserwidget.c:1058
 msgid "Whether the widget should show other applications"
-msgstr "Menentukan apakah widget memiliki fokus input"
+msgstr "Apakah widget perlu menampilkan aplikasi lain"
 
-#: ../gtk/gtkappchooserwidget.c:1070
-#, fuzzy
+#: ../gtk/gtkappchooserwidget.c:1071
 msgid "Show all apps"
-msgstr "Tampilkan semua foto."
+msgstr "Tampilkan semua aplikasi"
 
-#: ../gtk/gtkappchooserwidget.c:1071
-#, fuzzy
+#: ../gtk/gtkappchooserwidget.c:1072
 msgid "Whether the widget should show all applications"
-msgstr "Apakah butir mesti mengisi ruang tersedia"
+msgstr "Apakah widget perlu menampilkan semua aplikasi"
 
-#: ../gtk/gtkappchooserwidget.c:1084
-#, fuzzy
+#: ../gtk/gtkappchooserwidget.c:1085
 msgid "Widget's default text"
-msgstr "Menentukan apakah widget adalah widget default"
+msgstr "Teks baku widget"
 
-#: ../gtk/gtkappchooserwidget.c:1085
+#: ../gtk/gtkappchooserwidget.c:1086
 msgid "The default text appearing when there are no applications"
-msgstr ""
+msgstr "Teks baku yang muncul ketika tak ada aplikasi"
 
-#: ../gtk/gtkarrow.c:110
+#: ../gtk/gtkarrow.c:112
 msgid "Arrow direction"
 msgstr "Arah panah"
 
-#: ../gtk/gtkarrow.c:111
+#: ../gtk/gtkarrow.c:113
 msgid "The direction the arrow should point"
 msgstr "Arah penunjukkan panah"
 
-#: ../gtk/gtkarrow.c:119
+#: ../gtk/gtkarrow.c:121
 msgid "Arrow shadow"
 msgstr "Bayangan panah"
 
-#: ../gtk/gtkarrow.c:120
+#: ../gtk/gtkarrow.c:122
 msgid "Appearance of the shadow surrounding the arrow"
 msgstr "Muncul tidaknya bayangan pada panah"
 
-#: ../gtk/gtkarrow.c:127
-#: ../gtk/gtkcombobox.c:985
-#: ../gtk/gtkmenu.c:796
-#: ../gtk/gtkmenuitem.c:391
+#: ../gtk/gtkarrow.c:129
+#: ../gtk/gtkcombobox.c:986
+#: ../gtk/gtkmenu.c:798
+#: ../gtk/gtkmenuitem.c:446
 msgid "Arrow Scaling"
 msgstr "Penskalaan Panah"
 
-#: ../gtk/gtkarrow.c:128
+#: ../gtk/gtkarrow.c:130
 msgid "Amount of space used up by arrow"
 msgstr "Banyaknya ruang yang dipakai oleh panah"
 
 #: ../gtk/gtkaspectframe.c:109
-#: ../gtk/gtkwidget.c:1154
+#: ../gtk/gtkwidget.c:1178
 msgid "Horizontal Alignment"
 msgstr "Perataan Horisontal"
 
@@ -729,7 +722,7 @@ msgid "X alignment of the child"
 msgstr "Penyesuaian letak X pada anak"
 
 #: ../gtk/gtkaspectframe.c:116
-#: ../gtk/gtkwidget.c:1170
+#: ../gtk/gtkwidget.c:1194
 msgid "Vertical Alignment"
 msgstr "Perataan Vertikal"
 
@@ -753,115 +746,125 @@ msgstr "Obey child"
 msgid "Force aspect ratio to match that of the frame's child"
 msgstr "Sesuaikan rasio aspek hingga dengan bingkai anak"
 
-#: ../gtk/gtkassistant.c:326
+#: ../gtk/gtkassistant.c:310
 msgid "Header Padding"
 msgstr "Ganjal Header"
 
-#: ../gtk/gtkassistant.c:327
+#: ../gtk/gtkassistant.c:311
 msgid "Number of pixels around the header."
 msgstr "Cacah piksel sekitar header."
 
-#: ../gtk/gtkassistant.c:334
+#: ../gtk/gtkassistant.c:318
 msgid "Content Padding"
 msgstr "Ganjal Isi"
 
-#: ../gtk/gtkassistant.c:335
+#: ../gtk/gtkassistant.c:319
 msgid "Number of pixels around the content pages."
 msgstr "Cacah piksel sekitar halaman isi."
 
-#: ../gtk/gtkassistant.c:351
+#: ../gtk/gtkassistant.c:335
 msgid "Page type"
 msgstr "Jenis halaman"
 
-#: ../gtk/gtkassistant.c:352
+#: ../gtk/gtkassistant.c:336
 msgid "The type of the assistant page"
 msgstr "Tipe halaman pembantu"
 
-#: ../gtk/gtkassistant.c:369
+#: ../gtk/gtkassistant.c:351
 msgid "Page title"
 msgstr "Judul halaman"
 
-#: ../gtk/gtkassistant.c:370
+#: ../gtk/gtkassistant.c:352
 msgid "The title of the assistant page"
 msgstr "Judul halaman pembantu"
 
-#: ../gtk/gtkassistant.c:386
+#: ../gtk/gtkassistant.c:369
 msgid "Header image"
 msgstr "aHeader Dapat Diklik"
 
-#: ../gtk/gtkassistant.c:387
+#: ../gtk/gtkassistant.c:370
 msgid "Header image for the assistant page"
 msgstr "Citra header bagi halaman pembantu"
 
-#: ../gtk/gtkassistant.c:403
+#: ../gtk/gtkassistant.c:386
 msgid "Sidebar image"
 msgstr "Citra batang sisi"
 
-#: ../gtk/gtkassistant.c:404
+#: ../gtk/gtkassistant.c:387
 msgid "Sidebar image for the assistant page"
 msgstr "Citra batang sisi bagi halaman pembantu"
 
-#: ../gtk/gtkassistant.c:419
+#: ../gtk/gtkassistant.c:403
 msgid "Page complete"
 msgstr "Halaman komplit"
 
-#: ../gtk/gtkassistant.c:420
+#: ../gtk/gtkassistant.c:404
 msgid "Whether all required fields on the page have been filled out"
 msgstr "Apakah semua ruas yang diperlukan pada halaman mesti diisi"
 
-#: ../gtk/gtkbbox.c:152
+#: ../gtk/gtkbbox.c:159
 msgid "Minimum child width"
 msgstr "Lebar anak minimum"
 
-#: ../gtk/gtkbbox.c:153
+#: ../gtk/gtkbbox.c:160
 msgid "Minimum width of buttons inside the box"
 msgstr "Lebar minimum tombol dalam kotak"
 
-#: ../gtk/gtkbbox.c:161
+#: ../gtk/gtkbbox.c:168
 msgid "Minimum child height"
 msgstr "Tinggi anak minimal"
 
-#: ../gtk/gtkbbox.c:162
+#: ../gtk/gtkbbox.c:169
 msgid "Minimum height of buttons inside the box"
 msgstr "Tinggi minimum tombol dalam kotak"
 
-#: ../gtk/gtkbbox.c:170
+#: ../gtk/gtkbbox.c:177
 msgid "Child internal width padding"
 msgstr "Lebar isian anak intern"
 
-#: ../gtk/gtkbbox.c:171
+#: ../gtk/gtkbbox.c:178
 msgid "Amount to increase child's size on either side"
 msgstr "Jumlah yang ditambahkan pada ukuran anak pada semua sisi"
 
-#: ../gtk/gtkbbox.c:179
+#: ../gtk/gtkbbox.c:186
 msgid "Child internal height padding"
 msgstr "Tinggi isian anak intern"
 
-#: ../gtk/gtkbbox.c:180
+#: ../gtk/gtkbbox.c:187
 msgid "Amount to increase child's size on the top and bottom"
 msgstr "Jumlah yang ditambahkan pada ukuran anak di atas dan di bawah"
 
-#: ../gtk/gtkbbox.c:188
+#: ../gtk/gtkbbox.c:195
 msgid "Layout style"
 msgstr "Gaya tata letak"
 
-#: ../gtk/gtkbbox.c:189
+#: ../gtk/gtkbbox.c:196
 msgid "How to lay out the buttons in the box. Possible values are: spread, edge, start and end"
 msgstr "Cara mengatur tata letak tombol dalam kotak. Nilai yang berlaku adalah: spread, edge, start, dan end"
 
-#: ../gtk/gtkbbox.c:197
+#: ../gtk/gtkbbox.c:204
 msgid "Secondary"
 msgstr "Sekunder"
 
-#: ../gtk/gtkbbox.c:198
+#: ../gtk/gtkbbox.c:205
 msgid "If TRUE, the child appears in a secondary group of children, suitable for, e.g., help buttons"
 msgstr "Bila diisi TRUE, anak akan muncul pada grup anak sekunder, ini cocok untuk tombol bantuan dsb"
 
+#: ../gtk/gtkbbox.c:212
+#| msgid "Homogeneous"
+msgid "Non-Homogeneous"
+msgstr "Non-Homogen"
+
+#: ../gtk/gtkbbox.c:213
+#| msgid "If TRUE, the child can be made smaller than its requisition"
+msgid "If TRUE, the child will not be subject to homogeneous sizing"
+msgstr "Bila bernilai TRUE, anak tidak harus mengikuti penentuan ukuran homogen"
+
 #: ../gtk/gtkbox.c:241
-#: ../gtk/gtkcellareabox.c:318
-#: ../gtk/gtkexpander.c:311
-#: ../gtk/gtkiconview.c:645
-#: ../gtk/gtktreeviewcolumn.c:271
+#: ../gtk/gtkcellareabox.c:317
+#: ../gtk/gtkexpander.c:314
+#: ../gtk/gtkiconview.c:643
+#: ../gtk/gtktreeviewcolumn.c:283
 msgid "Spacing"
 msgstr "Jarak"
 
@@ -870,9 +873,9 @@ msgid "The amount of space between children"
 msgstr "Jarak antar anak"
 
 #: ../gtk/gtkbox.c:251
-#: ../gtk/gtktable.c:193
-#: ../gtk/gtktoolbar.c:551
-#: ../gtk/gtktoolitemgroup.c:1649
+#: ../gtk/gtktable.c:227
+#: ../gtk/gtktoolbar.c:563
+#: ../gtk/gtktoolitemgroup.c:1645
 msgid "Homogeneous"
 msgstr "Homogen"
 
@@ -881,11 +884,11 @@ msgid "Whether the children should all be the same size"
 msgstr "Menentukan apakah semua anak memiliki ukuran yang sama atau tidak"
 
 #: ../gtk/gtkbox.c:272
-#: ../gtk/gtkcellareabox.c:338
-#: ../gtk/gtktoolbar.c:543
-#: ../gtk/gtktoolitemgroup.c:1656
-#: ../gtk/gtktoolpalette.c:1101
-#: ../gtk/gtktreeviewcolumn.c:327
+#: ../gtk/gtkcellareabox.c:337
+#: ../gtk/gtktoolbar.c:555
+#: ../gtk/gtktoolitemgroup.c:1652
+#: ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktreeviewcolumn.c:339
 msgid "Expand"
 msgstr "Ekspansi"
 
@@ -894,7 +897,7 @@ msgid "Whether the child should receive extra space when the parent grows"
 msgstr "Menentukan apakah anak bisa menambah ruang saat bapaknya bertambah besar"
 
 #: ../gtk/gtkbox.c:289
-#: ../gtk/gtktoolitemgroup.c:1663
+#: ../gtk/gtktoolitemgroup.c:1659
 msgid "Fill"
 msgstr "Isi"
 
@@ -903,7 +906,7 @@ msgid "Whether extra space given to the child should be allocated to the child o
 msgstr "Apakah anak bisa menerima ruangan tambahan atau untuk pengisi ruang kosong"
 
 #: ../gtk/gtkbox.c:297
-#: ../gtk/gtktrayicon-x11.c:166
+#: ../gtk/gtktrayicon-x11.c:169
 msgid "Padding"
 msgstr "Isian"
 
@@ -920,14 +923,14 @@ msgid "A GtkPackType indicating whether the child is packed with reference to th
 msgstr "Suatu nilai GtkPackType yang menentukan apakah anak dipak dengan merujuk pada awal atau akhir bapaknya"
 
 #: ../gtk/gtkbox.c:311
-#: ../gtk/gtknotebook.c:760
-#: ../gtk/gtkpaned.c:326
-#: ../gtk/gtktoolitemgroup.c:1677
+#: ../gtk/gtknotebook.c:769
+#: ../gtk/gtkpaned.c:349
+#: ../gtk/gtktoolitemgroup.c:1673
 msgid "Position"
 msgstr "Posisi"
 
 #: ../gtk/gtkbox.c:312
-#: ../gtk/gtknotebook.c:761
+#: ../gtk/gtknotebook.c:770
 msgid "The index of the child in the parent"
 msgstr "Indek anak dalam bapak"
 
@@ -939,342 +942,325 @@ msgstr "Domain Terjemahan"
 msgid "The translation domain used by gettext"
 msgstr "Domain penerjemahan yang dipakai oleh gettext"
 
-#: ../gtk/gtkbutton.c:228
+#: ../gtk/gtkbutton.c:229
 msgid "Text of the label widget inside the button, if the button contains a label widget"
 msgstr "Tulisan pada widget label dalam tombol, (jika tombol berisi widget label"
 
-#: ../gtk/gtkbutton.c:235
-#: ../gtk/gtkexpander.c:295
-#: ../gtk/gtklabel.c:588
-#: ../gtk/gtkmenuitem.c:343
-#: ../gtk/gtktoolbutton.c:208
+#: ../gtk/gtkbutton.c:236
+#: ../gtk/gtkexpander.c:298
+#: ../gtk/gtklabel.c:765
+#: ../gtk/gtkmenuitem.c:398
+#: ../gtk/gtktoolbutton.c:239
 msgid "Use underline"
 msgstr "Gunakan garis bawah"
 
-#: ../gtk/gtkbutton.c:236
-#: ../gtk/gtkexpander.c:296
-#: ../gtk/gtklabel.c:589
-#: ../gtk/gtkmenuitem.c:344
+#: ../gtk/gtkbutton.c:237
+#: ../gtk/gtkexpander.c:299
+#: ../gtk/gtklabel.c:766
+#: ../gtk/gtkmenuitem.c:399
 msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
 msgstr "Jika ini diisi maka ada garis bawah pada teks yang menunjukkan bahwa huruf tersebut berisi singkatan tombol jalan pintas"
 
-#: ../gtk/gtkbutton.c:243
-#: ../gtk/gtkimagemenuitem.c:164
+#: ../gtk/gtkbutton.c:244
+#: ../gtk/gtkimagemenuitem.c:175
 msgid "Use stock"
 msgstr "Gunakan stok"
 
-#: ../gtk/gtkbutton.c:244
+#: ../gtk/gtkbutton.c:245
 msgid "If set, the label is used to pick a stock item instead of being displayed"
 msgstr "Jika ini diisi, tulisan pada label akan dipilih dari item stok"
 
-#: ../gtk/gtkbutton.c:251
-#: ../gtk/gtkcombobox.c:791
-#: ../gtk/gtkfilechooserbutton.c:383
+#: ../gtk/gtkbutton.c:252
+#: ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkfilechooserbutton.c:426
 msgid "Focus on click"
 msgstr "Klik untuk membuat fokus"
 
-#: ../gtk/gtkbutton.c:252
-#: ../gtk/gtkfilechooserbutton.c:384
+#: ../gtk/gtkbutton.c:253
+#: ../gtk/gtkfilechooserbutton.c:427
 msgid "Whether the button grabs focus when it is clicked with the mouse"
 msgstr "Menentukan apakah tombol mendapatkan fokus pada saat diklik dengan mouse"
 
-#: ../gtk/gtkbutton.c:259
+#: ../gtk/gtkbutton.c:260
 msgid "Border relief"
 msgstr "Relief sisi"
 
-#: ../gtk/gtkbutton.c:260
+#: ../gtk/gtkbutton.c:261
 msgid "The border relief style"
 msgstr "Gaya relief pada sisi"
 
-#: ../gtk/gtkbutton.c:277
+#: ../gtk/gtkbutton.c:278
 msgid "Horizontal alignment for child"
 msgstr "Perataan horisontal untuk anak"
 
-#: ../gtk/gtkbutton.c:296
+#: ../gtk/gtkbutton.c:297
 msgid "Vertical alignment for child"
 msgstr "Perataan vertikal untuk anak"
 
-#: ../gtk/gtkbutton.c:313
-#: ../gtk/gtkimagemenuitem.c:149
+#: ../gtk/gtkbutton.c:314
+#: ../gtk/gtkimagemenuitem.c:160
 msgid "Image widget"
 msgstr "Widget gambar"
 
-#: ../gtk/gtkbutton.c:314
+#: ../gtk/gtkbutton.c:315
 msgid "Child widget to appear next to the button text"
 msgstr "Widget anak yang ditampilkan di samping tombol teks"
 
-#: ../gtk/gtkbutton.c:328
+#: ../gtk/gtkbutton.c:329
 msgid "Image position"
 msgstr "Posisi citra"
 
-#: ../gtk/gtkbutton.c:329
+#: ../gtk/gtkbutton.c:330
 msgid "The position of the image relative to the text"
 msgstr "Posisi citra relatif terhadap teks"
 
-#: ../gtk/gtkbutton.c:449
+#: ../gtk/gtkbutton.c:450
 msgid "Default Spacing"
 msgstr "Jarak default"
 
-#: ../gtk/gtkbutton.c:450
+#: ../gtk/gtkbutton.c:451
 msgid "Extra space to add for GTK_CAN_DEFAULT buttons"
 msgstr "Ruangan tambahan untuk tombol GTK_CAN_DEFAULT"
 
-#: ../gtk/gtkbutton.c:464
+#: ../gtk/gtkbutton.c:465
 msgid "Default Outside Spacing"
 msgstr "Jarak luar default"
 
-#: ../gtk/gtkbutton.c:465
+#: ../gtk/gtkbutton.c:466
 msgid "Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside the border"
 msgstr "Ruang tambahan untuk tombol GTK_CAN_DEFAULT yang selalu digambar di luar batas tombol"
 
-#: ../gtk/gtkbutton.c:470
+#: ../gtk/gtkbutton.c:471
 msgid "Child X Displacement"
 msgstr "Relokasi X Anak"
 
-#: ../gtk/gtkbutton.c:471
+#: ../gtk/gtkbutton.c:472
 msgid "How far in the x direction to move the child when the button is depressed"
 msgstr "Seberapa jauh arah x saat memindahkan anak pada saat tombol ditekan"
 
-#: ../gtk/gtkbutton.c:478
+#: ../gtk/gtkbutton.c:479
 msgid "Child Y Displacement"
 msgstr "Relokasi Y Anak"
 
-#: ../gtk/gtkbutton.c:479
+#: ../gtk/gtkbutton.c:480
 msgid "How far in the y direction to move the child when the button is depressed"
 msgstr "Seberapa jauh arah y saat memindahkan anak pada saat tombol ditekan"
 
-#: ../gtk/gtkbutton.c:495
+#: ../gtk/gtkbutton.c:496
 msgid "Displace focus"
 msgstr "Pindahkan fokus"
 
-#: ../gtk/gtkbutton.c:496
+#: ../gtk/gtkbutton.c:497
 msgid "Whether the child_displacement_x/_y properties should also affect the focus rectangle"
 msgstr "Menentukan apakah child_displacement_x/y_properties juga mempengaruhi fokus kotak"
 
-#: ../gtk/gtkbutton.c:509
-#: ../gtk/gtkentry.c:787
-#: ../gtk/gtkentry.c:1832
+#: ../gtk/gtkbutton.c:510
+#: ../gtk/gtkentry.c:794
+#: ../gtk/gtkentry.c:1869
 msgid "Inner Border"
 msgstr "Batas Dalam"
 
-#: ../gtk/gtkbutton.c:510
+#: ../gtk/gtkbutton.c:511
 msgid "Border between button edges and child."
 msgstr "Batas antara tepi tombol dan anak."
 
-#: ../gtk/gtkbutton.c:523
+#: ../gtk/gtkbutton.c:524
 msgid "Image spacing"
 msgstr "Jarak antar citra"
 
-#: ../gtk/gtkbutton.c:524
+#: ../gtk/gtkbutton.c:525
 msgid "Spacing in pixels between the image and label"
 msgstr "Ruang dalam piksel antar citra dan label"
 
-#: ../gtk/gtkcalendar.c:468
+#: ../gtk/gtkcalendar.c:470
 msgid "Year"
 msgstr "Tahun"
 
-#: ../gtk/gtkcalendar.c:469
+#: ../gtk/gtkcalendar.c:471
 msgid "The selected year"
 msgstr "Tahun yang dipilih"
 
-#: ../gtk/gtkcalendar.c:482
+#: ../gtk/gtkcalendar.c:484
 msgid "Month"
 msgstr "Bulan"
 
-#: ../gtk/gtkcalendar.c:483
+#: ../gtk/gtkcalendar.c:485
 msgid "The selected month (as a number between 0 and 11)"
 msgstr "Bulan yang dipilih (dalam angka mulai 0 hingga 11)"
 
-#: ../gtk/gtkcalendar.c:497
+#: ../gtk/gtkcalendar.c:499
 msgid "Day"
 msgstr "Hari"
 
-#: ../gtk/gtkcalendar.c:498
+#: ../gtk/gtkcalendar.c:500
 msgid "The selected day (as a number between 1 and 31, or 0 to unselect the currently selected day)"
 msgstr "Hari yang dipilih (dalam angka dari 1 hingga 31, atau 0 untuk membatalkan pilihan pada hari yang sudah dipilih)"
 
-#: ../gtk/gtkcalendar.c:512
+#: ../gtk/gtkcalendar.c:514
 msgid "Show Heading"
 msgstr "Tampilkan heading"
 
-#: ../gtk/gtkcalendar.c:513
+#: ../gtk/gtkcalendar.c:515
 msgid "If TRUE, a heading is displayed"
 msgstr "Bila bernilai TRUE, heading ditampilkan"
 
-#: ../gtk/gtkcalendar.c:527
+#: ../gtk/gtkcalendar.c:529
 msgid "Show Day Names"
 msgstr "Tampilkan nama-nama hari"
 
-#: ../gtk/gtkcalendar.c:528
+#: ../gtk/gtkcalendar.c:530
 msgid "If TRUE, day names are displayed"
 msgstr "Bila bernilai TRUE, nama-nama hari ditampilkan"
 
-#: ../gtk/gtkcalendar.c:541
+#: ../gtk/gtkcalendar.c:543
 msgid "No Month Change"
 msgstr "Bulan Tetap"
 
-#: ../gtk/gtkcalendar.c:542
+#: ../gtk/gtkcalendar.c:544
 msgid "If TRUE, the selected month cannot be changed"
 msgstr "Bila bernilai TRUE, bulan yang sudah dipilih tidak dapat diganti"
 
-#: ../gtk/gtkcalendar.c:556
+#: ../gtk/gtkcalendar.c:558
 msgid "Show Week Numbers"
 msgstr "Tampilkan angka minggu"
 
-#: ../gtk/gtkcalendar.c:557
+#: ../gtk/gtkcalendar.c:559
 msgid "If TRUE, week numbers are displayed"
 msgstr "Bila bernilai TRUE, angka minggu ditampilkan"
 
-#: ../gtk/gtkcalendar.c:572
+#: ../gtk/gtkcalendar.c:574
 msgid "Details Width"
 msgstr "Lebar Detail"
 
-#: ../gtk/gtkcalendar.c:573
+#: ../gtk/gtkcalendar.c:575
 msgid "Details width in characters"
 msgstr "Lebar rincian dalam karakter"
 
-#: ../gtk/gtkcalendar.c:588
+#: ../gtk/gtkcalendar.c:590
 msgid "Details Height"
 msgstr "Tinggi Detail"
 
-#: ../gtk/gtkcalendar.c:589
+#: ../gtk/gtkcalendar.c:591
 msgid "Details height in rows"
 msgstr "Tinggi rincian dalam baris"
 
-#: ../gtk/gtkcalendar.c:605
+#: ../gtk/gtkcalendar.c:607
 msgid "Show Details"
 msgstr "Tampilkan Detail"
 
-#: ../gtk/gtkcalendar.c:606
+#: ../gtk/gtkcalendar.c:608
 msgid "If TRUE, details are shown"
 msgstr "Bila bernilai TRUE, rincian ditampilkan"
 
-#: ../gtk/gtkcalendar.c:618
+#: ../gtk/gtkcalendar.c:620
 msgid "Inner border"
 msgstr "Bingkai dalam"
 
-#: ../gtk/gtkcalendar.c:619
+#: ../gtk/gtkcalendar.c:621
 msgid "Inner border space"
 msgstr "Jarak bingkai dalam"
 
-#: ../gtk/gtkcalendar.c:630
+#: ../gtk/gtkcalendar.c:632
 msgid "Vertical separation"
 msgstr "Pemisahan vertikal"
 
-#: ../gtk/gtkcalendar.c:631
+#: ../gtk/gtkcalendar.c:633
 msgid "Space between day headers and main area"
 msgstr "Jarak antara tajuk hari dan wilayah utama"
 
-#: ../gtk/gtkcalendar.c:642
+#: ../gtk/gtkcalendar.c:644
 msgid "Horizontal separation"
 msgstr "Pemisahan horisontal"
 
-#: ../gtk/gtkcalendar.c:643
+#: ../gtk/gtkcalendar.c:645
 msgid "Space between week headers and main area"
 msgstr "Jarak antara tajuk minggu dan wilayah utama"
 
-#: ../gtk/gtkcellareabox.c:319
-#: ../gtk/gtktreeviewcolumn.c:272
+#: ../gtk/gtkcellareabox.c:318
+#: ../gtk/gtktreeviewcolumn.c:284
 msgid "Space which is inserted between cells"
 msgstr "Ruangan yang disisipkan di antara sel"
 
-#: ../gtk/gtkcellareabox.c:339
-#, fuzzy
+#: ../gtk/gtkcellareabox.c:338
 msgid "Whether the cell expands"
-msgstr "Apakah menggunakan properti penampilan aksi yang terkait"
+msgstr "Apakah sel mengembang"
 
-#: ../gtk/gtkcellareabox.c:354
-#, fuzzy
+#: ../gtk/gtkcellareabox.c:353
 msgid "Align"
-msgstr "Rapikan"
+msgstr "Rataan"
 
-#: ../gtk/gtkcellareabox.c:355
-#, fuzzy
+#: ../gtk/gtkcellareabox.c:354
 msgid "Whether cell should align with adjacent rows"
-msgstr "Apakah butir mesti memulai suatu baris baru"
+msgstr "Apakah sel mesti rata dengan baris-baris sebelah"
 
-#: ../gtk/gtkcellareabox.c:371
-#, fuzzy
+#: ../gtk/gtkcellareabox.c:370
 msgid "Fixed Size"
-msgstr "Ukuran slider tetap"
+msgstr "Ukuran Tetap"
 
-#: ../gtk/gtkcellareabox.c:372
-#, fuzzy
+#: ../gtk/gtkcellareabox.c:371
 msgid "Whether cells should be the same size in all rows"
-msgstr "Menentukan apakah semua anak memiliki ukuran yang sama atau tidak"
+msgstr "Apakah semua sel mesti berukuran sama pada semua baris"
 
-#: ../gtk/gtkcellareabox.c:388
-#, fuzzy
+#: ../gtk/gtkcellareabox.c:387
 msgid "Pack Type"
 msgstr "Tipe Pak"
 
-#: ../gtk/gtkcellareabox.c:389
-#, fuzzy
+#: ../gtk/gtkcellareabox.c:388
 msgid "A GtkPackType indicating whether the cell is packed with reference to the start or end of the cell area"
-msgstr "Suatu nilai GtkPackType yang menentukan apakah anak dipak dengan merujuk pada awal atau akhir bapaknya"
+msgstr "Suatu nilai GtkPackType yang menunjukkan apakah sel dipak dengan rujukan ke awal atau akhir area sel"
 
 #: ../gtk/gtkcellarea.c:803
-#, fuzzy
 msgid "Focus Cell"
-msgstr "<b>Sel yang Dipilih</b>"
+msgstr "Sel Fokus"
 
 #: ../gtk/gtkcellarea.c:804
-#, fuzzy
 msgid "The cell which currently has focus"
-msgstr "Objek yang aktif"
+msgstr "Sel yang kini memiliki fokus"
 
 #: ../gtk/gtkcellarea.c:822
-#, fuzzy
 msgid "Edited Cell"
-msgstr "<b>Sel yang Dipilih</b>"
+msgstr "Sel yang Diedit"
 
 #: ../gtk/gtkcellarea.c:823
-#, fuzzy
 msgid "The cell which is currently being edited"
-msgstr "Objek yang aktif"
+msgstr "Sel yang sedang disunting"
 
 #: ../gtk/gtkcellarea.c:841
-#, fuzzy
 msgid "Edit Widget"
-msgstr "Pemilih widget"
+msgstr "Widget Penyunting"
 
 #: ../gtk/gtkcellarea.c:842
-#, fuzzy
 msgid "The widget currently editing the edited cell"
-msgstr "Halaman kini dalam dokumen"
+msgstr "Widget yang kini menyunting sel yang diedit"
 
-#: ../gtk/gtkcellareacontext.c:127
-#, fuzzy
+#: ../gtk/gtkcellareacontext.c:119
 msgid "Area"
 msgstr "Area"
 
-#: ../gtk/gtkcellareacontext.c:128
+#: ../gtk/gtkcellareacontext.c:120
 msgid "The Cell Area this context was created for"
-msgstr ""
+msgstr "Area Sel yang menjadi tujuan pembuatan konteks ini"
 
-#: ../gtk/gtkcellareacontext.c:144
-#: ../gtk/gtkcellareacontext.c:163
-#: ../gtk/gtktreeviewcolumn.c:299
+#: ../gtk/gtkcellareacontext.c:136
+#: ../gtk/gtkcellareacontext.c:155
+#: ../gtk/gtktreeviewcolumn.c:311
 msgid "Minimum Width"
 msgstr "Lebar Minimal"
 
-#: ../gtk/gtkcellareacontext.c:145
-#: ../gtk/gtkcellareacontext.c:164
-#, fuzzy
+#: ../gtk/gtkcellareacontext.c:137
+#: ../gtk/gtkcellareacontext.c:156
 msgid "Minimum cached width"
-msgstr "Lebar anak minimum"
+msgstr "Lebar tersinggah minimal"
 
-#: ../gtk/gtkcellareacontext.c:182
-#: ../gtk/gtkcellareacontext.c:201
-#, fuzzy
+#: ../gtk/gtkcellareacontext.c:174
+#: ../gtk/gtkcellareacontext.c:193
 msgid "Minimum Height"
-msgstr "Tinggi anak minimal"
+msgstr "Tinggi Minimal"
 
-#: ../gtk/gtkcellareacontext.c:183
-#: ../gtk/gtkcellareacontext.c:202
-#, fuzzy
+#: ../gtk/gtkcellareacontext.c:175
+#: ../gtk/gtkcellareacontext.c:194
 msgid "Minimum cached height"
-msgstr "Tinggi anak minimal"
+msgstr "Tinggi tersinggah minimal"
 
 #: ../gtk/gtkcelleditable.c:53
 msgid "Editing Canceled"
@@ -1284,35 +1270,35 @@ msgstr "Penyuntingan Dibatalkan"
 msgid "Indicates that editing has been canceled"
 msgstr "Menandakan bahwa penyuntingan telah dibatalkan"
 
-#: ../gtk/gtkcellrendereraccel.c:137
+#: ../gtk/gtkcellrendereraccel.c:152
 msgid "Accelerator key"
 msgstr "Tombol akselerator"
 
-#: ../gtk/gtkcellrendereraccel.c:138
+#: ../gtk/gtkcellrendereraccel.c:153
 msgid "The keyval of the accelerator"
 msgstr "Nilai kunci dari akselerator"
 
-#: ../gtk/gtkcellrendereraccel.c:154
+#: ../gtk/gtkcellrendereraccel.c:169
 msgid "Accelerator modifiers"
 msgstr "Pengait akselerator"
 
-#: ../gtk/gtkcellrendereraccel.c:155
+#: ../gtk/gtkcellrendereraccel.c:170
 msgid "The modifier mask of the accelerator"
 msgstr "Mask pengubah bagi akselerator"
 
-#: ../gtk/gtkcellrendereraccel.c:172
+#: ../gtk/gtkcellrendereraccel.c:187
 msgid "Accelerator keycode"
 msgstr "Kode tombol akselerator"
 
-#: ../gtk/gtkcellrendereraccel.c:173
+#: ../gtk/gtkcellrendereraccel.c:188
 msgid "The hardware keycode of the accelerator"
 msgstr "Kode kunci perangkat keras dari akselerator"
 
-#: ../gtk/gtkcellrendereraccel.c:192
+#: ../gtk/gtkcellrendereraccel.c:207
 msgid "Accelerator Mode"
 msgstr "Mode Akselerator"
 
-#: ../gtk/gtkcellrendereraccel.c:193
+#: ../gtk/gtkcellrendereraccel.c:208
 msgid "The type of accelerators"
 msgstr "Tipe akselerator"
 
@@ -1440,194 +1426,192 @@ msgstr "Set latar sel"
 msgid "Whether this tag affects the cell background color"
 msgstr "Apakah tag ini mempengaruhi warna latar sel atau tidak"
 
-#: ../gtk/gtkcellrenderercombo.c:109
+#: ../gtk/gtkcellrenderercombo.c:130
 msgid "Model"
 msgstr "Model"
 
-#: ../gtk/gtkcellrenderercombo.c:110
+#: ../gtk/gtkcellrenderercombo.c:131
 msgid "The model containing the possible values for the combo box"
 msgstr "Model berisi nilai yang mungkin untuk kotak combo"
 
-#: ../gtk/gtkcellrenderercombo.c:132
+#: ../gtk/gtkcellrenderercombo.c:153
 msgid "Text Column"
 msgstr "Kolom Teks"
 
-#: ../gtk/gtkcellrenderercombo.c:133
+#: ../gtk/gtkcellrenderercombo.c:154
 msgid "A column in the data source model to get the strings from"
 msgstr "Kolom pada model sumber data asal untuk mengambil kalimat"
 
-#: ../gtk/gtkcellrenderercombo.c:150
-#: ../gtk/gtkcombobox.c:858
+#: ../gtk/gtkcellrenderercombo.c:171
+#: ../gtk/gtkcombobox.c:859
 msgid "Has Entry"
 msgstr "Ada Isinya"
 
-#: ../gtk/gtkcellrenderercombo.c:151
+#: ../gtk/gtkcellrenderercombo.c:172
 msgid "If FALSE, don't allow to enter strings other than the chosen ones"
 msgstr "Jika diisi FALSE, maka jangan bolehkan untuk memasukkan kalimat selain yang sudah dipilih"
 
-#: ../gtk/gtkcellrendererpixbuf.c:120
+#: ../gtk/gtkcellrendererpixbuf.c:140
 msgid "Pixbuf Object"
 msgstr "Obyek Pixbuf"
 
-#: ../gtk/gtkcellrendererpixbuf.c:121
+#: ../gtk/gtkcellrendererpixbuf.c:141
 msgid "The pixbuf to render"
 msgstr "Pixbuf yang hendak dirender"
 
-#: ../gtk/gtkcellrendererpixbuf.c:128
+#: ../gtk/gtkcellrendererpixbuf.c:148
 msgid "Pixbuf Expander Open"
 msgstr "Ekspander Pixbuf buka"
 
-#: ../gtk/gtkcellrendererpixbuf.c:129
+#: ../gtk/gtkcellrendererpixbuf.c:149
 msgid "Pixbuf for open expander"
 msgstr "Pixbuf untuk ekspander terbuka"
 
-#: ../gtk/gtkcellrendererpixbuf.c:136
+#: ../gtk/gtkcellrendererpixbuf.c:156
 msgid "Pixbuf Expander Closed"
 msgstr "Ekspander Pixbuf Tutup"
 
-#: ../gtk/gtkcellrendererpixbuf.c:137
+#: ../gtk/gtkcellrendererpixbuf.c:157
 msgid "Pixbuf for closed expander"
 msgstr "Pixbuf untuk ekspander tertutup"
 
-#: ../gtk/gtkcellrendererpixbuf.c:144
-#: ../gtk/gtkimage.c:253
-#: ../gtk/gtkstatusicon.c:220
+#: ../gtk/gtkcellrendererpixbuf.c:164
+#: ../gtk/gtkimage.c:254
+#: ../gtk/gtkstatusicon.c:251
 msgid "Stock ID"
 msgstr "ID stok"
 
-#: ../gtk/gtkcellrendererpixbuf.c:145
+#: ../gtk/gtkcellrendererpixbuf.c:165
 msgid "The stock ID of the stock icon to render"
 msgstr "ID stok pada ikon yang hendak digambar"
 
-#: ../gtk/gtkcellrendererpixbuf.c:152
+#: ../gtk/gtkcellrendererpixbuf.c:172
 #: ../gtk/gtkcellrendererspinner.c:151
 #: ../gtk/gtkrecentmanager.c:309
-#: ../gtk/gtkstatusicon.c:261
+#: ../gtk/gtkstatusicon.c:292
 msgid "Size"
 msgstr "Ukuran"
 
-#: ../gtk/gtkcellrendererpixbuf.c:153
+#: ../gtk/gtkcellrendererpixbuf.c:173
 msgid "The GtkIconSize value that specifies the size of the rendered icon"
 msgstr "Nilai GtkIconSize yang menentukan ukuran dari icon yang digambarkan"
 
-#: ../gtk/gtkcellrendererpixbuf.c:162
+#: ../gtk/gtkcellrendererpixbuf.c:182
 msgid "Detail"
 msgstr "Detail"
 
-#: ../gtk/gtkcellrendererpixbuf.c:163
+#: ../gtk/gtkcellrendererpixbuf.c:183
 msgid "Render detail to pass to the theme engine"
 msgstr "Detil render yang diberikan pada mesin tematik"
 
-#: ../gtk/gtkcellrendererpixbuf.c:196
+#: ../gtk/gtkcellrendererpixbuf.c:216
 msgid "Follow State"
 msgstr "Ikuti Status"
 
-#: ../gtk/gtkcellrendererpixbuf.c:197
+#: ../gtk/gtkcellrendererpixbuf.c:217
 msgid "Whether the rendered pixbuf should be colorized according to the state"
 msgstr "Menentukan apakah pixbuf yang telah digambar harus diwarnai menurut yang telah ditentukan"
 
-#: ../gtk/gtkcellrendererpixbuf.c:214
-#: ../gtk/gtkimage.c:328
-#: ../gtk/gtkwindow.c:695
+#: ../gtk/gtkcellrendererpixbuf.c:234
+#: ../gtk/gtkimage.c:329
+#: ../gtk/gtkwindow.c:703
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../gtk/gtkcellrendererprogress.c:127
+#: ../gtk/gtkcellrendererprogress.c:139
 msgid "Value of the progress bar"
 msgstr "Nilai dari batang proses"
 
-#: ../gtk/gtkcellrendererprogress.c:144
-#: ../gtk/gtkcellrenderertext.c:255
-#: ../gtk/gtkentry.c:830
+#: ../gtk/gtkcellrendererprogress.c:156
+#: ../gtk/gtkcellrenderertext.c:254
 #: ../gtk/gtkentrybuffer.c:352
-#: ../gtk/gtkmessagedialog.c:227
-#: ../gtk/gtkprogressbar.c:177
-#: ../gtk/gtktextbuffer.c:210
+#: ../gtk/gtkentry.c:837
+#: ../gtk/gtkmessagedialog.c:229
+#: ../gtk/gtkprogressbar.c:176
+#: ../gtk/gtktextbuffer.c:221
 msgid "Text"
 msgstr "Teks"
 
-#: ../gtk/gtkcellrendererprogress.c:145
+#: ../gtk/gtkcellrendererprogress.c:157
 msgid "Text on the progress bar"
 msgstr "Teks yang ditampilkan pada batang proses"
 
-#: ../gtk/gtkcellrendererprogress.c:168
+#: ../gtk/gtkcellrendererprogress.c:180
 #: ../gtk/gtkcellrendererspinner.c:137
 msgid "Pulse"
 msgstr "Pulsa"
 
-#: ../gtk/gtkcellrendererprogress.c:169
+#: ../gtk/gtkcellrendererprogress.c:181
 msgid "Set this to positive values to indicate that some progress is made, but you don't know how much."
 msgstr "Isi dengan nilai positif untuk mengindikasikan telah dicapai suatu kemajuan, tapi Anda tak tahu seberapa banyak."
 
-#: ../gtk/gtkcellrendererprogress.c:185
+#: ../gtk/gtkcellrendererprogress.c:197
 msgid "Text x alignment"
 msgstr "Perataan x"
 
-#: ../gtk/gtkcellrendererprogress.c:186
+#: ../gtk/gtkcellrendererprogress.c:198
 msgid "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."
 msgstr "Perataan teks horisontal, bernilai 0 (kiri) hingga 1 (kanan). Nilainya dibalik untuk tata letak dari kanan-ke-kiri (RTL)."
 
-#: ../gtk/gtkcellrendererprogress.c:202
+#: ../gtk/gtkcellrendererprogress.c:214
 msgid "Text y alignment"
 msgstr "Perataan y"
 
-#: ../gtk/gtkcellrendererprogress.c:203
+#: ../gtk/gtkcellrendererprogress.c:215
 msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
 msgstr "Perataan teks vertikal, bernilai 0 (atas) hingga 1 (bawah)."
 
-#: ../gtk/gtkcellrendererprogress.c:214
-#: ../gtk/gtkprogressbar.c:153
-#: ../gtk/gtkrange.c:424
+#: ../gtk/gtkcellrendererprogress.c:226
+#: ../gtk/gtkprogressbar.c:152
+#: ../gtk/gtkrange.c:426
 msgid "Inverted"
-msgstr "Terbalik"
+msgstr "Dibalik"
 
-#: ../gtk/gtkcellrendererprogress.c:215
-#: ../gtk/gtkprogressbar.c:154
-#, fuzzy
+#: ../gtk/gtkcellrendererprogress.c:227
+#: ../gtk/gtkprogressbar.c:153
 msgid "Invert the direction in which the progress bar grows"
-msgstr "Orientasi dan arah laju progress bar"
+msgstr "Balikkan arah berkembangnya bilah kemajuan"
 
-#: ../gtk/gtkcellrendererspin.c:91
-#: ../gtk/gtkrange.c:416
-#: ../gtk/gtkscalebutton.c:236
-#: ../gtk/gtkspinbutton.c:320
+#: ../gtk/gtkcellrendererspin.c:113
+#: ../gtk/gtkrange.c:418
+#: ../gtk/gtkscalebutton.c:237
+#: ../gtk/gtkspinbutton.c:323
 msgid "Adjustment"
 msgstr "Penyesuaian"
 
-#: ../gtk/gtkcellrendererspin.c:92
-#: ../gtk/gtkspinbutton.c:321
-#, fuzzy
+#: ../gtk/gtkcellrendererspin.c:114
+#: ../gtk/gtkspinbutton.c:324
 msgid "The adjustment that holds the value of the spin button"
-msgstr "Penyesuaian yang menyimpan nilai spinbutton"
+msgstr "Penyesuaian yang menyimpan nilai tombol spin"
 
-#: ../gtk/gtkcellrendererspin.c:107
+#: ../gtk/gtkcellrendererspin.c:129
 msgid "Climb rate"
 msgstr "Laju pendakian"
 
-#: ../gtk/gtkcellrendererspin.c:108
-#: ../gtk/gtkspinbutton.c:329
+#: ../gtk/gtkcellrendererspin.c:130
+#: ../gtk/gtkspinbutton.c:332
 msgid "The acceleration rate when you hold down a button"
 msgstr "Laju percepatan saat sebuah tombol ditekan"
 
-#: ../gtk/gtkcellrendererspin.c:121
-#: ../gtk/gtkscale.c:252
-#: ../gtk/gtkspinbutton.c:338
+#: ../gtk/gtkcellrendererspin.c:143
+#: ../gtk/gtkscale.c:254
+#: ../gtk/gtkspinbutton.c:341
 msgid "Digits"
 msgstr "Digit"
 
-#: ../gtk/gtkcellrendererspin.c:122
-#: ../gtk/gtkspinbutton.c:339
+#: ../gtk/gtkcellrendererspin.c:144
+#: ../gtk/gtkspinbutton.c:342
 msgid "The number of decimal places to display"
 msgstr "Jumlah tempat desimal yang ditampilkan"
 
 #: ../gtk/gtkcellrendererspinner.c:119
-#: ../gtk/gtkcheckmenuitem.c:106
-#: ../gtk/gtkmenu.c:586
-#: ../gtk/gtkspinner.c:118
-#: ../gtk/gtkswitch.c:778
+#: ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkmenu.c:588
+#: ../gtk/gtkspinner.c:115
+#: ../gtk/gtkswitch.c:783
 #: ../gtk/gtktoggleaction.c:133
-#: ../gtk/gtktogglebutton.c:125
-#: ../gtk/gtktoggletoolbutton.c:112
+#: ../gtk/gtktogglebutton.c:178
+#: ../gtk/gtktoggletoolbutton.c:127
 msgid "Active"
 msgstr "Aktif"
 
@@ -1643,573 +1627,569 @@ msgstr "Pulsa spinner"
 msgid "The GtkIconSize value that specifies the size of the rendered spinner"
 msgstr "Nilai GtkIconSize yang menyatakan ukuran spinner yang dirender"
 
-#: ../gtk/gtkcellrenderertext.c:256
+#: ../gtk/gtkcellrenderertext.c:255
 msgid "Text to render"
 msgstr "Teks yang hendak ditulis"
 
-#: ../gtk/gtkcellrenderertext.c:263
+#: ../gtk/gtkcellrenderertext.c:262
 msgid "Markup"
 msgstr "Markup"
 
-#: ../gtk/gtkcellrenderertext.c:264
+#: ../gtk/gtkcellrenderertext.c:263
 msgid "Marked up text to render"
 msgstr "Teks bermarka yang hendak ditulis"
 
-#: ../gtk/gtkcellrenderertext.c:271
-#: ../gtk/gtklabel.c:574
+#: ../gtk/gtkcellrenderertext.c:270
+#: ../gtk/gtklabel.c:751
 msgid "Attributes"
 msgstr "Atribut"
 
-#: ../gtk/gtkcellrenderertext.c:272
+#: ../gtk/gtkcellrenderertext.c:271
 msgid "A list of style attributes to apply to the text of the renderer"
 msgstr "Daftar gaya atribut yang diberikan pada penggambar teks"
 
-#: ../gtk/gtkcellrenderertext.c:279
+#: ../gtk/gtkcellrenderertext.c:278
 msgid "Single Paragraph Mode"
 msgstr "Moda Paragraf Tunggal"
 
-#: ../gtk/gtkcellrenderertext.c:280
-#, fuzzy
+#: ../gtk/gtkcellrenderertext.c:279
 msgid "Whether to keep all text in a single paragraph"
-msgstr "Menentukan apakah semua teks dimasukkan dalam satu paragraf saja"
+msgstr "Apakah semua teks dimasukkan dalam satu paragraf saja"
 
-#: ../gtk/gtkcellrenderertext.c:288
-#: ../gtk/gtkcellview.c:189
-#: ../gtk/gtktexttag.c:196
+#: ../gtk/gtkcellrenderertext.c:287
+#: ../gtk/gtkcellview.c:191
+#: ../gtk/gtktexttag.c:199
 msgid "Background color name"
-msgstr "Nama warna latar"
+msgstr "Nama warna latar belakang"
 
-#: ../gtk/gtkcellrenderertext.c:289
-#: ../gtk/gtkcellview.c:190
-#: ../gtk/gtktexttag.c:197
+#: ../gtk/gtkcellrenderertext.c:288
+#: ../gtk/gtkcellview.c:192
+#: ../gtk/gtktexttag.c:200
 msgid "Background color as a string"
-msgstr "Nama warna latar dalam string"
+msgstr "Warna latar belakang dalam string"
 
-#: ../gtk/gtkcellrenderertext.c:296
-#: ../gtk/gtkcellview.c:196
-#: ../gtk/gtktexttag.c:204
+#: ../gtk/gtkcellrenderertext.c:295
+#: ../gtk/gtkcellview.c:198
+#: ../gtk/gtktexttag.c:207
 msgid "Background color"
 msgstr "Warna latar belakang"
 
-#: ../gtk/gtkcellrenderertext.c:297
-#: ../gtk/gtkcellview.c:197
+#: ../gtk/gtkcellrenderertext.c:296
+#: ../gtk/gtkcellview.c:199
+#: ../gtk/gtktexttag.c:208
 msgid "Background color as a GdkColor"
 msgstr "Warna latar belakang dalam format GdkColor"
 
-#: ../gtk/gtkcellrenderertext.c:311
+#: ../gtk/gtkcellrenderertext.c:310
 msgid "Background color as RGBA"
-msgstr "Warna latar dalam RGBA"
+msgstr "Warna latar belakang dalam RGBA"
 
-#: ../gtk/gtkcellrenderertext.c:312
-#: ../gtk/gtkcellview.c:211
+#: ../gtk/gtkcellrenderertext.c:311
+#: ../gtk/gtkcellview.c:213
+#: ../gtk/gtktexttag.c:223
 msgid "Background color as a GdkRGBA"
-msgstr "Warna latar dalam GdkRGBA"
+msgstr "Warna latar belakang dalam GdkRGBA"
 
-#: ../gtk/gtkcellrenderertext.c:318
-#: ../gtk/gtktexttag.c:220
+#: ../gtk/gtkcellrenderertext.c:317
+#: ../gtk/gtktexttag.c:238
 msgid "Foreground color name"
 msgstr "Nama warna latar depan"
 
-#: ../gtk/gtkcellrenderertext.c:319
-#: ../gtk/gtktexttag.c:221
+#: ../gtk/gtkcellrenderertext.c:318
+#: ../gtk/gtktexttag.c:239
 msgid "Foreground color as a string"
-msgstr "Warna latar depan dalam kata-kata"
+msgstr "Warna latar depan dalam string"
 
-#: ../gtk/gtkcellrenderertext.c:326
-#: ../gtk/gtktexttag.c:228
-#: ../gtk/gtktrayicon-x11.c:134
+#: ../gtk/gtkcellrenderertext.c:325
+#: ../gtk/gtktexttag.c:246
+#: ../gtk/gtktrayicon-x11.c:137
 msgid "Foreground color"
 msgstr "Warna latar depan"
 
-#: ../gtk/gtkcellrenderertext.c:327
+#: ../gtk/gtkcellrenderertext.c:326
+#: ../gtk/gtktexttag.c:247
 msgid "Foreground color as a GdkColor"
 msgstr "Warna latar depan dalam GdkColor"
 
-#: ../gtk/gtkcellrenderertext.c:341
-#, fuzzy
+#: ../gtk/gtkcellrenderertext.c:340
 msgid "Foreground color as RGBA"
-msgstr "Warna latar dalam RGBA"
+msgstr "Warna latar depan dalam RGBA"
 
-#: ../gtk/gtkcellrenderertext.c:342
-#, fuzzy
+#: ../gtk/gtkcellrenderertext.c:341
+#: ../gtk/gtktexttag.c:262
 msgid "Foreground color as a GdkRGBA"
-msgstr "Warna latar dalam GdkRGBA"
+msgstr "Warna latar depan dalam GdkRGBA"
 
-#: ../gtk/gtkcellrenderertext.c:350
-#: ../gtk/gtkentry.c:754
-#: ../gtk/gtktexttag.c:245
-#: ../gtk/gtktextview.c:684
+#: ../gtk/gtkcellrenderertext.c:349
+#: ../gtk/gtkentry.c:761
+#: ../gtk/gtktexttag.c:278
+#: ../gtk/gtktextview.c:686
 msgid "Editable"
 msgstr "Dapat disunting"
 
-#: ../gtk/gtkcellrenderertext.c:351
-#: ../gtk/gtktexttag.c:246
-#: ../gtk/gtktextview.c:685
+#: ../gtk/gtkcellrenderertext.c:350
+#: ../gtk/gtktexttag.c:279
+#: ../gtk/gtktextview.c:687
 msgid "Whether the text can be modified by the user"
 msgstr "Menentukan apakah teks bisa diganti-ganti oleh user"
 
-#: ../gtk/gtkcellrenderertext.c:358
-#: ../gtk/gtkcellrenderertext.c:366
-#: ../gtk/gtktexttag.c:261
-#: ../gtk/gtktexttag.c:269
+#: ../gtk/gtkcellrenderertext.c:357
+#: ../gtk/gtkcellrenderertext.c:365
+#: ../gtk/gtktexttag.c:294
+#: ../gtk/gtktexttag.c:302
 msgid "Font"
 msgstr "Fonta"
 
-#: ../gtk/gtkcellrenderertext.c:359
-#: ../gtk/gtktexttag.c:262
+#: ../gtk/gtkcellrenderertext.c:358
+#: ../gtk/gtktexttag.c:295
 msgid "Font description as a string, e.g. \"Sans Italic 12\""
 msgstr "Deskripsi font dalam string, misal \"Sans Italic 12\""
 
-#: ../gtk/gtkcellrenderertext.c:367
-#: ../gtk/gtktexttag.c:270
+#: ../gtk/gtkcellrenderertext.c:366
+#: ../gtk/gtktexttag.c:303
 msgid "Font description as a PangoFontDescription struct"
 msgstr "Deskripsi fonta dalam bentuk struktur PangoFontDescription"
 
-#: ../gtk/gtkcellrenderertext.c:375
-#: ../gtk/gtktexttag.c:277
+#: ../gtk/gtkcellrenderertext.c:374
+#: ../gtk/gtktexttag.c:310
 msgid "Font family"
 msgstr "Keluarga fonta"
 
-#: ../gtk/gtkcellrenderertext.c:376
-#: ../gtk/gtktexttag.c:278
+#: ../gtk/gtkcellrenderertext.c:375
+#: ../gtk/gtktexttag.c:311
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "Nama keluarga fonta, misalnya Sans, Helvetica, Times, Monospace"
 
+#: ../gtk/gtkcellrenderertext.c:382
 #: ../gtk/gtkcellrenderertext.c:383
-#: ../gtk/gtkcellrenderertext.c:384
-#: ../gtk/gtktexttag.c:285
+#: ../gtk/gtktexttag.c:318
 msgid "Font style"
 msgstr "Gaya fonta"
 
+#: ../gtk/gtkcellrenderertext.c:391
 #: ../gtk/gtkcellrenderertext.c:392
-#: ../gtk/gtkcellrenderertext.c:393
-#: ../gtk/gtktexttag.c:294
+#: ../gtk/gtktexttag.c:327
 msgid "Font variant"
 msgstr "Varian fonta"
 
+#: ../gtk/gtkcellrenderertext.c:400
 #: ../gtk/gtkcellrenderertext.c:401
-#: ../gtk/gtkcellrenderertext.c:402
-#: ../gtk/gtktexttag.c:303
+#: ../gtk/gtktexttag.c:336
 msgid "Font weight"
 msgstr "Tebal fonta"
 
+#: ../gtk/gtkcellrenderertext.c:410
 #: ../gtk/gtkcellrenderertext.c:411
-#: ../gtk/gtkcellrenderertext.c:412
-#: ../gtk/gtktexttag.c:314
+#: ../gtk/gtktexttag.c:347
 msgid "Font stretch"
 msgstr "Renggangan fonta"
 
+#: ../gtk/gtkcellrenderertext.c:419
 #: ../gtk/gtkcellrenderertext.c:420
-#: ../gtk/gtkcellrenderertext.c:421
-#: ../gtk/gtktexttag.c:323
+#: ../gtk/gtktexttag.c:356
 msgid "Font size"
 msgstr "Ukuran fonta"
 
-#: ../gtk/gtkcellrenderertext.c:430
-#: ../gtk/gtktexttag.c:343
+#: ../gtk/gtkcellrenderertext.c:429
+#: ../gtk/gtktexttag.c:376
 msgid "Font points"
 msgstr "Poin fonta"
 
-#: ../gtk/gtkcellrenderertext.c:431
-#: ../gtk/gtktexttag.c:344
+#: ../gtk/gtkcellrenderertext.c:430
+#: ../gtk/gtktexttag.c:377
 msgid "Font size in points"
 msgstr "Ukuran fonta dalam poin"
 
-#: ../gtk/gtkcellrenderertext.c:440
-#: ../gtk/gtktexttag.c:333
+#: ../gtk/gtkcellrenderertext.c:439
+#: ../gtk/gtktexttag.c:366
 msgid "Font scale"
 msgstr "Skala fonta"
 
-#: ../gtk/gtkcellrenderertext.c:441
+#: ../gtk/gtkcellrenderertext.c:440
 msgid "Font scaling factor"
 msgstr "Faktor skala fonta"
 
-#: ../gtk/gtkcellrenderertext.c:450
-#: ../gtk/gtktexttag.c:412
+#: ../gtk/gtkcellrenderertext.c:449
+#: ../gtk/gtktexttag.c:445
 msgid "Rise"
 msgstr "Angkat"
 
-#: ../gtk/gtkcellrenderertext.c:451
+#: ../gtk/gtkcellrenderertext.c:450
 msgid "Offset of text above the baseline (below the baseline if rise is negative)"
 msgstr "Jarak dari garis batas bawah font (bila dibawah garis, maka nilai bernilai negatif)"
 
-#: ../gtk/gtkcellrenderertext.c:462
-#: ../gtk/gtktexttag.c:452
+#: ../gtk/gtkcellrenderertext.c:461
+#: ../gtk/gtktexttag.c:485
 msgid "Strikethrough"
 msgstr "Dicoret"
 
-#: ../gtk/gtkcellrenderertext.c:463
-#: ../gtk/gtktexttag.c:453
+#: ../gtk/gtkcellrenderertext.c:462
+#: ../gtk/gtktexttag.c:486
 msgid "Whether to strike through the text"
 msgstr "Menentukan apakah teks disertai coretan"
 
-#: ../gtk/gtkcellrenderertext.c:470
-#: ../gtk/gtktexttag.c:460
+#: ../gtk/gtkcellrenderertext.c:469
+#: ../gtk/gtktexttag.c:493
 msgid "Underline"
 msgstr "Garis bawah"
 
-#: ../gtk/gtkcellrenderertext.c:471
-#: ../gtk/gtktexttag.c:461
+#: ../gtk/gtkcellrenderertext.c:470
+#: ../gtk/gtktexttag.c:494
 msgid "Style of underline for this text"
 msgstr "Beri garis bawah pada teks"
 
-#: ../gtk/gtkcellrenderertext.c:479
-#: ../gtk/gtktexttag.c:372
+#: ../gtk/gtkcellrenderertext.c:478
+#: ../gtk/gtktexttag.c:405
 msgid "Language"
 msgstr "Bahasa"
 
-#: ../gtk/gtkcellrenderertext.c:480
+#: ../gtk/gtkcellrenderertext.c:479
 msgid "The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If you don't understand this parameter, you probably don't need it"
 msgstr "Kode bahasa tulisan dalam teks dalam kode ISO. Pango menggunakan kode ini sebagai petunjuk dalam menggambar tulisan itu. Jika Anda tidak mengerti parameter ini, berarti Anda tidak memerlukannya."
 
-#: ../gtk/gtkcellrenderertext.c:500
-#: ../gtk/gtklabel.c:699
-#: ../gtk/gtkprogressbar.c:217
+#: ../gtk/gtkcellrenderertext.c:499
+#: ../gtk/gtklabel.c:876
+#: ../gtk/gtkprogressbar.c:220
 msgid "Ellipsize"
 msgstr "Elipsis"
 
-#: ../gtk/gtkcellrenderertext.c:501
+#: ../gtk/gtkcellrenderertext.c:500
 msgid "The preferred place to ellipsize the string, if the cell renderer does not have enough room to display the entire string"
 msgstr "Tempat yang disukai untuk menyingkat string, bila perender sel tak punya cukup ruang untuk menampilkan seluruh string"
 
-#: ../gtk/gtkcellrenderertext.c:520
-#: ../gtk/gtkfilechooserbutton.c:411
-#: ../gtk/gtklabel.c:720
+#: ../gtk/gtkcellrenderertext.c:519
+#: ../gtk/gtkfilechooserbutton.c:454
+#: ../gtk/gtklabel.c:897
 msgid "Width In Characters"
 msgstr "Lebar dalam karakter"
 
-#: ../gtk/gtkcellrenderertext.c:521
-#: ../gtk/gtklabel.c:721
+#: ../gtk/gtkcellrenderertext.c:520
+#: ../gtk/gtklabel.c:898
 msgid "The desired width of the label, in characters"
 msgstr "Lebar label yang diinginkan dalam karakter"
 
-#: ../gtk/gtkcellrenderertext.c:545
-#: ../gtk/gtklabel.c:781
+#: ../gtk/gtkcellrenderertext.c:544
+#: ../gtk/gtklabel.c:958
 msgid "Maximum Width In Characters"
 msgstr "Lebar Maksimum Dalam Karakter"
 
-#: ../gtk/gtkcellrenderertext.c:546
+#: ../gtk/gtkcellrenderertext.c:545
 msgid "The maximum width of the cell, in characters"
 msgstr "Lebar maksimum sel, dalam karakter"
 
-#: ../gtk/gtkcellrenderertext.c:564
-#: ../gtk/gtktexttag.c:469
+#: ../gtk/gtkcellrenderertext.c:563
+#: ../gtk/gtktexttag.c:502
 msgid "Wrap mode"
 msgstr "Mode potong"
 
-#: ../gtk/gtkcellrenderertext.c:565
+#: ../gtk/gtkcellrenderertext.c:564
 msgid "How to break the string into multiple lines, if the cell renderer does not have enough room to display the entire string"
 msgstr "Cara memecah kalimat dalam baris-baris pada saat kotak sel tidak memiliki cukup ruang untuk menampilkan keseluruhan teks"
 
-#: ../gtk/gtkcellrenderertext.c:584
-#: ../gtk/gtkcombobox.c:680
+#: ../gtk/gtkcellrenderertext.c:583
+#: ../gtk/gtkcombobox.c:681
 msgid "Wrap width"
 msgstr "Lebar pembengkokan"
 
-#: ../gtk/gtkcellrenderertext.c:585
+#: ../gtk/gtkcellrenderertext.c:584
 msgid "The width at which the text is wrapped"
 msgstr "Lebar di mana teks akan dipotong"
 
-#: ../gtk/gtkcellrenderertext.c:605
-#: ../gtk/gtktreeviewcolumn.c:352
+#: ../gtk/gtkcellrenderertext.c:604
+#: ../gtk/gtktreeviewcolumn.c:364
 msgid "Alignment"
 msgstr "Penyesuaian"
 
-#: ../gtk/gtkcellrenderertext.c:606
+#: ../gtk/gtkcellrenderertext.c:605
 msgid "How to align the lines"
 msgstr "Bagaimana meratakan garis"
 
-#: ../gtk/gtkcellrenderertext.c:618
-#: ../gtk/gtkcellview.c:315
-#: ../gtk/gtktexttag.c:558
+#: ../gtk/gtkcellrenderertext.c:617
+#: ../gtk/gtkcellview.c:317
+#: ../gtk/gtktexttag.c:605
 msgid "Background set"
 msgstr "Set latar belakang"
 
-#: ../gtk/gtkcellrenderertext.c:619
-#: ../gtk/gtkcellview.c:316
-#: ../gtk/gtktexttag.c:559
+#: ../gtk/gtkcellrenderertext.c:618
+#: ../gtk/gtkcellview.c:318
+#: ../gtk/gtktexttag.c:606
 msgid "Whether this tag affects the background color"
 msgstr "Tentukan apakah tag ini berpengaruh pada warna latar belakang"
 
-#: ../gtk/gtkcellrenderertext.c:622
-#: ../gtk/gtktexttag.c:566
+#: ../gtk/gtkcellrenderertext.c:621
+#: ../gtk/gtktexttag.c:613
 msgid "Foreground set"
 msgstr "Set Latar depan"
 
-#: ../gtk/gtkcellrenderertext.c:623
-#: ../gtk/gtktexttag.c:567
+#: ../gtk/gtkcellrenderertext.c:622
+#: ../gtk/gtktexttag.c:614
 msgid "Whether this tag affects the foreground color"
 msgstr "Tentukan apakah tag ini berpengaruh pada warna latar depan"
 
-#: ../gtk/gtkcellrenderertext.c:626
-#: ../gtk/gtktexttag.c:570
+#: ../gtk/gtkcellrenderertext.c:625
+#: ../gtk/gtktexttag.c:617
 msgid "Editability set"
 msgstr "Set Editability"
 
-#: ../gtk/gtkcellrenderertext.c:627
-#: ../gtk/gtktexttag.c:571
+#: ../gtk/gtkcellrenderertext.c:626
+#: ../gtk/gtktexttag.c:618
 msgid "Whether this tag affects text editability"
 msgstr "Tentukan apakah tag ini berpengarun pada bisa diedit atau tidaknya sebuah teks"
 
-#: ../gtk/gtkcellrenderertext.c:630
-#: ../gtk/gtktexttag.c:574
+#: ../gtk/gtkcellrenderertext.c:629
+#: ../gtk/gtktexttag.c:621
 msgid "Font family set"
 msgstr "Set keluarga fonta"
 
-#: ../gtk/gtkcellrenderertext.c:631
-#: ../gtk/gtktexttag.c:575
+#: ../gtk/gtkcellrenderertext.c:630
+#: ../gtk/gtktexttag.c:622
 msgid "Whether this tag affects the font family"
 msgstr "Menentukan apakah tag ini berpengaruh pada keluarga fonta"
 
-#: ../gtk/gtkcellrenderertext.c:634
-#: ../gtk/gtktexttag.c:578
+#: ../gtk/gtkcellrenderertext.c:633
+#: ../gtk/gtktexttag.c:625
 msgid "Font style set"
 msgstr "Set gaya fonta"
 
-#: ../gtk/gtkcellrenderertext.c:635
-#: ../gtk/gtktexttag.c:579
+#: ../gtk/gtkcellrenderertext.c:634
+#: ../gtk/gtktexttag.c:626
 msgid "Whether this tag affects the font style"
 msgstr "Menentukan apakah tag berpengaruh pada gaya fonta"
 
-#: ../gtk/gtkcellrenderertext.c:638
-#: ../gtk/gtktexttag.c:582
+#: ../gtk/gtkcellrenderertext.c:637
+#: ../gtk/gtktexttag.c:629
 msgid "Font variant set"
 msgstr "Set varian fonta"
 
-#: ../gtk/gtkcellrenderertext.c:639
-#: ../gtk/gtktexttag.c:583
+#: ../gtk/gtkcellrenderertext.c:638
+#: ../gtk/gtktexttag.c:630
 msgid "Whether this tag affects the font variant"
 msgstr "Menentukan apakah tag berpegaruh pada jenis fonta"
 
-#: ../gtk/gtkcellrenderertext.c:642
-#: ../gtk/gtktexttag.c:586
+#: ../gtk/gtkcellrenderertext.c:641
+#: ../gtk/gtktexttag.c:633
 msgid "Font weight set"
 msgstr "Set tebal fonta"
 
-#: ../gtk/gtkcellrenderertext.c:643
-#: ../gtk/gtktexttag.c:587
+#: ../gtk/gtkcellrenderertext.c:642
+#: ../gtk/gtktexttag.c:634
 msgid "Whether this tag affects the font weight"
 msgstr "Menentukan apakah tag berpengaruh pada bobot fonta"
 
-#: ../gtk/gtkcellrenderertext.c:646
-#: ../gtk/gtktexttag.c:590
+#: ../gtk/gtkcellrenderertext.c:645
+#: ../gtk/gtktexttag.c:637
 msgid "Font stretch set"
 msgstr "Set renggangan fonta"
 
-#: ../gtk/gtkcellrenderertext.c:647
-#: ../gtk/gtktexttag.c:591
+#: ../gtk/gtkcellrenderertext.c:646
+#: ../gtk/gtktexttag.c:638
 msgid "Whether this tag affects the font stretch"
 msgstr "Menentukan apakah tag berpengaruh pada stretch fonta"
 
-#: ../gtk/gtkcellrenderertext.c:650
-#: ../gtk/gtktexttag.c:594
+#: ../gtk/gtkcellrenderertext.c:649
+#: ../gtk/gtktexttag.c:641
 msgid "Font size set"
 msgstr "Set ukuran fonta"
 
-#: ../gtk/gtkcellrenderertext.c:651
-#: ../gtk/gtktexttag.c:595
+#: ../gtk/gtkcellrenderertext.c:650
+#: ../gtk/gtktexttag.c:642
 msgid "Whether this tag affects the font size"
 msgstr "Menentukan apakah tag berpengaruh pada ukuran fonta"
 
-#: ../gtk/gtkcellrenderertext.c:654
-#: ../gtk/gtktexttag.c:598
+#: ../gtk/gtkcellrenderertext.c:653
+#: ../gtk/gtktexttag.c:645
 msgid "Font scale set"
 msgstr "Set skala fonta"
 
-#: ../gtk/gtkcellrenderertext.c:655
-#: ../gtk/gtktexttag.c:599
+#: ../gtk/gtkcellrenderertext.c:654
+#: ../gtk/gtktexttag.c:646
 msgid "Whether this tag scales the font size by a factor"
 msgstr "Menentukan apakah tag ini diskalakan dengan faktor"
 
-#: ../gtk/gtkcellrenderertext.c:658
-#: ../gtk/gtktexttag.c:618
+#: ../gtk/gtkcellrenderertext.c:657
+#: ../gtk/gtktexttag.c:665
 msgid "Rise set"
 msgstr "Set angkat"
 
-#: ../gtk/gtkcellrenderertext.c:659
-#: ../gtk/gtktexttag.c:619
+#: ../gtk/gtkcellrenderertext.c:658
+#: ../gtk/gtktexttag.c:666
 msgid "Whether this tag affects the rise"
 msgstr "Menentukan apakah tag berpengaruh pada nilai angkatan"
 
-#: ../gtk/gtkcellrenderertext.c:662
-#: ../gtk/gtktexttag.c:634
+#: ../gtk/gtkcellrenderertext.c:661
+#: ../gtk/gtktexttag.c:681
 msgid "Strikethrough set"
 msgstr "Set coretan"
 
-#: ../gtk/gtkcellrenderertext.c:663
-#: ../gtk/gtktexttag.c:635
+#: ../gtk/gtkcellrenderertext.c:662
+#: ../gtk/gtktexttag.c:682
 msgid "Whether this tag affects strikethrough"
 msgstr "Menentukan apakah tag berpengaruh pada coretan"
 
-#: ../gtk/gtkcellrenderertext.c:666
-#: ../gtk/gtktexttag.c:642
+#: ../gtk/gtkcellrenderertext.c:665
+#: ../gtk/gtktexttag.c:689
 msgid "Underline set"
 msgstr "Garis bawah"
 
-#: ../gtk/gtkcellrenderertext.c:667
-#: ../gtk/gtktexttag.c:643
+#: ../gtk/gtkcellrenderertext.c:666
+#: ../gtk/gtktexttag.c:690
 msgid "Whether this tag affects underlining"
 msgstr "Menentukan apakah tag berpengaruh pada garis bawah"
 
-#: ../gtk/gtkcellrenderertext.c:670
-#: ../gtk/gtktexttag.c:606
+#: ../gtk/gtkcellrenderertext.c:669
+#: ../gtk/gtktexttag.c:653
 msgid "Language set"
 msgstr "Set Bahasa"
 
-#: ../gtk/gtkcellrenderertext.c:671
-#: ../gtk/gtktexttag.c:607
+#: ../gtk/gtkcellrenderertext.c:670
+#: ../gtk/gtktexttag.c:654
 msgid "Whether this tag affects the language the text is rendered as"
 msgstr "Menentukan apakah tag mempengaruhi bahasa teks yang digambar"
 
-#: ../gtk/gtkcellrenderertext.c:674
+#: ../gtk/gtkcellrenderertext.c:673
 msgid "Ellipsize set"
 msgstr "Setingan Ellips"
 
-#: ../gtk/gtkcellrenderertext.c:675
+#: ../gtk/gtkcellrenderertext.c:674
 msgid "Whether this tag affects the ellipsize mode"
 msgstr "Menentukan apakah tag berpengaruh pada mode ellips"
 
-#: ../gtk/gtkcellrenderertext.c:678
+#: ../gtk/gtkcellrenderertext.c:677
 msgid "Align set"
 msgstr "Set perataan"
 
-#: ../gtk/gtkcellrenderertext.c:679
+#: ../gtk/gtkcellrenderertext.c:678
 msgid "Whether this tag affects the alignment mode"
 msgstr "Menentukan apakah tag berpengaruh pada mode perataan"
 
-#: ../gtk/gtkcellrenderertoggle.c:128
+#: ../gtk/gtkcellrenderertoggle.c:140
 msgid "Toggle state"
 msgstr "Status togel"
 
-#: ../gtk/gtkcellrenderertoggle.c:129
+#: ../gtk/gtkcellrenderertoggle.c:141
 msgid "The toggle state of the button"
 msgstr "Status togel tombol"
 
-#: ../gtk/gtkcellrenderertoggle.c:136
+#: ../gtk/gtkcellrenderertoggle.c:148
 msgid "Inconsistent state"
 msgstr "Kondisi tidak konsisten"
 
-#: ../gtk/gtkcellrenderertoggle.c:137
+#: ../gtk/gtkcellrenderertoggle.c:149
 msgid "The inconsistent state of the button"
 msgstr "Kondisi tombol tidak konsisten"
 
-#: ../gtk/gtkcellrenderertoggle.c:144
+#: ../gtk/gtkcellrenderertoggle.c:156
 msgid "Activatable"
 msgstr "Dapat diaktifkan"
 
-#: ../gtk/gtkcellrenderertoggle.c:145
+#: ../gtk/gtkcellrenderertoggle.c:157
 msgid "The toggle button can be activated"
 msgstr "Tombol togel dapat diaktifkan"
 
-#: ../gtk/gtkcellrenderertoggle.c:152
+#: ../gtk/gtkcellrenderertoggle.c:164
 msgid "Radio state"
 msgstr "Kondisi radio"
 
-#: ../gtk/gtkcellrenderertoggle.c:153
+#: ../gtk/gtkcellrenderertoggle.c:165
 msgid "Draw the toggle button as a radio button"
 msgstr "Menggambar tombol togel sebagai tombol radio"
 
-#: ../gtk/gtkcellrenderertoggle.c:160
+#: ../gtk/gtkcellrenderertoggle.c:172
 msgid "Indicator size"
 msgstr "Ukuran indikator"
 
-#: ../gtk/gtkcellrenderertoggle.c:161
-#: ../gtk/gtkcheckbutton.c:78
-#: ../gtk/gtkcheckmenuitem.c:130
+#: ../gtk/gtkcellrenderertoggle.c:173
+#: ../gtk/gtkcheckbutton.c:95
+#: ../gtk/gtkcheckmenuitem.c:146
 msgid "Size of check or radio indicator"
 msgstr "Ukuran indikator cek atau radio"
 
-#: ../gtk/gtkcellview.c:210
-#, fuzzy
+#: ../gtk/gtkcellview.c:212
 msgid "Background RGBA color"
-msgstr "Warna RGBA latar sel"
+msgstr "Warna RGBA latar belakang"
 
-#: ../gtk/gtkcellview.c:225
+#: ../gtk/gtkcellview.c:227
 msgid "CellView model"
 msgstr "Model CellView"
 
-#: ../gtk/gtkcellview.c:226
+#: ../gtk/gtkcellview.c:228
 msgid "The model for cell view"
 msgstr "Model tampilan sel"
 
-#: ../gtk/gtkcellview.c:244
-#: ../gtk/gtkcombobox.c:944
+#: ../gtk/gtkcellview.c:246
+#: ../gtk/gtkcombobox.c:945
 #: ../gtk/gtkentrycompletion.c:448
-#: ../gtk/gtkiconview.c:770
+#: ../gtk/gtkiconview.c:768
 #: ../gtk/gtktreemenu.c:329
-#: ../gtk/gtktreeviewcolumn.c:415
-#, fuzzy
+#: ../gtk/gtktreeviewcolumn.c:427
 msgid "Cell Area"
-msgstr "area gambar"
+msgstr "Area Sel"
 
-#: ../gtk/gtkcellview.c:245
-#: ../gtk/gtkcombobox.c:945
+#: ../gtk/gtkcellview.c:247
+#: ../gtk/gtkcombobox.c:946
 #: ../gtk/gtkentrycompletion.c:449
-#: ../gtk/gtkiconview.c:771
+#: ../gtk/gtkiconview.c:769
 #: ../gtk/gtktreemenu.c:330
-#: ../gtk/gtktreeviewcolumn.c:416
+#: ../gtk/gtktreeviewcolumn.c:428
 msgid "The GtkCellArea used to layout cells"
-msgstr ""
+msgstr "GtkCellArea yang dipakai untuk mengatur tata letak sel"
 
-#: ../gtk/gtkcellview.c:268
+#: ../gtk/gtkcellview.c:270
 msgid "Cell Area Context"
-msgstr ""
+msgstr "Konteks Area Sel"
 
-#: ../gtk/gtkcellview.c:269
+#: ../gtk/gtkcellview.c:271
 msgid "The GtkCellAreaContext used to compute the geometry of the cell view"
-msgstr ""
+msgstr "GtkCellAreaContext yang dipakai untuk menghitung geometri dari tilikan sel"
 
-#: ../gtk/gtkcellview.c:286
-#, fuzzy
+#: ../gtk/gtkcellview.c:288
 msgid "Draw Sensitive"
-msgstr "Sesuai Bes_ar/Kecil Huruf"
+msgstr "Gambar Sensitif"
 
-#: ../gtk/gtkcellview.c:287
-#, fuzzy
+#: ../gtk/gtkcellview.c:289
 msgid "Whether to force cells to be drawn in a sensitive state"
-msgstr "Apakah baris pohon mesti digambar pada tilikan bentuk pohon"
+msgstr "Apakah memaksa sel digambar dalam keadaan sensitif"
 
-#: ../gtk/gtkcellview.c:305
-#, fuzzy
+#: ../gtk/gtkcellview.c:307
 msgid "Fit Model"
-msgstr "<b>Model Bahasa</b>"
+msgstr "Pas Model"
 
-#: ../gtk/gtkcellview.c:306
+#: ../gtk/gtkcellview.c:308
 msgid "Whether to request enough space for every row in the model"
-msgstr ""
+msgstr "Apakah meminta cukup ruang untuk setiap baris dalam model"
 
-#: ../gtk/gtkcheckbutton.c:77
-#: ../gtk/gtkcheckmenuitem.c:129
+#: ../gtk/gtkcheckbutton.c:94
+#: ../gtk/gtkcheckmenuitem.c:145
 msgid "Indicator Size"
-msgstr "Ukuran indikator"
+msgstr "Ukuran Indikator"
 
-#: ../gtk/gtkcheckbutton.c:85
-#: ../gtk/gtkexpander.c:345
+#: ../gtk/gtkcheckbutton.c:102
+#: ../gtk/gtkexpander.c:364
 msgid "Indicator Spacing"
 msgstr "Jarak Indikator"
 
-#: ../gtk/gtkcheckbutton.c:86
+#: ../gtk/gtkcheckbutton.c:103
 msgid "Spacing around check or radio indicator"
 msgstr "Jarak antara indikator cek atau radio"
 
-#: ../gtk/gtkcheckmenuitem.c:107
+#: ../gtk/gtkcheckmenuitem.c:123
 msgid "Whether the menu item is checked"
 msgstr "Apakah menu item sedang dipilih atau tidak"
 
-#: ../gtk/gtkcheckmenuitem.c:114
-#: ../gtk/gtktogglebutton.c:133
+#: ../gtk/gtkcheckmenuitem.c:130
+#: ../gtk/gtktogglebutton.c:186
 msgid "Inconsistent"
 msgstr "Tidak konsisten"
 
-#: ../gtk/gtkcheckmenuitem.c:115
+#: ../gtk/gtkcheckmenuitem.c:131
 msgid "Whether to display an \"inconsistent\" state"
 msgstr "Menentukan apakah menampilkan kondisi 'tidak konsisten' atau tidak"
 
-#: ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkcheckmenuitem.c:138
 msgid "Draw as radio menu item"
 msgstr "Gambar sebagai isian menu radio"
 
-#: ../gtk/gtkcheckmenuitem.c:123
+#: ../gtk/gtkcheckmenuitem.c:139
 msgid "Whether the menu item looks like a radio menu item"
 msgstr "Apakah menu objek kelihatan seperti menu objek radio"
 
@@ -2218,16 +2198,15 @@ msgid "Use alpha"
 msgstr "Gunakan alfa"
 
 #: ../gtk/gtkcolorbutton.c:171
-#, fuzzy
 msgid "Whether to give the color an alpha value"
-msgstr "Menentukan apakah memberikan warna dengan nilai alpha"
+msgstr "Apakah memberi warna suatu nilai alfa"
 
 #: ../gtk/gtkcolorbutton.c:185
-#: ../gtk/gtkfilechooserbutton.c:397
-#: ../gtk/gtkfontbutton.c:140
+#: ../gtk/gtkfilechooserbutton.c:440
+#: ../gtk/gtkfontbutton.c:150
 #: ../gtk/gtkprintjob.c:141
-#: ../gtk/gtkstatusicon.c:407
-#: ../gtk/gtktreeviewcolumn.c:319
+#: ../gtk/gtkstatusicon.c:438
+#: ../gtk/gtktreeviewcolumn.c:331
 msgid "Title"
 msgstr "Judul"
 
@@ -2236,7 +2215,7 @@ msgid "The title of the color selection dialog"
 msgstr "Judul dialog pemilih warna"
 
 #: ../gtk/gtkcolorbutton.c:200
-#: ../gtk/gtkcolorsel.c:338
+#: ../gtk/gtkcolorsel.c:336
 msgid "Current Color"
 msgstr "Warna saat ini"
 
@@ -2245,7 +2224,7 @@ msgid "The selected color"
 msgstr "Warna yang dipilih"
 
 #: ../gtk/gtkcolorbutton.c:215
-#: ../gtk/gtkcolorsel.c:345
+#: ../gtk/gtkcolorsel.c:343
 msgid "Current Alpha"
 msgstr "Alpha saat ini"
 
@@ -2254,652 +2233,656 @@ msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr "Nilai opasitas terpilih (0 transparan penuh, 65535 tidak transparan)"
 
 #: ../gtk/gtkcolorbutton.c:230
-#, fuzzy
 msgid "Current RGBA Color"
-msgstr "Warna RGBA latar sel"
+msgstr "Warna RGBA Kini"
 
 #: ../gtk/gtkcolorbutton.c:231
-#, fuzzy
 msgid "The selected RGBA color"
-msgstr "Warna dari sambungan terpilih"
+msgstr "Warna RGBA yang dipilih"
 
-#: ../gtk/gtkcolorsel.c:324
+#: ../gtk/gtkcolorsel.c:322
 msgid "Has Opacity Control"
 msgstr "Memiliki Kontrol Opasitas"
 
-#: ../gtk/gtkcolorsel.c:325
+#: ../gtk/gtkcolorsel.c:323
 msgid "Whether the color selector should allow setting opacity"
 msgstr "Menentukan apakah pemilih warna memiliki seting opasitas atau tidak"
 
-#: ../gtk/gtkcolorsel.c:331
+#: ../gtk/gtkcolorsel.c:329
 msgid "Has palette"
 msgstr "Memiliki palet"
 
-#: ../gtk/gtkcolorsel.c:332
+#: ../gtk/gtkcolorsel.c:330
 msgid "Whether a palette should be used"
 msgstr "Menentukan apakah palet digunakan atau tidak"
 
-#: ../gtk/gtkcolorsel.c:339
+#: ../gtk/gtkcolorsel.c:337
 msgid "The current color"
 msgstr "Warna saat ini"
 
-#: ../gtk/gtkcolorsel.c:346
+#: ../gtk/gtkcolorsel.c:344
 msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr "Nilai opasitas saat ini (0 transparan, 65535 tidak transparan)"
 
-#: ../gtk/gtkcolorsel.c:360
-#, fuzzy
+#: ../gtk/gtkcolorsel.c:358
 msgid "Current RGBA"
-msgstr "Xft RGBA"
+msgstr "RGBA kini"
 
-#: ../gtk/gtkcolorsel.c:361
-#, fuzzy
+#: ../gtk/gtkcolorsel.c:359
 msgid "The current RGBA color"
-msgstr "Warna RGBA latar sel"
+msgstr "Warna RGBA kini"
 
-#: ../gtk/gtkcolorseldialog.c:110
+#: ../gtk/gtkcolorseldialog.c:136
 msgid "Color Selection"
 msgstr "Pemilihan Warna"
 
-#: ../gtk/gtkcolorseldialog.c:111
+#: ../gtk/gtkcolorseldialog.c:137
 msgid "The color selection embedded in the dialog."
 msgstr "Pilihan warna yang ditempelkan di dialog."
 
-#: ../gtk/gtkcolorseldialog.c:117
+#: ../gtk/gtkcolorseldialog.c:143
 msgid "OK Button"
 msgstr "Tombol Oke"
 
-#: ../gtk/gtkcolorseldialog.c:118
+#: ../gtk/gtkcolorseldialog.c:144
 msgid "The OK button of the dialog."
 msgstr "Tombol Oke pada dialog."
 
-#: ../gtk/gtkcolorseldialog.c:124
+#: ../gtk/gtkcolorseldialog.c:150
 msgid "Cancel Button"
 msgstr "Tombol Batal"
 
-#: ../gtk/gtkcolorseldialog.c:125
+#: ../gtk/gtkcolorseldialog.c:151
 msgid "The cancel button of the dialog."
 msgstr "Tombol batal dari dialog."
 
-#: ../gtk/gtkcolorseldialog.c:131
+#: ../gtk/gtkcolorseldialog.c:157
 msgid "Help Button"
 msgstr "Tombol Bantuan"
 
-#: ../gtk/gtkcolorseldialog.c:132
+#: ../gtk/gtkcolorseldialog.c:158
 msgid "The help button of the dialog."
 msgstr "Tombol bantuan dari dialog."
 
-#: ../gtk/gtkcombobox.c:663
+#: ../gtk/gtkcombobox.c:664
 msgid "ComboBox model"
 msgstr "Model ComboBox"
 
-#: ../gtk/gtkcombobox.c:664
+#: ../gtk/gtkcombobox.c:665
 msgid "The model for the combo box"
 msgstr "Model kotak combo"
 
-#: ../gtk/gtkcombobox.c:681
+#: ../gtk/gtkcombobox.c:682
 msgid "Wrap width for laying out the items in a grid"
 msgstr "Lebar lipatan untuk menata letak butir dalam kisi"
 
-#: ../gtk/gtkcombobox.c:703
+#: ../gtk/gtkcombobox.c:704
 #: ../gtk/gtktreemenu.c:383
 msgid "Row span column"
 msgstr "Jarak antar baris"
 
-#: ../gtk/gtkcombobox.c:704
+#: ../gtk/gtkcombobox.c:705
 #: ../gtk/gtktreemenu.c:384
 msgid "TreeModel column containing the row span values"
 msgstr "Kolom TreeModel berisi nilai row span"
 
-#: ../gtk/gtkcombobox.c:725
+#: ../gtk/gtkcombobox.c:726
 #: ../gtk/gtktreemenu.c:404
 msgid "Column span column"
 msgstr "Jarak antar kolom"
 
-#: ../gtk/gtkcombobox.c:726
+#: ../gtk/gtkcombobox.c:727
 #: ../gtk/gtktreemenu.c:405
 msgid "TreeModel column containing the column span values"
 msgstr "Kolom TreeModel berisi nilai column span"
 
-#: ../gtk/gtkcombobox.c:747
+#: ../gtk/gtkcombobox.c:748
 msgid "Active item"
 msgstr "Objek aktif"
 
-#: ../gtk/gtkcombobox.c:748
+#: ../gtk/gtkcombobox.c:749
 msgid "The item which is currently active"
 msgstr "Objek yang aktif"
 
-#: ../gtk/gtkcombobox.c:767
-#: ../gtk/gtkuimanager.c:225
+#: ../gtk/gtkcombobox.c:768
+#: ../gtk/gtkuimanager.c:479
 msgid "Add tearoffs to menus"
 msgstr "Tambahkan penyobek pada menu"
 
-#: ../gtk/gtkcombobox.c:768
+#: ../gtk/gtkcombobox.c:769
 msgid "Whether dropdowns should have a tearoff menu item"
 msgstr "Apakah dropdown harus memiliki sebuah objek menu tearoff"
 
-#: ../gtk/gtkcombobox.c:783
-#: ../gtk/gtkentry.c:779
+#: ../gtk/gtkcombobox.c:784
+#: ../gtk/gtkentry.c:786
 msgid "Has Frame"
 msgstr "Ada bingkai atau tidak"
 
-#: ../gtk/gtkcombobox.c:784
+#: ../gtk/gtkcombobox.c:785
 msgid "Whether the combo box draws a frame around the child"
 msgstr "Menentukan apakah kotak combo mengambarkan suatu bingkai di sekitar anak"
 
-#: ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkcombobox.c:793
 msgid "Whether the combo box grabs focus when it is clicked with the mouse"
 msgstr "Menentukan apakah kotak combo memfokuskan ketika diklik dengan mouse"
 
-#: ../gtk/gtkcombobox.c:807
-#: ../gtk/gtkmenu.c:641
+#: ../gtk/gtkcombobox.c:808
+#: ../gtk/gtkmenu.c:643
 msgid "Tearoff Title"
 msgstr "Judul saat disobek"
 
-#: ../gtk/gtkcombobox.c:808
+#: ../gtk/gtkcombobox.c:809
 msgid "A title that may be displayed by the window manager when the popup is torn-off"
 msgstr "Judul yang mungkin ditampilkan oleh manajer jendela ketika popup dilepas"
 
-#: ../gtk/gtkcombobox.c:825
+#: ../gtk/gtkcombobox.c:826
 msgid "Popup shown"
 msgstr "Popup ditampilkan"
 
-#: ../gtk/gtkcombobox.c:826
+#: ../gtk/gtkcombobox.c:827
 msgid "Whether the combo's dropdown is shown"
 msgstr "Apakah dropdown kombo ditampilkan"
 
-#: ../gtk/gtkcombobox.c:842
+#: ../gtk/gtkcombobox.c:843
 msgid "Button Sensitivity"
 msgstr "Kepekaan Tombol"
 
-#: ../gtk/gtkcombobox.c:843
+#: ../gtk/gtkcombobox.c:844
 msgid "Whether the dropdown button is sensitive when the model is empty"
 msgstr "Apakah tombol dropdown peka ketika model kosong"
 
-#: ../gtk/gtkcombobox.c:859
-#, fuzzy
+#: ../gtk/gtkcombobox.c:860
 msgid "Whether combo box has an entry"
-msgstr "Menentukan apakah kotak combo mengambarkan suatu bingkai di sekitar anak"
+msgstr "Apakah kotak combo punya entri"
 
-#: ../gtk/gtkcombobox.c:874
-#, fuzzy
+#: ../gtk/gtkcombobox.c:875
 msgid "Entry Text Column"
-msgstr "Kolom Punya Entri"
+msgstr "Kolom Teks Entri"
 
-#: ../gtk/gtkcombobox.c:875
+#: ../gtk/gtkcombobox.c:876
 msgid "The column in the combo box's model to associate with strings from the entry if the combo was created with #GtkComboBox:has-entry = %TRUE"
-msgstr ""
+msgstr "Kolom pada model kotak kombo yang diasosiasikan dengan string dari entri bila kombo dibuat dengan #GtkComboBox:has-entry = %TRUE"
 
-#: ../gtk/gtkcombobox.c:892
-#, fuzzy
+#: ../gtk/gtkcombobox.c:893
 msgid "ID Column"
-msgstr "ID kolom pengurut"
+msgstr "Kolom ID"
 
-#: ../gtk/gtkcombobox.c:893
+#: ../gtk/gtkcombobox.c:894
 msgid "The column in the combo box's model that provides string IDs for the values in the model"
-msgstr ""
+msgstr "Kolom pada model kotak kombo yang menyediakan ID string bagi nilai-nilai dalam model"
 
-#: ../gtk/gtkcombobox.c:908
-#, fuzzy
+#: ../gtk/gtkcombobox.c:909
 msgid "Active id"
-msgstr "ID Gatekeeper"
+msgstr "ID aktif"
 
-#: ../gtk/gtkcombobox.c:909
-#, fuzzy
+#: ../gtk/gtkcombobox.c:910
 msgid "The value of the id column for the active row"
-msgstr "Nama ikon dari tema ikon"
+msgstr "Nilai dari kolom id bagi baris aktif"
 
-#: ../gtk/gtkcombobox.c:924
-#, fuzzy
+#: ../gtk/gtkcombobox.c:925
 msgid "Popup Fixed Width"
-msgstr "Fonta lebar tetap"
+msgstr "Lebar Tetap Popup"
 
-#: ../gtk/gtkcombobox.c:925
+#: ../gtk/gtkcombobox.c:926
 msgid "Whether the popup's width should be a fixed width matching the allocated width of the combo box"
-msgstr ""
+msgstr "Apakah lebar popup mesti suatu nilai tetap yang cocok dengan lebar kotak kombo yang dialokasikan"
 
-#: ../gtk/gtkcombobox.c:951
+#: ../gtk/gtkcombobox.c:952
 msgid "Appears as list"
 msgstr "Tampilkan sebagai daftar"
 
-#: ../gtk/gtkcombobox.c:952
+#: ../gtk/gtkcombobox.c:953
 msgid "Whether dropdowns should look like lists rather than menus"
 msgstr "Menentukan apakah dropdowns harus kelihatan seperti daftar dari pada menu"
 
-#: ../gtk/gtkcombobox.c:968
+#: ../gtk/gtkcombobox.c:969
 msgid "Arrow Size"
 msgstr "Ukuran Panah"
 
-#: ../gtk/gtkcombobox.c:969
+#: ../gtk/gtkcombobox.c:970
 msgid "The minimum size of the arrow in the combo box"
 msgstr "Ukuran minimum panah dalam kotak kombo"
 
-#: ../gtk/gtkcombobox.c:986
-#, fuzzy
+#: ../gtk/gtkcombobox.c:987
 msgid "The amount of space used by the arrow"
 msgstr "Banyaknya ruang yang dipakai oleh panah"
 
-#: ../gtk/gtkcombobox.c:1001
-#: ../gtk/gtkentry.c:879
-#: ../gtk/gtkhandlebox.c:190
-#: ../gtk/gtkmenubar.c:207
-#: ../gtk/gtkstatusbar.c:180
-#: ../gtk/gtktoolbar.c:601
-#: ../gtk/gtkviewport.c:153
+#: ../gtk/gtkcombobox.c:1002
+#: ../gtk/gtkentry.c:886
+#: ../gtk/gtkhandlebox.c:218
+#: ../gtk/gtkmenubar.c:218
+#: ../gtk/gtkstatusbar.c:182
+#: ../gtk/gtktoolbar.c:613
+#: ../gtk/gtkviewport.c:155
 msgid "Shadow type"
 msgstr "Tipe shadow"
 
-#: ../gtk/gtkcombobox.c:1002
+#: ../gtk/gtkcombobox.c:1003
 msgid "Which kind of shadow to draw around the combo box"
 msgstr "Jenis bayangan mana yang digambar di sekeliling kotak kombo"
 
-#: ../gtk/gtkcontainer.c:453
+#: ../gtk/gtkcontainer.c:457
 msgid "Resize mode"
 msgstr "Modus Ganti ukuran"
 
-#: ../gtk/gtkcontainer.c:454
+#: ../gtk/gtkcontainer.c:458
 msgid "Specify how resize events are handled"
 msgstr "Menentukan bagaimana penggantian ukuran dikerjakan"
 
-#: ../gtk/gtkcontainer.c:461
+#: ../gtk/gtkcontainer.c:465
 msgid "Border width"
 msgstr "Lebar batas"
 
-#: ../gtk/gtkcontainer.c:462
+#: ../gtk/gtkcontainer.c:466
 msgid "The width of the empty border outside the containers children"
 msgstr "Lebar batas kosong diluar anak kontainer"
 
-#: ../gtk/gtkcontainer.c:470
+#: ../gtk/gtkcontainer.c:474
 msgid "Child"
 msgstr "Anak"
 
-#: ../gtk/gtkcontainer.c:471
+#: ../gtk/gtkcontainer.c:475
 msgid "Can be used to add a new child to the container"
 msgstr "dApat digunakan untuk menambah anak pada kontainer"
 
-#: ../gtk/gtkdialog.c:289
-#: ../gtk/gtkinfobar.c:426
+#: ../gtk/gtkdialog.c:291
+#: ../gtk/gtkinfobar.c:427
 msgid "Content area border"
 msgstr "Batas area isi"
 
-#: ../gtk/gtkdialog.c:290
+#: ../gtk/gtkdialog.c:292
 msgid "Width of border around the main dialog area"
 msgstr "Lebar batas disekeliling area dialog utama"
 
-#: ../gtk/gtkdialog.c:307
-#: ../gtk/gtkinfobar.c:443
+#: ../gtk/gtkdialog.c:309
+#: ../gtk/gtkinfobar.c:444
 msgid "Content area spacing"
 msgstr "Jarak antara wilayah isi"
 
-#: ../gtk/gtkdialog.c:308
+#: ../gtk/gtkdialog.c:310
 msgid "Spacing between elements of the main dialog area"
 msgstr "Jarak antar elemen dari wilayah dialog utama"
 
-#: ../gtk/gtkdialog.c:315
-#: ../gtk/gtkinfobar.c:459
+#: ../gtk/gtkdialog.c:317
+#: ../gtk/gtkinfobar.c:460
 msgid "Button spacing"
 msgstr "Ruangan tombol"
 
-#: ../gtk/gtkdialog.c:316
-#: ../gtk/gtkinfobar.c:460
+#: ../gtk/gtkdialog.c:318
+#: ../gtk/gtkinfobar.c:461
 msgid "Spacing between buttons"
 msgstr "Ruangan antara tombol-tombol"
 
-#: ../gtk/gtkdialog.c:324
-#: ../gtk/gtkinfobar.c:475
+#: ../gtk/gtkdialog.c:326
+#: ../gtk/gtkinfobar.c:476
 msgid "Action area border"
 msgstr "Batas area aksi"
 
-#: ../gtk/gtkdialog.c:325
+#: ../gtk/gtkdialog.c:327
 msgid "Width of border around the button area at the bottom of the dialog"
 msgstr "Lebar batas disekeliling area tombol di bawah dialog"
 
-#: ../gtk/gtkentry.c:726
+#: ../gtk/gtkentrybuffer.c:353
+msgid "The contents of the buffer"
+msgstr "Isi penyangga"
+
+#: ../gtk/gtkentrybuffer.c:367
+#: ../gtk/gtkentry.c:917
+msgid "Text length"
+msgstr "Panjang teks"
+
+#: ../gtk/gtkentrybuffer.c:368
+msgid "Length of the text currently in the buffer"
+msgstr "Panjang teks yang tengah berada di penyangga"
+
+#: ../gtk/gtkentrybuffer.c:382
+#: ../gtk/gtkentry.c:769
+msgid "Maximum length"
+msgstr "Panjang maksimum"
+
+#: ../gtk/gtkentrybuffer.c:383
+#: ../gtk/gtkentry.c:770
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr "Jumlah karakter maksimum pada isian ini. Nol bila tak hingga"
+
+#: ../gtk/gtkentry.c:733
 msgid "Text Buffer"
 msgstr "Penyangga Teks"
 
-#: ../gtk/gtkentry.c:727
+#: ../gtk/gtkentry.c:734
 msgid "Text buffer object which actually stores entry text"
 msgstr "Objek penyangga teks yang sebenarnya menyimpan teks entri"
 
-#: ../gtk/gtkentry.c:734
-#: ../gtk/gtklabel.c:662
+#: ../gtk/gtkentry.c:741
+#: ../gtk/gtklabel.c:839
 msgid "Cursor Position"
 msgstr "Posisi kursor"
 
-#: ../gtk/gtkentry.c:735
-#: ../gtk/gtklabel.c:663
+#: ../gtk/gtkentry.c:742
+#: ../gtk/gtklabel.c:840
 msgid "The current position of the insertion cursor in chars"
 msgstr "Posisi kursor saat ini untuk memasukkan karakter"
 
-#: ../gtk/gtkentry.c:744
-#: ../gtk/gtklabel.c:672
+#: ../gtk/gtkentry.c:751
+#: ../gtk/gtklabel.c:849
 msgid "Selection Bound"
 msgstr "Batas seleksi"
 
-#: ../gtk/gtkentry.c:745
-#: ../gtk/gtklabel.c:673
+#: ../gtk/gtkentry.c:752
+#: ../gtk/gtklabel.c:850
 msgid "The position of the opposite end of the selection from the cursor in chars"
 msgstr "Posisi lawan pilihan dari kursor dalam satuan karakter"
 
-#: ../gtk/gtkentry.c:755
+#: ../gtk/gtkentry.c:762
 msgid "Whether the entry contents can be edited"
 msgstr "Menentukan apakah isi dapat diedit atau tidak"
 
-#: ../gtk/gtkentry.c:762
-#: ../gtk/gtkentrybuffer.c:382
-msgid "Maximum length"
-msgstr "Panjang maksimum"
-
-#: ../gtk/gtkentry.c:763
-#: ../gtk/gtkentrybuffer.c:383
-msgid "Maximum number of characters for this entry. Zero if no maximum"
-msgstr "Jumlah karakter maksimum pada isian ini. Nol bila tak hingga"
-
-#: ../gtk/gtkentry.c:771
+#: ../gtk/gtkentry.c:778
 msgid "Visibility"
 msgstr "Visibilitas"
 
-#: ../gtk/gtkentry.c:772
+#: ../gtk/gtkentry.c:779
 msgid "FALSE displays the \"invisible char\" instead of the actual text (password mode)"
 msgstr "FALSE akan menampilkan \"huruf tak kelihatan\" (misalnya untuk password)"
 
-#: ../gtk/gtkentry.c:780
+#: ../gtk/gtkentry.c:787
 msgid "FALSE removes outside bevel from entry"
 msgstr "FALSE akan menghapus bingkai dari isian ini"
 
-#: ../gtk/gtkentry.c:788
+#: ../gtk/gtkentry.c:795
 msgid "Border between text and frame. Overrides the inner-border style property"
 msgstr "Batas antara teks dan bingkai. Menimpa properti gaya inner-border"
 
-#: ../gtk/gtkentry.c:795
-#: ../gtk/gtkentry.c:1361
+#: ../gtk/gtkentry.c:802
+#: ../gtk/gtkentry.c:1398
 msgid "Invisible character"
 msgstr "Huruf tak kelihatan"
 
-#: ../gtk/gtkentry.c:796
-#: ../gtk/gtkentry.c:1362
+#: ../gtk/gtkentry.c:803
+#: ../gtk/gtkentry.c:1399
 msgid "The character to use when masking entry contents (in \"password mode\")"
 msgstr "Huruf yang dipakai sebagai huruf tak kelihatan (misalnya pada isian password)"
 
-#: ../gtk/gtkentry.c:803
+#: ../gtk/gtkentry.c:810
 msgid "Activates default"
 msgstr "Mengaktifkan default"
 
-#: ../gtk/gtkentry.c:804
+#: ../gtk/gtkentry.c:811
 msgid "Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed"
 msgstr "Apakah widget default diaktifkan atau tidak (misalnya tombol default pada dialog) pada saat tombol Enter ditekan"
 
-#: ../gtk/gtkentry.c:810
+#: ../gtk/gtkentry.c:817
 msgid "Width in chars"
 msgstr "Lebar dalam karakter"
 
-#: ../gtk/gtkentry.c:811
+#: ../gtk/gtkentry.c:818
 msgid "Number of characters to leave space for in the entry"
 msgstr "Jumlah karakter untuk menyisakan ruangan pada isian"
 
-#: ../gtk/gtkentry.c:820
+#: ../gtk/gtkentry.c:827
 msgid "Scroll offset"
 msgstr "Letak scroll"
 
-#: ../gtk/gtkentry.c:821
+#: ../gtk/gtkentry.c:828
 msgid "Number of pixels of the entry scrolled off the screen to the left"
 msgstr "Jumlah piksel pada isian yang bisa dinaik turunkan pada layar pada sisi kiri"
 
-#: ../gtk/gtkentry.c:831
+#: ../gtk/gtkentry.c:838
 msgid "The contents of the entry"
 msgstr "Isi"
 
-#: ../gtk/gtkentry.c:846
-#: ../gtk/gtkmisc.c:81
+#: ../gtk/gtkentry.c:853
+#: ../gtk/gtkmisc.c:105
 msgid "X align"
 msgstr "Perataan x"
 
-#: ../gtk/gtkentry.c:847
-#: ../gtk/gtkmisc.c:82
+#: ../gtk/gtkentry.c:854
+#: ../gtk/gtkmisc.c:106
 msgid "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."
 msgstr "Penyesuaian horisontal, bernilai 0 (kiri) hingga 1 (kanan). Nilainya dibalik untuk tataletak dari kanan-ke-kiri (RTL)."
 
-#: ../gtk/gtkentry.c:863
+#: ../gtk/gtkentry.c:870
 msgid "Truncate multiline"
 msgstr "Penggal multibaris"
 
-#: ../gtk/gtkentry.c:864
+#: ../gtk/gtkentry.c:871
 msgid "Whether to truncate multiline pastes to one line."
 msgstr "Aoakah memotong penempelan multi baris ke satu baris."
 
-#: ../gtk/gtkentry.c:880
+#: ../gtk/gtkentry.c:887
 msgid "Which kind of shadow to draw around the entry when has-frame is set"
 msgstr "Jenis bayangan mana yang digambar di sekeliling entri ketika has-frame ditata"
 
-#: ../gtk/gtkentry.c:895
-#: ../gtk/gtktextview.c:764
+#: ../gtk/gtkentry.c:902
+#: ../gtk/gtktextview.c:766
 msgid "Overwrite mode"
 msgstr "Modus Timpa"
 
-#: ../gtk/gtkentry.c:896
+#: ../gtk/gtkentry.c:903
 msgid "Whether new text overwrites existing text"
 msgstr "Apakah teks baru menimpa yang telah ada"
 
-#: ../gtk/gtkentry.c:910
-#: ../gtk/gtkentrybuffer.c:367
-msgid "Text length"
-msgstr "Panjang teks"
-
-#: ../gtk/gtkentry.c:911
+#: ../gtk/gtkentry.c:918
 msgid "Length of the text currently in the entry"
 msgstr "Panjang teks kini di entri"
 
-#: ../gtk/gtkentry.c:926
-#, fuzzy
+#: ../gtk/gtkentry.c:933
 msgid "Invisible character set"
-msgstr "Atur _Enkoding Karakter"
+msgstr "Karakter jadi tak nampak"
 
-#: ../gtk/gtkentry.c:927
-#, fuzzy
+#: ../gtk/gtkentry.c:934
 msgid "Whether the invisible character has been set"
 msgstr "Apakah karakter tak nampak telah ditata"
 
-#: ../gtk/gtkentry.c:945
+#: ../gtk/gtkentry.c:952
 msgid "Caps Lock warning"
 msgstr "Peringatan Caps Lock"
 
-#: ../gtk/gtkentry.c:946
+#: ../gtk/gtkentry.c:953
 msgid "Whether password entries will show a warning when Caps Lock is on"
 msgstr "Apakah entri sandi akan menampilkan peringatan ketika Caps Lock menyala"
 
-#: ../gtk/gtkentry.c:960
+#: ../gtk/gtkentry.c:967
 msgid "Progress Fraction"
 msgstr "Fraksi Kemajuan"
 
-#: ../gtk/gtkentry.c:961
+#: ../gtk/gtkentry.c:968
 msgid "The current fraction of the task that's been completed"
 msgstr "Fraksi kini dari tugas yang telah diselesaikan"
 
-#: ../gtk/gtkentry.c:978
+#: ../gtk/gtkentry.c:985
 msgid "Progress Pulse Step"
 msgstr "Langkah Pulsa Kemajuan"
 
-#: ../gtk/gtkentry.c:979
+#: ../gtk/gtkentry.c:986
 msgid "The fraction of total entry width to move the progress bouncing block for each call to gtk_entry_progress_pulse()"
 msgstr "Fraksi dari lebar entri total untuk memindah blok memantul yang menunjukkan kemajuan bagi setial panggilan ke gtk_entry_progress_pulse()"
 
-#: ../gtk/gtkentry.c:995
+#: ../gtk/gtkentry.c:1002
+msgid "Placeholder text"
+msgstr "Teks pesan tempat"
+
+#: ../gtk/gtkentry.c:1003
+msgid "Show text in the entry when it's empty and unfocused"
+msgstr "Tampilkan teks pada entri ketika kosong dan tak menerima fokus"
+
+#: ../gtk/gtkentry.c:1017
 msgid "Primary pixbuf"
 msgstr "Pixbuf primer"
 
-#: ../gtk/gtkentry.c:996
+#: ../gtk/gtkentry.c:1018
 msgid "Primary pixbuf for the entry"
 msgstr "Pixbuf primer bagi entri"
 
-#: ../gtk/gtkentry.c:1010
+#: ../gtk/gtkentry.c:1032
 msgid "Secondary pixbuf"
 msgstr "Pixbuf sekunder"
 
-#: ../gtk/gtkentry.c:1011
+#: ../gtk/gtkentry.c:1033
 msgid "Secondary pixbuf for the entry"
 msgstr "Pixbuf sekunder bagi entri"
 
-#: ../gtk/gtkentry.c:1025
+#: ../gtk/gtkentry.c:1047
 msgid "Primary stock ID"
 msgstr "ID stok primer"
 
-#: ../gtk/gtkentry.c:1026
+#: ../gtk/gtkentry.c:1048
 msgid "Stock ID for primary icon"
 msgstr "ID stok bagi ikon primer"
 
-#: ../gtk/gtkentry.c:1040
+#: ../gtk/gtkentry.c:1062
 msgid "Secondary stock ID"
 msgstr "ID stok sekunder"
 
-#: ../gtk/gtkentry.c:1041
+#: ../gtk/gtkentry.c:1063
 msgid "Stock ID for secondary icon"
 msgstr "ID stok bagi ikon sekunder"
 
-#: ../gtk/gtkentry.c:1055
+#: ../gtk/gtkentry.c:1077
 msgid "Primary icon name"
 msgstr "Nama ikon primer"
 
-#: ../gtk/gtkentry.c:1056
+#: ../gtk/gtkentry.c:1078
 msgid "Icon name for primary icon"
 msgstr "Nama ikon bagi ikon primer"
 
-#: ../gtk/gtkentry.c:1070
+#: ../gtk/gtkentry.c:1092
 msgid "Secondary icon name"
 msgstr "Nama ikon sekunder"
 
-#: ../gtk/gtkentry.c:1071
+#: ../gtk/gtkentry.c:1093
 msgid "Icon name for secondary icon"
 msgstr "Nama ikon bagi ikon sekunder"
 
-#: ../gtk/gtkentry.c:1085
+#: ../gtk/gtkentry.c:1107
 msgid "Primary GIcon"
 msgstr "GIcon Primer"
 
-#: ../gtk/gtkentry.c:1086
+#: ../gtk/gtkentry.c:1108
 msgid "GIcon for primary icon"
 msgstr "GIcon bagi ikon primer"
 
-#: ../gtk/gtkentry.c:1100
+#: ../gtk/gtkentry.c:1122
 msgid "Secondary GIcon"
 msgstr "GIcon sekunder"
 
-#: ../gtk/gtkentry.c:1101
+#: ../gtk/gtkentry.c:1123
 msgid "GIcon for secondary icon"
 msgstr "GIcon bagi ikon sekunder"
 
-#: ../gtk/gtkentry.c:1115
+#: ../gtk/gtkentry.c:1137
 msgid "Primary storage type"
 msgstr "Tipe penyimpanan primer"
 
-#: ../gtk/gtkentry.c:1116
+#: ../gtk/gtkentry.c:1138
 msgid "The representation being used for primary icon"
 msgstr "Representasi yang sedang dipakai oleh ikon primer"
 
-#: ../gtk/gtkentry.c:1131
+#: ../gtk/gtkentry.c:1153
 msgid "Secondary storage type"
 msgstr "Tipe penyimpanan sekunder"
 
-#: ../gtk/gtkentry.c:1132
+#: ../gtk/gtkentry.c:1154
 msgid "The representation being used for secondary icon"
 msgstr "Representasi yang sedang dipakai oleh ikon sekunder"
 
-#: ../gtk/gtkentry.c:1153
+#: ../gtk/gtkentry.c:1175
 msgid "Primary icon activatable"
 msgstr "Ikon primer dapat mengaktifkan"
 
-#: ../gtk/gtkentry.c:1154
+#: ../gtk/gtkentry.c:1176
 msgid "Whether the primary icon is activatable"
 msgstr "Apakah ikon primer adalah sesuatu yang dapat mengaktifkan"
 
-#: ../gtk/gtkentry.c:1174
+#: ../gtk/gtkentry.c:1196
 msgid "Secondary icon activatable"
 msgstr "Ikon sekunder dapat mengaktifkan"
 
-#: ../gtk/gtkentry.c:1175
+#: ../gtk/gtkentry.c:1197
 msgid "Whether the secondary icon is activatable"
 msgstr "Apakah ikon sekunder adalah sesuatu yang dapat mengaktifkan"
 
-#: ../gtk/gtkentry.c:1197
+#: ../gtk/gtkentry.c:1219
 msgid "Primary icon sensitive"
 msgstr "Ikon utama peka"
 
-#: ../gtk/gtkentry.c:1198
+#: ../gtk/gtkentry.c:1220
 msgid "Whether the primary icon is sensitive"
 msgstr "Apakah ikon utama peka"
 
-#: ../gtk/gtkentry.c:1219
+#: ../gtk/gtkentry.c:1241
 msgid "Secondary icon sensitive"
 msgstr "Ikon sekunder peka"
 
-#: ../gtk/gtkentry.c:1220
+#: ../gtk/gtkentry.c:1242
 msgid "Whether the secondary icon is sensitive"
 msgstr "Apakah ikon sekunder peka"
 
-#: ../gtk/gtkentry.c:1236
+#: ../gtk/gtkentry.c:1258
 msgid "Primary icon tooltip text"
 msgstr "Teks tooltip ikon utama"
 
-#: ../gtk/gtkentry.c:1237
-#: ../gtk/gtkentry.c:1273
+#: ../gtk/gtkentry.c:1259
+#: ../gtk/gtkentry.c:1295
 msgid "The contents of the tooltip on the primary icon"
 msgstr "Isi tooltip pada ikon utama"
 
-#: ../gtk/gtkentry.c:1253
+#: ../gtk/gtkentry.c:1275
 msgid "Secondary icon tooltip text"
 msgstr "Teks tooltip ikon sekunder"
 
-#: ../gtk/gtkentry.c:1254
-#: ../gtk/gtkentry.c:1292
+#: ../gtk/gtkentry.c:1276
+#: ../gtk/gtkentry.c:1314
 msgid "The contents of the tooltip on the secondary icon"
 msgstr "Isi tooltip pada ikon sekunder"
 
-#: ../gtk/gtkentry.c:1272
+#: ../gtk/gtkentry.c:1294
 msgid "Primary icon tooltip markup"
 msgstr "Markup tooltip ikon primer"
 
-#: ../gtk/gtkentry.c:1291
+#: ../gtk/gtkentry.c:1313
 msgid "Secondary icon tooltip markup"
 msgstr "Markup tooltip ikon sekunder"
 
-#: ../gtk/gtkentry.c:1311
-#: ../gtk/gtktextview.c:792
+#: ../gtk/gtkentry.c:1333
+#: ../gtk/gtktextview.c:794
 msgid "IM module"
 msgstr "Modul IM"
 
-#: ../gtk/gtkentry.c:1312
-#: ../gtk/gtktextview.c:793
+#: ../gtk/gtkentry.c:1334
+#: ../gtk/gtktextview.c:795
 msgid "Which IM module should be used"
 msgstr "Modul IM mana yang mesti dipakai"
 
-#: ../gtk/gtkentry.c:1326
+#: ../gtk/gtkentry.c:1348
+#| msgid "Completion Model"
+msgid "Completion"
+msgstr "Pelengkapan"
+
+#: ../gtk/gtkentry.c:1349
+msgid "The auxiliary completion object"
+msgstr "Objek pelengkapan tambahan"
+
+#: ../gtk/gtkentry.c:1363
 msgid "Icon Prelight"
 msgstr "Nyala Dini Ikon"
 
-#: ../gtk/gtkentry.c:1327
+#: ../gtk/gtkentry.c:1364
 msgid "Whether activatable icons should prelight when hovered"
 msgstr "Apakah ikon yang dapat mengaktifkan mesti menyala dini ketika kursor diambangkan di sekitar"
 
-#: ../gtk/gtkentry.c:1340
+#: ../gtk/gtkentry.c:1377
 msgid "Progress Border"
 msgstr "Batas Kemajuan"
 
-#: ../gtk/gtkentry.c:1341
+#: ../gtk/gtkentry.c:1378
 msgid "Border around the progress bar"
 msgstr "Batas di sekeliling batang kemajuan"
 
-#: ../gtk/gtkentry.c:1833
+#: ../gtk/gtkentry.c:1870
 msgid "Border between text and frame."
 msgstr "Batas antara teks dan bingkai."
 
-#: ../gtk/gtkentrybuffer.c:353
-msgid "The contents of the buffer"
-msgstr "Isi penyangga"
-
-#: ../gtk/gtkentrybuffer.c:368
-msgid "Length of the text currently in the buffer"
-msgstr "Panjang teks yang tengah berada di penyangga"
-
 #: ../gtk/gtkentrycompletion.c:320
 msgid "Completion Model"
 msgstr "Model Pelengkap Otomatis"
@@ -2917,7 +2900,7 @@ msgid "Minimum length of the search key in order to look up matches"
 msgstr "Panjang minimum teks kunci pencarian untuk mulai mencari"
 
 #: ../gtk/gtkentrycompletion.c:344
-#: ../gtk/gtkiconview.c:566
+#: ../gtk/gtkiconview.c:564
 msgid "Text column"
 msgstr "Kolom teks"
 
@@ -2981,82 +2964,89 @@ msgstr "Di atas anak"
 msgid "Whether the event-trapping window of the eventbox is above the window of the child widget as opposed to below it."
 msgstr "Menentukan apakah jendela penjebak kejadian kotak kejadiannya berada di atas jendela widget anak"
 
-#: ../gtk/gtkexpander.c:279
+#: ../gtk/gtkexpander.c:282
 msgid "Expanded"
 msgstr "Perluas"
 
-#: ../gtk/gtkexpander.c:280
+#: ../gtk/gtkexpander.c:283
 msgid "Whether the expander has been opened to reveal the child widget"
 msgstr "Apakah pengembang telah dibuka untuk menampilkan widget anak"
 
-#: ../gtk/gtkexpander.c:288
+#: ../gtk/gtkexpander.c:291
 msgid "Text of the expander's label"
 msgstr "Teks dari nama expander"
 
-#: ../gtk/gtkexpander.c:303
-#: ../gtk/gtklabel.c:581
+#: ../gtk/gtkexpander.c:306
+#: ../gtk/gtklabel.c:758
 msgid "Use markup"
 msgstr "Gunakan markup"
 
-#: ../gtk/gtkexpander.c:304
-#: ../gtk/gtklabel.c:582
+#: ../gtk/gtkexpander.c:307
+#: ../gtk/gtklabel.c:759
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "Label teks termasuk markup XML-nya. Silakan baca pango_parse_markup() untuk lebih jelasnya"
 
-#: ../gtk/gtkexpander.c:312
+#: ../gtk/gtkexpander.c:315
 msgid "Space to put between the label and the child"
 msgstr "Ruang antar label dan anaknya"
 
-#: ../gtk/gtkexpander.c:321
-#: ../gtk/gtkframe.c:168
-#: ../gtk/gtktoolbutton.c:215
-#: ../gtk/gtktoolitemgroup.c:1603
+#: ../gtk/gtkexpander.c:324
+#: ../gtk/gtkframe.c:206
+#: ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolitemgroup.c:1599
 msgid "Label widget"
 msgstr "Widget label"
 
-#: ../gtk/gtkexpander.c:322
+#: ../gtk/gtkexpander.c:325
 msgid "A widget to display in place of the usual expander label"
 msgstr "Widget yang digunakan untuk menampilkan nama expander yang biasa"
 
-#: ../gtk/gtkexpander.c:329
-#, fuzzy
+#: ../gtk/gtkexpander.c:332
 msgid "Label fill"
-msgstr "Isi penuh label"
+msgstr "Penuhi dengan label"
 
-#: ../gtk/gtkexpander.c:330
-#, fuzzy
+#: ../gtk/gtkexpander.c:333
 msgid "Whether the label widget should fill all available horizontal space"
-msgstr "Apakah widget label mesti mengisi ruang tersedia"
+msgstr "Apakah widget label mesti mengisi seluruh ruang horisontal yang tersedia"
 
-#: ../gtk/gtkexpander.c:336
-#: ../gtk/gtktoolitemgroup.c:1631
+#: ../gtk/gtkexpander.c:348
+#| msgid "Resize mode"
+msgid "Resize toplevel"
+msgstr "Ubah ukuran aras puncak"
+
+#: ../gtk/gtkexpander.c:349
+msgid "Whether the expander will resize the toplevel window upon expanding and collapsing"
+msgstr "Apakah ekspander akan mengubah ukuran jendela aras puncak ketika mengembangkan dan melipat"
+
+#: ../gtk/gtkexpander.c:355
+#: ../gtk/gtktoolitemgroup.c:1627
 #: ../gtk/gtktreeview.c:1187
 msgid "Expander Size"
 msgstr "Ukuran ekspander"
 
-#: ../gtk/gtkexpander.c:337
-#: ../gtk/gtktoolitemgroup.c:1632
+#: ../gtk/gtkexpander.c:356
+#: ../gtk/gtktoolitemgroup.c:1628
 #: ../gtk/gtktreeview.c:1188
 msgid "Size of the expander arrow"
 msgstr "Ukuran panah ekspander"
 
-#: ../gtk/gtkexpander.c:346
+#: ../gtk/gtkexpander.c:365
 msgid "Spacing around expander arrow"
 msgstr "Ruangan di sekeliling panah expander"
 
-#: ../gtk/gtkfilechooserbutton.c:366
+#: ../gtk/gtkfilechooserbutton.c:409
 msgid "Dialog"
 msgstr "Dialog"
 
-#: ../gtk/gtkfilechooserbutton.c:367
+#: ../gtk/gtkfilechooserbutton.c:410
 msgid "The file chooser dialog to use."
 msgstr "Dialog pemilih berkas yang digunakan"
 
-#: ../gtk/gtkfilechooserbutton.c:398
+#: ../gtk/gtkfilechooserbutton.c:441
 msgid "The title of the file chooser dialog."
 msgstr "Judul dialog pemilih berkas."
 
-#: ../gtk/gtkfilechooserbutton.c:412
+#: ../gtk/gtkfilechooserbutton.c:455
 msgid "The desired width of the button widget, in characters."
 msgstr "Lebar widget tombol dalam karakter"
 
@@ -3143,7 +3133,6 @@ msgid "Whether a file chooser in save mode will present an overwrite confirmatio
 msgstr "Apakah pemilih berkas pada mode penyimpanan akan menampilkan dialog konfirmasi penimpaan bila perlu."
 
 #: ../gtk/gtkfilechooser.c:830
-#, fuzzy
 msgid "Allow folder creation"
 msgstr "Ijinkan pembuatan folder"
 
@@ -3153,6 +3142,7 @@ msgstr "Apakah pemilih berkas bukan pada mode buka akan menawarkan pengguna untu
 
 #: ../gtk/gtkfixed.c:152
 #: ../gtk/gtklayout.c:634
+#: ../gtk/gtktreeviewcolumn.c:264
 msgid "X position"
 msgstr "Posisi X"
 
@@ -3171,577 +3161,570 @@ msgstr "Posisi Y"
 msgid "Y position of child widget"
 msgstr "Posisi Y widget anak"
 
-#: ../gtk/gtkfontbutton.c:141
-msgid "The title of the font selection dialog"
+#: ../gtk/gtkfontbutton.c:151
+#| msgid "The title of the file chooser dialog."
+msgid "The title of the font chooser dialog"
 msgstr "Judul dialog pemilih fonta"
 
-#: ../gtk/gtkfontbutton.c:156
-#: ../gtk/gtkfontsel.c:219
+#: ../gtk/gtkfontbutton.c:166
+#: ../gtk/gtkfontsel.c:244
 msgid "Font name"
 msgstr "Nama fonta"
 
-#: ../gtk/gtkfontbutton.c:157
+#: ../gtk/gtkfontbutton.c:167
 msgid "The name of the selected font"
 msgstr "Nama fonta yang dipilih"
 
-#: ../gtk/gtkfontbutton.c:158
+#: ../gtk/gtkfontbutton.c:168
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:173
+#: ../gtk/gtkfontbutton.c:183
 msgid "Use font in label"
 msgstr "Gunakan fonta ini pada label"
 
-#: ../gtk/gtkfontbutton.c:174
+#: ../gtk/gtkfontbutton.c:184
 msgid "Whether the label is drawn in the selected font"
 msgstr "Apakah label digambar dengan fonta yang dipilih"
 
-#: ../gtk/gtkfontbutton.c:189
+#: ../gtk/gtkfontbutton.c:199
 msgid "Use size in label"
 msgstr "Gunakan ukuran ini pada label"
 
-#: ../gtk/gtkfontbutton.c:190
+#: ../gtk/gtkfontbutton.c:200
 msgid "Whether the label is drawn with the selected font size"
 msgstr "Apakah label digambar dengan ukuran fonta yang dipilih"
 
-#: ../gtk/gtkfontbutton.c:206
+#: ../gtk/gtkfontbutton.c:216
 msgid "Show style"
 msgstr "Tampilkan gaya"
 
-#: ../gtk/gtkfontbutton.c:207
+#: ../gtk/gtkfontbutton.c:217
 msgid "Whether the selected font style is shown in the label"
 msgstr "Menentukan apakah gaya huruf terpilih akan ditampilkan pada label"
 
-#: ../gtk/gtkfontbutton.c:222
+#: ../gtk/gtkfontbutton.c:232
 msgid "Show size"
 msgstr "Tampilkan ukuran"
 
-#: ../gtk/gtkfontbutton.c:223
+#: ../gtk/gtkfontbutton.c:233
 msgid "Whether selected font size is shown in the label"
 msgstr "Menentukan apakah ukuran fonta terpilih nampak pada label"
 
-#: ../gtk/gtkfontsel.c:220
+#: ../gtk/gtkfontsel.c:245
 msgid "The string that represents this font"
 msgstr "String yang mewakili fonta ini"
 
-#: ../gtk/gtkfontsel.c:226
+#: ../gtk/gtkfontsel.c:251
 msgid "Preview text"
 msgstr "Contoh teks"
 
-#: ../gtk/gtkfontsel.c:227
+#: ../gtk/gtkfontsel.c:252
 msgid "The text to display in order to demonstrate the selected font"
 msgstr "Teks yang ditulis untuk melihat contoh font yang dipilih"
 
-#: ../gtk/gtkframe.c:134
+#: ../gtk/gtkframe.c:172
 msgid "Text of the frame's label"
 msgstr "Teks pada bingkai label"
 
-#: ../gtk/gtkframe.c:141
+#: ../gtk/gtkframe.c:179
 msgid "Label xalign"
 msgstr "Label xalign"
 
-#: ../gtk/gtkframe.c:142
+#: ../gtk/gtkframe.c:180
 msgid "The horizontal alignment of the label"
 msgstr "Penyesuaian letak horisontal label"
 
-#: ../gtk/gtkframe.c:150
+#: ../gtk/gtkframe.c:188
 msgid "Label yalign"
 msgstr "Label yalign"
 
-#: ../gtk/gtkframe.c:151
+#: ../gtk/gtkframe.c:189
 msgid "The vertical alignment of the label"
 msgstr "Penyesuaian letak vertikal label"
 
-#: ../gtk/gtkframe.c:159
+#: ../gtk/gtkframe.c:197
 msgid "Frame shadow"
 msgstr "Bayangan bingkai"
 
-#: ../gtk/gtkframe.c:160
+#: ../gtk/gtkframe.c:198
 msgid "Appearance of the frame border"
 msgstr "Bagaimanana batas bingkai ditampilkan"
 
-#: ../gtk/gtkframe.c:169
+#: ../gtk/gtkframe.c:207
 msgid "A widget to display in place of the usual frame label"
 msgstr "Widget yang digunakan untuk menampilkan letak label bingkai"
 
-#: ../gtk/gtkgrid.c:1277
-#: ../gtk/gtktable.c:175
+#: ../gtk/gtkgrid.c:1298
+#: ../gtk/gtktable.c:209
 msgid "Row spacing"
 msgstr "Jarak antar baris"
 
-#: ../gtk/gtkgrid.c:1278
-#: ../gtk/gtktable.c:176
+#: ../gtk/gtkgrid.c:1299
+#: ../gtk/gtktable.c:210
 msgid "The amount of space between two consecutive rows"
 msgstr "Besar ruangan antara dua baris"
 
-#: ../gtk/gtkgrid.c:1284
-#: ../gtk/gtktable.c:184
+#: ../gtk/gtkgrid.c:1305
+#: ../gtk/gtktable.c:218
 msgid "Column spacing"
 msgstr "Jarak antar kolom"
 
-#: ../gtk/gtkgrid.c:1285
-#: ../gtk/gtktable.c:185
+#: ../gtk/gtkgrid.c:1306
+#: ../gtk/gtktable.c:219
 msgid "The amount of space between two consecutive columns"
 msgstr "Besar ruangan jarak antar kolom"
 
-#: ../gtk/gtkgrid.c:1291
-#, fuzzy
+#: ../gtk/gtkgrid.c:1312
 msgid "Row Homogeneous"
-msgstr "tajuk baris"
+msgstr "Baris Homogen"
 
-#: ../gtk/gtkgrid.c:1292
-#, fuzzy
+#: ../gtk/gtkgrid.c:1313
 msgid "If TRUE, the rows are all the same height"
-msgstr "Bila TRUE, sel tabel memiliki tinggi/lebar yang sama"
+msgstr "Bila TRUE, semua baris sama tinggi"
 
-#: ../gtk/gtkgrid.c:1298
-#, fuzzy
+#: ../gtk/gtkgrid.c:1319
 msgid "Column Homogeneous"
-msgstr "tajuk kolom"
+msgstr "Kolom Homogen"
 
-#: ../gtk/gtkgrid.c:1299
-#, fuzzy
+#: ../gtk/gtkgrid.c:1320
 msgid "If TRUE, the columns are all the same width"
-msgstr "Bila TRUE, sel tabel memiliki tinggi/lebar yang sama"
+msgstr "Bila TRUE, semua kolom sama lebar"
 
-#: ../gtk/gtkgrid.c:1305
-#: ../gtk/gtktable.c:201
+#: ../gtk/gtkgrid.c:1326
+#: ../gtk/gtktable.c:235
 msgid "Left attachment"
 msgstr "Pasangan kiri"
 
-#: ../gtk/gtkgrid.c:1306
-#: ../gtk/gtkmenu.c:759
-#: ../gtk/gtktable.c:202
+#: ../gtk/gtkgrid.c:1327
+#: ../gtk/gtkmenu.c:761
+#: ../gtk/gtktable.c:236
 msgid "The column number to attach the left side of the child to"
 msgstr "Jumlah kolom yang dipasangkan pada sisi kiri anak"
 
-#: ../gtk/gtkgrid.c:1312
-#: ../gtk/gtktable.c:215
+#: ../gtk/gtkgrid.c:1333
+#: ../gtk/gtktable.c:249
 msgid "Top attachment"
 msgstr "Pasangan atas"
 
-#: ../gtk/gtkgrid.c:1313
-#, fuzzy
+#: ../gtk/gtkgrid.c:1334
 msgid "The row number to attach the top side of a child widget to"
-msgstr "Jumlah baris yang dipasangkan pada sisi atas widget"
+msgstr "Sisi atas widget anak akan ditempelkan pada nomor baris ini"
 
-#: ../gtk/gtkgrid.c:1319
+#: ../gtk/gtkgrid.c:1340
 #: ../gtk/gtklayout.c:660
-#: ../gtk/gtktreeviewcolumn.c:262
+#: ../gtk/gtktreeviewcolumn.c:274
 msgid "Width"
 msgstr "Lebar"
 
-#: ../gtk/gtkgrid.c:1320
-#, fuzzy
+#: ../gtk/gtkgrid.c:1341
 msgid "The number of columns that a child spans"
-msgstr "Jumlah kolom dalam tabel"
+msgstr "Cacah kolom yang dicakup oleh anak"
 
-#: ../gtk/gtkgrid.c:1326
+#: ../gtk/gtkgrid.c:1347
 #: ../gtk/gtklayout.c:669
 msgid "Height"
 msgstr "Tinggi"
 
-#: ../gtk/gtkgrid.c:1327
-#, fuzzy
+#: ../gtk/gtkgrid.c:1348
 msgid "The number of rows that a child spans"
-msgstr "Jumlah baris dalam tabel"
+msgstr "Cacah baris yang dicakup oleh anak"
 
-#: ../gtk/gtkhandlebox.c:191
+#: ../gtk/gtkhandlebox.c:219
 msgid "Appearance of the shadow that surrounds the container"
 msgstr "Bagaimana bayangan yang mengelilingi kontainer ditampilkan"
 
-#: ../gtk/gtkhandlebox.c:199
+#: ../gtk/gtkhandlebox.c:227
 msgid "Handle position"
 msgstr "Posisi handle"
 
-#: ../gtk/gtkhandlebox.c:200
+#: ../gtk/gtkhandlebox.c:228
 msgid "Position of the handle relative to the child widget"
 msgstr "Posisi handle relatif dari widget anak"
 
-#: ../gtk/gtkhandlebox.c:208
+#: ../gtk/gtkhandlebox.c:236
 msgid "Snap edge"
 msgstr "Jepret pada sisi"
 
-#: ../gtk/gtkhandlebox.c:209
+#: ../gtk/gtkhandlebox.c:237
 msgid "Side of the handlebox that's lined up with the docking point to dock the handlebox"
 msgstr "Sisi kotak handle yang berbaris dengan titik doking sebagai tempat sandar kotak handle"
 
-#: ../gtk/gtkhandlebox.c:217
+#: ../gtk/gtkhandlebox.c:245
 msgid "Snap edge set"
 msgstr "Jepret pada sisi di set"
 
-#: ../gtk/gtkhandlebox.c:218
+#: ../gtk/gtkhandlebox.c:246
 msgid "Whether to use the value from the snap_edge property or a value derived from handle_position"
 msgstr "Menentukan apakah menggunakan nilai dari snap_edge atau nilai dari handle_position"
 
-#: ../gtk/gtkhandlebox.c:225
+#: ../gtk/gtkhandlebox.c:253
 msgid "Child Detached"
 msgstr "Anak Dilepas"
 
-#: ../gtk/gtkhandlebox.c:226
+#: ../gtk/gtkhandlebox.c:254
 msgid "A boolean value indicating whether the handlebox's child is attached or detached."
 msgstr "Nilai bool yang mengindikasikan apakah handlebox milik anak disambung atau dilepas."
 
-#: ../gtk/gtkiconview.c:529
+#: ../gtk/gtkiconview.c:527
+#: ../gtk/gtktreeselection.c:131
 msgid "Selection mode"
 msgstr "Moda pilihan"
 
-#: ../gtk/gtkiconview.c:530
+#: ../gtk/gtkiconview.c:528
 msgid "The selection mode"
 msgstr "Moda pilihan"
 
-#: ../gtk/gtkiconview.c:548
+#: ../gtk/gtkiconview.c:546
 msgid "Pixbuf column"
 msgstr "Kolom pixbuf"
 
-#: ../gtk/gtkiconview.c:549
+#: ../gtk/gtkiconview.c:547
 msgid "Model column used to retrieve the icon pixbuf from"
 msgstr "Kolom model yang digunakna untuk mengambil pixbuf ikon"
 
-#: ../gtk/gtkiconview.c:567
+#: ../gtk/gtkiconview.c:565
 msgid "Model column used to retrieve the text from"
 msgstr "Kolom model yang digunakna untuk mengambil teks"
 
-#: ../gtk/gtkiconview.c:586
+#: ../gtk/gtkiconview.c:584
 msgid "Markup column"
 msgstr "Kolom markup"
 
-#: ../gtk/gtkiconview.c:587
+#: ../gtk/gtkiconview.c:585
 msgid "Model column used to retrieve the text if using Pango markup"
 msgstr "Kolom model yang digunakna untuk mengambil teks jika menggunakan markup Pango"
 
-#: ../gtk/gtkiconview.c:594
+#: ../gtk/gtkiconview.c:592
 msgid "Icon View Model"
 msgstr "Model Tampilan Ikon"
 
-#: ../gtk/gtkiconview.c:595
+#: ../gtk/gtkiconview.c:593
 msgid "The model for the icon view"
 msgstr "Model tampilan ikon"
 
-#: ../gtk/gtkiconview.c:611
+#: ../gtk/gtkiconview.c:609
 msgid "Number of columns"
 msgstr "Jumlah kolom"
 
-#: ../gtk/gtkiconview.c:612
+#: ../gtk/gtkiconview.c:610
 msgid "Number of columns to display"
 msgstr "Jumlah kolom yang ditampilkan"
 
-#: ../gtk/gtkiconview.c:629
+#: ../gtk/gtkiconview.c:627
 msgid "Width for each item"
 msgstr "Lebar untuk setiap objek"
 
-#: ../gtk/gtkiconview.c:630
+#: ../gtk/gtkiconview.c:628
 msgid "The width used for each item"
 msgstr "Lebar untuk setiap isian"
 
-#: ../gtk/gtkiconview.c:646
+#: ../gtk/gtkiconview.c:644
 msgid "Space which is inserted between cells of an item"
 msgstr "Ruangan yang akan disisipkan di antara sel pada isian"
 
-#: ../gtk/gtkiconview.c:661
+#: ../gtk/gtkiconview.c:659
 msgid "Row Spacing"
 msgstr "Jarak Antar Baris"
 
-#: ../gtk/gtkiconview.c:662
+#: ../gtk/gtkiconview.c:660
 msgid "Space which is inserted between grid rows"
 msgstr "Ruangan yang akan disisipkan di antara baris dalam kotak-kotak"
 
-#: ../gtk/gtkiconview.c:677
+#: ../gtk/gtkiconview.c:675
 msgid "Column Spacing"
 msgstr "Jarak Antar Kolom"
 
-#: ../gtk/gtkiconview.c:678
+#: ../gtk/gtkiconview.c:676
 msgid "Space which is inserted between grid columns"
 msgstr "Ruang yang disisipkan di antara kolom-kolom kisi"
 
-#: ../gtk/gtkiconview.c:693
+#: ../gtk/gtkiconview.c:691
 msgid "Margin"
 msgstr "Batas"
 
-#: ../gtk/gtkiconview.c:694
+#: ../gtk/gtkiconview.c:692
 msgid "Space which is inserted at the edges of the icon view"
 msgstr "Ruangan yang akan disisipkan pada sisi tampilan ikon"
 
-#: ../gtk/gtkiconview.c:709
+#: ../gtk/gtkiconview.c:707
 msgid "Item Orientation"
 msgstr "Orientasi Butir"
 
-#: ../gtk/gtkiconview.c:710
+#: ../gtk/gtkiconview.c:708
 msgid "How the text and icon of each item are positioned relative to each other"
 msgstr "Cara teks dan ikon untuk setiap isian diletakkan, relatif"
 
-#: ../gtk/gtkiconview.c:726
+#: ../gtk/gtkiconview.c:724
 #: ../gtk/gtktreeview.c:1022
-#: ../gtk/gtktreeviewcolumn.c:362
+#: ../gtk/gtktreeviewcolumn.c:374
 msgid "Reorderable"
 msgstr "Dapat diurut kembali"
 
-#: ../gtk/gtkiconview.c:727
+#: ../gtk/gtkiconview.c:725
 #: ../gtk/gtktreeview.c:1023
 msgid "View is reorderable"
 msgstr "View dapat diurut kembali"
 
-#: ../gtk/gtkiconview.c:734
+#: ../gtk/gtkiconview.c:732
 #: ../gtk/gtktreeview.c:1173
 msgid "Tooltip Column"
 msgstr "Kolom Tooltip"
 
-#: ../gtk/gtkiconview.c:735
+#: ../gtk/gtkiconview.c:733
 msgid "The column in the model containing the tooltip texts for the items"
 msgstr "Kolom pada model yang memuat teks tooltip bagi butir"
 
-#: ../gtk/gtkiconview.c:752
+#: ../gtk/gtkiconview.c:750
 msgid "Item Padding"
 msgstr "Pengganjal Butir"
 
-#: ../gtk/gtkiconview.c:753
+#: ../gtk/gtkiconview.c:751
 msgid "Padding around icon view items"
 msgstr "Pengganjal sekeliling butir tilikan ikon"
 
-#: ../gtk/gtkiconview.c:784
+#: ../gtk/gtkiconview.c:782
 msgid "Selection Box Color"
 msgstr "Warna Kotak Pilihan"
 
-#: ../gtk/gtkiconview.c:785
+#: ../gtk/gtkiconview.c:783
 msgid "Color of the selection box"
 msgstr "Warna kotak pilihan"
 
-#: ../gtk/gtkiconview.c:791
+#: ../gtk/gtkiconview.c:789
 msgid "Selection Box Alpha"
 msgstr "Kotak Pilihan Alfa"
 
-#: ../gtk/gtkiconview.c:792
+#: ../gtk/gtkiconview.c:790
 msgid "Opacity of the selection box"
 msgstr "Opasitas kotak pilihan"
 
-#: ../gtk/gtkimage.c:236
-#: ../gtk/gtkstatusicon.c:204
+#: ../gtk/gtkimage.c:237
+#: ../gtk/gtkstatusicon.c:235
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtk/gtkimage.c:237
-#: ../gtk/gtkstatusicon.c:205
+#: ../gtk/gtkimage.c:238
+#: ../gtk/gtkstatusicon.c:236
 msgid "A GdkPixbuf to display"
 msgstr "GdkPixbuf yang hendak ditampilkan"
 
-#: ../gtk/gtkimage.c:244
+#: ../gtk/gtkimage.c:245
 #: ../gtk/gtkrecentmanager.c:294
-#: ../gtk/gtkstatusicon.c:212
+#: ../gtk/gtkstatusicon.c:243
 msgid "Filename"
 msgstr "Nama berkas"
 
-#: ../gtk/gtkimage.c:245
-#: ../gtk/gtkstatusicon.c:213
+#: ../gtk/gtkimage.c:246
+#: ../gtk/gtkstatusicon.c:244
 msgid "Filename to load and display"
 msgstr "Nama berkas yang hendak dibuka dan ditampilkan"
 
-#: ../gtk/gtkimage.c:254
-#: ../gtk/gtkstatusicon.c:221
+#: ../gtk/gtkimage.c:255
+#: ../gtk/gtkstatusicon.c:252
 msgid "Stock ID for a stock image to display"
 msgstr "ID stok untuk gambar stok yang hendak ditampilkan"
 
-#: ../gtk/gtkimage.c:261
+#: ../gtk/gtkimage.c:262
 msgid "Icon set"
 msgstr "Set ikon"
 
-#: ../gtk/gtkimage.c:262
+#: ../gtk/gtkimage.c:263
 msgid "Icon set to display"
 msgstr "Set ikon yang hendak ditampilkan"
 
-#: ../gtk/gtkimage.c:269
-#: ../gtk/gtkscalebutton.c:227
-#: ../gtk/gtktoolbar.c:518
-#: ../gtk/gtktoolpalette.c:1039
+#: ../gtk/gtkimage.c:270
+#: ../gtk/gtkscalebutton.c:228
+#: ../gtk/gtktoolbar.c:530
+#: ../gtk/gtktoolpalette.c:1008
 msgid "Icon size"
 msgstr "Ukuran ikon"
 
-#: ../gtk/gtkimage.c:270
+#: ../gtk/gtkimage.c:271
 msgid "Symbolic size to use for stock icon, icon set or named icon"
 msgstr "Ukuran simbolis untuk digunakan pada ikon stock. ikon set ataupun named ikon"
 
-#: ../gtk/gtkimage.c:286
+#: ../gtk/gtkimage.c:287
 msgid "Pixel size"
 msgstr "Ukuran piksel"
 
-#: ../gtk/gtkimage.c:287
+#: ../gtk/gtkimage.c:288
 msgid "Pixel size to use for named icon"
 msgstr "Ukuran piksel pada ikon bernama"
 
-#: ../gtk/gtkimage.c:295
+#: ../gtk/gtkimage.c:296
 msgid "Animation"
 msgstr "Animasi"
 
-#: ../gtk/gtkimage.c:296
+#: ../gtk/gtkimage.c:297
 msgid "GdkPixbufAnimation to display"
 msgstr "GdkPixbufAnimation yang hendak ditampilkan"
 
-#: ../gtk/gtkimage.c:336
-#: ../gtk/gtkstatusicon.c:252
+#: ../gtk/gtkimage.c:337
+#: ../gtk/gtkstatusicon.c:283
 msgid "Storage type"
 msgstr "Tipe penyimpanan"
 
-#: ../gtk/gtkimage.c:337
-#: ../gtk/gtkstatusicon.c:253
+#: ../gtk/gtkimage.c:338
+#: ../gtk/gtkstatusicon.c:284
 msgid "The representation being used for image data"
 msgstr "Metode yang digunakan untuk data gambar"
 
-#: ../gtk/gtkimage.c:355
-#, fuzzy
+#: ../gtk/gtkimage.c:356
 msgid "Use Fallback"
-msgstr "Pengalasan GNOME"
+msgstr "Gunakan Cadangan"
 
-#: ../gtk/gtkimage.c:356
-#, fuzzy
+#: ../gtk/gtkimage.c:357
 msgid "Whether to use icon names fallback"
-msgstr "Apakah ikon status sedang nampak atau tidak"
+msgstr "Apakah memakai cadangan nama ikon"
 
-#: ../gtk/gtkimagemenuitem.c:150
+#: ../gtk/gtkimagemenuitem.c:161
 msgid "Child widget to appear next to the menu text"
 msgstr "Widget anak yang ditampilkan di samping teks menu"
 
-#: ../gtk/gtkimagemenuitem.c:165
+#: ../gtk/gtkimagemenuitem.c:176
 msgid "Whether to use the label text to create a stock menu item"
 msgstr "Apakah memakai teks label untuk membuat suatu butir menu stok"
 
-#: ../gtk/gtkimagemenuitem.c:198
-#: ../gtk/gtkmenu.c:601
+#: ../gtk/gtkimagemenuitem.c:209
+#: ../gtk/gtkmenu.c:603
 msgid "Accel Group"
 msgstr "Grup Akselerator"
 
-#: ../gtk/gtkimagemenuitem.c:199
+#: ../gtk/gtkimagemenuitem.c:210
 msgid "The Accel Group to use for stock accelerator keys"
 msgstr "Grup Akselerasi bagi kunci akselerator stok"
 
-#: ../gtk/gtkinfobar.c:371
-#: ../gtk/gtkmessagedialog.c:202
+#: ../gtk/gtkinfobar.c:372
+#: ../gtk/gtkmessagedialog.c:204
 msgid "Message Type"
 msgstr "Tipe Pesan"
 
-#: ../gtk/gtkinfobar.c:372
-#: ../gtk/gtkmessagedialog.c:203
+#: ../gtk/gtkinfobar.c:373
+#: ../gtk/gtkmessagedialog.c:205
 msgid "The type of message"
 msgstr "Tipe pesan"
 
-#: ../gtk/gtkinfobar.c:427
+#: ../gtk/gtkinfobar.c:428
 msgid "Width of border around the content area"
 msgstr "Lebar batas sekeliling wilayah isi"
 
-#: ../gtk/gtkinfobar.c:444
+#: ../gtk/gtkinfobar.c:445
 msgid "Spacing between elements of the area"
 msgstr "Jarak antar elemen dari wilayah"
 
-#: ../gtk/gtkinfobar.c:476
+#: ../gtk/gtkinfobar.c:477
 msgid "Width of border around the action area"
 msgstr "Lebar batas sekeliling wilayah aksi"
 
-#: ../gtk/gtkinvisible.c:89
-#: ../gtk/gtkmountoperation.c:175
-#: ../gtk/gtkstatusicon.c:271
-#: ../gtk/gtkstylecontext.c:546
-#: ../gtk/gtkwindow.c:726
+#: ../gtk/gtkinvisible.c:103
+#: ../gtk/gtkmountoperation.c:173
+#: ../gtk/gtkstatusicon.c:302
+#: ../gtk/gtkstylecontext.c:432
+#: ../gtk/gtkwindow.c:765
 msgid "Screen"
 msgstr "Layar"
 
-#: ../gtk/gtkinvisible.c:90
-#: ../gtk/gtkwindow.c:727
+#: ../gtk/gtkinvisible.c:104
+#: ../gtk/gtkwindow.c:766
 msgid "The screen where this window will be displayed"
 msgstr "Layar tempat jendela hendak ditampilkan"
 
-#: ../gtk/gtklabel.c:568
+#: ../gtk/gtklabel.c:745
 msgid "The text of the label"
 msgstr "Label teks"
 
-#: ../gtk/gtklabel.c:575
+#: ../gtk/gtklabel.c:752
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "Daftar gaya atribut yang hendak ditempelkan pada label teks"
 
-#: ../gtk/gtklabel.c:596
-#: ../gtk/gtktexttag.c:353
-#: ../gtk/gtktextview.c:701
+#: ../gtk/gtklabel.c:773
+#: ../gtk/gtktexttag.c:386
+#: ../gtk/gtktextview.c:703
 msgid "Justification"
 msgstr "Rata"
 
-#: ../gtk/gtklabel.c:597
+#: ../gtk/gtklabel.c:774
 msgid "The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that"
 msgstr "Penyesuaian letak baris pada label teks, relatif terhadap satu dan yang lainnya. Hal ini tidak berpengaruh pada penyesuaian letak label dalam lokasinya.  Silakan baca GtkMis::xalign untuk informasi lengkapnya"
 
-#: ../gtk/gtklabel.c:605
+#: ../gtk/gtklabel.c:782
 msgid "Pattern"
 msgstr "Pola"
 
-#: ../gtk/gtklabel.c:606
+#: ../gtk/gtklabel.c:783
 msgid "A string with _ characters in positions correspond to characters in the text to underline"
 msgstr "Kalimat dengan karakter _ (underscore) pada suatu karakter akan membuat karakter tersebut diberi garis bawah"
 
-#: ../gtk/gtklabel.c:613
+#: ../gtk/gtklabel.c:790
 msgid "Line wrap"
 msgstr "potong baris"
 
-#: ../gtk/gtklabel.c:614
+#: ../gtk/gtklabel.c:791
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "Jika diset, baris akan dipotong bila terlalu lebar"
 
-#: ../gtk/gtklabel.c:629
+#: ../gtk/gtklabel.c:806
 msgid "Line wrap mode"
 msgstr "Mode pembengkokan baris"
 
-#: ../gtk/gtklabel.c:630
+#: ../gtk/gtklabel.c:807
 msgid "If wrap is set, controls how linewrapping is done"
 msgstr "Bila pelipatan diaktifkan, mengendalikan bagaimana pelipatan baris dilakukan"
 
-#: ../gtk/gtklabel.c:637
+#: ../gtk/gtklabel.c:814
 msgid "Selectable"
 msgstr "Dapat dipilih"
 
-#: ../gtk/gtklabel.c:638
+#: ../gtk/gtklabel.c:815
 msgid "Whether the label text can be selected with the mouse"
 msgstr "Menentukan apakah teks label dapat dipilih dengan mouse atau tidak"
 
-#: ../gtk/gtklabel.c:644
+#: ../gtk/gtklabel.c:821
 msgid "Mnemonic key"
 msgstr "Tombol singkat"
 
-#: ../gtk/gtklabel.c:645
+#: ../gtk/gtklabel.c:822
 msgid "The mnemonic accelerator key for this label"
 msgstr "Tombol singkat untuk label ini"
 
-#: ../gtk/gtklabel.c:653
+#: ../gtk/gtklabel.c:830
 msgid "Mnemonic widget"
 msgstr "Widget mnemonik"
 
-#: ../gtk/gtklabel.c:654
+#: ../gtk/gtklabel.c:831
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr "Widget yang diaktifkan saat tombol singkat ditekan"
 
-#: ../gtk/gtklabel.c:700
+#: ../gtk/gtklabel.c:877
 msgid "The preferred place to ellipsize the string, if the label does not have enough room to display the entire string"
 msgstr "Tempat yang disukai untuk menyingkat string, bila label tak punya cukup ruang untuk menampilkan seluruhnya."
 
-#: ../gtk/gtklabel.c:741
+#: ../gtk/gtklabel.c:918
 msgid "Single Line Mode"
 msgstr "Moda Satu Baris"
 
-#: ../gtk/gtklabel.c:742
+#: ../gtk/gtklabel.c:919
 msgid "Whether the label is in single line mode"
 msgstr "Menentukan apakah teks label dalam mode baris tunggal"
 
-#: ../gtk/gtklabel.c:759
+#: ../gtk/gtklabel.c:936
 msgid "Angle"
 msgstr "Sudut"
 
-#: ../gtk/gtklabel.c:760
+#: ../gtk/gtklabel.c:937
 msgid "Angle at which the label is rotated"
 msgstr "Sudut rotasi label"
 
-#: ../gtk/gtklabel.c:782
+#: ../gtk/gtklabel.c:959
 msgid "The desired maximum width of the label, in characters"
 msgstr "Lebar maksimum label dalam karakter"
 
-#: ../gtk/gtklabel.c:800
+#: ../gtk/gtklabel.c:977
 msgid "Track visited links"
 msgstr "Lacak taut yang telah dikunjungi"
 
-#: ../gtk/gtklabel.c:801
+#: ../gtk/gtklabel.c:978
 msgid "Whether visited links should be tracked"
 msgstr "Apakah taut yang pernah dikunjungi mesti dilacak"
 
@@ -3769,557 +3752,595 @@ msgstr "Telah Dikunjungi"
 msgid "Whether this link has been visited."
 msgstr "Apakah taut ini pernah dikunjungi."
 
-#: ../gtk/gtkmenubar.c:181
+#: ../gtk/gtklockbutton.c:278
+msgid "Permission"
+msgstr "Ijin"
+
+#: ../gtk/gtklockbutton.c:279
+msgid "The GPermission object controlling this button"
+msgstr "Objek GPermission yang mengendalikan tombol ini"
+
+#: ../gtk/gtklockbutton.c:286
+#| msgid "Text"
+msgid "Lock Text"
+msgstr "Teks Kunci"
+
+#: ../gtk/gtklockbutton.c:287
+#| msgid "The text to display in order to demonstrate the selected font"
+msgid "The text to display when prompting the user to lock"
+msgstr "Teks yang ditampilkan ketika meminta pengguna untuk mengunci"
+
+#: ../gtk/gtklockbutton.c:295
+msgid "Unlock Text"
+msgstr "Teks Buka Kunci"
+
+#: ../gtk/gtklockbutton.c:296
+#| msgid "The text to display in order to demonstrate the selected font"
+msgid "The text to display when prompting the user to unlock"
+msgstr "Teks yang ditampilkan ketika meminta pengguna untuk membuka kunci"
+
+#: ../gtk/gtklockbutton.c:304
+#| msgid "Tooltip"
+msgid "Lock Tooltip"
+msgstr "Teks Petunjuk Mengunci"
+
+#: ../gtk/gtklockbutton.c:305
+msgid "The tooltip to display when prompting the user to lock"
+msgstr "Teks petunjuk yang ditampilkan ketika meminta pengguna untuk mengunci"
+
+#: ../gtk/gtklockbutton.c:313
+#| msgid "Enable Tooltips"
+msgid "Unlock Tooltip"
+msgstr "Teks Petunjuk Buka Kunci"
+
+#: ../gtk/gtklockbutton.c:314
+msgid "The tooltip to display when prompting the user to unlock"
+msgstr "Teks petunjuk yang ditampilkan ketika meminta pengguna untuk membuka kunci"
+
+#: ../gtk/gtklockbutton.c:322
+msgid "Not Authorized Tooltip"
+msgstr "Teks Petunjuk Tidak Berhak"
+
+#: ../gtk/gtklockbutton.c:323
+msgid "The tooltip to display when prompting the user cannot obtain authorization"
+msgstr "Teks petunjuk yang ditampilkan ketika memberitahu bahwa pengguna tak bisa memperoleh otorisasi"
+
+#: ../gtk/gtkmenubar.c:192
 msgid "Pack direction"
 msgstr "Arah pengepakan"
 
-#: ../gtk/gtkmenubar.c:182
+#: ../gtk/gtkmenubar.c:193
 msgid "The pack direction of the menubar"
 msgstr "Arah pengepakan batang menu"
 
-#: ../gtk/gtkmenubar.c:198
+#: ../gtk/gtkmenubar.c:209
 msgid "Child Pack direction"
 msgstr "Arah Pemaketan Anak"
 
-#: ../gtk/gtkmenubar.c:199
+#: ../gtk/gtkmenubar.c:210
 msgid "The child pack direction of the menubar"
 msgstr "Arah dari menubar anak"
 
-#: ../gtk/gtkmenubar.c:208
+#: ../gtk/gtkmenubar.c:219
 msgid "Style of bevel around the menubar"
 msgstr "Gaya kotak sekitar kotak menu"
 
-#: ../gtk/gtkmenubar.c:215
-#: ../gtk/gtktoolbar.c:568
+#: ../gtk/gtkmenubar.c:226
+#: ../gtk/gtktoolbar.c:580
 msgid "Internal padding"
 msgstr "Isian internal"
 
-#: ../gtk/gtkmenubar.c:216
+#: ../gtk/gtkmenubar.c:227
 msgid "Amount of border space between the menubar shadow and the menu items"
 msgstr "Jumlah ruangan batas antara kotak menu dan isi menu"
 
-#: ../gtk/gtkmenu.c:587
+#: ../gtk/gtkmenu.c:589
 msgid "The currently selected menu item"
 msgstr "Butir menu yang kini dipilih"
 
-#: ../gtk/gtkmenu.c:602
+#: ../gtk/gtkmenu.c:604
 msgid "The accel group holding accelerators for the menu"
 msgstr "Grup akselerator yang mewadahi akselerator bagi menu"
 
-#: ../gtk/gtkmenu.c:616
-#: ../gtk/gtkmenuitem.c:313
+#: ../gtk/gtkmenu.c:618
+#: ../gtk/gtkmenuitem.c:368
 msgid "Accel Path"
 msgstr "Lokasi Akselerator"
 
-#: ../gtk/gtkmenu.c:617
+#: ../gtk/gtkmenu.c:619
 msgid "An accel path used to conveniently construct accel paths of child items"
 msgstr "Lokasi akselerator yang dipakai untuk menyusun lokasi akselerator bagi butir anak secara mudah"
 
-#: ../gtk/gtkmenu.c:633
+#: ../gtk/gtkmenu.c:635
 msgid "Attach Widget"
 msgstr "Widget Tempel"
 
-#: ../gtk/gtkmenu.c:634
+#: ../gtk/gtkmenu.c:636
 msgid "The widget the menu is attached to"
 msgstr "Widget tempat menempel menu"
 
-#: ../gtk/gtkmenu.c:642
+#: ../gtk/gtkmenu.c:644
 msgid "A title that may be displayed by the window manager when this menu is torn-off"
 msgstr "Judul yang ditampilkan jendela manager saat menu ini disobek"
 
-#: ../gtk/gtkmenu.c:656
+#: ../gtk/gtkmenu.c:658
 msgid "Tearoff State"
 msgstr "Kondisi Sobekan"
 
-#: ../gtk/gtkmenu.c:657
+#: ../gtk/gtkmenu.c:659
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "Boolean yang mengindikasikan apakah menu di matikan"
 
-#: ../gtk/gtkmenu.c:671
+#: ../gtk/gtkmenu.c:673
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../gtk/gtkmenu.c:672
+#: ../gtk/gtkmenu.c:674
 msgid "The monitor the menu will be popped up on"
 msgstr "Monitor tempat menu akan di-popup"
 
-#: ../gtk/gtkmenu.c:678
+#: ../gtk/gtkmenu.c:680
 msgid "Vertical Padding"
 msgstr "Isian Vertikal"
 
-#: ../gtk/gtkmenu.c:679
+#: ../gtk/gtkmenu.c:681
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Ruangan lebih pada bagian atas dan bawah menu"
 
-#: ../gtk/gtkmenu.c:701
+#: ../gtk/gtkmenu.c:703
 msgid "Reserve Toggle Size"
 msgstr "Cadangkan Ukuran Jungkit"
 
-#: ../gtk/gtkmenu.c:702
+#: ../gtk/gtkmenu.c:704
 msgid "A boolean that indicates whether the menu reserves space for toggles and icons"
 msgstr "Bool yang mengindikasikan apakah menu mencadangkan ruang bagi penjungkit dan ikon"
 
-#: ../gtk/gtkmenu.c:708
+#: ../gtk/gtkmenu.c:710
 msgid "Horizontal Padding"
 msgstr "Pengganjal Horisontal"
 
-#: ../gtk/gtkmenu.c:709
+#: ../gtk/gtkmenu.c:711
 msgid "Extra space at the left and right edges of the menu"
 msgstr "Ruang tambahan di kiri dan kanan tepi menu"
 
-#: ../gtk/gtkmenu.c:717
+#: ../gtk/gtkmenu.c:719
 msgid "Vertical Offset"
 msgstr "Ofset vertikal"
 
-#: ../gtk/gtkmenu.c:718
+#: ../gtk/gtkmenu.c:720
 msgid "When the menu is a submenu, position it this number of pixels offset vertically"
 msgstr "Apabila menu ini berupa submenu, letakkan menu ini pada lokasi yang ditentukan angka ini (dalam piksel) secara vertikal"
 
-#: ../gtk/gtkmenu.c:726
+#: ../gtk/gtkmenu.c:728
 msgid "Horizontal Offset"
 msgstr "Ofset Horisontal"
 
-#: ../gtk/gtkmenu.c:727
+#: ../gtk/gtkmenu.c:729
 msgid "When the menu is a submenu, position it this number of pixels offset horizontally"
 msgstr "Apabila menu ini berupa submenu, letakkan menu ini pada lokasi yang ditentukan angka ini (dalam piksel) secara horisontal"
 
-#: ../gtk/gtkmenu.c:735
+#: ../gtk/gtkmenu.c:737
 msgid "Double Arrows"
 msgstr "Panah Ganda"
 
-#: ../gtk/gtkmenu.c:736
+#: ../gtk/gtkmenu.c:738
 msgid "When scrolling, always show both arrows."
 msgstr "Ketika menggulung, selalu tampilkan kedua panah."
 
-#: ../gtk/gtkmenu.c:749
+#: ../gtk/gtkmenu.c:751
 msgid "Arrow Placement"
 msgstr "Penempatan Panah"
 
-#: ../gtk/gtkmenu.c:750
+#: ../gtk/gtkmenu.c:752
 msgid "Indicates where scroll arrows should be placed"
 msgstr "Mengindikasikan dimana panah penggulung mesti ditempatkan"
 
-#: ../gtk/gtkmenu.c:758
+#: ../gtk/gtkmenu.c:760
 msgid "Left Attach"
 msgstr "Menempel pada Kiri"
 
-#: ../gtk/gtkmenu.c:766
+#: ../gtk/gtkmenu.c:768
 msgid "Right Attach"
 msgstr "Menempel di Kanan"
 
-#: ../gtk/gtkmenu.c:767
+#: ../gtk/gtkmenu.c:769
 msgid "The column number to attach the right side of the child to"
 msgstr "Jumlah kolom untuk diikutsertakan pada bagian kanan dari anak"
 
-#: ../gtk/gtkmenu.c:774
+#: ../gtk/gtkmenu.c:776
 msgid "Top Attach"
 msgstr "Menempel di Atas"
 
-#: ../gtk/gtkmenu.c:775
+#: ../gtk/gtkmenu.c:777
 msgid "The row number to attach the top of the child to"
 msgstr "Jumlah kolom untuk diikutsertakan pada bagian atas dari anak"
 
-#: ../gtk/gtkmenu.c:782
+#: ../gtk/gtkmenu.c:784
 msgid "Bottom Attach"
 msgstr "Menempel di Bawah"
 
-#: ../gtk/gtkmenu.c:783
-#: ../gtk/gtktable.c:223
+#: ../gtk/gtkmenu.c:785
+#: ../gtk/gtktable.c:257
 msgid "The row number to attach the bottom of the child to"
 msgstr "Jumlah baris yang dipasangkan pada sisi bawah anak"
 
-#: ../gtk/gtkmenu.c:797
+#: ../gtk/gtkmenu.c:799
 msgid "Arbitrary constant to scale down the size of the scroll arrow"
 msgstr "Konstanta sebarang untuk memperkecil ukurang panah penggulung"
 
-#: ../gtk/gtkmenuitem.c:281
+#: ../gtk/gtkmenuitem.c:336
 msgid "Right Justified"
 msgstr "Rata Kanan"
 
-#: ../gtk/gtkmenuitem.c:282
+#: ../gtk/gtkmenuitem.c:337
 msgid "Sets whether the menu item appears justified at the right side of a menu bar"
 msgstr "Menata apakah butir menu tampil diratakan di sisi kanan batang menu"
 
-#: ../gtk/gtkmenuitem.c:296
+#: ../gtk/gtkmenuitem.c:351
 msgid "Submenu"
 msgstr "Sub menu"
 
-#: ../gtk/gtkmenuitem.c:297
+#: ../gtk/gtkmenuitem.c:352
 msgid "The submenu attached to the menu item, or NULL if it has none"
 msgstr "Sub menu yang ditempelkan ke butir menu, atau NULL bila tak punya"
 
-#: ../gtk/gtkmenuitem.c:314
+#: ../gtk/gtkmenuitem.c:369
 msgid "Sets the accelerator path of the menu item"
 msgstr "Tata lokasi akselerator dari butir menu"
 
-#: ../gtk/gtkmenuitem.c:329
+#: ../gtk/gtkmenuitem.c:384
 msgid "The text for the child label"
 msgstr "Teks bagi label anak"
 
-#: ../gtk/gtkmenuitem.c:392
+#: ../gtk/gtkmenuitem.c:447
 msgid "Amount of space used up by arrow, relative to the menu item's font size"
 msgstr "Banyaknya ruang yang dipakai oleh panah, relatif terhadap ukuran fonta butir menu"
 
-#: ../gtk/gtkmenuitem.c:405
+#: ../gtk/gtkmenuitem.c:460
 msgid "Width in Characters"
 msgstr "Lebar dalam Karakter"
 
-#: ../gtk/gtkmenuitem.c:406
+#: ../gtk/gtkmenuitem.c:461
 msgid "The minimum desired width of the menu item in characters"
 msgstr "Lebar minimum yang diinginkan dari butir menu dalam karakter"
 
-#: ../gtk/gtkmenushell.c:420
+#: ../gtk/gtkmenushell.c:421
 msgid "Take Focus"
 msgstr "Ambil fokus"
 
-#: ../gtk/gtkmenushell.c:421
+#: ../gtk/gtkmenushell.c:422
 msgid "A boolean that determines whether the menu grabs the keyboard focus"
 msgstr "Nilai boolean yang memutuskan apakah menu mengambil fokus keyboard"
 
-#: ../gtk/gtkmenutoolbutton.c:257
+#: ../gtk/gtkmenutoolbutton.c:293
 msgid "Menu"
 msgstr "Menu"
 
-#: ../gtk/gtkmenutoolbutton.c:258
+#: ../gtk/gtkmenutoolbutton.c:294
 msgid "The dropdown menu"
 msgstr "Menu pilihan"
 
-#: ../gtk/gtkmessagedialog.c:185
+#: ../gtk/gtkmessagedialog.c:187
 msgid "Image/label border"
 msgstr "Batas gambar/label"
 
-#: ../gtk/gtkmessagedialog.c:186
+#: ../gtk/gtkmessagedialog.c:188
 msgid "Width of border around the label and image in the message dialog"
 msgstr "Lebar batas di sekitar label dan gambar pada dialog pesan"
 
-#: ../gtk/gtkmessagedialog.c:210
+#: ../gtk/gtkmessagedialog.c:212
 msgid "Message Buttons"
 msgstr "Tombol pesan"
 
-#: ../gtk/gtkmessagedialog.c:211
+#: ../gtk/gtkmessagedialog.c:213
 msgid "The buttons shown in the message dialog"
 msgstr "Tombol yang ditampilkan pada tombol pesan"
 
-#: ../gtk/gtkmessagedialog.c:228
+#: ../gtk/gtkmessagedialog.c:230
 msgid "The primary text of the message dialog"
 msgstr "Teks utama dari dialog pesan"
 
-#: ../gtk/gtkmessagedialog.c:243
+#: ../gtk/gtkmessagedialog.c:245
 msgid "Use Markup"
 msgstr "Gunakan Markup"
 
-#: ../gtk/gtkmessagedialog.c:244
+#: ../gtk/gtkmessagedialog.c:246
 msgid "The primary text of the title includes Pango markup."
 msgstr "Teks primer dari judul termasuk markup Pango."
 
-#: ../gtk/gtkmessagedialog.c:258
+#: ../gtk/gtkmessagedialog.c:260
 msgid "Secondary Text"
 msgstr "Teks Sekunder"
 
-#: ../gtk/gtkmessagedialog.c:259
+#: ../gtk/gtkmessagedialog.c:261
 msgid "The secondary text of the message dialog"
 msgstr "Teks sekunder dari dialog pesan"
 
-#: ../gtk/gtkmessagedialog.c:274
+#: ../gtk/gtkmessagedialog.c:276
 msgid "Use Markup in secondary"
 msgstr "Gunakan Markup di sekunder"
 
-#: ../gtk/gtkmessagedialog.c:275
+#: ../gtk/gtkmessagedialog.c:277
 msgid "The secondary text includes Pango markup."
 msgstr "Teks sekunder termasuk markup Pango."
 
-#: ../gtk/gtkmessagedialog.c:289
+#: ../gtk/gtkmessagedialog.c:291
 msgid "Image"
 msgstr "Gambar"
 
-#: ../gtk/gtkmessagedialog.c:290
+#: ../gtk/gtkmessagedialog.c:292
 msgid "The image"
 msgstr "Citra"
 
-#: ../gtk/gtkmessagedialog.c:306
+#: ../gtk/gtkmessagedialog.c:308
 msgid "Message area"
 msgstr "Area pesan"
 
-#: ../gtk/gtkmessagedialog.c:307
-#, fuzzy
+#: ../gtk/gtkmessagedialog.c:309
 msgid "GtkVBox that holds the dialog's primary and secondary labels"
-msgstr "GtkVBox yang memegang label primer dan sekunder milik dialog"
+msgstr "GtkVBox yang menampung label primer dan sekunder milik dialog"
 
-#: ../gtk/gtkmisc.c:91
+#: ../gtk/gtkmisc.c:115
 msgid "Y align"
 msgstr "Perataan y"
 
-#: ../gtk/gtkmisc.c:92
+#: ../gtk/gtkmisc.c:116
 msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
 msgstr "Penyesuaian vertikal, bernilai 0 (atas) hingga 1 (bawah)"
 
-#: ../gtk/gtkmisc.c:101
+#: ../gtk/gtkmisc.c:125
 msgid "X pad"
 msgstr "Isian sisi X"
 
-#: ../gtk/gtkmisc.c:102
+#: ../gtk/gtkmisc.c:126
 msgid "The amount of space to add on the left and right of the widget, in pixels"
 msgstr "Ruangan yang ditambahkan pada sisi kiri dan kanan widget dalam satuan piksel"
 
-#: ../gtk/gtkmisc.c:111
+#: ../gtk/gtkmisc.c:135
 msgid "Y pad"
 msgstr "Isian Y"
 
-#: ../gtk/gtkmisc.c:112
+#: ../gtk/gtkmisc.c:136
 msgid "The amount of space to add on the top and bottom of the widget, in pixels"
 msgstr "Ruangan yang diisikan pada sisi atas dan bawah widget dalam satuan piksel"
 
-#: ../gtk/gtkmountoperation.c:159
+#: ../gtk/gtkmountoperation.c:157
 msgid "Parent"
 msgstr "Induk"
 
-#: ../gtk/gtkmountoperation.c:160
+#: ../gtk/gtkmountoperation.c:158
 msgid "The parent window"
 msgstr "Jendela induk"
 
-#: ../gtk/gtkmountoperation.c:167
+#: ../gtk/gtkmountoperation.c:165
 msgid "Is Showing"
 msgstr "Ditampilkan"
 
-#: ../gtk/gtkmountoperation.c:168
+#: ../gtk/gtkmountoperation.c:166
 msgid "Are we showing a dialog"
 msgstr "Apakah kita sedang menampilkan suatu dialog?"
 
-#: ../gtk/gtkmountoperation.c:176
+#: ../gtk/gtkmountoperation.c:174
 msgid "The screen where this window will be displayed."
 msgstr "Layar tempat jendela ini hendak ditampilkan."
 
-#: ../gtk/gtknotebook.c:685
+#: ../gtk/gtknotebook.c:694
 msgid "Page"
 msgstr "Halaman"
 
-#: ../gtk/gtknotebook.c:686
+#: ../gtk/gtknotebook.c:695
 msgid "The index of the current page"
 msgstr "Indeks halaman saat ini"
 
-#: ../gtk/gtknotebook.c:694
+#: ../gtk/gtknotebook.c:703
 msgid "Tab Position"
 msgstr "Posisi tab"
 
-#: ../gtk/gtknotebook.c:695
+#: ../gtk/gtknotebook.c:704
 msgid "Which side of the notebook holds the tabs"
 msgstr "Lokasi tab pada buku catatan"
 
-#: ../gtk/gtknotebook.c:702
+#: ../gtk/gtknotebook.c:711
 msgid "Show Tabs"
 msgstr "Tampilkan Tab"
 
-#: ../gtk/gtknotebook.c:703
-#, fuzzy
+#: ../gtk/gtknotebook.c:712
 msgid "Whether tabs should be shown"
-msgstr "Menentukan apakah tab digambar atau tidak"
+msgstr "Apakah tab mesti ditampilkan"
 
-#: ../gtk/gtknotebook.c:709
+#: ../gtk/gtknotebook.c:718
 msgid "Show Border"
 msgstr "Tampilkan Batas"
 
-#: ../gtk/gtknotebook.c:710
-#, fuzzy
+#: ../gtk/gtknotebook.c:719
 msgid "Whether the border should be shown"
-msgstr "Menentukan apakah batas digambar atau tidak"
+msgstr "Apakah batas mesti ditampilkan"
 
-#: ../gtk/gtknotebook.c:716
+#: ../gtk/gtknotebook.c:725
 msgid "Scrollable"
 msgstr "Dapat discroll"
 
-#: ../gtk/gtknotebook.c:717
+#: ../gtk/gtknotebook.c:726
 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
 msgstr "Bila bernilai TRUE, panah scroll digambar dengan syarat tidak terlalu banyak tab"
 
-#: ../gtk/gtknotebook.c:723
+#: ../gtk/gtknotebook.c:732
 msgid "Enable Popup"
 msgstr "Tampilkan popup"
 
-#: ../gtk/gtknotebook.c:724
+#: ../gtk/gtknotebook.c:733
 msgid "If TRUE, pressing the right mouse button on the notebook pops up a menu that you can use to go to a page"
 msgstr "Bila bernilai TRUE, dengan menekan tombol kanan pada notebook akan men"
 
-#: ../gtk/gtknotebook.c:738
+#: ../gtk/gtknotebook.c:747
 msgid "Group Name"
 msgstr "Nama Grup"
 
-#: ../gtk/gtknotebook.c:739
+#: ../gtk/gtknotebook.c:748
 msgid "Group name for tab drag and drop"
 msgstr "Nama grup bagi tab seret dan jatuhkan"
 
-#: ../gtk/gtknotebook.c:746
+#: ../gtk/gtknotebook.c:755
 msgid "Tab label"
 msgstr "Label tab"
 
-#: ../gtk/gtknotebook.c:747
+#: ../gtk/gtknotebook.c:756
 msgid "The string displayed on the child's tab label"
 msgstr "String yang ditampilkan pada label tab anak"
 
-#: ../gtk/gtknotebook.c:753
+#: ../gtk/gtknotebook.c:762
 msgid "Menu label"
 msgstr "Label menu"
 
-#: ../gtk/gtknotebook.c:754
+#: ../gtk/gtknotebook.c:763
 msgid "The string displayed in the child's menu entry"
 msgstr "String yang ditampilkan pada isian menu anak"
 
-#: ../gtk/gtknotebook.c:767
+#: ../gtk/gtknotebook.c:776
 msgid "Tab expand"
 msgstr "Ekspansi tab"
 
-#: ../gtk/gtknotebook.c:768
-#, fuzzy
+#: ../gtk/gtknotebook.c:777
 msgid "Whether to expand the child's tab"
-msgstr "Menentukan apakah tab anak diekspansi atau tidak"
+msgstr "Apakah tab anak dikembangkan"
 
-#: ../gtk/gtknotebook.c:774
+#: ../gtk/gtknotebook.c:783
 msgid "Tab fill"
 msgstr "Isi penuh tab"
 
-#: ../gtk/gtknotebook.c:775
-#, fuzzy
+#: ../gtk/gtknotebook.c:784
 msgid "Whether the child's tab should fill the allocated area"
-msgstr "Menentukan apakah tab anak dapat mengisi area yang dialokasikan atau tidak"
+msgstr "Apakah tab anak mesti mengisi penuh area yang dialokasikan"
 
-#: ../gtk/gtknotebook.c:782
+#: ../gtk/gtknotebook.c:791
 msgid "Tab reorderable"
 msgstr "Tab dapat diubah urutan"
 
-#: ../gtk/gtknotebook.c:783
-#, fuzzy
+#: ../gtk/gtknotebook.c:792
 msgid "Whether the tab is reorderable by user action"
-msgstr "Apakah tab dapat diubah urutannya oleh aksi pengguna atau tidak"
+msgstr "Apakah tab dapat diubah urutannya oleh aksi pengguna"
 
-#: ../gtk/gtknotebook.c:789
+#: ../gtk/gtknotebook.c:798
 msgid "Tab detachable"
 msgstr "Tab dapat dilepas"
 
-#: ../gtk/gtknotebook.c:790
+#: ../gtk/gtknotebook.c:799
 msgid "Whether the tab is detachable"
 msgstr "Apakah tab dapat dilepas"
 
-#: ../gtk/gtknotebook.c:805
+#: ../gtk/gtknotebook.c:814
 #: ../gtk/gtkscrollbar.c:102
 msgid "Secondary backward stepper"
 msgstr "Tangga mundur sekunder"
 
-#: ../gtk/gtknotebook.c:806
+#: ../gtk/gtknotebook.c:815
 msgid "Display a second backward arrow button on the opposite end of the tab area"
 msgstr "Menampilkan tombol panah mundur sekunder pada sisi ujung area tab"
 
-#: ../gtk/gtknotebook.c:821
+#: ../gtk/gtknotebook.c:830
 #: ../gtk/gtkscrollbar.c:109
 msgid "Secondary forward stepper"
 msgstr "Tangga maju sekunder"
 
-#: ../gtk/gtknotebook.c:822
+#: ../gtk/gtknotebook.c:831
 msgid "Display a second forward arrow button on the opposite end of the tab area"
 msgstr "Menampilkan tombol panah maju sekunder pada sisi ujung area tab"
 
-#: ../gtk/gtknotebook.c:836
+#: ../gtk/gtknotebook.c:845
 #: ../gtk/gtkscrollbar.c:88
 msgid "Backward stepper"
 msgstr "Tangga Mundur"
 
-#: ../gtk/gtknotebook.c:837
+#: ../gtk/gtknotebook.c:846
 #: ../gtk/gtkscrollbar.c:89
 msgid "Display the standard backward arrow button"
 msgstr "Menampilkan tombol panah mundur standar"
 
-#: ../gtk/gtknotebook.c:851
+#: ../gtk/gtknotebook.c:860
 #: ../gtk/gtkscrollbar.c:95
 msgid "Forward stepper"
 msgstr "Tangga maju"
 
-#: ../gtk/gtknotebook.c:852
+#: ../gtk/gtknotebook.c:861
 #: ../gtk/gtkscrollbar.c:96
 msgid "Display the standard forward arrow button"
 msgstr "Menampilkan tombol panah maju standar"
 
-#: ../gtk/gtknotebook.c:866
+#: ../gtk/gtknotebook.c:875
 msgid "Tab overlap"
 msgstr "Pertumpukan tab"
 
-#: ../gtk/gtknotebook.c:867
+#: ../gtk/gtknotebook.c:876
 msgid "Size of tab overlap area"
 msgstr "Ukuran dari wilayah bertumpuknya tab"
 
-#: ../gtk/gtknotebook.c:882
+#: ../gtk/gtknotebook.c:891
 msgid "Tab curvature"
 msgstr "Lengkungan tab"
 
-#: ../gtk/gtknotebook.c:883
+#: ../gtk/gtknotebook.c:892
 msgid "Size of tab curvature"
 msgstr "Ukuran dari lengkungan tab"
 
-#: ../gtk/gtknotebook.c:899
+#: ../gtk/gtknotebook.c:908
 msgid "Arrow spacing"
 msgstr "Jarak panah"
 
-#: ../gtk/gtknotebook.c:900
+#: ../gtk/gtknotebook.c:909
 msgid "Scroll arrow spacing"
 msgstr "Jarak panah penggulung"
 
-#: ../gtk/gtknotebook.c:916
-#, fuzzy
+#: ../gtk/gtknotebook.c:925
 msgid "Initial gap"
-msgstr "Emigrant Gap"
+msgstr "Celah awal"
 
-#: ../gtk/gtknotebook.c:917
+#: ../gtk/gtknotebook.c:926
 msgid "Initial gap before the first tab"
-msgstr ""
+msgstr "Celah awal sebelum tab pertama"
 
-#: ../gtk/gtknumerableicon.c:652
-#, fuzzy
+#: ../gtk/gtknumerableicon.c:653
 msgid "Icon's count"
-msgstr "<b>Jumlah anak</b>"
+msgstr "Cacah ikon"
 
-#: ../gtk/gtknumerableicon.c:653
-#, fuzzy
+#: ../gtk/gtknumerableicon.c:654
 msgid "The count of the emblem currently displayed"
-msgstr "Indeks halaman saat ini"
+msgstr "Cacan emblem yang kini ditampilkan"
 
-#: ../gtk/gtknumerableicon.c:659
-#, fuzzy
+#: ../gtk/gtknumerableicon.c:660
 msgid "Icon's label"
-msgstr "label akselerator"
+msgstr "Label ikon"
 
-#: ../gtk/gtknumerableicon.c:660
-#, fuzzy
+#: ../gtk/gtknumerableicon.c:661
 msgid "The label to be displayed over the icon"
-msgstr "Ikon stock ditampilkan pada objek"
+msgstr "Label yang ditampilkan di atas ikon"
 
-#: ../gtk/gtknumerableicon.c:666
-#, fuzzy
+#: ../gtk/gtknumerableicon.c:667
 msgid "Icon's style context"
-msgstr "Set gaya fonta"
+msgstr "Konteks gaya ikon"
 
-#: ../gtk/gtknumerableicon.c:667
+#: ../gtk/gtknumerableicon.c:668
 msgid "The style context to theme the icon appearance"
-msgstr ""
+msgstr "Konteks gaya untuk menata tema penampilan ikon"
 
-#: ../gtk/gtknumerableicon.c:673
-#, fuzzy
+#: ../gtk/gtknumerableicon.c:674
 msgid "Background icon"
-msgstr "Pilih ikon"
+msgstr "Ikon latar belakang"
 
-#: ../gtk/gtknumerableicon.c:674
+#: ../gtk/gtknumerableicon.c:675
 msgid "The icon for the number emblem background"
-msgstr ""
+msgstr "Ikon bagi latar belakang emblem angka"
 
-#: ../gtk/gtknumerableicon.c:680
-#, fuzzy
+#: ../gtk/gtknumerableicon.c:681
 msgid "Background icon name"
-msgstr "Kolom Nama Ikon"
+msgstr "Nama ikon latar belakang"
 
-#: ../gtk/gtknumerableicon.c:681
-#, fuzzy
+#: ../gtk/gtknumerableicon.c:682
 msgid "The icon name for the number emblem background"
-msgstr "Nama ikon yang dipakai untuk pencetak"
+msgstr "Nama ikon bagi latar belakang emblem angka"
 
 #: ../gtk/gtkorientable.c:63
-#: ../gtk/gtkstatusicon.c:311
-#: ../gtk/gtktrayicon-x11.c:125
+#: ../gtk/gtkstatusicon.c:342
+#: ../gtk/gtktrayicon-x11.c:128
 msgid "Orientation"
 msgstr "Orientasi"
 
@@ -4327,73 +4348,72 @@ msgstr "Orientasi"
 msgid "The orientation of the orientable"
 msgstr "Orientasi dari yang dapat diputar"
 
-#: ../gtk/gtkpaned.c:327
+#: ../gtk/gtkpaned.c:350
 msgid "Position of paned separator in pixels (0 means all the way to the left/top)"
 msgstr "Posisi pemisah pane dalam satuan piksel (0 berarti hingga ke sebelah kiri/atas)"
 
-#: ../gtk/gtkpaned.c:336
+#: ../gtk/gtkpaned.c:359
 msgid "Position Set"
 msgstr "Posisi diset"
 
-#: ../gtk/gtkpaned.c:337
+#: ../gtk/gtkpaned.c:360
 msgid "TRUE if the Position property should be used"
 msgstr "Bernilai TRUE apabila properti Posisi harus digunakan"
 
-#: ../gtk/gtkpaned.c:343
+#: ../gtk/gtkpaned.c:366
 msgid "Handle Size"
 msgstr "Ukuran handle"
 
-#: ../gtk/gtkpaned.c:344
+#: ../gtk/gtkpaned.c:367
 msgid "Width of handle"
 msgstr "Lebar handle"
 
-#: ../gtk/gtkpaned.c:360
+#: ../gtk/gtkpaned.c:383
 msgid "Minimal Position"
 msgstr "Posisi Minimal"
 
-#: ../gtk/gtkpaned.c:361
+#: ../gtk/gtkpaned.c:384
 msgid "Smallest possible value for the \"position\" property"
 msgstr "Nilai terkecil yang paling mungkin untuk nilai \"posisi\""
 
-#: ../gtk/gtkpaned.c:378
+#: ../gtk/gtkpaned.c:401
 msgid "Maximal Position"
 msgstr "Posisi Maksimal"
 
-#: ../gtk/gtkpaned.c:379
+#: ../gtk/gtkpaned.c:402
 msgid "Largest possible value for the \"position\" property"
 msgstr "Nilai terbesar yang paling mungkin untuk nilai \"posisi\""
 
-#: ../gtk/gtkpaned.c:396
+#: ../gtk/gtkpaned.c:419
 msgid "Resize"
 msgstr "Ganti ukuran"
 
-#: ../gtk/gtkpaned.c:397
+#: ../gtk/gtkpaned.c:420
 msgid "If TRUE, the child expands and shrinks along with the paned widget"
 msgstr "Bila bernilai TRUE, anak dapat diperbesar/kecil sebatas ukuran widget pan"
 
-#: ../gtk/gtkpaned.c:412
+#: ../gtk/gtkpaned.c:435
 msgid "Shrink"
 msgstr "Dapat dikecilkan"
 
-#: ../gtk/gtkpaned.c:413
+#: ../gtk/gtkpaned.c:436
 msgid "If TRUE, the child can be made smaller than its requisition"
 msgstr "Bila bernilai TRUE, anak dapat dibuat lebih kecil ukurannnya"
 
-#: ../gtk/gtkplug.c:201
-#: ../gtk/gtkstatusicon.c:295
+#: ../gtk/gtkplug.c:203
+#: ../gtk/gtkstatusicon.c:326
 msgid "Embedded"
 msgstr "Tertanam"
 
-#: ../gtk/gtkplug.c:202
-#, fuzzy
+#: ../gtk/gtkplug.c:204
 msgid "Whether the plug is embedded"
-msgstr "Apakah penutup tertanam atau tidak"
+msgstr "Apakah penutup tertanam"
 
-#: ../gtk/gtkplug.c:216
+#: ../gtk/gtkplug.c:218
 msgid "Socket Window"
 msgstr "Jendela Soket"
 
-#: ../gtk/gtkplug.c:217
+#: ../gtk/gtkplug.c:219
 msgid "The window of the socket the plug is embedded in"
 msgstr "Jendela tempat penutup ditanamkan pada soket"
 
@@ -4477,11 +4497,21 @@ msgstr "Menerima Tugas"
 msgid "TRUE if this printer is accepting new jobs"
 msgstr "TRUE bila pencetak ini siap menerima tugas baru"
 
-#: ../gtk/gtkprinteroptionwidget.c:121
+#: ../gtk/gtkprinteroption.c:105
+#| msgid "Minimum Value"
+msgid "Option Value"
+msgstr "Nilai Opsi"
+
+#: ../gtk/gtkprinteroption.c:106
+#| msgid "Name of the printer"
+msgid "Value of the option"
+msgstr "Nilai dari opsi"
+
+#: ../gtk/gtkprinteroptionwidget.c:122
 msgid "Source option"
 msgstr "Opsi sumber"
 
-#: ../gtk/gtkprinteroptionwidget.c:122
+#: ../gtk/gtkprinteroptionwidget.c:123
 msgid "The PrinterOption backing this widget"
 msgstr "PrinterOption yang mendukung widget ini"
 
@@ -4507,7 +4537,7 @@ msgstr "Tatanan pencetak"
 
 #: ../gtk/gtkprintjob.c:168
 #: ../gtk/gtkprintjob.c:169
-#: ../gtk/gtkprintunixdialog.c:298
+#: ../gtk/gtkprintunixdialog.c:368
 msgid "Page Setup"
 msgstr "Atur Halaman"
 
@@ -4529,12 +4559,12 @@ msgid "The GtkPageSetup used by default"
 msgstr "GtkPageSetup yang dipakai secara baku"
 
 #: ../gtk/gtkprintoperation.c:1097
-#: ../gtk/gtkprintunixdialog.c:316
+#: ../gtk/gtkprintunixdialog.c:386
 msgid "Print Settings"
 msgstr "Tatanan Pencetakan"
 
 #: ../gtk/gtkprintoperation.c:1098
-#: ../gtk/gtkprintunixdialog.c:317
+#: ../gtk/gtkprintunixdialog.c:387
 msgid "The GtkPrintSettings used for initializing the dialog"
 msgstr "GtkPrintSettings yang dipakai untuk menginisialisasi dialog"
 
@@ -4555,12 +4585,12 @@ msgid "The number of pages in the document."
 msgstr "Cacah halaman dalam dokumen."
 
 #: ../gtk/gtkprintoperation.c:1163
-#: ../gtk/gtkprintunixdialog.c:306
+#: ../gtk/gtkprintunixdialog.c:376
 msgid "Current Page"
 msgstr "Halaman Kini"
 
 #: ../gtk/gtkprintoperation.c:1164
-#: ../gtk/gtkprintunixdialog.c:307
+#: ../gtk/gtkprintunixdialog.c:377
 msgid "The current page in the document"
 msgstr "Halaman kini dalam dokumen"
 
@@ -4630,7 +4660,7 @@ msgid "Label for the tab containing custom widgets."
 msgstr "Label bagi tab yang memuat widget gubahan."
 
 #: ../gtk/gtkprintoperation.c:1360
-#: ../gtk/gtkprintunixdialog.c:341
+#: ../gtk/gtkprintunixdialog.c:411
 msgid "Support Selection"
 msgstr "Mendukung Pilihan"
 
@@ -4639,7 +4669,7 @@ msgid "TRUE if the print operation will support print of selection."
 msgstr "TRUE bila operasi pencetakan akan mendukung pencetakan dari pilihan."
 
 #: ../gtk/gtkprintoperation.c:1377
-#: ../gtk/gtkprintunixdialog.c:349
+#: ../gtk/gtkprintunixdialog.c:419
 msgid "Has Selection"
 msgstr "Punya Pilihan"
 
@@ -4648,7 +4678,7 @@ msgid "TRUE if a selection exists."
 msgstr "TRUE bila ada pilihan."
 
 #: ../gtk/gtkprintoperation.c:1393
-#: ../gtk/gtkprintunixdialog.c:357
+#: ../gtk/gtkprintunixdialog.c:427
 msgid "Embed Page Setup"
 msgstr "Tanamkan Penyiapan Halaman"
 
@@ -4664,116 +4694,115 @@ msgstr "Cacah Halaman Akan Dicetak"
 msgid "The number of pages that will be printed."
 msgstr "Cacah halaman yang akan dicetak"
 
-#: ../gtk/gtkprintunixdialog.c:299
+#: ../gtk/gtkprintunixdialog.c:369
 msgid "The GtkPageSetup to use"
 msgstr "GtkPageSetup yang akan dipakai"
 
-#: ../gtk/gtkprintunixdialog.c:324
+#: ../gtk/gtkprintunixdialog.c:394
 msgid "Selected Printer"
 msgstr "Pencetak Terpilih"
 
-#: ../gtk/gtkprintunixdialog.c:325
+#: ../gtk/gtkprintunixdialog.c:395
 msgid "The GtkPrinter which is selected"
 msgstr "GtkPrinter yang dipilih"
 
-#: ../gtk/gtkprintunixdialog.c:332
+#: ../gtk/gtkprintunixdialog.c:402
 msgid "Manual Capabilities"
 msgstr "Kapabilitas Manual"
 
-#: ../gtk/gtkprintunixdialog.c:333
+#: ../gtk/gtkprintunixdialog.c:403
 msgid "Capabilities the application can handle"
 msgstr "Kapabilitas yang dapat ditangani aplikasi"
 
-#: ../gtk/gtkprintunixdialog.c:342
+#: ../gtk/gtkprintunixdialog.c:412
 msgid "Whether the dialog supports selection"
 msgstr "Apakah dialog mendukung pilihan"
 
-#: ../gtk/gtkprintunixdialog.c:350
+#: ../gtk/gtkprintunixdialog.c:420
 msgid "Whether the application has a selection"
 msgstr "Apakah aplikasi memiliki pilihan"
 
-#: ../gtk/gtkprintunixdialog.c:358
+#: ../gtk/gtkprintunixdialog.c:428
 msgid "TRUE if page setup combos are embedded in GtkPrintUnixDialog"
 msgstr "TRUE bila kombo penyiapan halaman ditanamkan pada GtkPrintUnixDialog"
 
-#: ../gtk/gtkprogressbar.c:161
+#: ../gtk/gtkprogressbar.c:160
 msgid "Fraction"
 msgstr "Fraksi"
 
-#: ../gtk/gtkprogressbar.c:162
+#: ../gtk/gtkprogressbar.c:161
 msgid "The fraction of total work that has been completed"
 msgstr "Jumlah bagian yang telah selesai"
 
-#: ../gtk/gtkprogressbar.c:169
+#: ../gtk/gtkprogressbar.c:168
 msgid "Pulse Step"
 msgstr "Tahapan Pulsa"
 
-#: ../gtk/gtkprogressbar.c:170
+#: ../gtk/gtkprogressbar.c:169
 msgid "The fraction of total progress to move the bouncing block when pulsed"
 msgstr "Pecahan total kemajuan untuk memindahkan blok yang memantul saat diberi pulsa"
 
-#: ../gtk/gtkprogressbar.c:178
+#: ../gtk/gtkprogressbar.c:177
 msgid "Text to be displayed in the progress bar"
 msgstr "Teks yang ditampilkan pada progres bar"
 
-#: ../gtk/gtkprogressbar.c:195
+#: ../gtk/gtkprogressbar.c:198
 msgid "Show text"
 msgstr "Tampilkan teks"
 
-#: ../gtk/gtkprogressbar.c:196
+#: ../gtk/gtkprogressbar.c:199
 msgid "Whether the progress is shown as text."
 msgstr "Apakah kemajuan ditampilkan sebagai teks."
 
-#: ../gtk/gtkprogressbar.c:218
-#, fuzzy
+#: ../gtk/gtkprogressbar.c:221
 msgid "The preferred place to ellipsize the string, if the progress bar does not have enough room to display the entire string, if at all."
 msgstr "Tempat yang disukai untuk menyingkat string, bila bilah kemajuan tak punya cukup ruang untuk menampilkan seluruh string."
 
-#: ../gtk/gtkprogressbar.c:225
+#: ../gtk/gtkprogressbar.c:228
 msgid "X spacing"
 msgstr "Jarak x"
 
-#: ../gtk/gtkprogressbar.c:226
+#: ../gtk/gtkprogressbar.c:229
 msgid "Extra spacing applied to the width of a progress bar."
 msgstr "Ruang yang ditambahkan pada lebar batang kemajuan."
 
-#: ../gtk/gtkprogressbar.c:231
+#: ../gtk/gtkprogressbar.c:234
 msgid "Y spacing"
 msgstr "Jarak y"
 
-#: ../gtk/gtkprogressbar.c:232
+#: ../gtk/gtkprogressbar.c:235
 msgid "Extra spacing applied to the height of a progress bar."
 msgstr "Ruang yang ditambahkan pada tinggi batang kemajuan."
 
-#: ../gtk/gtkprogressbar.c:245
+#: ../gtk/gtkprogressbar.c:248
 msgid "Minimum horizontal bar width"
 msgstr "Lebar batang horisontal minimal"
 
-#: ../gtk/gtkprogressbar.c:246
+#: ../gtk/gtkprogressbar.c:249
 msgid "The minimum horizontal width of the progress bar"
 msgstr "Lebar horisontal minimum dari batang kemajuan"
 
-#: ../gtk/gtkprogressbar.c:258
+#: ../gtk/gtkprogressbar.c:261
 msgid "Minimum horizontal bar height"
 msgstr "Lebar batang horisontal minimal"
 
-#: ../gtk/gtkprogressbar.c:259
+#: ../gtk/gtkprogressbar.c:262
 msgid "Minimum horizontal height of the progress bar"
 msgstr "Tinggi horisontal minimum dari batang kemajuan"
 
-#: ../gtk/gtkprogressbar.c:271
+#: ../gtk/gtkprogressbar.c:274
 msgid "Minimum vertical bar width"
 msgstr "Lebar batang vertikal minimal"
 
-#: ../gtk/gtkprogressbar.c:272
+#: ../gtk/gtkprogressbar.c:275
 msgid "The minimum vertical width of the progress bar"
 msgstr "Lebar vertikal minimum dari batang kemajuan"
 
-#: ../gtk/gtkprogressbar.c:284
+#: ../gtk/gtkprogressbar.c:287
 msgid "Minimum vertical bar height"
 msgstr "Tinggi batang vertikal minimal"
 
-#: ../gtk/gtkprogressbar.c:285
+#: ../gtk/gtkprogressbar.c:288
 msgid "The minimum vertical height of the progress bar"
 msgstr "Tinggi vertikal minimum dari batang kemajuan"
 
@@ -4786,9 +4815,9 @@ msgid "The value returned by gtk_radio_action_get_current_value() when this acti
 msgstr "Nilai yang diberikan gtk_radio_action_get_current_valu() pada saat aksi ini dijadikan aksi utama dalam kelompoknya."
 
 #: ../gtk/gtkradioaction.c:135
-#: ../gtk/gtkradiobutton.c:163
-#: ../gtk/gtkradiomenuitem.c:374
-#: ../gtk/gtkradiotoolbutton.c:65
+#: ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiomenuitem.c:426
+#: ../gtk/gtkradiotoolbutton.c:85
 msgid "Group"
 msgstr "Kelompok"
 
@@ -4801,154 +4830,139 @@ msgid "The current value"
 msgstr "Nilai kini"
 
 #: ../gtk/gtkradioaction.c:152
-#, fuzzy
 msgid "The value property of the currently active member of the group to which this action belongs."
 msgstr "Properti nilai dari anggota yang sedang aktif dari grup pemilik aksi ini."
 
-#: ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiobutton.c:165
 msgid "The radio button whose group this widget belongs to."
 msgstr "Tombol radio tempat kelompok widget ini berada."
 
-#: ../gtk/gtkradiomenuitem.c:375
-#, fuzzy
+#: ../gtk/gtkradiomenuitem.c:427
 msgid "The radio menu item whose group this widget belongs to."
 msgstr "Butir menu radio tempat grup pemilik widget ini."
 
-#: ../gtk/gtkradiotoolbutton.c:66
-#, fuzzy
+#: ../gtk/gtkradiotoolbutton.c:86
 msgid "The radio tool button whose group this button belongs to."
 msgstr "Tombol alat radio tempat grup pemilik tombol ini."
 
-#: ../gtk/gtkrange.c:417
+#: ../gtk/gtkrange.c:419
 msgid "The GtkAdjustment that contains the current value of this range object"
 msgstr "GtkAdjustment yang berisi nilai sekarang pada obyek jangkauan"
 
-#: ../gtk/gtkrange.c:425
+#: ../gtk/gtkrange.c:427
 msgid "Invert direction slider moves to increase range value"
 msgstr "Balik arah slider yang bergerak untuk meningkatkan nilai jangkauan"
 
-#: ../gtk/gtkrange.c:432
-#, fuzzy
+#: ../gtk/gtkrange.c:434
 msgid "Lower stepper sensitivity"
 msgstr "Sensitivitas stepper bawah"
 
-#: ../gtk/gtkrange.c:433
-#, fuzzy
+#: ../gtk/gtkrange.c:435
 msgid "The sensitivity policy for the stepper that points to the adjustment's lower side"
 msgstr "Kebijakan sensitivitas bagi stepper yang menunjuk ke pengaturan sisi bawah"
 
-#: ../gtk/gtkrange.c:441
-#, fuzzy
+#: ../gtk/gtkrange.c:443
 msgid "Upper stepper sensitivity"
 msgstr "Sensitivitas stepper atas"
 
-#: ../gtk/gtkrange.c:442
-#, fuzzy
+#: ../gtk/gtkrange.c:444
 msgid "The sensitivity policy for the stepper that points to the adjustment's upper side"
 msgstr "Kebijakan sensitivitas bagi stepper yang menunjuk ke pengaturan sisi atas"
 
-#: ../gtk/gtkrange.c:459
+#: ../gtk/gtkrange.c:461
 msgid "Show Fill Level"
 msgstr "Tampilkan Tingkat Pengisian"
 
-#: ../gtk/gtkrange.c:460
-#, fuzzy
+#: ../gtk/gtkrange.c:462
 msgid "Whether to display a fill level indicator graphics on trough."
 msgstr "Apakah menampilkan grafik indikator tingkat pengisian."
 
-#: ../gtk/gtkrange.c:476
-#, fuzzy
+#: ../gtk/gtkrange.c:478
 msgid "Restrict to Fill Level"
 msgstr "Batasi Tingkat Pengisian"
 
-#: ../gtk/gtkrange.c:477
-#, fuzzy
+#: ../gtk/gtkrange.c:479
 msgid "Whether to restrict the upper boundary to the fill level."
 msgstr "Apakah perlu membatasi batas atas tingkat pengisian."
 
-#: ../gtk/gtkrange.c:492
+#: ../gtk/gtkrange.c:494
 msgid "Fill Level"
 msgstr "Tingkat Pengisian"
 
-#: ../gtk/gtkrange.c:493
+#: ../gtk/gtkrange.c:495
 msgid "The fill level."
 msgstr "Tingkat pengisian."
 
-#: ../gtk/gtkrange.c:510
-#, fuzzy
+#: ../gtk/gtkrange.c:512
 msgid "Round Digits"
-msgstr "Kolom digit"
+msgstr "Digit Pembulatan"
 
-#: ../gtk/gtkrange.c:511
-#, fuzzy
+#: ../gtk/gtkrange.c:513
 msgid "The number of digits to round the value to."
-msgstr "Cacah halaman dalam dokumen."
+msgstr "Nilai dibulatkan ke cacah digit ini."
 
-#: ../gtk/gtkrange.c:519
-#: ../gtk/gtkswitch.c:813
+#: ../gtk/gtkrange.c:521
+#: ../gtk/gtkswitch.c:817
 msgid "Slider Width"
 msgstr "Lebar slider"
 
-#: ../gtk/gtkrange.c:520
+#: ../gtk/gtkrange.c:522
 msgid "Width of scrollbar or scale thumb"
 msgstr "Lebar scrollbar atau patokan skala"
 
-#: ../gtk/gtkrange.c:527
+#: ../gtk/gtkrange.c:529
 msgid "Trough Border"
 msgstr "Batas"
 
-#: ../gtk/gtkrange.c:528
+#: ../gtk/gtkrange.c:530
 msgid "Spacing between thumb/steppers and outer trough bevel"
 msgstr "Besar ruangan antara patokan/tangga dan batas luar"
 
-#: ../gtk/gtkrange.c:535
+#: ../gtk/gtkrange.c:537
 msgid "Stepper Size"
 msgstr "Ukuran tangga"
 
-#: ../gtk/gtkrange.c:536
+#: ../gtk/gtkrange.c:538
 msgid "Length of step buttons at ends"
 msgstr "Panjang tombol tangga pada sisi ujung"
 
-#: ../gtk/gtkrange.c:549
+#: ../gtk/gtkrange.c:551
 msgid "Stepper Spacing"
 msgstr "Ruang isi tangga"
 
-#: ../gtk/gtkrange.c:550
+#: ../gtk/gtkrange.c:552
 msgid "Spacing between step buttons and thumb"
 msgstr "Besar ruangan yang mengisi antara tangga dan patokan"
 
-#: ../gtk/gtkrange.c:557
+#: ../gtk/gtkrange.c:559
 msgid "Arrow X Displacement"
 msgstr "Pemindahan sisi X panah"
 
-#: ../gtk/gtkrange.c:558
+#: ../gtk/gtkrange.c:560
 msgid "How far in the x direction to move the arrow when the button is depressed"
 msgstr "Seberapa jauh pada arah x yang digunakan untuk memindahkan panah saat tombol dilepas"
 
-#: ../gtk/gtkrange.c:565
+#: ../gtk/gtkrange.c:567
 msgid "Arrow Y Displacement"
 msgstr "Pemindahan sisi Y panah"
 
-#: ../gtk/gtkrange.c:566
+#: ../gtk/gtkrange.c:568
 msgid "How far in the y direction to move the arrow when the button is depressed"
 msgstr "Seberapa jauh pada arah y yang digunakan untuk memindahkan panah saat tombol dilepas"
 
-#: ../gtk/gtkrange.c:582
-#, fuzzy
+#: ../gtk/gtkrange.c:584
 msgid "Trough Under Steppers"
 msgstr "Trough Di Bawah Stepper"
 
-#: ../gtk/gtkrange.c:583
-#, fuzzy
+#: ../gtk/gtkrange.c:585
 msgid "Whether to draw trough for full length of range or exclude the steppers and spacing"
 msgstr "Apakah menggambar trough sepanjang jangkauan atau mengecualikan stepper dan jarak"
 
-#: ../gtk/gtkrange.c:596
+#: ../gtk/gtkrange.c:598
 msgid "Arrow scaling"
 msgstr "Penskalaan panah"
 
-#: ../gtk/gtkrange.c:597
-#, fuzzy
+#: ../gtk/gtkrange.c:599
 msgid "Arrow scaling with regard to scroll button size"
 msgstr "Penskalaan panah terhadap ukuran tombol gulir"
 
@@ -5031,7 +5045,6 @@ msgid "The sorting order of the items displayed"
 msgstr "Urutan pengurutan dari butir yang ditampilkan"
 
 #: ../gtk/gtkrecentchooser.c:265
-#, fuzzy
 msgid "The current filter for selecting which resources are displayed"
 msgstr "Tapis yang sedang dipakai untuk memilih sumber daya mana yang ditampilkan"
 
@@ -5043,92 +5056,90 @@ msgstr "Lokasi lengkap ke berkas untuk dipakai menyimpan dan membaca daftar"
 msgid "The size of the recently used resources list"
 msgstr "Ukuran dari daftar sumber daya yang baru-baru ini dipakai"
 
-#: ../gtk/gtkscalebutton.c:218
+#: ../gtk/gtkscalebutton.c:219
 msgid "The value of the scale"
 msgstr "Nilai skala"
 
-#: ../gtk/gtkscalebutton.c:228
+#: ../gtk/gtkscalebutton.c:229
 msgid "The icon size"
 msgstr "Ukuran ikon"
 
-#: ../gtk/gtkscalebutton.c:237
+#: ../gtk/gtkscalebutton.c:238
 msgid "The GtkAdjustment that contains the current value of this scale button object"
 msgstr "GtkAdjustment yang memuat nilai kini dari objek tombol skala ini"
 
-#: ../gtk/gtkscalebutton.c:265
+#: ../gtk/gtkscalebutton.c:266
 msgid "Icons"
 msgstr "Ikon"
 
-#: ../gtk/gtkscalebutton.c:266
+#: ../gtk/gtkscalebutton.c:267
 msgid "List of icon names"
 msgstr "Daftar nama ikon"
 
-#: ../gtk/gtkscale.c:253
+#: ../gtk/gtkscale.c:255
 msgid "The number of decimal places that are displayed in the value"
 msgstr "Jumlah desimal yang disajikan pada nilai"
 
-#: ../gtk/gtkscale.c:262
+#: ../gtk/gtkscale.c:264
 msgid "Draw Value"
 msgstr "Gambarkan nilai"
 
-#: ../gtk/gtkscale.c:263
+#: ../gtk/gtkscale.c:265
 msgid "Whether the current value is displayed as a string next to the slider"
 msgstr "Menentukan apakah nilai saat ini ditampilkan di samping slider sebagai string"
 
-#: ../gtk/gtkscale.c:270
+#: ../gtk/gtkscale.c:272
 msgid "Value Position"
 msgstr "Posisi nilai"
 
-#: ../gtk/gtkscale.c:271
+#: ../gtk/gtkscale.c:273
 msgid "The position in which the current value is displayed"
 msgstr "Posisi tempat nilai saat ini ditampilkan"
 
-#: ../gtk/gtkscale.c:278
+#: ../gtk/gtkscale.c:280
 msgid "Slider Length"
 msgstr "Panjang slider"
 
-#: ../gtk/gtkscale.c:279
+#: ../gtk/gtkscale.c:281
 msgid "Length of scale's slider"
 msgstr "Panjang slider skala"
 
-#: ../gtk/gtkscale.c:287
+#: ../gtk/gtkscale.c:289
 msgid "Value spacing"
 msgstr "Jarak Nilai"
 
-#: ../gtk/gtkscale.c:288
+#: ../gtk/gtkscale.c:290
 msgid "Space between value text and the slider/trough area"
 msgstr "Jarakn ruangan antara nilai teks dengan area slider"
 
-#: ../gtk/gtkscrollable.c:86
+#: ../gtk/gtkscrollable.c:94
 msgid "Horizontal adjustment"
 msgstr "Penyesuaian horisontal"
 
-#: ../gtk/gtkscrollable.c:87
+#: ../gtk/gtkscrollable.c:95
 msgid "Horizontal adjustment that is shared between the scrollable widget and its controller"
-msgstr ""
+msgstr "Penyesuaian horisontal yang dipakai bersama antara widget yang dapat digulung dan pengendalinya"
 
-#: ../gtk/gtkscrollable.c:103
+#: ../gtk/gtkscrollable.c:111
 msgid "Vertical adjustment"
 msgstr "Penyesuaian vertikal"
 
-#: ../gtk/gtkscrollable.c:104
+#: ../gtk/gtkscrollable.c:112
 msgid "Vertical adjustment that is shared between the scrollable widget and its controller"
-msgstr ""
+msgstr "Penyesuaian vertikal yang dipakai bersama antara widget yang dapat digulung dan pengendalinya"
 
-#: ../gtk/gtkscrollable.c:120
-#, fuzzy
+#: ../gtk/gtkscrollable.c:128
 msgid "Horizontal Scrollable Policy"
-msgstr "Kebijakan Scrollbar Horisontal"
+msgstr "Kebijakan Dapat Digulung Horisontal"
 
-#: ../gtk/gtkscrollable.c:121
-#: ../gtk/gtkscrollable.c:137
+#: ../gtk/gtkscrollable.c:129
+#: ../gtk/gtkscrollable.c:145
 msgid "How the size of the content should be determined"
-msgstr ""
+msgstr "Bagaimana ukuran isi mesti ditentukan"
 
-#: ../gtk/gtkscrollable.c:136
-#, fuzzy
+#: ../gtk/gtkscrollable.c:144
 msgid "Vertical Scrollable Policy"
-msgstr "Kebijakan Scrollbar Vertikal"
+msgstr "Kebijakan Dapat Digulung Vertikal"
 
 #: ../gtk/gtkscrollbar.c:72
 msgid "Minimum Slider Length"
@@ -5211,12 +5222,10 @@ msgid "Style of bevel around the contents"
 msgstr "Gaya bevel disekeliling isi"
 
 #: ../gtk/gtkscrolledwindow.c:367
-#, fuzzy
 msgid "Scrollbars within bevel"
 msgstr "Bilah gulir dengan bevel"
 
 #: ../gtk/gtkscrolledwindow.c:368
-#, fuzzy
 msgid "Place scrollbars within the scrolled window's bevel"
 msgstr "Tempatkan bilah gulir di dalam bevel jendela yang digulirkan"
 
@@ -5234,7 +5243,7 @@ msgstr "Lebar Minimal Isi"
 
 #: ../gtk/gtkscrolledwindow.c:392
 msgid "The minimum width that the scrolled window will allocate to its content"
-msgstr ""
+msgstr "Lebar minimal yang akan dialokasikan oleh jendela yang digulung ke isinya"
 
 #: ../gtk/gtkscrolledwindow.c:406
 msgid "Minimum Content Height"
@@ -5242,7 +5251,7 @@ msgstr "Tinggi Minimal Isi"
 
 #: ../gtk/gtkscrolledwindow.c:407
 msgid "The minimum height that the scrolled window will allocate to its content"
-msgstr ""
+msgstr "Tinggi minimal yang akan dialokasikan oleh jendela yang digulung ke isinya"
 
 #: ../gtk/gtkseparatortoolitem.c:143
 msgid "Draw"
@@ -5285,7 +5294,6 @@ msgid "Length of the cursor blink cycle, in milliseconds"
 msgstr "Panjang siklus kedip kursus, dalam milidetik"
 
 #: ../gtk/gtksettings.c:375
-#, fuzzy
 msgid "Cursor Blink Timeout"
 msgstr "Tenggat Kedip Kursor"
 
@@ -5306,9 +5314,8 @@ msgid "Theme Name"
 msgstr "Nama Tema"
 
 #: ../gtk/gtksettings.c:392
-#, fuzzy
 msgid "Name of theme to load"
-msgstr "Gagal membuka tema \"%s\": %s\n"
+msgstr "Nama tema untuk dimuat"
 
 #: ../gtk/gtksettings.c:400
 msgid "Icon Theme Name"
@@ -5319,12 +5326,10 @@ msgid "Name of icon theme to use"
 msgstr "Nama tema ikon yang digunakan"
 
 #: ../gtk/gtksettings.c:409
-#, fuzzy
 msgid "Fallback Icon Theme Name"
 msgstr "Nama Tema Ikon Cadangan Terakhir"
 
 #: ../gtk/gtksettings.c:410
-#, fuzzy
 msgid "Name of a icon theme to fall back to"
 msgstr "Nama tema ikon yang dipakai sebagai cadangan terakhir"
 
@@ -5333,9 +5338,8 @@ msgid "Key Theme Name"
 msgstr "Nama Tema Kunci"
 
 #: ../gtk/gtksettings.c:419
-#, fuzzy
 msgid "Name of key theme to load"
-msgstr "Nama berkas RC tema yang akan dibuka"
+msgstr "Name tema kunci untuk dimuat"
 
 #: ../gtk/gtksettings.c:427
 msgid "Menu bar accelerator"
@@ -5462,37 +5466,30 @@ msgid "Show the 'Insert Unicode Control Character' menu"
 msgstr "Tampilkan menu 'Sisipkan Karakter Kendali Unicode'"
 
 #: ../gtk/gtksettings.c:592
-#, fuzzy
 msgid "Whether the context menus of entries and text views should offer to insert control characters"
 msgstr "Apakah menu konteks dari entri dan tampilan teks harus menawarkan untuk menyisipkan karakter kendali. "
 
 #: ../gtk/gtksettings.c:600
-#, fuzzy
 msgid "Start timeout"
 msgstr "Tenggat awal"
 
 #: ../gtk/gtksettings.c:601
-#, fuzzy
 msgid "Starting value for timeouts, when button is pressed"
 msgstr "Nilai awal tenggat, ketika tombol ditekan"
 
 #: ../gtk/gtksettings.c:610
-#, fuzzy
 msgid "Repeat timeout"
 msgstr "Tenggat pengulangan"
 
 #: ../gtk/gtksettings.c:611
-#, fuzzy
 msgid "Repeat value for timeouts, when button is pressed"
 msgstr "Nilai pengulangan tenggat, ketika tombol ditekan"
 
 #: ../gtk/gtksettings.c:620
-#, fuzzy
 msgid "Expand timeout"
 msgstr "Tenggat perluasan"
 
 #: ../gtk/gtksettings.c:621
-#, fuzzy
 msgid "Expand value for timeouts, when a widget is expanding a new region"
 msgstr "Nilai perluasan tenggat, ketika suatu widget sedang mengembangkan wilayah baru"
 
@@ -5521,32 +5518,26 @@ msgid "When TRUE, there are no motion notify events delivered on this screen"
 msgstr "Bila TRUE, tak ada peristiwa pemberitahuan gerakan yang dikirim pada layar ini"
 
 #: ../gtk/gtksettings.c:703
-#, fuzzy
 msgid "Tooltip timeout"
-msgstr "Tenggat tooltip"
+msgstr "Tenggat balon petunjuk"
 
 #: ../gtk/gtksettings.c:704
-#, fuzzy
 msgid "Timeout before tooltip is shown"
-msgstr "Tenggat sebelum tooltip ditampilkan"
+msgstr "Tenggat sebelum balon petunjuk ditampilkan"
 
 #: ../gtk/gtksettings.c:729
-#, fuzzy
 msgid "Tooltip browse timeout"
-msgstr "Tenggat ramban tooltip"
+msgstr "Tenggat ramban balon petunjuk"
 
 #: ../gtk/gtksettings.c:730
-#, fuzzy
 msgid "Timeout before tooltip is shown when browse mode is enabled"
-msgstr "Tenggat sebelum tooltip ditampilkan ketika mode ramban diaktifkan"
+msgstr "Tenggat sebelum balon petunjuk ditampilkan ketika mode ramban diaktifkan"
 
 #: ../gtk/gtksettings.c:751
-#, fuzzy
 msgid "Tooltip browse mode timeout"
-msgstr "Tenggat mode ramban tooltip"
+msgstr "Tenggat mode ramban balon petunjuk"
 
 #: ../gtk/gtksettings.c:752
-#, fuzzy
 msgid "Timeout after which browse mode is disabled"
 msgstr "Tenggat setelah mode ramban dimatikan"
 
@@ -5559,12 +5550,10 @@ msgid "When TRUE, there are only cursor keys available to navigate widgets"
 msgstr "Bila TRUE, hanya kunci kursor yang tersedia untuk menavigasi widget"
 
 #: ../gtk/gtksettings.c:789
-#, fuzzy
 msgid "Keynav Wrap Around"
-msgstr "Keynav Lingkar Balik"
+msgstr "Keynav Melingkar Balik"
 
 #: ../gtk/gtksettings.c:790
-#, fuzzy
 msgid "Whether to wrap around when keyboard-navigating widgets"
 msgstr "Apakah memutar kembali ke awal ketika menavigasi widget memakai papan tik"
 
@@ -5609,12 +5598,10 @@ msgid "Command to run when displaying a print preview"
 msgstr "Perintah yang dijalankan ketika menampilkan suatu pratilik pencetakan"
 
 #: ../gtk/gtksettings.c:896
-#, fuzzy
 msgid "Enable Mnemonics"
 msgstr "Aktifkan Mnemonik"
 
 #: ../gtk/gtksettings.c:897
-#, fuzzy
 msgid "Whether labels should have mnemonics"
 msgstr "Apakah label mesti memiliki mnemonik"
 
@@ -5715,728 +5702,734 @@ msgstr "Mnemonik Otomatis"
 msgid "Whether mnemonics should be automatically shown and hidden when the user presses the mnemonic activator."
 msgstr "Apakah mnemonik perlu otomatis ditampilkan dan disembunyikan ketika pengguna menekan pengaktif mnemonik."
 
-#: ../gtk/gtksettings.c:1136
+#: ../gtk/gtksettings.c:1127
+#| msgid "Visible"
+msgid "Visible Focus"
+msgstr "Ambil Fokus"
+
+#: ../gtk/gtksettings.c:1128
+msgid "Whether 'focus rectangles' should be hidden until the user starts to use the keyboard."
+msgstr "Apakah 'focus rectangles' mesti disembunyikan sampai pengguna mulai memakai papan tik."
+
+#: ../gtk/gtksettings.c:1154
 msgid "Application prefers a dark theme"
 msgstr "Aplikasi lebih suka tema gelap"
 
-#: ../gtk/gtksettings.c:1137
+#: ../gtk/gtksettings.c:1155
 msgid "Whether the application prefers to have a dark theme."
 msgstr "Apakah aplikasi lebih suka memakai tema gelap."
 
-#: ../gtk/gtksettings.c:1152
+#: ../gtk/gtksettings.c:1170
 msgid "Show button images"
 msgstr "Tampilkan gambar pada tombol"
 
-#: ../gtk/gtksettings.c:1153
+#: ../gtk/gtksettings.c:1171
 msgid "Whether images should be shown on buttons"
 msgstr "Apakah citra akan ditampilkan pada tombol"
 
-#: ../gtk/gtksettings.c:1161
-#: ../gtk/gtksettings.c:1255
+#: ../gtk/gtksettings.c:1179
+#: ../gtk/gtksettings.c:1273
 msgid "Select on focus"
 msgstr "Langsung pilih saat fokus"
 
-#: ../gtk/gtksettings.c:1162
+#: ../gtk/gtksettings.c:1180
 msgid "Whether to select the contents of an entry when it is focused"
 msgstr "Menentukan apakah isi langsung dipilih saat isian mendapat fokus"
 
-#: ../gtk/gtksettings.c:1179
+#: ../gtk/gtksettings.c:1197
 msgid "Password Hint Timeout"
 msgstr "Waktu Tunggu Saran Sandi"
 
-#: ../gtk/gtksettings.c:1180
+#: ../gtk/gtksettings.c:1198
 msgid "How long to show the last input character in hidden entries"
 msgstr "Berapa lama menampilkan karakter masukan terakhir di masukan tersembunyi"
 
-#: ../gtk/gtksettings.c:1189
+#: ../gtk/gtksettings.c:1207
 msgid "Show menu images"
 msgstr "Tampilkan gambar menu"
 
-#: ../gtk/gtksettings.c:1190
+#: ../gtk/gtksettings.c:1208
 msgid "Whether images should be shown in menus"
 msgstr "Menentukan apakah gambar akan ditampilkan pada menu"
 
-#: ../gtk/gtksettings.c:1198
+#: ../gtk/gtksettings.c:1216
 msgid "Delay before drop down menus appear"
 msgstr "Jeda sebelum membuka menu drop-down"
 
-#: ../gtk/gtksettings.c:1199
+#: ../gtk/gtksettings.c:1217
 msgid "Delay before the submenus of a menu bar appear"
 msgstr "Jeda sebelum submenu suatu menu muncul"
 
-#: ../gtk/gtksettings.c:1216
+#: ../gtk/gtksettings.c:1234
 msgid "Scrolled Window Placement"
 msgstr "Penempatan Jendela Tergulung"
 
-#: ../gtk/gtksettings.c:1217
+#: ../gtk/gtksettings.c:1235
 msgid "Where the contents of scrolled windows are located with respect to the scrollbars, if not overridden by the scrolled window's own placement."
 msgstr "Dimana isi jendela tergulung ditempatkan terhadap batang penggulung, bila tak ditimpa oleh penempatan sendiri dari jendela tergulung."
 
-#: ../gtk/gtksettings.c:1226
+#: ../gtk/gtksettings.c:1244
 msgid "Can change accelerators"
 msgstr "Dapat mengganti akselerator"
 
-#: ../gtk/gtksettings.c:1227
+#: ../gtk/gtksettings.c:1245
 msgid "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr "Menentukan apakah akselerator menu dapat dirubah dengan menekan tombol lain pada menu"
 
-#: ../gtk/gtksettings.c:1235
+#: ../gtk/gtksettings.c:1253
 msgid "Delay before submenus appear"
 msgstr "Jeda sebelum sub menu ditampilkan"
 
-#: ../gtk/gtksettings.c:1236
+#: ../gtk/gtksettings.c:1254
 msgid "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr "Waktu minimum saat pointer diam di atas menu sebelum submenu muncul"
 
-#: ../gtk/gtksettings.c:1245
+#: ../gtk/gtksettings.c:1263
 msgid "Delay before hiding a submenu"
 msgstr "Jeda sebelum menyembunyikan submenu"
 
-#: ../gtk/gtksettings.c:1246
+#: ../gtk/gtksettings.c:1264
 msgid "The time before hiding a submenu when the pointer is moving towards the submenu"
 msgstr "Waktu sebelum menyembunyikan sub menu saat pointer bergerak menuju sub menu"
 
-#: ../gtk/gtksettings.c:1256
+#: ../gtk/gtksettings.c:1274
 msgid "Whether to select the contents of a selectable label when it is focused"
 msgstr "Apakah memilih isi dari suatu label yang dapat dipilih ketika menerima fokus"
 
-#: ../gtk/gtksettings.c:1264
+#: ../gtk/gtksettings.c:1282
 msgid "Custom palette"
 msgstr "Palet pilihan sendiri"
 
-#: ../gtk/gtksettings.c:1265
+#: ../gtk/gtksettings.c:1283
 msgid "Palette to use in the color selector"
 msgstr "Palet yang digunakan pada pemilih warna"
 
-#: ../gtk/gtksettings.c:1273
+#: ../gtk/gtksettings.c:1291
 msgid "IM Preedit style"
 msgstr "Gaya preedit IM"
 
-#: ../gtk/gtksettings.c:1274
+#: ../gtk/gtksettings.c:1292
 msgid "How to draw the input method preedit string"
 msgstr "Cara menggambar string preedit metode input"
 
-#: ../gtk/gtksettings.c:1283
+#: ../gtk/gtksettings.c:1301
 msgid "IM Status style"
 msgstr "Gaya status IM"
 
-#: ../gtk/gtksettings.c:1284
+#: ../gtk/gtksettings.c:1302
 msgid "How to draw the input method statusbar"
 msgstr "Cara menggambar statusbar metode input"
 
-#: ../gtk/gtksizegroup.c:301
+#: ../gtk/gtksizegroup.c:382
+#: ../gtk/gtktreeselection.c:130
 msgid "Mode"
 msgstr "Mode"
 
-#: ../gtk/gtksizegroup.c:302
+#: ../gtk/gtksizegroup.c:383
 msgid "The directions in which the size group affects the requested sizes of its component widgets"
 msgstr "Arah dimana grup ukuran mempengaruhi ukuran yang diminta dari widget komponennya"
 
-#: ../gtk/gtksizegroup.c:318
+#: ../gtk/gtksizegroup.c:399
 msgid "Ignore hidden"
 msgstr "Abaikan sembunyi"
 
-#: ../gtk/gtksizegroup.c:319
+#: ../gtk/gtksizegroup.c:400
 msgid "If TRUE, unmapped widgets are ignored when determining the size of the group"
 msgstr "Bila TRUE, widget tak terpetakan diabaikan ketikan menentukan ukuran grup"
 
-#: ../gtk/gtkspinbutton.c:328
+#: ../gtk/gtkspinbutton.c:331
 msgid "Climb Rate"
 msgstr "Laju Tanjakan"
 
-#: ../gtk/gtkspinbutton.c:348
+#: ../gtk/gtkspinbutton.c:351
 msgid "Snap to Ticks"
 msgstr "Jepret pada Tick"
 
-#: ../gtk/gtkspinbutton.c:349
+#: ../gtk/gtkspinbutton.c:352
 msgid "Whether erroneous values are automatically changed to a spin button's nearest step increment"
 msgstr "Menentukan apakah nilai galat otomatis dirubah sesuai dengan angka kenaikan spin button"
 
-#: ../gtk/gtkspinbutton.c:356
+#: ../gtk/gtkspinbutton.c:359
 msgid "Numeric"
 msgstr "Numerik"
 
-#: ../gtk/gtkspinbutton.c:357
+#: ../gtk/gtkspinbutton.c:360
 msgid "Whether non-numeric characters should be ignored"
 msgstr "Menentukan apakah karakter non-numerik diabaikan"
 
-#: ../gtk/gtkspinbutton.c:364
+#: ../gtk/gtkspinbutton.c:367
 msgid "Wrap"
 msgstr "Genap"
 
-#: ../gtk/gtkspinbutton.c:365
+#: ../gtk/gtkspinbutton.c:368
 msgid "Whether a spin button should wrap upon reaching its limits"
 msgstr "Menentukan apakah spin button digenapkan saat mencapai batas"
 
-#: ../gtk/gtkspinbutton.c:372
+#: ../gtk/gtkspinbutton.c:375
 msgid "Update Policy"
 msgstr "Kebijakan Update"
 
-#: ../gtk/gtkspinbutton.c:373
+#: ../gtk/gtkspinbutton.c:376
 msgid "Whether the spin button should update always, or only when the value is legal"
 msgstr "Menentukan apakah spin button selalu diupdate, atau hanya pada saat nilainya bernilai benar"
 
-#: ../gtk/gtkspinbutton.c:382
+#: ../gtk/gtkspinbutton.c:385
 msgid "Reads the current value, or sets a new value"
 msgstr "Membaca nilai saat ini, atau mengisi nilai baru"
 
-#: ../gtk/gtkspinbutton.c:391
+#: ../gtk/gtkspinbutton.c:394
 msgid "Style of bevel around the spin button"
 msgstr "Gaya bevel disekeliling tombol spin"
 
-#: ../gtk/gtkspinner.c:119
+#: ../gtk/gtkspinner.c:116
 msgid "Whether the spinner is active"
 msgstr "Apakah spinner aktif"
 
-#: ../gtk/gtkstatusbar.c:181
+#: ../gtk/gtkstatusbar.c:183
 msgid "Style of bevel around the statusbar text"
 msgstr "Gaya bevel di sekeliling teks statusbar"
 
-#: ../gtk/gtkstatusicon.c:262
+#: ../gtk/gtkstatusicon.c:293
 msgid "The size of the icon"
 msgstr "Ukuran ikon"
 
-#: ../gtk/gtkstatusicon.c:272
+#: ../gtk/gtkstatusicon.c:303
 msgid "The screen where this status icon will be displayed"
 msgstr "Layar dimana ikon status akan ditampilkan"
 
-#: ../gtk/gtkstatusicon.c:280
-#, fuzzy
+#: ../gtk/gtkstatusicon.c:311
 msgid "Whether the status icon is visible"
-msgstr "Apakah ikon status sedang nampak atau tidak"
+msgstr "Apakah ikon status nampak"
 
-#: ../gtk/gtkstatusicon.c:296
-#, fuzzy
+#: ../gtk/gtkstatusicon.c:327
 msgid "Whether the status icon is embedded"
-msgstr "Apakah ikon status ditanam atau tidak"
+msgstr "Apakah ikon status ditanam"
 
-#: ../gtk/gtkstatusicon.c:312
-#: ../gtk/gtktrayicon-x11.c:126
+#: ../gtk/gtkstatusicon.c:343
+#: ../gtk/gtktrayicon-x11.c:129
 msgid "The orientation of the tray"
 msgstr "Arah dari laci"
 
-#: ../gtk/gtkstatusicon.c:339
-#: ../gtk/gtkwidget.c:1067
+#: ../gtk/gtkstatusicon.c:370
+#: ../gtk/gtkwidget.c:1091
 msgid "Has tooltip"
 msgstr "Punya tooltip"
 
-#: ../gtk/gtkstatusicon.c:340
+#: ../gtk/gtkstatusicon.c:371
 msgid "Whether this tray icon has a tooltip"
 msgstr "Apakah ikon baki ini punya tooltip"
 
-#: ../gtk/gtkstatusicon.c:365
-#: ../gtk/gtkwidget.c:1088
+#: ../gtk/gtkstatusicon.c:396
+#: ../gtk/gtkwidget.c:1112
 msgid "Tooltip Text"
 msgstr "Teks Tooltip"
 
-#: ../gtk/gtkstatusicon.c:366
-#: ../gtk/gtkwidget.c:1089
-#: ../gtk/gtkwidget.c:1110
+#: ../gtk/gtkstatusicon.c:397
+#: ../gtk/gtkwidget.c:1113
+#: ../gtk/gtkwidget.c:1134
 msgid "The contents of the tooltip for this widget"
 msgstr "Isi tooltip bagi widget ini"
 
-#: ../gtk/gtkstatusicon.c:389
-#: ../gtk/gtkwidget.c:1109
+#: ../gtk/gtkstatusicon.c:420
+#: ../gtk/gtkwidget.c:1133
 msgid "Tooltip markup"
 msgstr "Markup tooltip"
 
-#: ../gtk/gtkstatusicon.c:390
+#: ../gtk/gtkstatusicon.c:421
 msgid "The contents of the tooltip for this tray icon"
 msgstr "Isi tooltip bagi ikon baki ini"
 
-#: ../gtk/gtkstatusicon.c:408
+#: ../gtk/gtkstatusicon.c:439
 msgid "The title of this tray icon"
 msgstr "Judul dari ikon baki ini"
 
 #: ../gtk/gtkstyle.c:471
-#, fuzzy
 msgid "Style context"
-msgstr "Bantuan _Konteks"
+msgstr "Konteks gaya"
 
 #: ../gtk/gtkstyle.c:472
 msgid "GtkStyleContext to get style from"
-msgstr ""
+msgstr "GtkStyleContext tempat mengambil gaya"
 
-#: ../gtk/gtkstylecontext.c:547
-#, fuzzy
+#: ../gtk/gtkstylecontext.c:433
 msgid "The associated GdkScreen"
-msgstr "Informasi yang berhubungan"
+msgstr "GdkScreen terkait"
 
-#: ../gtk/gtkstylecontext.c:553
-#, fuzzy
+#: ../gtk/gtkstylecontext.c:439
 msgid "Direction"
 msgstr "Arah"
 
-#: ../gtk/gtkstylecontext.c:554
-#: ../gtk/gtktexttag.c:236
+#: ../gtk/gtkstylecontext.c:440
+#: ../gtk/gtktexttag.c:269
 msgid "Text direction"
 msgstr "Arah teks"
 
-#: ../gtk/gtkswitch.c:779
-#, fuzzy
+#: ../gtk/gtkswitch.c:784
 msgid "Whether the switch is on or off"
-msgstr "Apakah widget disangga berganda"
+msgstr "Apakah saklar nyala atau mati"
 
-#: ../gtk/gtkswitch.c:814
-#, fuzzy
+#: ../gtk/gtkswitch.c:818
 msgid "The minimum width of the handle"
-msgstr "Lebar anak minimum"
+msgstr "Lebar minimal dari pegangan"
 
-#: ../gtk/gtktable.c:157
+#: ../gtk/gtktable.c:191
 msgid "Rows"
 msgstr "Baris"
 
-#: ../gtk/gtktable.c:158
+#: ../gtk/gtktable.c:192
 msgid "The number of rows in the table"
 msgstr "Jumlah baris dalam tabel"
 
-#: ../gtk/gtktable.c:166
+#: ../gtk/gtktable.c:200
 msgid "Columns"
 msgstr "Kolom"
 
-#: ../gtk/gtktable.c:167
+#: ../gtk/gtktable.c:201
 msgid "The number of columns in the table"
 msgstr "Jumlah kolom dalam tabel"
 
-#: ../gtk/gtktable.c:194
+#: ../gtk/gtktable.c:228
 msgid "If TRUE, the table cells are all the same width/height"
 msgstr "Bila TRUE, sel tabel memiliki tinggi/lebar yang sama"
 
-#: ../gtk/gtktable.c:208
+#: ../gtk/gtktable.c:242
 msgid "Right attachment"
 msgstr "Pasangan kanan"
 
-#: ../gtk/gtktable.c:209
+#: ../gtk/gtktable.c:243
 msgid "The column number to attach the right side of a child widget to"
 msgstr "jumlah kolom yang dipasangkan pada sisi kanan widget"
 
-#: ../gtk/gtktable.c:216
+#: ../gtk/gtktable.c:250
 msgid "The row number to attach the top of a child widget to"
 msgstr "Jumlah baris yang dipasangkan pada sisi atas widget"
 
-#: ../gtk/gtktable.c:222
+#: ../gtk/gtktable.c:256
 msgid "Bottom attachment"
 msgstr "Pasangan bawah"
 
-#: ../gtk/gtktable.c:229
+#: ../gtk/gtktable.c:263
 msgid "Horizontal options"
 msgstr "Opsi horisontal"
 
-#: ../gtk/gtktable.c:230
+#: ../gtk/gtktable.c:264
 msgid "Options specifying the horizontal behaviour of the child"
 msgstr "Pilihan yang menentukan kelakuan horisontal anak"
 
-#: ../gtk/gtktable.c:236
+#: ../gtk/gtktable.c:270
 msgid "Vertical options"
 msgstr "Opsi vertikal"
 
-#: ../gtk/gtktable.c:237
+#: ../gtk/gtktable.c:271
 msgid "Options specifying the vertical behaviour of the child"
 msgstr "Pilihan yang menentukan kelakuan vertikal anak"
 
-#: ../gtk/gtktable.c:243
+#: ../gtk/gtktable.c:277
 msgid "Horizontal padding"
 msgstr "Isian horisontal"
 
-#: ../gtk/gtktable.c:244
+#: ../gtk/gtktable.c:278
 msgid "Extra space to put between the child and its left and right neighbors, in pixels"
 msgstr "Ruangan ekstra yang diisikan di antara anak dan sisi tetangga kanan dan kiri, dalam satuan piksel"
 
-#: ../gtk/gtktable.c:250
+#: ../gtk/gtktable.c:284
 msgid "Vertical padding"
 msgstr "Isian vertikal"
 
-#: ../gtk/gtktable.c:251
+#: ../gtk/gtktable.c:285
 msgid "Extra space to put between the child and its upper and lower neighbors, in pixels"
 msgstr "Ruangan ekstra yang diisikan di antara anak dan sisi tetangga atas dan bawah, dalam satuan piksel"
 
-#: ../gtk/gtktextbuffer.c:192
+#: ../gtk/gtktextbuffer.c:203
 msgid "Tag Table"
 msgstr "Tabel Tag"
 
-#: ../gtk/gtktextbuffer.c:193
+#: ../gtk/gtktextbuffer.c:204
 msgid "Text Tag Table"
 msgstr "Tabel Tag Teks"
 
-#: ../gtk/gtktextbuffer.c:211
+#: ../gtk/gtktextbuffer.c:222
 msgid "Current text of the buffer"
 msgstr "Teks buffer saat ini"
 
-#: ../gtk/gtktextbuffer.c:225
+#: ../gtk/gtktextbuffer.c:236
 msgid "Has selection"
 msgstr "Punya pilihan"
 
-#: ../gtk/gtktextbuffer.c:226
+#: ../gtk/gtktextbuffer.c:237
 msgid "Whether the buffer has some text currently selected"
 msgstr "Apakah penyangga memiliki teks yang kini sedang dipilih"
 
-#: ../gtk/gtktextbuffer.c:242
+#: ../gtk/gtktextbuffer.c:253
 msgid "Cursor position"
 msgstr "Posisi kursor"
 
-#: ../gtk/gtktextbuffer.c:243
-#, fuzzy
+#: ../gtk/gtktextbuffer.c:254
 msgid "The position of the insert mark (as offset from the beginning of the buffer)"
 msgstr "Posisi tanda sisip (sebagai ofset dari awal penyangga)"
 
-#: ../gtk/gtktextbuffer.c:258
+#: ../gtk/gtktextbuffer.c:269
 msgid "Copy target list"
 msgstr "Salin daftar target"
 
-#: ../gtk/gtktextbuffer.c:259
-#, fuzzy
+#: ../gtk/gtktextbuffer.c:270
 msgid "The list of targets this buffer supports for clipboard copying and DND source"
 msgstr "Daftar target yang didukung oleh penyangga ini bagi penyalinan papan klip dan sumber DND"
 
-#: ../gtk/gtktextbuffer.c:274
+#: ../gtk/gtktextbuffer.c:285
 msgid "Paste target list"
 msgstr "Tempel daftar target"
 
-#: ../gtk/gtktextbuffer.c:275
-#, fuzzy
+#: ../gtk/gtktextbuffer.c:286
 msgid "The list of targets this buffer supports for clipboard pasting and DND destination"
 msgstr "Daftar target yang didukung oleh penyangga ini bagi penempelan papan klip dan tujuan DND"
 
-#: ../gtk/gtktextmark.c:90
-#, fuzzy
+#: ../gtk/gtktextmark.c:127
 msgid "Mark name"
 msgstr "Nama tanda"
 
-#: ../gtk/gtktextmark.c:97
-#, fuzzy
+#: ../gtk/gtktextmark.c:134
 msgid "Left gravity"
 msgstr "Gravitasi kiri"
 
-#: ../gtk/gtktextmark.c:98
-#, fuzzy
+#: ../gtk/gtktextmark.c:135
 msgid "Whether the mark has left gravity"
 msgstr "Apakah tanda memiliki gravitasi kiri"
 
-#: ../gtk/gtktexttag.c:186
+#: ../gtk/gtktexttag.c:189
 msgid "Tag name"
 msgstr "Nama tag"
 
-#: ../gtk/gtktexttag.c:187
+#: ../gtk/gtktexttag.c:190
 msgid "Name used to refer to the text tag. NULL for anonymous tags"
 msgstr "Nama yang digunakan untuk merujuk pada suatu tag teks. Isikan NULL untuk tag anonim"
 
-#: ../gtk/gtktexttag.c:205
-msgid "Background color as a (possibly unallocated) GdkColor"
-msgstr "Warna latar belakan dalam bentuk GdkColor (mungkin belum dialokasikan)"
+#: ../gtk/gtktexttag.c:222
+msgid "Background RGBA"
+msgstr "RGBA latar belakang"
 
-#: ../gtk/gtktexttag.c:212
+#: ../gtk/gtktexttag.c:230
 msgid "Background full height"
 msgstr "Latar belakang tinggi penuh"
 
-#: ../gtk/gtktexttag.c:213
+#: ../gtk/gtktexttag.c:231
 msgid "Whether the background color fills the entire line height or only the height of the tagged characters"
 msgstr "Menentukan pakah warna latar mengisi seluruhnya atau hanya setinggi karakter yang memiliki tag"
 
-#: ../gtk/gtktexttag.c:229
-msgid "Foreground color as a (possibly unallocated) GdkColor"
-msgstr "Warna depan dalam bentuk GdkColor (mungkin belum dialokasikan)"
+#: ../gtk/gtktexttag.c:261
+msgid "Foreground RGBA"
+msgstr "RGBA latar depan"
 
-#: ../gtk/gtktexttag.c:237
+#: ../gtk/gtktexttag.c:270
 msgid "Text direction, e.g. right-to-left or left-to-right"
 msgstr "Arah teks, misalnya kanan-ke-kiri atau kiri-ke-kanan"
 
-#: ../gtk/gtktexttag.c:286
+#: ../gtk/gtktexttag.c:319
 msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
 msgstr "Gaya huruf dalam PangoStyle, misal PANGO_STYLE_ITALIC"
 
-#: ../gtk/gtktexttag.c:295
+#: ../gtk/gtktexttag.c:328
 msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
 msgstr "Varian font dalam PangoVariant, misal PANGO_VARIANT_SMALL_CAPS"
 
-#: ../gtk/gtktexttag.c:304
+#: ../gtk/gtktexttag.c:337
 msgid "Font weight as an integer, see predefined values in PangoWeight; for example, PANGO_WEIGHT_BOLD"
 msgstr "Tinggi font dalam integer, coba lihat nilai konstanta pada PangoWeight, misal, PANGO_WEIGHT_BOLD"
 
-#: ../gtk/gtktexttag.c:315
+#: ../gtk/gtktexttag.c:348
 msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
 msgstr "Kerapatan font dalam PangoStretch, misal PANGO_STRETCH_CONDENSED"
 
-#: ../gtk/gtktexttag.c:324
+#: ../gtk/gtktexttag.c:357
 msgid "Font size in Pango units"
 msgstr "Ukuran font dalam unit Pango"
 
-#: ../gtk/gtktexttag.c:334
+#: ../gtk/gtktexttag.c:367
 msgid "Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE"
 msgstr "Ukuran font dalam faktor skala relatif ke ukuran font standar. Nilai ini beradaptasi otomatis saat berganti tematik dan sangat dianjurkan untuk diset.  Pango memiliki konstanta untuk beberapa ukuran, sebagai misal PANGO_SCALE_X_LARGE"
 
-#: ../gtk/gtktexttag.c:354
-#: ../gtk/gtktextview.c:702
+#: ../gtk/gtktexttag.c:387
+#: ../gtk/gtktextview.c:704
 msgid "Left, right, or center justification"
 msgstr "Rataan kiri, kanan, atau tengah"
 
-#: ../gtk/gtktexttag.c:373
+#: ../gtk/gtktexttag.c:406
 msgid "The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If not set, an appropriate default will be used."
 msgstr "Kode bahasa tulisan dalam teks dalam kode ISO. Pango menggunakan kode ini sebagai petunjuk dalam menggambar tulisan itu. Jika tidak ditentukan, maka kode standar akan digunakan."
 
-#: ../gtk/gtktexttag.c:380
+#: ../gtk/gtktexttag.c:413
 msgid "Left margin"
 msgstr "Margin kiri"
 
-#: ../gtk/gtktexttag.c:381
-#: ../gtk/gtktextview.c:711
+#: ../gtk/gtktexttag.c:414
+#: ../gtk/gtktextview.c:713
 msgid "Width of the left margin in pixels"
 msgstr "Lebar margin kiri dalam satuan piksel"
 
-#: ../gtk/gtktexttag.c:390
+#: ../gtk/gtktexttag.c:423
 msgid "Right margin"
 msgstr "Margin kanan"
 
-#: ../gtk/gtktexttag.c:391
-#: ../gtk/gtktextview.c:721
+#: ../gtk/gtktexttag.c:424
+#: ../gtk/gtktextview.c:723
 msgid "Width of the right margin in pixels"
 msgstr "Lebar margin kanan dalam satuan piksel"
 
-#: ../gtk/gtktexttag.c:401
-#: ../gtk/gtktextview.c:730
+#: ../gtk/gtktexttag.c:434
+#: ../gtk/gtktextview.c:732
 msgid "Indent"
 msgstr "Indentasi"
 
-#: ../gtk/gtktexttag.c:402
-#: ../gtk/gtktextview.c:731
+#: ../gtk/gtktexttag.c:435
+#: ../gtk/gtktextview.c:733
 msgid "Amount to indent the paragraph, in pixels"
 msgstr "Jumlah piksel untuk membuat indentasi paragraf"
 
-#: ../gtk/gtktexttag.c:413
-#, fuzzy
+#: ../gtk/gtktexttag.c:446
 msgid "Offset of text above the baseline (below the baseline if rise is negative) in Pango units"
 msgstr "Ofset teks di atas baseline (di bawah baseline bila kenaikan negatif) dalam unit Pango"
 
-#: ../gtk/gtktexttag.c:422
+#: ../gtk/gtktexttag.c:455
 msgid "Pixels above lines"
 msgstr "Piksel di atas tulisan"
 
-#: ../gtk/gtktexttag.c:423
-#: ../gtk/gtktextview.c:655
+#: ../gtk/gtktexttag.c:456
+#: ../gtk/gtktextview.c:657
 msgid "Pixels of blank space above paragraphs"
 msgstr "Jumlah piksel ruang kosong di atas paragraf"
 
-#: ../gtk/gtktexttag.c:432
+#: ../gtk/gtktexttag.c:465
 msgid "Pixels below lines"
 msgstr "Piksel di bawah tulisan"
 
-#: ../gtk/gtktexttag.c:433
-#: ../gtk/gtktextview.c:665
+#: ../gtk/gtktexttag.c:466
+#: ../gtk/gtktextview.c:667
 msgid "Pixels of blank space below paragraphs"
 msgstr "Jumlah piksel ruang kosong di bawah paragraf"
 
-#: ../gtk/gtktexttag.c:442
+#: ../gtk/gtktexttag.c:475
 msgid "Pixels inside wrap"
 msgstr "Piksel dalam potongan"
 
-#: ../gtk/gtktexttag.c:443
-#: ../gtk/gtktextview.c:675
+#: ../gtk/gtktexttag.c:476
+#: ../gtk/gtktextview.c:677
 msgid "Pixels of blank space between wrapped lines in a paragraph"
 msgstr "Banyaknya piksel kosong antara baris yang dipotong dalam paragraf"
 
-#: ../gtk/gtktexttag.c:470
-#: ../gtk/gtktextview.c:693
+#: ../gtk/gtktexttag.c:503
+#: ../gtk/gtktextview.c:695
 msgid "Whether to wrap lines never, at word boundaries, or at character boundaries"
 msgstr "Menentukan apakah baris tidak pernah dipotong, atau dipotong pada batas kata, atau dipotong pada batas karakter"
 
-#: ../gtk/gtktexttag.c:479
-#: ../gtk/gtktextview.c:740
+#: ../gtk/gtktexttag.c:512
+#: ../gtk/gtktextview.c:742
 msgid "Tabs"
 msgstr "Tab"
 
-#: ../gtk/gtktexttag.c:480
-#: ../gtk/gtktextview.c:741
+#: ../gtk/gtktexttag.c:513
+#: ../gtk/gtktextview.c:743
 msgid "Custom tabs for this text"
 msgstr "Tab sendiri untuk teks ini"
 
-#: ../gtk/gtktexttag.c:498
+#: ../gtk/gtktexttag.c:531
 msgid "Invisible"
 msgstr "Tidak kelihatan"
 
-#: ../gtk/gtktexttag.c:499
+#: ../gtk/gtktexttag.c:532
 msgid "Whether this text is hidden."
 msgstr "Menentukan apakah teks ini disembunyikan"
 
-#: ../gtk/gtktexttag.c:513
+#: ../gtk/gtktexttag.c:546
 msgid "Paragraph background color name"
 msgstr "Nama warna latar belakang paragraf"
 
-#: ../gtk/gtktexttag.c:514
+#: ../gtk/gtktexttag.c:547
 msgid "Paragraph background color as a string"
 msgstr "Warna latar belakang paragraf sebagai suatu string"
 
-#: ../gtk/gtktexttag.c:529
+#: ../gtk/gtktexttag.c:561
 msgid "Paragraph background color"
 msgstr "Warna latar belakang paragraf"
 
-#: ../gtk/gtktexttag.c:530
-msgid "Paragraph background color as a (possibly unallocated) GdkColor"
-msgstr "Warna latar paragraf dalam bentuk GdkColor (mungkin belum dialokasikan)"
+#: ../gtk/gtktexttag.c:562
+#| msgid "Paragraph background color as a string"
+msgid "Paragraph background color as a GdkColor"
+msgstr "Warna latar belakang paragraf sebagai GdkColor"
+
+#: ../gtk/gtktexttag.c:576
+#| msgid "Paragraph background set"
+msgid "Paragraph background RGBA"
+msgstr "RGBA latar belakang paragraf"
 
-#: ../gtk/gtktexttag.c:548
+#: ../gtk/gtktexttag.c:577
+#| msgid "Paragraph background color as a string"
+msgid "Paragraph background RGBA as a GdkRGBA"
+msgstr "RGBA latar belakang paragraf sebagai GdkRGBA"
+
+#: ../gtk/gtktexttag.c:595
 msgid "Margin Accumulates"
 msgstr "Akumulasi Margin"
 
-#: ../gtk/gtktexttag.c:549
+#: ../gtk/gtktexttag.c:596
 msgid "Whether left and right margins accumulate."
 msgstr "Apakah marjin kiri dan kanan dijumlahkan."
 
-#: ../gtk/gtktexttag.c:562
+#: ../gtk/gtktexttag.c:609
 msgid "Background full height set"
 msgstr "Latar belakang penuh"
 
-#: ../gtk/gtktexttag.c:563
+#: ../gtk/gtktexttag.c:610
 msgid "Whether this tag affects background height"
 msgstr "Menentukan apakah tag ini berpengaruh pada tinggi latar belakang"
 
-#: ../gtk/gtktexttag.c:602
+#: ../gtk/gtktexttag.c:649
 msgid "Justification set"
 msgstr "Set rataan"
 
-#: ../gtk/gtktexttag.c:603
+#: ../gtk/gtktexttag.c:650
 msgid "Whether this tag affects paragraph justification"
 msgstr "Menentukan apakah tag berpengaruh pada rataan paragraf"
 
-#: ../gtk/gtktexttag.c:610
+#: ../gtk/gtktexttag.c:657
 msgid "Left margin set"
 msgstr "Set margin kiri"
 
-#: ../gtk/gtktexttag.c:611
+#: ../gtk/gtktexttag.c:658
 msgid "Whether this tag affects the left margin"
 msgstr "Menentukan apakah tag berpengaruh pada margin kiri"
 
-#: ../gtk/gtktexttag.c:614
+#: ../gtk/gtktexttag.c:661
 msgid "Indent set"
 msgstr "Set indentasi"
 
-#: ../gtk/gtktexttag.c:615
+#: ../gtk/gtktexttag.c:662
 msgid "Whether this tag affects indentation"
 msgstr "Menentukan apakah tag berpengaruh pada indentasi"
 
-#: ../gtk/gtktexttag.c:622
+#: ../gtk/gtktexttag.c:669
 msgid "Pixels above lines set"
 msgstr "Set piksel di atas garis"
 
-#: ../gtk/gtktexttag.c:623
-#: ../gtk/gtktexttag.c:627
+#: ../gtk/gtktexttag.c:670
+#: ../gtk/gtktexttag.c:674
 msgid "Whether this tag affects the number of pixels above lines"
 msgstr "Menentukan tag berpengaruh pada jumlah piksel pada garis atas"
 
-#: ../gtk/gtktexttag.c:626
+#: ../gtk/gtktexttag.c:673
 msgid "Pixels below lines set"
 msgstr "Set piksel di bawah garis"
 
-#: ../gtk/gtktexttag.c:630
+#: ../gtk/gtktexttag.c:677
 msgid "Pixels inside wrap set"
 msgstr "Set piksel dalam potongan"
 
-#: ../gtk/gtktexttag.c:631
+#: ../gtk/gtktexttag.c:678
 msgid "Whether this tag affects the number of pixels between wrapped lines"
 msgstr "Menentukan tag berpengaruh pada jumlah piksel antara baris-baris yang dipotong"
 
-#: ../gtk/gtktexttag.c:638
+#: ../gtk/gtktexttag.c:685
 msgid "Right margin set"
 msgstr "Set margin kanan"
 
-#: ../gtk/gtktexttag.c:639
+#: ../gtk/gtktexttag.c:686
 msgid "Whether this tag affects the right margin"
 msgstr "Menentukan tag apakah berpengaruh pada margin kanan"
 
-#: ../gtk/gtktexttag.c:646
+#: ../gtk/gtktexttag.c:693
 msgid "Wrap mode set"
 msgstr "Set modus potongan"
 
-#: ../gtk/gtktexttag.c:647
+#: ../gtk/gtktexttag.c:694
 msgid "Whether this tag affects line wrap mode"
 msgstr "Menentukan apakah tag berpengaruh pada modus pemotongan garis"
 
-#: ../gtk/gtktexttag.c:650
+#: ../gtk/gtktexttag.c:697
 msgid "Tabs set"
 msgstr "Set tab"
 
-#: ../gtk/gtktexttag.c:651
+#: ../gtk/gtktexttag.c:698
 msgid "Whether this tag affects tabs"
 msgstr "Menentukan apakah tag mempengaruhi tab"
 
-#: ../gtk/gtktexttag.c:654
+#: ../gtk/gtktexttag.c:701
 msgid "Invisible set"
 msgstr "Set Menghilang"
 
-#: ../gtk/gtktexttag.c:655
+#: ../gtk/gtktexttag.c:702
 msgid "Whether this tag affects text visibility"
 msgstr "Menentukan apakah tag mempengaruhi hilang/timbulnya teks"
 
-#: ../gtk/gtktexttag.c:658
+#: ../gtk/gtktexttag.c:705
 msgid "Paragraph background set"
 msgstr "Ketentuan latar belakang paragraf"
 
-#: ../gtk/gtktexttag.c:659
+#: ../gtk/gtktexttag.c:706
 msgid "Whether this tag affects the paragraph background color"
 msgstr "Tentukan apakah tag ini berpengaruh pada warna latar belakang paragraf"
 
-#: ../gtk/gtktextview.c:654
+#: ../gtk/gtktextview.c:656
 msgid "Pixels Above Lines"
 msgstr "Piksel Di Atas Garis"
 
-#: ../gtk/gtktextview.c:664
+#: ../gtk/gtktextview.c:666
 msgid "Pixels Below Lines"
 msgstr "Piksel Di Bawah Garis"
 
-#: ../gtk/gtktextview.c:674
+#: ../gtk/gtktextview.c:676
 msgid "Pixels Inside Wrap"
 msgstr "Piksel Dalam Pelipatan"
 
-#: ../gtk/gtktextview.c:692
+#: ../gtk/gtktextview.c:694
 msgid "Wrap Mode"
 msgstr "Mode Pembengkokan"
 
-#: ../gtk/gtktextview.c:710
+#: ../gtk/gtktextview.c:712
 msgid "Left Margin"
 msgstr "Margin Kiri"
 
-#: ../gtk/gtktextview.c:720
+#: ../gtk/gtktextview.c:722
 msgid "Right Margin"
 msgstr "Margin Kanan"
 
-#: ../gtk/gtktextview.c:748
+#: ../gtk/gtktextview.c:750
 msgid "Cursor Visible"
 msgstr "Kursor Nampak"
 
-#: ../gtk/gtktextview.c:749
+#: ../gtk/gtktextview.c:751
 msgid "If the insertion cursor is shown"
 msgstr "Menentukan apakah kursor untuk menulis kelihatan atau tidak"
 
-#: ../gtk/gtktextview.c:756
+#: ../gtk/gtktextview.c:758
 msgid "Buffer"
 msgstr "Buffer"
 
-#: ../gtk/gtktextview.c:757
+#: ../gtk/gtktextview.c:759
 msgid "The buffer which is displayed"
 msgstr "Buffer yang ditampilkan"
 
-#: ../gtk/gtktextview.c:765
+#: ../gtk/gtktextview.c:767
 msgid "Whether entered text overwrites existing contents"
 msgstr "Menentukan apakah teks yang dimasukkan menimpa isi yang ada sebelumnya"
 
-#: ../gtk/gtktextview.c:772
+#: ../gtk/gtktextview.c:774
 msgid "Accepts tab"
 msgstr "Perbolehkan tab"
 
-#: ../gtk/gtktextview.c:773
+#: ../gtk/gtktextview.c:775
 msgid "Whether Tab will result in a tab character being entered"
-msgstr "Menentukan apakah bila Tab ditekan maka akan menyisipkan karakter Tab"
+msgstr "Apakah Tab akan menyisipkan karakter Tab"
 
-#: ../gtk/gtktextview.c:808
+#: ../gtk/gtktextview.c:810
 msgid "Error underline color"
 msgstr "Warna garis bawah galat"
 
-#: ../gtk/gtktextview.c:809
+#: ../gtk/gtktextview.c:811
 msgid "Color with which to draw error-indication underlines"
 msgstr "Warna untuk menggambar garis bawah kesalahan"
 
-#: ../gtk/gtkthemingengine.c:249
-#, fuzzy
+#: ../gtk/gtkthemingengine.c:257
 msgid "Theming engine name"
-msgstr "Nama Tema"
+msgstr "Nama mesin penyusun tema"
 
 #: ../gtk/gtktoggleaction.c:118
 msgid "Create the same proxies as a radio action"
@@ -6444,315 +6437,315 @@ msgstr "Buat proxi yang sama sebagai suatu aksi radio"
 
 #: ../gtk/gtktoggleaction.c:119
 msgid "Whether the proxies for this action look like radio action proxies"
-msgstr "Menentukan apkah proksi aksi ini berupa proksi aksi radio"
+msgstr "Apakah proksi aksi ini berupa proksi aksi radio"
 
 #: ../gtk/gtktoggleaction.c:134
-#, fuzzy
 msgid "Whether the toggle action should be active"
-msgstr "Apakah pemilihan harus mengikuti penunjuk"
+msgstr "Apakah aksi jungkit mesti aktif"
 
-#: ../gtk/gtktogglebutton.c:126
-#: ../gtk/gtktoggletoolbutton.c:113
-#, fuzzy
+#: ../gtk/gtktogglebutton.c:179
+#: ../gtk/gtktoggletoolbutton.c:128
 msgid "If the toggle button should be pressed in"
-msgstr "Menentukan apakah tombol togel harus ditekan ke dalam atau tidak"
+msgstr "Apakah tombol jungkit harus ditekan ke dalam"
 
-#: ../gtk/gtktogglebutton.c:134
+#: ../gtk/gtktogglebutton.c:187
 msgid "If the toggle button is in an \"in between\" state"
 msgstr "Menentukan apakah tombol togel ada dalam kondisi \"antara\""
 
-#: ../gtk/gtktogglebutton.c:141
+#: ../gtk/gtktogglebutton.c:194
 msgid "Draw Indicator"
 msgstr "Indikator gambar"
 
-#: ../gtk/gtktogglebutton.c:142
+#: ../gtk/gtktogglebutton.c:195
 msgid "If the toggle part of the button is displayed"
 msgstr "Menentukan apakah bagian togel tombol ditampilkan"
 
-#: ../gtk/gtktoolbar.c:489
-#: ../gtk/gtktoolpalette.c:1069
+#: ../gtk/gtktoolbar.c:501
+#: ../gtk/gtktoolpalette.c:1038
 msgid "Toolbar Style"
 msgstr "Gaya toolbar"
 
-#: ../gtk/gtktoolbar.c:490
+#: ../gtk/gtktoolbar.c:502
 msgid "How to draw the toolbar"
 msgstr "Cara menggambar toolbar"
 
-#: ../gtk/gtktoolbar.c:497
+#: ../gtk/gtktoolbar.c:509
 msgid "Show Arrow"
 msgstr "Tampilkan Panah"
 
-#: ../gtk/gtktoolbar.c:498
+#: ../gtk/gtktoolbar.c:510
 msgid "If an arrow should be shown if the toolbar doesn't fit"
 msgstr "Menentukan apakah panah harus ditampilkan pada toolbar bila ruangannya sudah tidak cukup"
 
-#: ../gtk/gtktoolbar.c:519
+#: ../gtk/gtktoolbar.c:531
 msgid "Size of icons in this toolbar"
 msgstr "Ukuran ikon pada batang perkakas ini"
 
-#: ../gtk/gtktoolbar.c:534
-#: ../gtk/gtktoolpalette.c:1055
+#: ../gtk/gtktoolbar.c:546
+#: ../gtk/gtktoolpalette.c:1024
 msgid "Icon size set"
 msgstr "Ukuran ikon ditata"
 
-#: ../gtk/gtktoolbar.c:535
-#: ../gtk/gtktoolpalette.c:1056
+#: ../gtk/gtktoolbar.c:547
+#: ../gtk/gtktoolpalette.c:1025
 msgid "Whether the icon-size property has been set"
 msgstr "Apakah properti icon-size telah ditata"
 
-#: ../gtk/gtktoolbar.c:544
+#: ../gtk/gtktoolbar.c:556
 msgid "Whether the item should receive extra space when the toolbar grows"
 msgstr "Menentukan apakah obyek bisa menambah ruang saat toolbar bertambah besar"
 
-#: ../gtk/gtktoolbar.c:552
-#: ../gtk/gtktoolitemgroup.c:1650
+#: ../gtk/gtktoolbar.c:564
+#: ../gtk/gtktoolitemgroup.c:1646
 msgid "Whether the item should be the same size as other homogeneous items"
 msgstr "Menentukan apakah obyek memiliki ukuran yang sama dengan obyek homogen lain atau tidak"
 
-#: ../gtk/gtktoolbar.c:559
+#: ../gtk/gtktoolbar.c:571
 msgid "Spacer size"
 msgstr "Ukuran pengisi ruang"
 
-#: ../gtk/gtktoolbar.c:560
+#: ../gtk/gtktoolbar.c:572
 msgid "Size of spacers"
 msgstr "Ukuran pengisi ruang"
 
-#: ../gtk/gtktoolbar.c:569
+#: ../gtk/gtktoolbar.c:581
 msgid "Amount of border space between the toolbar shadow and the buttons"
 msgstr "Jumlah ruangan dalam batas antara bayangan toolbar dan tombolnya"
 
-#: ../gtk/gtktoolbar.c:577
+#: ../gtk/gtktoolbar.c:589
 msgid "Maximum child expand"
 msgstr "Ekspansi anak maksimal"
 
-#: ../gtk/gtktoolbar.c:578
+#: ../gtk/gtktoolbar.c:590
 msgid "Maximum amount of space an expandable item will be given"
 msgstr "Banyaknya ruang maksimum yang diberikan kepada suatu butir yang dapat dikembangkan"
 
-#: ../gtk/gtktoolbar.c:586
+#: ../gtk/gtktoolbar.c:598
 msgid "Space style"
 msgstr "Gaya pengisi ruangan"
 
-#: ../gtk/gtktoolbar.c:587
+#: ../gtk/gtktoolbar.c:599
 msgid "Whether spacers are vertical lines or just blank"
 msgstr "Menentukan apakah pengisi ruangan digambar secara vertikal atau kosong saja"
 
-#: ../gtk/gtktoolbar.c:594
+#: ../gtk/gtktoolbar.c:606
 msgid "Button relief"
 msgstr "Relief tombol"
 
-#: ../gtk/gtktoolbar.c:595
+#: ../gtk/gtktoolbar.c:607
 msgid "Type of bevel around toolbar buttons"
 msgstr "Tipe gaya dekorasi di sekeliling tombol toolbar"
 
-#: ../gtk/gtktoolbar.c:602
+#: ../gtk/gtktoolbar.c:614
 msgid "Style of bevel around the toolbar"
 msgstr "Gaya dekorasi sekeliling toolbar"
 
-#: ../gtk/gtktoolbutton.c:202
+#: ../gtk/gtktoolbutton.c:233
 msgid "Text to show in the item."
 msgstr "Teks yang akan ditampilkan pada objek"
 
-#: ../gtk/gtktoolbutton.c:209
+#: ../gtk/gtktoolbutton.c:240
 msgid "If set, an underline in the label property indicates that the next character should be used for the mnemonic accelerator key in the overflow menu"
 msgstr "Jika ditentukan, sebuah garis bawah pada label mengindikasikan bahwa karakter selanjutnya harus dipergunakan untuk kunci akselerator mnemonic pada menu yang overflow."
 
-#: ../gtk/gtktoolbutton.c:216
+#: ../gtk/gtktoolbutton.c:247
 msgid "Widget to use as the item label"
 msgstr "Widget yang digunakan sebagai label objek"
 
-#: ../gtk/gtktoolbutton.c:222
+#: ../gtk/gtktoolbutton.c:253
 msgid "Stock Id"
 msgstr "ID Stok"
 
-#: ../gtk/gtktoolbutton.c:223
+#: ../gtk/gtktoolbutton.c:254
 msgid "The stock icon displayed on the item"
 msgstr "Ikon stock ditampilkan pada objek"
 
-#: ../gtk/gtktoolbutton.c:239
+#: ../gtk/gtktoolbutton.c:270
 msgid "Icon name"
 msgstr "Nama ikon"
 
-#: ../gtk/gtktoolbutton.c:240
+#: ../gtk/gtktoolbutton.c:271
 msgid "The name of the themed icon displayed on the item"
 msgstr "Nama ikon tematik yang ditampilkan pada objek"
 
-#: ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolbutton.c:277
 msgid "Icon widget"
 msgstr "Widget ikon"
 
-#: ../gtk/gtktoolbutton.c:247
+#: ../gtk/gtktoolbutton.c:278
 msgid "Icon widget to display in the item"
 msgstr "Widget ikon untuk ditampilkan pada objek"
 
-#: ../gtk/gtktoolbutton.c:260
+#: ../gtk/gtktoolbutton.c:291
 msgid "Icon spacing"
 msgstr "Jarak ikon"
 
-#: ../gtk/gtktoolbutton.c:261
+#: ../gtk/gtktoolbutton.c:292
 msgid "Spacing in pixels between the icon and label"
 msgstr "Jarak dalam piksel antara ikon dan label"
 
-#: ../gtk/gtktoolitem.c:210
+#: ../gtk/gtktoolitem.c:209
 msgid "Whether the toolbar item is considered important. When TRUE, toolbar buttons show text in GTK_TOOLBAR_BOTH_HORIZ mode"
 msgstr "Menentukan apakah isi batang alat ini penting atau tidak. Bila diisi TRUE, maka tombol dalam batang alat akan menampilkan teks dalam moda GTK_TOOLBAR_BOTH_HORIZ"
 
-#: ../gtk/gtktoolitemgroup.c:1597
+#: ../gtk/gtktoolitemgroup.c:1593
 msgid "The human-readable title of this item group"
 msgstr "Judul yang mudah dibaca dari grup butir ini"
 
-#: ../gtk/gtktoolitemgroup.c:1604
+#: ../gtk/gtktoolitemgroup.c:1600
 msgid "A widget to display in place of the usual label"
 msgstr "Widget yang ditampilkan sebagai pengganti label yang biasanya"
 
-#: ../gtk/gtktoolitemgroup.c:1610
+#: ../gtk/gtktoolitemgroup.c:1606
 msgid "Collapsed"
 msgstr "Dilipat"
 
-#: ../gtk/gtktoolitemgroup.c:1611
+#: ../gtk/gtktoolitemgroup.c:1607
 msgid "Whether the group has been collapsed and items are hidden"
 msgstr "Apakah grup telah dilipat dan butir-butir disembunyikan"
 
-#: ../gtk/gtktoolitemgroup.c:1617
+#: ../gtk/gtktoolitemgroup.c:1613
 msgid "ellipsize"
 msgstr "elipsiskan"
 
-#: ../gtk/gtktoolitemgroup.c:1618
+#: ../gtk/gtktoolitemgroup.c:1614
 msgid "Ellipsize for item group headers"
 msgstr "Singkatkan butir tajuk grup"
 
-#: ../gtk/gtktoolitemgroup.c:1624
+#: ../gtk/gtktoolitemgroup.c:1620
 msgid "Header Relief"
 msgstr "Relief Tajuk"
 
-#: ../gtk/gtktoolitemgroup.c:1625
-#, fuzzy
+#: ../gtk/gtktoolitemgroup.c:1621
 msgid "Relief of the group header button"
 msgstr "Relief bagi tombol tajuk grup"
 
-#: ../gtk/gtktoolitemgroup.c:1640
+#: ../gtk/gtktoolitemgroup.c:1636
 msgid "Header Spacing"
 msgstr "Jarak Tajuk"
 
-#: ../gtk/gtktoolitemgroup.c:1641
+#: ../gtk/gtktoolitemgroup.c:1637
 msgid "Spacing between expander arrow and caption"
 msgstr "Jarak antara panah pengembang dan keterangan gambar"
 
-#: ../gtk/gtktoolitemgroup.c:1657
+#: ../gtk/gtktoolitemgroup.c:1653
 msgid "Whether the item should receive extra space when the group grows"
 msgstr "Apakah butir mesti menerima ruang tambahan ketika grup berkembang"
 
-#: ../gtk/gtktoolitemgroup.c:1664
+#: ../gtk/gtktoolitemgroup.c:1660
 msgid "Whether the item should fill the available space"
 msgstr "Apakah butir mesti mengisi ruang tersedia"
 
-#: ../gtk/gtktoolitemgroup.c:1670
+#: ../gtk/gtktoolitemgroup.c:1666
 msgid "New Row"
 msgstr "Baris Baru"
 
-#: ../gtk/gtktoolitemgroup.c:1671
+#: ../gtk/gtktoolitemgroup.c:1667
 msgid "Whether the item should start a new row"
 msgstr "Apakah butir mesti memulai suatu baris baru"
 
-#: ../gtk/gtktoolitemgroup.c:1678
+#: ../gtk/gtktoolitemgroup.c:1674
 msgid "Position of the item within this group"
 msgstr "Posisi butir dalam grup ini"
 
-#: ../gtk/gtktoolpalette.c:1040
+#: ../gtk/gtktoolpalette.c:1009
 msgid "Size of icons in this tool palette"
 msgstr "Ukuran ikon di palet perkakas ini"
 
-#: ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktoolpalette.c:1039
 msgid "Style of items in the tool palette"
 msgstr "Gaya butir di palet perkakas ini"
 
-#: ../gtk/gtktoolpalette.c:1086
+#: ../gtk/gtktoolpalette.c:1055
 msgid "Exclusive"
 msgstr "Eksklusif"
 
-#: ../gtk/gtktoolpalette.c:1087
+#: ../gtk/gtktoolpalette.c:1056
 msgid "Whether the item group should be the only expanded at a given time"
 msgstr "Apakah grup butir mesti hanya satu-satunya yang dikembangkan pada suatu saat"
 
-#: ../gtk/gtktoolpalette.c:1102
+#: ../gtk/gtktoolpalette.c:1071
 msgid "Whether the item group should receive extra space when the palette grows"
 msgstr "Apakah grup butir mesti menerima ruang tambahan ketika palet berkembang"
 
-#: ../gtk/gtktrayicon-x11.c:135
+#: ../gtk/gtktrayicon-x11.c:138
 msgid "Foreground color for symbolic icons"
 msgstr "Warna latar depan bagi ikon simbolis"
 
-#: ../gtk/gtktrayicon-x11.c:142
+#: ../gtk/gtktrayicon-x11.c:145
 msgid "Error color"
 msgstr "Warna galat"
 
-#: ../gtk/gtktrayicon-x11.c:143
+#: ../gtk/gtktrayicon-x11.c:146
 msgid "Error color for symbolic icons"
 msgstr "Warna galat bagi ikon simbolis"
 
-#: ../gtk/gtktrayicon-x11.c:150
+#: ../gtk/gtktrayicon-x11.c:153
 msgid "Warning color"
 msgstr "Warna peringatan"
 
-#: ../gtk/gtktrayicon-x11.c:151
+#: ../gtk/gtktrayicon-x11.c:154
 msgid "Warning color for symbolic icons"
 msgstr "Warna peringatan bagi ikon simbolis"
 
-#: ../gtk/gtktrayicon-x11.c:158
+#: ../gtk/gtktrayicon-x11.c:161
 msgid "Success color"
 msgstr "Warna sukses"
 
-#: ../gtk/gtktrayicon-x11.c:159
+#: ../gtk/gtktrayicon-x11.c:162
 msgid "Success color for symbolic icons"
 msgstr "Warna sukses bagi ikon simbolis"
 
-#: ../gtk/gtktrayicon-x11.c:167
+#: ../gtk/gtktrayicon-x11.c:170
 msgid "Padding that should be put around icons in the tray"
 msgstr "Pengganjal yang mesti diletakkan di sekitar ikon di baki"
 
+#: ../gtk/gtktrayicon-x11.c:179
+#| msgid "Icon Sizes"
+msgid "Icon Size"
+msgstr "Ukuran Ikon"
+
+#: ../gtk/gtktrayicon-x11.c:180
+msgid "The pixel size that icons should be forced to, or zero"
+msgstr "Ikon mesti dipaksa ukuran pikselnya sekian, atau nol"
+
 #: ../gtk/gtktreemenu.c:287
-#, fuzzy
 msgid "TreeMenu model"
-msgstr "<b>Model Bahasa</b>"
+msgstr "Model MenuPohon"
 
 #: ../gtk/gtktreemenu.c:288
-#, fuzzy
 msgid "The model for the tree menu"
-msgstr "Model TreeView"
+msgstr "Model bagi menu pohon"
 
 #: ../gtk/gtktreemenu.c:310
 msgid "TreeMenu root row"
-msgstr ""
+msgstr "Baris akar MenuPohon"
 
 #: ../gtk/gtktreemenu.c:311
 msgid "The TreeMenu will display children of the specified root"
-msgstr ""
+msgstr "MenuPohon akan menampilkan anak dari akar yang dinyatakan"
 
 #: ../gtk/gtktreemenu.c:344
-#, fuzzy
 msgid "Tearoff"
-msgstr "Judul saat disobek"
+msgstr "Lepasan"
 
 #: ../gtk/gtktreemenu.c:345
-#, fuzzy
 msgid "Whether the menu has a tearoff item"
-msgstr "Apakah dropdown harus memiliki sebuah objek menu tearoff"
+msgstr "Apakah menu memiliki butir yang dapat dilepas"
 
 #: ../gtk/gtktreemenu.c:361
-#, fuzzy
 msgid "Wrap Width"
-msgstr "Lebar pembengkokan"
+msgstr "Lebar Pelipatan"
 
 #: ../gtk/gtktreemenu.c:362
-#, fuzzy
 msgid "Wrap width for laying out items in a grid"
 msgstr "Lebar lipatan untuk menata letak butir dalam kisi"
 
-#: ../gtk/gtktreemodelsort.c:312
+#: ../gtk/gtktreemodelsort.c:419
 msgid "TreeModelSort Model"
 msgstr "Model TreeModelSort"
 
-#: ../gtk/gtktreemodelsort.c:313
+#: ../gtk/gtktreemodelsort.c:420
 msgid "The model for the TreeModelSort to sort"
 msgstr "Model untuk mengurutkan TreeModelSort"
 
@@ -6829,7 +6822,6 @@ msgid "Whether the selection should follow the pointer"
 msgstr "Apakah pemilihan harus mengikuti penunjuk"
 
 #: ../gtk/gtktreeview.c:1108
-#, fuzzy
 msgid "Hover Expand"
 msgstr "Perluasan Hover"
 
@@ -6961,724 +6953,738 @@ msgstr "Pola garis bentuk pohon"
 msgid "Dash pattern used to draw the tree view lines"
 msgstr "Pola garis putus yang dipakai untuk menggambar garis tilikan bentuk pohon"
 
-#: ../gtk/gtktreeviewcolumn.c:247
+#: ../gtk/gtktreeviewcolumn.c:249
 msgid "Whether to display the column"
 msgstr "Menentukan apakah kolom ditampilkan"
 
-#: ../gtk/gtktreeviewcolumn.c:254
-#: ../gtk/gtkwindow.c:642
+#: ../gtk/gtktreeviewcolumn.c:256
+#: ../gtk/gtkwindow.c:650
 msgid "Resizable"
 msgstr "Dapat diubah ukurannya"
 
-#: ../gtk/gtktreeviewcolumn.c:255
+#: ../gtk/gtktreeviewcolumn.c:257
 msgid "Column is user-resizable"
 msgstr "Ukuran kolom dapat dirubah user"
 
-#: ../gtk/gtktreeviewcolumn.c:263
+#: ../gtk/gtktreeviewcolumn.c:265
+#| msgid "Current width of the column"
+msgid "Current X position of the column"
+msgstr "Posisi X kolom kini"
+
+#: ../gtk/gtktreeviewcolumn.c:275
 msgid "Current width of the column"
 msgstr "Lebar kolom saat ini"
 
-#: ../gtk/gtktreeviewcolumn.c:280
+#: ../gtk/gtktreeviewcolumn.c:292
 msgid "Sizing"
 msgstr "Merubah ukuran"
 
-#: ../gtk/gtktreeviewcolumn.c:281
+#: ../gtk/gtktreeviewcolumn.c:293
 msgid "Resize mode of the column"
 msgstr "Modus perubahan ukuran pada kolom"
 
-#: ../gtk/gtktreeviewcolumn.c:289
+#: ../gtk/gtktreeviewcolumn.c:301
 msgid "Fixed Width"
 msgstr "Lebar Tetap"
 
-#: ../gtk/gtktreeviewcolumn.c:290
+#: ../gtk/gtktreeviewcolumn.c:302
 msgid "Current fixed width of the column"
 msgstr "Lebar kolom yang tetap pada saat ini"
 
-#: ../gtk/gtktreeviewcolumn.c:300
+#: ../gtk/gtktreeviewcolumn.c:312
 msgid "Minimum allowed width of the column"
 msgstr "Lebar minimal kolom yang diizinkan"
 
-#: ../gtk/gtktreeviewcolumn.c:309
+#: ../gtk/gtktreeviewcolumn.c:321
 msgid "Maximum Width"
 msgstr "Lebar maksimal"
 
-#: ../gtk/gtktreeviewcolumn.c:310
+#: ../gtk/gtktreeviewcolumn.c:322
 msgid "Maximum allowed width of the column"
 msgstr "Lebar maksimal kolom yang diizinkan"
 
-#: ../gtk/gtktreeviewcolumn.c:320
+#: ../gtk/gtktreeviewcolumn.c:332
 msgid "Title to appear in column header"
 msgstr "Judul yang ditampilkan pada bagian atas kolom"
 
-#: ../gtk/gtktreeviewcolumn.c:328
+#: ../gtk/gtktreeviewcolumn.c:340
 msgid "Column gets share of extra width allocated to the widget"
 msgstr "Kolom dapat bagian lebar ekstra yang belum dijatahkan pada widget"
 
-#: ../gtk/gtktreeviewcolumn.c:335
+#: ../gtk/gtktreeviewcolumn.c:347
 msgid "Clickable"
 msgstr "Bisa diklik"
 
-#: ../gtk/gtktreeviewcolumn.c:336
+#: ../gtk/gtktreeviewcolumn.c:348
 msgid "Whether the header can be clicked"
 msgstr "Menentukan apakah header dapat diklik"
 
-#: ../gtk/gtktreeviewcolumn.c:344
+#: ../gtk/gtktreeviewcolumn.c:356
 msgid "Widget"
 msgstr "Widget"
 
-#: ../gtk/gtktreeviewcolumn.c:345
+#: ../gtk/gtktreeviewcolumn.c:357
 msgid "Widget to put in column header button instead of column title"
 msgstr "Widget yang diletakkan pada tombol header bagian atas kolom  dan bukan pada judul kolom"
 
-#: ../gtk/gtktreeviewcolumn.c:353
+#: ../gtk/gtktreeviewcolumn.c:365
 msgid "X Alignment of the column header text or widget"
 msgstr "Penyesuaian X pada teks header kolom atau widget"
 
-#: ../gtk/gtktreeviewcolumn.c:363
+#: ../gtk/gtktreeviewcolumn.c:375
 msgid "Whether the column can be reordered around the headers"
 msgstr "Menentukan apakah kolom dapat diurut kembali pada header"
 
-#: ../gtk/gtktreeviewcolumn.c:370
+#: ../gtk/gtktreeviewcolumn.c:382
 msgid "Sort indicator"
 msgstr "Indikator pengurutan"
 
-#: ../gtk/gtktreeviewcolumn.c:371
+#: ../gtk/gtktreeviewcolumn.c:383
 msgid "Whether to show a sort indicator"
 msgstr "Menentukan apakah menampilkan indikator pengurutan"
 
-#: ../gtk/gtktreeviewcolumn.c:378
+#: ../gtk/gtktreeviewcolumn.c:390
 msgid "Sort order"
 msgstr "Arah pengurutan"
 
-#: ../gtk/gtktreeviewcolumn.c:379
+#: ../gtk/gtktreeviewcolumn.c:391
 msgid "Sort direction the sort indicator should indicate"
 msgstr "Arah pengurutan yang ditampilkan oleh indikator pengurutan"
 
-#: ../gtk/gtktreeviewcolumn.c:395
+#: ../gtk/gtktreeviewcolumn.c:407
 msgid "Sort column ID"
 msgstr "ID kolom pengurut"
 
-#: ../gtk/gtktreeviewcolumn.c:396
+#: ../gtk/gtktreeviewcolumn.c:408
 msgid "Logical sort column ID this column sorts on when selected for sorting"
 msgstr "ID lojik kolom pengurutan yang dipakai ketika dipilih untuk pengurutan"
 
-#: ../gtk/gtkuimanager.c:226
+#: ../gtk/gtkuimanager.c:480
 msgid "Whether tearoff menu items should be added to menus"
 msgstr "Apakah menu objek tearoff harus ditambahkan ke menu"
 
-#: ../gtk/gtkuimanager.c:233
+#: ../gtk/gtkuimanager.c:487
 msgid "Merged UI definition"
 msgstr "Gabungan definisi antarmuka pengguna"
 
-#: ../gtk/gtkuimanager.c:234
+#: ../gtk/gtkuimanager.c:488
 msgid "An XML string describing the merged UI"
 msgstr "Teks XML mengenai gabungan antarmuka"
 
-#: ../gtk/gtkviewport.c:154
+#: ../gtk/gtkviewport.c:156
 msgid "Determines how the shadowed box around the viewport is drawn"
 msgstr "Menentukan bagaimana menggambar kotak berbayang di sekeliling viewport"
 
 #: ../gtk/gtkvolumebutton.c:156
-#, fuzzy
 msgid "Use symbolic icons"
-msgstr "G_unakan Ikon Kecil"
+msgstr "Pakai ikon simbolik"
 
 #: ../gtk/gtkvolumebutton.c:157
-#, fuzzy
 msgid "Whether to use symbolic icons"
-msgstr "Warna peringatan bagi ikon simbolis"
+msgstr "Apakah memakai ikon simbolik"
 
-#: ../gtk/gtkwidget.c:926
+#: ../gtk/gtkwidget.c:950
 msgid "Widget name"
 msgstr "Nama widget"
 
-#: ../gtk/gtkwidget.c:927
+#: ../gtk/gtkwidget.c:951
 msgid "The name of the widget"
 msgstr "Nama widget"
 
-#: ../gtk/gtkwidget.c:933
+#: ../gtk/gtkwidget.c:957
 msgid "Parent widget"
 msgstr "Widget Bapak"
 
-#: ../gtk/gtkwidget.c:934
+#: ../gtk/gtkwidget.c:958
 msgid "The parent widget of this widget. Must be a Container widget"
 msgstr "Bapak widget ini. Harus berupa widget Container"
 
-#: ../gtk/gtkwidget.c:941
+#: ../gtk/gtkwidget.c:965
 msgid "Width request"
 msgstr "Permintaan lebar"
 
-#: ../gtk/gtkwidget.c:942
+#: ../gtk/gtkwidget.c:966
 msgid "Override for width request of the widget, or -1 if natural request should be used"
 msgstr "Nilai yang diberikan saat ada permintaan nilai lebar, atau bernilai -1 apabila permintaan dilakukan natural"
 
-#: ../gtk/gtkwidget.c:950
+#: ../gtk/gtkwidget.c:974
 msgid "Height request"
 msgstr "Permintaan tinggi"
 
-#: ../gtk/gtkwidget.c:951
+#: ../gtk/gtkwidget.c:975
 msgid "Override for height request of the widget, or -1 if natural request should be used"
 msgstr "Nilai yang diberikan saat ada permintaan nilai tinggi, atau bernilai -1 apabila permintaan dilakukan natural"
 
-#: ../gtk/gtkwidget.c:960
+#: ../gtk/gtkwidget.c:984
 msgid "Whether the widget is visible"
 msgstr "Menentukan apakah widget terlihat atau tidak"
 
-#: ../gtk/gtkwidget.c:967
+#: ../gtk/gtkwidget.c:991
 msgid "Whether the widget responds to input"
 msgstr "Menentukan apakah widget memberi respon pada semua input"
 
-#: ../gtk/gtkwidget.c:973
+#: ../gtk/gtkwidget.c:997
 msgid "Application paintable"
 msgstr "Aplikasi dapat menggambar"
 
-#: ../gtk/gtkwidget.c:974
+#: ../gtk/gtkwidget.c:998
 msgid "Whether the application will paint directly on the widget"
 msgstr "Menentukan apakah aplikasi dapat menggambar langsung pada widget"
 
-#: ../gtk/gtkwidget.c:980
+#: ../gtk/gtkwidget.c:1004
 msgid "Can focus"
 msgstr "Dapat memiliki fokus"
 
-#: ../gtk/gtkwidget.c:981
+#: ../gtk/gtkwidget.c:1005
 msgid "Whether the widget can accept the input focus"
 msgstr "Menentukan apakah widget dapat menerima fokus input"
 
-#: ../gtk/gtkwidget.c:987
+#: ../gtk/gtkwidget.c:1011
 msgid "Has focus"
 msgstr "Memiliki fokus"
 
-#: ../gtk/gtkwidget.c:988
+#: ../gtk/gtkwidget.c:1012
 msgid "Whether the widget has the input focus"
 msgstr "Menentukan apakah widget memiliki fokus input"
 
-#: ../gtk/gtkwidget.c:994
+#: ../gtk/gtkwidget.c:1018
 msgid "Is focus"
 msgstr "Fokus"
 
-#: ../gtk/gtkwidget.c:995
+#: ../gtk/gtkwidget.c:1019
 msgid "Whether the widget is the focus widget within the toplevel"
 msgstr "Menentukan apakah widget adalah widget fokus dalam tingkat atas"
 
-#: ../gtk/gtkwidget.c:1001
+#: ../gtk/gtkwidget.c:1025
 msgid "Can default"
 msgstr "Dapat menjadi default"
 
-#: ../gtk/gtkwidget.c:1002
+#: ../gtk/gtkwidget.c:1026
 msgid "Whether the widget can be the default widget"
 msgstr "Menentukan apakah widget dapat menjadi widget default"
 
-#: ../gtk/gtkwidget.c:1008
+#: ../gtk/gtkwidget.c:1032
 msgid "Has default"
 msgstr "Memiliki default"
 
-#: ../gtk/gtkwidget.c:1009
+#: ../gtk/gtkwidget.c:1033
 msgid "Whether the widget is the default widget"
 msgstr "Menentukan apakah widget adalah widget default"
 
-#: ../gtk/gtkwidget.c:1015
+#: ../gtk/gtkwidget.c:1039
 msgid "Receives default"
 msgstr "Menerima default"
 
-#: ../gtk/gtkwidget.c:1016
+#: ../gtk/gtkwidget.c:1040
 msgid "If TRUE, the widget will receive the default action when it is focused"
 msgstr "Apabila bernilai TRUE, widget dapat menerima aksi default saat menerima fokus"
 
-#: ../gtk/gtkwidget.c:1022
+#: ../gtk/gtkwidget.c:1046
 msgid "Composite child"
 msgstr "Anak komposit"
 
-#: ../gtk/gtkwidget.c:1023
+#: ../gtk/gtkwidget.c:1047
 msgid "Whether the widget is part of a composite widget"
 msgstr "Menentukan apakah widget merupakan bagian dari widget komposit"
 
-#: ../gtk/gtkwidget.c:1029
+#: ../gtk/gtkwidget.c:1053
 msgid "Style"
 msgstr "Gaya"
 
-#: ../gtk/gtkwidget.c:1030
+#: ../gtk/gtkwidget.c:1054
 msgid "The style of the widget, which contains information about how it will look (colors etc)"
 msgstr "Gaya widget, yang berisi bagaimana dia akan ditampilkan (warna dsb)"
 
-#: ../gtk/gtkwidget.c:1036
+#: ../gtk/gtkwidget.c:1060
 msgid "Events"
 msgstr "Kejadian"
 
-#: ../gtk/gtkwidget.c:1037
+#: ../gtk/gtkwidget.c:1061
 msgid "The event mask that decides what kind of GdkEvents this widget gets"
 msgstr "Tipe kejadian yang menentukan jenis GdkEvents yang akan diterima widget"
 
-#: ../gtk/gtkwidget.c:1044
+#: ../gtk/gtkwidget.c:1068
 msgid "No show all"
 msgstr "Jangan tampilkan semua"
 
-#: ../gtk/gtkwidget.c:1045
+#: ../gtk/gtkwidget.c:1069
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Menentukan apakah gtk_widget_show_all() tidak perlu mempengaruhi widget ini atau tidak"
 
-#: ../gtk/gtkwidget.c:1068
+#: ../gtk/gtkwidget.c:1092
 msgid "Whether this widget has a tooltip"
 msgstr "Apakah widget memiliki suatu tooltip"
 
-#: ../gtk/gtkwidget.c:1124
+#: ../gtk/gtkwidget.c:1148
 msgid "Window"
 msgstr "Jendela"
 
-#: ../gtk/gtkwidget.c:1125
+#: ../gtk/gtkwidget.c:1149
 msgid "The widget's window if it is realized"
 msgstr "Jendela widget bila diwujudkan"
 
-#: ../gtk/gtkwidget.c:1139
+#: ../gtk/gtkwidget.c:1163
 msgid "Double Buffered"
 msgstr "Disangga Berganda"
 
-#: ../gtk/gtkwidget.c:1140
+#: ../gtk/gtkwidget.c:1164
 msgid "Whether the widget is double buffered"
 msgstr "Apakah widget disangga berganda"
 
-#: ../gtk/gtkwidget.c:1155
+#: ../gtk/gtkwidget.c:1179
 msgid "How to position in extra horizontal space"
 msgstr "Bagaimana memposisikan di ruang horisontal ekstra"
 
-#: ../gtk/gtkwidget.c:1171
+#: ../gtk/gtkwidget.c:1195
 msgid "How to position in extra vertical space"
 msgstr "Bagaimana memposisikan di ruang vertikal ekstra"
 
-#: ../gtk/gtkwidget.c:1190
+#: ../gtk/gtkwidget.c:1214
 msgid "Margin on Left"
 msgstr "Marjin di Kiri"
 
-#: ../gtk/gtkwidget.c:1191
+#: ../gtk/gtkwidget.c:1215
 msgid "Pixels of extra space on the left side"
 msgstr "Cacah piksel ruang ekstra pada sisi kiri"
 
-#: ../gtk/gtkwidget.c:1211
+#: ../gtk/gtkwidget.c:1235
 msgid "Margin on Right"
 msgstr "Marjin di Kanan"
 
-#: ../gtk/gtkwidget.c:1212
+#: ../gtk/gtkwidget.c:1236
 msgid "Pixels of extra space on the right side"
 msgstr "Cacah piksel ruang ekstra pada sisi kanan"
 
-#: ../gtk/gtkwidget.c:1232
+#: ../gtk/gtkwidget.c:1256
 msgid "Margin on Top"
 msgstr "Marjin di Puncak"
 
-#: ../gtk/gtkwidget.c:1233
+#: ../gtk/gtkwidget.c:1257
 msgid "Pixels of extra space on the top side"
 msgstr "Cacah piksel ruang ekstra pada sisi atas"
 
-#: ../gtk/gtkwidget.c:1253
+#: ../gtk/gtkwidget.c:1277
 msgid "Margin on Bottom"
 msgstr "Marjin di Dasar"
 
-#: ../gtk/gtkwidget.c:1254
+#: ../gtk/gtkwidget.c:1278
 msgid "Pixels of extra space on the bottom side"
 msgstr "Cacah piksel ruang ekstra pada sisi bawah"
 
-#: ../gtk/gtkwidget.c:1271
+#: ../gtk/gtkwidget.c:1295
 msgid "All Margins"
 msgstr "Semua Batas"
 
-#: ../gtk/gtkwidget.c:1272
+#: ../gtk/gtkwidget.c:1296
 msgid "Pixels of extra space on all four sides"
 msgstr "Cacah piksel ruang ekstra pada keempat sisi"
 
-#: ../gtk/gtkwidget.c:1305
+#: ../gtk/gtkwidget.c:1329
 msgid "Horizontal Expand"
 msgstr "Mengembang Horisontal"
 
-#: ../gtk/gtkwidget.c:1306
-#, fuzzy
+#: ../gtk/gtkwidget.c:1330
 msgid "Whether widget wants more horizontal space"
-msgstr "Apakah butir mesti mengisi ruang tersedia"
+msgstr "Apakah widget ingin ruang horisontal lebih"
 
-#: ../gtk/gtkwidget.c:1320
-#, fuzzy
+#: ../gtk/gtkwidget.c:1344
 msgid "Horizontal Expand Set"
-msgstr "Mengatur tata letak horizontal"
+msgstr "Tata Ekspansi Horisontal"
 
-#: ../gtk/gtkwidget.c:1321
-#, fuzzy
+#: ../gtk/gtkwidget.c:1345
 msgid "Whether to use the hexpand property"
-msgstr "Apakah menggunakan properti penampilan aksi yang terkait"
+msgstr "Apakah menggunakan properti hexpand"
 
-#: ../gtk/gtkwidget.c:1335
+#: ../gtk/gtkwidget.c:1359
 msgid "Vertical Expand"
 msgstr "Mengembang Vertikal"
 
-#: ../gtk/gtkwidget.c:1336
-#, fuzzy
+#: ../gtk/gtkwidget.c:1360
 msgid "Whether widget wants more vertical space"
-msgstr "Menentukan apakah widget terlihat atau tidak"
+msgstr "Apakah widget ingin ruang vertikal lebih"
 
-#: ../gtk/gtkwidget.c:1350
-#, fuzzy
+#: ../gtk/gtkwidget.c:1374
 msgid "Vertical Expand Set"
-msgstr "Mengatur tata letak vertikal"
+msgstr "Tata Ekspansi Vertikal"
 
-#: ../gtk/gtkwidget.c:1351
-#, fuzzy
+#: ../gtk/gtkwidget.c:1375
 msgid "Whether to use the vexpand property"
-msgstr "Apakah menggunakan properti penampilan aksi yang terkait"
+msgstr "Apakah menggunakan properti vexpand"
 
-#: ../gtk/gtkwidget.c:1365
+#: ../gtk/gtkwidget.c:1389
 msgid "Expand Both"
 msgstr "Ekspansi Dua Arah"
 
-#: ../gtk/gtkwidget.c:1366
+#: ../gtk/gtkwidget.c:1390
 msgid "Whether widget wants to expand in both directions"
 msgstr "Apakah widget ingin mengembang ke kedua arah"
 
-#: ../gtk/gtkwidget.c:3003
+#: ../gtk/gtkwidget.c:3029
 msgid "Interior Focus"
 msgstr "Fokus interior"
 
-#: ../gtk/gtkwidget.c:3004
+#: ../gtk/gtkwidget.c:3030
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Menentukan apakah menggambar indikator fokus di dalam widget"
 
-#: ../gtk/gtkwidget.c:3010
+#: ../gtk/gtkwidget.c:3036
 msgid "Focus linewidth"
 msgstr "Lebar garis fokus"
 
-#: ../gtk/gtkwidget.c:3011
+#: ../gtk/gtkwidget.c:3037
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Lebar garis indikator fokus dalam piksel"
 
-#: ../gtk/gtkwidget.c:3017
+#: ../gtk/gtkwidget.c:3043
 msgid "Focus line dash pattern"
 msgstr "Garis fokus berpola garis-garis"
 
-#: ../gtk/gtkwidget.c:3018
+#: ../gtk/gtkwidget.c:3044
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Pola garis-garis yang digunakan untuk menggambar indikator fokus"
 
-#: ../gtk/gtkwidget.c:3023
+#: ../gtk/gtkwidget.c:3049
 msgid "Focus padding"
 msgstr "Isian fokus"
 
-#: ../gtk/gtkwidget.c:3024
+#: ../gtk/gtkwidget.c:3050
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "Lebar antara indikator fokus dan kotak widget dalam piksel"
 
-#: ../gtk/gtkwidget.c:3029
+#: ../gtk/gtkwidget.c:3055
 msgid "Cursor color"
 msgstr "Warna kursor"
 
-#: ../gtk/gtkwidget.c:3030
+#: ../gtk/gtkwidget.c:3056
 msgid "Color with which to draw insertion cursor"
 msgstr "Warna untuk menggambar kursor pengisian"
 
-#: ../gtk/gtkwidget.c:3035
+#: ../gtk/gtkwidget.c:3061
 msgid "Secondary cursor color"
 msgstr "Wanra kursor sekunder"
 
-#: ../gtk/gtkwidget.c:3036
+#: ../gtk/gtkwidget.c:3062
 msgid "Color with which to draw the secondary insertion cursor when editing mixed right-to-left and left-to-right text"
 msgstr "Warna yang akan digambarkan pada kursor pengisian sekunder saat mengedit campuran teks kanan-ke-kiri dan kiri-ke-kanan"
 
-#: ../gtk/gtkwidget.c:3041
+#: ../gtk/gtkwidget.c:3067
 msgid "Cursor line aspect ratio"
 msgstr "Rasio aspek garis kursor"
 
-#: ../gtk/gtkwidget.c:3042
+#: ../gtk/gtkwidget.c:3068
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Rasio aspek yang digunakan saat menggambar kursor pengisian teks"
 
-#: ../gtk/gtkwidget.c:3048
+#: ../gtk/gtkwidget.c:3074
 msgid "Window dragging"
 msgstr "Penyeretan jendela"
 
-#: ../gtk/gtkwidget.c:3049
+#: ../gtk/gtkwidget.c:3075
 msgid "Whether windows can be dragged by clicking on empty areas"
 msgstr "Apakah jendela dapat diseret dengan mengklik pada daerah kosong"
 
-#: ../gtk/gtkwidget.c:3062
+#: ../gtk/gtkwidget.c:3088
 msgid "Unvisited Link Color"
 msgstr "Warna Taut Belum Dikunjungi"
 
-#: ../gtk/gtkwidget.c:3063
+#: ../gtk/gtkwidget.c:3089
 msgid "Color of unvisited links"
 msgstr "Warna dari taut yang belum dikunjungi"
 
-#: ../gtk/gtkwidget.c:3076
+#: ../gtk/gtkwidget.c:3102
 msgid "Visited Link Color"
 msgstr "Warna Taut Telah Dikunjungi"
 
-#: ../gtk/gtkwidget.c:3077
+#: ../gtk/gtkwidget.c:3103
 msgid "Color of visited links"
 msgstr "Warna dari taut yang telah dikunjungi"
 
-#: ../gtk/gtkwidget.c:3091
+#: ../gtk/gtkwidget.c:3117
 msgid "Wide Separators"
 msgstr "Pembatas Lebar"
 
-#: ../gtk/gtkwidget.c:3092
+#: ../gtk/gtkwidget.c:3118
 msgid "Whether separators have configurable width and should be drawn using a box instead of a line"
 msgstr "Apakah pemisah memiliki lebar yang dapat diatur dan mesti digambar memakai kotak, bukan garis"
 
-#: ../gtk/gtkwidget.c:3106
+#: ../gtk/gtkwidget.c:3132
 msgid "Separator Width"
 msgstr "Lebar Pembatas"
 
-#: ../gtk/gtkwidget.c:3107
+#: ../gtk/gtkwidget.c:3133
 msgid "The width of separators if wide-separators is TRUE"
 msgstr "Lebar pembatas bila \"wide-separator\" berisi TRUE"
 
-#: ../gtk/gtkwidget.c:3121
+#: ../gtk/gtkwidget.c:3147
 msgid "Separator Height"
 msgstr "Tinggi Pembatas"
 
-#: ../gtk/gtkwidget.c:3122
+#: ../gtk/gtkwidget.c:3148
 msgid "The height of separators if \"wide-separators\" is TRUE"
 msgstr "Tinggi pembatas bila \"wide-separator\" berisi TRUE"
 
-#: ../gtk/gtkwidget.c:3136
+#: ../gtk/gtkwidget.c:3162
 msgid "Horizontal Scroll Arrow Length"
 msgstr "Panjang Panah Penggulung Mendatar"
 
-#: ../gtk/gtkwidget.c:3137
+#: ../gtk/gtkwidget.c:3163
 msgid "The length of horizontal scroll arrows"
 msgstr "Panjang dari panah penggulung arah mendatar"
 
-#: ../gtk/gtkwidget.c:3151
+#: ../gtk/gtkwidget.c:3177
 msgid "Vertical Scroll Arrow Length"
 msgstr "Panjang Panah Penggulung Tegak"
 
-#: ../gtk/gtkwidget.c:3152
+#: ../gtk/gtkwidget.c:3178
 msgid "The length of vertical scroll arrows"
 msgstr "Panjang dari panah penggulung arah tegak"
 
-#: ../gtk/gtkwindow.c:600
+#: ../gtk/gtkwindow.c:608
 msgid "Window Type"
 msgstr "Tipe window"
 
-#: ../gtk/gtkwindow.c:601
+#: ../gtk/gtkwindow.c:609
 msgid "The type of the window"
 msgstr "Jenis window"
 
-#: ../gtk/gtkwindow.c:609
+#: ../gtk/gtkwindow.c:617
 msgid "Window Title"
 msgstr "Judul Window"
 
-#: ../gtk/gtkwindow.c:610
+#: ../gtk/gtkwindow.c:618
 msgid "The title of the window"
 msgstr "Judul window"
 
-#: ../gtk/gtkwindow.c:617
+#: ../gtk/gtkwindow.c:625
 msgid "Window Role"
 msgstr "Peranan Window"
 
-#: ../gtk/gtkwindow.c:618
+#: ../gtk/gtkwindow.c:626
 msgid "Unique identifier for the window to be used when restoring a session"
 msgstr "Nama unik jendela untuk digunakan saat mengembalikan kondisi sesi"
 
-#: ../gtk/gtkwindow.c:634
+#: ../gtk/gtkwindow.c:642
 msgid "Startup ID"
 msgstr "ID Mula"
 
-#: ../gtk/gtkwindow.c:635
+#: ../gtk/gtkwindow.c:643
 msgid "Unique startup identifier for the window used by startup-notification"
 msgstr "Identifier mula unik bagi jendela yang dipakai oleh startup-notification"
 
-#: ../gtk/gtkwindow.c:643
+#: ../gtk/gtkwindow.c:651
 msgid "If TRUE, users can resize the window"
 msgstr "Bila bernilai TRUE, pengguna dapat merubah ukuran window"
 
-#: ../gtk/gtkwindow.c:650
+#: ../gtk/gtkwindow.c:658
 msgid "Modal"
 msgstr "Modal"
 
-#: ../gtk/gtkwindow.c:651
+#: ../gtk/gtkwindow.c:659
 msgid "If TRUE, the window is modal (other windows are not usable while this one is up)"
 msgstr "Bila bernilai TRUE, jendela bersifat modal (window lain tidak dapat digunakan saat jendela yang ini ada di atasnya)"
 
-#: ../gtk/gtkwindow.c:658
+#: ../gtk/gtkwindow.c:666
 msgid "Window Position"
 msgstr "Posisi Window"
 
-#: ../gtk/gtkwindow.c:659
+#: ../gtk/gtkwindow.c:667
 msgid "The initial position of the window"
 msgstr "Posisi awal window"
 
-#: ../gtk/gtkwindow.c:667
+#: ../gtk/gtkwindow.c:675
 msgid "Default Width"
 msgstr "Lebar awal"
 
-#: ../gtk/gtkwindow.c:668
+#: ../gtk/gtkwindow.c:676
 msgid "The default width of the window, used when initially showing the window"
 msgstr "Lebar awal window, digunakan saat pertama kali menampilkan window"
 
-#: ../gtk/gtkwindow.c:677
+#: ../gtk/gtkwindow.c:685
 msgid "Default Height"
 msgstr "Tinggi Baku"
 
-#: ../gtk/gtkwindow.c:678
+#: ../gtk/gtkwindow.c:686
 msgid "The default height of the window, used when initially showing the window"
 msgstr "Tinggi awal window, digunakan pertama kali saat menampilkan window"
 
-#: ../gtk/gtkwindow.c:687
+#: ../gtk/gtkwindow.c:695
 msgid "Destroy with Parent"
 msgstr "Musnah dengan Bapak"
 
-#: ../gtk/gtkwindow.c:688
+#: ../gtk/gtkwindow.c:696
 msgid "If this window should be destroyed when the parent is destroyed"
 msgstr "Bila bapak jendela ini dimusnahkan, maka jendela ini juga harus dimusnahkan"
 
-#: ../gtk/gtkwindow.c:696
+#: ../gtk/gtkwindow.c:704
 msgid "Icon for this window"
 msgstr "Ikon yang digunakan pada jendela ini"
 
-#: ../gtk/gtkwindow.c:702
+#: ../gtk/gtkwindow.c:722
 msgid "Mnemonics Visible"
 msgstr "Mnemonik Nampak"
 
-#: ../gtk/gtkwindow.c:703
+#: ../gtk/gtkwindow.c:723
 msgid "Whether mnemonics are currently visible in this window"
 msgstr "Apakah mnemonik kini nampak pada jendela ini"
 
-#: ../gtk/gtkwindow.c:719
+#: ../gtk/gtkwindow.c:741
+#| msgid "Cursor Visible"
+msgid "Focus Visible"
+msgstr "Fokus Nampak"
+
+#: ../gtk/gtkwindow.c:742
+#| msgid "Whether mnemonics are currently visible in this window"
+msgid "Whether focus rectangles are currently visible in this window"
+msgstr "Apakah kotak fokus kini nampak pada jendela ini"
+
+#: ../gtk/gtkwindow.c:758
 msgid "Name of the themed icon for this window"
 msgstr "Ikon tematik yang digunakan pada jendela ini"
 
-#: ../gtk/gtkwindow.c:734
+#: ../gtk/gtkwindow.c:773
 msgid "Is Active"
 msgstr "Aktif"
 
-#: ../gtk/gtkwindow.c:735
+#: ../gtk/gtkwindow.c:774
 msgid "Whether the toplevel is the current active window"
 msgstr "Menentukan apakah pada tingkat atas adalah jendela aktif saat ini"
 
-#: ../gtk/gtkwindow.c:742
+#: ../gtk/gtkwindow.c:781
 msgid "Focus in Toplevel"
 msgstr "Fokus pada Tingkat Atas"
 
-#: ../gtk/gtkwindow.c:743
+#: ../gtk/gtkwindow.c:782
 msgid "Whether the input focus is within this GtkWindow"
 msgstr "Menentukan apakah fokus input ada dalam GtkWindow ini"
 
-#: ../gtk/gtkwindow.c:750
+#: ../gtk/gtkwindow.c:789
 msgid "Type hint"
 msgstr "Petunjuk pengetikan"
 
-#: ../gtk/gtkwindow.c:751
+#: ../gtk/gtkwindow.c:790
 msgid "Hint to help the desktop environment understand what kind of window this is and how to treat it."
 msgstr "Petunjuk untuk membantu lingkungan desktop mengerti jenis jendela ini dan bagaimana melayaninya."
 
-#: ../gtk/gtkwindow.c:759
+#: ../gtk/gtkwindow.c:798
 msgid "Skip taskbar"
 msgstr "Jangan pada taskbar"
 
-#: ../gtk/gtkwindow.c:760
+#: ../gtk/gtkwindow.c:799
 msgid "TRUE if the window should not be in the task bar."
 msgstr "Bernilai TRUE bila jendela tidak usah ada pada task bar."
 
-#: ../gtk/gtkwindow.c:767
+#: ../gtk/gtkwindow.c:806
 msgid "Skip pager"
 msgstr "Jangan pada pager"
 
-#: ../gtk/gtkwindow.c:768
+#: ../gtk/gtkwindow.c:807
 msgid "TRUE if the window should not be in the pager."
 msgstr "TRUE jika jendela tidak muncul pada pager"
 
-#: ../gtk/gtkwindow.c:775
+#: ../gtk/gtkwindow.c:814
 msgid "Urgent"
 msgstr "Penting"
 
-#: ../gtk/gtkwindow.c:776
+#: ../gtk/gtkwindow.c:815
 msgid "TRUE if the window should be brought to the user's attention."
 msgstr "TRUE bila jendela mesti dibuat agar diperhatikan oleh pengguna."
 
-#: ../gtk/gtkwindow.c:790
+#: ../gtk/gtkwindow.c:829
 msgid "Accept focus"
 msgstr "Terima fokus"
 
-#: ../gtk/gtkwindow.c:791
+#: ../gtk/gtkwindow.c:830
 msgid "TRUE if the window should receive the input focus."
 msgstr "TRUE jika jendela harus dapat menerima fokus masukan"
 
-#: ../gtk/gtkwindow.c:805
+#: ../gtk/gtkwindow.c:844
 msgid "Focus on map"
 msgstr "Fokus pada pemetaan"
 
-#: ../gtk/gtkwindow.c:806
+#: ../gtk/gtkwindow.c:845
 msgid "TRUE if the window should receive the input focus when mapped."
 msgstr "BENAR jika jendelanya harus menerima fokus masukan ketika dipetakan."
 
-#: ../gtk/gtkwindow.c:820
+#: ../gtk/gtkwindow.c:859
 msgid "Decorated"
 msgstr "Memiliki dekorasi"
 
-#: ../gtk/gtkwindow.c:821
+#: ../gtk/gtkwindow.c:860
 msgid "Whether the window should be decorated by the window manager"
 msgstr "Menentukan apakah jendela harus diberi dekorasi oleh program pengatur jendela"
 
-#: ../gtk/gtkwindow.c:835
+#: ../gtk/gtkwindow.c:874
 msgid "Deletable"
 msgstr "Dapat dihapus"
 
-#: ../gtk/gtkwindow.c:836
+#: ../gtk/gtkwindow.c:875
 msgid "Whether the window frame should have a close button"
 msgstr "Apakah rangka jendela mesti memiliki suatu tombol tutup"
 
-#: ../gtk/gtkwindow.c:855
+#: ../gtk/gtkwindow.c:894
 msgid "Resize grip"
-msgstr "Pengubah ukuran"
+msgstr "Grip pengubah ukuran"
 
-#: ../gtk/gtkwindow.c:856
-#, fuzzy
+#: ../gtk/gtkwindow.c:895
 msgid "Specifies whether the window should have a resize grip"
-msgstr "Apakah rangka jendela mesti memiliki suatu tombol tutup"
+msgstr "Apakah rangka jendela mesti memiliki suatu grip pengubah ukuran"
 
-#: ../gtk/gtkwindow.c:870
+#: ../gtk/gtkwindow.c:909
 msgid "Resize grip is visible"
-msgstr ""
+msgstr "Grip ubah ukuran nampak"
 
-#: ../gtk/gtkwindow.c:871
-#, fuzzy
+#: ../gtk/gtkwindow.c:910
 msgid "Specifies whether the window's resize grip is visible."
-msgstr "Apakah kelompok aksi tampak atau tidak."
+msgstr "Apakah grip pengubah ukuran jendela nampak."
 
-#: ../gtk/gtkwindow.c:887
+#: ../gtk/gtkwindow.c:926
 msgid "Gravity"
 msgstr "Gravitasi"
 
-#: ../gtk/gtkwindow.c:888
+#: ../gtk/gtkwindow.c:927
 msgid "The window gravity of the window"
 msgstr "Gravitasi jendela ini"
 
-#: ../gtk/gtkwindow.c:905
+#: ../gtk/gtkwindow.c:944
 msgid "Transient for Window"
 msgstr "Transien untuk Jendela"
 
-#: ../gtk/gtkwindow.c:906
+#: ../gtk/gtkwindow.c:945
 msgid "The transient parent of the dialog"
 msgstr "Induk transien dari dialog"
 
-#: ../gtk/gtkwindow.c:921
+#: ../gtk/gtkwindow.c:960
 msgid "Opacity for Window"
 msgstr "Kelegapan bagi Jendela"
 
-#: ../gtk/gtkwindow.c:922
+#: ../gtk/gtkwindow.c:961
 msgid "The opacity of the window, from 0 to 1"
 msgstr "Tingkat tembus pandang jendela, dari 0 ke 1"
 
-#: ../gtk/gtkwindow.c:932
-#: ../gtk/gtkwindow.c:933
+#: ../gtk/gtkwindow.c:971
+#: ../gtk/gtkwindow.c:972
 msgid "Width of resize grip"
 msgstr "Lebar grip pengubah ukuran"
 
-#: ../gtk/gtkwindow.c:938
-#: ../gtk/gtkwindow.c:939
+#: ../gtk/gtkwindow.c:977
+#: ../gtk/gtkwindow.c:978
 msgid "Height of resize grip"
 msgstr "Tinggi grip pengubah ukuran"
 
-#: ../gtk/gtkwindow.c:961
+#: ../gtk/gtkwindow.c:1000
 msgid "GtkApplication"
 msgstr "GtkApplication"
 
-#: ../gtk/gtkwindow.c:962
+#: ../gtk/gtkwindow.c:1001
 msgid "The GtkApplication for the window"
 msgstr "GtkApplication bagi jendela"
 
+#: ../modules/printbackends/cups/gtkprintercups.c:95
+msgid "Color Profile Title"
+msgstr "Judul Profil Warna"
+
+#: ../modules/printbackends/cups/gtkprintercups.c:96
+#| msgid "The title of the color selection dialog"
+msgid "The title of the color profile to use"
+msgstr "Judul profil warna yang akan dipakai"
+
diff --git a/po-properties/ru.po b/po-properties/ru.po
index 7b023bee05..b641a45e64 100644
--- a/po-properties/ru.po
+++ b/po-properties/ru.po
@@ -11,21 +11,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%"
-"2b&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-03 09:37+0000\n"
-"PO-Revision-Date: 2011-04-03 14:22+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2b&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-08-23 17:57+0000\n"
+"PO-Revision-Date: 2011-08-25 22:04+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../gdk/gdkapplaunchcontext.c:129 ../gdk/gdkcursor.c:136
+#: ../gdk/gdkapplaunchcontext.c:129
+#: ../gdk/gdkcursor.c:136
 #: ../gdk/gdkdevicemanager.c:146
 msgid "Display"
 msgstr "Ди�плей"
@@ -58,7 +57,8 @@ msgstr "Ди�петчер у�трой�тва"
 msgid "Device manager which the device belongs to"
 msgstr "Ди�петчер, которому принадлежит у�трой�тво"
 
-#: ../gdk/gdkdevice.c:141 ../gdk/gdkdevice.c:142
+#: ../gdk/gdkdevice.c:141
+#: ../gdk/gdkdevice.c:142
 msgid "Device name"
 msgstr "Им� у�трой�тва"
 
@@ -86,7 +86,8 @@ msgstr "И�точник ввода"
 msgid "Source type for the device"
 msgstr "Тип и�точника дл� у�трой�тва"
 
-#: ../gdk/gdkdevice.c:203 ../gdk/gdkdevice.c:204
+#: ../gdk/gdkdevice.c:203
+#: ../gdk/gdkdevice.c:204
 msgid "Input mode for the device"
 msgstr "Режим ввода дл� у�трой�тва"
 
@@ -98,7 +99,8 @@ msgstr "Имеет ли у�трой�тво кур�ор"
 msgid "Whether there is a visible cursor following device motion"
 msgstr "Перемещает�� ли видимый кур�ор при движении у�трой�тва"
 
-#: ../gdk/gdkdevice.c:234 ../gdk/gdkdevice.c:235
+#: ../gdk/gdkdevice.c:234
+#: ../gdk/gdkdevice.c:235
 msgid "Number of axes in the device"
 msgstr "Чи�ло о�ей в у�трой�тве"
 
@@ -106,11 +108,11 @@ msgstr "Чи�ло о�ей в у�трой�тве"
 msgid "Display for the device manager"
 msgstr "Ди�плей ди�петчера у�трой�тва"
 
-#: ../gdk/gdkdisplaymanager.c:154
+#: ../gdk/gdkdisplaymanager.c:162
 msgid "Default Display"
 msgstr "Ди�плей по умолчанию"
 
-#: ../gdk/gdkdisplaymanager.c:155
+#: ../gdk/gdkdisplaymanager.c:163
 msgid "The default display for GDK"
 msgstr "И�ходный ди�плей дл� под�и�темы GDK"
 
@@ -130,24 +132,16 @@ msgstr "Разрешение шрифта"
 msgid "The resolution for fonts on the screen"
 msgstr "Разрешение шрифтов на �кране"
 
-#: ../gdk/gdkwindow.c:373 ../gdk/gdkwindow.c:374
+#: ../gdk/gdkwindow.c:376
+#: ../gdk/gdkwindow.c:377
 msgid "Cursor"
 msgstr "Кур�ор"
 
-#: ../gdk/x11/gdkdevice-xi.c:140 ../gdk/x11/gdkdevice-xi.c:141
-#: ../gdk/x11/gdkdevice-xi2.c:130
-msgid "Device ID"
-msgstr "ID у�трой�тва"
-
-#: ../gdk/x11/gdkdevice-xi2.c:131
-msgid "Device identifier"
-msgstr "Идентификатор у�трой�тва"
-
-#: ../gdk/x11/gdkdevicemanager-xi2.c:118
+#: ../gdk/x11/gdkdevicemanager-xi2.c:119
 msgid "Opcode"
 msgstr "Код операции"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:119
+#: ../gdk/x11/gdkdevicemanager-xi2.c:120
 msgid "Opcode for XInput2 requests"
 msgstr "Код операции дл� запро�ов XInput2"
 
@@ -159,125 +153,125 @@ msgstr "База �обыти�"
 msgid "Event base for XInput events"
 msgstr "База дл� �обытий XInput"
 
-#: ../gtk/gtkaboutdialog.c:276
+#: ../gdk/x11/gdkdevice-xi2.c:130
+#: ../gdk/x11/gdkdevice-xi.c:140
+#: ../gdk/x11/gdkdevice-xi.c:141
+msgid "Device ID"
+msgstr "ID у�трой�тва"
+
+#: ../gdk/x11/gdkdevice-xi2.c:131
+msgid "Device identifier"
+msgstr "Идентификатор у�трой�тва"
+
+#: ../gtk/gtkaboutdialog.c:275
 msgid "Program name"
 msgstr "Им� программы"
 
-#: ../gtk/gtkaboutdialog.c:277
-msgid ""
-"The name of the program. If this is not set, it defaults to "
-"g_get_application_name()"
-msgstr ""
-"Им� программы. Е�ли не у�тановлено, по умолчанию и�пользует�� "
-"g_get_application_name()"
+#: ../gtk/gtkaboutdialog.c:276
+msgid "The name of the program. If this is not set, it defaults to g_get_application_name()"
+msgstr "Им� программы. Е�ли не у�тановлено, по умолчанию и�пользует�� g_get_application_name()"
 
-#: ../gtk/gtkaboutdialog.c:291
+#: ../gtk/gtkaboutdialog.c:290
 msgid "Program version"
 msgstr "Вер�и� программы"
 
-#: ../gtk/gtkaboutdialog.c:292
+#: ../gtk/gtkaboutdialog.c:291
 msgid "The version of the program"
 msgstr "Вер�и� программы"
 
-#: ../gtk/gtkaboutdialog.c:306
+#: ../gtk/gtkaboutdialog.c:305
 msgid "Copyright string"
 msgstr "Строка автор�кого права"
 
-#: ../gtk/gtkaboutdialog.c:307
+#: ../gtk/gtkaboutdialog.c:306
 msgid "Copyright information for the program"
 msgstr "Информаци� о автор�ком праве программы"
 
-#: ../gtk/gtkaboutdialog.c:324
+#: ../gtk/gtkaboutdialog.c:323
 msgid "Comments string"
 msgstr "Строка комментари�"
 
-#: ../gtk/gtkaboutdialog.c:325
+#: ../gtk/gtkaboutdialog.c:324
 msgid "Comments about the program"
 msgstr "Комментарии о программе"
 
-#: ../gtk/gtkaboutdialog.c:375
+#: ../gtk/gtkaboutdialog.c:374
 msgid "License Type"
 msgstr "Тип лицензии"
 
-#: ../gtk/gtkaboutdialog.c:376
+#: ../gtk/gtkaboutdialog.c:375
 msgid "The license type of the program"
 msgstr "Тип лицензии программы"
 
-#: ../gtk/gtkaboutdialog.c:392
+#: ../gtk/gtkaboutdialog.c:391
 msgid "Website URL"
 msgstr "URL веб-�айта"
 
-#: ../gtk/gtkaboutdialog.c:393
+#: ../gtk/gtkaboutdialog.c:392
 msgid "The URL for the link to the website of the program"
 msgstr "URL дл� ��ылки на веб-�айт программы"
 
-#: ../gtk/gtkaboutdialog.c:407
+#: ../gtk/gtkaboutdialog.c:406
 msgid "Website label"
 msgstr "Ярлык веб-�айта"
 
-#: ../gtk/gtkaboutdialog.c:408
+#: ../gtk/gtkaboutdialog.c:407
 msgid "The label for the link to the website of the program"
 msgstr "Ярлык дл� ��ылки на веб-�айт программы"
 
-#: ../gtk/gtkaboutdialog.c:424
+#: ../gtk/gtkaboutdialog.c:423
 msgid "Authors"
 msgstr "�вторы"
 
-#: ../gtk/gtkaboutdialog.c:425
+#: ../gtk/gtkaboutdialog.c:424
 msgid "List of authors of the program"
 msgstr "Спи�ок авторов программы"
 
-#: ../gtk/gtkaboutdialog.c:441
+#: ../gtk/gtkaboutdialog.c:440
 msgid "Documenters"
 msgstr "�вторы документации"
 
-#: ../gtk/gtkaboutdialog.c:442
+#: ../gtk/gtkaboutdialog.c:441
 msgid "List of people documenting the program"
 msgstr "Спи�ок авторов документации программы"
 
-#: ../gtk/gtkaboutdialog.c:458
+#: ../gtk/gtkaboutdialog.c:457
 msgid "Artists"
 msgstr "Художники"
 
-#: ../gtk/gtkaboutdialog.c:459
+#: ../gtk/gtkaboutdialog.c:458
 msgid "List of people who have contributed artwork to the program"
 msgstr "Спи�ок уча�твовавших в художе�твенном оформлении программы"
 
-#: ../gtk/gtkaboutdialog.c:476
+#: ../gtk/gtkaboutdialog.c:475
 msgid "Translator credits"
 msgstr "Переводчики"
 
-#: ../gtk/gtkaboutdialog.c:477
-msgid ""
-"Credits to the translators. This string should be marked as translatable"
-msgstr ""
-"Благодарно�ти переводчикам. Эти �троки должны быть помечены как переводимые"
+#: ../gtk/gtkaboutdialog.c:476
+msgid "Credits to the translators. This string should be marked as translatable"
+msgstr "Благодарно�ти переводчикам. Эти �троки должны быть помечены как переводимые"
 
-#: ../gtk/gtkaboutdialog.c:492
+#: ../gtk/gtkaboutdialog.c:491
 msgid "Logo"
 msgstr "Значок"
 
-#: ../gtk/gtkaboutdialog.c:493
-msgid ""
-"A logo for the about box. If this is not set, it defaults to "
-"gtk_window_get_default_icon_list()"
-msgstr ""
-"Значок дл� окна «О программе». Е�ли не у�тановлено, по умолчанию и�пользует�� "
-"результат gtk_window_get_default_icon_list()"
+#: ../gtk/gtkaboutdialog.c:492
+msgid "A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"
+msgstr "Значок дл� окна «О программе». Е�ли не у�тановлено, по умолчанию и�пользует�� результат gtk_window_get_default_icon_list()"
 
-#: ../gtk/gtkaboutdialog.c:508
+#: ../gtk/gtkaboutdialog.c:507
 msgid "Logo Icon Name"
 msgstr "Им� значка логотипа"
 
-#: ../gtk/gtkaboutdialog.c:509
+#: ../gtk/gtkaboutdialog.c:508
 msgid "A named icon to use as the logo for the about box."
 msgstr "Им� значка дл� и�пользовани� в каче�тве логотипа окна «О программе»."
 
-#: ../gtk/gtkaboutdialog.c:522
+#: ../gtk/gtkaboutdialog.c:521
 msgid "Wrap license"
 msgstr "Перено� лицензии"
 
-#: ../gtk/gtkaboutdialog.c:523
+#: ../gtk/gtkaboutdialog.c:522
 msgid "Whether to wrap the license text."
 msgstr "Перено�ить ли тек�т лицензии"
 
@@ -297,8 +291,11 @@ msgstr "Виджет управлени� бы�трой клавиши"
 msgid "The widget to be monitored for accelerator changes"
 msgstr "Виджет который отвечает за изменение бы�трой клавиши"
 
-#: ../gtk/gtkaction.c:222 ../gtk/gtkactiongroup.c:228 ../gtk/gtkprinter.c:125
-#: ../gtk/gtktextmark.c:89 ../gtk/gtkthemingengine.c:248
+#: ../gtk/gtkaction.c:222
+#: ../gtk/gtkactiongroup.c:228
+#: ../gtk/gtkprinter.c:125
+#: ../gtk/gtktextmark.c:126
+#: ../gtk/gtkthemingengine.c:256
 msgid "Name"
 msgstr "�аименование"
 
@@ -306,17 +303,20 @@ msgstr "�аименование"
 msgid "A unique name for the action."
 msgstr "Уникальное им� дл� дей�тви�."
 
-#: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:227 ../gtk/gtkexpander.c:287
-#: ../gtk/gtkframe.c:133 ../gtk/gtklabel.c:567 ../gtk/gtkmenuitem.c:328
-#: ../gtk/gtktoolbutton.c:201 ../gtk/gtktoolitemgroup.c:1596
+#: ../gtk/gtkaction.c:241
+#: ../gtk/gtkbutton.c:228
+#: ../gtk/gtkexpander.c:290
+#: ../gtk/gtkframe.c:171
+#: ../gtk/gtklabel.c:729
+#: ../gtk/gtkmenuitem.c:383
+#: ../gtk/gtktoolbutton.c:232
+#: ../gtk/gtktoolitemgroup.c:1592
 msgid "Label"
 msgstr "Метка"
 
 #: ../gtk/gtkaction.c:242
 msgid "The label used for menu items and buttons that activate this action."
-msgstr ""
-"Метка, и�пользуема� дл� �лементов меню и кнопок, инициирующих данное "
-"дей�твие."
+msgstr "Метка, и�пользуема� дл� �лементов меню и кнопок, инициирующих данное дей�твие."
 
 #: ../gtk/gtkaction.c:258
 msgid "Short label"
@@ -324,9 +324,7 @@ msgstr "Кратка� метка"
 
 #: ../gtk/gtkaction.c:259
 msgid "A shorter label that may be used on toolbar buttons."
-msgstr ""
-"Кратка� метка, котора� может быть и�пользована дл� кнопок панели "
-"ин�трументов."
+msgstr "Кратка� метка, котора� может быть и�пользована дл� кнопок панели ин�трументов."
 
 #: ../gtk/gtkaction.c:267
 msgid "Tooltip"
@@ -342,77 +340,72 @@ msgstr "В�троенный значок"
 
 #: ../gtk/gtkaction.c:284
 msgid "The stock icon displayed in widgets representing this action."
-msgstr ""
-"В�троенный значок, отображаемый в виджетах, пред�тавл�ющих �то дей�твие."
+msgstr "В�троенный значок, отображаемый в виджетах, пред�тавл�ющих �то дей�твие."
 
-#: ../gtk/gtkaction.c:304 ../gtk/gtkstatusicon.c:245
+#: ../gtk/gtkaction.c:304
+#: ../gtk/gtkstatusicon.c:275
 msgid "GIcon"
 msgstr "GIcon"
 
-#: ../gtk/gtkaction.c:305 ../gtk/gtkcellrendererpixbuf.c:215
-#: ../gtk/gtkimage.c:329 ../gtk/gtkstatusicon.c:246
+#: ../gtk/gtkaction.c:305
+#: ../gtk/gtkcellrendererpixbuf.c:235
+#: ../gtk/gtkimage.c:330
+#: ../gtk/gtkstatusicon.c:276
 msgid "The GIcon being displayed"
 msgstr "Отображаемый значок GIcon"
 
-#: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:180
-#: ../gtk/gtkimage.c:311 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:229
-#: ../gtk/gtkwindow.c:722
+#: ../gtk/gtkaction.c:325
+#: ../gtk/gtkcellrendererpixbuf.c:200
+#: ../gtk/gtkimage.c:312
+#: ../gtk/gtkprinter.c:174
+#: ../gtk/gtkstatusicon.c:259
+#: ../gtk/gtkwindow.c:757
 msgid "Icon Name"
 msgstr "Им� значка"
 
-#: ../gtk/gtkaction.c:326 ../gtk/gtkcellrendererpixbuf.c:181
-#: ../gtk/gtkimage.c:312 ../gtk/gtkstatusicon.c:230
+#: ../gtk/gtkaction.c:326
+#: ../gtk/gtkcellrendererpixbuf.c:201
+#: ../gtk/gtkimage.c:313
+#: ../gtk/gtkstatusicon.c:260
 msgid "The name of the icon from the icon theme"
 msgstr "Им� значка из темы значков"
 
-#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:195
+#: ../gtk/gtkaction.c:333
+#: ../gtk/gtktoolitem.c:194
 msgid "Visible when horizontal"
 msgstr "Видим при горизонтальном ра�положении"
 
-#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:196
-msgid ""
-"Whether the toolbar item is visible when the toolbar is in a horizontal "
-"orientation."
-msgstr ""
-"Будет ли �лемент панели ин�трументов видим при горизонтальном ра�положении "
-"панели ин�трументов."
+#: ../gtk/gtkaction.c:334
+#: ../gtk/gtktoolitem.c:195
+msgid "Whether the toolbar item is visible when the toolbar is in a horizontal orientation."
+msgstr "Будет ли �лемент панели ин�трументов видим при горизонтальном ра�положении панели ин�трументов."
 
 #: ../gtk/gtkaction.c:349
 msgid "Visible when overflown"
 msgstr "Видим при переполнении"
 
 #: ../gtk/gtkaction.c:350
-msgid ""
-"When TRUE, toolitem proxies for this action are represented in the toolbar "
-"overflow menu."
-msgstr ""
-"Е�ли у�тановлено, то прок�и �лементов меню дл� дей�тви� будут перекрывать "
-"меню на панели ин�трументов"
+msgid "When TRUE, toolitem proxies for this action are represented in the toolbar overflow menu."
+msgstr "Е�ли у�тановлено, то прок�и �лементов меню дл� дей�тви� будут перекрывать меню на панели ин�трументов"
 
-#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:202
+#: ../gtk/gtkaction.c:357
+#: ../gtk/gtktoolitem.c:201
 msgid "Visible when vertical"
 msgstr "Видим при вертикальном ра�положении"
 
-#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:203
-msgid ""
-"Whether the toolbar item is visible when the toolbar is in a vertical "
-"orientation."
-msgstr ""
-"Будет ли �лемент панели ин�трументов видим при вертикально ра�положении "
-"панели ин�трументов."
+#: ../gtk/gtkaction.c:358
+#: ../gtk/gtktoolitem.c:202
+msgid "Whether the toolbar item is visible when the toolbar is in a vertical orientation."
+msgstr "Будет ли �лемент панели ин�трументов видим при вертикально ра�положении панели ин�трументов."
 
-#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:209
+#: ../gtk/gtkaction.c:365
+#: ../gtk/gtktoolitem.c:208
 msgid "Is important"
 msgstr "Важное"
 
 #: ../gtk/gtkaction.c:366
-msgid ""
-"Whether the action is considered important. When TRUE, toolitem proxies for "
-"this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
-msgstr ""
-"Предполагать ли данное дей�твие важным. Е�ли у�тановлено, то прок�и "
-"�лементов панели дл� дей�тви� будут показывать тек�т в режиме "
-"GTK_TOOLBAR_BOTH_HORIZ."
+msgid "Whether the action is considered important. When TRUE, toolitem proxies for this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
+msgstr "Предполагать ли данное дей�твие важным. Е�ли у�тановлено, то прок�и �лементов панели дл� дей�тви� будут показывать тек�т в режиме GTK_TOOLBAR_BOTH_HORIZ."
 
 #: ../gtk/gtkaction.c:374
 msgid "Hide if empty"
@@ -420,11 +413,12 @@ msgstr "Скрывать, е�ли пу�то"
 
 #: ../gtk/gtkaction.c:375
 msgid "When TRUE, empty menu proxies for this action are hidden."
-msgstr ""
-"Е�ли у�тановлено, то пу�тые прок�и �лементов меню дл� дей�тви� будут �крыты."
+msgstr "Е�ли у�тановлено, то пу�тые прок�и �лементов меню дл� дей�тви� будут �крыты."
 
-#: ../gtk/gtkaction.c:381 ../gtk/gtkactiongroup.c:235
-#: ../gtk/gtkcellrenderer.c:290 ../gtk/gtkwidget.c:971
+#: ../gtk/gtkaction.c:381
+#: ../gtk/gtkactiongroup.c:235
+#: ../gtk/gtkcellrenderer.c:290
+#: ../gtk/gtkwidget.c:990
 msgid "Sensitive"
 msgstr "Чув�твительный"
 
@@ -432,9 +426,11 @@ msgstr "Чув�твительный"
 msgid "Whether the action is enabled."
 msgstr "Включено ли дей�твие "
 
-#: ../gtk/gtkaction.c:388 ../gtk/gtkactiongroup.c:242
-#: ../gtk/gtkstatusicon.c:280 ../gtk/gtktreeviewcolumn.c:246
-#: ../gtk/gtkwidget.c:964
+#: ../gtk/gtkaction.c:388
+#: ../gtk/gtkactiongroup.c:242
+#: ../gtk/gtkstatusicon.c:310
+#: ../gtk/gtktreeviewcolumn.c:248
+#: ../gtk/gtkwidget.c:983
 msgid "Visible"
 msgstr "Видимый"
 
@@ -447,18 +443,16 @@ msgid "Action Group"
 msgstr "Группа дей�тви�"
 
 #: ../gtk/gtkaction.c:396
-msgid ""
-"The GtkActionGroup this GtkAction is associated with, or NULL (for internal "
-"use)."
-msgstr ""
-"Значение GtkActionGroup, � которым �то дей�твие а��оциировано или NULL (дл� "
-"внутреннего и�пользовани�)."
+msgid "The GtkActionGroup this GtkAction is associated with, or NULL (for internal use)."
+msgstr "Значение GtkActionGroup, � которым �то дей�твие а��оциировано или NULL (дл� внутреннего и�пользовани�)."
 
-#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:183
+#: ../gtk/gtkaction.c:414
+#: ../gtk/gtkimagemenuitem.c:194
 msgid "Always show image"
 msgstr "В�егда показывать значок"
 
-#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:184
+#: ../gtk/gtkaction.c:415
+#: ../gtk/gtkimagemenuitem.c:195
 msgid "Whether the image will always be shown"
 msgstr "Показывать ли значок в меню"
 
@@ -480,8 +474,7 @@ msgstr "Св�занное дей�твие"
 
 #: ../gtk/gtkactivatable.c:290
 msgid "The action this activatable will activate and receive updates from"
-msgstr ""
-"�ктиваци� �того �лемента приведёт к активации и получению обновлений из"
+msgstr "�ктиваци� �того �лемента приведёт к активации и получению обновлений из"
 
 #: ../gtk/gtkactivatable.c:312
 msgid "Use Action Appearance"
@@ -491,8 +484,10 @@ msgstr "И�пользовать �вой�тва вида дей�тви�"
 msgid "Whether to use the related actions appearance properties"
 msgstr "И�пользовать ли �вой�тва вида, �оответ�твующие дей�твию"
 
-#: ../gtk/gtkadjustment.c:123 ../gtk/gtkcellrendererprogress.c:126
-#: ../gtk/gtkscalebutton.c:217 ../gtk/gtkspinbutton.c:381
+#: ../gtk/gtkadjustment.c:123
+#: ../gtk/gtkcellrendererprogress.c:138
+#: ../gtk/gtkscalebutton.c:218
+#: ../gtk/gtkspinbutton.c:384
 msgid "Value"
 msgstr "Значение"
 
@@ -544,51 +539,35 @@ msgstr "Размер �траницы подгонки"
 msgid "Horizontal alignment"
 msgstr "Горизонтальное выравнивание"
 
-#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:278
-msgid ""
-"Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
-"right aligned"
-msgstr ""
-"Горизонтальное ра�положение вложенного �лемента в до�тупном про�тран�тве. "
-"0.0 -- выровнен по левому краю, 1.0 -- выровнен по правому краю"
+#: ../gtk/gtkalignment.c:138
+#: ../gtk/gtkbutton.c:279
+msgid "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is right aligned"
+msgstr "Горизонтальное ра�положение вложенного �лемента в до�тупном про�тран�тве. 0.0 -- выровнен по левому краю, 1.0 -- выровнен по правому краю"
 
 #: ../gtk/gtkalignment.c:147
 msgid "Vertical alignment"
 msgstr "Вертикальное выравнивание"
 
-#: ../gtk/gtkalignment.c:148 ../gtk/gtkbutton.c:297
-msgid ""
-"Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
-"bottom aligned"
-msgstr ""
-"Вертикальное ра�положение вложенного �лемента в до�тупном про�тран�тве. 0.0 "
-"-- выровнен по верхнему краю, 1.0 -- выровнен по нижнему краю"
+#: ../gtk/gtkalignment.c:148
+#: ../gtk/gtkbutton.c:298
+msgid "Vertical position of child in available space. 0.0 is top aligned, 1.0 is bottom aligned"
+msgstr "Вертикальное ра�положение вложенного �лемента в до�тупном про�тран�тве. 0.0 -- выровнен по верхнему краю, 1.0 -- выровнен по нижнему краю"
 
 #: ../gtk/gtkalignment.c:156
 msgid "Horizontal scale"
 msgstr "Горизонтальное ма�штабирование"
 
 #: ../gtk/gtkalignment.c:157
-msgid ""
-"If available horizontal space is bigger than needed for the child, how much "
-"of it to use for the child. 0.0 means none, 1.0 means all"
-msgstr ""
-"Е�ли до�тупное горизонтальное про�тран�тво больше, чем необходимо дл� "
-"�лемента, как много будет и�пользовано �тим �лементом. 0.0 -- ничего, 1.0 -- "
-"в�ё"
+msgid "If available horizontal space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all"
+msgstr "Е�ли до�тупное горизонтальное про�тран�тво больше, чем необходимо дл� �лемента, как много будет и�пользовано �тим �лементом. 0.0 -- ничего, 1.0 -- в�ё"
 
 #: ../gtk/gtkalignment.c:165
 msgid "Vertical scale"
 msgstr "Вертикальное ма�штабирование"
 
 #: ../gtk/gtkalignment.c:166
-msgid ""
-"If available vertical space is bigger than needed for the child, how much of "
-"it to use for the child. 0.0 means none, 1.0 means all"
-msgstr ""
-"Е�ли до�тупное вертикальное про�тран�тво больше, чем необходимо дл� "
-"�лемента, как много будет и�пользовано �тим �лементом. 0.0 -- ничего, 1.0 -- "
-"в�ё"
+msgid "If available vertical space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all"
+msgstr "Е�ли до�тупное вертикальное про�тран�тво больше, чем необходимо дл� �лемента, как много будет и�пользовано �тим �лементом. 0.0 -- ничего, 1.0 -- в�ё"
 
 #: ../gtk/gtkalignment.c:183
 msgid "Top Padding"
@@ -627,25 +606,24 @@ msgid "Include an 'Other...' item"
 msgstr "Включить �лемент 'Другой...'"
 
 #: ../gtk/gtkappchooserbutton.c:556
-msgid ""
-"Whether the combobox should include an item that triggers a "
-"GtkAppChooserDialog"
-msgstr ""
-"Включить ли в комбинированный �пи�ок �лемент дл� вызова GtkAppChooserDialog"
+msgid "Whether the combobox should include an item that triggers a GtkAppChooserDialog"
+msgstr "Включить ли в комбинированный �пи�ок �лемент дл� вызова GtkAppChooserDialog"
 
-#: ../gtk/gtkappchooserbutton.c:568 ../gtk/gtkappchooserdialog.c:722
+#: ../gtk/gtkappchooserbutton.c:568
+#: ../gtk/gtkappchooserdialog.c:722
 msgid "Heading"
 msgstr "Заголовок"
 
-#: ../gtk/gtkappchooserbutton.c:569 ../gtk/gtkappchooserdialog.c:723
+#: ../gtk/gtkappchooserbutton.c:569
+#: ../gtk/gtkappchooserdialog.c:723
 msgid "The text to show at the top of the dialog"
 msgstr "Тек�т, отображаемый на �амом верху диалогового окна."
 
-#: ../gtk/gtkappchooser.c:58
+#: ../gtk/gtkappchooser.c:61
 msgid "Content type"
 msgstr "Тип �одержимого"
 
-#: ../gtk/gtkappchooser.c:59
+#: ../gtk/gtkappchooser.c:62
 msgid "The content type used by the open with object"
 msgstr "Тип �одержимого, и�пользуемый � объектом при открытии"
 
@@ -657,80 +635,83 @@ msgstr "GFile"
 msgid "The GFile used by the app chooser dialog"
 msgstr "GFile и�пользует�� в диалогом выбора приложений"
 
-#: ../gtk/gtkappchooserwidget.c:1015
+#: ../gtk/gtkappchooserwidget.c:1016
 msgid "Show default app"
 msgstr "Показ приложени� по умолчанию"
 
-#: ../gtk/gtkappchooserwidget.c:1016
+#: ../gtk/gtkappchooserwidget.c:1017
 msgid "Whether the widget should show the default application"
 msgstr "Должен ли виджет показывать приложение по умолчанию"
 
-#: ../gtk/gtkappchooserwidget.c:1029
+#: ../gtk/gtkappchooserwidget.c:1030
 msgid "Show recommended apps"
 msgstr "Показ рекомендуемых приложений"
 
-#: ../gtk/gtkappchooserwidget.c:1030
+#: ../gtk/gtkappchooserwidget.c:1031
 msgid "Whether the widget should show recommended applications"
 msgstr "Должен ли виджет показывать рекомендуемые приложени�"
 
-#: ../gtk/gtkappchooserwidget.c:1043
+#: ../gtk/gtkappchooserwidget.c:1044
 msgid "Show fallback apps"
 msgstr "Показ приложений в крайнем �лучае"
 
-#: ../gtk/gtkappchooserwidget.c:1044
+#: ../gtk/gtkappchooserwidget.c:1045
 msgid "Whether the widget should show fallback applications"
 msgstr "Должен ли виджет показывать приложени�, и�пользуемые в крайнем �лучае"
 
-#: ../gtk/gtkappchooserwidget.c:1056
+#: ../gtk/gtkappchooserwidget.c:1057
 msgid "Show other apps"
 msgstr "Показ других приложений"
 
-#: ../gtk/gtkappchooserwidget.c:1057
+#: ../gtk/gtkappchooserwidget.c:1058
 msgid "Whether the widget should show other applications"
 msgstr "Должен ли виджет показывать другие приложени�"
 
-#: ../gtk/gtkappchooserwidget.c:1070
+#: ../gtk/gtkappchooserwidget.c:1071
 msgid "Show all apps"
 msgstr "Показ в�ех приложений"
 
-#: ../gtk/gtkappchooserwidget.c:1071
+#: ../gtk/gtkappchooserwidget.c:1072
 msgid "Whether the widget should show all applications"
 msgstr "Должен ли виджет показывать в�е приложени�"
 
-#: ../gtk/gtkappchooserwidget.c:1084
+#: ../gtk/gtkappchooserwidget.c:1085
 msgid "Widget's default text"
 msgstr "Тек�т виджета по умолчанию"
 
-#: ../gtk/gtkappchooserwidget.c:1085
+#: ../gtk/gtkappchooserwidget.c:1086
 msgid "The default text appearing when there are no applications"
 msgstr "Тек�т по умолчанию, по�вл�ющий�� в �лучае когда нет приложений"
 
-#: ../gtk/gtkarrow.c:110
+#: ../gtk/gtkarrow.c:112
 msgid "Arrow direction"
 msgstr "�аправление �трелки"
 
-#: ../gtk/gtkarrow.c:111
+#: ../gtk/gtkarrow.c:113
 msgid "The direction the arrow should point"
 msgstr "�аправление, в котором указывает �трелка"
 
-#: ../gtk/gtkarrow.c:119
+#: ../gtk/gtkarrow.c:121
 msgid "Arrow shadow"
 msgstr "Тень �трелки"
 
-#: ../gtk/gtkarrow.c:120
+#: ../gtk/gtkarrow.c:122
 msgid "Appearance of the shadow surrounding the arrow"
 msgstr "Внешний вид тени, отбра�ываемой �трелкой"
 
-#: ../gtk/gtkarrow.c:127 ../gtk/gtkcombobox.c:985 ../gtk/gtkmenu.c:796
-#: ../gtk/gtkmenuitem.c:391
+#: ../gtk/gtkarrow.c:129
+#: ../gtk/gtkcombobox.c:986
+#: ../gtk/gtkmenu.c:798
+#: ../gtk/gtkmenuitem.c:446
 msgid "Arrow Scaling"
 msgstr "Ра�т�жение �трелки"
 
-#: ../gtk/gtkarrow.c:128
+#: ../gtk/gtkarrow.c:130
 msgid "Amount of space used up by arrow"
 msgstr "Про�тран�тво, занимаемое �трелкой"
 
-#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1159
+#: ../gtk/gtkaspectframe.c:109
+#: ../gtk/gtkwidget.c:1178
 msgid "Horizontal Alignment"
 msgstr "Горизонтальное выравнивание"
 
@@ -738,7 +719,8 @@ msgstr "Горизонтальное выравнивание"
 msgid "X alignment of the child"
 msgstr "Выравнивание вложенного �лемента по о�и X"
 
-#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1175
+#: ../gtk/gtkaspectframe.c:116
+#: ../gtk/gtkwidget.c:1194
 msgid "Vertical Alignment"
 msgstr "Вертикальное выравнивание"
 
@@ -752,9 +734,7 @@ msgstr "Отношение"
 
 #: ../gtk/gtkaspectframe.c:124
 msgid "Aspect ratio if obey_child is FALSE"
-msgstr ""
-"Ко�ффициент пропорционально�ти, е�ли дл� параметра «Подчинённый "
-"�лемент» (obey_child) выбрано значение «ЛОЖ�О»"
+msgstr "Ко�ффициент пропорционально�ти, е�ли дл� параметра «Подчинённый �лемент» (obey_child) выбрано значение «ЛОЖ�О»"
 
 #: ../gtk/gtkaspectframe.c:130
 msgid "Obey child"
@@ -762,125 +742,127 @@ msgstr "Подчин�ть�� дочернему �лементу"
 
 #: ../gtk/gtkaspectframe.c:131
 msgid "Force aspect ratio to match that of the frame's child"
-msgstr ""
-"Приве�ти ко�ффициент пропорционально�ти в �оответ�твие � таковым у дочернего "
-"�лемента рамки"
+msgstr "Приве�ти ко�ффициент пропорционально�ти в �оответ�твие � таковым у дочернего �лемента рамки"
 
-#: ../gtk/gtkassistant.c:326
+#: ../gtk/gtkassistant.c:310
 msgid "Header Padding"
 msgstr "Про�тран�тво заголовка"
 
-#: ../gtk/gtkassistant.c:327
+#: ../gtk/gtkassistant.c:311
 msgid "Number of pixels around the header."
 msgstr "Чи�ло пу�тых пик�елей вокруг заголовка."
 
-#: ../gtk/gtkassistant.c:334
+#: ../gtk/gtkassistant.c:318
 msgid "Content Padding"
 msgstr "Про�тран�тво �одержимого"
 
-#: ../gtk/gtkassistant.c:335
+#: ../gtk/gtkassistant.c:319
 msgid "Number of pixels around the content pages."
 msgstr "Чи�ло пу�тых пик�елей вокруг �одержимого."
 
-#: ../gtk/gtkassistant.c:351
+#: ../gtk/gtkassistant.c:335
 msgid "Page type"
 msgstr "Тип �траниц"
 
-#: ../gtk/gtkassistant.c:352
+#: ../gtk/gtkassistant.c:336
 msgid "The type of the assistant page"
 msgstr "Тип �траниц помощника"
 
-#: ../gtk/gtkassistant.c:369
+#: ../gtk/gtkassistant.c:351
 msgid "Page title"
 msgstr "Заголовок �траниц"
 
-#: ../gtk/gtkassistant.c:370
+#: ../gtk/gtkassistant.c:352
 msgid "The title of the assistant page"
 msgstr "Заголовок �траницы помощника"
 
-#: ../gtk/gtkassistant.c:386
+#: ../gtk/gtkassistant.c:369
 msgid "Header image"
 msgstr "Изображение заголовка"
 
-#: ../gtk/gtkassistant.c:387
+#: ../gtk/gtkassistant.c:370
 msgid "Header image for the assistant page"
 msgstr "Изображение заголовка �траницы помощника"
 
-#: ../gtk/gtkassistant.c:403
+#: ../gtk/gtkassistant.c:386
 msgid "Sidebar image"
 msgstr "Изображение боковой обла�ти"
 
-#: ../gtk/gtkassistant.c:404
+#: ../gtk/gtkassistant.c:387
 msgid "Sidebar image for the assistant page"
 msgstr "Изображение боковой обла�ти помощника"
 
-#: ../gtk/gtkassistant.c:419
+#: ../gtk/gtkassistant.c:403
 msgid "Page complete"
 msgstr "Страница заполнена"
 
-#: ../gtk/gtkassistant.c:420
+#: ../gtk/gtkassistant.c:404
 msgid "Whether all required fields on the page have been filled out"
 msgstr "Заполнены ли в�е требуемые пол� на �той �транице"
 
-#: ../gtk/gtkbbox.c:152
+#: ../gtk/gtkbbox.c:159
 msgid "Minimum child width"
 msgstr "Минимальна� ширина вложенного �лемента"
 
-#: ../gtk/gtkbbox.c:153
+#: ../gtk/gtkbbox.c:160
 msgid "Minimum width of buttons inside the box"
 msgstr "Минимальна� ширина кнопок внутри контейнера"
 
-#: ../gtk/gtkbbox.c:161
+#: ../gtk/gtkbbox.c:168
 msgid "Minimum child height"
 msgstr "Минимальна� вы�ота вложенного �лемента"
 
-#: ../gtk/gtkbbox.c:162
+#: ../gtk/gtkbbox.c:169
 msgid "Minimum height of buttons inside the box"
 msgstr "Минимальна� вы�ота кнопок внутри контейнера"
 
-#: ../gtk/gtkbbox.c:170
+#: ../gtk/gtkbbox.c:177
 msgid "Child internal width padding"
 msgstr "Внутреннее дополнение по ширине"
 
-#: ../gtk/gtkbbox.c:171
+#: ../gtk/gtkbbox.c:178
 msgid "Amount to increase child's size on either side"
 msgstr "Степень увеличени� размера �лемента �лева и �права"
 
-#: ../gtk/gtkbbox.c:179
+#: ../gtk/gtkbbox.c:186
 msgid "Child internal height padding"
 msgstr "Внутреннее дополнение по вы�оте"
 
-#: ../gtk/gtkbbox.c:180
+#: ../gtk/gtkbbox.c:187
 msgid "Amount to increase child's size on the top and bottom"
 msgstr "Степень увеличени� размера �лемента �верху и �низу"
 
-#: ../gtk/gtkbbox.c:188
+#: ../gtk/gtkbbox.c:195
 msgid "Layout style"
 msgstr "Стиль размещени�"
 
-#: ../gtk/gtkbbox.c:189
-msgid ""
-"How to lay out the buttons in the box. Possible values are: spread, edge, "
-"start and end"
-msgstr ""
-"Как размещают�� кнопки в окне.  Возможные значени�: spread («ра�пределённо»), "
-"edge («по кра�м»), start («� начала») и end («� конца»)"
+#: ../gtk/gtkbbox.c:196
+msgid "How to lay out the buttons in the box. Possible values are: spread, edge, start and end"
+msgstr "Как размещают�� кнопки в окне.  Возможные значени�: spread («ра�пределённо»), edge («по кра�м»), start («� начала») и end («� конца»)"
 
-#: ../gtk/gtkbbox.c:197
+#: ../gtk/gtkbbox.c:204
 msgid "Secondary"
 msgstr "Дополнительный"
 
-#: ../gtk/gtkbbox.c:198
-msgid ""
-"If TRUE, the child appears in a secondary group of children, suitable for, e."
-"g., help buttons"
-msgstr ""
-"Е�ли у�тановлено, то вложенный �лемент по�вл�ет�� в дополнительной группе "
-"вложенных �лементов; может и�пользовать��, например, дл� кнопок вызова "
-"�правки"
-
-#: ../gtk/gtkbox.c:241 ../gtk/gtkcellareabox.c:318 ../gtk/gtkexpander.c:311
-#: ../gtk/gtkiconview.c:645 ../gtk/gtktreeviewcolumn.c:271
+#: ../gtk/gtkbbox.c:205
+msgid "If TRUE, the child appears in a secondary group of children, suitable for, e.g., help buttons"
+msgstr "Е�ли у�тановлено, то вложенный �лемент по�вл�ет�� в дополнительной группе вложенных �лементов; может и�пользовать��, например, дл� кнопок вызова �правки"
+
+#: ../gtk/gtkbbox.c:212
+#| msgid "Homogeneous"
+msgid "Non-Homogeneous"
+msgstr "�еоднородный"
+
+#: ../gtk/gtkbbox.c:213
+#| msgid "If TRUE, the child can be made smaller than its requisition"
+msgid "If TRUE, the child will not be subject to homogeneous sizing"
+msgstr "Е�ли у�тановлено, то дочерний �лемент не будет подчин�ть�� однородному изменению размеров"
+
+#: ../gtk/gtkbox.c:241
+#: ../gtk/gtkcellareabox.c:317
+#: ../gtk/gtkexpander.c:314
+#: ../gtk/gtkiconview.c:643
+#: ../gtk/gtktreeviewcolumn.c:283
 msgid "Spacing"
 msgstr "Интервал"
 
@@ -888,8 +870,10 @@ msgstr "Интервал"
 msgid "The amount of space between children"
 msgstr "Ра��то�ние между вложенными �лементами"
 
-#: ../gtk/gtkbox.c:251 ../gtk/gtktable.c:193 ../gtk/gtktoolbar.c:551
-#: ../gtk/gtktoolitemgroup.c:1649
+#: ../gtk/gtkbox.c:251
+#: ../gtk/gtktable.c:227
+#: ../gtk/gtktoolbar.c:563
+#: ../gtk/gtktoolitemgroup.c:1645
 msgid "Homogeneous"
 msgstr "Гомогенно�ть"
 
@@ -897,58 +881,54 @@ msgstr "Гомогенно�ть"
 msgid "Whether the children should all be the same size"
 msgstr "Имеют ли в�е вложенные �лементы одинаковый размер"
 
-#: ../gtk/gtkbox.c:272 ../gtk/gtkcellareabox.c:338 ../gtk/gtktoolbar.c:543
-#: ../gtk/gtktoolitemgroup.c:1656 ../gtk/gtktoolpalette.c:1101
-#: ../gtk/gtktreeviewcolumn.c:327
+#: ../gtk/gtkbox.c:272
+#: ../gtk/gtkcellareabox.c:337
+#: ../gtk/gtktoolbar.c:555
+#: ../gtk/gtktoolitemgroup.c:1652
+#: ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktreeviewcolumn.c:339
 msgid "Expand"
 msgstr "Ра�шир�емо�ть"
 
 #: ../gtk/gtkbox.c:273
 msgid "Whether the child should receive extra space when the parent grows"
-msgstr ""
-"Ра�шир�ют�� ли в�е вложенные �лементы при увеличении размера родитель�кого "
-"�лемента"
+msgstr "Ра�шир�ют�� ли в�е вложенные �лементы при увеличении размера родитель�кого �лемента"
 
-#: ../gtk/gtkbox.c:289 ../gtk/gtktoolitemgroup.c:1663
+#: ../gtk/gtkbox.c:289
+#: ../gtk/gtktoolitemgroup.c:1659
 msgid "Fill"
 msgstr "Заполнение"
 
 #: ../gtk/gtkbox.c:290
-msgid ""
-"Whether extra space given to the child should be allocated to the child or "
-"used as padding"
-msgstr ""
-"Ра�предел�ть ли дополнительное про�тран�тво, отданное дочернему �лементу, "
-"внутри �лемента (fill), или и�пользовать его дл� дополнени� (padding)"
+msgid "Whether extra space given to the child should be allocated to the child or used as padding"
+msgstr "Ра�предел�ть ли дополнительное про�тран�тво, отданное дочернему �лементу, внутри �лемента (fill), или и�пользовать его дл� дополнени� (padding)"
 
-#: ../gtk/gtkbox.c:297 ../gtk/gtktrayicon-x11.c:169
+#: ../gtk/gtkbox.c:297
+#: ../gtk/gtktrayicon-x11.c:169
 msgid "Padding"
 msgstr "Дополнение"
 
 #: ../gtk/gtkbox.c:298
 msgid "Extra space to put between the child and its neighbors, in pixels"
-msgstr ""
-"Дополнительное про�тран�тво, которое будет помещено между дочерним �лементом "
-"и его �о�ед�ми, в точках ра�тра"
+msgstr "Дополнительное про�тран�тво, которое будет помещено между дочерним �лементом и его �о�ед�ми, в точках ра�тра"
 
 #: ../gtk/gtkbox.c:304
 msgid "Pack type"
 msgstr "Тип упаковки"
 
 #: ../gtk/gtkbox.c:305
-msgid ""
-"A GtkPackType indicating whether the child is packed with reference to the "
-"start or end of the parent"
-msgstr ""
-"GtkPackType указывает отно�ительно чего упаковывает�� дочерний �лемент -- "
-"отно�ительно начала, конца, или �лемента-родител�"
+msgid "A GtkPackType indicating whether the child is packed with reference to the start or end of the parent"
+msgstr "GtkPackType указывает отно�ительно чего упаковывает�� дочерний �лемент -- отно�ительно начала, конца, или �лемента-родител�"
 
-#: ../gtk/gtkbox.c:311 ../gtk/gtknotebook.c:760 ../gtk/gtkpaned.c:326
-#: ../gtk/gtktoolitemgroup.c:1677
+#: ../gtk/gtkbox.c:311
+#: ../gtk/gtknotebook.c:769
+#: ../gtk/gtkpaned.c:349
+#: ../gtk/gtktoolitemgroup.c:1673
 msgid "Position"
 msgstr "Позици�"
 
-#: ../gtk/gtkbox.c:312 ../gtk/gtknotebook.c:761
+#: ../gtk/gtkbox.c:312
+#: ../gtk/gtknotebook.c:770
 msgid "The index of the child in the parent"
 msgstr "Индек� дочернего �лемента в �лементе-родителе"
 
@@ -960,286 +940,272 @@ msgstr "Обла�ть перевода"
 msgid "The translation domain used by gettext"
 msgstr "Обла�ть перевода, и�пользуема� gettext"
 
-#: ../gtk/gtkbutton.c:228
-msgid ""
-"Text of the label widget inside the button, if the button contains a label "
-"widget"
+#: ../gtk/gtkbutton.c:229
+msgid "Text of the label widget inside the button, if the button contains a label widget"
 msgstr "Тек�т виджета-метки на кнопке, е�ли кнопка �одержит метку."
 
-#: ../gtk/gtkbutton.c:235 ../gtk/gtkexpander.c:295 ../gtk/gtklabel.c:588
-#: ../gtk/gtkmenuitem.c:343 ../gtk/gtktoolbutton.c:208
+#: ../gtk/gtkbutton.c:236
+#: ../gtk/gtkexpander.c:298
+#: ../gtk/gtklabel.c:750
+#: ../gtk/gtkmenuitem.c:398
+#: ../gtk/gtktoolbutton.c:239
 msgid "Use underline"
 msgstr "И�пользовать подчеркивание"
 
-#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:296 ../gtk/gtklabel.c:589
-#: ../gtk/gtkmenuitem.c:344
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"Е�ли у�тановлено, подчёркивание в тек�те обозначает, что �ледующий �имвол "
-"и�пользует�� в комбинации клавиш."
+#: ../gtk/gtkbutton.c:237
+#: ../gtk/gtkexpander.c:299
+#: ../gtk/gtklabel.c:751
+#: ../gtk/gtkmenuitem.c:399
+msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+msgstr "Е�ли у�тановлено, подчёркивание в тек�те обозначает, что �ледующий �имвол и�пользует�� в комбинации клавиш."
 
-#: ../gtk/gtkbutton.c:243 ../gtk/gtkimagemenuitem.c:164
+#: ../gtk/gtkbutton.c:244
+#: ../gtk/gtkimagemenuitem.c:175
 msgid "Use stock"
 msgstr "И�пользовать в�троенное"
 
-#: ../gtk/gtkbutton.c:244
-msgid ""
-"If set, the label is used to pick a stock item instead of being displayed"
-msgstr ""
-"Е�ли у�тановлено, метка будет и�пользована дл� выбора из в�троенных кнопок "
-"вме�то отображени�"
+#: ../gtk/gtkbutton.c:245
+msgid "If set, the label is used to pick a stock item instead of being displayed"
+msgstr "Е�ли у�тановлено, метка будет и�пользована дл� выбора из в�троенных кнопок вме�то отображени�"
 
-#: ../gtk/gtkbutton.c:251 ../gtk/gtkcombobox.c:791
-#: ../gtk/gtkfilechooserbutton.c:383
+#: ../gtk/gtkbutton.c:252
+#: ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkfilechooserbutton.c:426
 msgid "Focus on click"
 msgstr "Захватывать фоку� по щелчку"
 
-#: ../gtk/gtkbutton.c:252 ../gtk/gtkfilechooserbutton.c:384
+#: ../gtk/gtkbutton.c:253
+#: ../gtk/gtkfilechooserbutton.c:427
 msgid "Whether the button grabs focus when it is clicked with the mouse"
 msgstr "Захватывает ли кнопка фоку� ввода при щелчке мышью по ней"
 
-#: ../gtk/gtkbutton.c:259
+#: ../gtk/gtkbutton.c:260
 msgid "Border relief"
 msgstr "Рельефные границы"
 
-#: ../gtk/gtkbutton.c:260
+#: ../gtk/gtkbutton.c:261
 msgid "The border relief style"
 msgstr "Стиль рельефа границы"
 
-#: ../gtk/gtkbutton.c:277
+#: ../gtk/gtkbutton.c:278
 msgid "Horizontal alignment for child"
 msgstr "Горизонтальное выравнивание дл� дочерних �лементов"
 
-#: ../gtk/gtkbutton.c:296
+#: ../gtk/gtkbutton.c:297
 msgid "Vertical alignment for child"
 msgstr "Вертикальное выравнивание дл� дочерних �лементов"
 
-#: ../gtk/gtkbutton.c:313 ../gtk/gtkimagemenuitem.c:149
+#: ../gtk/gtkbutton.c:314
+#: ../gtk/gtkimagemenuitem.c:160
 msgid "Image widget"
 msgstr "Виджет «Изображение»"
 
-#: ../gtk/gtkbutton.c:314
+#: ../gtk/gtkbutton.c:315
 msgid "Child widget to appear next to the button text"
 msgstr "Дочерний виджет, по�вл�ющий�� на �кране р�дом � тек�том кнопки"
 
-#: ../gtk/gtkbutton.c:328
+#: ../gtk/gtkbutton.c:329
 msgid "Image position"
 msgstr "Положение изображени�"
 
-#: ../gtk/gtkbutton.c:329
+#: ../gtk/gtkbutton.c:330
 msgid "The position of the image relative to the text"
 msgstr "Положение изображени� отно�ительно тек�та"
 
-#: ../gtk/gtkbutton.c:449
+#: ../gtk/gtkbutton.c:450
 msgid "Default Spacing"
 msgstr "Интервал по умолчанию"
 
-#: ../gtk/gtkbutton.c:450
+#: ../gtk/gtkbutton.c:451
 msgid "Extra space to add for GTK_CAN_DEFAULT buttons"
 msgstr "Дополнительное про�тран�тво дл� кнопок типа GTK_CAN_DEFAULT"
 
-#: ../gtk/gtkbutton.c:464
+#: ../gtk/gtkbutton.c:465
 msgid "Default Outside Spacing"
 msgstr "Внешний интервал по умолчанию"
 
-#: ../gtk/gtkbutton.c:465
-msgid ""
-"Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside "
-"the border"
-msgstr ""
-"Дополнительное про�тран�тво дл� кнопок типа  GTK_CAN_DEFAULT, которое в�егда "
-"добавл�ет�� �наружи к границам кнопок"
+#: ../gtk/gtkbutton.c:466
+msgid "Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside the border"
+msgstr "Дополнительное про�тран�тво дл� кнопок типа  GTK_CAN_DEFAULT, которое в�егда добавл�ет�� �наружи к границам кнопок"
 
-#: ../gtk/gtkbutton.c:470
+#: ../gtk/gtkbutton.c:471
 msgid "Child X Displacement"
 msgstr "Перемещение дочернего �лемента по горизонтали"
 
-#: ../gtk/gtkbutton.c:471
-msgid ""
-"How far in the x direction to move the child when the button is depressed"
-msgstr ""
-"�а �колько переме�тить дочерний �лемент по горизонтали, е�ли нажата кнопка"
+#: ../gtk/gtkbutton.c:472
+msgid "How far in the x direction to move the child when the button is depressed"
+msgstr "�а �колько переме�тить дочерний �лемент по горизонтали, е�ли нажата кнопка"
 
-#: ../gtk/gtkbutton.c:478
+#: ../gtk/gtkbutton.c:479
 msgid "Child Y Displacement"
 msgstr "Перемещение дочернего �лемента по вертикали"
 
-#: ../gtk/gtkbutton.c:479
-msgid ""
-"How far in the y direction to move the child when the button is depressed"
-msgstr ""
-"�а �колько переме�тить дочерний �лемент по вертикали, е�ли нажата кнопка"
+#: ../gtk/gtkbutton.c:480
+msgid "How far in the y direction to move the child when the button is depressed"
+msgstr "�а �колько переме�тить дочерний �лемент по вертикали, е�ли нажата кнопка"
 
-#: ../gtk/gtkbutton.c:495
+#: ../gtk/gtkbutton.c:496
 msgid "Displace focus"
 msgstr "Сме�тить фоку�"
 
-#: ../gtk/gtkbutton.c:496
-msgid ""
-"Whether the child_displacement_x/_y properties should also affect the focus "
-"rectangle"
-msgstr ""
-"Вли�ют ли �вой�тва child_displacement_x/_y также и на пр�моугольник фоку�а"
+#: ../gtk/gtkbutton.c:497
+msgid "Whether the child_displacement_x/_y properties should also affect the focus rectangle"
+msgstr "Вли�ют ли �вой�тва child_displacement_x/_y также и на пр�моугольник фоку�а"
 
-#: ../gtk/gtkbutton.c:509 ../gtk/gtkentry.c:787 ../gtk/gtkentry.c:1832
+#: ../gtk/gtkbutton.c:510
+#: ../gtk/gtkentry.c:794
+#: ../gtk/gtkentry.c:1869
 msgid "Inner Border"
 msgstr "Внутреннее окаймление"
 
-#: ../gtk/gtkbutton.c:510
+#: ../gtk/gtkbutton.c:511
 msgid "Border between button edges and child."
 msgstr "Окаймление между границами кнопки и дочерним объектом."
 
-#: ../gtk/gtkbutton.c:523
+#: ../gtk/gtkbutton.c:524
 msgid "Image spacing"
 msgstr "От�туп изображени�"
 
-#: ../gtk/gtkbutton.c:524
+#: ../gtk/gtkbutton.c:525
 msgid "Spacing in pixels between the image and label"
 msgstr "От�туп в пик�ел�х между изображением и меткой"
 
-#: ../gtk/gtkcalendar.c:468
+#: ../gtk/gtkcalendar.c:470
 msgid "Year"
 msgstr "Год"
 
-#: ../gtk/gtkcalendar.c:469
+#: ../gtk/gtkcalendar.c:471
 msgid "The selected year"
 msgstr "Выбранный год"
 
-#: ../gtk/gtkcalendar.c:482
+#: ../gtk/gtkcalendar.c:484
 msgid "Month"
 msgstr "Ме��ц"
 
-#: ../gtk/gtkcalendar.c:483
+#: ../gtk/gtkcalendar.c:485
 msgid "The selected month (as a number between 0 and 11)"
 msgstr "Выбранный ме��ц (как номер между 0 и 11)"
 
-#: ../gtk/gtkcalendar.c:497
+#: ../gtk/gtkcalendar.c:499
 msgid "Day"
 msgstr "День"
 
-#: ../gtk/gtkcalendar.c:498
-msgid ""
-"The selected day (as a number between 1 and 31, or 0 to unselect the "
-"currently selected day)"
+#: ../gtk/gtkcalendar.c:500
+msgid "The selected day (as a number between 1 and 31, or 0 to unselect the currently selected day)"
 msgstr "Выбранный день (как номер между 1 и 31 или 0 дл� отмены выбора)"
 
-#: ../gtk/gtkcalendar.c:512
+#: ../gtk/gtkcalendar.c:514
 msgid "Show Heading"
 msgstr "Показывать заголовок"
 
-#: ../gtk/gtkcalendar.c:513
+#: ../gtk/gtkcalendar.c:515
 msgid "If TRUE, a heading is displayed"
 msgstr "Е�ли у�тановлено, то заголовок отображает��"
 
-#: ../gtk/gtkcalendar.c:527
+#: ../gtk/gtkcalendar.c:529
 msgid "Show Day Names"
 msgstr "Показывать имена дней"
 
-#: ../gtk/gtkcalendar.c:528
+#: ../gtk/gtkcalendar.c:530
 msgid "If TRUE, day names are displayed"
 msgstr "Е�ли у�тановлено, то имена дней отображают��"
 
-#: ../gtk/gtkcalendar.c:541
+#: ../gtk/gtkcalendar.c:543
 msgid "No Month Change"
 msgstr "Ме��ц не измен�ет��"
 
-#: ../gtk/gtkcalendar.c:542
+#: ../gtk/gtkcalendar.c:544
 msgid "If TRUE, the selected month cannot be changed"
 msgstr "Е�ли у�тановлено, то изменить выбранный ме��ц невозможно"
 
-#: ../gtk/gtkcalendar.c:556
+#: ../gtk/gtkcalendar.c:558
 msgid "Show Week Numbers"
 msgstr "Показывать номера недель"
 
-#: ../gtk/gtkcalendar.c:557
+#: ../gtk/gtkcalendar.c:559
 msgid "If TRUE, week numbers are displayed"
 msgstr "Е�ли у�тановлено, то номера недель отображают��"
 
-#: ../gtk/gtkcalendar.c:572
+#: ../gtk/gtkcalendar.c:574
 msgid "Details Width"
 msgstr "Ширина деталей"
 
-#: ../gtk/gtkcalendar.c:573
+#: ../gtk/gtkcalendar.c:575
 msgid "Details width in characters"
 msgstr "Ширина деталей в �имволах"
 
-#: ../gtk/gtkcalendar.c:588
+#: ../gtk/gtkcalendar.c:590
 msgid "Details Height"
 msgstr "Вы�ота деталей"
 
-#: ../gtk/gtkcalendar.c:589
+#: ../gtk/gtkcalendar.c:591
 msgid "Details height in rows"
 msgstr "Вы�ота деталей в �троках"
 
-#: ../gtk/gtkcalendar.c:605
+#: ../gtk/gtkcalendar.c:607
 msgid "Show Details"
 msgstr "Показать детали"
 
-#: ../gtk/gtkcalendar.c:606
+#: ../gtk/gtkcalendar.c:608
 msgid "If TRUE, details are shown"
 msgstr "Е�ли у�тановлено, детали отображают��"
 
-#: ../gtk/gtkcalendar.c:618
+#: ../gtk/gtkcalendar.c:620
 msgid "Inner border"
 msgstr "Внутреннее окаймление"
 
-#: ../gtk/gtkcalendar.c:619
+#: ../gtk/gtkcalendar.c:621
 msgid "Inner border space"
 msgstr "Про�тран�тво внутренней границы"
 
-#: ../gtk/gtkcalendar.c:630
+#: ../gtk/gtkcalendar.c:632
 msgid "Vertical separation"
 msgstr "Вертикальное разделение"
 
-#: ../gtk/gtkcalendar.c:631
+#: ../gtk/gtkcalendar.c:633
 msgid "Space between day headers and main area"
 msgstr "Интервал между заголовками дней и о�новной обла�тью"
 
-#: ../gtk/gtkcalendar.c:642
+#: ../gtk/gtkcalendar.c:644
 msgid "Horizontal separation"
 msgstr "Горизонтальное разделение"
 
-#: ../gtk/gtkcalendar.c:643
+#: ../gtk/gtkcalendar.c:645
 msgid "Space between week headers and main area"
 msgstr "Ра��то�ни� между заголовками недель и о�новной обла�тью"
 
-#: ../gtk/gtkcellareabox.c:319 ../gtk/gtktreeviewcolumn.c:272
+#: ../gtk/gtkcellareabox.c:318
+#: ../gtk/gtktreeviewcolumn.c:284
 msgid "Space which is inserted between cells"
 msgstr "Про�тран�тво, в�тавл�емое между �чейками"
 
-#: ../gtk/gtkcellareabox.c:339
+#: ../gtk/gtkcellareabox.c:338
 msgid "Whether the cell expands"
 msgstr "Будут ли �чейки ра�шир�емыми"
 
-#: ../gtk/gtkcellareabox.c:354
+#: ../gtk/gtkcellareabox.c:353
 msgid "Align"
 msgstr "Выравнивание"
 
-#: ../gtk/gtkcellareabox.c:355
+#: ../gtk/gtkcellareabox.c:354
 msgid "Whether cell should align with adjacent rows"
 msgstr "Должны ли �чейки выравнивать�� по �о�едним �трокам"
 
-#: ../gtk/gtkcellareabox.c:371
+#: ../gtk/gtkcellareabox.c:370
 msgid "Fixed Size"
 msgstr "По�то�нный размер"
 
-#: ../gtk/gtkcellareabox.c:372
+#: ../gtk/gtkcellareabox.c:371
 msgid "Whether cells should be the same size in all rows"
 msgstr "Должны ли быть �чейки во в�ех �троках одного размера"
 
-#: ../gtk/gtkcellareabox.c:388
+#: ../gtk/gtkcellareabox.c:387
 msgid "Pack Type"
 msgstr "Тип упаковки"
 
-#: ../gtk/gtkcellareabox.c:389
-msgid ""
-"A GtkPackType indicating whether the cell is packed with reference to the "
-"start or end of the cell area"
-msgstr ""
-"GtkPackType указывает как упаковывают�� �чейки: отно�ительно начала или "
-"конца обла�ти �чеек"
+#: ../gtk/gtkcellareabox.c:388
+msgid "A GtkPackType indicating whether the cell is packed with reference to the start or end of the cell area"
+msgstr "GtkPackType указывает как упаковывают�� �чейки: отно�ительно начала или конца обла�ти �чеек"
 
 #: ../gtk/gtkcellarea.c:803
 msgid "Focus Cell"
@@ -1265,28 +1231,32 @@ msgstr "Редактируемый виджет"
 msgid "The widget currently editing the edited cell"
 msgstr "Виджет, которой в данный момент измен�ет редактируемую �чейку"
 
-#: ../gtk/gtkcellareacontext.c:127
+#: ../gtk/gtkcellareacontext.c:119
 msgid "Area"
 msgstr "Обла�ть"
 
-#: ../gtk/gtkcellareacontext.c:128
+#: ../gtk/gtkcellareacontext.c:120
 msgid "The Cell Area this context was created for"
 msgstr "Обла�ть �чеек, �озданна� дл� �того контек�та"
 
-#: ../gtk/gtkcellareacontext.c:144 ../gtk/gtkcellareacontext.c:163
-#: ../gtk/gtktreeviewcolumn.c:299
+#: ../gtk/gtkcellareacontext.c:136
+#: ../gtk/gtkcellareacontext.c:155
+#: ../gtk/gtktreeviewcolumn.c:311
 msgid "Minimum Width"
 msgstr "Минимальна� ширина"
 
-#: ../gtk/gtkcellareacontext.c:145 ../gtk/gtkcellareacontext.c:164
+#: ../gtk/gtkcellareacontext.c:137
+#: ../gtk/gtkcellareacontext.c:156
 msgid "Minimum cached width"
 msgstr "Минимальна� к�шированна� ширина"
 
-#: ../gtk/gtkcellareacontext.c:182 ../gtk/gtkcellareacontext.c:201
+#: ../gtk/gtkcellareacontext.c:174
+#: ../gtk/gtkcellareacontext.c:193
 msgid "Minimum Height"
 msgstr "Минимальна� вы�ота"
 
-#: ../gtk/gtkcellareacontext.c:183 ../gtk/gtkcellareacontext.c:202
+#: ../gtk/gtkcellareacontext.c:175
+#: ../gtk/gtkcellareacontext.c:194
 msgid "Minimum cached height"
 msgstr "Минимальна� к�шированна� вы�ота"
 
@@ -1298,35 +1268,35 @@ msgstr "Редактирование отменено"
 msgid "Indicates that editing has been canceled"
 msgstr "Показывает, что редактирование было отменено"
 
-#: ../gtk/gtkcellrendereraccel.c:137
+#: ../gtk/gtkcellrendereraccel.c:152
 msgid "Accelerator key"
 msgstr "Бы�тра� клавиша"
 
-#: ../gtk/gtkcellrendereraccel.c:138
+#: ../gtk/gtkcellrendereraccel.c:153
 msgid "The keyval of the accelerator"
 msgstr "Значение бы�трой клавиши"
 
-#: ../gtk/gtkcellrendereraccel.c:154
+#: ../gtk/gtkcellrendereraccel.c:169
 msgid "Accelerator modifiers"
 msgstr "Модификатор бы�трой клавиши"
 
-#: ../gtk/gtkcellrendereraccel.c:155
+#: ../gtk/gtkcellrendereraccel.c:170
 msgid "The modifier mask of the accelerator"
 msgstr "Ма�ка модификатора бы�трой клавиши"
 
-#: ../gtk/gtkcellrendereraccel.c:172
+#: ../gtk/gtkcellrendereraccel.c:187
 msgid "Accelerator keycode"
 msgstr "Значение бы�трой клавиши"
 
-#: ../gtk/gtkcellrendereraccel.c:173
+#: ../gtk/gtkcellrendereraccel.c:188
 msgid "The hardware keycode of the accelerator"
 msgstr "�ппаратный код бы�трой клавиши"
 
-#: ../gtk/gtkcellrendereraccel.c:192
+#: ../gtk/gtkcellrendereraccel.c:207
 msgid "Accelerator Mode"
 msgstr "Режим бы�трой клавиши"
 
-#: ../gtk/gtkcellrendereraccel.c:193
+#: ../gtk/gtkcellrendereraccel.c:208
 msgid "The type of accelerators"
 msgstr "Тип бы�трых клавиш"
 
@@ -1454,182 +1424,192 @@ msgstr "Фон �чейки у�тановлен"
 msgid "Whether this tag affects the cell background color"
 msgstr "Вли�ет ли �тот тег на цвет фона �чейки"
 
-#: ../gtk/gtkcellrenderercombo.c:109
+#: ../gtk/gtkcellrenderercombo.c:130
 msgid "Model"
 msgstr "Модель"
 
-#: ../gtk/gtkcellrenderercombo.c:110
+#: ../gtk/gtkcellrenderercombo.c:131
 msgid "The model containing the possible values for the combo box"
 msgstr "Модель, �одержаща� возможные параметры выпадающего �пи�ка"
 
-#: ../gtk/gtkcellrenderercombo.c:132
+#: ../gtk/gtkcellrenderercombo.c:153
 msgid "Text Column"
 msgstr "Столбец тек�та"
 
-#: ../gtk/gtkcellrenderercombo.c:133
+#: ../gtk/gtkcellrenderercombo.c:154
 msgid "A column in the data source model to get the strings from"
 msgstr "Столбец в модели и�точника данных, откуда берут�� �троки"
 
-#: ../gtk/gtkcellrenderercombo.c:150 ../gtk/gtkcombobox.c:858
+#: ../gtk/gtkcellrenderercombo.c:171
+#: ../gtk/gtkcombobox.c:859
 msgid "Has Entry"
 msgstr "Имеет запи�ь"
 
-#: ../gtk/gtkcellrenderercombo.c:151
+#: ../gtk/gtkcellrenderercombo.c:172
 msgid "If FALSE, don't allow to enter strings other than the chosen ones"
-msgstr ""
-"Е�ли не у�тановлено, не позвол�ть вводить �троки, отличные от выбранных"
+msgstr "Е�ли не у�тановлено, не позвол�ть вводить �троки, отличные от выбранных"
 
-#: ../gtk/gtkcellrendererpixbuf.c:120
+#: ../gtk/gtkcellrendererpixbuf.c:140
 msgid "Pixbuf Object"
 msgstr "Объект значок (Pixbuf)"
 
-#: ../gtk/gtkcellrendererpixbuf.c:121
+#: ../gtk/gtkcellrendererpixbuf.c:141
 msgid "The pixbuf to render"
 msgstr "Значок (Рixbuf) дл� отри�овки"
 
-#: ../gtk/gtkcellrendererpixbuf.c:128
+#: ../gtk/gtkcellrendererpixbuf.c:148
 msgid "Pixbuf Expander Open"
 msgstr "Значок (Pixbuf) дл� открытого ра�ширител�"
 
-#: ../gtk/gtkcellrendererpixbuf.c:129
+#: ../gtk/gtkcellrendererpixbuf.c:149
 msgid "Pixbuf for open expander"
 msgstr "Значок (Pixbuf) дл� открытого ра�шир�емого объекта"
 
-#: ../gtk/gtkcellrendererpixbuf.c:136
+#: ../gtk/gtkcellrendererpixbuf.c:156
 msgid "Pixbuf Expander Closed"
 msgstr "Значок (Pixbuf) дл� закрытого ра�ширител�"
 
-#: ../gtk/gtkcellrendererpixbuf.c:137
+#: ../gtk/gtkcellrendererpixbuf.c:157
 msgid "Pixbuf for closed expander"
 msgstr "Значок (Pixbuf) дл� закрытого ра�шир�емого объекта"
 
-#: ../gtk/gtkcellrendererpixbuf.c:144 ../gtk/gtkimage.c:253
-#: ../gtk/gtkstatusicon.c:221
+#: ../gtk/gtkcellrendererpixbuf.c:164
+#: ../gtk/gtkimage.c:254
+#: ../gtk/gtkstatusicon.c:251
 msgid "Stock ID"
 msgstr "Идентификатор (ID) в�троенного значка"
 
-#: ../gtk/gtkcellrendererpixbuf.c:145
+#: ../gtk/gtkcellrendererpixbuf.c:165
 msgid "The stock ID of the stock icon to render"
 msgstr "Идентификатор (ID) в�троенного значка дл� отри�овки"
 
-#: ../gtk/gtkcellrendererpixbuf.c:152 ../gtk/gtkcellrendererspinner.c:151
-#: ../gtk/gtkrecentmanager.c:309 ../gtk/gtkstatusicon.c:262
+#: ../gtk/gtkcellrendererpixbuf.c:172
+#: ../gtk/gtkcellrendererspinner.c:151
+#: ../gtk/gtkrecentmanager.c:309
+#: ../gtk/gtkstatusicon.c:292
 msgid "Size"
 msgstr "Размер"
 
-#: ../gtk/gtkcellrendererpixbuf.c:153
+#: ../gtk/gtkcellrendererpixbuf.c:173
 msgid "The GtkIconSize value that specifies the size of the rendered icon"
 msgstr "Значение GtkIconSize, определ�ющее размер отри�ованного значка"
 
-#: ../gtk/gtkcellrendererpixbuf.c:162
+#: ../gtk/gtkcellrendererpixbuf.c:182
 msgid "Detail"
 msgstr "Подробно�ти"
 
-#: ../gtk/gtkcellrendererpixbuf.c:163
+#: ../gtk/gtkcellrendererpixbuf.c:183
 msgid "Render detail to pass to the theme engine"
-msgstr ""
-"Подробно�ти визуализации (render detail) дл� передачи под�и�теме отри�овке "
-"темы"
+msgstr "Подробно�ти визуализации (render detail) дл� передачи под�и�теме отри�овке темы"
 
-#: ../gtk/gtkcellrendererpixbuf.c:196
+#: ../gtk/gtkcellrendererpixbuf.c:216
 msgid "Follow State"
 msgstr "От�леживать �о�то�ние"
 
-#: ../gtk/gtkcellrendererpixbuf.c:197
+#: ../gtk/gtkcellrendererpixbuf.c:217
 msgid "Whether the rendered pixbuf should be colorized according to the state"
 msgstr "Окрашен ли быть ра�теризованный pixbuf в �оответ�твии � �о�то�нием"
 
-#: ../gtk/gtkcellrendererpixbuf.c:214 ../gtk/gtkimage.c:328
-#: ../gtk/gtkwindow.c:699
+#: ../gtk/gtkcellrendererpixbuf.c:234
+#: ../gtk/gtkimage.c:329
+#: ../gtk/gtkwindow.c:703
 msgid "Icon"
 msgstr "Значок"
 
-#: ../gtk/gtkcellrendererprogress.c:127
+#: ../gtk/gtkcellrendererprogress.c:139
 msgid "Value of the progress bar"
 msgstr "Значение индикатора хода проце��а"
 
-#: ../gtk/gtkcellrendererprogress.c:144 ../gtk/gtkcellrenderertext.c:255
-#: ../gtk/gtkentry.c:830 ../gtk/gtkentrybuffer.c:352
-#: ../gtk/gtkmessagedialog.c:227 ../gtk/gtkprogressbar.c:177
-#: ../gtk/gtktextbuffer.c:210
+#: ../gtk/gtkcellrendererprogress.c:156
+#: ../gtk/gtkcellrenderertext.c:254
+#: ../gtk/gtkentrybuffer.c:352
+#: ../gtk/gtkentry.c:837
+#: ../gtk/gtkmessagedialog.c:229
+#: ../gtk/gtkprogressbar.c:176
+#: ../gtk/gtktextbuffer.c:221
 msgid "Text"
 msgstr "Тек�т"
 
-#: ../gtk/gtkcellrendererprogress.c:145
+#: ../gtk/gtkcellrendererprogress.c:157
 msgid "Text on the progress bar"
 msgstr "Тек�т на индикаторе хода проце��а"
 
-#: ../gtk/gtkcellrendererprogress.c:168 ../gtk/gtkcellrendererspinner.c:137
+#: ../gtk/gtkcellrendererprogress.c:180
+#: ../gtk/gtkcellrendererspinner.c:137
 msgid "Pulse"
 msgstr "Пуль�"
 
-#: ../gtk/gtkcellrendererprogress.c:169
-msgid ""
-"Set this to positive values to indicate that some progress is made, but you "
-"don't know how much."
-msgstr ""
-"У�тановите �то �вой�тво в положительное значение, чтобы показать, что "
-"продвижение в работе до�тигнуто но количе�твенно его оценить невозможно"
+#: ../gtk/gtkcellrendererprogress.c:181
+msgid "Set this to positive values to indicate that some progress is made, but you don't know how much."
+msgstr "У�тановите �то �вой�тво в положительное значение, чтобы показать, что продвижение в работе до�тигнуто но количе�твенно его оценить невозможно"
 
-#: ../gtk/gtkcellrendererprogress.c:185
+#: ../gtk/gtkcellrendererprogress.c:197
 msgid "Text x alignment"
 msgstr "Выравнивание тек�та по X"
 
-#: ../gtk/gtkcellrendererprogress.c:186
-msgid ""
-"The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
-"layouts."
-msgstr ""
-"Горизонтальное выравнивание от 0 (влево) до 1 (вправо). Инвертирует�� дл� "
-"ра�кладки RTL"
+#: ../gtk/gtkcellrendererprogress.c:198
+msgid "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."
+msgstr "Горизонтальное выравнивание от 0 (влево) до 1 (вправо). Инвертирует�� дл� ра�кладки RTL"
 
-#: ../gtk/gtkcellrendererprogress.c:202
+#: ../gtk/gtkcellrendererprogress.c:214
 msgid "Text y alignment"
 msgstr "Выравнивание тек�та по Y"
 
-#: ../gtk/gtkcellrendererprogress.c:203
+#: ../gtk/gtkcellrendererprogress.c:215
 msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
 msgstr "Вертикальное выравнивание от 0 (вверх) до 1 (вниз)."
 
-#: ../gtk/gtkcellrendererprogress.c:214 ../gtk/gtkprogressbar.c:153
-#: ../gtk/gtkrange.c:424
+#: ../gtk/gtkcellrendererprogress.c:226
+#: ../gtk/gtkprogressbar.c:152
+#: ../gtk/gtkrange.c:426
 msgid "Inverted"
 msgstr "Инвертированное"
 
-#: ../gtk/gtkcellrendererprogress.c:215 ../gtk/gtkprogressbar.c:154
+#: ../gtk/gtkcellrendererprogress.c:227
+#: ../gtk/gtkprogressbar.c:153
 msgid "Invert the direction in which the progress bar grows"
 msgstr "Обратное направление ро�та индикатора выполнени�"
 
-#: ../gtk/gtkcellrendererspin.c:91 ../gtk/gtkrange.c:416
-#: ../gtk/gtkscalebutton.c:236 ../gtk/gtkspinbutton.c:320
+#: ../gtk/gtkcellrendererspin.c:113
+#: ../gtk/gtkrange.c:418
+#: ../gtk/gtkscalebutton.c:237
+#: ../gtk/gtkspinbutton.c:323
 msgid "Adjustment"
 msgstr "Подгонка"
 
-#: ../gtk/gtkcellrendererspin.c:92 ../gtk/gtkspinbutton.c:321
+#: ../gtk/gtkcellrendererspin.c:114
+#: ../gtk/gtkspinbutton.c:324
 msgid "The adjustment that holds the value of the spin button"
 msgstr "Подгонка, хран�ща� значение кнопки-�чётчика"
 
-#: ../gtk/gtkcellrendererspin.c:107
+#: ../gtk/gtkcellrendererspin.c:129
 msgid "Climb rate"
 msgstr "У�корение"
 
-#: ../gtk/gtkcellrendererspin.c:108 ../gtk/gtkspinbutton.c:329
+#: ../gtk/gtkcellrendererspin.c:130
+#: ../gtk/gtkspinbutton.c:332
 msgid "The acceleration rate when you hold down a button"
 msgstr "У�корение прокрутки значений при удерживании нажатой кнопки"
 
-#: ../gtk/gtkcellrendererspin.c:121 ../gtk/gtkscale.c:252
-#: ../gtk/gtkspinbutton.c:338
+#: ../gtk/gtkcellrendererspin.c:143
+#: ../gtk/gtkscale.c:254
+#: ../gtk/gtkspinbutton.c:341
 msgid "Digits"
 msgstr "Цифры"
 
-#: ../gtk/gtkcellrendererspin.c:122 ../gtk/gtkspinbutton.c:339
+#: ../gtk/gtkcellrendererspin.c:144
+#: ../gtk/gtkspinbutton.c:342
 msgid "The number of decimal places to display"
 msgstr "Количе�тво отображаемых де��тичных разр�дов"
 
-#: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:106
-#: ../gtk/gtkmenu.c:586 ../gtk/gtkspinner.c:118 ../gtk/gtkswitch.c:801
-#: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:125
-#: ../gtk/gtktoggletoolbutton.c:112
+#: ../gtk/gtkcellrendererspinner.c:119
+#: ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkmenu.c:588
+#: ../gtk/gtkspinner.c:115
+#: ../gtk/gtkswitch.c:783
+#: ../gtk/gtktoggleaction.c:133
+#: ../gtk/gtktogglebutton.c:178
+#: ../gtk/gtktoggletoolbutton.c:127
 msgid "Active"
 msgstr "�ктивный"
 
@@ -1645,507 +1625,569 @@ msgstr "Пуль�аци� вертушки"
 msgid "The GtkIconSize value that specifies the size of the rendered spinner"
 msgstr "Значение GtkIconSize, определ�ющее размер отри�овываемой вертушки"
 
-#: ../gtk/gtkcellrenderertext.c:256
+#: ../gtk/gtkcellrenderertext.c:255
 msgid "Text to render"
 msgstr "Отображаемый тек�т"
 
-#: ../gtk/gtkcellrenderertext.c:263
+#: ../gtk/gtkcellrenderertext.c:262
 msgid "Markup"
 msgstr "Разметка"
 
-#: ../gtk/gtkcellrenderertext.c:264
+#: ../gtk/gtkcellrenderertext.c:263
 msgid "Marked up text to render"
 msgstr "Разметка тек�та дл� отображени�"
 
-#: ../gtk/gtkcellrenderertext.c:271 ../gtk/gtklabel.c:574
+#: ../gtk/gtkcellrenderertext.c:270
+#: ../gtk/gtklabel.c:736
 msgid "Attributes"
 msgstr "�трибуты"
 
-#: ../gtk/gtkcellrenderertext.c:272
+#: ../gtk/gtkcellrenderertext.c:271
 msgid "A list of style attributes to apply to the text of the renderer"
 msgstr "Спи�ок атрибутов �тил�, примен�емых к визуализируемому тек�ту"
 
-#: ../gtk/gtkcellrenderertext.c:279
+#: ../gtk/gtkcellrenderertext.c:278
 msgid "Single Paragraph Mode"
 msgstr "Режим одного абзаца"
 
-#: ../gtk/gtkcellrenderertext.c:280
+#: ../gtk/gtkcellrenderertext.c:279
 msgid "Whether to keep all text in a single paragraph"
 msgstr "Следует ли �охран�ть ве�ь тек�т в одном абзаце"
 
-#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:189
-#: ../gtk/gtktexttag.c:196
+#: ../gtk/gtkcellrenderertext.c:287
+#: ../gtk/gtkcellview.c:191
+#: ../gtk/gtktexttag.c:199
 msgid "Background color name"
 msgstr "�аименование цвета фона"
 
-#: ../gtk/gtkcellrenderertext.c:289 ../gtk/gtkcellview.c:190
-#: ../gtk/gtktexttag.c:197
+#: ../gtk/gtkcellrenderertext.c:288
+#: ../gtk/gtkcellview.c:192
+#: ../gtk/gtktexttag.c:200
 msgid "Background color as a string"
 msgstr "Цвет фона как �трока"
 
-#: ../gtk/gtkcellrenderertext.c:296 ../gtk/gtkcellview.c:196
-#: ../gtk/gtktexttag.c:204
+#: ../gtk/gtkcellrenderertext.c:295
+#: ../gtk/gtkcellview.c:198
+#: ../gtk/gtktexttag.c:207
 msgid "Background color"
 msgstr "Цвет фона"
 
-#: ../gtk/gtkcellrenderertext.c:297 ../gtk/gtkcellview.c:197
+#: ../gtk/gtkcellrenderertext.c:296
+#: ../gtk/gtkcellview.c:199
+#: ../gtk/gtktexttag.c:208
 msgid "Background color as a GdkColor"
 msgstr "Цвет фона в формате GdkColor"
 
-#: ../gtk/gtkcellrenderertext.c:311
+#: ../gtk/gtkcellrenderertext.c:310
 msgid "Background color as RGBA"
 msgstr "Цвета фона в формате RGBA"
 
-#: ../gtk/gtkcellrenderertext.c:312 ../gtk/gtkcellview.c:211
+#: ../gtk/gtkcellrenderertext.c:311
+#: ../gtk/gtkcellview.c:213
+#: ../gtk/gtktexttag.c:223
 msgid "Background color as a GdkRGBA"
 msgstr "Цвет фона в формате GdkRGBA"
 
-#: ../gtk/gtkcellrenderertext.c:318 ../gtk/gtktexttag.c:220
+#: ../gtk/gtkcellrenderertext.c:317
+#: ../gtk/gtktexttag.c:238
 msgid "Foreground color name"
 msgstr "�аименование цвета тек�та"
 
-#: ../gtk/gtkcellrenderertext.c:319 ../gtk/gtktexttag.c:221
+#: ../gtk/gtkcellrenderertext.c:318
+#: ../gtk/gtktexttag.c:239
 msgid "Foreground color as a string"
 msgstr "Цвет тек�та как �трока"
 
-#: ../gtk/gtkcellrenderertext.c:326 ../gtk/gtktexttag.c:228
+#: ../gtk/gtkcellrenderertext.c:325
+#: ../gtk/gtktexttag.c:246
 #: ../gtk/gtktrayicon-x11.c:137
 msgid "Foreground color"
 msgstr "Цвет тек�та"
 
-#: ../gtk/gtkcellrenderertext.c:327
+#: ../gtk/gtkcellrenderertext.c:326
+#: ../gtk/gtktexttag.c:247
 msgid "Foreground color as a GdkColor"
 msgstr "Цвет тек�та в формате GdkColor"
 
-#: ../gtk/gtkcellrenderertext.c:341
+#: ../gtk/gtkcellrenderertext.c:340
 msgid "Foreground color as RGBA"
 msgstr "Цвет тек�та в формате RGBA"
 
-#: ../gtk/gtkcellrenderertext.c:342
+#: ../gtk/gtkcellrenderertext.c:341
+#: ../gtk/gtktexttag.c:262
 msgid "Foreground color as a GdkRGBA"
 msgstr "Цвет тек�та в формате GdkRGBA"
 
-#: ../gtk/gtkcellrenderertext.c:350 ../gtk/gtkentry.c:754
-#: ../gtk/gtktexttag.c:245 ../gtk/gtktextview.c:684
+#: ../gtk/gtkcellrenderertext.c:349
+#: ../gtk/gtkentry.c:761
+#: ../gtk/gtktexttag.c:278
+#: ../gtk/gtktextview.c:686
 msgid "Editable"
 msgstr "Редактируемый"
 
-#: ../gtk/gtkcellrenderertext.c:351 ../gtk/gtktexttag.c:246
-#: ../gtk/gtktextview.c:685
+#: ../gtk/gtkcellrenderertext.c:350
+#: ../gtk/gtktexttag.c:279
+#: ../gtk/gtktextview.c:687
 msgid "Whether the text can be modified by the user"
 msgstr "Может ли тек�т быть изменён пользователем"
 
-#: ../gtk/gtkcellrenderertext.c:358 ../gtk/gtkcellrenderertext.c:366
-#: ../gtk/gtktexttag.c:261 ../gtk/gtktexttag.c:269
+#: ../gtk/gtkcellrenderertext.c:357
+#: ../gtk/gtkcellrenderertext.c:365
+#: ../gtk/gtktexttag.c:294
+#: ../gtk/gtktexttag.c:302
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../gtk/gtkcellrenderertext.c:359 ../gtk/gtktexttag.c:262
+#: ../gtk/gtkcellrenderertext.c:358
+#: ../gtk/gtktexttag.c:295
 msgid "Font description as a string, e.g. \"Sans Italic 12\""
 msgstr "Опи�ание шрифта в виде �троки, например, «Sans Italic 12»"
 
-#: ../gtk/gtkcellrenderertext.c:367 ../gtk/gtktexttag.c:270
+#: ../gtk/gtkcellrenderertext.c:366
+#: ../gtk/gtktexttag.c:303
 msgid "Font description as a PangoFontDescription struct"
 msgstr "Опи�ание шрифта �труктурой PangoFontDescription"
 
-#: ../gtk/gtkcellrenderertext.c:375 ../gtk/gtktexttag.c:277
+#: ../gtk/gtkcellrenderertext.c:374
+#: ../gtk/gtktexttag.c:310
 msgid "Font family"
 msgstr "Семей�тво шрифта:"
 
-#: ../gtk/gtkcellrenderertext.c:376 ../gtk/gtktexttag.c:278
+#: ../gtk/gtkcellrenderertext.c:375
+#: ../gtk/gtktexttag.c:311
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "�аименование �емей�тва шрифта, т.е. Сан�, Гельветика, Тайм�"
 
-#: ../gtk/gtkcellrenderertext.c:383 ../gtk/gtkcellrenderertext.c:384
-#: ../gtk/gtktexttag.c:285
+#: ../gtk/gtkcellrenderertext.c:382
+#: ../gtk/gtkcellrenderertext.c:383
+#: ../gtk/gtktexttag.c:318
 msgid "Font style"
 msgstr "Стиль шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:392 ../gtk/gtkcellrenderertext.c:393
-#: ../gtk/gtktexttag.c:294
+#: ../gtk/gtkcellrenderertext.c:391
+#: ../gtk/gtkcellrenderertext.c:392
+#: ../gtk/gtktexttag.c:327
 msgid "Font variant"
 msgstr "Вариант шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:401 ../gtk/gtkcellrenderertext.c:402
-#: ../gtk/gtktexttag.c:303
+#: ../gtk/gtkcellrenderertext.c:400
+#: ../gtk/gtkcellrenderertext.c:401
+#: ../gtk/gtktexttag.c:336
 msgid "Font weight"
 msgstr "�а�ыщенно�ть шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:411 ../gtk/gtkcellrenderertext.c:412
-#: ../gtk/gtktexttag.c:314
+#: ../gtk/gtkcellrenderertext.c:410
+#: ../gtk/gtkcellrenderertext.c:411
+#: ../gtk/gtktexttag.c:347
 msgid "Font stretch"
 msgstr "Разр�дка шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:420 ../gtk/gtkcellrenderertext.c:421
-#: ../gtk/gtktexttag.c:323
+#: ../gtk/gtkcellrenderertext.c:419
+#: ../gtk/gtkcellrenderertext.c:420
+#: ../gtk/gtktexttag.c:356
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:430 ../gtk/gtktexttag.c:343
+#: ../gtk/gtkcellrenderertext.c:429
+#: ../gtk/gtktexttag.c:376
 msgid "Font points"
 msgstr "Пункты шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:431 ../gtk/gtktexttag.c:344
+#: ../gtk/gtkcellrenderertext.c:430
+#: ../gtk/gtktexttag.c:377
 msgid "Font size in points"
 msgstr "Размер шрифта в пунктах"
 
-#: ../gtk/gtkcellrenderertext.c:440 ../gtk/gtktexttag.c:333
+#: ../gtk/gtkcellrenderertext.c:439
+#: ../gtk/gtktexttag.c:366
 msgid "Font scale"
 msgstr "Ма�штаб шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:441
+#: ../gtk/gtkcellrenderertext.c:440
 msgid "Font scaling factor"
 msgstr "Ко�ффициент ма�штабировани� шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:450 ../gtk/gtktexttag.c:412
+#: ../gtk/gtkcellrenderertext.c:449
+#: ../gtk/gtktexttag.c:445
 msgid "Rise"
 msgstr "Смещение"
 
-#: ../gtk/gtkcellrenderertext.c:451
-msgid ""
-"Offset of text above the baseline (below the baseline if rise is negative)"
-msgstr ""
-"Смещение тек�та над линией шрифта (под линию шрифта, дл� отрицательных "
-"значений)"
+#: ../gtk/gtkcellrenderertext.c:450
+msgid "Offset of text above the baseline (below the baseline if rise is negative)"
+msgstr "Смещение тек�та над линией шрифта (под линию шрифта, дл� отрицательных значений)"
 
-#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:452
+#: ../gtk/gtkcellrenderertext.c:461
+#: ../gtk/gtktexttag.c:485
 msgid "Strikethrough"
 msgstr "Перечеркивание"
 
-#: ../gtk/gtkcellrenderertext.c:463 ../gtk/gtktexttag.c:453
+#: ../gtk/gtkcellrenderertext.c:462
+#: ../gtk/gtktexttag.c:486
 msgid "Whether to strike through the text"
 msgstr "Будет ли тек�т перечеркнут"
 
-#: ../gtk/gtkcellrenderertext.c:470 ../gtk/gtktexttag.c:460
+#: ../gtk/gtkcellrenderertext.c:469
+#: ../gtk/gtktexttag.c:493
 msgid "Underline"
 msgstr "Подчеркивание"
 
-#: ../gtk/gtkcellrenderertext.c:471 ../gtk/gtktexttag.c:461
+#: ../gtk/gtkcellrenderertext.c:470
+#: ../gtk/gtktexttag.c:494
 msgid "Style of underline for this text"
 msgstr "Стиль подчеркивани� дл� тек�та"
 
-#: ../gtk/gtkcellrenderertext.c:479 ../gtk/gtktexttag.c:372
+#: ../gtk/gtkcellrenderertext.c:478
+#: ../gtk/gtktexttag.c:405
 msgid "Language"
 msgstr "Язык"
 
-#: ../gtk/gtkcellrenderertext.c:480
-msgid ""
-"The language this text is in, as an ISO code. Pango can use this as a hint "
-"when rendering the text. If you don't understand this parameter, you "
-"probably don't need it"
-msgstr ""
-"Язык, на котором напи�ан тек�т, в виде ISO-кода.  Pango может и�пользовать "
-"�то значение как под�казку (hint) при отри�овке тек�та.  Е�ли вы не "
-"понимаете, что �то за параметр, то он вам, �корее в�его, не нужен."
+#: ../gtk/gtkcellrenderertext.c:479
+msgid "The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If you don't understand this parameter, you probably don't need it"
+msgstr "Язык, на котором напи�ан тек�т, в виде ISO-кода.  Pango может и�пользовать �то значение как под�казку (hint) при отри�овке тек�та.  Е�ли вы не понимаете, что �то за параметр, то он вам, �корее в�его, не нужен."
 
-#: ../gtk/gtkcellrenderertext.c:500 ../gtk/gtklabel.c:699
-#: ../gtk/gtkprogressbar.c:217
+#: ../gtk/gtkcellrenderertext.c:499
+#: ../gtk/gtklabel.c:861
+#: ../gtk/gtkprogressbar.c:220
 msgid "Ellipsize"
 msgstr "Эллиптизаци�"
 
-#: ../gtk/gtkcellrenderertext.c:501
-msgid ""
-"The preferred place to ellipsize the string, if the cell renderer does not "
-"have enough room to display the entire string"
-msgstr ""
-"Желаемое ме�то �ллиптизации �троки, е�ли механизму отображени� �троки в "
-"�чейке не хватает ме�та дл� отображени� в�ей �троки."
+#: ../gtk/gtkcellrenderertext.c:500
+msgid "The preferred place to ellipsize the string, if the cell renderer does not have enough room to display the entire string"
+msgstr "Желаемое ме�то �ллиптизации �троки, е�ли механизму отображени� �троки в �чейке не хватает ме�та дл� отображени� в�ей �троки."
 
-#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtkfilechooserbutton.c:411
-#: ../gtk/gtklabel.c:720
+#: ../gtk/gtkcellrenderertext.c:519
+#: ../gtk/gtkfilechooserbutton.c:454
+#: ../gtk/gtklabel.c:882
 msgid "Width In Characters"
 msgstr "Ширина в �имволах"
 
-#: ../gtk/gtkcellrenderertext.c:521 ../gtk/gtklabel.c:721
+#: ../gtk/gtkcellrenderertext.c:520
+#: ../gtk/gtklabel.c:883
 msgid "The desired width of the label, in characters"
 msgstr "Желаема� ширина �рлыка, в �имволах"
 
-#: ../gtk/gtkcellrenderertext.c:545 ../gtk/gtklabel.c:781
+#: ../gtk/gtkcellrenderertext.c:544
+#: ../gtk/gtklabel.c:943
 msgid "Maximum Width In Characters"
 msgstr "Мак�имальна� ширина в �имволах"
 
-#: ../gtk/gtkcellrenderertext.c:546
+#: ../gtk/gtkcellrenderertext.c:545
 msgid "The maximum width of the cell, in characters"
 msgstr "Мак�имальна� ширина �чейки, в �имволах"
 
-#: ../gtk/gtkcellrenderertext.c:564 ../gtk/gtktexttag.c:469
+#: ../gtk/gtkcellrenderertext.c:563
+#: ../gtk/gtktexttag.c:502
 msgid "Wrap mode"
 msgstr "Режим перено�а"
 
-#: ../gtk/gtkcellrenderertext.c:565
-msgid ""
-"How to break the string into multiple lines, if the cell renderer does not "
-"have enough room to display the entire string"
-msgstr ""
-"Как разделить �троку на не�колько �трок, е�ли механизму отображени� �троки "
-"не хватает ме�та дл� отображени� в�ей �троки"
+#: ../gtk/gtkcellrenderertext.c:564
+msgid "How to break the string into multiple lines, if the cell renderer does not have enough room to display the entire string"
+msgstr "Как разделить �троку на не�колько �трок, е�ли механизму отображени� �троки не хватает ме�та дл� отображени� в�ей �троки"
 
-#: ../gtk/gtkcellrenderertext.c:584 ../gtk/gtkcombobox.c:680
+#: ../gtk/gtkcellrenderertext.c:583
+#: ../gtk/gtkcombobox.c:681
 msgid "Wrap width"
 msgstr "Ширина перено�а"
 
-#: ../gtk/gtkcellrenderertext.c:585
+#: ../gtk/gtkcellrenderertext.c:584
 msgid "The width at which the text is wrapped"
 msgstr "Ширина, при которой тек�т перено�ит��"
 
-#: ../gtk/gtkcellrenderertext.c:605 ../gtk/gtktreeviewcolumn.c:352
+#: ../gtk/gtkcellrenderertext.c:604
+#: ../gtk/gtktreeviewcolumn.c:364
 msgid "Alignment"
 msgstr "Выравнивание"
 
-#: ../gtk/gtkcellrenderertext.c:606
+#: ../gtk/gtkcellrenderertext.c:605
 msgid "How to align the lines"
 msgstr "Как выравнивать �троки"
 
-#: ../gtk/gtkcellrenderertext.c:618 ../gtk/gtkcellview.c:315
-#: ../gtk/gtktexttag.c:558
+#: ../gtk/gtkcellrenderertext.c:617
+#: ../gtk/gtkcellview.c:317
+#: ../gtk/gtktexttag.c:605
 msgid "Background set"
 msgstr "Фон у�тановлен"
 
-#: ../gtk/gtkcellrenderertext.c:619 ../gtk/gtkcellview.c:316
-#: ../gtk/gtktexttag.c:559
+#: ../gtk/gtkcellrenderertext.c:618
+#: ../gtk/gtkcellview.c:318
+#: ../gtk/gtktexttag.c:606
 msgid "Whether this tag affects the background color"
 msgstr "Вли�ет ли �тот тег на цвет фона"
 
-#: ../gtk/gtkcellrenderertext.c:622 ../gtk/gtktexttag.c:566
+#: ../gtk/gtkcellrenderertext.c:621
+#: ../gtk/gtktexttag.c:613
 msgid "Foreground set"
 msgstr "Передний план у�тановлен"
 
-#: ../gtk/gtkcellrenderertext.c:623 ../gtk/gtktexttag.c:567
+#: ../gtk/gtkcellrenderertext.c:622
+#: ../gtk/gtktexttag.c:614
 msgid "Whether this tag affects the foreground color"
 msgstr "Вли�ет ли �тот тег на цвет переднего плана"
 
-#: ../gtk/gtkcellrenderertext.c:626 ../gtk/gtktexttag.c:570
+#: ../gtk/gtkcellrenderertext.c:625
+#: ../gtk/gtktexttag.c:617
 msgid "Editability set"
 msgstr "Редактируемо�ть у�тановлена"
 
-#: ../gtk/gtkcellrenderertext.c:627 ../gtk/gtktexttag.c:571
+#: ../gtk/gtkcellrenderertext.c:626
+#: ../gtk/gtktexttag.c:618
 msgid "Whether this tag affects text editability"
 msgstr "Вли�ет ли �тот тег на редактируемо�ть тек�та"
 
-#: ../gtk/gtkcellrenderertext.c:630 ../gtk/gtktexttag.c:574
+#: ../gtk/gtkcellrenderertext.c:629
+#: ../gtk/gtktexttag.c:621
 msgid "Font family set"
 msgstr "Семей�тво шрифта у�тановлено"
 
-#: ../gtk/gtkcellrenderertext.c:631 ../gtk/gtktexttag.c:575
+#: ../gtk/gtkcellrenderertext.c:630
+#: ../gtk/gtktexttag.c:622
 msgid "Whether this tag affects the font family"
 msgstr "Вли�ет ли �тот т�г на �емей�тво шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtktexttag.c:578
+#: ../gtk/gtkcellrenderertext.c:633
+#: ../gtk/gtktexttag.c:625
 msgid "Font style set"
 msgstr "Стиль шрифта у�тановлен"
 
-#: ../gtk/gtkcellrenderertext.c:635 ../gtk/gtktexttag.c:579
+#: ../gtk/gtkcellrenderertext.c:634
+#: ../gtk/gtktexttag.c:626
 msgid "Whether this tag affects the font style"
 msgstr "Вли�ет ли �тот т�г на �тиль шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:638 ../gtk/gtktexttag.c:582
+#: ../gtk/gtkcellrenderertext.c:637
+#: ../gtk/gtktexttag.c:629
 msgid "Font variant set"
 msgstr "Варианта шрифта у�тановлен"
 
-#: ../gtk/gtkcellrenderertext.c:639 ../gtk/gtktexttag.c:583
+#: ../gtk/gtkcellrenderertext.c:638
+#: ../gtk/gtktexttag.c:630
 msgid "Whether this tag affects the font variant"
 msgstr "Вли�ет ли �тот т�г на вариант шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:642 ../gtk/gtktexttag.c:586
+#: ../gtk/gtkcellrenderertext.c:641
+#: ../gtk/gtktexttag.c:633
 msgid "Font weight set"
 msgstr "�а�ыщенно�ть шрифта у�тановлена"
 
-#: ../gtk/gtkcellrenderertext.c:643 ../gtk/gtktexttag.c:587
+#: ../gtk/gtkcellrenderertext.c:642
+#: ../gtk/gtktexttag.c:634
 msgid "Whether this tag affects the font weight"
 msgstr "Вли�ет ли �тот т�г на на�ыщенно�ть шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtktexttag.c:590
+#: ../gtk/gtkcellrenderertext.c:645
+#: ../gtk/gtktexttag.c:637
 msgid "Font stretch set"
 msgstr "Разр�дка шрифта у�тановлено"
 
-#: ../gtk/gtkcellrenderertext.c:647 ../gtk/gtktexttag.c:591
+#: ../gtk/gtkcellrenderertext.c:646
+#: ../gtk/gtktexttag.c:638
 msgid "Whether this tag affects the font stretch"
 msgstr "Вли�ет ли �тот т�г на разр�дку шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:594
+#: ../gtk/gtkcellrenderertext.c:649
+#: ../gtk/gtktexttag.c:641
 msgid "Font size set"
 msgstr "Размера шрифта у�тановлен"
 
-#: ../gtk/gtkcellrenderertext.c:651 ../gtk/gtktexttag.c:595
+#: ../gtk/gtkcellrenderertext.c:650
+#: ../gtk/gtktexttag.c:642
 msgid "Whether this tag affects the font size"
 msgstr "Вли�ет ли �тот т�г на размер шрифта"
 
-#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:598
+#: ../gtk/gtkcellrenderertext.c:653
+#: ../gtk/gtktexttag.c:645
 msgid "Font scale set"
 msgstr "Ма�штаба шрифта у�тановлен"
 
-#: ../gtk/gtkcellrenderertext.c:655 ../gtk/gtktexttag.c:599
+#: ../gtk/gtkcellrenderertext.c:654
+#: ../gtk/gtktexttag.c:646
 msgid "Whether this tag scales the font size by a factor"
 msgstr "Ма�штабирует ли �тот тег размер шрифта на ко�ффициент"
 
-#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:618
+#: ../gtk/gtkcellrenderertext.c:657
+#: ../gtk/gtktexttag.c:665
 msgid "Rise set"
 msgstr "Смещение у�тановлено"
 
-#: ../gtk/gtkcellrenderertext.c:659 ../gtk/gtktexttag.c:619
+#: ../gtk/gtkcellrenderertext.c:658
+#: ../gtk/gtktexttag.c:666
 msgid "Whether this tag affects the rise"
 msgstr "Вли�ет ли �тот тег на �мещение"
 
-#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:634
+#: ../gtk/gtkcellrenderertext.c:661
+#: ../gtk/gtktexttag.c:681
 msgid "Strikethrough set"
 msgstr "Перечёркивание у�тановлено"
 
-#: ../gtk/gtkcellrenderertext.c:663 ../gtk/gtktexttag.c:635
+#: ../gtk/gtkcellrenderertext.c:662
+#: ../gtk/gtktexttag.c:682
 msgid "Whether this tag affects strikethrough"
 msgstr "Вли�ет ли �тот тег на перечёркивание"
 
-#: ../gtk/gtkcellrenderertext.c:666 ../gtk/gtktexttag.c:642
+#: ../gtk/gtkcellrenderertext.c:665
+#: ../gtk/gtktexttag.c:689
 msgid "Underline set"
 msgstr "Подчёркивание у�тановлено"
 
-#: ../gtk/gtkcellrenderertext.c:667 ../gtk/gtktexttag.c:643
+#: ../gtk/gtkcellrenderertext.c:666
+#: ../gtk/gtktexttag.c:690
 msgid "Whether this tag affects underlining"
 msgstr "Вли�ет ли �тот тег на подчёркивание"
 
-#: ../gtk/gtkcellrenderertext.c:670 ../gtk/gtktexttag.c:606
+#: ../gtk/gtkcellrenderertext.c:669
+#: ../gtk/gtktexttag.c:653
 msgid "Language set"
 msgstr "Язык у�тановлен"
 
-#: ../gtk/gtkcellrenderertext.c:671 ../gtk/gtktexttag.c:607
+#: ../gtk/gtkcellrenderertext.c:670
+#: ../gtk/gtktexttag.c:654
 msgid "Whether this tag affects the language the text is rendered as"
 msgstr "Вли�ет ли �тот тег на �зык отри�овки тек�та"
 
-#: ../gtk/gtkcellrenderertext.c:674
+#: ../gtk/gtkcellrenderertext.c:673
 msgid "Ellipsize set"
 msgstr "У�тановка �ллиптизации"
 
-#: ../gtk/gtkcellrenderertext.c:675
+#: ../gtk/gtkcellrenderertext.c:674
 msgid "Whether this tag affects the ellipsize mode"
 msgstr "Вли�ет ли �тот тег на режим �ллиптизации"
 
-#: ../gtk/gtkcellrenderertext.c:678
+#: ../gtk/gtkcellrenderertext.c:677
 msgid "Align set"
 msgstr "Выравнивание у�тановлено"
 
-#: ../gtk/gtkcellrenderertext.c:679
+#: ../gtk/gtkcellrenderertext.c:678
 msgid "Whether this tag affects the alignment mode"
 msgstr "Вли�ет ли �тот тег на режим выравнивани�"
 
-#: ../gtk/gtkcellrenderertoggle.c:128
+#: ../gtk/gtkcellrenderertoggle.c:140
 msgid "Toggle state"
 msgstr "Со�то�ние переключени�"
 
-#: ../gtk/gtkcellrenderertoggle.c:129
+#: ../gtk/gtkcellrenderertoggle.c:141
 msgid "The toggle state of the button"
 msgstr "Со�то�ние переключени� кнопки"
 
-#: ../gtk/gtkcellrenderertoggle.c:136
+#: ../gtk/gtkcellrenderertoggle.c:148
 msgid "Inconsistent state"
 msgstr "�ечув�твительное �о�то�ние"
 
-#: ../gtk/gtkcellrenderertoggle.c:137
+#: ../gtk/gtkcellrenderertoggle.c:149
 msgid "The inconsistent state of the button"
 msgstr "�ечув�твительное �о�то�ние кнопки"
 
-#: ../gtk/gtkcellrenderertoggle.c:144
+#: ../gtk/gtkcellrenderertoggle.c:156
 msgid "Activatable"
 msgstr "�ктивируемое"
 
-#: ../gtk/gtkcellrenderertoggle.c:145
+#: ../gtk/gtkcellrenderertoggle.c:157
 msgid "The toggle button can be activated"
 msgstr "Кнопка-переключатель может быть активирована"
 
-#: ../gtk/gtkcellrenderertoggle.c:152
+#: ../gtk/gtkcellrenderertoggle.c:164
 msgid "Radio state"
 msgstr "Радио-�о�то�ние"
 
-#: ../gtk/gtkcellrenderertoggle.c:153
+#: ../gtk/gtkcellrenderertoggle.c:165
 msgid "Draw the toggle button as a radio button"
 msgstr "Ри�овать кнопку-переключатель как радио-кнопку"
 
-#: ../gtk/gtkcellrenderertoggle.c:160
+#: ../gtk/gtkcellrenderertoggle.c:172
 msgid "Indicator size"
 msgstr "Размер индикатора"
 
-#: ../gtk/gtkcellrenderertoggle.c:161 ../gtk/gtkcheckbutton.c:78
-#: ../gtk/gtkcheckmenuitem.c:130
+#: ../gtk/gtkcellrenderertoggle.c:173
+#: ../gtk/gtkcheckbutton.c:95
+#: ../gtk/gtkcheckmenuitem.c:146
 msgid "Size of check or radio indicator"
 msgstr "Размер индикатора кнопки-флажка или радио-кнопки"
 
-#: ../gtk/gtkcellview.c:210
+#: ../gtk/gtkcellview.c:212
 msgid "Background RGBA color"
 msgstr "Цвет RGBA дл� фона"
 
-#: ../gtk/gtkcellview.c:225
+#: ../gtk/gtkcellview.c:227
 msgid "CellView model"
 msgstr "Модель CellView"
 
-#: ../gtk/gtkcellview.c:226
+#: ../gtk/gtkcellview.c:228
 msgid "The model for cell view"
 msgstr "Модель дл� отображени� �лементов в �чейке"
 
-#: ../gtk/gtkcellview.c:244 ../gtk/gtkcombobox.c:944
-#: ../gtk/gtkentrycompletion.c:448 ../gtk/gtkiconview.c:770
-#: ../gtk/gtktreemenu.c:329 ../gtk/gtktreeviewcolumn.c:415
+#: ../gtk/gtkcellview.c:246
+#: ../gtk/gtkcombobox.c:945
+#: ../gtk/gtkentrycompletion.c:448
+#: ../gtk/gtkiconview.c:768
+#: ../gtk/gtktreemenu.c:329
+#: ../gtk/gtktreeviewcolumn.c:427
 msgid "Cell Area"
 msgstr "Обла�ть �чейки"
 
-#: ../gtk/gtkcellview.c:245 ../gtk/gtkcombobox.c:945
-#: ../gtk/gtkentrycompletion.c:449 ../gtk/gtkiconview.c:771
-#: ../gtk/gtktreemenu.c:330 ../gtk/gtktreeviewcolumn.c:416
+#: ../gtk/gtkcellview.c:247
+#: ../gtk/gtkcombobox.c:946
+#: ../gtk/gtkentrycompletion.c:449
+#: ../gtk/gtkiconview.c:769
+#: ../gtk/gtktreemenu.c:330
+#: ../gtk/gtktreeviewcolumn.c:428
 msgid "The GtkCellArea used to layout cells"
 msgstr "Дл� ра�положени� �чеек и�пользовать GtkCellArea"
 
-#: ../gtk/gtkcellview.c:268
+#: ../gtk/gtkcellview.c:270
 msgid "Cell Area Context"
 msgstr "Контек�т обла�ти �чеек"
 
-#: ../gtk/gtkcellview.c:269
+#: ../gtk/gtkcellview.c:271
 msgid "The GtkCellAreaContext used to compute the geometry of the cell view"
-msgstr ""
-"Дл� вычи�лени� размеров отображени� �чеек и�пользовать GtkCellAreaContext"
+msgstr "Дл� вычи�лени� размеров отображени� �чеек и�пользовать GtkCellAreaContext"
 
-#: ../gtk/gtkcellview.c:286
+#: ../gtk/gtkcellview.c:288
 msgid "Draw Sensitive"
 msgstr "Отри�овка при во�приимчиво�ти"
 
-#: ../gtk/gtkcellview.c:287
+#: ../gtk/gtkcellview.c:289
 msgid "Whether to force cells to be drawn in a sensitive state"
-msgstr ""
-"Должны ли �чейки об�зательно отри�овывать�� в �о�то�нии во�приимчиво�ти"
+msgstr "Должны ли �чейки об�зательно отри�овывать�� в �о�то�нии во�приимчиво�ти"
 
-#: ../gtk/gtkcellview.c:305
+#: ../gtk/gtkcellview.c:307
 msgid "Fit Model"
 msgstr "Модель подгонки"
 
-#: ../gtk/gtkcellview.c:306
+#: ../gtk/gtkcellview.c:308
 msgid "Whether to request enough space for every row in the model"
 msgstr "Запрашивать ли до�таточно про�тран�тва на каждую �троку в модели"
 
-#: ../gtk/gtkcheckbutton.c:77 ../gtk/gtkcheckmenuitem.c:129
+#: ../gtk/gtkcheckbutton.c:94
+#: ../gtk/gtkcheckmenuitem.c:145
 msgid "Indicator Size"
 msgstr "Размер индикатора"
 
-#: ../gtk/gtkcheckbutton.c:85 ../gtk/gtkexpander.c:345
+#: ../gtk/gtkcheckbutton.c:102
+#: ../gtk/gtkexpander.c:364
 msgid "Indicator Spacing"
 msgstr "Интервал индикатора"
 
-#: ../gtk/gtkcheckbutton.c:86
+#: ../gtk/gtkcheckbutton.c:103
 msgid "Spacing around check or radio indicator"
 msgstr "Про�тран�тво вокруг индикатора кнопки-флажка или радио-кнопки"
 
-#: ../gtk/gtkcheckmenuitem.c:107
+#: ../gtk/gtkcheckmenuitem.c:123
 msgid "Whether the menu item is checked"
 msgstr "Имеет ли �лемент меню флажок"
 
-#: ../gtk/gtkcheckmenuitem.c:114 ../gtk/gtktogglebutton.c:133
+#: ../gtk/gtkcheckmenuitem.c:130
+#: ../gtk/gtktogglebutton.c:186
 msgid "Inconsistent"
 msgstr "�ечув�твительный"
 
-#: ../gtk/gtkcheckmenuitem.c:115
+#: ../gtk/gtkcheckmenuitem.c:131
 msgid "Whether to display an \"inconsistent\" state"
 msgstr "Отображать ли �о�то�ние «нечув�твительно�ти»"
 
-#: ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkcheckmenuitem.c:138
 msgid "Draw as radio menu item"
 msgstr "Ри�овать как радио-�лемент"
 
-#: ../gtk/gtkcheckmenuitem.c:123
+#: ../gtk/gtkcheckmenuitem.c:139
 msgid "Whether the menu item looks like a radio menu item"
 msgstr "Будет ли �лемент меню радио-�лементом"
 
@@ -2157,9 +2199,12 @@ msgstr "И�пользовать прозрачно�ть"
 msgid "Whether to give the color an alpha value"
 msgstr "Давать ли цвету значение прозрачно�ти"
 
-#: ../gtk/gtkcolorbutton.c:185 ../gtk/gtkfilechooserbutton.c:397
-#: ../gtk/gtkfontbutton.c:140 ../gtk/gtkprintjob.c:141
-#: ../gtk/gtkstatusicon.c:408 ../gtk/gtktreeviewcolumn.c:319
+#: ../gtk/gtkcolorbutton.c:185
+#: ../gtk/gtkfilechooserbutton.c:440
+#: ../gtk/gtkfontbutton.c:150
+#: ../gtk/gtkprintjob.c:141
+#: ../gtk/gtkstatusicon.c:438
+#: ../gtk/gtktreeviewcolumn.c:331
 msgid "Title"
 msgstr "Заголовок"
 
@@ -2167,7 +2212,8 @@ msgstr "Заголовок"
 msgid "The title of the color selection dialog"
 msgstr "Заголовок диалога выбора цвета"
 
-#: ../gtk/gtkcolorbutton.c:200 ../gtk/gtkcolorsel.c:338
+#: ../gtk/gtkcolorbutton.c:200
+#: ../gtk/gtkcolorsel.c:336
 msgid "Current Color"
 msgstr "Текущий цвет"
 
@@ -2175,15 +2221,14 @@ msgstr "Текущий цвет"
 msgid "The selected color"
 msgstr "Выбранный цвет"
 
-#: ../gtk/gtkcolorbutton.c:215 ../gtk/gtkcolorsel.c:345
+#: ../gtk/gtkcolorbutton.c:215
+#: ../gtk/gtkcolorsel.c:343
 msgid "Current Alpha"
 msgstr "Текущее значение прозрачно�ти "
 
 #: ../gtk/gtkcolorbutton.c:216
 msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)"
-msgstr ""
-"Текущее значение прозрачно�ти («0» - аб�олютно прозрачно, «65535» - аб�олютно "
-"непрозрачно)"
+msgstr "Текущее значение прозрачно�ти («0» - аб�олютно прозрачно, «65535» - аб�олютно непрозрачно)"
 
 #: ../gtk/gtkcolorbutton.c:230
 msgid "Current RGBA Color"
@@ -2193,645 +2238,649 @@ msgstr "Текущий цвет в формате RGBA"
 msgid "The selected RGBA color"
 msgstr "Выбранный цвет в формате RGBA"
 
-#: ../gtk/gtkcolorsel.c:324
+#: ../gtk/gtkcolorsel.c:322
 msgid "Has Opacity Control"
 msgstr "Имеет управление прозрачно�тью"
 
-#: ../gtk/gtkcolorsel.c:325
+#: ../gtk/gtkcolorsel.c:323
 msgid "Whether the color selector should allow setting opacity"
 msgstr "Позвол�ет ли диалог выбора цвета управление прозрачно�тью"
 
-#: ../gtk/gtkcolorsel.c:331
+#: ../gtk/gtkcolorsel.c:329
 msgid "Has palette"
 msgstr "Имеет палитру"
 
-#: ../gtk/gtkcolorsel.c:332
+#: ../gtk/gtkcolorsel.c:330
 msgid "Whether a palette should be used"
 msgstr "И�пользовать ли палитру"
 
-#: ../gtk/gtkcolorsel.c:339
+#: ../gtk/gtkcolorsel.c:337
 msgid "The current color"
 msgstr "Текущий цвет"
 
-#: ../gtk/gtkcolorsel.c:346
+#: ../gtk/gtkcolorsel.c:344
 msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
-msgstr ""
-"Текущее значение прозрачно�ти («0» - аб�олютно прозрачно, «65535» - аб�олютно "
-"непрозрачно)"
+msgstr "Текущее значение прозрачно�ти («0» - аб�олютно прозрачно, «65535» - аб�олютно непрозрачно)"
 
-#: ../gtk/gtkcolorsel.c:360
+#: ../gtk/gtkcolorsel.c:358
 msgid "Current RGBA"
 msgstr "Текущее значение RGBA"
 
-#: ../gtk/gtkcolorsel.c:361
+#: ../gtk/gtkcolorsel.c:359
 msgid "The current RGBA color"
 msgstr "Текущий цвет в формате RGBA"
 
-#: ../gtk/gtkcolorseldialog.c:110
+#: ../gtk/gtkcolorseldialog.c:136
 msgid "Color Selection"
 msgstr "Выбор цвета"
 
-#: ../gtk/gtkcolorseldialog.c:111
+#: ../gtk/gtkcolorseldialog.c:137
 msgid "The color selection embedded in the dialog."
 msgstr "Виджет выбор цвета, в�троенный в диалог."
 
-#: ../gtk/gtkcolorseldialog.c:117
+#: ../gtk/gtkcolorseldialog.c:143
 msgid "OK Button"
 msgstr "Кнопка OK"
 
-#: ../gtk/gtkcolorseldialog.c:118
+#: ../gtk/gtkcolorseldialog.c:144
 msgid "The OK button of the dialog."
 msgstr "Кнопка диалога OK"
 
-#: ../gtk/gtkcolorseldialog.c:124
+#: ../gtk/gtkcolorseldialog.c:150
 msgid "Cancel Button"
 msgstr "Кнопка Cancel"
 
-#: ../gtk/gtkcolorseldialog.c:125
+#: ../gtk/gtkcolorseldialog.c:151
 msgid "The cancel button of the dialog."
 msgstr "Кнопка Cancel диалога"
 
-#: ../gtk/gtkcolorseldialog.c:131
+#: ../gtk/gtkcolorseldialog.c:157
 msgid "Help Button"
 msgstr "Кнопка �правки"
 
-#: ../gtk/gtkcolorseldialog.c:132
+#: ../gtk/gtkcolorseldialog.c:158
 msgid "The help button of the dialog."
 msgstr "Кнопка �правки диалога"
 
-#: ../gtk/gtkcombobox.c:663
+#: ../gtk/gtkcombobox.c:664
 msgid "ComboBox model"
 msgstr "Модель �лемента ComboBox"
 
-#: ../gtk/gtkcombobox.c:664
+#: ../gtk/gtkcombobox.c:665
 msgid "The model for the combo box"
 msgstr "Модель дл� выпадающего �пи�ка"
 
-#: ../gtk/gtkcombobox.c:681
+#: ../gtk/gtkcombobox.c:682
 msgid "Wrap width for laying out the items in a grid"
 msgstr "Ширина размещени� �лементов в �етке"
 
-#: ../gtk/gtkcombobox.c:703 ../gtk/gtktreemenu.c:383
+#: ../gtk/gtkcombobox.c:704
+#: ../gtk/gtktreemenu.c:383
 msgid "Row span column"
 msgstr "Столбец заполнени� �троки"
 
-#: ../gtk/gtkcombobox.c:704 ../gtk/gtktreemenu.c:384
+#: ../gtk/gtkcombobox.c:705
+#: ../gtk/gtktreemenu.c:384
 msgid "TreeModel column containing the row span values"
 msgstr "Столбец �труктуры TreeModel, �одержащий значени� заполнени� �троки"
 
-#: ../gtk/gtkcombobox.c:725 ../gtk/gtktreemenu.c:404
+#: ../gtk/gtkcombobox.c:726
+#: ../gtk/gtktreemenu.c:404
 msgid "Column span column"
 msgstr "Столбец заполнени� �толбца"
 
-#: ../gtk/gtkcombobox.c:726 ../gtk/gtktreemenu.c:405
+#: ../gtk/gtkcombobox.c:727
+#: ../gtk/gtktreemenu.c:405
 msgid "TreeModel column containing the column span values"
 msgstr "Столбец �труктуры TreeModel, �одержащий значени� заполнени� �толбца"
 
-#: ../gtk/gtkcombobox.c:747
+#: ../gtk/gtkcombobox.c:748
 msgid "Active item"
 msgstr "�ктивный �лемент"
 
-#: ../gtk/gtkcombobox.c:748
+#: ../gtk/gtkcombobox.c:749
 msgid "The item which is currently active"
 msgstr "Текущий активный �лемент"
 
-#: ../gtk/gtkcombobox.c:767 ../gtk/gtkuimanager.c:225
+#: ../gtk/gtkcombobox.c:768
+#: ../gtk/gtkuimanager.c:479
 msgid "Add tearoffs to menus"
 msgstr "Добавл�ть отделённые меню"
 
-#: ../gtk/gtkcombobox.c:768
+#: ../gtk/gtkcombobox.c:769
 msgid "Whether dropdowns should have a tearoff menu item"
 msgstr "Имеют ли выпадающие �лементы линию разрыва"
 
-#: ../gtk/gtkcombobox.c:783 ../gtk/gtkentry.c:779
+#: ../gtk/gtkcombobox.c:784
+#: ../gtk/gtkentry.c:786
 msgid "Has Frame"
 msgstr "Имеет рамку"
 
-#: ../gtk/gtkcombobox.c:784
+#: ../gtk/gtkcombobox.c:785
 msgid "Whether the combo box draws a frame around the child"
 msgstr "Имеет ли выпадающее меню рамку вокруг дочернего �лемента"
 
-#: ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkcombobox.c:793
 msgid "Whether the combo box grabs focus when it is clicked with the mouse"
 msgstr "Перехватывает ли выпадающее меню фоку� при щелчке мышью"
 
-#: ../gtk/gtkcombobox.c:807 ../gtk/gtkmenu.c:641
+#: ../gtk/gtkcombobox.c:808
+#: ../gtk/gtkmenu.c:643
 msgid "Tearoff Title"
 msgstr "Заголовок отделённого меню"
 
-#: ../gtk/gtkcombobox.c:808
-msgid ""
-"A title that may be displayed by the window manager when the popup is torn-"
-"off"
-msgstr ""
-"Заголовок, который ди�петчер окон может показывать дл� в�плывающего меню "
-"по�ле его отделени�"
+#: ../gtk/gtkcombobox.c:809
+msgid "A title that may be displayed by the window manager when the popup is torn-off"
+msgstr "Заголовок, который ди�петчер окон может показывать дл� в�плывающего меню по�ле его отделени�"
 
-#: ../gtk/gtkcombobox.c:825
+#: ../gtk/gtkcombobox.c:826
 msgid "Popup shown"
 msgstr "Показывать в�плывающее меню"
 
-#: ../gtk/gtkcombobox.c:826
+#: ../gtk/gtkcombobox.c:827
 msgid "Whether the combo's dropdown is shown"
 msgstr "Будет ли показывать�� выпадающий �пи�ок"
 
-#: ../gtk/gtkcombobox.c:842
+#: ../gtk/gtkcombobox.c:843
 msgid "Button Sensitivity"
 msgstr "Чув�твительно�ть кнопки"
 
-#: ../gtk/gtkcombobox.c:843
+#: ../gtk/gtkcombobox.c:844
 msgid "Whether the dropdown button is sensitive when the model is empty"
 msgstr "�ктивна ли кнопка выпадающего �пи�ка е�ли модель пу�та"
 
-#: ../gtk/gtkcombobox.c:859
+#: ../gtk/gtkcombobox.c:860
 msgid "Whether combo box has an entry"
 msgstr "Имеет ли выпадающий �пи�ок поле ввода"
 
-#: ../gtk/gtkcombobox.c:874
+#: ../gtk/gtkcombobox.c:875
 msgid "Entry Text Column"
 msgstr "Столбец ввода тек�та"
 
-#: ../gtk/gtkcombobox.c:875
-msgid ""
-"The column in the combo box's model to associate with strings from the entry "
-"if the combo was created with #GtkComboBox:has-entry = %TRUE"
-msgstr ""
-"Столбец в модели выпадающего �пи�ка дл� �в�зи �о �троками из пол� ввода, "
-"е�ли выпадающий �пи�ок �оздан � #GtkComboBox:has-entry = %TRUE"
+#: ../gtk/gtkcombobox.c:876
+msgid "The column in the combo box's model to associate with strings from the entry if the combo was created with #GtkComboBox:has-entry = %TRUE"
+msgstr "Столбец в модели выпадающего �пи�ка дл� �в�зи �о �троками из пол� ввода, е�ли выпадающий �пи�ок �оздан � #GtkComboBox:has-entry = %TRUE"
 
-#: ../gtk/gtkcombobox.c:892
+#: ../gtk/gtkcombobox.c:893
 msgid "ID Column"
 msgstr "ID �толбца"
 
-#: ../gtk/gtkcombobox.c:893
-msgid ""
-"The column in the combo box's model that provides string IDs for the values "
-"in the model"
-msgstr ""
-"Столбец в модели выпадающего �пи�ка, который �одержит �троковые "
-"идентификаторы значений модели"
+#: ../gtk/gtkcombobox.c:894
+msgid "The column in the combo box's model that provides string IDs for the values in the model"
+msgstr "Столбец в модели выпадающего �пи�ка, который �одержит �троковые идентификаторы значений модели"
 
-#: ../gtk/gtkcombobox.c:908
+#: ../gtk/gtkcombobox.c:909
 msgid "Active id"
 msgstr "�ктивный id"
 
-#: ../gtk/gtkcombobox.c:909
+#: ../gtk/gtkcombobox.c:910
 msgid "The value of the id column for the active row"
 msgstr "Значение идентификатора �толбца в активной колонке"
 
-#: ../gtk/gtkcombobox.c:924
+#: ../gtk/gtkcombobox.c:925
 msgid "Popup Fixed Width"
 msgstr "По�то�нна� ширина в�плывающего меню"
 
-#: ../gtk/gtkcombobox.c:925
-msgid ""
-"Whether the popup's width should be a fixed width matching the allocated "
-"width of the combo box"
-msgstr ""
-"Должна ли ширина в�плывающего меню быть по�то�нной и �овпадать � шириной, "
-"выделенной дл� выпадающего �пи�ка"
+#: ../gtk/gtkcombobox.c:926
+msgid "Whether the popup's width should be a fixed width matching the allocated width of the combo box"
+msgstr "Должна ли ширина в�плывающего меню быть по�то�нной и �овпадать � шириной, выделенной дл� выпадающего �пи�ка"
 
-#: ../gtk/gtkcombobox.c:951
+#: ../gtk/gtkcombobox.c:952
 msgid "Appears as list"
 msgstr "По�вл�ет�� как �пи�ок"
 
-#: ../gtk/gtkcombobox.c:952
+#: ../gtk/gtkcombobox.c:953
 msgid "Whether dropdowns should look like lists rather than menus"
 msgstr "Выгл�д�т ли выпадающие �лементы как �пи�ки, а не как меню"
 
-#: ../gtk/gtkcombobox.c:968
+#: ../gtk/gtkcombobox.c:969
 msgid "Arrow Size"
 msgstr "Размер �трелки"
 
-#: ../gtk/gtkcombobox.c:969
+#: ../gtk/gtkcombobox.c:970
 msgid "The minimum size of the arrow in the combo box"
 msgstr "Минимальный размер �трелки выпадающего �пи�ка"
 
-#: ../gtk/gtkcombobox.c:986
+#: ../gtk/gtkcombobox.c:987
 msgid "The amount of space used by the arrow"
 msgstr "Про�тран�тво, занимаемое �трелкой"
 
-#: ../gtk/gtkcombobox.c:1001 ../gtk/gtkentry.c:879 ../gtk/gtkhandlebox.c:190
-#: ../gtk/gtkmenubar.c:207 ../gtk/gtkstatusbar.c:180 ../gtk/gtktoolbar.c:601
-#: ../gtk/gtkviewport.c:153
+#: ../gtk/gtkcombobox.c:1002
+#: ../gtk/gtkentry.c:886
+#: ../gtk/gtkhandlebox.c:218
+#: ../gtk/gtkmenubar.c:218
+#: ../gtk/gtkstatusbar.c:182
+#: ../gtk/gtktoolbar.c:613
+#: ../gtk/gtkviewport.c:155
 msgid "Shadow type"
 msgstr "Тип тени"
 
-#: ../gtk/gtkcombobox.c:1002
+#: ../gtk/gtkcombobox.c:1003
 msgid "Which kind of shadow to draw around the combo box"
 msgstr "Тень вокруг выпадающего �пи�ка"
 
-#: ../gtk/gtkcontainer.c:453
+#: ../gtk/gtkcontainer.c:457
 msgid "Resize mode"
 msgstr "Режим изменени� размера"
 
-#: ../gtk/gtkcontainer.c:454
+#: ../gtk/gtkcontainer.c:458
 msgid "Specify how resize events are handled"
 msgstr "Определ�ет �по�об обработки �обытий, возникающих при изменении размера"
 
-#: ../gtk/gtkcontainer.c:461
+#: ../gtk/gtkcontainer.c:465
 msgid "Border width"
 msgstr "Ширина границы"
 
-#: ../gtk/gtkcontainer.c:462
+#: ../gtk/gtkcontainer.c:466
 msgid "The width of the empty border outside the containers children"
 msgstr "Ширина пу�той границы за пределами дочерних объектов контейнера"
 
-#: ../gtk/gtkcontainer.c:470
+#: ../gtk/gtkcontainer.c:474
 msgid "Child"
 msgstr "Дочерний �лемент"
 
-#: ../gtk/gtkcontainer.c:471
+#: ../gtk/gtkcontainer.c:475
 msgid "Can be used to add a new child to the container"
-msgstr ""
-"Может быть и�пользовано дл� добавлени� нового дочернего �лемента в контейнер"
+msgstr "Может быть и�пользовано дл� добавлени� нового дочернего �лемента в контейнер"
 
-#: ../gtk/gtkdialog.c:289 ../gtk/gtkinfobar.c:426
+#: ../gtk/gtkdialog.c:291
+#: ../gtk/gtkinfobar.c:427
 msgid "Content area border"
 msgstr "Граница обла�ти �одержимого"
 
-#: ../gtk/gtkdialog.c:290
+#: ../gtk/gtkdialog.c:292
 msgid "Width of border around the main dialog area"
 msgstr "Ширина границы вокруг о�новной обла�ти диалога"
 
-#: ../gtk/gtkdialog.c:307 ../gtk/gtkinfobar.c:443
+#: ../gtk/gtkdialog.c:309
+#: ../gtk/gtkinfobar.c:444
 msgid "Content area spacing"
 msgstr "От�тупы о�новной обла�ти"
 
-#: ../gtk/gtkdialog.c:308
+#: ../gtk/gtkdialog.c:310
 msgid "Spacing between elements of the main dialog area"
 msgstr "Ра��то�ни� между �лементами о�новной обла�ти диалога"
 
-#: ../gtk/gtkdialog.c:315 ../gtk/gtkinfobar.c:459
+#: ../gtk/gtkdialog.c:317
+#: ../gtk/gtkinfobar.c:460
 msgid "Button spacing"
 msgstr "Интервал кнопок"
 
-#: ../gtk/gtkdialog.c:316 ../gtk/gtkinfobar.c:460
+#: ../gtk/gtkdialog.c:318
+#: ../gtk/gtkinfobar.c:461
 msgid "Spacing between buttons"
 msgstr "Интервал между кнопками"
 
-#: ../gtk/gtkdialog.c:324 ../gtk/gtkinfobar.c:475
+#: ../gtk/gtkdialog.c:326
+#: ../gtk/gtkinfobar.c:476
 msgid "Action area border"
 msgstr "Граница обла�ти дей�твий"
 
-#: ../gtk/gtkdialog.c:325
+#: ../gtk/gtkdialog.c:327
 msgid "Width of border around the button area at the bottom of the dialog"
 msgstr "Ширина от�тупа вокруг кнопки �низу в диалоге"
 
-#: ../gtk/gtkentry.c:726
+#: ../gtk/gtkentrybuffer.c:353
+msgid "The contents of the buffer"
+msgstr "Содержимое буфера"
+
+#: ../gtk/gtkentrybuffer.c:367
+#: ../gtk/gtkentry.c:917
+msgid "Text length"
+msgstr "Длина тек�та"
+
+#: ../gtk/gtkentrybuffer.c:368
+msgid "Length of the text currently in the buffer"
+msgstr "Длина тек�та в буфере в на�то�щее врем�"
+
+#: ../gtk/gtkentrybuffer.c:382
+#: ../gtk/gtkentry.c:769
+msgid "Maximum length"
+msgstr "Мак�имальна� длина"
+
+#: ../gtk/gtkentrybuffer.c:383
+#: ../gtk/gtkentry.c:770
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr "Мак�имальное чи�ло �имволов дл� пол� ввода. «0» -- без ограничений"
+
+#: ../gtk/gtkentry.c:733
 msgid "Text Buffer"
 msgstr "Тек�товый буфер"
 
-#: ../gtk/gtkentry.c:727
+#: ../gtk/gtkentry.c:734
 msgid "Text buffer object which actually stores entry text"
 msgstr "Объект тек�тового буфера, который дей�твительно хранит тек�т ввода"
 
-#: ../gtk/gtkentry.c:734 ../gtk/gtklabel.c:662
+#: ../gtk/gtkentry.c:741
+#: ../gtk/gtklabel.c:824
 msgid "Cursor Position"
 msgstr "Позици� кур�ора"
 
-#: ../gtk/gtkentry.c:735 ../gtk/gtklabel.c:663
+#: ../gtk/gtkentry.c:742
+#: ../gtk/gtklabel.c:825
 msgid "The current position of the insertion cursor in chars"
 msgstr "Текуща� позици� точки в�тавки (insertion cursor) в �имволах"
 
-#: ../gtk/gtkentry.c:744 ../gtk/gtklabel.c:672
+#: ../gtk/gtkentry.c:751
+#: ../gtk/gtklabel.c:834
 msgid "Selection Bound"
 msgstr "Граница выделени�"
 
-#: ../gtk/gtkentry.c:745 ../gtk/gtklabel.c:673
-msgid ""
-"The position of the opposite end of the selection from the cursor in chars"
+#: ../gtk/gtkentry.c:752
+#: ../gtk/gtklabel.c:835
+msgid "The position of the opposite end of the selection from the cursor in chars"
 msgstr "Положение противоположного конца выделени� от кур�ора в �имволах"
 
-#: ../gtk/gtkentry.c:755
+#: ../gtk/gtkentry.c:762
 msgid "Whether the entry contents can be edited"
 msgstr "Может ли �одержимое пол� ввода быть изменено"
 
-#: ../gtk/gtkentry.c:762 ../gtk/gtkentrybuffer.c:382
-msgid "Maximum length"
-msgstr "Мак�имальна� длина"
-
-#: ../gtk/gtkentry.c:763 ../gtk/gtkentrybuffer.c:383
-msgid "Maximum number of characters for this entry. Zero if no maximum"
-msgstr "Мак�имальное чи�ло �имволов дл� пол� ввода. «0» -- без ограничений"
-
-#: ../gtk/gtkentry.c:771
+#: ../gtk/gtkentry.c:778
 msgid "Visibility"
 msgstr "Видимо�ть"
 
-#: ../gtk/gtkentry.c:772
-msgid ""
-"FALSE displays the \"invisible char\" instead of the actual text (password "
-"mode)"
-msgstr ""
-"Е�ли не у�тановлено, то приводит к отображению «невидимого �имвола» вме�то "
-"�амого тек�та (режим ввода парол�)"
+#: ../gtk/gtkentry.c:779
+msgid "FALSE displays the \"invisible char\" instead of the actual text (password mode)"
+msgstr "Е�ли не у�тановлено, то приводит к отображению «невидимого �имвола» вме�то �амого тек�та (режим ввода парол�)"
 
-#: ../gtk/gtkentry.c:780
+#: ../gtk/gtkentry.c:787
 msgid "FALSE removes outside bevel from entry"
 msgstr "Е�ли не у�тановлено, то удал�ет из �лемента внешнюю рамку"
 
-#: ../gtk/gtkentry.c:788
-msgid ""
-"Border between text and frame. Overrides the inner-border style property"
-msgstr ""
-"От�туп между тек�том и рамкой. Переопредел�ет �вой�тво �тил� inner-border"
+#: ../gtk/gtkentry.c:795
+msgid "Border between text and frame. Overrides the inner-border style property"
+msgstr "От�туп между тек�том и рамкой. Переопредел�ет �вой�тво �тил� inner-border"
 
-#: ../gtk/gtkentry.c:795 ../gtk/gtkentry.c:1361
+#: ../gtk/gtkentry.c:802
+#: ../gtk/gtkentry.c:1398
 msgid "Invisible character"
 msgstr "�евидимый �имвол"
 
-#: ../gtk/gtkentry.c:796 ../gtk/gtkentry.c:1362
+#: ../gtk/gtkentry.c:803
+#: ../gtk/gtkentry.c:1399
 msgid "The character to use when masking entry contents (in \"password mode\")"
-msgstr ""
-"Символ, и�пользуемый дл� �окрыти� �одержимого пол� ввода (в «режиме парол�»)"
+msgstr "Символ, и�пользуемый дл� �окрыти� �одержимого пол� ввода (в «режиме парол�»)"
 
-#: ../gtk/gtkentry.c:803
+#: ../gtk/gtkentry.c:810
 msgid "Activates default"
 msgstr "�ктивизирует дей�твие по умолчанию"
 
-#: ../gtk/gtkentry.c:804
-msgid ""
-"Whether to activate the default widget (such as the default button in a "
-"dialog) when Enter is pressed"
-msgstr ""
-"�ктивизировать ли дей�твие по умолчанию (например, кнопку, и�пользуемую по "
-"умолчанию в диалоге), е�ли нажата клавиша «Ввод»."
+#: ../gtk/gtkentry.c:811
+msgid "Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed"
+msgstr "�ктивизировать ли дей�твие по умолчанию (например, кнопку, и�пользуемую по умолчанию в диалоге), е�ли нажата клавиша «Ввод»."
 
-#: ../gtk/gtkentry.c:810
+#: ../gtk/gtkentry.c:817
 msgid "Width in chars"
 msgstr "Ширина в �имволах"
 
-#: ../gtk/gtkentry.c:811
+#: ../gtk/gtkentry.c:818
 msgid "Number of characters to leave space for in the entry"
 msgstr "Чи�ло �имволов, дл� которых о�тавлено ме�то в поле ввода"
 
-#: ../gtk/gtkentry.c:820
+#: ../gtk/gtkentry.c:827
 msgid "Scroll offset"
 msgstr "Смещение при прокрутке"
 
-#: ../gtk/gtkentry.c:821
+#: ../gtk/gtkentry.c:828
 msgid "Number of pixels of the entry scrolled off the screen to the left"
-msgstr ""
-"Количе�тво пик�елей пол� ввода, вышедших за левую границу �крана при "
-"прокрутке"
+msgstr "Количе�тво пик�елей пол� ввода, вышедших за левую границу �крана при прокрутке"
 
-#: ../gtk/gtkentry.c:831
+#: ../gtk/gtkentry.c:838
 msgid "The contents of the entry"
 msgstr "Содержимое пол� ввода"
 
-#: ../gtk/gtkentry.c:846 ../gtk/gtkmisc.c:81
+#: ../gtk/gtkentry.c:853
+#: ../gtk/gtkmisc.c:105
 msgid "X align"
 msgstr "Выравнивание по X"
 
-#: ../gtk/gtkentry.c:847 ../gtk/gtkmisc.c:82
-msgid ""
-"The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
-"layouts."
-msgstr ""
-"Горизонтальное выравнивание от 0 (влево) до 1 (вправо). Инвертирует�� дл� "
-"формата RTL."
+#: ../gtk/gtkentry.c:854
+#: ../gtk/gtkmisc.c:106
+msgid "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL layouts."
+msgstr "Горизонтальное выравнивание от 0 (влево) до 1 (вправо). Инвертирует�� дл� формата RTL."
 
-#: ../gtk/gtkentry.c:863
+#: ../gtk/gtkentry.c:870
 msgid "Truncate multiline"
 msgstr "Обрезать много�трочный тек�т"
 
-#: ../gtk/gtkentry.c:864
+#: ../gtk/gtkentry.c:871
 msgid "Whether to truncate multiline pastes to one line."
 msgstr "Обрезать ли в�тавленный много�трочный тек�т до одной �троки."
 
-#: ../gtk/gtkentry.c:880
+#: ../gtk/gtkentry.c:887
 msgid "Which kind of shadow to draw around the entry when has-frame is set"
-msgstr ""
-"Какой вид тени ри�овать вокруг пол� ввода когда у�тановлено �вой�тво has-"
-"frame"
+msgstr "Какой вид тени ри�овать вокруг пол� ввода когда у�тановлено �вой�тво has-frame"
 
-#: ../gtk/gtkentry.c:895 ../gtk/gtktextview.c:764
+#: ../gtk/gtkentry.c:902
+#: ../gtk/gtktextview.c:766
 msgid "Overwrite mode"
 msgstr "Режим перезапи�и"
 
-#: ../gtk/gtkentry.c:896
+#: ../gtk/gtkentry.c:903
 msgid "Whether new text overwrites existing text"
 msgstr "Перезапи�ывает ли вводимый тек�т �уще�твующий"
 
-#: ../gtk/gtkentry.c:910 ../gtk/gtkentrybuffer.c:367
-msgid "Text length"
-msgstr "Длина тек�та"
-
-#: ../gtk/gtkentry.c:911
+#: ../gtk/gtkentry.c:918
 msgid "Length of the text currently in the entry"
 msgstr "Длина тек�та в поле ввода"
 
-#: ../gtk/gtkentry.c:926
+#: ../gtk/gtkentry.c:933
 msgid "Invisible character set"
 msgstr "�евидимый ввод"
 
-#: ../gtk/gtkentry.c:927
+#: ../gtk/gtkentry.c:934
 msgid "Whether the invisible character has been set"
 msgstr "Включена ли невидимо�ть вводимых �имволов"
 
-#: ../gtk/gtkentry.c:945
+#: ../gtk/gtkentry.c:952
 msgid "Caps Lock warning"
 msgstr "Предупреждение о верхнем реги�тре"
 
-#: ../gtk/gtkentry.c:946
+#: ../gtk/gtkentry.c:953
 msgid "Whether password entries will show a warning when Caps Lock is on"
-msgstr ""
-"Показывать ли предупреждение о вводе в верхнем реги�тре в диалоге ввода "
-"парол�"
+msgstr "Показывать ли предупреждение о вводе в верхнем реги�тре в диалоге ввода парол�"
 
-#: ../gtk/gtkentry.c:960
+#: ../gtk/gtkentry.c:967
 msgid "Progress Fraction"
 msgstr "Процент выполнени�"
 
-#: ../gtk/gtkentry.c:961
+#: ../gtk/gtkentry.c:968
 msgid "The current fraction of the task that's been completed"
 msgstr "Процент выполнени� по�тавленной задачи"
 
-#: ../gtk/gtkentry.c:978
+#: ../gtk/gtkentry.c:985
 msgid "Progress Pulse Step"
 msgstr "Шаг пуль�ации"
 
-#: ../gtk/gtkentry.c:979
-msgid ""
-"The fraction of total entry width to move the progress bouncing block for "
-"each call to gtk_entry_progress_pulse()"
-msgstr ""
-"Дол� общего объема работы, при выполнении которой прои�ходит приращение "
-"индикатора проце��а при вызове gtk_entry_progress_pulse()"
+#: ../gtk/gtkentry.c:986
+msgid "The fraction of total entry width to move the progress bouncing block for each call to gtk_entry_progress_pulse()"
+msgstr "Дол� общего объема работы, при выполнении которой прои�ходит приращение индикатора проце��а при вызове gtk_entry_progress_pulse()"
 
-#: ../gtk/gtkentry.c:995
+#: ../gtk/gtkentry.c:1002
+msgid "Placeholder text"
+msgstr "Тек�т-заполнитель"
+
+#: ../gtk/gtkentry.c:1003
+msgid "Show text in the entry when it's empty and unfocused"
+msgstr "Показывать тек�т в поле, когда оно пу�тует или не имеет фоку�а"
+
+#: ../gtk/gtkentry.c:1017
 msgid "Primary pixbuf"
 msgstr "Главный значок"
 
-#: ../gtk/gtkentry.c:996
+#: ../gtk/gtkentry.c:1018
 msgid "Primary pixbuf for the entry"
 msgstr "Значок (Pixbuf) дл� открытого ра�шир�емого объекта"
 
-#: ../gtk/gtkentry.c:1010
+#: ../gtk/gtkentry.c:1032
 msgid "Secondary pixbuf"
 msgstr "Дополнительный значок"
 
-#: ../gtk/gtkentry.c:1011
+#: ../gtk/gtkentry.c:1033
 msgid "Secondary pixbuf for the entry"
 msgstr "Дополнительный значок дл� пол� ввода"
 
-#: ../gtk/gtkentry.c:1025
+#: ../gtk/gtkentry.c:1047
 msgid "Primary stock ID"
 msgstr "Идентификатор главного значка"
 
-#: ../gtk/gtkentry.c:1026
+#: ../gtk/gtkentry.c:1048
 msgid "Stock ID for primary icon"
 msgstr "Главный идентификатор в�троенного значка"
 
-#: ../gtk/gtkentry.c:1040
+#: ../gtk/gtkentry.c:1062
 msgid "Secondary stock ID"
 msgstr "Идентификатор дополнительного значка"
 
-#: ../gtk/gtkentry.c:1041
+#: ../gtk/gtkentry.c:1063
 msgid "Stock ID for secondary icon"
 msgstr "Дополнительный идентификатор в�троенного значка"
 
-#: ../gtk/gtkentry.c:1055
+#: ../gtk/gtkentry.c:1077
 msgid "Primary icon name"
 msgstr "Им� главного значка"
 
-#: ../gtk/gtkentry.c:1056
+#: ../gtk/gtkentry.c:1078
 msgid "Icon name for primary icon"
 msgstr "Главное им� дл� значка"
 
-#: ../gtk/gtkentry.c:1070
+#: ../gtk/gtkentry.c:1092
 msgid "Secondary icon name"
 msgstr "Им� дополнительного значка"
 
-#: ../gtk/gtkentry.c:1071
+#: ../gtk/gtkentry.c:1093
 msgid "Icon name for secondary icon"
 msgstr "Дополнительное им� дл� значка"
 
-#: ../gtk/gtkentry.c:1085
+#: ../gtk/gtkentry.c:1107
 msgid "Primary GIcon"
 msgstr "Главный значок GIcon"
 
-#: ../gtk/gtkentry.c:1086
+#: ../gtk/gtkentry.c:1108
 msgid "GIcon for primary icon"
 msgstr "Главный значок GIcon"
 
-#: ../gtk/gtkentry.c:1100
+#: ../gtk/gtkentry.c:1122
 msgid "Secondary GIcon"
 msgstr "Дополнительный GIcon"
 
-#: ../gtk/gtkentry.c:1101
+#: ../gtk/gtkentry.c:1123
 msgid "GIcon for secondary icon"
 msgstr "Дополнительный GIcon"
 
-#: ../gtk/gtkentry.c:1115
+#: ../gtk/gtkentry.c:1137
 msgid "Primary storage type"
 msgstr "Тип хранени� главного значка"
 
-#: ../gtk/gtkentry.c:1116
+#: ../gtk/gtkentry.c:1138
 msgid "The representation being used for primary icon"
 msgstr "Пред�тавление, и�пользуемое дл� главного значка"
 
-#: ../gtk/gtkentry.c:1131
+#: ../gtk/gtkentry.c:1153
 msgid "Secondary storage type"
 msgstr "Пред�тавление дополнительного значка"
 
-#: ../gtk/gtkentry.c:1132
+#: ../gtk/gtkentry.c:1154
 msgid "The representation being used for secondary icon"
 msgstr "Пред�тавление, и�пользуемое дл� дополнительного значка"
 
-#: ../gtk/gtkentry.c:1153
+#: ../gtk/gtkentry.c:1175
 msgid "Primary icon activatable"
 msgstr "Главный значок активен"
 
-#: ../gtk/gtkentry.c:1154
+#: ../gtk/gtkentry.c:1176
 msgid "Whether the primary icon is activatable"
 msgstr "�ктивен ли главный значок"
 
-#: ../gtk/gtkentry.c:1174
+#: ../gtk/gtkentry.c:1196
 msgid "Secondary icon activatable"
 msgstr "Дополнительный значок активен"
 
-#: ../gtk/gtkentry.c:1175
+#: ../gtk/gtkentry.c:1197
 msgid "Whether the secondary icon is activatable"
 msgstr "�ктивен ли дополнительный значок"
 
-#: ../gtk/gtkentry.c:1197
+#: ../gtk/gtkentry.c:1219
 msgid "Primary icon sensitive"
 msgstr "Главный значок чув�твительный"
 
-#: ../gtk/gtkentry.c:1198
+#: ../gtk/gtkentry.c:1220
 msgid "Whether the primary icon is sensitive"
 msgstr "Чув�твителен ли главный значок"
 
-#: ../gtk/gtkentry.c:1219
+#: ../gtk/gtkentry.c:1241
 msgid "Secondary icon sensitive"
 msgstr "Дополнительный значок чув�твительный"
 
-#: ../gtk/gtkentry.c:1220
+#: ../gtk/gtkentry.c:1242
 msgid "Whether the secondary icon is sensitive"
 msgstr "Чув�твителен ли дополнительный значок"
 
-#: ../gtk/gtkentry.c:1236
+#: ../gtk/gtkentry.c:1258
 msgid "Primary icon tooltip text"
 msgstr "Тек�т в�плывающей под�казки главного значка"
 
-#: ../gtk/gtkentry.c:1237 ../gtk/gtkentry.c:1273
+#: ../gtk/gtkentry.c:1259
+#: ../gtk/gtkentry.c:1295
 msgid "The contents of the tooltip on the primary icon"
 msgstr "Содержание в�плывающей под�казки главного значка"
 
-#: ../gtk/gtkentry.c:1253
+#: ../gtk/gtkentry.c:1275
 msgid "Secondary icon tooltip text"
 msgstr "Тек�т в�плывающей под�казки дополнительного значка"
 
-#: ../gtk/gtkentry.c:1254 ../gtk/gtkentry.c:1292
+#: ../gtk/gtkentry.c:1276
+#: ../gtk/gtkentry.c:1314
 msgid "The contents of the tooltip on the secondary icon"
 msgstr "Содержание в�плывающей под�казки дополнительного значка"
 
-#: ../gtk/gtkentry.c:1272
+#: ../gtk/gtkentry.c:1294
 msgid "Primary icon tooltip markup"
 msgstr "Разметка в�плывающей под�казки главного значка"
 
-#: ../gtk/gtkentry.c:1291
+#: ../gtk/gtkentry.c:1313
 msgid "Secondary icon tooltip markup"
 msgstr "Разметка в�плывающей под�казки дополнительного значка"
 
-#: ../gtk/gtkentry.c:1311 ../gtk/gtktextview.c:792
+#: ../gtk/gtkentry.c:1333
+#: ../gtk/gtktextview.c:794
 msgid "IM module"
 msgstr "Модуль ввода"
 
-#: ../gtk/gtkentry.c:1312 ../gtk/gtktextview.c:793
+#: ../gtk/gtkentry.c:1334
+#: ../gtk/gtktextview.c:795
 msgid "Which IM module should be used"
 msgstr "И�пользуемый модуль ввода"
 
-#: ../gtk/gtkentry.c:1326
+#: ../gtk/gtkentry.c:1348
+#| msgid "Completion Model"
+msgid "Completion"
+msgstr "Дополнение"
+
+#: ../gtk/gtkentry.c:1349
+msgid "The auxiliary completion object"
+msgstr "Объект в�помогательного дополнени�"
+
+#: ../gtk/gtkentry.c:1363
 msgid "Icon Prelight"
 msgstr "Под�ветка значка"
 
-#: ../gtk/gtkentry.c:1327
+#: ../gtk/gtkentry.c:1364
 msgid "Whether activatable icons should prelight when hovered"
 msgstr "Под�вечивать ли активный значок при наведении указател� мыши"
 
-#: ../gtk/gtkentry.c:1340
+#: ../gtk/gtkentry.c:1377
 msgid "Progress Border"
 msgstr "Про�тран�тво вокруг индикатора выполнени�"
 
-#: ../gtk/gtkentry.c:1341
+#: ../gtk/gtkentry.c:1378
 msgid "Border around the progress bar"
 msgstr "От�тупы вокруг индикатора выполнени�"
 
-#: ../gtk/gtkentry.c:1833
+#: ../gtk/gtkentry.c:1870
 msgid "Border between text and frame."
 msgstr "От�туп между тек�том и рамкой."
 
-#: ../gtk/gtkentrybuffer.c:353
-msgid "The contents of the buffer"
-msgstr "Содержимое буфера"
-
-#: ../gtk/gtkentrybuffer.c:368
-msgid "Length of the text currently in the buffer"
-msgstr "Длина тек�та в буфере в на�то�щее врем�"
-
 #: ../gtk/gtkentrycompletion.c:320
 msgid "Completion Model"
 msgstr "Режим дополнени�"
@@ -2848,7 +2897,8 @@ msgstr "Минимальна� длина ключа"
 msgid "Minimum length of the search key in order to look up matches"
 msgstr "Минимальна� длина ключа в пор�дке пои�ка на �овпадение"
 
-#: ../gtk/gtkentrycompletion.c:344 ../gtk/gtkiconview.c:566
+#: ../gtk/gtkentrycompletion.c:344
+#: ../gtk/gtkiconview.c:564
 msgid "Text column"
 msgstr "Тек�товый �толбец"
 
@@ -2878,8 +2928,7 @@ msgstr "Ширина выпадающего набора"
 
 #: ../gtk/gtkentrycompletion.c:396
 msgid "If TRUE, the popup window will have the same size as the entry"
-msgstr ""
-"Е�ли у�тановлено, выпадающее окно будет иметь такой же размер, как и �лемент"
+msgstr "Е�ли у�тановлено, выпадающее окно будет иметь такой же размер, как и �лемент"
 
 #: ../gtk/gtkentrycompletion.c:414
 msgid "Popup single match"
@@ -2902,96 +2951,100 @@ msgid "Visible Window"
 msgstr "Видимое окно"
 
 #: ../gtk/gtkeventbox.c:110
-msgid ""
-"Whether the event box is visible, as opposed to invisible and only used to "
-"trap events."
-msgstr ""
-"Явл�ет�� ли обла�ть �обытий видимой в противове� невидимо�ти, и�пользует�� "
-"только дл� перехвата �обытий."
+msgid "Whether the event box is visible, as opposed to invisible and only used to trap events."
+msgstr "Явл�ет�� ли обла�ть �обытий видимой в противове� невидимо�ти, и�пользует�� только дл� перехвата �обытий."
 
 #: ../gtk/gtkeventbox.c:116
 msgid "Above child"
 msgstr "�ад дочерним �лементом"
 
 #: ../gtk/gtkeventbox.c:117
-msgid ""
-"Whether the event-trapping window of the eventbox is above the window of the "
-"child widget as opposed to below it."
-msgstr ""
-"Ра�полагать ли окно перехвата �обытий над окном � дочерним �лементом в "
-"противове� ра�положению �низу."
+msgid "Whether the event-trapping window of the eventbox is above the window of the child widget as opposed to below it."
+msgstr "Ра�полагать ли окно перехвата �обытий над окном � дочерним �лементом в противове� ра�положению �низу."
 
-#: ../gtk/gtkexpander.c:279
+#: ../gtk/gtkexpander.c:282
 msgid "Expanded"
 msgstr "Ра�ширенный"
 
-#: ../gtk/gtkexpander.c:280
+#: ../gtk/gtkexpander.c:283
 msgid "Whether the expander has been opened to reveal the child widget"
 msgstr "Может ли открытый ра�ширитель обнаруживать дочерний �лемент"
 
-#: ../gtk/gtkexpander.c:288
+#: ../gtk/gtkexpander.c:291
 msgid "Text of the expander's label"
 msgstr "Тек�т метки ра�ширител�"
 
-#: ../gtk/gtkexpander.c:303 ../gtk/gtklabel.c:581
+#: ../gtk/gtkexpander.c:306
+#: ../gtk/gtklabel.c:743
 msgid "Use markup"
 msgstr "И�пользовать разметку"
 
-#: ../gtk/gtkexpander.c:304 ../gtk/gtklabel.c:582
+#: ../gtk/gtkexpander.c:307
+#: ../gtk/gtklabel.c:744
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "Тек�т метки включает разметку XML.  См. функцию pango_parse_markup()"
 
-#: ../gtk/gtkexpander.c:312
+#: ../gtk/gtkexpander.c:315
 msgid "Space to put between the label and the child"
-msgstr ""
-"Дополнительное про�тран�тво, которое будет помещено между меткой и дочерним "
-"�лементом"
+msgstr "Дополнительное про�тран�тво, которое будет помещено между меткой и дочерним �лементом"
 
-#: ../gtk/gtkexpander.c:321 ../gtk/gtkframe.c:168 ../gtk/gtktoolbutton.c:215
-#: ../gtk/gtktoolitemgroup.c:1603
+#: ../gtk/gtkexpander.c:324
+#: ../gtk/gtkframe.c:206
+#: ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolitemgroup.c:1599
 msgid "Label widget"
 msgstr "Виджет «Метка»"
 
-#: ../gtk/gtkexpander.c:322
+#: ../gtk/gtkexpander.c:325
 msgid "A widget to display in place of the usual expander label"
 msgstr "Виджет, который будет отображать�� вме�то обычной метки ра�ширител�"
 
-#: ../gtk/gtkexpander.c:329
+#: ../gtk/gtkexpander.c:332
 msgid "Label fill"
 msgstr "Заполнение меткой"
 
-#: ../gtk/gtkexpander.c:330
+#: ../gtk/gtkexpander.c:333
 msgid "Whether the label widget should fill all available horizontal space"
-msgstr ""
-"Должна ли метка виджета заполн�ть в�ё до�тупное про�тран�тво по горизонтали"
+msgstr "Должна ли метка виджета заполн�ть в�ё до�тупное про�тран�тво по горизонтали"
+
+#: ../gtk/gtkexpander.c:348
+#| msgid "Resize mode"
+msgid "Resize toplevel"
+msgstr "Измен�ть верхний уровень"
 
-#: ../gtk/gtkexpander.c:336 ../gtk/gtktoolitemgroup.c:1631
+#: ../gtk/gtkexpander.c:349
+msgid "Whether the expander will resize the toplevel window upon expanding and collapsing"
+msgstr "Будет ли ра�ширитель измен�ть размер окна верхнего уровн� при ра�ширении"
+
+#: ../gtk/gtkexpander.c:355
+#: ../gtk/gtktoolitemgroup.c:1627
 #: ../gtk/gtktreeview.c:1187
 msgid "Expander Size"
 msgstr "Размер ра�ширител�"
 
-#: ../gtk/gtkexpander.c:337 ../gtk/gtktoolitemgroup.c:1632
+#: ../gtk/gtkexpander.c:356
+#: ../gtk/gtktoolitemgroup.c:1628
 #: ../gtk/gtktreeview.c:1188
 msgid "Size of the expander arrow"
 msgstr "Размер ра�шир�ющей �трелки"
 
-#: ../gtk/gtkexpander.c:346
+#: ../gtk/gtkexpander.c:365
 msgid "Spacing around expander arrow"
 msgstr "Интервал вокруг �трелки-ра�ширител�"
 
-#: ../gtk/gtkfilechooserbutton.c:366
+#: ../gtk/gtkfilechooserbutton.c:409
 msgid "Dialog"
 msgstr "Диалог"
 
-#: ../gtk/gtkfilechooserbutton.c:367
+#: ../gtk/gtkfilechooserbutton.c:410
 msgid "The file chooser dialog to use."
 msgstr "И�пользуемый диалог выбора файлов."
 
-#: ../gtk/gtkfilechooserbutton.c:398
+#: ../gtk/gtkfilechooserbutton.c:441
 msgid "The title of the file chooser dialog."
 msgstr "Заголовок диалога выбора файлов."
 
-#: ../gtk/gtkfilechooserbutton.c:412
+#: ../gtk/gtkfilechooserbutton.c:455
 msgid "The desired width of the button widget, in characters."
 msgstr "Желаема� ширина виджета кнопки, в �имволах."
 
@@ -3003,7 +3056,8 @@ msgstr "Дей�твие"
 msgid "The type of operation that the file selector is performing"
 msgstr "Тип операции, производимой диалогом выбора файлов"
 
-#: ../gtk/gtkfilechooser.c:754 ../gtk/gtkrecentchooser.c:264
+#: ../gtk/gtkfilechooser.c:754
+#: ../gtk/gtkrecentchooser.c:264
 msgid "Filter"
 msgstr "Фильтр"
 
@@ -3032,8 +3086,7 @@ msgid "Preview Widget Active"
 msgstr "Виджет образца активен"
 
 #: ../gtk/gtkfilechooser.c:773
-msgid ""
-"Whether the application supplied widget for custom previews should be shown."
+msgid "Whether the application supplied widget for custom previews should be shown."
 msgstr "Показывать ли поддерживаемый приложением виджет образца."
 
 #: ../gtk/gtkfilechooser.c:778
@@ -3052,7 +3105,8 @@ msgstr "Дополнительный виджет"
 msgid "Application supplied widget for extra options."
 msgstr "Поддерживаемый приложением виджет дл� дополнительных опций."
 
-#: ../gtk/gtkfilechooser.c:790 ../gtk/gtkrecentchooser.c:203
+#: ../gtk/gtkfilechooser.c:790
+#: ../gtk/gtkrecentchooser.c:203
 msgid "Select Multiple"
 msgstr "Выдел�ть не�колько"
 
@@ -3073,607 +3127,616 @@ msgid "Do overwrite confirmation"
 msgstr "Подтверждение перезапи�и"
 
 #: ../gtk/gtkfilechooser.c:814
-msgid ""
-"Whether a file chooser in save mode will present an overwrite confirmation "
-"dialog if necessary."
-msgstr ""
-"Спрашивать ли о перезапи�и �уще�твующих файлов в режиме �охранени� диалога "
-"выбора файлов."
+msgid "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary."
+msgstr "Спрашивать ли о перезапи�и �уще�твующих файлов в режиме �охранени� диалога выбора файлов."
 
 #: ../gtk/gtkfilechooser.c:830
 msgid "Allow folder creation"
 msgstr "Разрешить �оздание папки"
 
 #: ../gtk/gtkfilechooser.c:831
-msgid ""
-"Whether a file chooser not in open mode will offer the user to create new "
-"folders."
-msgstr ""
-"Должен ли диалог выбора файлов, который не в режиме открыти�, предлагать "
-"пользователю �оздавать новые папки."
+msgid "Whether a file chooser not in open mode will offer the user to create new folders."
+msgstr "Должен ли диалог выбора файлов, который не в режиме открыти�, предлагать пользователю �оздавать новые папки."
 
-#: ../gtk/gtkfixed.c:152 ../gtk/gtklayout.c:634
+#: ../gtk/gtkfixed.c:152
+#: ../gtk/gtklayout.c:634
+#: ../gtk/gtktreeviewcolumn.c:264
 msgid "X position"
 msgstr "Позици� по X"
 
-#: ../gtk/gtkfixed.c:153 ../gtk/gtklayout.c:635
+#: ../gtk/gtkfixed.c:153
+#: ../gtk/gtklayout.c:635
 msgid "X position of child widget"
 msgstr "Позици� дочернего виджета по горизонтали"
 
-#: ../gtk/gtkfixed.c:160 ../gtk/gtklayout.c:644
+#: ../gtk/gtkfixed.c:160
+#: ../gtk/gtklayout.c:644
 msgid "Y position"
 msgstr "Позици� по Y"
 
-#: ../gtk/gtkfixed.c:161 ../gtk/gtklayout.c:645
+#: ../gtk/gtkfixed.c:161
+#: ../gtk/gtklayout.c:645
 msgid "Y position of child widget"
 msgstr "Позици� дочернего виджета по вертикали"
 
-#: ../gtk/gtkfontbutton.c:141
-msgid "The title of the font selection dialog"
-msgstr "Заголовок диалога выбора файлов"
+#: ../gtk/gtkfontbutton.c:151
+#| msgid "The title of the file chooser dialog."
+msgid "The title of the font chooser dialog"
+msgstr "Заголовок диалога выбора шрифта"
 
-#: ../gtk/gtkfontbutton.c:156 ../gtk/gtkfontsel.c:219
+#: ../gtk/gtkfontbutton.c:166
+#: ../gtk/gtkfontchooser.c:182
+#: ../gtk/gtkfontsel.c:244
 msgid "Font name"
 msgstr "�аименование шрифта"
 
-#: ../gtk/gtkfontbutton.c:157
+#: ../gtk/gtkfontbutton.c:167
 msgid "The name of the selected font"
 msgstr "�аименование выбранного шрифта"
 
-#: ../gtk/gtkfontbutton.c:158
+#: ../gtk/gtkfontbutton.c:168
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:173
+#: ../gtk/gtkfontbutton.c:183
 msgid "Use font in label"
 msgstr "И�пользовать шрифт в метке"
 
-#: ../gtk/gtkfontbutton.c:174
+#: ../gtk/gtkfontbutton.c:184
 msgid "Whether the label is drawn in the selected font"
 msgstr "И�пользовать ли в метке выбранный шрифт"
 
-#: ../gtk/gtkfontbutton.c:189
+#: ../gtk/gtkfontbutton.c:199
 msgid "Use size in label"
 msgstr "И�пользовать размер в метке"
 
-#: ../gtk/gtkfontbutton.c:190
+#: ../gtk/gtkfontbutton.c:200
 msgid "Whether the label is drawn with the selected font size"
 msgstr "И�пользовать ли в метке выбранный размер"
 
-#: ../gtk/gtkfontbutton.c:206
+#: ../gtk/gtkfontbutton.c:216
 msgid "Show style"
 msgstr "Показывать �тиль"
 
-#: ../gtk/gtkfontbutton.c:207
+#: ../gtk/gtkfontbutton.c:217
 msgid "Whether the selected font style is shown in the label"
 msgstr "Показывать ли в метке �тиль выбранного шрифта"
 
-#: ../gtk/gtkfontbutton.c:222
+#: ../gtk/gtkfontbutton.c:232
 msgid "Show size"
 msgstr "Показывать размер"
 
-#: ../gtk/gtkfontbutton.c:223
+#: ../gtk/gtkfontbutton.c:233
 msgid "Whether selected font size is shown in the label"
 msgstr "Показывать ли в метке размер выбранного шрифта"
 
-#: ../gtk/gtkfontsel.c:220
+#: ../gtk/gtkfontchooser.c:183
+#: ../gtk/gtkfontsel.c:245
 msgid "The string that represents this font"
 msgstr "Строка, пред�тавл�юща� �тот шрифт"
 
-#: ../gtk/gtkfontsel.c:226
+#: ../gtk/gtkfontchooser.c:189
+#: ../gtk/gtkfontsel.c:251
 msgid "Preview text"
 msgstr "Образец тек�та"
 
-#: ../gtk/gtkfontsel.c:227
+#: ../gtk/gtkfontchooser.c:190
+#: ../gtk/gtkfontsel.c:252
 msgid "The text to display in order to demonstrate the selected font"
 msgstr "Тек�т, и�пользуемый дл� демон�трации выбранного шрифта"
 
-#: ../gtk/gtkframe.c:134
+#: ../gtk/gtkfontchooser.c:197
+#| msgid "Preview text"
+msgid "Show preview text entry"
+msgstr "Показывать предварительный про�мотр тек�та"
+
+#: ../gtk/gtkfontchooser.c:198
+#| msgid "Whether the switch is on or off"
+msgid "Whether the preview text entry is shown or not"
+msgstr "Включён ли предварительный про�мотр тек�та"
+
+#: ../gtk/gtkframe.c:172
 msgid "Text of the frame's label"
 msgstr "Тек�т метки рамки"
 
-#: ../gtk/gtkframe.c:141
+#: ../gtk/gtkframe.c:179
 msgid "Label xalign"
 msgstr "Выравнивание метки по о�и X"
 
-#: ../gtk/gtkframe.c:142
+#: ../gtk/gtkframe.c:180
 msgid "The horizontal alignment of the label"
 msgstr "Горизонтальное выравнивание метки"
 
-#: ../gtk/gtkframe.c:150
+#: ../gtk/gtkframe.c:188
 msgid "Label yalign"
 msgstr "Выравнивание метки по о�и Y"
 
-#: ../gtk/gtkframe.c:151
+#: ../gtk/gtkframe.c:189
 msgid "The vertical alignment of the label"
 msgstr "Вертикальное выравнивание метки"
 
-#: ../gtk/gtkframe.c:159
+#: ../gtk/gtkframe.c:197
 msgid "Frame shadow"
 msgstr "Тень рамки"
 
-#: ../gtk/gtkframe.c:160
+#: ../gtk/gtkframe.c:198
 msgid "Appearance of the frame border"
 msgstr "Внешний вид границы рамки"
 
-#: ../gtk/gtkframe.c:169
+#: ../gtk/gtkframe.c:207
 msgid "A widget to display in place of the usual frame label"
 msgstr "Виджет, который будет отображать�� вме�то обычной метки рамки"
 
-#: ../gtk/gtkgrid.c:1277 ../gtk/gtktable.c:175
+#: ../gtk/gtkgrid.c:1298
+#: ../gtk/gtktable.c:209
 msgid "Row spacing"
 msgstr "Интервал �трок"
 
-#: ../gtk/gtkgrid.c:1278 ../gtk/gtktable.c:176
+#: ../gtk/gtkgrid.c:1299
+#: ../gtk/gtktable.c:210
 msgid "The amount of space between two consecutive rows"
 msgstr "Ра��то�ние между �о�едними �троками"
 
-#: ../gtk/gtkgrid.c:1284 ../gtk/gtktable.c:184
+#: ../gtk/gtkgrid.c:1305
+#: ../gtk/gtktable.c:218
 msgid "Column spacing"
 msgstr "Интервал �толбцов"
 
-#: ../gtk/gtkgrid.c:1285 ../gtk/gtktable.c:185
+#: ../gtk/gtkgrid.c:1306
+#: ../gtk/gtktable.c:219
 msgid "The amount of space between two consecutive columns"
 msgstr "Ра��то�ние между �о�едними �толбцами"
 
-#: ../gtk/gtkgrid.c:1291
+#: ../gtk/gtkgrid.c:1312
 msgid "Row Homogeneous"
 msgstr "Гомогенно�ть �троки"
 
-#: ../gtk/gtkgrid.c:1292
+#: ../gtk/gtkgrid.c:1313
 msgid "If TRUE, the rows are all the same height"
 msgstr "Е�ли у�тановлено, то �троки имеют одинаковую вы�оту"
 
-#: ../gtk/gtkgrid.c:1298
+#: ../gtk/gtkgrid.c:1319
 msgid "Column Homogeneous"
 msgstr "Гомогенно�ть �толбца"
 
-#: ../gtk/gtkgrid.c:1299
+#: ../gtk/gtkgrid.c:1320
 msgid "If TRUE, the columns are all the same width"
 msgstr "Е�ли у�тановлено, то �толбцы имеют одинаковую ширину"
 
-#: ../gtk/gtkgrid.c:1305 ../gtk/gtktable.c:201
+#: ../gtk/gtkgrid.c:1326
+#: ../gtk/gtktable.c:235
 msgid "Left attachment"
 msgstr "Прибавление �лева"
 
-#: ../gtk/gtkgrid.c:1306 ../gtk/gtkmenu.c:759 ../gtk/gtktable.c:202
+#: ../gtk/gtkgrid.c:1327
+#: ../gtk/gtkmenu.c:761
+#: ../gtk/gtktable.c:236
 msgid "The column number to attach the left side of the child to"
 msgstr "Чи�ло �толбцов, прибавл�емых к левой �тороне дочернего �лемента"
 
-#: ../gtk/gtkgrid.c:1312 ../gtk/gtktable.c:215
+#: ../gtk/gtkgrid.c:1333
+#: ../gtk/gtktable.c:249
 msgid "Top attachment"
 msgstr "Прибавление �верху"
 
-#: ../gtk/gtkgrid.c:1313
+#: ../gtk/gtkgrid.c:1334
 msgid "The row number to attach the top side of a child widget to"
 msgstr "Чи�ло �трок, прибавл�емых к верхней �тороне дочернего виджета"
 
-#: ../gtk/gtkgrid.c:1319 ../gtk/gtklayout.c:660 ../gtk/gtktreeviewcolumn.c:262
+#: ../gtk/gtkgrid.c:1340
+#: ../gtk/gtklayout.c:660
+#: ../gtk/gtktreeviewcolumn.c:274
 msgid "Width"
 msgstr "Ширина"
 
-#: ../gtk/gtkgrid.c:1320
+#: ../gtk/gtkgrid.c:1341
 msgid "The number of columns that a child spans"
 msgstr "Чи�ло �толбцов заполнени� потомка"
 
-#: ../gtk/gtkgrid.c:1326 ../gtk/gtklayout.c:669
+#: ../gtk/gtkgrid.c:1347
+#: ../gtk/gtklayout.c:669
 msgid "Height"
 msgstr "Вы�ота"
 
-#: ../gtk/gtkgrid.c:1327
+#: ../gtk/gtkgrid.c:1348
 msgid "The number of rows that a child spans"
 msgstr "Чи�ло �трок заполнени� потомка"
 
-#: ../gtk/gtkhandlebox.c:191
+#: ../gtk/gtkhandlebox.c:219
 msgid "Appearance of the shadow that surrounds the container"
 msgstr "Внешний вид тени, окружающей контейнер"
 
-#: ../gtk/gtkhandlebox.c:199
+#: ../gtk/gtkhandlebox.c:227
 msgid "Handle position"
 msgstr "Позици� регул�тора"
 
-#: ../gtk/gtkhandlebox.c:200
+#: ../gtk/gtkhandlebox.c:228
 msgid "Position of the handle relative to the child widget"
 msgstr "Позици� регул�тора отно�ительно дочернего виджета"
 
-#: ../gtk/gtkhandlebox.c:208
+#: ../gtk/gtkhandlebox.c:236
 msgid "Snap edge"
 msgstr "Выравнивать кра�"
 
-#: ../gtk/gtkhandlebox.c:209
-msgid ""
-"Side of the handlebox that's lined up with the docking point to dock the "
-"handlebox"
-msgstr ""
-"Сторона контейнера � от�оедин�емым виджетом, �оединённа� � �лементом виджета "
-"дл� перено�а"
+#: ../gtk/gtkhandlebox.c:237
+msgid "Side of the handlebox that's lined up with the docking point to dock the handlebox"
+msgstr "Сторона контейнера � от�оедин�емым виджетом, �оединённа� � �лементом виджета дл� перено�а"
 
-#: ../gtk/gtkhandlebox.c:217
+#: ../gtk/gtkhandlebox.c:245
 msgid "Snap edge set"
 msgstr "Выравнивание краёв у�тановлено"
 
-#: ../gtk/gtkhandlebox.c:218
-msgid ""
-"Whether to use the value from the snap_edge property or a value derived from "
-"handle_position"
-msgstr ""
-"И�пользовать ли значение из �вой�тва snap_edge («Выравнивать кра�») или "
-"значение, уна�ледованное от handle_position («Позици� регул�тора»)"
+#: ../gtk/gtkhandlebox.c:246
+msgid "Whether to use the value from the snap_edge property or a value derived from handle_position"
+msgstr "И�пользовать ли значение из �вой�тва snap_edge («Выравнивать кра�») или значение, уна�ледованное от handle_position («Позици� регул�тора»)"
 
-#: ../gtk/gtkhandlebox.c:225
+#: ../gtk/gtkhandlebox.c:253
 msgid "Child Detached"
 msgstr "Дочерний виджет от�оединён"
 
-#: ../gtk/gtkhandlebox.c:226
-msgid ""
-"A boolean value indicating whether the handlebox's child is attached or "
-"detached."
+#: ../gtk/gtkhandlebox.c:254
+msgid "A boolean value indicating whether the handlebox's child is attached or detached."
 msgstr "Булево значение, показывающее, от�оединён ли дочерний виджет."
 
-#: ../gtk/gtkiconview.c:529
+#: ../gtk/gtkiconview.c:527
+#: ../gtk/gtktreeselection.c:131
 msgid "Selection mode"
 msgstr "Режим выделени�"
 
-#: ../gtk/gtkiconview.c:530
+#: ../gtk/gtkiconview.c:528
 msgid "The selection mode"
 msgstr "Режим выделени�"
 
-#: ../gtk/gtkiconview.c:548
+#: ../gtk/gtkiconview.c:546
 msgid "Pixbuf column"
 msgstr "Столбец pixbuf"
 
-#: ../gtk/gtkiconview.c:549
+#: ../gtk/gtkiconview.c:547
 msgid "Model column used to retrieve the icon pixbuf from"
 msgstr "Модель �толбца, и�пользуема� дл� получени� изображени� (pixbuf) значка"
 
-#: ../gtk/gtkiconview.c:567
+#: ../gtk/gtkiconview.c:565
 msgid "Model column used to retrieve the text from"
 msgstr "Модель �толбца, и�пользуема� дл� получени� из нее тек�та"
 
-#: ../gtk/gtkiconview.c:586
+#: ../gtk/gtkiconview.c:584
 msgid "Markup column"
 msgstr "Разметка �толбца"
 
-#: ../gtk/gtkiconview.c:587
+#: ../gtk/gtkiconview.c:585
 msgid "Model column used to retrieve the text if using Pango markup"
-msgstr ""
-"Модель �толбца, и�пользуема� дл� получени� из нее тек�та, е�ли и�пользует�� "
-"разметка Pango"
+msgstr "Модель �толбца, и�пользуема� дл� получени� из нее тек�та, е�ли и�пользует�� разметка Pango"
 
-#: ../gtk/gtkiconview.c:594
+#: ../gtk/gtkiconview.c:592
 msgid "Icon View Model"
 msgstr "Модель Icon View"
 
-#: ../gtk/gtkiconview.c:595
+#: ../gtk/gtkiconview.c:593
 msgid "The model for the icon view"
 msgstr "Модель дл� про�мотра в виде значков"
 
-#: ../gtk/gtkiconview.c:611
+#: ../gtk/gtkiconview.c:609
 msgid "Number of columns"
 msgstr "Чи�ло �толбцов"
 
-#: ../gtk/gtkiconview.c:612
+#: ../gtk/gtkiconview.c:610
 msgid "Number of columns to display"
 msgstr "Количе�тво отображаемых �толбцов"
 
-#: ../gtk/gtkiconview.c:629
+#: ../gtk/gtkiconview.c:627
 msgid "Width for each item"
 msgstr "Виджет дл� каждого �лемента"
 
-#: ../gtk/gtkiconview.c:630
+#: ../gtk/gtkiconview.c:628
 msgid "The width used for each item"
 msgstr "Ширина, и�пользуема� дл� каждого �лемента"
 
-#: ../gtk/gtkiconview.c:646
+#: ../gtk/gtkiconview.c:644
 msgid "Space which is inserted between cells of an item"
 msgstr "Про�тран�тво, в�тавл�емое между �чейками �лемента"
 
-#: ../gtk/gtkiconview.c:661
+#: ../gtk/gtkiconview.c:659
 msgid "Row Spacing"
 msgstr "Меж�трочный интервал"
 
-#: ../gtk/gtkiconview.c:662
+#: ../gtk/gtkiconview.c:660
 msgid "Space which is inserted between grid rows"
 msgstr "Про�тран�тво, в�тавл�емое между �троками �етки"
 
-#: ../gtk/gtkiconview.c:677
+#: ../gtk/gtkiconview.c:675
 msgid "Column Spacing"
 msgstr "Интервал �толбцов"
 
-#: ../gtk/gtkiconview.c:678
+#: ../gtk/gtkiconview.c:676
 msgid "Space which is inserted between grid columns"
 msgstr "Про�тран�тво между �толбцами �етки"
 
-#: ../gtk/gtkiconview.c:693
+#: ../gtk/gtkiconview.c:691
 msgid "Margin"
 msgstr "Граница"
 
-#: ../gtk/gtkiconview.c:694
+#: ../gtk/gtkiconview.c:692
 msgid "Space which is inserted at the edges of the icon view"
-msgstr ""
-"Про�тран�тво, в�тавл�емое между углами значков в режиме про�мотра «значки»"
+msgstr "Про�тран�тво, в�тавл�емое между углами значков в режиме про�мотра «значки»"
 
-#: ../gtk/gtkiconview.c:709
+#: ../gtk/gtkiconview.c:707
 msgid "Item Orientation"
 msgstr "Ориентаци� �лемента"
 
-#: ../gtk/gtkiconview.c:710
-msgid ""
-"How the text and icon of each item are positioned relative to each other"
-msgstr ""
-"Как тек�т и значки каждого �лемента позиционируют�� отно�ительно друг друга"
+#: ../gtk/gtkiconview.c:708
+msgid "How the text and icon of each item are positioned relative to each other"
+msgstr "Как тек�т и значки каждого �лемента позиционируют�� отно�ительно друг друга"
 
-#: ../gtk/gtkiconview.c:726 ../gtk/gtktreeview.c:1022
-#: ../gtk/gtktreeviewcolumn.c:362
+#: ../gtk/gtkiconview.c:724
+#: ../gtk/gtktreeview.c:1022
+#: ../gtk/gtktreeviewcolumn.c:374
 msgid "Reorderable"
 msgstr "Пере�тавл�емые"
 
-#: ../gtk/gtkiconview.c:727 ../gtk/gtktreeview.c:1023
+#: ../gtk/gtkiconview.c:725
+#: ../gtk/gtktreeview.c:1023
 msgid "View is reorderable"
 msgstr "Элементы про�мотра можно перегруппировывать"
 
-#: ../gtk/gtkiconview.c:734 ../gtk/gtktreeview.c:1173
+#: ../gtk/gtkiconview.c:732
+#: ../gtk/gtktreeview.c:1173
 msgid "Tooltip Column"
 msgstr "Столбец в�плывающей под�казки"
 
-#: ../gtk/gtkiconview.c:735
+#: ../gtk/gtkiconview.c:733
 msgid "The column in the model containing the tooltip texts for the items"
-msgstr ""
-"Столбец в модели и�точника данных, �одержащий тек�т в�плывающей под�казки "
-"�лементов"
+msgstr "Столбец в модели и�точника данных, �одержащий тек�т в�плывающей под�казки �лементов"
 
-#: ../gtk/gtkiconview.c:752
+#: ../gtk/gtkiconview.c:750
 msgid "Item Padding"
 msgstr "Дополнени� �лемента"
 
-#: ../gtk/gtkiconview.c:753
+#: ../gtk/gtkiconview.c:751
 msgid "Padding around icon view items"
 msgstr "Дополнени� вокруг значков"
 
-#: ../gtk/gtkiconview.c:784
+#: ../gtk/gtkiconview.c:782
 msgid "Selection Box Color"
 msgstr "Цвет диалога выделени�"
 
-#: ../gtk/gtkiconview.c:785
+#: ../gtk/gtkiconview.c:783
 msgid "Color of the selection box"
 msgstr "Цвет диалога выделени�"
 
-#: ../gtk/gtkiconview.c:791
+#: ../gtk/gtkiconview.c:789
 msgid "Selection Box Alpha"
 msgstr "Прозрачно�ть диалога выделени�"
 
-#: ../gtk/gtkiconview.c:792
+#: ../gtk/gtkiconview.c:790
 msgid "Opacity of the selection box"
 msgstr "Прозрачно�ть диалога выделени�"
 
-#: ../gtk/gtkimage.c:236 ../gtk/gtkstatusicon.c:205
+#: ../gtk/gtkimage.c:237
+#: ../gtk/gtkstatusicon.c:235
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtk/gtkimage.c:237 ../gtk/gtkstatusicon.c:206
+#: ../gtk/gtkimage.c:238
+#: ../gtk/gtkstatusicon.c:236
 msgid "A GdkPixbuf to display"
 msgstr "Отображаемый GdkPixbuf"
 
-#: ../gtk/gtkimage.c:244 ../gtk/gtkrecentmanager.c:294
-#: ../gtk/gtkstatusicon.c:213
+#: ../gtk/gtkimage.c:245
+#: ../gtk/gtkrecentmanager.c:294
+#: ../gtk/gtkstatusicon.c:243
 msgid "Filename"
 msgstr "Им� файла"
 
-#: ../gtk/gtkimage.c:245 ../gtk/gtkstatusicon.c:214
+#: ../gtk/gtkimage.c:246
+#: ../gtk/gtkstatusicon.c:244
 msgid "Filename to load and display"
 msgstr "Им� файла дл� загрузки и отображени�"
 
-#: ../gtk/gtkimage.c:254 ../gtk/gtkstatusicon.c:222
+#: ../gtk/gtkimage.c:255
+#: ../gtk/gtkstatusicon.c:252
 msgid "Stock ID for a stock image to display"
 msgstr "Идентификатор (ID) в�троенного изображени� дл� отображени�"
 
-#: ../gtk/gtkimage.c:261
+#: ../gtk/gtkimage.c:262
 msgid "Icon set"
 msgstr "�абор значков"
 
-#: ../gtk/gtkimage.c:262
+#: ../gtk/gtkimage.c:263
 msgid "Icon set to display"
 msgstr "Отображаемый набор значков"
 
-#: ../gtk/gtkimage.c:269 ../gtk/gtkscalebutton.c:227 ../gtk/gtktoolbar.c:518
-#: ../gtk/gtktoolpalette.c:1039
+#: ../gtk/gtkimage.c:270
+#: ../gtk/gtkscalebutton.c:228
+#: ../gtk/gtktoolbar.c:530
+#: ../gtk/gtktoolpalette.c:1008
 msgid "Icon size"
 msgstr "Размер значка"
 
-#: ../gtk/gtkimage.c:270
+#: ../gtk/gtkimage.c:271
 msgid "Symbolic size to use for stock icon, icon set or named icon"
-msgstr ""
-"Символиче�кий размер дл� в�троенного значка, набора значков или именованного "
-"значка"
+msgstr "Символиче�кий размер дл� в�троенного значка, набора значков или именованного значка"
 
-#: ../gtk/gtkimage.c:286
+#: ../gtk/gtkimage.c:287
 msgid "Pixel size"
 msgstr "Размер в пик�елах"
 
-#: ../gtk/gtkimage.c:287
+#: ../gtk/gtkimage.c:288
 msgid "Pixel size to use for named icon"
 msgstr "Размер в пик�елах, и�пользуемый дл� именованного значка"
 
-#: ../gtk/gtkimage.c:295
+#: ../gtk/gtkimage.c:296
 msgid "Animation"
 msgstr "�нимаци�"
 
-#: ../gtk/gtkimage.c:296
+#: ../gtk/gtkimage.c:297
 msgid "GdkPixbufAnimation to display"
 msgstr "Объект GdkPixbufAnimation дл� отображени�"
 
-#: ../gtk/gtkimage.c:336 ../gtk/gtkstatusicon.c:253
+#: ../gtk/gtkimage.c:337
+#: ../gtk/gtkstatusicon.c:283
 msgid "Storage type"
 msgstr "Тип хранени�"
 
-#: ../gtk/gtkimage.c:337 ../gtk/gtkstatusicon.c:254
+#: ../gtk/gtkimage.c:338
+#: ../gtk/gtkstatusicon.c:284
 msgid "The representation being used for image data"
 msgstr "Пред�тавление, и�пользуемое дл� данных изображени�"
 
-#: ../gtk/gtkimage.c:355
+#: ../gtk/gtkimage.c:356
 msgid "Use Fallback"
 msgstr "И�пользовать запа�"
 
-#: ../gtk/gtkimage.c:356
+#: ../gtk/gtkimage.c:357
 msgid "Whether to use icon names fallback"
 msgstr "И�пользовать ли запа�ные имена значков"
 
-#: ../gtk/gtkimagemenuitem.c:150
+#: ../gtk/gtkimagemenuitem.c:161
 msgid "Child widget to appear next to the menu text"
 msgstr "Дочерний виджет, по�вл�ющий�� на �кране р�дом � тек�том меню"
 
-#: ../gtk/gtkimagemenuitem.c:165
+#: ../gtk/gtkimagemenuitem.c:176
 msgid "Whether to use the label text to create a stock menu item"
-msgstr ""
-"И�пользовать ли тек�т метки в�троенного значка при �оздании �лемента меню"
+msgstr "И�пользовать ли тек�т метки в�троенного значка при �оздании �лемента меню"
 
-#: ../gtk/gtkimagemenuitem.c:198 ../gtk/gtkmenu.c:601
+#: ../gtk/gtkimagemenuitem.c:209
+#: ../gtk/gtkmenu.c:603
 msgid "Accel Group"
 msgstr "Группа у�корителей"
 
-#: ../gtk/gtkimagemenuitem.c:199
+#: ../gtk/gtkimagemenuitem.c:210
 msgid "The Accel Group to use for stock accelerator keys"
 msgstr "Группа у�корителей дл� добавлени� бы�трых клавиш в�троенного значка"
 
-#: ../gtk/gtkinfobar.c:371 ../gtk/gtkmessagedialog.c:202
+#: ../gtk/gtkinfobar.c:372
+#: ../gtk/gtkmessagedialog.c:204
 msgid "Message Type"
 msgstr "Тип �ообщени�"
 
-#: ../gtk/gtkinfobar.c:372 ../gtk/gtkmessagedialog.c:203
+#: ../gtk/gtkinfobar.c:373
+#: ../gtk/gtkmessagedialog.c:205
 msgid "The type of message"
 msgstr "Тип �ообщени�"
 
-#: ../gtk/gtkinfobar.c:427
+#: ../gtk/gtkinfobar.c:428
 msgid "Width of border around the content area"
 msgstr "Ширина границы вокруг обла�ти �одержимого"
 
-#: ../gtk/gtkinfobar.c:444
+#: ../gtk/gtkinfobar.c:445
 msgid "Spacing between elements of the area"
 msgstr "Ра��то�ни� между �лементами обла�ти"
 
-#: ../gtk/gtkinfobar.c:476
+#: ../gtk/gtkinfobar.c:477
 msgid "Width of border around the action area"
 msgstr "Ширина границы вокруг обла�ти дей�твий"
 
-#: ../gtk/gtkinvisible.c:89 ../gtk/gtkmountoperation.c:175
-#: ../gtk/gtkstatusicon.c:272 ../gtk/gtkstylecontext.c:545
-#: ../gtk/gtkwindow.c:730
+#: ../gtk/gtkinvisible.c:103
+#: ../gtk/gtkmountoperation.c:173
+#: ../gtk/gtkstatusicon.c:302
+#: ../gtk/gtkstylecontext.c:432
+#: ../gtk/gtkwindow.c:765
 msgid "Screen"
 msgstr "Экран"
 
-#: ../gtk/gtkinvisible.c:90 ../gtk/gtkwindow.c:731
+#: ../gtk/gtkinvisible.c:104
+#: ../gtk/gtkwindow.c:766
 msgid "The screen where this window will be displayed"
 msgstr "Экран, на котором будет отображено окно"
 
-#: ../gtk/gtklabel.c:568
+#: ../gtk/gtklabel.c:730
 msgid "The text of the label"
 msgstr "Тек�т метки"
 
-#: ../gtk/gtklabel.c:575
+#: ../gtk/gtklabel.c:737
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "Спи�ок атрибутов �тил�, примен�емых к тек�ту метки"
 
-#: ../gtk/gtklabel.c:596 ../gtk/gtktexttag.c:353 ../gtk/gtktextview.c:701
+#: ../gtk/gtklabel.c:758
+#: ../gtk/gtktexttag.c:386
+#: ../gtk/gtktextview.c:703
 msgid "Justification"
 msgstr "Выравнивание"
 
-#: ../gtk/gtklabel.c:597
-msgid ""
-"The alignment of the lines in the text of the label relative to each other. "
-"This does NOT affect the alignment of the label within its allocation. See "
-"GtkMisc::xalign for that"
-msgstr ""
-"Выравнивание �трок тек�та метки отно�ительно друг друга.  �Е вли�ет на "
-"выравнивание метки внутри указанного дл� нее ме�та.  По �тому вопро�у �м. "
-"GtkMisc::xalign"
+#: ../gtk/gtklabel.c:759
+msgid "The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that"
+msgstr "Выравнивание �трок тек�та метки отно�ительно друг друга.  �Е вли�ет на выравнивание метки внутри указанного дл� нее ме�та.  По �тому вопро�у �м. GtkMisc::xalign"
 
-#: ../gtk/gtklabel.c:605
+#: ../gtk/gtklabel.c:767
 msgid "Pattern"
 msgstr "Шаблон"
 
-#: ../gtk/gtklabel.c:606
-msgid ""
-"A string with _ characters in positions correspond to characters in the text "
-"to underline"
-msgstr ""
-"Строка � �имволами _ , позици� которых �оответ�твует позиции �имволов, "
-"которые надо подчеркнуть в тек�те"
+#: ../gtk/gtklabel.c:768
+msgid "A string with _ characters in positions correspond to characters in the text to underline"
+msgstr "Строка � �имволами _ , позици� которых �оответ�твует позиции �имволов, которые надо подчеркнуть в тек�те"
 
-#: ../gtk/gtklabel.c:613
+#: ../gtk/gtklabel.c:775
 msgid "Line wrap"
 msgstr "Перено� �трок"
 
-#: ../gtk/gtklabel.c:614
+#: ../gtk/gtklabel.c:776
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "Е�ли у�тановлено, перено�ит �лишком длинные �троки тек�та"
 
-#: ../gtk/gtklabel.c:629
+#: ../gtk/gtklabel.c:791
 msgid "Line wrap mode"
 msgstr "Режим перено�а �трок"
 
-#: ../gtk/gtklabel.c:630
+#: ../gtk/gtklabel.c:792
 msgid "If wrap is set, controls how linewrapping is done"
-msgstr ""
-"Е�ли режим перено�а у�тановлен, контролирует, как производит�� разрыв �трок"
+msgstr "Е�ли режим перено�а у�тановлен, контролирует, как производит�� разрыв �трок"
 
-#: ../gtk/gtklabel.c:637
+#: ../gtk/gtklabel.c:799
 msgid "Selectable"
 msgstr "Выдел�емый"
 
-#: ../gtk/gtklabel.c:638
+#: ../gtk/gtklabel.c:800
 msgid "Whether the label text can be selected with the mouse"
 msgstr "Может ли тек�т метки быть выделен � помощью мыши"
 
-#: ../gtk/gtklabel.c:644
+#: ../gtk/gtklabel.c:806
 msgid "Mnemonic key"
 msgstr "Мнемониче�ка� клавиша"
 
-#: ../gtk/gtklabel.c:645
+#: ../gtk/gtklabel.c:807
 msgid "The mnemonic accelerator key for this label"
 msgstr "Мнемониче�ка� бы�тра� клавиша дл� �той метки"
 
-#: ../gtk/gtklabel.c:653
+#: ../gtk/gtklabel.c:815
 msgid "Mnemonic widget"
 msgstr "Мнемониче�кий виджет"
 
-#: ../gtk/gtklabel.c:654
+#: ../gtk/gtklabel.c:816
 msgid "The widget to be activated when the label's mnemonic key is pressed"
-msgstr ""
-"Виджет, который будет активизирован при нажатии мнемониче�кой клавиши метки"
+msgstr "Виджет, который будет активизирован при нажатии мнемониче�кой клавиши метки"
 
-#: ../gtk/gtklabel.c:700
-msgid ""
-"The preferred place to ellipsize the string, if the label does not have "
-"enough room to display the entire string"
-msgstr ""
-"Предпочтительное ме�то дл� �ллиптизации �троки, е�ли ме�та в метке "
-"недо�таточно дл� отображени� в�ей �троки."
+#: ../gtk/gtklabel.c:862
+msgid "The preferred place to ellipsize the string, if the label does not have enough room to display the entire string"
+msgstr "Предпочтительное ме�то дл� �ллиптизации �троки, е�ли ме�та в метке недо�таточно дл� отображени� в�ей �троки."
 
-#: ../gtk/gtklabel.c:741
+#: ../gtk/gtklabel.c:903
 msgid "Single Line Mode"
 msgstr "Режим одной �троки"
 
-#: ../gtk/gtklabel.c:742
+#: ../gtk/gtklabel.c:904
 msgid "Whether the label is in single line mode"
 msgstr "�аходит�� ли �рлык в режиме одной �троки"
 
-#: ../gtk/gtklabel.c:759
+#: ../gtk/gtklabel.c:921
 msgid "Angle"
 msgstr "Угол"
 
-#: ../gtk/gtklabel.c:760
+#: ../gtk/gtklabel.c:922
 msgid "Angle at which the label is rotated"
 msgstr "Угол, на который поворачивает�� �рлык"
 
-#: ../gtk/gtklabel.c:782
+#: ../gtk/gtklabel.c:944
 msgid "The desired maximum width of the label, in characters"
 msgstr "Желаема� мак�имальна� ширина �рлыка, в �имволах"
 
-#: ../gtk/gtklabel.c:800
+#: ../gtk/gtklabel.c:962
 msgid "Track visited links"
 msgstr "От�леживать по�ещенные ��ылки"
 
-#: ../gtk/gtklabel.c:801
+#: ../gtk/gtklabel.c:963
 msgid "Whether visited links should be tracked"
 msgstr "Должны ли от�леживать�� по�ещенные ��ылки"
 
@@ -3701,558 +3764,594 @@ msgstr "По�ещён"
 msgid "Whether this link has been visited."
 msgstr "Открывала�ь ли �та ��ылка ранее."
 
-#: ../gtk/gtkmenubar.c:181
+#: ../gtk/gtklockbutton.c:278
+msgid "Permission"
+msgstr "Права до�тупа"
+
+#: ../gtk/gtklockbutton.c:279
+msgid "The GPermission object controlling this button"
+msgstr "Объект GPermission, контролирующий �ту кнопку"
+
+#: ../gtk/gtklockbutton.c:286
+#| msgid "Text"
+msgid "Lock Text"
+msgstr "Заблокировать тек�т"
+
+#: ../gtk/gtklockbutton.c:287
+#| msgid "The text to display in order to demonstrate the selected font"
+msgid "The text to display when prompting the user to lock"
+msgstr "Тек�т, показываемый пользователю при блокировании"
+
+#: ../gtk/gtklockbutton.c:295
+msgid "Unlock Text"
+msgstr "Разблокировать тек�т"
+
+#: ../gtk/gtklockbutton.c:296
+#| msgid "The text to display in order to demonstrate the selected font"
+msgid "The text to display when prompting the user to unlock"
+msgstr "Тек�т, показываемый пользователю при разблокировании"
+
+#: ../gtk/gtklockbutton.c:304
+#| msgid "Tooltip"
+msgid "Lock Tooltip"
+msgstr "Заблокировать под�казку"
+
+#: ../gtk/gtklockbutton.c:305
+msgid "The tooltip to display when prompting the user to lock"
+msgstr "Под�казка, показываема� пользователю дл� блокировки"
+
+#: ../gtk/gtklockbutton.c:313
+#| msgid "Enable Tooltips"
+msgid "Unlock Tooltip"
+msgstr "Разблокировать под�казку"
+
+#: ../gtk/gtklockbutton.c:314
+msgid "The tooltip to display when prompting the user to unlock"
+msgstr "Под�казка, показываема� пользователю дл� разблокировки"
+
+#: ../gtk/gtklockbutton.c:322
+msgid "Not Authorized Tooltip"
+msgstr "Под�казка о недо�тупно�ти авторизации"
+
+#: ../gtk/gtklockbutton.c:323
+msgid "The tooltip to display when prompting the user cannot obtain authorization"
+msgstr "Под�казка, когда пользователь не может получить авторизацию"
+
+#: ../gtk/gtkmenubar.c:192
 msgid "Pack direction"
 msgstr "�аправление упаковки"
 
-#: ../gtk/gtkmenubar.c:182
+#: ../gtk/gtkmenubar.c:193
 msgid "The pack direction of the menubar"
 msgstr "�аправление упаковки меню"
 
-#: ../gtk/gtkmenubar.c:198
+#: ../gtk/gtkmenubar.c:209
 msgid "Child Pack direction"
 msgstr "�аправление упаковки дочернего меню"
 
-#: ../gtk/gtkmenubar.c:199
+#: ../gtk/gtkmenubar.c:210
 msgid "The child pack direction of the menubar"
 msgstr "�аправление упаковки дочернего меню"
 
-#: ../gtk/gtkmenubar.c:208
+#: ../gtk/gtkmenubar.c:219
 msgid "Style of bevel around the menubar"
 msgstr "Стиль �ко�а вокруг �троки меню"
 
-#: ../gtk/gtkmenubar.c:215 ../gtk/gtktoolbar.c:568
+#: ../gtk/gtkmenubar.c:226
+#: ../gtk/gtktoolbar.c:580
 msgid "Internal padding"
 msgstr "Внутреннее дополнение"
 
-#: ../gtk/gtkmenubar.c:216
+#: ../gtk/gtkmenubar.c:227
 msgid "Amount of border space between the menubar shadow and the menu items"
 msgstr "Про�тран�тво между тенью панели меню и �лементами меню"
 
-#: ../gtk/gtkmenu.c:587
+#: ../gtk/gtkmenu.c:589
 msgid "The currently selected menu item"
 msgstr "Текущий выбранный �лемент меню"
 
-#: ../gtk/gtkmenu.c:602
+#: ../gtk/gtkmenu.c:604
 msgid "The accel group holding accelerators for the menu"
 msgstr "Группа у�корителей, �одержаща� бы�трые клавиши дл� меню"
 
-#: ../gtk/gtkmenu.c:616 ../gtk/gtkmenuitem.c:313
+#: ../gtk/gtkmenu.c:618
+#: ../gtk/gtkmenuitem.c:368
 msgid "Accel Path"
 msgstr "Путь у�корител�"
 
-#: ../gtk/gtkmenu.c:617
+#: ../gtk/gtkmenu.c:619
 msgid "An accel path used to conveniently construct accel paths of child items"
-msgstr ""
-"Путь у�корител�, и�пользуемый дл� �оздани� пути у�корителей дочерних "
-"�лементов"
+msgstr "Путь у�корител�, и�пользуемый дл� �оздани� пути у�корителей дочерних �лементов"
 
-#: ../gtk/gtkmenu.c:633
+#: ../gtk/gtkmenu.c:635
 msgid "Attach Widget"
 msgstr "Под�оединённый виджет"
 
-#: ../gtk/gtkmenu.c:634
+#: ../gtk/gtkmenu.c:636
 msgid "The widget the menu is attached to"
 msgstr "Виджет, под�оединённый к �тому меню"
 
-#: ../gtk/gtkmenu.c:642
-msgid ""
-"A title that may be displayed by the window manager when this menu is torn-"
-"off"
-msgstr ""
-"Заголовок, который ди�петчер окон будет отображать дл� меню по�ле его "
-"отделени�"
+#: ../gtk/gtkmenu.c:644
+msgid "A title that may be displayed by the window manager when this menu is torn-off"
+msgstr "Заголовок, который ди�петчер окон будет отображать дл� меню по�ле его отделени�"
 
-#: ../gtk/gtkmenu.c:656
+#: ../gtk/gtkmenu.c:658
 msgid "Tearoff State"
 msgstr "Со�то�ние линии разрыва"
 
-#: ../gtk/gtkmenu.c:657
+#: ../gtk/gtkmenu.c:659
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "Булево значение, которое показывает, �вл�ет�� ли меню «отрывным»"
 
-#: ../gtk/gtkmenu.c:671
+#: ../gtk/gtkmenu.c:673
 msgid "Monitor"
 msgstr "Монитор"
 
-#: ../gtk/gtkmenu.c:672
+#: ../gtk/gtkmenu.c:674
 msgid "The monitor the menu will be popped up on"
 msgstr "Монитор, на котором �то меню будет отображено"
 
-#: ../gtk/gtkmenu.c:678
+#: ../gtk/gtkmenu.c:680
 msgid "Vertical Padding"
 msgstr "Вертикальное дополнение"
 
-#: ../gtk/gtkmenu.c:679
+#: ../gtk/gtkmenu.c:681
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Дополнительное про�тран�тво, добавл�емое к меню �верху и �низу"
 
-#: ../gtk/gtkmenu.c:701
+#: ../gtk/gtkmenu.c:703
 msgid "Reserve Toggle Size"
 msgstr "Зарезервировать размер переключени�"
 
-#: ../gtk/gtkmenu.c:702
-msgid ""
-"A boolean that indicates whether the menu reserves space for toggles and "
-"icons"
-msgstr ""
-"Булево значение, которое показывает, должно ли меню резервировать ме�то дл� "
-"переключателей и иконок"
+#: ../gtk/gtkmenu.c:704
+msgid "A boolean that indicates whether the menu reserves space for toggles and icons"
+msgstr "Булево значение, которое показывает, должно ли меню резервировать ме�то дл� переключателей и иконок"
 
-#: ../gtk/gtkmenu.c:708
+#: ../gtk/gtkmenu.c:710
 msgid "Horizontal Padding"
 msgstr "Горизонтальные дополнение"
 
-#: ../gtk/gtkmenu.c:709
+#: ../gtk/gtkmenu.c:711
 msgid "Extra space at the left and right edges of the menu"
 msgstr "Дополнительное про�тран�тво, добавл�емое к меню �права и �лева"
 
-#: ../gtk/gtkmenu.c:717
+#: ../gtk/gtkmenu.c:719
 msgid "Vertical Offset"
 msgstr "Вертикальный от�туп"
 
-#: ../gtk/gtkmenu.c:718
-msgid ""
-"When the menu is a submenu, position it this number of pixels offset "
-"vertically"
-msgstr ""
-"Когда меню �вл�ет�� подменю, оно ра�полагает�� �о �мещением по вертикали"
+#: ../gtk/gtkmenu.c:720
+msgid "When the menu is a submenu, position it this number of pixels offset vertically"
+msgstr "Когда меню �вл�ет�� подменю, оно ра�полагает�� �о �мещением по вертикали"
 
-#: ../gtk/gtkmenu.c:726
+#: ../gtk/gtkmenu.c:728
 msgid "Horizontal Offset"
 msgstr "Горизонтальный от�туп"
 
-#: ../gtk/gtkmenu.c:727
-msgid ""
-"When the menu is a submenu, position it this number of pixels offset "
-"horizontally"
-msgstr ""
-"Когда меню �вл�ет�� подменю, оно ра�полагает�� �о �мещением по горизонтали"
+#: ../gtk/gtkmenu.c:729
+msgid "When the menu is a submenu, position it this number of pixels offset horizontally"
+msgstr "Когда меню �вл�ет�� подменю, оно ра�полагает�� �о �мещением по горизонтали"
 
-#: ../gtk/gtkmenu.c:735
+#: ../gtk/gtkmenu.c:737
 msgid "Double Arrows"
 msgstr "Двойные �трелки"
 
-#: ../gtk/gtkmenu.c:736
+#: ../gtk/gtkmenu.c:738
 msgid "When scrolling, always show both arrows."
 msgstr "При прокрутке показывать обе �трелки."
 
-#: ../gtk/gtkmenu.c:749
+#: ../gtk/gtkmenu.c:751
 msgid "Arrow Placement"
 msgstr "Размещение �трелки"
 
-#: ../gtk/gtkmenu.c:750
+#: ../gtk/gtkmenu.c:752
 msgid "Indicates where scroll arrows should be placed"
 msgstr "Задаёт размещение �трелок прокрутки"
 
-#: ../gtk/gtkmenu.c:758
+#: ../gtk/gtkmenu.c:760
 msgid "Left Attach"
 msgstr "Прибавление �лева"
 
-#: ../gtk/gtkmenu.c:766
+#: ../gtk/gtkmenu.c:768
 msgid "Right Attach"
 msgstr "Прибавление �права"
 
-#: ../gtk/gtkmenu.c:767
+#: ../gtk/gtkmenu.c:769
 msgid "The column number to attach the right side of the child to"
 msgstr "Чи�ло �толбцов, прибавл�емых к правой �тороне дочернего �лемента"
 
-#: ../gtk/gtkmenu.c:774
+#: ../gtk/gtkmenu.c:776
 msgid "Top Attach"
 msgstr "Прибавление �верху"
 
-#: ../gtk/gtkmenu.c:775
+#: ../gtk/gtkmenu.c:777
 msgid "The row number to attach the top of the child to"
 msgstr "Чи�ло �трок, прибавл�емых к верхней �тороне дочернего �лемента"
 
-#: ../gtk/gtkmenu.c:782
+#: ../gtk/gtkmenu.c:784
 msgid "Bottom Attach"
 msgstr "Прибавление �низу"
 
-#: ../gtk/gtkmenu.c:783 ../gtk/gtktable.c:223
+#: ../gtk/gtkmenu.c:785
+#: ../gtk/gtktable.c:257
 msgid "The row number to attach the bottom of the child to"
 msgstr "Чи�ло �трок, прибавл�емых к нижней �тороне дочернего �лемента"
 
-#: ../gtk/gtkmenu.c:797
+#: ../gtk/gtkmenu.c:799
 msgid "Arbitrary constant to scale down the size of the scroll arrow"
 msgstr "Произвольное значение дл� уменьшени� размера �трелки прокрутки"
 
-#: ../gtk/gtkmenuitem.c:281
+#: ../gtk/gtkmenuitem.c:336
 msgid "Right Justified"
 msgstr "Выровнено по правому краю"
 
-#: ../gtk/gtkmenuitem.c:282
-msgid ""
-"Sets whether the menu item appears justified at the right side of a menu bar"
+#: ../gtk/gtkmenuitem.c:337
+msgid "Sets whether the menu item appears justified at the right side of a menu bar"
 msgstr "Выровнено ли меню по правому краю панели меню"
 
-#: ../gtk/gtkmenuitem.c:296
+#: ../gtk/gtkmenuitem.c:351
 msgid "Submenu"
 msgstr "Подменю"
 
-#: ../gtk/gtkmenuitem.c:297
+#: ../gtk/gtkmenuitem.c:352
 msgid "The submenu attached to the menu item, or NULL if it has none"
-msgstr ""
-"Подменю, при�оединённое к �тому пункту меню, или NULL, е�ли таковое "
-"от�ут�твует"
+msgstr "Подменю, при�оединённое к �тому пункту меню, или NULL, е�ли таковое от�ут�твует"
 
-#: ../gtk/gtkmenuitem.c:314
+#: ../gtk/gtkmenuitem.c:369
 msgid "Sets the accelerator path of the menu item"
 msgstr "Задаёт путь у�корител� дл� �лемента меню"
 
-#: ../gtk/gtkmenuitem.c:329
+#: ../gtk/gtkmenuitem.c:384
 msgid "The text for the child label"
 msgstr "Тек�т дл� дочерней метки"
 
-#: ../gtk/gtkmenuitem.c:392
+#: ../gtk/gtkmenuitem.c:447
 msgid "Amount of space used up by arrow, relative to the menu item's font size"
-msgstr ""
-"Про�тран�тво, занимаемое �трелкой, отно�ительно размера шрифта �лемента меню"
+msgstr "Про�тран�тво, занимаемое �трелкой, отно�ительно размера шрифта �лемента меню"
 
-#: ../gtk/gtkmenuitem.c:405
+#: ../gtk/gtkmenuitem.c:460
 msgid "Width in Characters"
 msgstr "Ширина в �имволах"
 
-#: ../gtk/gtkmenuitem.c:406
+#: ../gtk/gtkmenuitem.c:461
 msgid "The minimum desired width of the menu item in characters"
 msgstr "Минимальна� ширина �лемента меню, в �имволах"
 
-#: ../gtk/gtkmenushell.c:420
+#: ../gtk/gtkmenushell.c:421
 msgid "Take Focus"
 msgstr "Перехватывает фоку�"
 
-#: ../gtk/gtkmenushell.c:421
+#: ../gtk/gtkmenushell.c:422
 msgid "A boolean that determines whether the menu grabs the keyboard focus"
 msgstr "Булево значение, определ�ющее, перехватывает ли меню фоку� клавиатуры"
 
-#: ../gtk/gtkmenutoolbutton.c:257
+#: ../gtk/gtkmenutoolbutton.c:293
 msgid "Menu"
 msgstr "Меню"
 
-#: ../gtk/gtkmenutoolbutton.c:258
+#: ../gtk/gtkmenutoolbutton.c:294
 msgid "The dropdown menu"
 msgstr "Выпадающее меню"
 
-#: ../gtk/gtkmessagedialog.c:185
+#: ../gtk/gtkmessagedialog.c:187
 msgid "Image/label border"
 msgstr "Граница изображени�/метки"
 
-#: ../gtk/gtkmessagedialog.c:186
+#: ../gtk/gtkmessagedialog.c:188
 msgid "Width of border around the label and image in the message dialog"
 msgstr "Ширина от�тупа вокруг метки и изображени� в диалоге �ообщени�"
 
-#: ../gtk/gtkmessagedialog.c:210
+#: ../gtk/gtkmessagedialog.c:212
 msgid "Message Buttons"
 msgstr "Кнопки �ообщени�"
 
-#: ../gtk/gtkmessagedialog.c:211
+#: ../gtk/gtkmessagedialog.c:213
 msgid "The buttons shown in the message dialog"
 msgstr "Кнопки, отображаемые в диалоге �ообщени�"
 
-#: ../gtk/gtkmessagedialog.c:228
+#: ../gtk/gtkmessagedialog.c:230
 msgid "The primary text of the message dialog"
 msgstr "Главный тек�т диалога �ообщени�"
 
-#: ../gtk/gtkmessagedialog.c:243
+#: ../gtk/gtkmessagedialog.c:245
 msgid "Use Markup"
 msgstr "И�пользовать разметку"
 
-#: ../gtk/gtkmessagedialog.c:244
+#: ../gtk/gtkmessagedialog.c:246
 msgid "The primary text of the title includes Pango markup."
 msgstr "Главный тек�т диалога �ообщени� и�пользует разметку Pango."
 
-#: ../gtk/gtkmessagedialog.c:258
+#: ../gtk/gtkmessagedialog.c:260
 msgid "Secondary Text"
 msgstr "Вторичный тек�т"
 
-#: ../gtk/gtkmessagedialog.c:259
+#: ../gtk/gtkmessagedialog.c:261
 msgid "The secondary text of the message dialog"
 msgstr "Вторичный тек�т диалога �ообщени�"
 
-#: ../gtk/gtkmessagedialog.c:274
+#: ../gtk/gtkmessagedialog.c:276
 msgid "Use Markup in secondary"
 msgstr "И�пользовать разметку во вторичном"
 
-#: ../gtk/gtkmessagedialog.c:275
+#: ../gtk/gtkmessagedialog.c:277
 msgid "The secondary text includes Pango markup."
 msgstr "Вторичный тек�т диалога �ообщени� и�пользует разметку Pango."
 
-#: ../gtk/gtkmessagedialog.c:289
+#: ../gtk/gtkmessagedialog.c:291
 msgid "Image"
 msgstr "Изображение"
 
-#: ../gtk/gtkmessagedialog.c:290
+#: ../gtk/gtkmessagedialog.c:292
 msgid "The image"
 msgstr "Изображение"
 
-#: ../gtk/gtkmessagedialog.c:306
+#: ../gtk/gtkmessagedialog.c:308
 msgid "Message area"
 msgstr "Обла�ть �ообщени�"
 
-#: ../gtk/gtkmessagedialog.c:307
+#: ../gtk/gtkmessagedialog.c:309
 msgid "GtkVBox that holds the dialog's primary and secondary labels"
 msgstr "GtkVBox, в котором �одержат�� первична� и вторична� метки диалога"
 
-#: ../gtk/gtkmisc.c:91
+#: ../gtk/gtkmisc.c:115
 msgid "Y align"
 msgstr "Y-выравнивание"
 
-#: ../gtk/gtkmisc.c:92
+#: ../gtk/gtkmisc.c:116
 msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
 msgstr "Вертикальное выравнивание от 0 (вверх) до 1 (вниз)"
 
-#: ../gtk/gtkmisc.c:101
+#: ../gtk/gtkmisc.c:125
 msgid "X pad"
 msgstr "Заполнение по горизонтали"
 
-#: ../gtk/gtkmisc.c:102
-msgid ""
-"The amount of space to add on the left and right of the widget, in pixels"
+#: ../gtk/gtkmisc.c:126
+msgid "The amount of space to add on the left and right of the widget, in pixels"
 msgstr "Про�тран�тво, добавл�емое к виджету �лева и �права, в пик�ел�х"
 
-#: ../gtk/gtkmisc.c:111
+#: ../gtk/gtkmisc.c:135
 msgid "Y pad"
 msgstr "Заполнение по вертикали"
 
-#: ../gtk/gtkmisc.c:112
-msgid ""
-"The amount of space to add on the top and bottom of the widget, in pixels"
+#: ../gtk/gtkmisc.c:136
+msgid "The amount of space to add on the top and bottom of the widget, in pixels"
 msgstr "Про�тран�тво, добавл�емое к виджету �верху и �низу, в пик�ел�х"
 
-#: ../gtk/gtkmountoperation.c:159
+#: ../gtk/gtkmountoperation.c:157
 msgid "Parent"
 msgstr "Родитель"
 
-#: ../gtk/gtkmountoperation.c:160
+#: ../gtk/gtkmountoperation.c:158
 msgid "The parent window"
 msgstr "Родитель�кое окно"
 
-#: ../gtk/gtkmountoperation.c:167
+#: ../gtk/gtkmountoperation.c:165
 msgid "Is Showing"
 msgstr "Диалог отображён"
 
-#: ../gtk/gtkmountoperation.c:168
+#: ../gtk/gtkmountoperation.c:166
 msgid "Are we showing a dialog"
 msgstr "Отображать ли диалог"
 
-#: ../gtk/gtkmountoperation.c:176
+#: ../gtk/gtkmountoperation.c:174
 msgid "The screen where this window will be displayed."
 msgstr "Экран, на котором будет отображено �то окно."
 
-#: ../gtk/gtknotebook.c:685
+#: ../gtk/gtknotebook.c:694
 msgid "Page"
 msgstr "Страница"
 
-#: ../gtk/gtknotebook.c:686
+#: ../gtk/gtknotebook.c:695
 msgid "The index of the current page"
 msgstr "Индек� текущей �траницы"
 
-#: ../gtk/gtknotebook.c:694
+#: ../gtk/gtknotebook.c:703
 msgid "Tab Position"
 msgstr "Размещение вкладки"
 
-#: ../gtk/gtknotebook.c:695
+#: ../gtk/gtknotebook.c:704
 msgid "Which side of the notebook holds the tabs"
 msgstr "�а какой �тороне блокнота помещают�� вкладки"
 
-#: ../gtk/gtknotebook.c:702
+#: ../gtk/gtknotebook.c:711
 msgid "Show Tabs"
 msgstr "Показать вкладки"
 
-#: ../gtk/gtknotebook.c:703
+#: ../gtk/gtknotebook.c:712
 msgid "Whether tabs should be shown"
 msgstr "Показывать ли вкладки"
 
-#: ../gtk/gtknotebook.c:709
+#: ../gtk/gtknotebook.c:718
 msgid "Show Border"
 msgstr "Показывать границу"
 
-#: ../gtk/gtknotebook.c:710
+#: ../gtk/gtknotebook.c:719
 msgid "Whether the border should be shown"
 msgstr "Будет ли отображать�� граница"
 
-#: ../gtk/gtknotebook.c:716
+#: ../gtk/gtknotebook.c:725
 msgid "Scrollable"
 msgstr "Прокручиваемый"
 
-#: ../gtk/gtknotebook.c:717
+#: ../gtk/gtknotebook.c:726
 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
-msgstr ""
-"Е�ли у�тановлено, то �трелки прокрутки будут добавлены, е�ли е�ть �лишком "
-"много вкладок, чтобы поме�тить�� в окне"
+msgstr "Е�ли у�тановлено, то �трелки прокрутки будут добавлены, е�ли е�ть �лишком много вкладок, чтобы поме�тить�� в окне"
 
-#: ../gtk/gtknotebook.c:723
+#: ../gtk/gtknotebook.c:732
 msgid "Enable Popup"
 msgstr "Включить в�плывающие меню"
 
-#: ../gtk/gtknotebook.c:724
-msgid ""
-"If TRUE, pressing the right mouse button on the notebook pops up a menu that "
-"you can use to go to a page"
-msgstr ""
-"Е�ли у�тановлено, то при нажатии правой клавиши мыши в обла�ти блокнота "
-"по�вит�� в�плывающее меню, которое можно и�пользовать дл� перемещени� по "
-"�траницам"
+#: ../gtk/gtknotebook.c:733
+msgid "If TRUE, pressing the right mouse button on the notebook pops up a menu that you can use to go to a page"
+msgstr "Е�ли у�тановлено, то при нажатии правой клавиши мыши в обла�ти блокнота по�вит�� в�плывающее меню, которое можно и�пользовать дл� перемещени� по �траницам"
 
-#: ../gtk/gtknotebook.c:738
+#: ../gtk/gtknotebook.c:747
 msgid "Group Name"
 msgstr "Им� группы"
 
-#: ../gtk/gtknotebook.c:739
+#: ../gtk/gtknotebook.c:748
 msgid "Group name for tab drag and drop"
 msgstr "Им� группы дл� от�оединени� и перено�а вкладки"
 
-#: ../gtk/gtknotebook.c:746
+#: ../gtk/gtknotebook.c:755
 msgid "Tab label"
 msgstr "Метка вкладки"
 
-#: ../gtk/gtknotebook.c:747
+#: ../gtk/gtknotebook.c:756
 msgid "The string displayed on the child's tab label"
 msgstr "Строка, отображаема� на метке вкладки дочернего �лемента"
 
-#: ../gtk/gtknotebook.c:753
+#: ../gtk/gtknotebook.c:762
 msgid "Menu label"
 msgstr "Метка меню"
 
-#: ../gtk/gtknotebook.c:754
+#: ../gtk/gtknotebook.c:763
 msgid "The string displayed in the child's menu entry"
 msgstr "Строка, отображаема� в пункте меню вкладки дочернего �лемента"
 
-#: ../gtk/gtknotebook.c:767
+#: ../gtk/gtknotebook.c:776
 msgid "Tab expand"
 msgstr "Ра�ширение вкладок"
 
-#: ../gtk/gtknotebook.c:768
+#: ../gtk/gtknotebook.c:777
 msgid "Whether to expand the child's tab"
 msgstr "Ра�шир�ет�� ли дочерн�� вкладка"
 
-#: ../gtk/gtknotebook.c:774
+#: ../gtk/gtknotebook.c:783
 msgid "Tab fill"
 msgstr "Заполнение вкладок"
 
-#: ../gtk/gtknotebook.c:775
+#: ../gtk/gtknotebook.c:784
 msgid "Whether the child's tab should fill the allocated area"
 msgstr "Заполн�ет ли дочерн�� вкладка в�ю выделенную обла�ть"
 
-#: ../gtk/gtknotebook.c:782
+#: ../gtk/gtknotebook.c:791
 msgid "Tab reorderable"
 msgstr "Пере�тавл�емые вкладки"
 
-#: ../gtk/gtknotebook.c:783
+#: ../gtk/gtknotebook.c:792
 msgid "Whether the tab is reorderable by user action"
 msgstr "Может ли пользователь пере�тавл�ть вкладки"
 
-#: ../gtk/gtknotebook.c:789
+#: ../gtk/gtknotebook.c:798
 msgid "Tab detachable"
 msgstr "Отдел�емые вкладки"
 
-#: ../gtk/gtknotebook.c:790
+#: ../gtk/gtknotebook.c:799
 msgid "Whether the tab is detachable"
 msgstr "Можно ли отделить вкладку"
 
-#: ../gtk/gtknotebook.c:805 ../gtk/gtkscrollbar.c:102
+#: ../gtk/gtknotebook.c:814
+#: ../gtk/gtkscrollbar.c:102
 msgid "Secondary backward stepper"
 msgstr "Дополнительна� кнопка перемещени� назад"
 
-#: ../gtk/gtknotebook.c:806
-msgid ""
-"Display a second backward arrow button on the opposite end of the tab area"
-msgstr ""
-"Отображать вторую кнопку �о �трелкой назад на противоположной �тороне поло�ы "
-"вкладок"
+#: ../gtk/gtknotebook.c:815
+msgid "Display a second backward arrow button on the opposite end of the tab area"
+msgstr "Отображать вторую кнопку �о �трелкой назад на противоположной �тороне поло�ы вкладок"
 
-#: ../gtk/gtknotebook.c:821 ../gtk/gtkscrollbar.c:109
+#: ../gtk/gtknotebook.c:830
+#: ../gtk/gtkscrollbar.c:109
 msgid "Secondary forward stepper"
 msgstr "Дополнительна� кнопка перемещени� вперёд"
 
-#: ../gtk/gtknotebook.c:822
-msgid ""
-"Display a second forward arrow button on the opposite end of the tab area"
-msgstr ""
-"Отображать вторую кнопку �о �трелкой вперёд на противоположной �тороне "
-"поло�ы вкладок"
+#: ../gtk/gtknotebook.c:831
+msgid "Display a second forward arrow button on the opposite end of the tab area"
+msgstr "Отображать вторую кнопку �о �трелкой вперёд на противоположной �тороне поло�ы вкладок"
 
-#: ../gtk/gtknotebook.c:836 ../gtk/gtkscrollbar.c:88
+#: ../gtk/gtknotebook.c:845
+#: ../gtk/gtkscrollbar.c:88
 msgid "Backward stepper"
 msgstr "Кнопка перемещени� назад"
 
-#: ../gtk/gtknotebook.c:837 ../gtk/gtkscrollbar.c:89
+#: ../gtk/gtknotebook.c:846
+#: ../gtk/gtkscrollbar.c:89
 msgid "Display the standard backward arrow button"
 msgstr "Отображать �тандартную кнопку �о �трелкой назад"
 
-#: ../gtk/gtknotebook.c:851 ../gtk/gtkscrollbar.c:95
+#: ../gtk/gtknotebook.c:860
+#: ../gtk/gtkscrollbar.c:95
 msgid "Forward stepper"
 msgstr "Кнопка перемещени� вперёд"
 
-#: ../gtk/gtknotebook.c:852 ../gtk/gtkscrollbar.c:96
+#: ../gtk/gtknotebook.c:861
+#: ../gtk/gtkscrollbar.c:96
 msgid "Display the standard forward arrow button"
 msgstr "Отображать �тандартную кнопку �о �трелкой вперёд"
 
-#: ../gtk/gtknotebook.c:866
+#: ../gtk/gtknotebook.c:875
 msgid "Tab overlap"
 msgstr "Перекрытие вкладок"
 
-#: ../gtk/gtknotebook.c:867
+#: ../gtk/gtknotebook.c:876
 msgid "Size of tab overlap area"
 msgstr "Размер обла�ти перекрыти� вкладок"
 
-#: ../gtk/gtknotebook.c:882
+#: ../gtk/gtknotebook.c:891
 msgid "Tab curvature"
 msgstr "Сглаживание вкладки"
 
-#: ../gtk/gtknotebook.c:883
+#: ../gtk/gtknotebook.c:892
 msgid "Size of tab curvature"
 msgstr "Размер �глаживани� вкладки"
 
-#: ../gtk/gtknotebook.c:899
+#: ../gtk/gtknotebook.c:908
 msgid "Arrow spacing"
 msgstr "Про�тран�тво вокруг �трелки"
 
-#: ../gtk/gtknotebook.c:900
+#: ../gtk/gtknotebook.c:909
 msgid "Scroll arrow spacing"
 msgstr "Про�тран�тво вокруг �трелки прокрутки"
 
-#: ../gtk/gtknumerableicon.c:652
+#: ../gtk/gtknotebook.c:925
+msgid "Initial gap"
+msgstr "От�туп"
+
+#: ../gtk/gtknotebook.c:926
+msgid "Initial gap before the first tab"
+msgstr "От�туп от первой вкладки"
+
+#: ../gtk/gtknumerableicon.c:653
 msgid "Icon's count"
 msgstr "Счётчик значков"
 
-#: ../gtk/gtknumerableicon.c:653
+#: ../gtk/gtknumerableicon.c:654
 msgid "The count of the emblem currently displayed"
 msgstr "Счётчик отображаемых в данный момент значков"
 
-#: ../gtk/gtknumerableicon.c:659
+#: ../gtk/gtknumerableicon.c:660
 msgid "Icon's label"
 msgstr "Ярлык значка"
 
-#: ../gtk/gtknumerableicon.c:660
+#: ../gtk/gtknumerableicon.c:661
 msgid "The label to be displayed over the icon"
 msgstr "�ад значком будет показан �рлык"
 
-#: ../gtk/gtknumerableicon.c:666
+#: ../gtk/gtknumerableicon.c:667
 msgid "Icon's style context"
 msgstr "Контек�т �тил� значка"
 
-#: ../gtk/gtknumerableicon.c:667
+#: ../gtk/gtknumerableicon.c:668
 msgid "The style context to theme the icon appearance"
 msgstr "Контек�т �тил� темы показа значка"
 
-#: ../gtk/gtknumerableicon.c:673
+#: ../gtk/gtknumerableicon.c:674
 msgid "Background icon"
 msgstr "Фоновый значок"
 
-#: ../gtk/gtknumerableicon.c:674
+#: ../gtk/gtknumerableicon.c:675
 msgid "The icon for the number emblem background"
 msgstr "Значок, отображающий в фоне количе�тво значков"
 
-#: ../gtk/gtknumerableicon.c:680
+#: ../gtk/gtknumerableicon.c:681
 msgid "Background icon name"
 msgstr "Им� фонового значка"
 
-#: ../gtk/gtknumerableicon.c:681
+#: ../gtk/gtknumerableicon.c:682
 msgid "The icon name for the number emblem background"
 msgstr "Им� значка, отображающего в фоне количе�тво значков"
 
-#: ../gtk/gtkorientable.c:63 ../gtk/gtkstatusicon.c:312
+#: ../gtk/gtkorientable.c:63
+#: ../gtk/gtkstatusicon.c:342
 #: ../gtk/gtktrayicon-x11.c:128
 msgid "Orientation"
 msgstr "Ориентаци�"
@@ -4261,77 +4360,72 @@ msgstr "Ориентаци�"
 msgid "The orientation of the orientable"
 msgstr "Ориентаци� �лемента"
 
-#: ../gtk/gtkpaned.c:327
-msgid ""
-"Position of paned separator in pixels (0 means all the way to the left/top)"
-msgstr ""
-"Позици� разделител� в пик�ел�х (0 означает в�е про�тран�тво до левого "
-"верхнего угла)"
+#: ../gtk/gtkpaned.c:350
+msgid "Position of paned separator in pixels (0 means all the way to the left/top)"
+msgstr "Позици� разделител� в пик�ел�х (0 означает в�е про�тран�тво до левого верхнего угла)"
 
-#: ../gtk/gtkpaned.c:336
+#: ../gtk/gtkpaned.c:359
 msgid "Position Set"
 msgstr "Задавать положение"
 
-#: ../gtk/gtkpaned.c:337
+#: ../gtk/gtkpaned.c:360
 msgid "TRUE if the Position property should be used"
 msgstr "Е�ли у�тановлено, то будет и�пользовать�� параметр «Position»"
 
-#: ../gtk/gtkpaned.c:343
+#: ../gtk/gtkpaned.c:366
 msgid "Handle Size"
 msgstr "Размер �лемента"
 
-#: ../gtk/gtkpaned.c:344
+#: ../gtk/gtkpaned.c:367
 msgid "Width of handle"
 msgstr "Ширина �лемента"
 
-#: ../gtk/gtkpaned.c:360
+#: ../gtk/gtkpaned.c:383
 msgid "Minimal Position"
 msgstr "Минимальна� позици�"
 
-#: ../gtk/gtkpaned.c:361
+#: ../gtk/gtkpaned.c:384
 msgid "Smallest possible value for the \"position\" property"
 msgstr "�аименьшее возможное значение дл� параметра «position»"
 
-#: ../gtk/gtkpaned.c:378
+#: ../gtk/gtkpaned.c:401
 msgid "Maximal Position"
 msgstr "Мак�имальна� позици�"
 
-#: ../gtk/gtkpaned.c:379
+#: ../gtk/gtkpaned.c:402
 msgid "Largest possible value for the \"position\" property"
 msgstr "�аибольшее возможное значение дл� параметра «position»"
 
-#: ../gtk/gtkpaned.c:396
+#: ../gtk/gtkpaned.c:419
 msgid "Resize"
 msgstr "Измен�емый"
 
-#: ../gtk/gtkpaned.c:397
+#: ../gtk/gtkpaned.c:420
 msgid "If TRUE, the child expands and shrinks along with the paned widget"
-msgstr ""
-"Е�ли у�тановлено, то дочерний �лемент измен�ет размеры вме�те � родитель�ким"
+msgstr "Е�ли у�тановлено, то дочерний �лемент измен�ет размеры вме�те � родитель�ким"
 
-#: ../gtk/gtkpaned.c:412
+#: ../gtk/gtkpaned.c:435
 msgid "Shrink"
 msgstr "Сжимаемый"
 
-#: ../gtk/gtkpaned.c:413
+#: ../gtk/gtkpaned.c:436
 msgid "If TRUE, the child can be made smaller than its requisition"
-msgstr ""
-"Е�ли у�тановлено, то дочерний �лемент может быть �жат отно�ительно "
-"запрошенных размеров"
+msgstr "Е�ли у�тановлено, то дочерний �лемент может быть �жат отно�ительно запрошенных размеров"
 
-#: ../gtk/gtkplug.c:201 ../gtk/gtkstatusicon.c:296
+#: ../gtk/gtkplug.c:203
+#: ../gtk/gtkstatusicon.c:326
 msgid "Embedded"
 msgstr "В�троено"
 
-#: ../gtk/gtkplug.c:202
+#: ../gtk/gtkplug.c:204
 msgid "Whether the plug is embedded"
 msgstr "В�троено ли окно в родитель�кий виджет"
 
-#: ../gtk/gtkplug.c:216
+#: ../gtk/gtkplug.c:218
 msgid "Socket Window"
 msgstr "Удалённое окно"
 
-#: ../gtk/gtkplug.c:217
+#: ../gtk/gtkplug.c:219
 msgid "The window of the socket the plug is embedded in"
 msgstr "Удалённое окно, в которое в�троен �тот виджет"
 
@@ -4415,11 +4509,21 @@ msgstr "Принимает задани�"
 msgid "TRUE if this printer is accepting new jobs"
 msgstr "У�тановлено, е�ли принтер принимает новые задани�"
 
-#: ../gtk/gtkprinteroptionwidget.c:121
+#: ../gtk/gtkprinteroption.c:105
+#| msgid "Minimum Value"
+msgid "Option Value"
+msgstr "Значение параметра"
+
+#: ../gtk/gtkprinteroption.c:106
+#| msgid "Name of the printer"
+msgid "Value of the option"
+msgstr "Значение параметра"
+
+#: ../gtk/gtkprinteroptionwidget.c:122
 msgid "Source option"
 msgstr "Параметры принтера"
 
-#: ../gtk/gtkprinteroptionwidget.c:122
+#: ../gtk/gtkprinteroptionwidget.c:123
 msgid "The PrinterOption backing this widget"
 msgstr "Объект PrinterOption, отно��щий�� к �тому �лементу"
 
@@ -4443,22 +4547,20 @@ msgstr "�а�тройки"
 msgid "Printer settings"
 msgstr "�а�тройки принтера"
 
-#: ../gtk/gtkprintjob.c:168 ../gtk/gtkprintjob.c:169
-#: ../gtk/gtkprintunixdialog.c:298
+#: ../gtk/gtkprintjob.c:168
+#: ../gtk/gtkprintjob.c:169
+#: ../gtk/gtkprintunixdialog.c:368
 msgid "Page Setup"
 msgstr "�а�тройки �траницы"
 
-#: ../gtk/gtkprintjob.c:177 ../gtk/gtkprintoperation.c:1206
+#: ../gtk/gtkprintjob.c:177
+#: ../gtk/gtkprintoperation.c:1206
 msgid "Track Print Status"
 msgstr "Следить за �о�то�нием принтера"
 
 #: ../gtk/gtkprintjob.c:178
-msgid ""
-"TRUE if the print job will continue to emit status-changed signals after the "
-"print data has been sent to the printer or print server."
-msgstr ""
-"У�тановлено, е�ли �та задача будет порождать �игнал «status-changed» при "
-"от�ылке данных на принтер или �ервер печати."
+msgid "TRUE if the print job will continue to emit status-changed signals after the print data has been sent to the printer or print server."
+msgstr "У�тановлено, е�ли �та задача будет порождать �игнал «status-changed» при от�ылке данных на принтер или �ервер печати."
 
 #: ../gtk/gtkprintoperation.c:1078
 msgid "Default Page Setup"
@@ -4468,11 +4570,13 @@ msgstr "�а�тройки �траницы по умолчанию"
 msgid "The GtkPageSetup used by default"
 msgstr "Объект GtkPageSetup и�пользуемый по умолчанию"
 
-#: ../gtk/gtkprintoperation.c:1097 ../gtk/gtkprintunixdialog.c:316
+#: ../gtk/gtkprintoperation.c:1097
+#: ../gtk/gtkprintunixdialog.c:386
 msgid "Print Settings"
 msgstr "�а�тройки печати"
 
-#: ../gtk/gtkprintoperation.c:1098 ../gtk/gtkprintunixdialog.c:317
+#: ../gtk/gtkprintoperation.c:1098
+#: ../gtk/gtkprintunixdialog.c:387
 msgid "The GtkPrintSettings used for initializing the dialog"
 msgstr "Объект GtkPrintSettings, и�пользуемый дл� инициализации диалога"
 
@@ -4492,11 +4596,13 @@ msgstr "Чи�ло �траниц"
 msgid "The number of pages in the document."
 msgstr "Чи�ло �траниц в документе."
 
-#: ../gtk/gtkprintoperation.c:1163 ../gtk/gtkprintunixdialog.c:306
+#: ../gtk/gtkprintoperation.c:1163
+#: ../gtk/gtkprintunixdialog.c:376
 msgid "Current Page"
 msgstr "Текуща� �траница"
 
-#: ../gtk/gtkprintoperation.c:1164 ../gtk/gtkprintunixdialog.c:307
+#: ../gtk/gtkprintoperation.c:1164
+#: ../gtk/gtkprintunixdialog.c:377
 msgid "The current page in the document"
 msgstr "Текуща� �траница документа"
 
@@ -4505,20 +4611,12 @@ msgid "Use full page"
 msgstr "И�пользовать �траницу целиком"
 
 #: ../gtk/gtkprintoperation.c:1186
-msgid ""
-"TRUE if the origin of the context should be at the corner of the page and "
-"not the corner of the imageable area"
-msgstr ""
-"У�тановлено, е�ли угол печатаемых данных должен ра�полагать�� в вершине "
-"�траницы, а не в вершине отображаемой обла�ти"
+msgid "TRUE if the origin of the context should be at the corner of the page and not the corner of the imageable area"
+msgstr "У�тановлено, е�ли угол печатаемых данных должен ра�полагать�� в вершине �траницы, а не в вершине отображаемой обла�ти"
 
 #: ../gtk/gtkprintoperation.c:1207
-msgid ""
-"TRUE if the print operation will continue to report on the print job status "
-"after the print data has been sent to the printer or print server."
-msgstr ""
-"У�тановлено, е�ли задача печати будет �ообщать о �воем �о�то�нии даже по�ле "
-"того, как данные будут ото�ланы на принтер или �ервер печати."
+msgid "TRUE if the print operation will continue to report on the print job status after the print data has been sent to the printer or print server."
+msgstr "У�тановлено, е�ли задача печати будет �ообщать о �воем �о�то�нии даже по�ле того, как данные будут ото�ланы на принтер или �ервер печати."
 
 #: ../gtk/gtkprintoperation.c:1224
 msgid "Unit"
@@ -4534,8 +4632,7 @@ msgstr "Показать диалог"
 
 #: ../gtk/gtkprintoperation.c:1243
 msgid "TRUE if a progress dialog is shown while printing."
-msgstr ""
-"У�тановлено, е�ли во врем� печати показывает�� диалог текущего �о�то�ни�."
+msgstr "У�тановлено, е�ли во врем� печати показывает�� диалог текущего �о�то�ни�."
 
 #: ../gtk/gtkprintoperation.c:1266
 msgid "Allow Async"
@@ -4545,7 +4642,8 @@ msgstr "Разрешить а�инхронно"
 msgid "TRUE if print process may run asynchronous."
 msgstr "У�тановлено, е�ли проце�� печати может прои�ходить а�инхронно."
 
-#: ../gtk/gtkprintoperation.c:1289 ../gtk/gtkprintoperation.c:1290
+#: ../gtk/gtkprintoperation.c:1289
+#: ../gtk/gtkprintoperation.c:1290
 msgid "Export filename"
 msgstr "Файл"
 
@@ -4573,7 +4671,8 @@ msgstr "�а�траиваема� метка вкладки"
 msgid "Label for the tab containing custom widgets."
 msgstr "Метка дл� вкладки, �одержащей дополнительные �лементы."
 
-#: ../gtk/gtkprintoperation.c:1360 ../gtk/gtkprintunixdialog.c:341
+#: ../gtk/gtkprintoperation.c:1360
+#: ../gtk/gtkprintunixdialog.c:411
 msgid "Support Selection"
 msgstr "Выбор поддержки"
 
@@ -4581,7 +4680,8 @@ msgstr "Выбор поддержки"
 msgid "TRUE if the print operation will support print of selection."
 msgstr "У�тановлено, е�ли операци� печати будет поддерживать печать выделени�."
 
-#: ../gtk/gtkprintoperation.c:1377 ../gtk/gtkprintunixdialog.c:349
+#: ../gtk/gtkprintoperation.c:1377
+#: ../gtk/gtkprintunixdialog.c:419
 msgid "Has Selection"
 msgstr "Имеет выделение"
 
@@ -4589,14 +4689,14 @@ msgstr "Имеет выделение"
 msgid "TRUE if a selection exists."
 msgstr "У�тановлено, е�ли выделение �уще�твует."
 
-#: ../gtk/gtkprintoperation.c:1393 ../gtk/gtkprintunixdialog.c:357
+#: ../gtk/gtkprintoperation.c:1393
+#: ../gtk/gtkprintunixdialog.c:427
 msgid "Embed Page Setup"
 msgstr "В�троить на�тройку �траницы"
 
 #: ../gtk/gtkprintoperation.c:1394
 msgid "TRUE if page setup combos are embedded in GtkPrintDialog"
-msgstr ""
-"У�тановлено, е�ли комбинации на�тройки �траницы в�троены в GtkPrintDialog"
+msgstr "У�тановлено, е�ли комбинации на�тройки �траницы в�троены в GtkPrintDialog"
 
 #: ../gtk/gtkprintoperation.c:1415
 msgid "Number of Pages To Print"
@@ -4606,122 +4706,115 @@ msgstr "Чи�ло �траниц дл� печати"
 msgid "The number of pages that will be printed."
 msgstr "Чи�ло �траниц, которые будут ра�печатаны."
 
-#: ../gtk/gtkprintunixdialog.c:299
+#: ../gtk/gtkprintunixdialog.c:369
 msgid "The GtkPageSetup to use"
 msgstr "И�пользуемый объект GtkPageSetup"
 
-#: ../gtk/gtkprintunixdialog.c:324
+#: ../gtk/gtkprintunixdialog.c:394
 msgid "Selected Printer"
 msgstr "Выбранный принтер"
 
-#: ../gtk/gtkprintunixdialog.c:325
+#: ../gtk/gtkprintunixdialog.c:395
 msgid "The GtkPrinter which is selected"
 msgstr "Выбранный объект GtkPrinter"
 
-#: ../gtk/gtkprintunixdialog.c:332
+#: ../gtk/gtkprintunixdialog.c:402
 msgid "Manual Capabilities"
 msgstr "�еавтоматизированные возможно�ти"
 
-#: ../gtk/gtkprintunixdialog.c:333
+#: ../gtk/gtkprintunixdialog.c:403
 msgid "Capabilities the application can handle"
 msgstr "Возможно�ти, � которыми приложение может обращать��"
 
-#: ../gtk/gtkprintunixdialog.c:342
+#: ../gtk/gtkprintunixdialog.c:412
 msgid "Whether the dialog supports selection"
 msgstr "Поддерживает ли диалог выделение"
 
-#: ../gtk/gtkprintunixdialog.c:350
+#: ../gtk/gtkprintunixdialog.c:420
 msgid "Whether the application has a selection"
 msgstr "Имеет ли приложение выделение"
 
-#: ../gtk/gtkprintunixdialog.c:358
+#: ../gtk/gtkprintunixdialog.c:428
 msgid "TRUE if page setup combos are embedded in GtkPrintUnixDialog"
-msgstr ""
-"У�тановлено, е�ли комбинации на�тройки �траницы в�троены в GtkPrintUnixDialog"
+msgstr "У�тановлено, е�ли комбинации на�тройки �траницы в�троены в GtkPrintUnixDialog"
 
-#: ../gtk/gtkprogressbar.c:161
+#: ../gtk/gtkprogressbar.c:160
 msgid "Fraction"
 msgstr "Процент выполнени�"
 
-#: ../gtk/gtkprogressbar.c:162
+#: ../gtk/gtkprogressbar.c:161
 msgid "The fraction of total work that has been completed"
 msgstr "Выполненна� ча�ть работы"
 
-#: ../gtk/gtkprogressbar.c:169
+#: ../gtk/gtkprogressbar.c:168
 msgid "Pulse Step"
 msgstr "Шаг пуль�ации"
 
-#: ../gtk/gtkprogressbar.c:170
+#: ../gtk/gtkprogressbar.c:169
 msgid "The fraction of total progress to move the bouncing block when pulsed"
-msgstr ""
-"Дол� общего объема работы, при выполнении которой прои�ходит приращение "
-"индикатора проце��а"
+msgstr "Дол� общего объема работы, при выполнении которой прои�ходит приращение индикатора проце��а"
 
-#: ../gtk/gtkprogressbar.c:178
+#: ../gtk/gtkprogressbar.c:177
 msgid "Text to be displayed in the progress bar"
 msgstr "Тек�т, отображаемый в индикаторе выполнени�"
 
-#: ../gtk/gtkprogressbar.c:195
+#: ../gtk/gtkprogressbar.c:198
 msgid "Show text"
 msgstr "Показывать тек�т"
 
-#: ../gtk/gtkprogressbar.c:196
+#: ../gtk/gtkprogressbar.c:199
 msgid "Whether the progress is shown as text."
 msgstr "Будет ли ход выполнени� проце��а отображать�� в виде тек�та"
 
-#: ../gtk/gtkprogressbar.c:218
-msgid ""
-"The preferred place to ellipsize the string, if the progress bar does not "
-"have enough room to display the entire string, if at all."
-msgstr ""
-"Предпочтительное ме�то дл� �ллиптизации �троки, е�ли индикатор хода проце��а "
-"не имеет до�таточно ме�та дл� отображени� в�ей �троки."
+#: ../gtk/gtkprogressbar.c:221
+msgid "The preferred place to ellipsize the string, if the progress bar does not have enough room to display the entire string, if at all."
+msgstr "Предпочтительное ме�то дл� �ллиптизации �троки, е�ли индикатор хода проце��а не имеет до�таточно ме�та дл� отображени� в�ей �троки."
 
-#: ../gtk/gtkprogressbar.c:225
+#: ../gtk/gtkprogressbar.c:228
 msgid "X spacing"
 msgstr "От�туп по горизонтали"
 
-#: ../gtk/gtkprogressbar.c:226
+#: ../gtk/gtkprogressbar.c:229
 msgid "Extra spacing applied to the width of a progress bar."
 msgstr "Дополнительное про�тран�тво к ширине индикатора хода выполнени�."
 
-#: ../gtk/gtkprogressbar.c:231
+#: ../gtk/gtkprogressbar.c:234
 msgid "Y spacing"
 msgstr "От�туп по вертикали"
 
-#: ../gtk/gtkprogressbar.c:232
+#: ../gtk/gtkprogressbar.c:235
 msgid "Extra spacing applied to the height of a progress bar."
 msgstr "Дополнительное про�тран�тво к вы�оте индикатора хода выполнени�."
 
-#: ../gtk/gtkprogressbar.c:245
+#: ../gtk/gtkprogressbar.c:248
 msgid "Minimum horizontal bar width"
 msgstr "Минимальна� ширина горизонтального индикатора выполнени�"
 
-#: ../gtk/gtkprogressbar.c:246
+#: ../gtk/gtkprogressbar.c:249
 msgid "The minimum horizontal width of the progress bar"
 msgstr "Минимальна� ширина горизонтального индикатора выполнени�"
 
-#: ../gtk/gtkprogressbar.c:258
+#: ../gtk/gtkprogressbar.c:261
 msgid "Minimum horizontal bar height"
 msgstr "Минимальна� вы�ота горизонтального индикатора выполнени�"
 
-#: ../gtk/gtkprogressbar.c:259
+#: ../gtk/gtkprogressbar.c:262
 msgid "Minimum horizontal height of the progress bar"
 msgstr "Минимальна� вы�ота горизонтального индикатора выполнени�"
 
-#: ../gtk/gtkprogressbar.c:271
+#: ../gtk/gtkprogressbar.c:274
 msgid "Minimum vertical bar width"
 msgstr "Минимальна� ширина вертикального индикатора выполнени�"
 
-#: ../gtk/gtkprogressbar.c:272
+#: ../gtk/gtkprogressbar.c:275
 msgid "The minimum vertical width of the progress bar"
 msgstr "Минимальна� ширина вертикального индикатора выполнени�"
 
-#: ../gtk/gtkprogressbar.c:284
+#: ../gtk/gtkprogressbar.c:287
 msgid "Minimum vertical bar height"
 msgstr "Минимальна� вы�ота вертикального индикатора выполнени�"
 
-#: ../gtk/gtkprogressbar.c:285
+#: ../gtk/gtkprogressbar.c:288
 msgid "The minimum vertical height of the progress bar"
 msgstr "Минимальна� вы�ота вертикального индикатора выполнени�"
 
@@ -4730,15 +4823,13 @@ msgid "The value"
 msgstr "Значение"
 
 #: ../gtk/gtkradioaction.c:119
-msgid ""
-"The value returned by gtk_radio_action_get_current_value() when this action "
-"is the current action of its group."
-msgstr ""
-"Значение, возвращаемое функцией gtk_radio_action_get_current_value(), когда "
-"�то дей�твие �вл�ет�� текущим дей�твием �воей группы.."
+msgid "The value returned by gtk_radio_action_get_current_value() when this action is the current action of its group."
+msgstr "Значение, возвращаемое функцией gtk_radio_action_get_current_value(), когда �то дей�твие �вл�ет�� текущим дей�твием �воей группы.."
 
-#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:163
-#: ../gtk/gtkradiomenuitem.c:374 ../gtk/gtkradiotoolbutton.c:65
+#: ../gtk/gtkradioaction.c:135
+#: ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiomenuitem.c:426
+#: ../gtk/gtkradiotoolbutton.c:85
 msgid "Group"
 msgstr "Группа"
 
@@ -4751,167 +4842,149 @@ msgid "The current value"
 msgstr "Текущее значение"
 
 #: ../gtk/gtkradioaction.c:152
-msgid ""
-"The value property of the currently active member of the group to which this "
-"action belongs."
-msgstr ""
-"Значение текущего активного �лемента группы, к которой виджет принадлежит."
+msgid "The value property of the currently active member of the group to which this action belongs."
+msgstr "Значение текущего активного �лемента группы, к которой виджет принадлежит."
 
-#: ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiobutton.c:165
 msgid "The radio button whose group this widget belongs to."
 msgstr "Радио-кнопка, группе которого принадлежит �тот виджет."
 
-#: ../gtk/gtkradiomenuitem.c:375
+#: ../gtk/gtkradiomenuitem.c:427
 msgid "The radio menu item whose group this widget belongs to."
 msgstr "Радио �лемент меню, группе которого принадлежит �тот виджет."
 
-#: ../gtk/gtkradiotoolbutton.c:66
+#: ../gtk/gtkradiotoolbutton.c:86
 msgid "The radio tool button whose group this button belongs to."
 msgstr "Радио-кнопка, группе которой принадлежит �та кнопка."
 
-#: ../gtk/gtkrange.c:417
+#: ../gtk/gtkrange.c:419
 msgid "The GtkAdjustment that contains the current value of this range object"
-msgstr ""
-"Объект GtkAdjustment, где хранит�� текущее значение объекта типа «диапазон»"
+msgstr "Объект GtkAdjustment, где хранит�� текущее значение объекта типа «диапазон»"
 
-#: ../gtk/gtkrange.c:425
+#: ../gtk/gtkrange.c:427
 msgid "Invert direction slider moves to increase range value"
 msgstr "Инвертировать обла�ти, отмеченной ползунками, дл� увеличени� диапазона"
 
-#: ../gtk/gtkrange.c:432
+#: ../gtk/gtkrange.c:434
 msgid "Lower stepper sensitivity"
 msgstr "Чув�твительно�ть �двига вниз"
 
-#: ../gtk/gtkrange.c:433
-msgid ""
-"The sensitivity policy for the stepper that points to the adjustment's lower "
-"side"
-msgstr ""
-"Политика чув�твительно�ти дл� �двига вниз в �торону уменьшени� промежутка"
+#: ../gtk/gtkrange.c:435
+msgid "The sensitivity policy for the stepper that points to the adjustment's lower side"
+msgstr "Политика чув�твительно�ти дл� �двига вниз в �торону уменьшени� промежутка"
 
-#: ../gtk/gtkrange.c:441
+#: ../gtk/gtkrange.c:443
 msgid "Upper stepper sensitivity"
 msgstr "Чув�твительно�ть �двига вверх"
 
-#: ../gtk/gtkrange.c:442
-msgid ""
-"The sensitivity policy for the stepper that points to the adjustment's upper "
-"side"
-msgstr ""
-"Политика чув�твительно�ти дл� �двига вверх в �торону увеличени� промежутка"
+#: ../gtk/gtkrange.c:444
+msgid "The sensitivity policy for the stepper that points to the adjustment's upper side"
+msgstr "Политика чув�твительно�ти дл� �двига вверх в �торону увеличени� промежутка"
 
-#: ../gtk/gtkrange.c:459
+#: ../gtk/gtkrange.c:461
 msgid "Show Fill Level"
 msgstr "Показывать уровень заполнени�"
 
-#: ../gtk/gtkrange.c:460
+#: ../gtk/gtkrange.c:462
 msgid "Whether to display a fill level indicator graphics on trough."
 msgstr "Ри�овать индикатор уровн� наполнени� на желобке"
 
-#: ../gtk/gtkrange.c:476
+#: ../gtk/gtkrange.c:478
 msgid "Restrict to Fill Level"
 msgstr "Ограничивать уровнем заполнени�"
 
-#: ../gtk/gtkrange.c:477
+#: ../gtk/gtkrange.c:479
 msgid "Whether to restrict the upper boundary to the fill level."
 msgstr "Ограничить верхнее значение уровнем наполнени�."
 
-#: ../gtk/gtkrange.c:492
+#: ../gtk/gtkrange.c:494
 msgid "Fill Level"
 msgstr "Уровень наполнени�"
 
-#: ../gtk/gtkrange.c:493
+#: ../gtk/gtkrange.c:495
 msgid "The fill level."
 msgstr "уровень наполнени�."
 
-#: ../gtk/gtkrange.c:510
+#: ../gtk/gtkrange.c:512
 msgid "Round Digits"
 msgstr "Округление по�ле знака"
 
-#: ../gtk/gtkrange.c:511
+#: ../gtk/gtkrange.c:513
 msgid "The number of digits to round the value to."
 msgstr "Количе�тво знаков, по�ле которого выполн�ет�� округление."
 
-#: ../gtk/gtkrange.c:519 ../gtk/gtkswitch.c:836
+#: ../gtk/gtkrange.c:521
+#: ../gtk/gtkswitch.c:817
 msgid "Slider Width"
 msgstr "Ширина поло�ы прокрутки"
 
-#: ../gtk/gtkrange.c:520
+#: ../gtk/gtkrange.c:522
 msgid "Width of scrollbar or scale thumb"
 msgstr "Ширина поло�ы прокрутки или указател� ма�штаба"
 
-#: ../gtk/gtkrange.c:527
+#: ../gtk/gtkrange.c:529
 msgid "Trough Border"
 msgstr "Граница направл�ющей"
 
-#: ../gtk/gtkrange.c:528
+#: ../gtk/gtkrange.c:530
 msgid "Spacing between thumb/steppers and outer trough bevel"
-msgstr ""
-"Ра��то�ние между указателем/кнопками перемещени� и внешней границей "
-"направл�ющей"
+msgstr "Ра��то�ние между указателем/кнопками перемещени� и внешней границей направл�ющей"
 
-#: ../gtk/gtkrange.c:535
+#: ../gtk/gtkrange.c:537
 msgid "Stepper Size"
 msgstr "Размер кнопки перемещени�"
 
-#: ../gtk/gtkrange.c:536
+#: ../gtk/gtkrange.c:538
 msgid "Length of step buttons at ends"
 msgstr "Длина кнопок перемещени� от кра� до кра�"
 
-#: ../gtk/gtkrange.c:549
+#: ../gtk/gtkrange.c:551
 msgid "Stepper Spacing"
 msgstr "Ра��то�ние между кнопками перемещени�"
 
-#: ../gtk/gtkrange.c:550
+#: ../gtk/gtkrange.c:552
 msgid "Spacing between step buttons and thumb"
 msgstr "Ра��то�ние между кнопками перемещени� и указателем"
 
-#: ../gtk/gtkrange.c:557
+#: ../gtk/gtkrange.c:559
 msgid "Arrow X Displacement"
 msgstr "Горизонтальное �мещение �трелки"
 
-#: ../gtk/gtkrange.c:558
-msgid ""
-"How far in the x direction to move the arrow when the button is depressed"
-msgstr ""
-"�а�колько �трелка будет перемещать�� в горизонтальном направлении при "
-"нажатии кнопки"
+#: ../gtk/gtkrange.c:560
+msgid "How far in the x direction to move the arrow when the button is depressed"
+msgstr "�а�колько �трелка будет перемещать�� в горизонтальном направлении при нажатии кнопки"
 
-#: ../gtk/gtkrange.c:565
+#: ../gtk/gtkrange.c:567
 msgid "Arrow Y Displacement"
 msgstr "Вертикальное �мещение �трелки"
 
-#: ../gtk/gtkrange.c:566
-msgid ""
-"How far in the y direction to move the arrow when the button is depressed"
-msgstr ""
-"�а�колько �трелка будет перемещать�� в вертикальном направлении при нажатии "
-"кнопки"
+#: ../gtk/gtkrange.c:568
+msgid "How far in the y direction to move the arrow when the button is depressed"
+msgstr "�а�колько �трелка будет перемещать�� в вертикальном направлении при нажатии кнопки"
 
-#: ../gtk/gtkrange.c:582
+#: ../gtk/gtkrange.c:584
 msgid "Trough Under Steppers"
 msgstr "Желобок под метками"
 
-#: ../gtk/gtkrange.c:583
-msgid ""
-"Whether to draw trough for full length of range or exclude the steppers and "
-"spacing"
-msgstr ""
-"Ри�овать ли желобок во в�ю длину прокрутки или и�ключать кнопки и промежутки"
+#: ../gtk/gtkrange.c:585
+msgid "Whether to draw trough for full length of range or exclude the steppers and spacing"
+msgstr "Ри�овать ли желобок во в�ю длину прокрутки или и�ключать кнопки и промежутки"
 
-#: ../gtk/gtkrange.c:596
+#: ../gtk/gtkrange.c:598
 msgid "Arrow scaling"
 msgstr "Ра�т�жение �трелки"
 
-#: ../gtk/gtkrange.c:597
+#: ../gtk/gtkrange.c:599
 msgid "Arrow scaling with regard to scroll button size"
 msgstr "Ра�т�жение �трелки по отношению к размеру кнопки прокрутки"
 
-#: ../gtk/gtkrecentaction.c:635 ../gtk/gtkrecentchoosermenu.c:246
+#: ../gtk/gtkrecentaction.c:635
+#: ../gtk/gtkrecentchoosermenu.c:246
 msgid "Show Numbers"
 msgstr "Показывать номера"
 
-#: ../gtk/gtkrecentaction.c:636 ../gtk/gtkrecentchoosermenu.c:247
+#: ../gtk/gtkrecentaction.c:636
+#: ../gtk/gtkrecentchoosermenu.c:247
 msgid "Whether the items should be displayed with a number"
 msgstr "Показывать ли �лементы вме�те � номером"
 
@@ -4965,9 +5038,7 @@ msgstr "Только локальные"
 
 #: ../gtk/gtkrecentchooser.c:218
 msgid "Whether the selected resource(s) should be limited to local file: URIs"
-msgstr ""
-"Ограничивать ли до�тупные дл� выделени� ре�ур�ы только локальными файлами �о "
-"�хемой file:"
+msgstr "Ограничивать ли до�тупные дл� выделени� ре�ур�ы только локальными файлами �о �хемой file:"
 
 #: ../gtk/gtkrecentchooser.c:234
 msgid "Limit"
@@ -4997,97 +5068,88 @@ msgstr "Полный путь к файлу, иÑ�пользуемому длÑ� Ð
 msgid "The size of the recently used resources list"
 msgstr "Размер �пи�ка недавно и�пользовавших�� ре�ур�ов"
 
-#: ../gtk/gtkscalebutton.c:218
+#: ../gtk/gtkscalebutton.c:219
 msgid "The value of the scale"
 msgstr "Значение поло�ы прокрутки"
 
-#: ../gtk/gtkscalebutton.c:228
+#: ../gtk/gtkscalebutton.c:229
 msgid "The icon size"
 msgstr "Размер значка"
 
-#: ../gtk/gtkscalebutton.c:237
-msgid ""
-"The GtkAdjustment that contains the current value of this scale button object"
+#: ../gtk/gtkscalebutton.c:238
+msgid "The GtkAdjustment that contains the current value of this scale button object"
 msgstr "Объект GtkAdjustment, где хранит�� текущее значение ра�т�жени�"
 
-#: ../gtk/gtkscalebutton.c:265
+#: ../gtk/gtkscalebutton.c:266
 msgid "Icons"
 msgstr "Значки"
 
-#: ../gtk/gtkscalebutton.c:266
+#: ../gtk/gtkscalebutton.c:267
 msgid "List of icon names"
 msgstr "Спи�ок имён значков"
 
-#: ../gtk/gtkscale.c:253
+#: ../gtk/gtkscale.c:255
 msgid "The number of decimal places that are displayed in the value"
 msgstr "Чи�ло де��тичных цифр, отображаемых дл� значени�"
 
-#: ../gtk/gtkscale.c:262
+#: ../gtk/gtkscale.c:264
 msgid "Draw Value"
 msgstr "Показывать значение"
 
-#: ../gtk/gtkscale.c:263
+#: ../gtk/gtkscale.c:265
 msgid "Whether the current value is displayed as a string next to the slider"
 msgstr "Будет ли текущее значение отображать�� в виде �троки р�дом � ползунком"
 
-#: ../gtk/gtkscale.c:270
+#: ../gtk/gtkscale.c:272
 msgid "Value Position"
 msgstr "Ра�положение значени�"
 
-#: ../gtk/gtkscale.c:271
+#: ../gtk/gtkscale.c:273
 msgid "The position in which the current value is displayed"
 msgstr "Ме�то, в котором отображает�� текущее значение"
 
-#: ../gtk/gtkscale.c:278
+#: ../gtk/gtkscale.c:280
 msgid "Slider Length"
 msgstr "Длина поло�ы прокрутки"
 
-#: ../gtk/gtkscale.c:279
+#: ../gtk/gtkscale.c:281
 msgid "Length of scale's slider"
 msgstr "Длина поло�ы прокрутки"
 
-#: ../gtk/gtkscale.c:287
+#: ../gtk/gtkscale.c:289
 msgid "Value spacing"
 msgstr "Значение от�тупа"
 
-#: ../gtk/gtkscale.c:288
+#: ../gtk/gtkscale.c:290
 msgid "Space between value text and the slider/trough area"
-msgstr ""
-"Ра��то�ние между отображаемым значением и обла�тью ползунка/направл�ющей"
+msgstr "Ра��то�ние между отображаемым значением и обла�тью ползунка/направл�ющей"
 
-#: ../gtk/gtkscrollable.c:86
+#: ../gtk/gtkscrollable.c:94
 msgid "Horizontal adjustment"
 msgstr "Выравнивание по горизонтали"
 
-#: ../gtk/gtkscrollable.c:87
-msgid ""
-"Horizontal adjustment that is shared between the scrollable widget and its "
-"controller"
-msgstr ""
-"Выравнивание по горизонтали, �овме�тно и�пользует�� прокручиваемым виджетом "
-"и его контроллером"
+#: ../gtk/gtkscrollable.c:95
+msgid "Horizontal adjustment that is shared between the scrollable widget and its controller"
+msgstr "Выравнивание по горизонтали, �овме�тно и�пользует�� прокручиваемым виджетом и его контроллером"
 
-#: ../gtk/gtkscrollable.c:103
+#: ../gtk/gtkscrollable.c:111
 msgid "Vertical adjustment"
 msgstr "Выравнивание по вертикали"
 
-#: ../gtk/gtkscrollable.c:104
-msgid ""
-"Vertical adjustment that is shared between the scrollable widget and its "
-"controller"
-msgstr ""
-"Выравнивание по вертикали, �овме�тно и�пользует�� прокручиваемым виджетом и "
-"его контроллером"
+#: ../gtk/gtkscrollable.c:112
+msgid "Vertical adjustment that is shared between the scrollable widget and its controller"
+msgstr "Выравнивание по вертикали, �овме�тно и�пользует�� прокручиваемым виджетом и его контроллером"
 
-#: ../gtk/gtkscrollable.c:120
+#: ../gtk/gtkscrollable.c:128
 msgid "Horizontal Scrollable Policy"
 msgstr "Правило горизонтальной прокрутки"
 
-#: ../gtk/gtkscrollable.c:121 ../gtk/gtkscrollable.c:137
+#: ../gtk/gtkscrollable.c:129
+#: ../gtk/gtkscrollable.c:145
 msgid "How the size of the content should be determined"
 msgstr "Как должен вычи�л�ть�� размер �одержимого"
 
-#: ../gtk/gtkscrollable.c:136
+#: ../gtk/gtkscrollable.c:144
 msgid "Vertical Scrollable Policy"
 msgstr "Правило вертикальной прокрутки"
 
@@ -5108,18 +5170,12 @@ msgid "Don't change slider size, just lock it to the minimum length"
 msgstr "�е измен�ть размер ползунка, про�то задать ему минимальный размер"
 
 #: ../gtk/gtkscrollbar.c:103
-msgid ""
-"Display a second backward arrow button on the opposite end of the scrollbar"
-msgstr ""
-"Отображать вторую кнопку �о �трелкой назад на противоположной �тороне поло�ы "
-"прокрутки"
+msgid "Display a second backward arrow button on the opposite end of the scrollbar"
+msgstr "Отображать вторую кнопку �о �трелкой назад на противоположной �тороне поло�ы прокрутки"
 
 #: ../gtk/gtkscrollbar.c:110
-msgid ""
-"Display a second forward arrow button on the opposite end of the scrollbar"
-msgstr ""
-"Отображать вторую кнопку �о �трелкой вперёд на противоположной �тороне "
-"поло�ы прокрутки"
+msgid "Display a second forward arrow button on the opposite end of the scrollbar"
+msgstr "Отображать вторую кнопку �о �трелкой вперёд на противоположной �тороне поло�ы прокрутки"
 
 #: ../gtk/gtkscrolledwindow.c:296
 msgid "Horizontal Adjustment"
@@ -5158,24 +5214,16 @@ msgid "Window Placement"
 msgstr "Размещение окна"
 
 #: ../gtk/gtkscrolledwindow.c:328
-msgid ""
-"Where the contents are located with respect to the scrollbars. This property "
-"only takes effect if \"window-placement-set\" is TRUE."
-msgstr ""
-"Ра�полагать ли �одержимое в �оответ�твии � поло�ами прокрутки. Это �вой�тво "
-"имеет дей�твие только е�ли у�тановлено «Размещение окна»."
+msgid "Where the contents are located with respect to the scrollbars. This property only takes effect if \"window-placement-set\" is TRUE."
+msgstr "Ра�полагать ли �одержимое в �оответ�твии � поло�ами прокрутки. Это �вой�тво имеет дей�твие только е�ли у�тановлено «Размещение окна»."
 
 #: ../gtk/gtkscrolledwindow.c:345
 msgid "Window Placement Set"
 msgstr "У�тановлено размещение окна"
 
 #: ../gtk/gtkscrolledwindow.c:346
-msgid ""
-"Whether \"window-placement\" should be used to determine the location of the "
-"contents with respect to the scrollbars."
-msgstr ""
-"И�пользовать ли �вой�тво «Размещение окна» дл� определени� положени� "
-"�одержимого по отношению к поло�ам прокрутки"
+msgid "Whether \"window-placement\" should be used to determine the location of the contents with respect to the scrollbars."
+msgstr "И�пользовать ли �вой�тво «Размещение окна» дл� определени� положени� �одержимого по отношению к поло�ам прокрутки"
 
 #: ../gtk/gtkscrolledwindow.c:352
 msgid "Shadow Type"
@@ -5199,8 +5247,7 @@ msgstr "Интервал поло� прокрутки"
 
 #: ../gtk/gtkscrolledwindow.c:375
 msgid "Number of pixels between the scrollbars and the scrolled window"
-msgstr ""
-"Количе�тво точек ра�тра между поло�ами прокрутки и прокручиваемым окном"
+msgstr "Количе�тво точек ра�тра между поло�ами прокрутки и прокручиваемым окном"
 
 #: ../gtk/gtkscrolledwindow.c:391
 msgid "Minimum Content Width"
@@ -5208,20 +5255,15 @@ msgstr "Минимальна� ширина �одержимого"
 
 #: ../gtk/gtkscrolledwindow.c:392
 msgid "The minimum width that the scrolled window will allocate to its content"
-msgstr ""
-"Минимальна� ширина, которое прокручиваемое окно будет выдел�ть дл� �воего "
-"�одержимого"
+msgstr "Минимальна� ширина, которое прокручиваемое окно будет выдел�ть дл� �воего �одержимого"
 
 #: ../gtk/gtkscrolledwindow.c:406
 msgid "Minimum Content Height"
 msgstr "Минимальна� вы�ота �одержимого"
 
 #: ../gtk/gtkscrolledwindow.c:407
-msgid ""
-"The minimum height that the scrolled window will allocate to its content"
-msgstr ""
-"Минимальна� вы�ота, которое прокручиваемое окно будет выдел�ть дл� �воего "
-"�одержимого"
+msgid "The minimum height that the scrolled window will allocate to its content"
+msgstr "Минимальна� вы�ота, которое прокручиваемое окно будет выдел�ть дл� �воего �одержимого"
 
 #: ../gtk/gtkseparatortoolitem.c:143
 msgid "Draw"
@@ -5231,746 +5273,685 @@ msgstr "Ри�овать"
 msgid "Whether the separator is drawn, or just blank"
 msgstr "Будут ли разделители нари�ованы или будут пу�тыми"
 
-#: ../gtk/gtksettings.c:318
+#: ../gtk/gtksettings.c:322
 msgid "Double Click Time"
 msgstr "Интервал двойного щелчка"
 
-#: ../gtk/gtksettings.c:319
-msgid ""
-"Maximum time allowed between two clicks for them to be considered a double "
-"click (in milliseconds)"
-msgstr ""
-"Мак�имальное врем� между двум� щелчками, при котором они �читают�� двойным "
-"щелчком (в милли�екундах)"
+#: ../gtk/gtksettings.c:323
+msgid "Maximum time allowed between two clicks for them to be considered a double click (in milliseconds)"
+msgstr "Мак�имальное врем� между двум� щелчками, при котором они �читают�� двойным щелчком (в милли�екундах)"
 
-#: ../gtk/gtksettings.c:326
+#: ../gtk/gtksettings.c:330
 msgid "Double Click Distance"
 msgstr "Ра��то�ние двойного щелчка"
 
-#: ../gtk/gtksettings.c:327
-msgid ""
-"Maximum distance allowed between two clicks for them to be considered a "
-"double click (in pixels)"
-msgstr ""
-"Мак�имальное ра��то�ние между двум� щелчками, при котором они �читают�� "
-"двойным щелчком (в пик�ел�х)"
+#: ../gtk/gtksettings.c:331
+msgid "Maximum distance allowed between two clicks for them to be considered a double click (in pixels)"
+msgstr "Мак�имальное ра��то�ние между двум� щелчками, при котором они �читают�� двойным щелчком (в пик�ел�х)"
 
-#: ../gtk/gtksettings.c:343
+#: ../gtk/gtksettings.c:347
 msgid "Cursor Blink"
 msgstr "Мигающий кур�ор"
 
-#: ../gtk/gtksettings.c:344
+#: ../gtk/gtksettings.c:348
 msgid "Whether the cursor should blink"
 msgstr "Мигает ли кур�ор"
 
-#: ../gtk/gtksettings.c:351
+#: ../gtk/gtksettings.c:355
 msgid "Cursor Blink Time"
 msgstr "Ча�тота мигани� кур�ора"
 
-#: ../gtk/gtksettings.c:352
+#: ../gtk/gtksettings.c:356
 msgid "Length of the cursor blink cycle, in milliseconds"
 msgstr "Длина цикла мигани� кур�ора в милли�екундах"
 
-#: ../gtk/gtksettings.c:371
+#: ../gtk/gtksettings.c:375
 msgid "Cursor Blink Timeout"
 msgstr "Задержка мигани� кур�ора"
 
-#: ../gtk/gtksettings.c:372
+#: ../gtk/gtksettings.c:376
 msgid "Time after which the cursor stops blinking, in seconds"
 msgstr "Врем�, по�ле которого кур�ор пере�таёт мигать, в �екундах"
 
-#: ../gtk/gtksettings.c:379
+#: ../gtk/gtksettings.c:383
 msgid "Split Cursor"
 msgstr "Разделить кур�ор"
 
-#: ../gtk/gtksettings.c:380
-msgid ""
-"Whether two cursors should be displayed for mixed left-to-right and right-to-"
-"left text"
-msgstr ""
-"Будут ли отображать�� два кур�ора дл� �мешанного �права-налево и �лева-"
-"направо тек�та"
+#: ../gtk/gtksettings.c:384
+msgid "Whether two cursors should be displayed for mixed left-to-right and right-to-left text"
+msgstr "Будут ли отображать�� два кур�ора дл� �мешанного �права-налево и �лева-направо тек�та"
 
-#: ../gtk/gtksettings.c:387
+#: ../gtk/gtksettings.c:391
 msgid "Theme Name"
 msgstr "�азвание темы"
 
-#: ../gtk/gtksettings.c:388
+#: ../gtk/gtksettings.c:392
 msgid "Name of theme to load"
 msgstr "�азвание темы дл� загрузки"
 
-#: ../gtk/gtksettings.c:396
+#: ../gtk/gtksettings.c:400
 msgid "Icon Theme Name"
 msgstr "Им� темы значков"
 
-#: ../gtk/gtksettings.c:397
+#: ../gtk/gtksettings.c:401
 msgid "Name of icon theme to use"
 msgstr "Им� и�пользуемой темы значков"
 
-#: ../gtk/gtksettings.c:405
+#: ../gtk/gtksettings.c:409
 msgid "Fallback Icon Theme Name"
 msgstr "Им� темы запа�ных значков"
 
-#: ../gtk/gtksettings.c:406
+#: ../gtk/gtksettings.c:410
 msgid "Name of a icon theme to fall back to"
-msgstr ""
-"Им� темы значков, котора� и�пользует�� дл� значков, когда нет подход�щих"
+msgstr "Им� темы значков, котора� и�пользует�� дл� значков, когда нет подход�щих"
 
-#: ../gtk/gtksettings.c:414
+#: ../gtk/gtksettings.c:418
 msgid "Key Theme Name"
 msgstr "Им� темы ра�кладки клавиш"
 
-#: ../gtk/gtksettings.c:415
+#: ../gtk/gtksettings.c:419
 msgid "Name of key theme to load"
 msgstr "Им� темы ра�кладки клавиш, которую нужно загрузить"
 
-#: ../gtk/gtksettings.c:423
+#: ../gtk/gtksettings.c:427
 msgid "Menu bar accelerator"
 msgstr "Клавиша вызова �троки меню"
 
-#: ../gtk/gtksettings.c:424
+#: ../gtk/gtksettings.c:428
 msgid "Keybinding to activate the menu bar"
 msgstr "Клавиша предназначенна� дл� вызова �троки меню"
 
-#: ../gtk/gtksettings.c:432
+#: ../gtk/gtksettings.c:436
 msgid "Drag threshold"
 msgstr "Порог перета�кивани�"
 
-#: ../gtk/gtksettings.c:433
+#: ../gtk/gtksettings.c:437
 msgid "Number of pixels the cursor can move before dragging"
-msgstr ""
-"Чи�ло точек ра�тра, на которое может �ме�тить�� кур�ор до перета�кивани�"
+msgstr "Чи�ло точек ра�тра, на которое может �ме�тить�� кур�ор до перета�кивани�"
 
-#: ../gtk/gtksettings.c:441
+#: ../gtk/gtksettings.c:445
 msgid "Font Name"
 msgstr "�аименование шрифта"
 
-#: ../gtk/gtksettings.c:442
+#: ../gtk/gtksettings.c:446
 msgid "Name of default font to use"
 msgstr "�аименование и�ходного шрифта"
 
-#: ../gtk/gtksettings.c:464
+#: ../gtk/gtksettings.c:468
 msgid "Icon Sizes"
 msgstr "Размеры значков"
 
-#: ../gtk/gtksettings.c:465
+#: ../gtk/gtksettings.c:469
 msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."
 msgstr "Спи�ок размеров значков (gtk-menu=16,16;gtk-button=20,20..."
 
-#: ../gtk/gtksettings.c:473
+#: ../gtk/gtksettings.c:477
 msgid "GTK Modules"
 msgstr "Модули GTK"
 
-#: ../gtk/gtksettings.c:474
+#: ../gtk/gtksettings.c:478
 msgid "List of currently active GTK modules"
 msgstr "Спи�ок до�тупных модулей GTK"
 
-#: ../gtk/gtksettings.c:482
+#: ../gtk/gtksettings.c:486
 msgid "Xft Antialias"
 msgstr "Сглаживание через Xft"
 
-#: ../gtk/gtksettings.c:483
+#: ../gtk/gtksettings.c:487
 msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
 msgstr "Сглаживать ли шрифты через Xft; 0=нет, 1=да, -1=и�ходное значение"
 
-#: ../gtk/gtksettings.c:492
+#: ../gtk/gtksettings.c:496
 msgid "Xft Hinting"
 msgstr "Хинтовать через Xft"
 
-#: ../gtk/gtksettings.c:493
+#: ../gtk/gtksettings.c:497
 msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
 msgstr "Хинтовать ли шрифты через Xft; 0=нет, 1=да, -1=и�ходное значение"
 
-#: ../gtk/gtksettings.c:502
+#: ../gtk/gtksettings.c:506
 msgid "Xft Hint Style"
 msgstr "Стиль хинтовани�"
 
-#: ../gtk/gtksettings.c:503
-msgid ""
-"What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
-msgstr ""
-"Какой уровень хинтовани� и�пользовать; никакого (hintnone), �лабый "
-"(hintslight), �редний (hintmedium) или полный (hintfull)"
+#: ../gtk/gtksettings.c:507
+msgid "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
+msgstr "Какой уровень хинтовани� и�пользовать; никакого (hintnone), �лабый (hintslight), �редний (hintmedium) или полный (hintfull)"
 
-#: ../gtk/gtksettings.c:512
+#: ../gtk/gtksettings.c:516
 msgid "Xft RGBA"
 msgstr "Субпик�ельное �глаживание"
 
-#: ../gtk/gtksettings.c:513
+#: ../gtk/gtksettings.c:517
 msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
-msgstr ""
-"Тип �убпик�ельного �глаживани�; от�ут�твует (none), rgb, bgr, vrgb, vbgr"
+msgstr "Тип �убпик�ельного �глаживани�; от�ут�твует (none), rgb, bgr, vrgb, vbgr"
 
-#: ../gtk/gtksettings.c:522
+#: ../gtk/gtksettings.c:526
 msgid "Xft DPI"
 msgstr "Разрешение"
 
-#: ../gtk/gtksettings.c:523
+#: ../gtk/gtksettings.c:527
 msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
 msgstr "Разрешение, в 1024 * точек/дюйм. -1 дл� значени� по умолчанию."
 
-#: ../gtk/gtksettings.c:532
+#: ../gtk/gtksettings.c:536
 msgid "Cursor theme name"
 msgstr "Им� темы значков"
 
-#: ../gtk/gtksettings.c:533
+#: ../gtk/gtksettings.c:537
 msgid "Name of the cursor theme to use, or NULL to use the default theme"
-msgstr ""
-"Им� и�пользуемой темы кур�оров, NULL дл� и�пользовани� темы по умолчанию"
+msgstr "Им� и�пользуемой темы кур�оров, NULL дл� и�пользовани� темы по умолчанию"
 
-#: ../gtk/gtksettings.c:541
+#: ../gtk/gtksettings.c:545
 msgid "Cursor theme size"
 msgstr "Размер темы кур�оров"
 
-#: ../gtk/gtksettings.c:542
+#: ../gtk/gtksettings.c:546
 msgid "Size to use for cursors, or 0 to use the default size"
 msgstr "Размер кур�оров или 0 дл� размера по умолчанию"
 
-#: ../gtk/gtksettings.c:551
+#: ../gtk/gtksettings.c:555
 msgid "Alternative button order"
 msgstr "�льтернативный пор�док кнопок"
 
-#: ../gtk/gtksettings.c:552
+#: ../gtk/gtksettings.c:556
 msgid "Whether buttons in dialogs should use the alternative button order"
 msgstr "И�пользовать ли альтернативный пор�док кнопок в диалогах"
 
-#: ../gtk/gtksettings.c:569
+#: ../gtk/gtksettings.c:573
 msgid "Alternative sort indicator direction"
 msgstr "�льтернативный индикатор �по�оба упор�дочивани�"
 
-#: ../gtk/gtksettings.c:570
-msgid ""
-"Whether the direction of the sort indicators in list and tree views is "
-"inverted compared to the default (where down means ascending)"
-msgstr ""
-"Инвертировать ли по �равнению � умолчанием направление индикатора �по�оба "
-"упор�дочивани� в �пи�ках или деревь�х (вниз будет означать возра�тание)"
+#: ../gtk/gtksettings.c:574
+msgid "Whether the direction of the sort indicators in list and tree views is inverted compared to the default (where down means ascending)"
+msgstr "Инвертировать ли по �равнению � умолчанием направление индикатора �по�оба упор�дочивани� в �пи�ках или деревь�х (вниз будет означать возра�тание)"
 
-#: ../gtk/gtksettings.c:578
+#: ../gtk/gtksettings.c:582
 msgid "Show the 'Input Methods' menu"
 msgstr "Показывать меню 'Методы ввода'"
 
-#: ../gtk/gtksettings.c:579
-msgid ""
-"Whether the context menus of entries and text views should offer to change "
-"the input method"
-msgstr ""
-"Должно ли контек�тное меню полей ввода и тек�товых полей �одержать подменю "
-"дл� изменени� методов ввода"
+#: ../gtk/gtksettings.c:583
+msgid "Whether the context menus of entries and text views should offer to change the input method"
+msgstr "Должно ли контек�тное меню полей ввода и тек�товых полей �одержать подменю дл� изменени� методов ввода"
 
-#: ../gtk/gtksettings.c:587
+#: ../gtk/gtksettings.c:591
 msgid "Show the 'Insert Unicode Control Character' menu"
 msgstr "Показывать меню 'В�тавить �имвол Unicode'"
 
-#: ../gtk/gtksettings.c:588
-msgid ""
-"Whether the context menus of entries and text views should offer to insert "
-"control characters"
-msgstr ""
-"Должно ли контек�тное меню полей ввода и тек�товых полей �одержать подменю "
-"дл� в�тавки управл�ющих �имволов"
+#: ../gtk/gtksettings.c:592
+msgid "Whether the context menus of entries and text views should offer to insert control characters"
+msgstr "Должно ли контек�тное меню полей ввода и тек�товых полей �одержать подменю дл� в�тавки управл�ющих �имволов"
 
-#: ../gtk/gtksettings.c:596
+#: ../gtk/gtksettings.c:600
 msgid "Start timeout"
 msgstr "Первоначальна� задержка"
 
-#: ../gtk/gtksettings.c:597
+#: ../gtk/gtksettings.c:601
 msgid "Starting value for timeouts, when button is pressed"
 msgstr "Врем� первоначальной задержки при нажатии кнопки"
 
-#: ../gtk/gtksettings.c:606
+#: ../gtk/gtksettings.c:610
 msgid "Repeat timeout"
 msgstr "Задержка повтора"
 
-#: ../gtk/gtksettings.c:607
+#: ../gtk/gtksettings.c:611
 msgid "Repeat value for timeouts, when button is pressed"
 msgstr "Врем� задержки повтора, когда кнопка нажата"
 
-#: ../gtk/gtksettings.c:616
+#: ../gtk/gtksettings.c:620
 msgid "Expand timeout"
 msgstr "Задержка ра�ширени�"
 
-#: ../gtk/gtksettings.c:617
+#: ../gtk/gtksettings.c:621
 msgid "Expand value for timeouts, when a widget is expanding a new region"
 msgstr "Задержка ра�ширени�, когда окно занимает новую обла�ть"
 
-#: ../gtk/gtksettings.c:652
+#: ../gtk/gtksettings.c:656
 msgid "Color scheme"
 msgstr "Цветова� �хема"
 
-#: ../gtk/gtksettings.c:653
+#: ../gtk/gtksettings.c:657
 msgid "A palette of named colors for use in themes"
 msgstr "Палитра именованных цветов дл� и�пользовани� в темах"
 
-#: ../gtk/gtksettings.c:662
+#: ../gtk/gtksettings.c:666
 msgid "Enable Animations"
 msgstr "Включить анимацию"
 
-#: ../gtk/gtksettings.c:663
+#: ../gtk/gtksettings.c:667
 msgid "Whether to enable toolkit-wide animations."
 msgstr "Включить ли пов�юду анимацию."
 
-#: ../gtk/gtksettings.c:681
+#: ../gtk/gtksettings.c:685
 msgid "Enable Touchscreen Mode"
 msgstr "Включить режим пр�мого до�тупа к �крану"
 
-#: ../gtk/gtksettings.c:682
+#: ../gtk/gtksettings.c:686
 msgid "When TRUE, there are no motion notify events delivered on this screen"
-msgstr ""
-"Когда у�тановлено, �обыти� уведомлени� о перемещении не до�тавл�ют�� дл� "
-"�лементов �крана"
+msgstr "Когда у�тановлено, �обыти� уведомлени� о перемещении не до�тавл�ют�� дл� �лементов �крана"
 
-#: ../gtk/gtksettings.c:699
+#: ../gtk/gtksettings.c:703
 msgid "Tooltip timeout"
 msgstr "Задержка под�казки"
 
-#: ../gtk/gtksettings.c:700
+#: ../gtk/gtksettings.c:704
 msgid "Timeout before tooltip is shown"
 msgstr "Первоначальна� задержка в�плывающей под�казки"
 
-#: ../gtk/gtksettings.c:725
+#: ../gtk/gtksettings.c:729
 msgid "Tooltip browse timeout"
 msgstr "Задержка про�мотра"
 
-#: ../gtk/gtksettings.c:726
+#: ../gtk/gtksettings.c:730
 msgid "Timeout before tooltip is shown when browse mode is enabled"
-msgstr ""
-"Задержка по�ле того, как под�казка показана перед включением режима обзора"
+msgstr "Задержка по�ле того, как под�казка показана перед включением режима обзора"
 
-#: ../gtk/gtksettings.c:747
+#: ../gtk/gtksettings.c:751
 msgid "Tooltip browse mode timeout"
 msgstr "Задержка режима обзора"
 
-#: ../gtk/gtksettings.c:748
+#: ../gtk/gtksettings.c:752
 msgid "Timeout after which browse mode is disabled"
 msgstr "Задержка, по�ле которой режим обзора будет отключён"
 
-#: ../gtk/gtksettings.c:767
+#: ../gtk/gtksettings.c:771
 msgid "Keynav Cursor Only"
 msgstr "Перемещение только � помощью �трелок"
 
-#: ../gtk/gtksettings.c:768
+#: ../gtk/gtksettings.c:772
 msgid "When TRUE, there are only cursor keys available to navigate widgets"
-msgstr ""
-"Е�ли у�тановлено, перемещение между окнами будет до�тупно только � помощью "
-"�трелок"
+msgstr "Е�ли у�тановлено, перемещение между окнами будет до�тупно только � помощью �трелок"
 
-#: ../gtk/gtksettings.c:785
+#: ../gtk/gtksettings.c:789
 msgid "Keynav Wrap Around"
 msgstr "Перемещение зациклено"
 
-#: ../gtk/gtksettings.c:786
+#: ../gtk/gtksettings.c:790
 msgid "Whether to wrap around when keyboard-navigating widgets"
 msgstr "Зацикливать ли перемещение кур�ора при управлении � клавиатуры"
 
-#: ../gtk/gtksettings.c:806
+#: ../gtk/gtksettings.c:810
 msgid "Error Bell"
 msgstr "Сигнал об ошибке"
 
-#: ../gtk/gtksettings.c:807
+#: ../gtk/gtksettings.c:811
 msgid "When TRUE, keyboard navigation and other errors will cause a beep"
-msgstr ""
-"Е�ли у�тановлено, ошибки перемещени� � помощью клавиатуры и другие ошибки "
-"будут порождать звуковой �игнал"
+msgstr "Е�ли у�тановлено, ошибки перемещени� � помощью клавиатуры и другие ошибки будут порождать звуковой �игнал"
 
-#: ../gtk/gtksettings.c:824
+#: ../gtk/gtksettings.c:828
 msgid "Color Hash"
 msgstr "�абор цветов"
 
-#: ../gtk/gtksettings.c:825
+#: ../gtk/gtksettings.c:829
 msgid "A hash table representation of the color scheme."
 msgstr "�абор, пред�тавл�ющий цветовую �хему."
 
-#: ../gtk/gtksettings.c:833
+#: ../gtk/gtksettings.c:837
 msgid "Default file chooser backend"
 msgstr "И�ходный движок дл� диалога выбора файлов"
 
-#: ../gtk/gtksettings.c:834
+#: ../gtk/gtksettings.c:838
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "�аименование и�ходного движка виджета GtkFileChooser"
 
-#: ../gtk/gtksettings.c:851
+#: ../gtk/gtksettings.c:855
 msgid "Default print backend"
 msgstr "Си�тема печати по умолчанию"
 
-#: ../gtk/gtksettings.c:852
+#: ../gtk/gtksettings.c:856
 msgid "List of the GtkPrintBackend backends to use by default"
 msgstr "Спи�ок �и�тем GtkPrintBackend дл� и�пользовани� по умолчанию"
 
-#: ../gtk/gtksettings.c:875
+#: ../gtk/gtksettings.c:879
 msgid "Default command to run when displaying a print preview"
-msgstr ""
-"Команда по умолчанию дл� отображени� окна предварительного про�мотра печати"
+msgstr "Команда по умолчанию дл� отображени� окна предварительного про�мотра печати"
 
-#: ../gtk/gtksettings.c:876
+#: ../gtk/gtksettings.c:880
 msgid "Command to run when displaying a print preview"
 msgstr "Команда дл� запу�ка окна предварительного про�мотра печати"
 
-#: ../gtk/gtksettings.c:892
+#: ../gtk/gtksettings.c:896
 msgid "Enable Mnemonics"
 msgstr "Включить под�казки"
 
-#: ../gtk/gtksettings.c:893
+#: ../gtk/gtksettings.c:897
 msgid "Whether labels should have mnemonics"
 msgstr "Имеют ли метки под�казки дл� активации"
 
-#: ../gtk/gtksettings.c:909
+#: ../gtk/gtksettings.c:913
 msgid "Enable Accelerators"
 msgstr "Включить комбинации клавиш"
 
-#: ../gtk/gtksettings.c:910
+#: ../gtk/gtksettings.c:914
 msgid "Whether menu items should have accelerators"
 msgstr "Имеют ли �лементы меню комбинации клавиш дл� запу�ка"
 
-#: ../gtk/gtksettings.c:927
+#: ../gtk/gtksettings.c:931
 msgid "Recent Files Limit"
 msgstr "Предел количе�тва недавних документов"
 
-#: ../gtk/gtksettings.c:928
+#: ../gtk/gtksettings.c:932
 msgid "Number of recently used files"
 msgstr "Чи�ло недавно и�пользовавших�� файлов"
 
-#: ../gtk/gtksettings.c:946
+#: ../gtk/gtksettings.c:950
 msgid "Default IM module"
 msgstr "Модуль IM по умолчанию"
 
-#: ../gtk/gtksettings.c:947
+#: ../gtk/gtksettings.c:951
 msgid "Which IM module should be used by default"
 msgstr "Модуль IM, и�пользуемый по умолчанию"
 
-#: ../gtk/gtksettings.c:965
+#: ../gtk/gtksettings.c:969
 msgid "Recent Files Max Age"
 msgstr "Мак�имальна� давно�ть и�пользовани� дл� недавних документов"
 
-#: ../gtk/gtksettings.c:966
+#: ../gtk/gtksettings.c:970
 msgid "Maximum age of recently used files, in days"
 msgstr "Мак�имальна� давно�ть и�пользовани� дл� недавних документов, в дн�х"
 
-#: ../gtk/gtksettings.c:975
+#: ../gtk/gtksettings.c:979
 msgid "Fontconfig configuration timestamp"
 msgstr "Временна� отметка конфигурации fontconfig"
 
-#: ../gtk/gtksettings.c:976
+#: ../gtk/gtksettings.c:980
 msgid "Timestamp of current fontconfig configuration"
 msgstr "Временна� отметка текущей конфигурации fontconfig"
 
-#: ../gtk/gtksettings.c:998
+#: ../gtk/gtksettings.c:1002
 msgid "Sound Theme Name"
 msgstr "Тема звуков"
 
-#: ../gtk/gtksettings.c:999
+#: ../gtk/gtksettings.c:1003
 msgid "XDG sound theme name"
 msgstr "Тема звуков по �тандарту XDG"
 
 #. Translators: this means sounds that are played as feedback to user input
-#: ../gtk/gtksettings.c:1021
+#: ../gtk/gtksettings.c:1025
 msgid "Audible Input Feedback"
 msgstr "Звукова� реакци� на дей�тви�"
 
-#: ../gtk/gtksettings.c:1022
+#: ../gtk/gtksettings.c:1026
 msgid "Whether to play event sounds as feedback to user input"
 msgstr "Проигрывать ли звуки �обытий в ответ на дей�тви� пользовател�"
 
-#: ../gtk/gtksettings.c:1043
+#: ../gtk/gtksettings.c:1047
 msgid "Enable Event Sounds"
 msgstr "Включить звуки �обытий"
 
-#: ../gtk/gtksettings.c:1044
+#: ../gtk/gtksettings.c:1048
 msgid "Whether to play any event sounds at all"
 msgstr "Проигрывать ли звуки �обытий"
 
-#: ../gtk/gtksettings.c:1059
+#: ../gtk/gtksettings.c:1063
 msgid "Enable Tooltips"
 msgstr "Включить в�плывающие под�казки"
 
-#: ../gtk/gtksettings.c:1060
+#: ../gtk/gtksettings.c:1064
 msgid "Whether tooltips should be shown on widgets"
 msgstr "Показывать ли в�плывающие под�казки дл� виджетов"
 
-#: ../gtk/gtksettings.c:1073
+#: ../gtk/gtksettings.c:1077
 msgid "Toolbar style"
 msgstr "Стиль панели ин�трументов"
 
-#: ../gtk/gtksettings.c:1074
-msgid ""
-"Whether default toolbars have text only, text and icons, icons only, etc."
-msgstr ""
-"Будет ли на панели ин�трументов по умолчанию только тек�т, тек�т и значки, "
-"только значки и т. д."
+#: ../gtk/gtksettings.c:1078
+msgid "Whether default toolbars have text only, text and icons, icons only, etc."
+msgstr "Будет ли на панели ин�трументов по умолчанию только тек�т, тек�т и значки, только значки и т. д."
 
-#: ../gtk/gtksettings.c:1088
+#: ../gtk/gtksettings.c:1092
 msgid "Toolbar Icon Size"
 msgstr "Размер значков панели ин�трументов"
 
-#: ../gtk/gtksettings.c:1089
+#: ../gtk/gtksettings.c:1093
 msgid "The size of icons in default toolbars."
 msgstr "Размер значков в панели ин�трументов по умолчанию."
 
-#: ../gtk/gtksettings.c:1106
+#: ../gtk/gtksettings.c:1110
 msgid "Auto Mnemonics"
 msgstr "�втоматиче�ка� мнемоника"
 
-#: ../gtk/gtksettings.c:1107
-msgid ""
-"Whether mnemonics should be automatically shown and hidden when the user "
-"presses the mnemonic activator."
-msgstr ""
-"�ужно ли автоматиче�ки показывать и �крывать мнемониче�кое обозначение, "
-"когда пользователь нажимает мнемониче�кий активатор."
+#: ../gtk/gtksettings.c:1111
+msgid "Whether mnemonics should be automatically shown and hidden when the user presses the mnemonic activator."
+msgstr "�ужно ли автоматиче�ки показывать и �крывать мнемониче�кое обозначение, когда пользователь нажимает мнемониче�кий активатор."
+
+#: ../gtk/gtksettings.c:1127
+#| msgid "Visible"
+msgid "Visible Focus"
+msgstr "Видимый фоку�"
 
-#: ../gtk/gtksettings.c:1132
+#: ../gtk/gtksettings.c:1128
+msgid "Whether 'focus rectangles' should be hidden until the user starts to use the keyboard."
+msgstr "Будут ли �крыты фоку�ные пр�моугольники до того, как пользователь начнёт и�пользовать клавиатуру."
+
+#: ../gtk/gtksettings.c:1154
 msgid "Application prefers a dark theme"
 msgstr "Приложение предпочитает тёмную тему"
 
-#: ../gtk/gtksettings.c:1133
+#: ../gtk/gtksettings.c:1155
 msgid "Whether the application prefers to have a dark theme."
 msgstr "Предпочитает ли приложение тёмную тему."
 
-#: ../gtk/gtksettings.c:1148
+#: ../gtk/gtksettings.c:1170
 msgid "Show button images"
 msgstr "Показывать изображени� на кнопках"
 
-#: ../gtk/gtksettings.c:1149
+#: ../gtk/gtksettings.c:1171
 msgid "Whether images should be shown on buttons"
 msgstr "Показывать ли изображени� на кнопках"
 
-#: ../gtk/gtksettings.c:1157 ../gtk/gtksettings.c:1251
+#: ../gtk/gtksettings.c:1179
+#: ../gtk/gtksettings.c:1273
 msgid "Select on focus"
 msgstr "Выдел�ть при фоку�ировании"
 
-#: ../gtk/gtksettings.c:1158
+#: ../gtk/gtksettings.c:1180
 msgid "Whether to select the contents of an entry when it is focused"
-msgstr ""
-"Будет ли �одержимое пол� ввода выдел�ть�� когда поле ввода получает фоку�"
+msgstr "Будет ли �одержимое пол� ввода выдел�ть�� когда поле ввода получает фоку�"
 
-#: ../gtk/gtksettings.c:1175
+#: ../gtk/gtksettings.c:1197
 msgid "Password Hint Timeout"
 msgstr "Задержка под�казки в пароле"
 
-#: ../gtk/gtksettings.c:1176
+#: ../gtk/gtksettings.c:1198
 msgid "How long to show the last input character in hidden entries"
-msgstr ""
-"Как долго показывать по�ледний введённый �имвол в �лементах ввода парол�"
+msgstr "Как долго показывать по�ледний введённый �имвол в �лементах ввода парол�"
 
-#: ../gtk/gtksettings.c:1185
+#: ../gtk/gtksettings.c:1207
 msgid "Show menu images"
 msgstr "Показывать изображени� в меню"
 
-#: ../gtk/gtksettings.c:1186
+#: ../gtk/gtksettings.c:1208
 msgid "Whether images should be shown in menus"
 msgstr "Показывать ли в меню изображени�"
 
-#: ../gtk/gtksettings.c:1194
+#: ../gtk/gtksettings.c:1216
 msgid "Delay before drop down menus appear"
 msgstr "Задержка перед по�влением «выпадающего вниз» меню"
 
-#: ../gtk/gtksettings.c:1195
+#: ../gtk/gtksettings.c:1217
 msgid "Delay before the submenus of a menu bar appear"
 msgstr "Задержка перед по�влением подменю у о�новного меню"
 
-#: ../gtk/gtksettings.c:1212
+#: ../gtk/gtksettings.c:1234
 msgid "Scrolled Window Placement"
 msgstr "Положение прокручиваемого окна"
 
-#: ../gtk/gtksettings.c:1213
-msgid ""
-"Where the contents of scrolled windows are located with respect to the "
-"scrollbars, if not overridden by the scrolled window's own placement."
-msgstr ""
-"Должно ли �одержимое ра�полагать�� так, как задано поло�ами прокрутки, или "
-"его ра�положение задано положением окна прокрутки."
+#: ../gtk/gtksettings.c:1235
+msgid "Where the contents of scrolled windows are located with respect to the scrollbars, if not overridden by the scrolled window's own placement."
+msgstr "Должно ли �одержимое ра�полагать�� так, как задано поло�ами прокрутки, или его ра�положение задано положением окна прокрутки."
 
-#: ../gtk/gtksettings.c:1222
+#: ../gtk/gtksettings.c:1244
 msgid "Can change accelerators"
 msgstr "Можно измен�ть комбинации клавиш"
 
-#: ../gtk/gtksettings.c:1223
-msgid ""
-"Whether menu accelerators can be changed by pressing a key over the menu item"
-msgstr ""
-"Можно ли изменить бы�трую клавишу меню при нажатии клавиши на �лементе меню"
+#: ../gtk/gtksettings.c:1245
+msgid "Whether menu accelerators can be changed by pressing a key over the menu item"
+msgstr "Можно ли изменить бы�трую клавишу меню при нажатии клавиши на �лементе меню"
 
-#: ../gtk/gtksettings.c:1231
+#: ../gtk/gtksettings.c:1253
 msgid "Delay before submenus appear"
 msgstr "Задержка перед по�влением подменю"
 
-#: ../gtk/gtksettings.c:1232
-msgid ""
-"Minimum time the pointer must stay over a menu item before the submenu appear"
-msgstr ""
-"Минимальное врем�, которое указатель мыши должен находить�� над пунктом "
-"меню, чтобы было отображено подменю"
+#: ../gtk/gtksettings.c:1254
+msgid "Minimum time the pointer must stay over a menu item before the submenu appear"
+msgstr "Минимальное врем�, которое указатель мыши должен находить�� над пунктом меню, чтобы было отображено подменю"
 
-#: ../gtk/gtksettings.c:1241
+#: ../gtk/gtksettings.c:1263
 msgid "Delay before hiding a submenu"
 msgstr "Задержка перед �окрытием подменю"
 
-#: ../gtk/gtksettings.c:1242
-msgid ""
-"The time before hiding a submenu when the pointer is moving towards the "
-"submenu"
-msgstr ""
-"Минимальное врем�, которое указатель мыши должен прове�ти вне пределов "
-"подменю, чтобы оно (подменю) было �крыто"
+#: ../gtk/gtksettings.c:1264
+msgid "The time before hiding a submenu when the pointer is moving towards the submenu"
+msgstr "Минимальное врем�, которое указатель мыши должен прове�ти вне пределов подменю, чтобы оно (подменю) было �крыто"
 
-#: ../gtk/gtksettings.c:1252
+#: ../gtk/gtksettings.c:1274
 msgid "Whether to select the contents of a selectable label when it is focused"
-msgstr ""
-"Выдел�ть ли �одержимое метки, поддерживающей выделение при получении фоку�а"
+msgstr "Выдел�ть ли �одержимое метки, поддерживающей выделение при получении фоку�а"
 
-#: ../gtk/gtksettings.c:1260
+#: ../gtk/gtksettings.c:1282
 msgid "Custom palette"
 msgstr "Друга� палитра"
 
-#: ../gtk/gtksettings.c:1261
+#: ../gtk/gtksettings.c:1283
 msgid "Palette to use in the color selector"
 msgstr "Палитра, и�пользуема� в диалоге выбора цвета"
 
-#: ../gtk/gtksettings.c:1269
+#: ../gtk/gtksettings.c:1291
 msgid "IM Preedit style"
 msgstr "Стиль IM Preedit"
 
-#: ../gtk/gtksettings.c:1270
+#: ../gtk/gtksettings.c:1292
 msgid "How to draw the input method preedit string"
 msgstr "Как ри�овать �троку IM Preedit"
 
-#: ../gtk/gtksettings.c:1279
+#: ../gtk/gtksettings.c:1301
 msgid "IM Status style"
 msgstr "Стиль �троки �о�то�ни� метода ввода"
 
-#: ../gtk/gtksettings.c:1280
+#: ../gtk/gtksettings.c:1302
 msgid "How to draw the input method statusbar"
 msgstr "Как ри�овать �троку �о�то�ни� метода ввода"
 
-#: ../gtk/gtksizegroup.c:301
+#: ../gtk/gtksizegroup.c:382
+#: ../gtk/gtktreeselection.c:130
 msgid "Mode"
 msgstr "Режим"
 
-#: ../gtk/gtksizegroup.c:302
-msgid ""
-"The directions in which the size group affects the requested sizes of its "
-"component widgets"
-msgstr ""
-"�аправлени�, в которых «группа по размеру» вли�ет на заданные размеры "
-"вход�щих в нее �лементов управлени�"
+#: ../gtk/gtksizegroup.c:383
+msgid "The directions in which the size group affects the requested sizes of its component widgets"
+msgstr "�аправлени�, в которых «группа по размеру» вли�ет на заданные размеры вход�щих в нее �лементов управлени�"
 
-#: ../gtk/gtksizegroup.c:318
+#: ../gtk/gtksizegroup.c:399
 msgid "Ignore hidden"
 msgstr "Игнорировать �крытые"
 
-#: ../gtk/gtksizegroup.c:319
-msgid ""
-"If TRUE, unmapped widgets are ignored when determining the size of the group"
-msgstr ""
-"Е�ли �тот параметр у�тановлен, �крытые �лементы игнорируют�� при определении "
-"размера группы"
+#: ../gtk/gtksizegroup.c:400
+msgid "If TRUE, unmapped widgets are ignored when determining the size of the group"
+msgstr "Е�ли �тот параметр у�тановлен, �крытые �лементы игнорируют�� при определении размера группы"
 
-#: ../gtk/gtkspinbutton.c:328
+#: ../gtk/gtkspinbutton.c:331
 msgid "Climb Rate"
 msgstr "У�корение"
 
-#: ../gtk/gtkspinbutton.c:348
+#: ../gtk/gtkspinbutton.c:351
 msgid "Snap to Ticks"
 msgstr "Замен�ть на ближайшее"
 
-#: ../gtk/gtkspinbutton.c:349
-msgid ""
-"Whether erroneous values are automatically changed to a spin button's "
-"nearest step increment"
-msgstr ""
-"Будут ли недопу�тимые значени� автоматиче�ки замен�ть�� на ближайшее "
-"значение �четчика"
+#: ../gtk/gtkspinbutton.c:352
+msgid "Whether erroneous values are automatically changed to a spin button's nearest step increment"
+msgstr "Будут ли недопу�тимые значени� автоматиче�ки замен�ть�� на ближайшее значение �четчика"
 
-#: ../gtk/gtkspinbutton.c:356
+#: ../gtk/gtkspinbutton.c:359
 msgid "Numeric"
 msgstr "Чи�ловое"
 
-#: ../gtk/gtkspinbutton.c:357
+#: ../gtk/gtkspinbutton.c:360
 msgid "Whether non-numeric characters should be ignored"
 msgstr "Будут ли игнорировать�� нецифровые �имволы"
 
-#: ../gtk/gtkspinbutton.c:364
+#: ../gtk/gtkspinbutton.c:367
 msgid "Wrap"
 msgstr "Перено�"
 
-#: ../gtk/gtkspinbutton.c:365
+#: ../gtk/gtkspinbutton.c:368
 msgid "Whether a spin button should wrap upon reaching its limits"
-msgstr ""
-"Будет ли �четчик переходить к другому концу шкалы при до�тижении предельных "
-"значений"
+msgstr "Будет ли �четчик переходить к другому концу шкалы при до�тижении предельных значений"
 
-#: ../gtk/gtkspinbutton.c:372
+#: ../gtk/gtkspinbutton.c:375
 msgid "Update Policy"
 msgstr "Политика обновлени�"
 
-#: ../gtk/gtkspinbutton.c:373
-msgid ""
-"Whether the spin button should update always, or only when the value is legal"
-msgstr ""
-"Должен ли �четчик обновл�ть�� в�егда или только е�ли значение �вл�ет�� "
-"допу�тимым"
+#: ../gtk/gtkspinbutton.c:376
+msgid "Whether the spin button should update always, or only when the value is legal"
+msgstr "Должен ли �четчик обновл�ть�� в�егда или только е�ли значение �вл�ет�� допу�тимым"
 
-#: ../gtk/gtkspinbutton.c:382
+#: ../gtk/gtkspinbutton.c:385
 msgid "Reads the current value, or sets a new value"
 msgstr "Читает текущее значение или у�танавливает новое значение"
 
-#: ../gtk/gtkspinbutton.c:391
+#: ../gtk/gtkspinbutton.c:394
 msgid "Style of bevel around the spin button"
 msgstr "Стиль �ко�а вокруг кнопки-�чётчика"
 
-#: ../gtk/gtkspinner.c:119
+#: ../gtk/gtkspinner.c:116
 msgid "Whether the spinner is active"
 msgstr "�ктивна ли вертушка"
 
-#: ../gtk/gtkstatusbar.c:181
+#: ../gtk/gtkstatusbar.c:183
 msgid "Style of bevel around the statusbar text"
 msgstr "Стиль �ко�а вокруг тек�та �троки �о�то�ни�"
 
-#: ../gtk/gtkstatusicon.c:263
+#: ../gtk/gtkstatusicon.c:293
 msgid "The size of the icon"
 msgstr "Размер значка"
 
-#: ../gtk/gtkstatusicon.c:273
+#: ../gtk/gtkstatusicon.c:303
 msgid "The screen where this status icon will be displayed"
 msgstr "Экран, на котором будет отображён �тот значок �о�то�ни�"
 
-#: ../gtk/gtkstatusicon.c:281
+#: ../gtk/gtkstatusicon.c:311
 msgid "Whether the status icon is visible"
 msgstr "Отображать ли значок �о�то�ни�"
 
-#: ../gtk/gtkstatusicon.c:297
+#: ../gtk/gtkstatusicon.c:327
 msgid "Whether the status icon is embedded"
 msgstr "В�троен ли значок �о�то�ни� в панель уведомлений"
 
-#: ../gtk/gtkstatusicon.c:313 ../gtk/gtktrayicon-x11.c:129
+#: ../gtk/gtkstatusicon.c:343
+#: ../gtk/gtktrayicon-x11.c:129
 msgid "The orientation of the tray"
 msgstr "Ориентаци� панели уведомлений"
 
-#: ../gtk/gtkstatusicon.c:340 ../gtk/gtkwidget.c:1072
+#: ../gtk/gtkstatusicon.c:370
+#: ../gtk/gtkwidget.c:1091
 msgid "Has tooltip"
 msgstr "Имеет в�плывающую под�казку"
 
-#: ../gtk/gtkstatusicon.c:341
+#: ../gtk/gtkstatusicon.c:371
 msgid "Whether this tray icon has a tooltip"
 msgstr "Имеет ли �тот значок панели уведомлений в�плывающую под�казку"
 
-#: ../gtk/gtkstatusicon.c:366 ../gtk/gtkwidget.c:1093
+#: ../gtk/gtkstatusicon.c:396
+#: ../gtk/gtkwidget.c:1112
 msgid "Tooltip Text"
 msgstr "Тек�т в�плывающей под�казки"
 
-#: ../gtk/gtkstatusicon.c:367 ../gtk/gtkwidget.c:1094 ../gtk/gtkwidget.c:1115
+#: ../gtk/gtkstatusicon.c:397
+#: ../gtk/gtkwidget.c:1113
+#: ../gtk/gtkwidget.c:1134
 msgid "The contents of the tooltip for this widget"
 msgstr "Содержание в�плывающей под�казки �лемента управлени�"
 
-#: ../gtk/gtkstatusicon.c:390 ../gtk/gtkwidget.c:1114
+#: ../gtk/gtkstatusicon.c:420
+#: ../gtk/gtkwidget.c:1133
 msgid "Tooltip markup"
 msgstr "Разметка в�плывающей под�казки"
 
-#: ../gtk/gtkstatusicon.c:391
+#: ../gtk/gtkstatusicon.c:421
 msgid "The contents of the tooltip for this tray icon"
 msgstr "Содержимое в�плывающей под�казки значка панели уведомлений"
 
-#: ../gtk/gtkstatusicon.c:409
+#: ../gtk/gtkstatusicon.c:439
 msgid "The title of this tray icon"
 msgstr "�азвание �того значка дл� лотка"
 
@@ -5982,504 +5963,485 @@ msgstr "Контек�т �тил�"
 msgid "GtkStyleContext to get style from"
 msgstr "Дл� получени� �тил� и�пользовать GtkStyleContext"
 
-#: ../gtk/gtkstylecontext.c:546
+#: ../gtk/gtkstylecontext.c:433
 msgid "The associated GdkScreen"
 msgstr "Св�занный GdkScreen"
 
-#: ../gtk/gtkstylecontext.c:552
+#: ../gtk/gtkstylecontext.c:439
 msgid "Direction"
 msgstr "�аправление"
 
-#: ../gtk/gtkstylecontext.c:553 ../gtk/gtktexttag.c:236
+#: ../gtk/gtkstylecontext.c:440
+#: ../gtk/gtktexttag.c:269
 msgid "Text direction"
 msgstr "�аправление тек�та"
 
-#: ../gtk/gtkswitch.c:802
+#: ../gtk/gtkswitch.c:784
 msgid "Whether the switch is on or off"
 msgstr "Включен или выключен переключатель"
 
-#: ../gtk/gtkswitch.c:837
+#: ../gtk/gtkswitch.c:818
 msgid "The minimum width of the handle"
 msgstr "Минимальна� ширина регул�тора"
 
-#: ../gtk/gtktable.c:157
+#: ../gtk/gtktable.c:191
 msgid "Rows"
 msgstr "Строки"
 
-#: ../gtk/gtktable.c:158
+#: ../gtk/gtktable.c:192
 msgid "The number of rows in the table"
 msgstr "Чи�ло �трок в таблице"
 
-#: ../gtk/gtktable.c:166
+#: ../gtk/gtktable.c:200
 msgid "Columns"
 msgstr "Столбцы"
 
-#: ../gtk/gtktable.c:167
+#: ../gtk/gtktable.c:201
 msgid "The number of columns in the table"
 msgstr "Чи�ло �толбцов в таблице"
 
-#: ../gtk/gtktable.c:194
+#: ../gtk/gtktable.c:228
 msgid "If TRUE, the table cells are all the same width/height"
 msgstr "Е�ли у�тановлено, то �чейки таблицы имеют одинаковую вы�оту и ширину"
 
-#: ../gtk/gtktable.c:208
+#: ../gtk/gtktable.c:242
 msgid "Right attachment"
 msgstr "Прибавление �права"
 
-#: ../gtk/gtktable.c:209
+#: ../gtk/gtktable.c:243
 msgid "The column number to attach the right side of a child widget to"
 msgstr "Чи�ло �толбцов, прибавл�емых к правой �тороне дочернего виджета"
 
-#: ../gtk/gtktable.c:216
+#: ../gtk/gtktable.c:250
 msgid "The row number to attach the top of a child widget to"
 msgstr "Чи�ло �трок, прибавл�емых к верхней �тороне дочернего виджета"
 
-#: ../gtk/gtktable.c:222
+#: ../gtk/gtktable.c:256
 msgid "Bottom attachment"
 msgstr "Прибавление �низу"
 
-#: ../gtk/gtktable.c:229
+#: ../gtk/gtktable.c:263
 msgid "Horizontal options"
 msgstr "Горизонтальные параметры"
 
-#: ../gtk/gtktable.c:230
+#: ../gtk/gtktable.c:264
 msgid "Options specifying the horizontal behaviour of the child"
 msgstr "Параметры, определ�ющие горизонтальное поведение дочернего �лемента"
 
-#: ../gtk/gtktable.c:236
+#: ../gtk/gtktable.c:270
 msgid "Vertical options"
 msgstr "Вертикальные параметры"
 
-#: ../gtk/gtktable.c:237
+#: ../gtk/gtktable.c:271
 msgid "Options specifying the vertical behaviour of the child"
 msgstr "Параметры, определ�ющие вертикальное поведение дочернего �лемента"
 
-#: ../gtk/gtktable.c:243
+#: ../gtk/gtktable.c:277
 msgid "Horizontal padding"
 msgstr "Горизонтальное дополнение"
 
-#: ../gtk/gtktable.c:244
-msgid ""
-"Extra space to put between the child and its left and right neighbors, in "
-"pixels"
-msgstr ""
-"Дополнительное количе�тво про�тран�тва, помещаемое между дочерним �лементом "
-"и левым и его правым �о�ед�ми, в пик�ел�х"
+#: ../gtk/gtktable.c:278
+msgid "Extra space to put between the child and its left and right neighbors, in pixels"
+msgstr "Дополнительное количе�тво про�тран�тва, помещаемое между дочерним �лементом и левым и его правым �о�ед�ми, в пик�ел�х"
 
-#: ../gtk/gtktable.c:250
+#: ../gtk/gtktable.c:284
 msgid "Vertical padding"
 msgstr "Вертикальное дополнение"
 
-#: ../gtk/gtktable.c:251
-msgid ""
-"Extra space to put between the child and its upper and lower neighbors, in "
-"pixels"
-msgstr ""
-"Дополнительное количе�тво про�тран�тва, помещаемое между дочерним �лементом "
-"и его верхним и нижним �о�ед�ми, в пик�ел�х"
+#: ../gtk/gtktable.c:285
+msgid "Extra space to put between the child and its upper and lower neighbors, in pixels"
+msgstr "Дополнительное количе�тво про�тран�тва, помещаемое между дочерним �лементом и его верхним и нижним �о�ед�ми, в пик�ел�х"
 
-#: ../gtk/gtktextbuffer.c:192
+#: ../gtk/gtktextbuffer.c:203
 msgid "Tag Table"
 msgstr "Таблица �рлыков"
 
-#: ../gtk/gtktextbuffer.c:193
+#: ../gtk/gtktextbuffer.c:204
 msgid "Text Tag Table"
 msgstr "Таблица �рлыков тек�та"
 
-#: ../gtk/gtktextbuffer.c:211
+#: ../gtk/gtktextbuffer.c:222
 msgid "Current text of the buffer"
 msgstr "Текущий тек�т буфера"
 
-#: ../gtk/gtktextbuffer.c:225
+#: ../gtk/gtktextbuffer.c:236
 msgid "Has selection"
 msgstr "Имеет выделение"
 
-#: ../gtk/gtktextbuffer.c:226
+#: ../gtk/gtktextbuffer.c:237
 msgid "Whether the buffer has some text currently selected"
 msgstr "Выделен ли некоторый тек�т в буфере"
 
-#: ../gtk/gtktextbuffer.c:242
+#: ../gtk/gtktextbuffer.c:253
 msgid "Cursor position"
 msgstr "Позици� кур�ора"
 
-#: ../gtk/gtktextbuffer.c:243
-msgid ""
-"The position of the insert mark (as offset from the beginning of the buffer)"
+#: ../gtk/gtktextbuffer.c:254
+msgid "The position of the insert mark (as offset from the beginning of the buffer)"
 msgstr "Положение отметки в�тавки (от�туп от начала буфера)"
 
-#: ../gtk/gtktextbuffer.c:258
+#: ../gtk/gtktextbuffer.c:269
 msgid "Copy target list"
 msgstr "Спи�ок целей копировани�"
 
-#: ../gtk/gtktextbuffer.c:259
-msgid ""
-"The list of targets this buffer supports for clipboard copying and DND source"
-msgstr ""
-"Спи�ок целей, которые �тот буфер может поддерживать при копировании в буфер "
-"обмена или перено�е мышью"
+#: ../gtk/gtktextbuffer.c:270
+msgid "The list of targets this buffer supports for clipboard copying and DND source"
+msgstr "Спи�ок целей, которые �тот буфер может поддерживать при копировании в буфер обмена или перено�е мышью"
 
-#: ../gtk/gtktextbuffer.c:274
+#: ../gtk/gtktextbuffer.c:285
 msgid "Paste target list"
 msgstr "Спи�ок целей в�тавки"
 
-#: ../gtk/gtktextbuffer.c:275
-msgid ""
-"The list of targets this buffer supports for clipboard pasting and DND "
-"destination"
-msgstr ""
-"Спи�ок целей, которые �тот буфер может поддерживать при в�тавке из буфера "
-"обмена или при перено�е мышью"
+#: ../gtk/gtktextbuffer.c:286
+msgid "The list of targets this buffer supports for clipboard pasting and DND destination"
+msgstr "Спи�ок целей, которые �тот буфер может поддерживать при в�тавке из буфера обмена или при перено�е мышью"
 
-#: ../gtk/gtktextmark.c:90
+#: ../gtk/gtktextmark.c:127
 msgid "Mark name"
 msgstr "Им� отметки"
 
-#: ../gtk/gtktextmark.c:97
+#: ../gtk/gtktextmark.c:134
 msgid "Left gravity"
 msgstr "Предпочтительно �лева"
 
-#: ../gtk/gtktextmark.c:98
+#: ../gtk/gtktextmark.c:135
 msgid "Whether the mark has left gravity"
 msgstr "Сдвигать ли отметку влево"
 
-#: ../gtk/gtktexttag.c:186
+#: ../gtk/gtktexttag.c:189
 msgid "Tag name"
 msgstr "Им� �рлыка"
 
-#: ../gtk/gtktexttag.c:187
+#: ../gtk/gtktexttag.c:190
 msgid "Name used to refer to the text tag. NULL for anonymous tags"
-msgstr ""
-"Им�, и�пользуемое дл� ��ылки на тек�товый �рлык. NULL дл� безым�нных �рлыков"
+msgstr "Им�, и�пользуемое дл� ��ылки на тек�товый �рлык. NULL дл� безым�нных �рлыков"
 
-#: ../gtk/gtktexttag.c:205
-msgid "Background color as a (possibly unallocated) GdkColor"
-msgstr "Цвет фона как (возможно нера�пределённа�) �труктура GdkColor"
+#: ../gtk/gtktexttag.c:222
+#| msgid "Background RGBA color"
+msgid "Background RGBA"
+msgstr "Фон в формате RGBA"
 
-#: ../gtk/gtktexttag.c:212
+#: ../gtk/gtktexttag.c:230
 msgid "Background full height"
 msgstr "Полна� вы�ота фона"
 
-#: ../gtk/gtktexttag.c:213
-msgid ""
-"Whether the background color fills the entire line height or only the height "
-"of the tagged characters"
-msgstr ""
-"Будет ли цвет фона применен на вы�оту в�ей �троки или только на вы�оту "
-"�имволов, отмеченных тегами"
+#: ../gtk/gtktexttag.c:231
+msgid "Whether the background color fills the entire line height or only the height of the tagged characters"
+msgstr "Будет ли цвет фона применен на вы�оту в�ей �троки или только на вы�оту �имволов, отмеченных тегами"
 
-#: ../gtk/gtktexttag.c:229
-msgid "Foreground color as a (possibly unallocated) GdkColor"
-msgstr "Цвет тек�та как (возможно нера�пределённа�) �труктура GdkColor"
+#: ../gtk/gtktexttag.c:261
+#| msgid "Foreground color as RGBA"
+msgid "Foreground RGBA"
+msgstr "Цвет тек�та в формате RGBA"
 
-#: ../gtk/gtktexttag.c:237
+#: ../gtk/gtktexttag.c:270
 msgid "Text direction, e.g. right-to-left or left-to-right"
 msgstr "�аправление тек�та, т.е. �права налево или �лева направо"
 
-#: ../gtk/gtktexttag.c:286
+#: ../gtk/gtktexttag.c:319
 msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
 msgstr "Стиль шрифта в виде PangoStyle, например, PANGO_STYLE_ITALIC"
 
-#: ../gtk/gtktexttag.c:295
+#: ../gtk/gtktexttag.c:328
 msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
 msgstr "Вариант шрифта в виде PangoVariant, например, PANGO_VARIANT_SMALL_CAPS"
 
-#: ../gtk/gtktexttag.c:304
-msgid ""
-"Font weight as an integer, see predefined values in PangoWeight; for "
-"example, PANGO_WEIGHT_BOLD"
-msgstr ""
-"Ве� шрифта как целое чи�ло, �мотрите предопределённые значени� в наборе "
-"PangoWeight; к примеру, PANGO_WEIGHT_BOLD"
+#: ../gtk/gtktexttag.c:337
+msgid "Font weight as an integer, see predefined values in PangoWeight; for example, PANGO_WEIGHT_BOLD"
+msgstr "Ве� шрифта как целое чи�ло, �мотрите предопределённые значени� в наборе PangoWeight; к примеру, PANGO_WEIGHT_BOLD"
 
-#: ../gtk/gtktexttag.c:315
+#: ../gtk/gtktexttag.c:348
 msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
-msgstr ""
-"Разр�дка шрифта как значение в наборе PangoStretch; к примеру, "
-"PANGO_STRETCH_CONDENCED"
+msgstr "Разр�дка шрифта как значение в наборе PangoStretch; к примеру, PANGO_STRETCH_CONDENCED"
 
-#: ../gtk/gtktexttag.c:324
+#: ../gtk/gtktexttag.c:357
 msgid "Font size in Pango units"
 msgstr "Размер шрифта в единицах �и�темы Pango"
 
-#: ../gtk/gtktexttag.c:334
-msgid ""
-"Font size as a scale factor relative to the default font size. This properly "
-"adapts to theme changes etc. so is recommended. Pango predefines some scales "
-"such as PANGO_SCALE_X_LARGE"
-msgstr ""
-"Размер шрифта, как ко�ффициент ма�штабировани� отно�ительно «шрифта по "
-"умолчанию».  Это �вой�тво позвол�ет адаптировать�� к изменени�м тем, и "
-"потому рекомендует��.  Pango имеет не�колько предопределённых ма�штабов, "
-"например PANGO_SCALE_X_LARGE"
+#: ../gtk/gtktexttag.c:367
+msgid "Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE"
+msgstr "Размер шрифта, как ко�ффициент ма�штабировани� отно�ительно «шрифта по умолчанию».  Это �вой�тво позвол�ет адаптировать�� к изменени�м тем, и потому рекомендует��.  Pango имеет не�колько предопределённых ма�штабов, например PANGO_SCALE_X_LARGE"
 
-#: ../gtk/gtktexttag.c:354 ../gtk/gtktextview.c:702
+#: ../gtk/gtktexttag.c:387
+#: ../gtk/gtktextview.c:704
 msgid "Left, right, or center justification"
 msgstr "Выравнивание влево, вправо или по центру"
 
-#: ../gtk/gtktexttag.c:373
-msgid ""
-"The language this text is in, as an ISO code. Pango can use this as a hint "
-"when rendering the text. If not set, an appropriate default will be used."
-msgstr ""
-"Язык, на котором напи�ан тек�т, в виде ISO-кода.  Pango может и�пользовать "
-"�то значение как под�казку (hint) при отри�овке тек�та. Е�ли не у�тановлен, "
-"будет и�пользовать�� параметр по умолчанию."
+#: ../gtk/gtktexttag.c:406
+msgid "The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If not set, an appropriate default will be used."
+msgstr "Язык, на котором напи�ан тек�т, в виде ISO-кода.  Pango может и�пользовать �то значение как под�казку (hint) при отри�овке тек�та. Е�ли не у�тановлен, будет и�пользовать�� параметр по умолчанию."
 
-#: ../gtk/gtktexttag.c:380
+#: ../gtk/gtktexttag.c:413
 msgid "Left margin"
 msgstr "От�туп �лева"
 
-#: ../gtk/gtktexttag.c:381 ../gtk/gtktextview.c:711
+#: ../gtk/gtktexttag.c:414
+#: ../gtk/gtktextview.c:713
 msgid "Width of the left margin in pixels"
 msgstr "Ширина от�тупа �лева в точках ра�тра"
 
-#: ../gtk/gtktexttag.c:390
+#: ../gtk/gtktexttag.c:423
 msgid "Right margin"
 msgstr "От�туп �права"
 
-#: ../gtk/gtktexttag.c:391 ../gtk/gtktextview.c:721
+#: ../gtk/gtktexttag.c:424
+#: ../gtk/gtktextview.c:723
 msgid "Width of the right margin in pixels"
 msgstr "Ширина от�тупа �права в пик�ел�х"
 
-#: ../gtk/gtktexttag.c:401 ../gtk/gtktextview.c:730
+#: ../gtk/gtktexttag.c:434
+#: ../gtk/gtktextview.c:732
 msgid "Indent"
 msgstr "�бзац"
 
-#: ../gtk/gtktexttag.c:402 ../gtk/gtktextview.c:731
+#: ../gtk/gtktexttag.c:435
+#: ../gtk/gtktextview.c:733
 msgid "Amount to indent the paragraph, in pixels"
 msgstr "�бзацный от�туп, в пик�ел�х"
 
-#: ../gtk/gtktexttag.c:413
-msgid ""
-"Offset of text above the baseline (below the baseline if rise is negative) "
-"in Pango units"
-msgstr ""
-"Смещение тек�та над базовой линией (под линию шрифта, дл� отрицательных "
-"значений) в единицах Pango"
+#: ../gtk/gtktexttag.c:446
+msgid "Offset of text above the baseline (below the baseline if rise is negative) in Pango units"
+msgstr "Смещение тек�та над базовой линией (под линию шрифта, дл� отрицательных значений) в единицах Pango"
 
-#: ../gtk/gtktexttag.c:422
+#: ../gtk/gtktexttag.c:455
 msgid "Pixels above lines"
 msgstr "Пик�елей над �троками"
 
-#: ../gtk/gtktexttag.c:423 ../gtk/gtktextview.c:655
+#: ../gtk/gtktexttag.c:456
+#: ../gtk/gtktextview.c:657
 msgid "Pixels of blank space above paragraphs"
 msgstr "Пик�елей в про�тран�тве над абзацами"
 
-#: ../gtk/gtktexttag.c:432
+#: ../gtk/gtktexttag.c:465
 msgid "Pixels below lines"
 msgstr "Пик�елей под �троками"
 
-#: ../gtk/gtktexttag.c:433 ../gtk/gtktextview.c:665
+#: ../gtk/gtktexttag.c:466
+#: ../gtk/gtktextview.c:667
 msgid "Pixels of blank space below paragraphs"
 msgstr "Пик�елей в про�тран�тве под абзацами"
 
-#: ../gtk/gtktexttag.c:442
+#: ../gtk/gtktexttag.c:475
 msgid "Pixels inside wrap"
 msgstr "Пик�елей в абзаце"
 
-#: ../gtk/gtktexttag.c:443 ../gtk/gtktextview.c:675
+#: ../gtk/gtktexttag.c:476
+#: ../gtk/gtktextview.c:677
 msgid "Pixels of blank space between wrapped lines in a paragraph"
 msgstr "Пик�елей в про�тран�тве между перене�ёнными �троками в абзаце"
 
-#: ../gtk/gtktexttag.c:470 ../gtk/gtktextview.c:693
-msgid ""
-"Whether to wrap lines never, at word boundaries, or at character boundaries"
-msgstr ""
-"�икогда не перено�ить �троки, перено�ить ли по границам �лов или по �имволам"
+#: ../gtk/gtktexttag.c:503
+#: ../gtk/gtktextview.c:695
+msgid "Whether to wrap lines never, at word boundaries, or at character boundaries"
+msgstr "�икогда не перено�ить �троки, перено�ить ли по границам �лов или по �имволам"
 
-#: ../gtk/gtktexttag.c:479 ../gtk/gtktextview.c:740
+#: ../gtk/gtktexttag.c:512
+#: ../gtk/gtktextview.c:742
 msgid "Tabs"
 msgstr "Табул�торы"
 
-#: ../gtk/gtktexttag.c:480 ../gtk/gtktextview.c:741
+#: ../gtk/gtktexttag.c:513
+#: ../gtk/gtktextview.c:743
 msgid "Custom tabs for this text"
 msgstr "Пользователь�кие табул�торы дл� тек�та"
 
-#: ../gtk/gtktexttag.c:498
+#: ../gtk/gtktexttag.c:531
 msgid "Invisible"
 msgstr "�евидимый"
 
-#: ../gtk/gtktexttag.c:499
+#: ../gtk/gtktexttag.c:532
 msgid "Whether this text is hidden."
 msgstr "Скрыт ли �тот тек�т"
 
-#: ../gtk/gtktexttag.c:513
+#: ../gtk/gtktexttag.c:546
 msgid "Paragraph background color name"
 msgstr "Им� цвета фона параграфа"
 
-#: ../gtk/gtktexttag.c:514
+#: ../gtk/gtktexttag.c:547
 msgid "Paragraph background color as a string"
 msgstr "Цвет фона параграфа как �трока"
 
-#: ../gtk/gtktexttag.c:529
+#: ../gtk/gtktexttag.c:561
 msgid "Paragraph background color"
 msgstr "Цвет фона параграфа"
 
-#: ../gtk/gtktexttag.c:530
-msgid "Paragraph background color as a (possibly unallocated) GdkColor"
-msgstr "Цвет фона параграфа как (возможно нера�пределённа�) �труктура GdkColor"
+#: ../gtk/gtktexttag.c:562
+#| msgid "Paragraph background color as a string"
+msgid "Paragraph background color as a GdkColor"
+msgstr "Цвет фона параграфа как GdkColor"
+
+#: ../gtk/gtktexttag.c:576
+#| msgid "Paragraph background set"
+msgid "Paragraph background RGBA"
+msgstr "Фон параграфа в формате RGBA"
+
+#: ../gtk/gtktexttag.c:577
+#| msgid "Paragraph background color as a string"
+msgid "Paragraph background RGBA as a GdkRGBA"
+msgstr "Фон параграфа в формате RGBA как GdkRGBA"
 
-#: ../gtk/gtktexttag.c:548
+#: ../gtk/gtktexttag.c:595
 msgid "Margin Accumulates"
 msgstr "Границы накапливают��"
 
-#: ../gtk/gtktexttag.c:549
+#: ../gtk/gtktexttag.c:596
 msgid "Whether left and right margins accumulate."
 msgstr "�акапливают�� ли лева� и права� границы."
 
-#: ../gtk/gtktexttag.c:562
+#: ../gtk/gtktexttag.c:609
 msgid "Background full height set"
 msgstr "Полна� вы�ота фона"
 
-#: ../gtk/gtktexttag.c:563
+#: ../gtk/gtktexttag.c:610
 msgid "Whether this tag affects background height"
 msgstr "Вли�ет ли �тот тег на вы�оту фона"
 
-#: ../gtk/gtktexttag.c:602
+#: ../gtk/gtktexttag.c:649
 msgid "Justification set"
 msgstr "Выравнивание"
 
-#: ../gtk/gtktexttag.c:603
+#: ../gtk/gtktexttag.c:650
 msgid "Whether this tag affects paragraph justification"
 msgstr "Вли�ет ли �тот тег на выравнивание абзацев"
 
-#: ../gtk/gtktexttag.c:610
+#: ../gtk/gtktexttag.c:657
 msgid "Left margin set"
 msgstr "Левое поле"
 
-#: ../gtk/gtktexttag.c:611
+#: ../gtk/gtktexttag.c:658
 msgid "Whether this tag affects the left margin"
 msgstr "Вли�ет ли �тот тег на левое поле"
 
-#: ../gtk/gtktexttag.c:614
+#: ../gtk/gtktexttag.c:661
 msgid "Indent set"
 msgstr "От�туп"
 
-#: ../gtk/gtktexttag.c:615
+#: ../gtk/gtktexttag.c:662
 msgid "Whether this tag affects indentation"
 msgstr "Вли�ет ли �тот тег на от�туп"
 
-#: ../gtk/gtktexttag.c:622
+#: ../gtk/gtktexttag.c:669
 msgid "Pixels above lines set"
 msgstr "Пик�ели над �троками"
 
-#: ../gtk/gtktexttag.c:623 ../gtk/gtktexttag.c:627
+#: ../gtk/gtktexttag.c:670
+#: ../gtk/gtktexttag.c:674
 msgid "Whether this tag affects the number of pixels above lines"
 msgstr "Вли�ет ли �тот тег на количе�тво пик�елей над �троками"
 
-#: ../gtk/gtktexttag.c:626
+#: ../gtk/gtktexttag.c:673
 msgid "Pixels below lines set"
 msgstr "Пик�ели под �троками"
 
-#: ../gtk/gtktexttag.c:630
+#: ../gtk/gtktexttag.c:677
 msgid "Pixels inside wrap set"
 msgstr "Пик�ели между перене�енными �троками"
 
-#: ../gtk/gtktexttag.c:631
+#: ../gtk/gtktexttag.c:678
 msgid "Whether this tag affects the number of pixels between wrapped lines"
 msgstr "Вли�ет ли �тот тег на количе�тво пик�елей между перене�енными �троками"
 
-#: ../gtk/gtktexttag.c:638
+#: ../gtk/gtktexttag.c:685
 msgid "Right margin set"
 msgstr "Правое поле"
 
-#: ../gtk/gtktexttag.c:639
+#: ../gtk/gtktexttag.c:686
 msgid "Whether this tag affects the right margin"
 msgstr "Вли�ет ли �тот тег на правое поле"
 
-#: ../gtk/gtktexttag.c:646
+#: ../gtk/gtktexttag.c:693
 msgid "Wrap mode set"
 msgstr "Режим перено�а"
 
-#: ../gtk/gtktexttag.c:647
+#: ../gtk/gtktexttag.c:694
 msgid "Whether this tag affects line wrap mode"
 msgstr "Вли�ет ли �тот тег на режим перено�а �трок"
 
-#: ../gtk/gtktexttag.c:650
+#: ../gtk/gtktexttag.c:697
 msgid "Tabs set"
 msgstr "Табул�ци�"
 
-#: ../gtk/gtktexttag.c:651
+#: ../gtk/gtktexttag.c:698
 msgid "Whether this tag affects tabs"
 msgstr "Вли�ет ли �тот тег на табул�цию"
 
-#: ../gtk/gtktexttag.c:654
+#: ../gtk/gtktexttag.c:701
 msgid "Invisible set"
 msgstr "�евидимо�ть"
 
-#: ../gtk/gtktexttag.c:655
+#: ../gtk/gtktexttag.c:702
 msgid "Whether this tag affects text visibility"
 msgstr "Вли�ет ли �тот тег на видимо�ть тек�та"
 
-#: ../gtk/gtktexttag.c:658
+#: ../gtk/gtktexttag.c:705
 msgid "Paragraph background set"
 msgstr "Фон параграфа у�тановлен"
 
-#: ../gtk/gtktexttag.c:659
+#: ../gtk/gtktexttag.c:706
 msgid "Whether this tag affects the paragraph background color"
 msgstr "Вли�ет ли �тот тег на цвет фона параграфа"
 
-#: ../gtk/gtktextview.c:654
+#: ../gtk/gtktextview.c:656
 msgid "Pixels Above Lines"
 msgstr "Точек ра�тра над �троками"
 
-#: ../gtk/gtktextview.c:664
+#: ../gtk/gtktextview.c:666
 msgid "Pixels Below Lines"
 msgstr "Точек ра�тра под �троками"
 
-#: ../gtk/gtktextview.c:674
+#: ../gtk/gtktextview.c:676
 msgid "Pixels Inside Wrap"
 msgstr "Пик�ели между перене�енными �троками"
 
-#: ../gtk/gtktextview.c:692
+#: ../gtk/gtktextview.c:694
 msgid "Wrap Mode"
 msgstr "Режим перено�а"
 
-#: ../gtk/gtktextview.c:710
+#: ../gtk/gtktextview.c:712
 msgid "Left Margin"
 msgstr "От�туп �лева"
 
-#: ../gtk/gtktextview.c:720
+#: ../gtk/gtktextview.c:722
 msgid "Right Margin"
 msgstr "От�туп �права"
 
-#: ../gtk/gtktextview.c:748
+#: ../gtk/gtktextview.c:750
 msgid "Cursor Visible"
 msgstr "Видимый кур�ор"
 
-#: ../gtk/gtktextview.c:749
+#: ../gtk/gtktextview.c:751
 msgid "If the insertion cursor is shown"
 msgstr "Показывать ли точку в�тавки"
 
-#: ../gtk/gtktextview.c:756
+#: ../gtk/gtktextview.c:758
 msgid "Buffer"
 msgstr "Буфер"
 
-#: ../gtk/gtktextview.c:757
+#: ../gtk/gtktextview.c:759
 msgid "The buffer which is displayed"
 msgstr "Отображаемый буфер"
 
-#: ../gtk/gtktextview.c:765
+#: ../gtk/gtktextview.c:767
 msgid "Whether entered text overwrites existing contents"
 msgstr "Перезапи�ывает ли вводимый тек�т �уще�твующий"
 
-#: ../gtk/gtktextview.c:772
+#: ../gtk/gtktextview.c:774
 msgid "Accepts tab"
 msgstr "Принимать табул�цию"
 
-#: ../gtk/gtktextview.c:773
+#: ../gtk/gtktextview.c:775
 msgid "Whether Tab will result in a tab character being entered"
 msgstr "Будет ли принимать�� введённый �имвол табул�ции"
 
-#: ../gtk/gtktextview.c:808
+#: ../gtk/gtktextview.c:810
 msgid "Error underline color"
 msgstr "Цвет подчёркивани� ошибки"
 
-#: ../gtk/gtktextview.c:809
+#: ../gtk/gtktextview.c:811
 msgid "Color with which to draw error-indication underlines"
 msgstr "Цвет, и�пользуемый дл� подчёркивани� при индикации ошибки"
 
-#: ../gtk/gtkthemingengine.c:249
+#: ../gtk/gtkthemingengine.c:257
 msgid "Theming engine name"
 msgstr "�азвание механизма темы"
 
@@ -6495,235 +6457,230 @@ msgstr "Будет ли прок�и дл� дей�тви� выгл�деть
 msgid "Whether the toggle action should be active"
 msgstr "�ктивна ли кнопка-переключатель"
 
-#: ../gtk/gtktogglebutton.c:126 ../gtk/gtktoggletoolbutton.c:113
+#: ../gtk/gtktogglebutton.c:179
+#: ../gtk/gtktoggletoolbutton.c:128
 msgid "If the toggle button should be pressed in"
 msgstr "�ажата ли кнопка-переключатель"
 
-#: ../gtk/gtktogglebutton.c:134
+#: ../gtk/gtktogglebutton.c:187
 msgid "If the toggle button is in an \"in between\" state"
 msgstr "Е�ли кнопка-переключатель в «промежуточном» �о�то�нии."
 
-#: ../gtk/gtktogglebutton.c:141
+#: ../gtk/gtktogglebutton.c:194
 msgid "Draw Indicator"
 msgstr "Ри�овать индикатор"
 
-#: ../gtk/gtktogglebutton.c:142
+#: ../gtk/gtktogglebutton.c:195
 msgid "If the toggle part of the button is displayed"
 msgstr "Е�ли отображена переключающа� ча�ть кнопки"
 
-#: ../gtk/gtktoolbar.c:489 ../gtk/gtktoolpalette.c:1069
+#: ../gtk/gtktoolbar.c:501
+#: ../gtk/gtktoolpalette.c:1038
 msgid "Toolbar Style"
 msgstr "Стиль панели ин�трументов"
 
-#: ../gtk/gtktoolbar.c:490
+#: ../gtk/gtktoolbar.c:502
 msgid "How to draw the toolbar"
 msgstr "Как ри�овать панель ин�трументов"
 
-#: ../gtk/gtktoolbar.c:497
+#: ../gtk/gtktoolbar.c:509
 msgid "Show Arrow"
 msgstr "Показывать �трелку"
 
-#: ../gtk/gtktoolbar.c:498
+#: ../gtk/gtktoolbar.c:510
 msgid "If an arrow should be shown if the toolbar doesn't fit"
 msgstr "Показывать ли �трелку, е�ли панель ин�трументов не помещает��"
 
-#: ../gtk/gtktoolbar.c:519
+#: ../gtk/gtktoolbar.c:531
 msgid "Size of icons in this toolbar"
 msgstr "Размер значков в панели ин�трументов по умолчанию"
 
-#: ../gtk/gtktoolbar.c:534 ../gtk/gtktoolpalette.c:1055
+#: ../gtk/gtktoolbar.c:546
+#: ../gtk/gtktoolpalette.c:1024
 msgid "Icon size set"
 msgstr "Размера значка у�тановлен"
 
-#: ../gtk/gtktoolbar.c:535 ../gtk/gtktoolpalette.c:1056
+#: ../gtk/gtktoolbar.c:547
+#: ../gtk/gtktoolpalette.c:1025
 msgid "Whether the icon-size property has been set"
 msgstr "У�тановлено ли �вой�тво размера значка"
 
-#: ../gtk/gtktoolbar.c:544
+#: ../gtk/gtktoolbar.c:556
 msgid "Whether the item should receive extra space when the toolbar grows"
 msgstr "Ра�шир�ют�� ли �лементы при увеличении размера панели ин�трументов"
 
-#: ../gtk/gtktoolbar.c:552 ../gtk/gtktoolitemgroup.c:1650
+#: ../gtk/gtktoolbar.c:564
+#: ../gtk/gtktoolitemgroup.c:1646
 msgid "Whether the item should be the same size as other homogeneous items"
 msgstr "Имеют ли в�е гомогенные �лементы одинаковый размер"
 
-#: ../gtk/gtktoolbar.c:559
+#: ../gtk/gtktoolbar.c:571
 msgid "Spacer size"
 msgstr "Размер разделител�"
 
-#: ../gtk/gtktoolbar.c:560
+#: ../gtk/gtktoolbar.c:572
 msgid "Size of spacers"
 msgstr "Размер разделителей"
 
-#: ../gtk/gtktoolbar.c:569
+#: ../gtk/gtktoolbar.c:581
 msgid "Amount of border space between the toolbar shadow and the buttons"
 msgstr "Ра��то�ние между тенью панели ин�трументов и кнопками"
 
-#: ../gtk/gtktoolbar.c:577
+#: ../gtk/gtktoolbar.c:589
 msgid "Maximum child expand"
 msgstr "Мак�имальное ра�ширение �лементов"
 
-#: ../gtk/gtktoolbar.c:578
+#: ../gtk/gtktoolbar.c:590
 msgid "Maximum amount of space an expandable item will be given"
 msgstr "Мак�имальное про�тран�тво, занимаемое каждым из ра�шир�емых �лементов"
 
-#: ../gtk/gtktoolbar.c:586
+#: ../gtk/gtktoolbar.c:598
 msgid "Space style"
 msgstr "Стиль разделител�"
 
-#: ../gtk/gtktoolbar.c:587
+#: ../gtk/gtktoolbar.c:599
 msgid "Whether spacers are vertical lines or just blank"
 msgstr "Будут ли разделители вертикальными лини�ми или про�то пу�тыми"
 
-#: ../gtk/gtktoolbar.c:594
+#: ../gtk/gtktoolbar.c:606
 msgid "Button relief"
 msgstr "Рельеф кнопки"
 
-#: ../gtk/gtktoolbar.c:595
+#: ../gtk/gtktoolbar.c:607
 msgid "Type of bevel around toolbar buttons"
 msgstr "Тип �ко�а вокруг кнопок панели ин�трументов"
 
-#: ../gtk/gtktoolbar.c:602
+#: ../gtk/gtktoolbar.c:614
 msgid "Style of bevel around the toolbar"
 msgstr "Стиль �ко�а вокруг панели ин�трументов"
 
-#: ../gtk/gtktoolbutton.c:202
+#: ../gtk/gtktoolbutton.c:233
 msgid "Text to show in the item."
 msgstr "Тек�т дл� отображени� в �лементе."
 
-#: ../gtk/gtktoolbutton.c:209
-msgid ""
-"If set, an underline in the label property indicates that the next character "
-"should be used for the mnemonic accelerator key in the overflow menu"
-msgstr ""
-"Е�ли у�тановлено, подчёркивание в метке означает, что �ледующий �имвол "
-"должен и�пользовать�� в комбинации клавиш."
+#: ../gtk/gtktoolbutton.c:240
+msgid "If set, an underline in the label property indicates that the next character should be used for the mnemonic accelerator key in the overflow menu"
+msgstr "Е�ли у�тановлено, подчёркивание в метке означает, что �ледующий �имвол должен и�пользовать�� в комбинации клавиш."
 
-#: ../gtk/gtktoolbutton.c:216
+#: ../gtk/gtktoolbutton.c:247
 msgid "Widget to use as the item label"
 msgstr "Виджет дл� и�пользовани� в каче�тве метки �лемента"
 
-#: ../gtk/gtktoolbutton.c:222
+#: ../gtk/gtktoolbutton.c:253
 msgid "Stock Id"
 msgstr "Идентификатор (ID) в�троенного значка"
 
-#: ../gtk/gtktoolbutton.c:223
+#: ../gtk/gtktoolbutton.c:254
 msgid "The stock icon displayed on the item"
 msgstr "В�троенный значок, отображаемый в �лементе"
 
-#: ../gtk/gtktoolbutton.c:239
+#: ../gtk/gtktoolbutton.c:270
 msgid "Icon name"
 msgstr "Им� значка"
 
-#: ../gtk/gtktoolbutton.c:240
+#: ../gtk/gtktoolbutton.c:271
 msgid "The name of the themed icon displayed on the item"
 msgstr "Им� значка из темы, отображаемого на �лементе"
 
-#: ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolbutton.c:277
 msgid "Icon widget"
 msgstr "Виджет значка"
 
-#: ../gtk/gtktoolbutton.c:247
+#: ../gtk/gtktoolbutton.c:278
 msgid "Icon widget to display in the item"
 msgstr "Виджет значка, отображающего�� в �лементе"
 
-#: ../gtk/gtktoolbutton.c:260
+#: ../gtk/gtktoolbutton.c:291
 msgid "Icon spacing"
 msgstr "От�туп значка"
 
-#: ../gtk/gtktoolbutton.c:261
+#: ../gtk/gtktoolbutton.c:292
 msgid "Spacing in pixels between the icon and label"
 msgstr "Ра��то�ние в пик�ел�х между значком и меткой"
 
-#: ../gtk/gtktoolitem.c:210
-msgid ""
-"Whether the toolbar item is considered important. When TRUE, toolbar buttons "
-"show text in GTK_TOOLBAR_BOTH_HORIZ mode"
-msgstr ""
-"Считать ли �лемент панели ин�трументов важным. Е�ли у�тановлено, кнопки "
-"будут показывать тек�т в режиме GTK_TOOLBAR_BOTH_HORIZ"
+#: ../gtk/gtktoolitem.c:209
+msgid "Whether the toolbar item is considered important. When TRUE, toolbar buttons show text in GTK_TOOLBAR_BOTH_HORIZ mode"
+msgstr "Считать ли �лемент панели ин�трументов важным. Е�ли у�тановлено, кнопки будут показывать тек�т в режиме GTK_TOOLBAR_BOTH_HORIZ"
 
-#: ../gtk/gtktoolitemgroup.c:1597
+#: ../gtk/gtktoolitemgroup.c:1593
 msgid "The human-readable title of this item group"
 msgstr "Заголовок данной группы �лементов в пон�тной человеку форме"
 
-#: ../gtk/gtktoolitemgroup.c:1604
+#: ../gtk/gtktoolitemgroup.c:1600
 msgid "A widget to display in place of the usual label"
 msgstr "Виджет, который будет отображать�� вме�то обычной метки"
 
-#: ../gtk/gtktoolitemgroup.c:1610
+#: ../gtk/gtktoolitemgroup.c:1606
 msgid "Collapsed"
 msgstr "Свёрнуто"
 
-#: ../gtk/gtktoolitemgroup.c:1611
+#: ../gtk/gtktoolitemgroup.c:1607
 msgid "Whether the group has been collapsed and items are hidden"
 msgstr "Будет ли группа �вёрнута, а �лементы �пр�таны"
 
-#: ../gtk/gtktoolitemgroup.c:1617
+#: ../gtk/gtktoolitemgroup.c:1613
 msgid "ellipsize"
 msgstr "�ллиптизаци�"
 
-#: ../gtk/gtktoolitemgroup.c:1618
+#: ../gtk/gtktoolitemgroup.c:1614
 msgid "Ellipsize for item group headers"
 msgstr "Эллиптизаци� заголовков группы �лементов"
 
-#: ../gtk/gtktoolitemgroup.c:1624
+#: ../gtk/gtktoolitemgroup.c:1620
 msgid "Header Relief"
 msgstr "Форма рельефа заголовка"
 
-#: ../gtk/gtktoolitemgroup.c:1625
+#: ../gtk/gtktoolitemgroup.c:1621
 msgid "Relief of the group header button"
 msgstr "Форма рельефа кнопки заголовков �толбцов"
 
-#: ../gtk/gtktoolitemgroup.c:1640
+#: ../gtk/gtktoolitemgroup.c:1636
 msgid "Header Spacing"
 msgstr "Про�тран�тво заголовка"
 
-#: ../gtk/gtktoolitemgroup.c:1641
+#: ../gtk/gtktoolitemgroup.c:1637
 msgid "Spacing between expander arrow and caption"
 msgstr "Интервал между �трелкой-ра�ширителем и заголовком"
 
-#: ../gtk/gtktoolitemgroup.c:1657
+#: ../gtk/gtktoolitemgroup.c:1653
 msgid "Whether the item should receive extra space when the group grows"
 msgstr "Ра�шир�ет�� ли �лемент при увеличении размера группы"
 
-#: ../gtk/gtktoolitemgroup.c:1664
+#: ../gtk/gtktoolitemgroup.c:1660
 msgid "Whether the item should fill the available space"
 msgstr "Должен ли �лемент заполн�ть в�ё до�тупное про�тран�тво"
 
-#: ../gtk/gtktoolitemgroup.c:1670
+#: ../gtk/gtktoolitemgroup.c:1666
 msgid "New Row"
 msgstr "�ова� �трока"
 
-#: ../gtk/gtktoolitemgroup.c:1671
+#: ../gtk/gtktoolitemgroup.c:1667
 msgid "Whether the item should start a new row"
 msgstr "Должен ли �лемент �оздавать новую �троку"
 
-#: ../gtk/gtktoolitemgroup.c:1678
+#: ../gtk/gtktoolitemgroup.c:1674
 msgid "Position of the item within this group"
 msgstr "Ра�положение �лемента внутри данной группы"
 
-#: ../gtk/gtktoolpalette.c:1040
+#: ../gtk/gtktoolpalette.c:1009
 msgid "Size of icons in this tool palette"
 msgstr "Размер значков в данной панели ин�трументов"
 
-#: ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktoolpalette.c:1039
 msgid "Style of items in the tool palette"
 msgstr "Стиль �лементов на панели ин�трументов"
 
-#: ../gtk/gtktoolpalette.c:1086
+#: ../gtk/gtktoolpalette.c:1055
 msgid "Exclusive"
 msgstr "И�ключительно"
 
-#: ../gtk/gtktoolpalette.c:1087
+#: ../gtk/gtktoolpalette.c:1056
 msgid "Whether the item group should be the only expanded at a given time"
 msgstr "Должна ли группа �лементов ра�шир�ть�� только в определённое врем�"
 
-#: ../gtk/gtktoolpalette.c:1102
-msgid ""
-"Whether the item group should receive extra space when the palette grows"
-msgstr ""
-"Должно ли увеличивать�� про�тран�тво группы �лементов при увеличении панели"
+#: ../gtk/gtktoolpalette.c:1071
+msgid "Whether the item group should receive extra space when the palette grows"
+msgstr "Должно ли увеличивать�� про�тран�тво группы �лементов при увеличении панели"
 
 #: ../gtk/gtktrayicon-x11.c:138
 msgid "Foreground color for symbolic icons"
@@ -6763,8 +6720,7 @@ msgstr "Размер значка"
 
 #: ../gtk/gtktrayicon-x11.c:180
 msgid "The pixel size that icons should be forced to, or zero"
-msgstr ""
-"Размер значка в пик�ел�х, к которому должны быть приведены значки, или ноль"
+msgstr "Размер значка в пик�ел�х, к которому должны быть приведены значки, или ноль"
 
 #: ../gtk/gtktreemenu.c:287
 msgid "TreeMenu model"
@@ -6798,11 +6754,11 @@ msgstr "Ширина перено�а"
 msgid "Wrap width for laying out items in a grid"
 msgstr "Ширина размещени� �лементов в �етке"
 
-#: ../gtk/gtktreemodelsort.c:312
+#: ../gtk/gtktreemodelsort.c:491
 msgid "TreeModelSort Model"
 msgstr "Модель TreeModelSort"
 
-#: ../gtk/gtktreemodelsort.c:313
+#: ../gtk/gtktreemodelsort.c:492
 msgid "The model for the TreeModelSort to sort"
 msgstr "Модель дл� �ортировки TreeModelSort"
 
@@ -6844,8 +6800,7 @@ msgstr "Под�казка дл� правил"
 
 #: ../gtk/gtktreeview.c:1031
 msgid "Set a hint to the theme engine to draw rows in alternating colors"
-msgstr ""
-"Задать под�казку дл� проце��ора тем дл� окрашивани� �трок в разные цвета"
+msgstr "Задать под�казку дл� проце��ора тем дл� окрашивани� �трок в разные цвета"
 
 #: ../gtk/gtktreeview.c:1038
 msgid "Enable Search"
@@ -6853,9 +6808,7 @@ msgstr "Разрешён пои�к"
 
 #: ../gtk/gtktreeview.c:1039
 msgid "View allows user to search through columns interactively"
-msgstr ""
-"Про�мотр позвол�ет пользователю выполн�ть пои�к по �толбцам в интерактивном "
-"режиме"
+msgstr "Про�мотр позвол�ет пользователю выполн�ть пои�к по �толбцам в интерактивном режиме"
 
 #: ../gtk/gtktreeview.c:1046
 msgid "Search Column"
@@ -6863,9 +6816,7 @@ msgstr "�айти �толбец"
 
 #: ../gtk/gtktreeview.c:1047
 msgid "Model column to search through during interactive search"
-msgstr ""
-"Столбец модели, по которому �ледует выполн�ть интерактивный пои�к по мере "
-"набора"
+msgstr "Столбец модели, по которому �ледует выполн�ть интерактивный пои�к по мере набора"
 
 #: ../gtk/gtktreeview.c:1067
 msgid "Fixed Height Mode"
@@ -6873,9 +6824,7 @@ msgstr "Режим фик�ированной вы�ота"
 
 #: ../gtk/gtktreeview.c:1068
 msgid "Speeds up GtkTreeView by assuming that all rows have the same height"
-msgstr ""
-"У�кор�ет виджет GtkTreeView, так как предполагает��, что в�е �троки имеют "
-"одинаковую вы�оту"
+msgstr "У�кор�ет виджет GtkTreeView, так как предполагает��, что в�е �троки имеют одинаковую вы�оту"
 
 #: ../gtk/gtktreeview.c:1088
 msgid "Hover Selection"
@@ -6890,10 +6839,8 @@ msgid "Hover Expand"
 msgstr "След�щее ра�ширение"
 
 #: ../gtk/gtktreeview.c:1109
-msgid ""
-"Whether rows should be expanded/collapsed when the pointer moves over them"
-msgstr ""
-"Должны ли �троки ра�шир�ть��/�жимать�� при перемещении кур�ора над ними"
+msgid "Whether rows should be expanded/collapsed when the pointer moves over them"
+msgstr "Должны ли �троки ра�шир�ть��/�жимать�� при перемещении кур�ора над ними"
 
 #: ../gtk/gtktreeview.c:1123
 msgid "Show Expanders"
@@ -6916,10 +6863,8 @@ msgid "Rubber Banding"
 msgstr "Выделение мышью"
 
 #: ../gtk/gtktreeview.c:1149
-msgid ""
-"Whether to enable selection of multiple items by dragging the mouse pointer"
-msgstr ""
-"Допу�кать ли выделение не�кольких �лементов при движении указател� мыши"
+msgid "Whether to enable selection of multiple items by dragging the mouse pointer"
+msgstr "Допу�кать ли выделение не�кольких �лементов при движении указател� мыши"
 
 #: ../gtk/gtktreeview.c:1156
 msgid "Enable Grid Lines"
@@ -6939,9 +6884,7 @@ msgstr "Будут ли отображать�� линии в дереве"
 
 #: ../gtk/gtktreeview.c:1174
 msgid "The column in the model containing the tooltip texts for the rows"
-msgstr ""
-"Столбец в модели и�точника данных, �одержащий в�плывающие под�казки дл� "
-"�трок."
+msgstr "Столбец в модели и�точника данных, �одержащий в�плывающие под�казки дл� �трок."
 
 #: ../gtk/gtktreeview.c:1196
 msgid "Vertical Separator Width"
@@ -7023,123 +6966,125 @@ msgstr "Образец линии"
 msgid "Dash pattern used to draw the tree view lines"
 msgstr "Образец штрихов дл� отображени� линии, раздел�ющей �троки"
 
-#: ../gtk/gtktreeviewcolumn.c:247
+#: ../gtk/gtktreeviewcolumn.c:249
 msgid "Whether to display the column"
 msgstr "Отображать ли �толбец"
 
-#: ../gtk/gtktreeviewcolumn.c:254 ../gtk/gtkwindow.c:646
+#: ../gtk/gtktreeviewcolumn.c:256
+#: ../gtk/gtkwindow.c:650
 msgid "Resizable"
 msgstr "С измен�емым размером"
 
-#: ../gtk/gtktreeviewcolumn.c:255
+#: ../gtk/gtktreeviewcolumn.c:257
 msgid "Column is user-resizable"
 msgstr "Размер �толбца может быть изменён пользователем"
 
-#: ../gtk/gtktreeviewcolumn.c:263
+#: ../gtk/gtktreeviewcolumn.c:265
+#| msgid "Current width of the column"
+msgid "Current X position of the column"
+msgstr "Текущее положение �толбца по о�и X"
+
+#: ../gtk/gtktreeviewcolumn.c:275
 msgid "Current width of the column"
 msgstr "Текуща� ширина �толбца"
 
-#: ../gtk/gtktreeviewcolumn.c:280
+#: ../gtk/gtktreeviewcolumn.c:292
 msgid "Sizing"
 msgstr "У�тановка размера"
 
-#: ../gtk/gtktreeviewcolumn.c:281
+#: ../gtk/gtktreeviewcolumn.c:293
 msgid "Resize mode of the column"
 msgstr "Режим изменени� размера �толбца"
 
-#: ../gtk/gtktreeviewcolumn.c:289
+#: ../gtk/gtktreeviewcolumn.c:301
 msgid "Fixed Width"
 msgstr "Фик�ированна� ширина"
 
-#: ../gtk/gtktreeviewcolumn.c:290
+#: ../gtk/gtktreeviewcolumn.c:302
 msgid "Current fixed width of the column"
 msgstr "Текуща� фик�ированна� ширина �толбца"
 
-#: ../gtk/gtktreeviewcolumn.c:300
+#: ../gtk/gtktreeviewcolumn.c:312
 msgid "Minimum allowed width of the column"
 msgstr "Минимально допу�тима� ширина �толбца"
 
-#: ../gtk/gtktreeviewcolumn.c:309
+#: ../gtk/gtktreeviewcolumn.c:321
 msgid "Maximum Width"
 msgstr "Мак�имальна� ширина"
 
-#: ../gtk/gtktreeviewcolumn.c:310
+#: ../gtk/gtktreeviewcolumn.c:322
 msgid "Maximum allowed width of the column"
 msgstr "Мак�имально допу�тима� ширина �толбца"
 
-#: ../gtk/gtktreeviewcolumn.c:320
+#: ../gtk/gtktreeviewcolumn.c:332
 msgid "Title to appear in column header"
 msgstr "Заголовок, отображаемый в заголовке �толбца"
 
-#: ../gtk/gtktreeviewcolumn.c:328
+#: ../gtk/gtktreeviewcolumn.c:340
 msgid "Column gets share of extra width allocated to the widget"
 msgstr "Столбцы ра�шир�ют�� до размеров выделенной виджету обла�ти"
 
-#: ../gtk/gtktreeviewcolumn.c:335
+#: ../gtk/gtktreeviewcolumn.c:347
 msgid "Clickable"
 msgstr "Чув�твительный к нажати�м"
 
-#: ../gtk/gtktreeviewcolumn.c:336
+#: ../gtk/gtktreeviewcolumn.c:348
 msgid "Whether the header can be clicked"
 msgstr "Чув�твителен ли заголовок к нажати�м"
 
-#: ../gtk/gtktreeviewcolumn.c:344
+#: ../gtk/gtktreeviewcolumn.c:356
 msgid "Widget"
 msgstr "Виджет"
 
-#: ../gtk/gtktreeviewcolumn.c:345
+#: ../gtk/gtktreeviewcolumn.c:357
 msgid "Widget to put in column header button instead of column title"
 msgstr "Виджет дл� замены заголовка �толбца кнопкой"
 
-#: ../gtk/gtktreeviewcolumn.c:353
+#: ../gtk/gtktreeviewcolumn.c:365
 msgid "X Alignment of the column header text or widget"
-msgstr ""
-"Выравнивание тек�та или �лемента управлени� в заголовке �толбца по "
-"горизонтали"
+msgstr "Выравнивание тек�та или �лемента управлени� в заголовке �толбца по горизонтали"
 
-#: ../gtk/gtktreeviewcolumn.c:363
+#: ../gtk/gtktreeviewcolumn.c:375
 msgid "Whether the column can be reordered around the headers"
 msgstr "Может ли �толбец быть перемещен в другое ме�то"
 
-#: ../gtk/gtktreeviewcolumn.c:370
+#: ../gtk/gtktreeviewcolumn.c:382
 msgid "Sort indicator"
 msgstr "Индикатор �ортировки"
 
-#: ../gtk/gtktreeviewcolumn.c:371
+#: ../gtk/gtktreeviewcolumn.c:383
 msgid "Whether to show a sort indicator"
 msgstr "Показывать ли индикатор �ортировки"
 
-#: ../gtk/gtktreeviewcolumn.c:378
+#: ../gtk/gtktreeviewcolumn.c:390
 msgid "Sort order"
 msgstr "Пор�док �ортировки"
 
-#: ../gtk/gtktreeviewcolumn.c:379
+#: ../gtk/gtktreeviewcolumn.c:391
 msgid "Sort direction the sort indicator should indicate"
 msgstr "�аправление �ортировки должно отображать�� индикатором"
 
-#: ../gtk/gtktreeviewcolumn.c:395
+#: ../gtk/gtktreeviewcolumn.c:407
 msgid "Sort column ID"
 msgstr "Идентификатор �толбца �ортировки"
 
-#: ../gtk/gtktreeviewcolumn.c:396
+#: ../gtk/gtktreeviewcolumn.c:408
 msgid "Logical sort column ID this column sorts on when selected for sorting"
-msgstr ""
-"Логиче�кий идентификатор �ортировки, по которому производит�� �ортировка "
-"�того �толбца, когда он выделен дл� �ортировки"
+msgstr "Логиче�кий идентификатор �ортировки, по которому производит�� �ортировка �того �толбца, когда он выделен дл� �ортировки"
 
-#: ../gtk/gtkuimanager.c:226
+#: ../gtk/gtkuimanager.c:480
 msgid "Whether tearoff menu items should be added to menus"
 msgstr "Следует ли добавл�ть отделённые меню к меню"
 
-#: ../gtk/gtkuimanager.c:233
+#: ../gtk/gtkuimanager.c:487
 msgid "Merged UI definition"
 msgstr "Объединённое определение интерфей�а"
 
-#: ../gtk/gtkuimanager.c:234
+#: ../gtk/gtkuimanager.c:488
 msgid "An XML string describing the merged UI"
 msgstr "Строка в формате XML, опи�ывающа� объединённый интерфей�"
 
-#: ../gtk/gtkviewport.c:154
+#: ../gtk/gtkviewport.c:156
 msgid "Determines how the shadowed box around the viewport is drawn"
 msgstr "Определ�ет �по�об прори�овки тени вокруг окна про�мотра"
 
@@ -7151,623 +7096,608 @@ msgstr "И�пользовать �имволиче�кие значки"
 msgid "Whether to use symbolic icons"
 msgstr "И�пользовать ли �имволиче�кие значки"
 
-#: ../gtk/gtkwidget.c:931
+#: ../gtk/gtkwidget.c:950
 msgid "Widget name"
 msgstr "Им� виджета"
 
-#: ../gtk/gtkwidget.c:932
+#: ../gtk/gtkwidget.c:951
 msgid "The name of the widget"
 msgstr "�азвание виджета"
 
-#: ../gtk/gtkwidget.c:938
+#: ../gtk/gtkwidget.c:957
 msgid "Parent widget"
 msgstr "Родитель�кий виджет"
 
-#: ../gtk/gtkwidget.c:939
+#: ../gtk/gtkwidget.c:958
 msgid "The parent widget of this widget. Must be a Container widget"
 msgstr "Родитель�кий виджет дл� виджета. Должен быть виджетом-контейнером"
 
-#: ../gtk/gtkwidget.c:946
+#: ../gtk/gtkwidget.c:965
 msgid "Width request"
 msgstr "Запро� на у�тановку ширины"
 
-#: ../gtk/gtkwidget.c:947
-msgid ""
-"Override for width request of the widget, or -1 if natural request should be "
-"used"
-msgstr ""
-"Изменение и�пользовани� запро�а на у�тановку ширины �лемента управлени� или -"
-"1, е�ли нужно и�пользовать и�ходный запро�"
+#: ../gtk/gtkwidget.c:966
+msgid "Override for width request of the widget, or -1 if natural request should be used"
+msgstr "Изменение и�пользовани� запро�а на у�тановку ширины �лемента управлени� или -1, е�ли нужно и�пользовать и�ходный запро�"
 
-#: ../gtk/gtkwidget.c:955
+#: ../gtk/gtkwidget.c:974
 msgid "Height request"
 msgstr "Запро� на у�тановку вы�оты"
 
-#: ../gtk/gtkwidget.c:956
-msgid ""
-"Override for height request of the widget, or -1 if natural request should "
-"be used"
-msgstr ""
-"Изменение запро�а на у�тановку вы�оты �лемента управлени� или -1, е�ли нужно "
-"и�пользовать и�ходный запро�"
+#: ../gtk/gtkwidget.c:975
+msgid "Override for height request of the widget, or -1 if natural request should be used"
+msgstr "Изменение запро�а на у�тановку вы�оты �лемента управлени� или -1, е�ли нужно и�пользовать и�ходный запро�"
 
-#: ../gtk/gtkwidget.c:965
+#: ../gtk/gtkwidget.c:984
 msgid "Whether the widget is visible"
 msgstr "Будет ли виджет видимым"
 
-#: ../gtk/gtkwidget.c:972
+#: ../gtk/gtkwidget.c:991
 msgid "Whether the widget responds to input"
 msgstr "Будет ли виждет и�пользовать ввод"
 
-#: ../gtk/gtkwidget.c:978
+#: ../gtk/gtkwidget.c:997
 msgid "Application paintable"
 msgstr "Отри�овываемый приложением"
 
-#: ../gtk/gtkwidget.c:979
+#: ../gtk/gtkwidget.c:998
 msgid "Whether the application will paint directly on the widget"
 msgstr "Будет ли приложение ри�овать напр�мую в виджете"
 
-#: ../gtk/gtkwidget.c:985
+#: ../gtk/gtkwidget.c:1004
 msgid "Can focus"
 msgstr "Может иметь фоку�"
 
-#: ../gtk/gtkwidget.c:986
+#: ../gtk/gtkwidget.c:1005
 msgid "Whether the widget can accept the input focus"
 msgstr "Будет ли виджет принимать фоку� ввода"
 
-#: ../gtk/gtkwidget.c:992
+#: ../gtk/gtkwidget.c:1011
 msgid "Has focus"
 msgstr "Имеет фоку�"
 
-#: ../gtk/gtkwidget.c:993
+#: ../gtk/gtkwidget.c:1012
 msgid "Whether the widget has the input focus"
 msgstr "Имеет ли виджет фоку� ввода"
 
-#: ../gtk/gtkwidget.c:999
+#: ../gtk/gtkwidget.c:1018
 msgid "Is focus"
 msgstr "Имеет фоку�"
 
-#: ../gtk/gtkwidget.c:1000
+#: ../gtk/gtkwidget.c:1019
 msgid "Whether the widget is the focus widget within the toplevel"
 msgstr "Получает ли виджет фоку� ввода в окне"
 
-#: ../gtk/gtkwidget.c:1006
+#: ../gtk/gtkwidget.c:1025
 msgid "Can default"
 msgstr "Выбирает�� по умолчанию"
 
-#: ../gtk/gtkwidget.c:1007
+#: ../gtk/gtkwidget.c:1026
 msgid "Whether the widget can be the default widget"
 msgstr "Может ли виджет быть «�лементом по умолчанию»"
 
-#: ../gtk/gtkwidget.c:1013
+#: ../gtk/gtkwidget.c:1032
 msgid "Has default"
 msgstr "Выбран по умолчанию"
 
-#: ../gtk/gtkwidget.c:1014
+#: ../gtk/gtkwidget.c:1033
 msgid "Whether the widget is the default widget"
 msgstr "Явл�ет�� ли виджет «и�ходным виджетом»"
 
-#: ../gtk/gtkwidget.c:1020
+#: ../gtk/gtkwidget.c:1039
 msgid "Receives default"
 msgstr "Дей�твие по умолчанию"
 
-#: ../gtk/gtkwidget.c:1021
+#: ../gtk/gtkwidget.c:1040
 msgid "If TRUE, the widget will receive the default action when it is focused"
-msgstr ""
-"Е�ли у�тановлено, то виджет получает дей�твие по умолчанию при получении "
-"фоку�а ввода"
+msgstr "Е�ли у�тановлено, то виджет получает дей�твие по умолчанию при получении фоку�а ввода"
 
-#: ../gtk/gtkwidget.c:1027
+#: ../gtk/gtkwidget.c:1046
 msgid "Composite child"
 msgstr "Со�тавной дочерний �лемент"
 
-#: ../gtk/gtkwidget.c:1028
+#: ../gtk/gtkwidget.c:1047
 msgid "Whether the widget is part of a composite widget"
 msgstr "Явл�ет�� ли виджет ча�тью �о�тавного �лемента управлени�"
 
-#: ../gtk/gtkwidget.c:1034
+#: ../gtk/gtkwidget.c:1053
 msgid "Style"
 msgstr "Стиль"
 
-#: ../gtk/gtkwidget.c:1035
-msgid ""
-"The style of the widget, which contains information about how it will look "
-"(colors etc)"
+#: ../gtk/gtkwidget.c:1054
+msgid "The style of the widget, which contains information about how it will look (colors etc)"
 msgstr "Стиль �лемента управлени�, опи�ывающий его внешний вид (цвета и т.п.)"
 
-#: ../gtk/gtkwidget.c:1041
+#: ../gtk/gtkwidget.c:1060
 msgid "Events"
 msgstr "Событи�"
 
-#: ../gtk/gtkwidget.c:1042
+#: ../gtk/gtkwidget.c:1061
 msgid "The event mask that decides what kind of GdkEvents this widget gets"
-msgstr ""
-"Ма�ка �обыти�, определ�юща�, какие �обыти� GdkEvents может получать �тот "
-"виджет"
+msgstr "Ма�ка �обыти�, определ�юща�, какие �обыти� GdkEvents может получать �тот виджет"
 
-#: ../gtk/gtkwidget.c:1049
+#: ../gtk/gtkwidget.c:1068
 msgid "No show all"
 msgstr "�е показывать в�ё"
 
-#: ../gtk/gtkwidget.c:1050
+#: ../gtk/gtkwidget.c:1069
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Будет ли функци� gtk_widget_show_all() воздей�твовать на �тот виждет"
 
-#: ../gtk/gtkwidget.c:1073
+#: ../gtk/gtkwidget.c:1092
 msgid "Whether this widget has a tooltip"
 msgstr "Имеет ли виджет в�плывающую под�казку"
 
-#: ../gtk/gtkwidget.c:1129
+#: ../gtk/gtkwidget.c:1148
 msgid "Window"
 msgstr "Окно"
 
-#: ../gtk/gtkwidget.c:1130
+#: ../gtk/gtkwidget.c:1149
 msgid "The widget's window if it is realized"
 msgstr "Окно виджета, е�ли виджет размещён на �кране"
 
-#: ../gtk/gtkwidget.c:1144
+#: ../gtk/gtkwidget.c:1163
 msgid "Double Buffered"
 msgstr "Дважды буферизован"
 
-#: ../gtk/gtkwidget.c:1145
+#: ../gtk/gtkwidget.c:1164
 msgid "Whether the widget is double buffered"
 msgstr "Должен ли виджет дважды буферизовывать��"
 
-#: ../gtk/gtkwidget.c:1160
+#: ../gtk/gtkwidget.c:1179
 msgid "How to position in extra horizontal space"
 msgstr "Размещение по горизонтали в дополнительном про�тран�тве"
 
-#: ../gtk/gtkwidget.c:1176
+#: ../gtk/gtkwidget.c:1195
 msgid "How to position in extra vertical space"
 msgstr "Размещение по вертикали в дополнительном про�тран�тве"
 
-#: ../gtk/gtkwidget.c:1195
+#: ../gtk/gtkwidget.c:1214
 msgid "Margin on Left"
 msgstr "Граница �лева"
 
-#: ../gtk/gtkwidget.c:1196
+#: ../gtk/gtkwidget.c:1215
 msgid "Pixels of extra space on the left side"
 msgstr "Пик�елей дополнительного про�тран�тва � левой �тороны"
 
-#: ../gtk/gtkwidget.c:1216
+#: ../gtk/gtkwidget.c:1235
 msgid "Margin on Right"
 msgstr "Граница �права"
 
-#: ../gtk/gtkwidget.c:1217
+#: ../gtk/gtkwidget.c:1236
 msgid "Pixels of extra space on the right side"
 msgstr "Пик�елей дополнительного про�тран�тва � правой �тороны"
 
-#: ../gtk/gtkwidget.c:1237
+#: ../gtk/gtkwidget.c:1256
 msgid "Margin on Top"
 msgstr "Граница от верха"
 
-#: ../gtk/gtkwidget.c:1238
+#: ../gtk/gtkwidget.c:1257
 msgid "Pixels of extra space on the top side"
 msgstr "Пик�елей дополнительного про�тран�тва �верху"
 
-#: ../gtk/gtkwidget.c:1258
+#: ../gtk/gtkwidget.c:1277
 msgid "Margin on Bottom"
 msgstr "Граница от низа"
 
-#: ../gtk/gtkwidget.c:1259
+#: ../gtk/gtkwidget.c:1278
 msgid "Pixels of extra space on the bottom side"
 msgstr "Пик�елей дополнительного про�тран�тва внизу"
 
-#: ../gtk/gtkwidget.c:1276
+#: ../gtk/gtkwidget.c:1295
 msgid "All Margins"
 msgstr "В�е границы"
 
-#: ../gtk/gtkwidget.c:1277
+#: ../gtk/gtkwidget.c:1296
 msgid "Pixels of extra space on all four sides"
 msgstr "Пик�елей дополнительного �о в�ех четырёх �торон"
 
-#: ../gtk/gtkwidget.c:1310
+#: ../gtk/gtkwidget.c:1329
 msgid "Horizontal Expand"
 msgstr "Дополнение по горизонтали"
 
-#: ../gtk/gtkwidget.c:1311
+#: ../gtk/gtkwidget.c:1330
 msgid "Whether widget wants more horizontal space"
 msgstr "Может ли виджет запро�ить дополнительное про�тран�тво по горизонтали"
 
-#: ../gtk/gtkwidget.c:1325
+#: ../gtk/gtkwidget.c:1344
 msgid "Horizontal Expand Set"
 msgstr "Включить дополнение по горизонтали"
 
-#: ../gtk/gtkwidget.c:1326
+#: ../gtk/gtkwidget.c:1345
 msgid "Whether to use the hexpand property"
 msgstr "И�пользовать ли �вой�тво hexpand"
 
-#: ../gtk/gtkwidget.c:1340
+#: ../gtk/gtkwidget.c:1359
 msgid "Vertical Expand"
 msgstr "Дополнение по вертикали"
 
-#: ../gtk/gtkwidget.c:1341
+#: ../gtk/gtkwidget.c:1360
 msgid "Whether widget wants more vertical space"
 msgstr "Может ли виджет запро�ить дополнительное про�тран�тво по вертикали"
 
-#: ../gtk/gtkwidget.c:1355
+#: ../gtk/gtkwidget.c:1374
 msgid "Vertical Expand Set"
 msgstr "Включить дополнение по вертикали"
 
-#: ../gtk/gtkwidget.c:1356
+#: ../gtk/gtkwidget.c:1375
 msgid "Whether to use the vexpand property"
 msgstr "И�пользовать ли �вой�тво vexpand"
 
-#: ../gtk/gtkwidget.c:1370
+#: ../gtk/gtkwidget.c:1389
 msgid "Expand Both"
 msgstr "Дополнение в оба направлени�"
 
-#: ../gtk/gtkwidget.c:1371
+#: ../gtk/gtkwidget.c:1390
 msgid "Whether widget wants to expand in both directions"
-msgstr ""
-"Может ли виджет запро�ить дополнительное про�тран�тво в оба направлени�"
+msgstr "Может ли виджет запро�ить дополнительное про�тран�тво в оба направлени�"
 
-#: ../gtk/gtkwidget.c:3008
+#: ../gtk/gtkwidget.c:3029
 msgid "Interior Focus"
 msgstr "Внутренний фоку� ввода"
 
-#: ../gtk/gtkwidget.c:3009
+#: ../gtk/gtkwidget.c:3030
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Ри�овать ли индикатор фоку�а ввода внутри �лементов управлени�"
 
-#: ../gtk/gtkwidget.c:3015
+#: ../gtk/gtkwidget.c:3036
 msgid "Focus linewidth"
 msgstr "Ширина линии фоку�а ввода"
 
-#: ../gtk/gtkwidget.c:3016
+#: ../gtk/gtkwidget.c:3037
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Ширина линии-индикатора фоку�а ввода, в точках ра�тра"
 
-#: ../gtk/gtkwidget.c:3022
+#: ../gtk/gtkwidget.c:3043
 msgid "Focus line dash pattern"
 msgstr "Штрих линии фоку�а ввода"
 
-#: ../gtk/gtkwidget.c:3023
+#: ../gtk/gtkwidget.c:3044
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Образец штрихов дл� отображени� линии-индикатора фоку�а ввода"
 
-#: ../gtk/gtkwidget.c:3028
+#: ../gtk/gtkwidget.c:3049
 msgid "Focus padding"
 msgstr "От�туп фоку�а ввода"
 
-#: ../gtk/gtkwidget.c:3029
+#: ../gtk/gtkwidget.c:3050
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
-msgstr ""
-"Ра��то�ние между индикатором фоку�а ввода и 'рамкой' виджета, в пик�ел�х"
+msgstr "Ра��то�ние между индикатором фоку�а ввода и 'рамкой' виджета, в пик�ел�х"
 
-#: ../gtk/gtkwidget.c:3034
+#: ../gtk/gtkwidget.c:3055
 msgid "Cursor color"
 msgstr "Цвет кур�ора"
 
-#: ../gtk/gtkwidget.c:3035
+#: ../gtk/gtkwidget.c:3056
 msgid "Color with which to draw insertion cursor"
 msgstr "Цвет, и�пользуемый дл� кур�ора"
 
-#: ../gtk/gtkwidget.c:3040
+#: ../gtk/gtkwidget.c:3061
 msgid "Secondary cursor color"
 msgstr "Цвет второго кур�ора"
 
-#: ../gtk/gtkwidget.c:3041
-msgid ""
-"Color with which to draw the secondary insertion cursor when editing mixed "
-"right-to-left and left-to-right text"
-msgstr ""
-"Цвет дл� отображени� второго кур�ора при и�пользовании �мешанного (�права "
-"налево и �лева направо) ввода тек�та"
+#: ../gtk/gtkwidget.c:3062
+msgid "Color with which to draw the secondary insertion cursor when editing mixed right-to-left and left-to-right text"
+msgstr "Цвет дл� отображени� второго кур�ора при и�пользовании �мешанного (�права налево и �лева направо) ввода тек�та"
 
-#: ../gtk/gtkwidget.c:3046
+#: ../gtk/gtkwidget.c:3067
 msgid "Cursor line aspect ratio"
 msgstr "Пропорции кур�ора"
 
-#: ../gtk/gtkwidget.c:3047
+#: ../gtk/gtkwidget.c:3068
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Пропорции кур�ора"
 
-#: ../gtk/gtkwidget.c:3053
+#: ../gtk/gtkwidget.c:3074
 msgid "Window dragging"
 msgstr "Перено� окна"
 
-#: ../gtk/gtkwidget.c:3054
+#: ../gtk/gtkwidget.c:3075
 msgid "Whether windows can be dragged by clicking on empty areas"
 msgstr "Можно ли перено�ить окно щелчком по пу�тым обла�т�м"
 
-#: ../gtk/gtkwidget.c:3067
+#: ../gtk/gtkwidget.c:3088
 msgid "Unvisited Link Color"
 msgstr "Цвет непо�ещённой ��ылки"
 
-#: ../gtk/gtkwidget.c:3068
+#: ../gtk/gtkwidget.c:3089
 msgid "Color of unvisited links"
 msgstr "Цвет ��ылки, ранее не и�пользовавшей��"
 
-#: ../gtk/gtkwidget.c:3081
+#: ../gtk/gtkwidget.c:3102
 msgid "Visited Link Color"
 msgstr "Цвет ��ылки"
 
-#: ../gtk/gtkwidget.c:3082
+#: ../gtk/gtkwidget.c:3103
 msgid "Color of visited links"
 msgstr "Цвет ��ылки, уже и�пользованной"
 
-#: ../gtk/gtkwidget.c:3096
+#: ../gtk/gtkwidget.c:3117
 msgid "Wide Separators"
 msgstr "Широкие разделители"
 
-#: ../gtk/gtkwidget.c:3097
-msgid ""
-"Whether separators have configurable width and should be drawn using a box "
-"instead of a line"
-msgstr ""
-"Имеют ли разделители ширину и отображают�� ли они в виде пр�моугольника, а "
-"не линии"
+#: ../gtk/gtkwidget.c:3118
+msgid "Whether separators have configurable width and should be drawn using a box instead of a line"
+msgstr "Имеют ли разделители ширину и отображают�� ли они в виде пр�моугольника, а не линии"
 
-#: ../gtk/gtkwidget.c:3111
+#: ../gtk/gtkwidget.c:3132
 msgid "Separator Width"
 msgstr "Ширина разделител�"
 
-#: ../gtk/gtkwidget.c:3112
+#: ../gtk/gtkwidget.c:3133
 msgid "The width of separators if wide-separators is TRUE"
 msgstr "Ширина разделителей, е�ли у�тановлено �вой�тво «Широкие разделители»"
 
-#: ../gtk/gtkwidget.c:3126
+#: ../gtk/gtkwidget.c:3147
 msgid "Separator Height"
 msgstr "Вы�ота разделител�"
 
-#: ../gtk/gtkwidget.c:3127
+#: ../gtk/gtkwidget.c:3148
 msgid "The height of separators if \"wide-separators\" is TRUE"
 msgstr "Вы�ота разделителей, е�ли у�тановлено �вой�тво «широкие разделители»"
 
-#: ../gtk/gtkwidget.c:3141
+#: ../gtk/gtkwidget.c:3162
 msgid "Horizontal Scroll Arrow Length"
 msgstr "Длина горизонтальной �трелки"
 
-#: ../gtk/gtkwidget.c:3142
+#: ../gtk/gtkwidget.c:3163
 msgid "The length of horizontal scroll arrows"
 msgstr "Длина горизонтальной �трелки прокрутки"
 
-#: ../gtk/gtkwidget.c:3156
+#: ../gtk/gtkwidget.c:3177
 msgid "Vertical Scroll Arrow Length"
 msgstr "Длина вертикальной �трелки"
 
-#: ../gtk/gtkwidget.c:3157
+#: ../gtk/gtkwidget.c:3178
 msgid "The length of vertical scroll arrows"
 msgstr "Длина вертикальной �трелки прокрутки"
 
-#: ../gtk/gtkwindow.c:604
+#: ../gtk/gtkwindow.c:608
 msgid "Window Type"
 msgstr "Тип окна"
 
-#: ../gtk/gtkwindow.c:605
+#: ../gtk/gtkwindow.c:609
 msgid "The type of the window"
 msgstr "Тип окна"
 
-#: ../gtk/gtkwindow.c:613
+#: ../gtk/gtkwindow.c:617
 msgid "Window Title"
 msgstr "Заголовок окна"
 
-#: ../gtk/gtkwindow.c:614
+#: ../gtk/gtkwindow.c:618
 msgid "The title of the window"
 msgstr "Заголовок окна"
 
-#: ../gtk/gtkwindow.c:621
+#: ../gtk/gtkwindow.c:625
 msgid "Window Role"
 msgstr "Роль окна"
 
-#: ../gtk/gtkwindow.c:622
+#: ../gtk/gtkwindow.c:626
 msgid "Unique identifier for the window to be used when restoring a session"
 msgstr "Уникальный идентификатор окна, и�пользуемый при во��тановлении �е��ии"
 
-#: ../gtk/gtkwindow.c:638
+#: ../gtk/gtkwindow.c:642
 msgid "Startup ID"
 msgstr "Идентификатор �и�темы запу�ка"
 
-#: ../gtk/gtkwindow.c:639
+#: ../gtk/gtkwindow.c:643
 msgid "Unique startup identifier for the window used by startup-notification"
-msgstr ""
-"Уникальный идентификатор, и�пользуемый �и�темой уведомлений о новых окнах"
+msgstr "Уникальный идентификатор, и�пользуемый �и�темой уведомлений о новых окнах"
 
-#: ../gtk/gtkwindow.c:647
+#: ../gtk/gtkwindow.c:651
 msgid "If TRUE, users can resize the window"
 msgstr "Е�ли у�тановлено, то пользователь может измен�ть размер окна"
 
-#: ../gtk/gtkwindow.c:654
+#: ../gtk/gtkwindow.c:658
 msgid "Modal"
 msgstr "Модальное"
 
-#: ../gtk/gtkwindow.c:655
-msgid ""
-"If TRUE, the window is modal (other windows are not usable while this one is "
-"up)"
-msgstr ""
-"Е�ли у�тановлено, то окно �вл�ет�� модальным (нельз� обратить�� к другим "
-"окнам, пока оно не будет закрыто)"
+#: ../gtk/gtkwindow.c:659
+msgid "If TRUE, the window is modal (other windows are not usable while this one is up)"
+msgstr "Е�ли у�тановлено, то окно �вл�ет�� модальным (нельз� обратить�� к другим окнам, пока оно не будет закрыто)"
 
-#: ../gtk/gtkwindow.c:662
+#: ../gtk/gtkwindow.c:666
 msgid "Window Position"
 msgstr "Позици� окна"
 
-#: ../gtk/gtkwindow.c:663
+#: ../gtk/gtkwindow.c:667
 msgid "The initial position of the window"
 msgstr "�ачальна� позици� окна"
 
-#: ../gtk/gtkwindow.c:671
+#: ../gtk/gtkwindow.c:675
 msgid "Default Width"
 msgstr "Ширина по умолчанию"
 
-#: ../gtk/gtkwindow.c:672
+#: ../gtk/gtkwindow.c:676
 msgid "The default width of the window, used when initially showing the window"
-msgstr ""
-"Ширина окна по умолчанию, и�пользует�� при первоначальном отображении окна"
+msgstr "Ширина окна по умолчанию, и�пользует�� при первоначальном отображении окна"
 
-#: ../gtk/gtkwindow.c:681
+#: ../gtk/gtkwindow.c:685
 msgid "Default Height"
 msgstr "Вы�ота по умолчанию"
 
-#: ../gtk/gtkwindow.c:682
-msgid ""
-"The default height of the window, used when initially showing the window"
-msgstr ""
-"Вы�ота окна по умолчанию, и�пользует�� при первоначальном отображении окна"
+#: ../gtk/gtkwindow.c:686
+msgid "The default height of the window, used when initially showing the window"
+msgstr "Вы�ота окна по умолчанию, и�пользует�� при первоначальном отображении окна"
 
-#: ../gtk/gtkwindow.c:691
+#: ../gtk/gtkwindow.c:695
 msgid "Destroy with Parent"
 msgstr "Уничтожать вме�те � родителем"
 
-#: ../gtk/gtkwindow.c:692
+#: ../gtk/gtkwindow.c:696
 msgid "If this window should be destroyed when the parent is destroyed"
 msgstr "Уничтожать ли �то окно при уничтожении родитель�кого окна"
 
-#: ../gtk/gtkwindow.c:700
+#: ../gtk/gtkwindow.c:704
 msgid "Icon for this window"
 msgstr "Значок дл� окна"
 
-#: ../gtk/gtkwindow.c:706
+#: ../gtk/gtkwindow.c:722
 msgid "Mnemonics Visible"
 msgstr "Мнемониче�кие клавиши видимы"
 
-#: ../gtk/gtkwindow.c:707
+#: ../gtk/gtkwindow.c:723
 msgid "Whether mnemonics are currently visible in this window"
 msgstr "Будут ли видимы мнемоники видимы в данном окне"
 
-#: ../gtk/gtkwindow.c:723
+#: ../gtk/gtkwindow.c:741
+#| msgid "Cursor Visible"
+msgid "Focus Visible"
+msgstr "Видимый кур�ор"
+
+#: ../gtk/gtkwindow.c:742
+#| msgid "Whether mnemonics are currently visible in this window"
+msgid "Whether focus rectangles are currently visible in this window"
+msgstr "Будут ли видимы фоку�ные пр�моугольники в �том окне"
+
+#: ../gtk/gtkwindow.c:758
 msgid "Name of the themed icon for this window"
 msgstr "Им� значка из темы дл� окна"
 
-#: ../gtk/gtkwindow.c:738
+#: ../gtk/gtkwindow.c:773
 msgid "Is Active"
 msgstr "�ктивный"
 
-#: ../gtk/gtkwindow.c:739
+#: ../gtk/gtkwindow.c:774
 msgid "Whether the toplevel is the current active window"
 msgstr "Явл�ет�� ли окно активным"
 
-#: ../gtk/gtkwindow.c:746
+#: ../gtk/gtkwindow.c:781
 msgid "Focus in Toplevel"
 msgstr "/Фоку� находит�� в окне"
 
-#: ../gtk/gtkwindow.c:747
+#: ../gtk/gtkwindow.c:782
 msgid "Whether the input focus is within this GtkWindow"
 msgstr "�аходит�� ли фоку� ввода в данном GtkWindow"
 
-#: ../gtk/gtkwindow.c:754
+#: ../gtk/gtkwindow.c:789
 msgid "Type hint"
 msgstr "Тип под�казки"
 
-#: ../gtk/gtkwindow.c:755
-msgid ""
-"Hint to help the desktop environment understand what kind of window this is "
-"and how to treat it."
-msgstr ""
-"Под�казка (hint), позвол�юща� оконному окружению пон�ть, к какому типу "
-"отно�ит�� данное окно и как � ним обходить��."
+#: ../gtk/gtkwindow.c:790
+msgid "Hint to help the desktop environment understand what kind of window this is and how to treat it."
+msgstr "Под�казка (hint), позвол�юща� оконному окружению пон�ть, к какому типу отно�ит�� данное окно и как � ним обходить��."
 
-#: ../gtk/gtkwindow.c:763
+#: ../gtk/gtkwindow.c:798
 msgid "Skip taskbar"
 msgstr "Скрыть из переключател� задач"
 
-#: ../gtk/gtkwindow.c:764
+#: ../gtk/gtkwindow.c:799
 msgid "TRUE if the window should not be in the task bar."
 msgstr "У�тановлено, е�ли окно не должно быть видимо в переключателе задач."
 
-#: ../gtk/gtkwindow.c:771
+#: ../gtk/gtkwindow.c:806
 msgid "Skip pager"
 msgstr "Скрыть из переключател� рабочих ме�т"
 
-#: ../gtk/gtkwindow.c:772
+#: ../gtk/gtkwindow.c:807
 msgid "TRUE if the window should not be in the pager."
-msgstr ""
-"У�тановлено, е�ли окно не должно быть видимо в переключателе рабочих ме�т."
+msgstr "У�тановлено, е�ли окно не должно быть видимо в переключателе рабочих ме�т."
 
-#: ../gtk/gtkwindow.c:779
+#: ../gtk/gtkwindow.c:814
 msgid "Urgent"
 msgstr "Срочно"
 
-#: ../gtk/gtkwindow.c:780
+#: ../gtk/gtkwindow.c:815
 msgid "TRUE if the window should be brought to the user's attention."
 msgstr "У�тановлено, е�ли окно должно привлечь внимание пользовател�."
 
-#: ../gtk/gtkwindow.c:794
+#: ../gtk/gtkwindow.c:829
 msgid "Accept focus"
 msgstr "Принимать фоку�"
 
-#: ../gtk/gtkwindow.c:795
+#: ../gtk/gtkwindow.c:830
 msgid "TRUE if the window should receive the input focus."
 msgstr "Е�ли у�тановлено, окно должно принимать фоку� ввода."
 
-#: ../gtk/gtkwindow.c:809
+#: ../gtk/gtkwindow.c:844
 msgid "Focus on map"
 msgstr "Фоку� при отображении"
 
-#: ../gtk/gtkwindow.c:810
+#: ../gtk/gtkwindow.c:845
 msgid "TRUE if the window should receive the input focus when mapped."
 msgstr "Е�ли у�тановлено, окно должно принимать фоку� ввода при отображении."
 
-#: ../gtk/gtkwindow.c:824
+#: ../gtk/gtkwindow.c:859
 msgid "Decorated"
 msgstr "Отделан"
 
-#: ../gtk/gtkwindow.c:825
+#: ../gtk/gtkwindow.c:860
 msgid "Whether the window should be decorated by the window manager"
 msgstr "Должно ли окно отделывать�� ди�петчером окон"
 
-#: ../gtk/gtkwindow.c:839
+#: ../gtk/gtkwindow.c:874
 msgid "Deletable"
 msgstr "Выдел�емый"
 
-#: ../gtk/gtkwindow.c:840
+#: ../gtk/gtkwindow.c:875
 msgid "Whether the window frame should have a close button"
 msgstr "Имеет ли рамка окна кнопку закрыти�"
 
-#: ../gtk/gtkwindow.c:859
+#: ../gtk/gtkwindow.c:894
 msgid "Resize grip"
 msgstr "Уголок изменени� размера"
 
-#: ../gtk/gtkwindow.c:860
+#: ../gtk/gtkwindow.c:895
 msgid "Specifies whether the window should have a resize grip"
 msgstr "Определ�ет, должно ли окно иметь уголок изменени� размера"
 
-#: ../gtk/gtkwindow.c:874
+#: ../gtk/gtkwindow.c:909
 msgid "Resize grip is visible"
 msgstr "Уголок изменени� размера видим"
 
-#: ../gtk/gtkwindow.c:875
+#: ../gtk/gtkwindow.c:910
 msgid "Specifies whether the window's resize grip is visible."
 msgstr "Определ�ет, видим ли уголок изменени� размера у окна"
 
-#: ../gtk/gtkwindow.c:891
+#: ../gtk/gtkwindow.c:926
 msgid "Gravity"
 msgstr "Прит�жение"
 
-#: ../gtk/gtkwindow.c:892
+#: ../gtk/gtkwindow.c:927
 msgid "The window gravity of the window"
 msgstr "Прит�жение окна к окнам"
 
-#: ../gtk/gtkwindow.c:909
+#: ../gtk/gtkwindow.c:944
 msgid "Transient for Window"
 msgstr "Св�занное окно"
 
-#: ../gtk/gtkwindow.c:910
+#: ../gtk/gtkwindow.c:945
 msgid "The transient parent of the dialog"
 msgstr "Окно, �в�занное � диалогом"
 
-#: ../gtk/gtkwindow.c:925
+#: ../gtk/gtkwindow.c:960
 msgid "Opacity for Window"
 msgstr "Прозрачно�ть окна"
 
-#: ../gtk/gtkwindow.c:926
+#: ../gtk/gtkwindow.c:961
 msgid "The opacity of the window, from 0 to 1"
 msgstr "Прозрачно�ть окна, от 0 до 1"
 
-#: ../gtk/gtkwindow.c:936 ../gtk/gtkwindow.c:937
+#: ../gtk/gtkwindow.c:971
+#: ../gtk/gtkwindow.c:972
 msgid "Width of resize grip"
 msgstr "Ширина уголка изменени� размера"
 
-#: ../gtk/gtkwindow.c:942 ../gtk/gtkwindow.c:943
+#: ../gtk/gtkwindow.c:977
+#: ../gtk/gtkwindow.c:978
 msgid "Height of resize grip"
 msgstr "Вы�ота уголка изменени� размера"
 
-#: ../gtk/gtkwindow.c:965
+#: ../gtk/gtkwindow.c:1000
 msgid "GtkApplication"
 msgstr "GtkApplication"
 
-#: ../gtk/gtkwindow.c:966
+#: ../gtk/gtkwindow.c:1001
 msgid "The GtkApplication for the window"
 msgstr "GtkApplication дл� окна"
+
+#: ../modules/printbackends/cups/gtkprintercups.c:95
+msgid "Color Profile Title"
+msgstr "Заголовок цветового профил�"
+
+#: ../modules/printbackends/cups/gtkprintercups.c:96
+#| msgid "The title of the color selection dialog"
+msgid "The title of the color profile to use"
+msgstr "Заголовок и�пользуемого цветового профил�"
+
diff --git a/po-properties/zh_HK.po b/po-properties/zh_HK.po
index a76f6cc507..a2cdef3d8f 100644
--- a/po-properties/zh_HK.po
+++ b/po-properties/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 3.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 20:26+0800\n"
-"PO-Revision-Date: 2011-04-04 20:26+0800\n"
+"POT-Creation-Date: 2011-08-27 10:35+0800\n"
+"PO-Revision-Date: 2011-08-27 10:35+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: \n"
@@ -99,11 +99,11 @@ msgstr "�置中的軸數"
 msgid "Display for the device manager"
 msgstr "�置管�的顯示"
 
-#: ../gdk/gdkdisplaymanager.c:158
+#: ../gdk/gdkdisplaymanager.c:162
 msgid "Default Display"
 msgstr "�設顯示�"
 
-#: ../gdk/gdkdisplaymanager.c:159
+#: ../gdk/gdkdisplaymanager.c:163
 msgid "The default display for GDK"
 msgstr "GDK 的�設顯示�"
 
@@ -123,24 +123,15 @@ msgstr "字型解�度"
 msgid "The resolution for fonts on the screen"
 msgstr "螢幕上字型的解�度"
 
-#: ../gdk/gdkwindow.c:373 ../gdk/gdkwindow.c:374
+#: ../gdk/gdkwindow.c:376 ../gdk/gdkwindow.c:377
 msgid "Cursor"
 msgstr "游標"
 
-#: ../gdk/x11/gdkdevice-xi.c:140 ../gdk/x11/gdkdevice-xi.c:141
-#: ../gdk/x11/gdkdevice-xi2.c:130
-msgid "Device ID"
-msgstr "�置 ID"
-
-#: ../gdk/x11/gdkdevice-xi2.c:131
-msgid "Device identifier"
-msgstr "�置識別符"
-
-#: ../gdk/x11/gdkdevicemanager-xi2.c:118
+#: ../gdk/x11/gdkdevicemanager-xi2.c:119
 msgid "Opcode"
 msgstr "Opcode"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:119
+#: ../gdk/x11/gdkdevicemanager-xi2.c:120
 msgid "Opcode for XInput2 requests"
 msgstr "XInput2 �求的 Opcode"
 
@@ -152,120 +143,129 @@ msgstr "事件基礎"
 msgid "Event base for XInput events"
 msgstr "XInput 事件的事件基礎"
 
-#: ../gtk/gtkaboutdialog.c:276
+#: ../gdk/x11/gdkdevice-xi2.c:130 ../gdk/x11/gdkdevice-xi.c:140
+#: ../gdk/x11/gdkdevice-xi.c:141
+msgid "Device ID"
+msgstr "�置 ID"
+
+#: ../gdk/x11/gdkdevice-xi2.c:131
+msgid "Device identifier"
+msgstr "�置識別符"
+
+#: ../gtk/gtkaboutdialog.c:275
 msgid "Program name"
 msgstr "程��稱"
 
-#: ../gtk/gtkaboutdialog.c:277
+#: ../gtk/gtkaboutdialog.c:276
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr "程��稱，如果沒有設定則� g_get_application_name() 的回傳值。"
 
-#: ../gtk/gtkaboutdialog.c:291
+#: ../gtk/gtkaboutdialog.c:290
 msgid "Program version"
 msgstr "程�版本"
 
-#: ../gtk/gtkaboutdialog.c:292
+#: ../gtk/gtkaboutdialog.c:291
 msgid "The version of the program"
 msgstr "程�的版本"
 
-#: ../gtk/gtkaboutdialog.c:306
+#: ../gtk/gtkaboutdialog.c:305
 msgid "Copyright string"
 msgstr "版權資訊"
 
-#: ../gtk/gtkaboutdialog.c:307
+#: ../gtk/gtkaboutdialog.c:306
 msgid "Copyright information for the program"
 msgstr "該程�的版權資訊"
 
-#: ../gtk/gtkaboutdialog.c:324
+#: ../gtk/gtkaboutdialog.c:323
 msgid "Comments string"
 msgstr "程�說明"
 
-#: ../gtk/gtkaboutdialog.c:325
+#: ../gtk/gtkaboutdialog.c:324
 msgid "Comments about the program"
 msgstr "有關該程�的說明"
 
-#: ../gtk/gtkaboutdialog.c:375
+#: ../gtk/gtkaboutdialog.c:374
 msgid "License Type"
 msgstr "授權類型"
 
-#: ../gtk/gtkaboutdialog.c:376
+#: ../gtk/gtkaboutdialog.c:375
 msgid "The license type of the program"
 msgstr "本程�的授權類型"
 
-#: ../gtk/gtkaboutdialog.c:392
+#: ../gtk/gtkaboutdialog.c:391
 msgid "Website URL"
 msgstr "網站 URL"
 
-#: ../gtk/gtkaboutdialog.c:393
+#: ../gtk/gtkaboutdialog.c:392
 msgid "The URL for the link to the website of the program"
 msgstr "代表該程�的網站的 URL 連�"
 
-#: ../gtk/gtkaboutdialog.c:407
+#: ../gtk/gtkaboutdialog.c:406
 msgid "Website label"
 msgstr "網站標籤"
 
-#: ../gtk/gtkaboutdialog.c:408
+#: ../gtk/gtkaboutdialog.c:407
 msgid "The label for the link to the website of the program"
 msgstr "代表該程�的連�的標籤"
 
-#: ../gtk/gtkaboutdialog.c:424
+#: ../gtk/gtkaboutdialog.c:423
 msgid "Authors"
 msgstr "作者"
 
-#: ../gtk/gtkaboutdialog.c:425
+#: ../gtk/gtkaboutdialog.c:424
 msgid "List of authors of the program"
 msgstr "程�作者清單"
 
-#: ../gtk/gtkaboutdialog.c:441
+#: ../gtk/gtkaboutdialog.c:440
 msgid "Documenters"
 msgstr "文件編寫員"
 
-#: ../gtk/gtkaboutdialog.c:442
+#: ../gtk/gtkaboutdialog.c:441
 msgid "List of people documenting the program"
 msgstr "為程�編寫文件的人員�單"
 
-#: ../gtk/gtkaboutdialog.c:458
+#: ../gtk/gtkaboutdialog.c:457
 msgid "Artists"
 msgstr "美工人員"
 
-#: ../gtk/gtkaboutdialog.c:459
+#: ../gtk/gtkaboutdialog.c:458
 msgid "List of people who have contributed artwork to the program"
 msgstr "為程�製作美工繪圖"
 
-#: ../gtk/gtkaboutdialog.c:476
+#: ../gtk/gtkaboutdialog.c:475
 msgid "Translator credits"
 msgstr "鳴�翻譯者"
 
-#: ../gtk/gtkaboutdialog.c:477
+#: ../gtk/gtkaboutdialog.c:476
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr "翻譯者的相關訊�。本字串應該被標記為�翻譯的字串"
 
-#: ../gtk/gtkaboutdialog.c:492
+#: ../gtk/gtkaboutdialog.c:491
 msgid "Logo"
 msgstr "標誌"
 
-#: ../gtk/gtkaboutdialog.c:493
+#: ../gtk/gtkaboutdialog.c:492
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
 msgstr "「關於��話盒中的標誌，如果沒有設定則�設使用 gtk_window_get_default_icon_list() 的回傳值。"
 
-#: ../gtk/gtkaboutdialog.c:508
+#: ../gtk/gtkaboutdialog.c:507
 msgid "Logo Icon Name"
 msgstr "標誌圖示�稱"
 
-#: ../gtk/gtkaboutdialog.c:509
+#: ../gtk/gtkaboutdialog.c:508
 msgid "A named icon to use as the logo for the about box."
 msgstr "用在「關於�方塊標誌的具�圖示。"
 
-#: ../gtk/gtkaboutdialog.c:522
+#: ../gtk/gtkaboutdialog.c:521
 msgid "Wrap license"
 msgstr "授權�款�行"
 
-#: ../gtk/gtkaboutdialog.c:523
+#: ../gtk/gtkaboutdialog.c:522
 msgid "Whether to wrap the license text."
 msgstr "授權�款是��行。"
 
@@ -286,7 +286,7 @@ msgid "The widget to be monitored for accelerator changes"
 msgstr "監視該視窗元件的�徑�變化"
 
 #: ../gtk/gtkaction.c:222 ../gtk/gtkactiongroup.c:228 ../gtk/gtkprinter.c:125
-#: ../gtk/gtktextmark.c:89 ../gtk/gtkthemingengine.c:248
+#: ../gtk/gtktextmark.c:126 ../gtk/gtkthemingengine.c:256
 msgid "Name"
 msgstr "�稱"
 
@@ -294,9 +294,9 @@ msgstr "�稱"
 msgid "A unique name for the action."
 msgstr "這個指令的特定�稱。"
 
-#: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:227 ../gtk/gtkexpander.c:289
-#: ../gtk/gtkframe.c:133 ../gtk/gtklabel.c:567 ../gtk/gtkmenuitem.c:328
-#: ../gtk/gtktoolbutton.c:201 ../gtk/gtktoolitemgroup.c:1596
+#: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:228 ../gtk/gtkexpander.c:290
+#: ../gtk/gtkframe.c:171 ../gtk/gtklabel.c:729 ../gtk/gtkmenuitem.c:383
+#: ../gtk/gtktoolbutton.c:232 ../gtk/gtktoolitemgroup.c:1592
 msgid "Label"
 msgstr "標籤"
 
@@ -328,31 +328,31 @@ msgstr "內置圖示"
 msgid "The stock icon displayed in widgets representing this action."
 msgstr "在視窗元件中代表此動作的內置圖示"
 
-#: ../gtk/gtkaction.c:304 ../gtk/gtkstatusicon.c:245
+#: ../gtk/gtkaction.c:304 ../gtk/gtkstatusicon.c:275
 msgid "GIcon"
 msgstr "GIcon"
 
-#: ../gtk/gtkaction.c:305 ../gtk/gtkcellrendererpixbuf.c:215
-#: ../gtk/gtkimage.c:329 ../gtk/gtkstatusicon.c:246
+#: ../gtk/gtkaction.c:305 ../gtk/gtkcellrendererpixbuf.c:235
+#: ../gtk/gtkimage.c:330 ../gtk/gtkstatusicon.c:276
 msgid "The GIcon being displayed"
 msgstr "準備顯示的 GIcon"
 
-#: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:180
-#: ../gtk/gtkimage.c:311 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:229
-#: ../gtk/gtkwindow.c:722
+#: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:200
+#: ../gtk/gtkimage.c:312 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:259
+#: ../gtk/gtkwindow.c:757
 msgid "Icon Name"
 msgstr "圖示�稱"
 
-#: ../gtk/gtkaction.c:326 ../gtk/gtkcellrendererpixbuf.c:181
-#: ../gtk/gtkimage.c:312 ../gtk/gtkstatusicon.c:230
+#: ../gtk/gtkaction.c:326 ../gtk/gtkcellrendererpixbuf.c:201
+#: ../gtk/gtkimage.c:313 ../gtk/gtkstatusicon.c:260
 msgid "The name of the icon from the icon theme"
 msgstr "圖示主題的圖示�稱"
 
-#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:195
+#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:194
 msgid "Visible when horizontal"
 msgstr "水平顯示時為�見"
 
-#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:196
+#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:195
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a horizontal "
 "orientation."
@@ -368,17 +368,17 @@ msgid ""
 "overflow menu."
 msgstr "當為 TRUE 時，此指令的工具�項代�會被顯示在工具列 overflow �單。"
 
-#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:202
+#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:201
 msgid "Visible when vertical"
 msgstr "垂直顯示時為�見"
 
-#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:203
+#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:202
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a vertical "
 "orientation."
 msgstr "當工具列呈垂直顯示時工具列項目是�為�見。"
 
-#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:209
+#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:208
 msgid "Is important"
 msgstr "��的"
 
@@ -397,7 +397,7 @@ msgid "When TRUE, empty menu proxies for this action are hidden."
 msgstr "當為 TRUE 時，代�此指令的空�單會被隱�。"
 
 #: ../gtk/gtkaction.c:381 ../gtk/gtkactiongroup.c:235
-#: ../gtk/gtkcellrenderer.c:290 ../gtk/gtkwidget.c:971
+#: ../gtk/gtkcellrenderer.c:290 ../gtk/gtkwidget.c:990
 msgid "Sensitive"
 msgstr "有�應"
 
@@ -406,8 +406,8 @@ msgid "Whether the action is enabled."
 msgstr "本指令是�有效。"
 
 #: ../gtk/gtkaction.c:388 ../gtk/gtkactiongroup.c:242
-#: ../gtk/gtkstatusicon.c:280 ../gtk/gtktreeviewcolumn.c:246
-#: ../gtk/gtkwidget.c:964
+#: ../gtk/gtkstatusicon.c:310 ../gtk/gtktreeviewcolumn.c:248
+#: ../gtk/gtkwidget.c:983
 msgid "Visible"
 msgstr "�見的"
 
@@ -425,11 +425,11 @@ msgid ""
 "use)."
 msgstr "本 GtkAction 相關的 GtkActionGroup，或為 NULL (用作內部使用)。"
 
-#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:183
+#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:194
 msgid "Always show image"
 msgstr "永�顯示圖片"
 
-#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:184
+#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:195
 msgid "Whether the image will always be shown"
 msgstr "是�永�顯示圖片"
 
@@ -461,8 +461,8 @@ msgstr "使用動作外觀"
 msgid "Whether to use the related actions appearance properties"
 msgstr "是�使用相關動作外觀屬性"
 
-#: ../gtk/gtkadjustment.c:123 ../gtk/gtkcellrendererprogress.c:126
-#: ../gtk/gtkscalebutton.c:217 ../gtk/gtkspinbutton.c:381
+#: ../gtk/gtkadjustment.c:123 ../gtk/gtkcellrendererprogress.c:138
+#: ../gtk/gtkscalebutton.c:218 ../gtk/gtkspinbutton.c:384
 msgid "Value"
 msgstr "數值"
 
@@ -514,7 +514,7 @@ msgstr "調整元件的分�大�"
 msgid "Horizontal alignment"
 msgstr "水平�齊設定"
 
-#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:278
+#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:279
 msgid ""
 "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
 "right aligned"
@@ -524,7 +524,7 @@ msgstr "å­�元件在æ��供的空間è£�çš„æ°´å¹³å°�齊方å¼�。0.0 表示é� å·¦å°
 msgid "Vertical alignment"
 msgstr "垂直�齊設定"
 
-#: ../gtk/gtkalignment.c:148 ../gtk/gtkbutton.c:297
+#: ../gtk/gtkalignment.c:148 ../gtk/gtkbutton.c:298
 msgid ""
 "Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
 "bottom aligned"
@@ -582,114 +582,114 @@ msgstr "��留空"
 msgid "The padding to insert at the right of the widget."
 msgstr "在視窗元件��置入的留空大�。"
 
-#: ../gtk/gtkappchooserbutton.c:555
+#: ../gtk/gtkappchooserbutton.c:557
 msgid "Include an 'Other...' item"
 msgstr "包�「其他…�項目"
 
-#: ../gtk/gtkappchooserbutton.c:556
+#: ../gtk/gtkappchooserbutton.c:558
 msgid ""
 "Whether the combobox should include an item that triggers a "
 "GtkAppChooserDialog"
 msgstr "組�方塊是�應包�觸發 GtkAppChooserDialog 的項目"
 
-#: ../gtk/gtkappchooserbutton.c:568 ../gtk/gtkappchooserdialog.c:722
+#: ../gtk/gtkappchooserbutton.c:570 ../gtk/gtkappchooserdialog.c:707
 msgid "Heading"
 msgstr "標題"
 
-#: ../gtk/gtkappchooserbutton.c:569 ../gtk/gtkappchooserdialog.c:723
+#: ../gtk/gtkappchooserbutton.c:571 ../gtk/gtkappchooserdialog.c:708
 msgid "The text to show at the top of the dialog"
 msgstr "在�話盒頂端顯示的文字"
 
-#: ../gtk/gtkappchooser.c:58
+#: ../gtk/gtkappchooser.c:61
 msgid "Content type"
 msgstr "內容類型"
 
-#: ../gtk/gtkappchooser.c:59
+#: ../gtk/gtkappchooser.c:62
 msgid "The content type used by the open with object"
 msgstr "以物件開啟所使用的內容類型"
 
-#: ../gtk/gtkappchooserdialog.c:708
+#: ../gtk/gtkappchooserdialog.c:693
 msgid "GFile"
 msgstr "GFile"
 
-#: ../gtk/gtkappchooserdialog.c:709
+#: ../gtk/gtkappchooserdialog.c:694
 msgid "The GFile used by the app chooser dialog"
 msgstr "程��擇�話盒使用的 GFile"
 
-#: ../gtk/gtkappchooserwidget.c:1015
+#: ../gtk/gtkappchooserwidget.c:1016
 msgid "Show default app"
 msgstr "顯示�設的程�"
 
-#: ../gtk/gtkappchooserwidget.c:1016
+#: ../gtk/gtkappchooserwidget.c:1017
 msgid "Whether the widget should show the default application"
 msgstr "該視窗元件是�應顯示�設的應用程�"
 
-#: ../gtk/gtkappchooserwidget.c:1029
+#: ../gtk/gtkappchooserwidget.c:1030
 msgid "Show recommended apps"
 msgstr "顯示建議的程�"
 
-#: ../gtk/gtkappchooserwidget.c:1030
+#: ../gtk/gtkappchooserwidget.c:1031
 msgid "Whether the widget should show recommended applications"
 msgstr "該視窗元件是�應顯示建議的應用程�"
 
-#: ../gtk/gtkappchooserwidget.c:1043
+#: ../gtk/gtkappchooserwidget.c:1044
 msgid "Show fallback apps"
 msgstr "顯示後備程�"
 
-#: ../gtk/gtkappchooserwidget.c:1044
+#: ../gtk/gtkappchooserwidget.c:1045
 msgid "Whether the widget should show fallback applications"
 msgstr "該視窗元件是�應顯示後備的應用程�"
 
-#: ../gtk/gtkappchooserwidget.c:1056
+#: ../gtk/gtkappchooserwidget.c:1057
 msgid "Show other apps"
 msgstr "顯示其他的程�"
 
-#: ../gtk/gtkappchooserwidget.c:1057
+#: ../gtk/gtkappchooserwidget.c:1058
 msgid "Whether the widget should show other applications"
 msgstr "該視窗元件是�應顯示其他的應用程�"
 
-#: ../gtk/gtkappchooserwidget.c:1070
+#: ../gtk/gtkappchooserwidget.c:1071
 msgid "Show all apps"
 msgstr "顯示所有的程�"
 
-#: ../gtk/gtkappchooserwidget.c:1071
+#: ../gtk/gtkappchooserwidget.c:1072
 msgid "Whether the widget should show all applications"
 msgstr "該視窗元件是�應顯示所有的應用程�"
 
-#: ../gtk/gtkappchooserwidget.c:1084
+#: ../gtk/gtkappchooserwidget.c:1085
 msgid "Widget's default text"
 msgstr "視窗元件的�設文字"
 
-#: ../gtk/gtkappchooserwidget.c:1085
+#: ../gtk/gtkappchooserwidget.c:1086
 msgid "The default text appearing when there are no applications"
 msgstr "當沒有應用程�時顯示的�設文字"
 
-#: ../gtk/gtkarrow.c:110
+#: ../gtk/gtkarrow.c:112
 msgid "Arrow direction"
 msgstr "箭頭方�"
 
-#: ../gtk/gtkarrow.c:111
+#: ../gtk/gtkarrow.c:113
 msgid "The direction the arrow should point"
 msgstr "箭頭所指的方�"
 
-#: ../gtk/gtkarrow.c:119
+#: ../gtk/gtkarrow.c:121
 msgid "Arrow shadow"
 msgstr "ç®­é ­é™°å½±"
 
-#: ../gtk/gtkarrow.c:120
+#: ../gtk/gtkarrow.c:122
 msgid "Appearance of the shadow surrounding the arrow"
 msgstr "箭頭周�出�的陰影"
 
-#: ../gtk/gtkarrow.c:127 ../gtk/gtkcombobox.c:985 ../gtk/gtkmenu.c:796
-#: ../gtk/gtkmenuitem.c:391
+#: ../gtk/gtkarrow.c:129 ../gtk/gtkcombobox.c:986 ../gtk/gtkmenu.c:798
+#: ../gtk/gtkmenuitem.c:446
 msgid "Arrow Scaling"
 msgstr "箭頭縮放"
 
-#: ../gtk/gtkarrow.c:128
+#: ../gtk/gtkarrow.c:130
 msgid "Amount of space used up by arrow"
 msgstr "箭頭所佔空間大�"
 
-#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1159
+#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1178
 msgid "Horizontal Alignment"
 msgstr "水平�齊�置"
 
@@ -697,7 +697,7 @@ msgstr "水平�齊�置"
 msgid "X alignment of the child"
 msgstr "�元件的水平�齊�置"
 
-#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1175
+#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1194
 msgid "Vertical Alignment"
 msgstr "垂直�齊�置"
 
@@ -721,176 +721,186 @@ msgstr "���元件"
 msgid "Force aspect ratio to match that of the frame's child"
 msgstr "強迫設定長寬比符�該框架�的�元件的設定"
 
-#: ../gtk/gtkassistant.c:326
+#: ../gtk/gtkassistant.c:310
 msgid "Header Padding"
 msgstr "�首留空"
 
-#: ../gtk/gtkassistant.c:327
+#: ../gtk/gtkassistant.c:311
 msgid "Number of pixels around the header."
 msgstr "�首周��留的�素數。"
 
-#: ../gtk/gtkassistant.c:334
+#: ../gtk/gtkassistant.c:318
 msgid "Content Padding"
 msgstr "內容留空"
 
-#: ../gtk/gtkassistant.c:335
+#: ../gtk/gtkassistant.c:319
 msgid "Number of pixels around the content pages."
 msgstr "內容周��留的�素數。"
 
-#: ../gtk/gtkassistant.c:351
+#: ../gtk/gtkassistant.c:335
 msgid "Page type"
 msgstr "��類型"
 
-#: ../gtk/gtkassistant.c:352
+#: ../gtk/gtkassistant.c:336
 msgid "The type of the assistant page"
 msgstr "助���的類型"
 
-#: ../gtk/gtkassistant.c:369
+#: ../gtk/gtkassistant.c:351
 msgid "Page title"
 msgstr "��標題"
 
-#: ../gtk/gtkassistant.c:370
+#: ../gtk/gtkassistant.c:352
 msgid "The title of the assistant page"
 msgstr "助���的標題"
 
-#: ../gtk/gtkassistant.c:386
+#: ../gtk/gtkassistant.c:369
 msgid "Header image"
 msgstr "�首圖片"
 
-#: ../gtk/gtkassistant.c:387
+#: ../gtk/gtkassistant.c:370
 msgid "Header image for the assistant page"
 msgstr "助���的�首圖片"
 
-#: ../gtk/gtkassistant.c:403
+#: ../gtk/gtkassistant.c:386
 msgid "Sidebar image"
 msgstr "�邊欄圖片"
 
-#: ../gtk/gtkassistant.c:404
+#: ../gtk/gtkassistant.c:387
 msgid "Sidebar image for the assistant page"
 msgstr "助���的�邊欄圖片"
 
-#: ../gtk/gtkassistant.c:419
+#: ../gtk/gtkassistant.c:403
 msgid "Page complete"
 msgstr "��完�"
 
-#: ../gtk/gtkassistant.c:420
+#: ../gtk/gtkassistant.c:404
 msgid "Whether all required fields on the page have been filled out"
 msgstr "在此��中所有�求的欄�是�已填好"
 
-#: ../gtk/gtkbbox.c:152
+#: ../gtk/gtkbbox.c:159
 msgid "Minimum child width"
 msgstr "�元件闊度下�"
 
-#: ../gtk/gtkbbox.c:153
+#: ../gtk/gtkbbox.c:160
 msgid "Minimum width of buttons inside the box"
 msgstr "在按鈕方塊內按鈕的闊度下�"
 
-#: ../gtk/gtkbbox.c:161
+#: ../gtk/gtkbbox.c:168
 msgid "Minimum child height"
 msgstr "�元件高度下�"
 
-#: ../gtk/gtkbbox.c:162
+#: ../gtk/gtkbbox.c:169
 msgid "Minimum height of buttons inside the box"
 msgstr "在按鈕方塊內按鈕的高度下�"
 
-#: ../gtk/gtkbbox.c:170
+#: ../gtk/gtkbbox.c:177
 msgid "Child internal width padding"
 msgstr "�元件內部留空闊度"
 
-#: ../gtk/gtkbbox.c:171
+#: ../gtk/gtkbbox.c:178
 msgid "Amount to increase child's size on either side"
 msgstr "副元件左�兩邊增加的尺寸"
 
-#: ../gtk/gtkbbox.c:179
+#: ../gtk/gtkbbox.c:186
 msgid "Child internal height padding"
 msgstr "副元件內部高度留邊"
 
-#: ../gtk/gtkbbox.c:180
+#: ../gtk/gtkbbox.c:187
 msgid "Amount to increase child's size on the top and bottom"
 msgstr "�元件頂部�底部欲增加的尺寸"
 
-#: ../gtk/gtkbbox.c:188
+#: ../gtk/gtkbbox.c:195
 msgid "Layout style"
 msgstr "呈�樣�"
 
-#: ../gtk/gtkbbox.c:189
+#: ../gtk/gtkbbox.c:196
 msgid ""
 "How to lay out the buttons in the box. Possible values are: spread, edge, "
 "start and end"
 msgstr "如何呈�方塊中的按鈕。�使用的值為「spread�(分散)�「edge�(邊緣)�「start�(開頭) �「end�(�尾)"
 
-#: ../gtk/gtkbbox.c:197
+#: ../gtk/gtkbbox.c:204
 msgid "Secondary"
 msgstr "次�的"
 
-#: ../gtk/gtkbbox.c:198
+#: ../gtk/gtkbbox.c:205
 msgid ""
 "If TRUE, the child appears in a secondary group of children, suitable for, e."
 "g., help buttons"
 msgstr "如設為定為‘TRUE’，�元件將出�於次�的�元件羣組中，�用於：求助按鈕"
 
-#: ../gtk/gtkbox.c:239 ../gtk/gtkcellareabox.c:318 ../gtk/gtkexpander.c:313
-#: ../gtk/gtkiconview.c:645 ../gtk/gtktreeviewcolumn.c:271
+#: ../gtk/gtkbbox.c:212
+#, fuzzy
+msgid "Non-Homogeneous"
+msgstr "列高一致"
+
+#: ../gtk/gtkbbox.c:213
+#, fuzzy
+msgid "If TRUE, the child will not be subject to homogeneous sizing"
+msgstr "如設為定為‘TRUE’，�元件�以比原本指定的大�更�"
+
+#: ../gtk/gtkbox.c:241 ../gtk/gtkcellareabox.c:317 ../gtk/gtkexpander.c:314
+#: ../gtk/gtkiconview.c:643 ../gtk/gtktreeviewcolumn.c:283
 msgid "Spacing"
 msgstr "é–“è·�"
 
-#: ../gtk/gtkbox.c:240
+#: ../gtk/gtkbox.c:242
 msgid "The amount of space between children"
 msgstr "�元件之間的間�"
 
-#: ../gtk/gtkbox.c:249 ../gtk/gtktable.c:193 ../gtk/gtktoolbar.c:551
-#: ../gtk/gtktoolitemgroup.c:1649
+#: ../gtk/gtkbox.c:251 ../gtk/gtktable.c:227 ../gtk/gtktoolbar.c:563
+#: ../gtk/gtktoolitemgroup.c:1645
 msgid "Homogeneous"
 msgstr "尺寸一致"
 
-#: ../gtk/gtkbox.c:250
+#: ../gtk/gtkbox.c:252
 msgid "Whether the children should all be the same size"
 msgstr "�元件的大�應�全部相�"
 
-#: ../gtk/gtkbox.c:270 ../gtk/gtkcellareabox.c:338 ../gtk/gtktoolbar.c:543
-#: ../gtk/gtktoolitemgroup.c:1656 ../gtk/gtktoolpalette.c:1101
-#: ../gtk/gtktreeviewcolumn.c:327
+#: ../gtk/gtkbox.c:272 ../gtk/gtkcellareabox.c:337 ../gtk/gtktoolbar.c:555
+#: ../gtk/gtktoolitemgroup.c:1652 ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktreeviewcolumn.c:339
 msgid "Expand"
 msgstr "æ“´å¼µ"
 
-#: ../gtk/gtkbox.c:271
+#: ../gtk/gtkbox.c:273
 msgid "Whether the child should receive extra space when the parent grows"
 msgstr "當�元件擴展開來時�元件應��時隨之擴張"
 
-#: ../gtk/gtkbox.c:287 ../gtk/gtktoolitemgroup.c:1663
+#: ../gtk/gtkbox.c:289 ../gtk/gtktoolitemgroup.c:1659
 msgid "Fill"
 msgstr "填滿"
 
-#: ../gtk/gtkbox.c:288
+#: ../gtk/gtkbox.c:290
 msgid ""
 "Whether extra space given to the child should be allocated to the child or "
 "used as padding"
 msgstr "當分�了�外的空間給�元件時，該空間應增加於�元件內部的尺寸，還是作為元件外部留空使用"
 
-#: ../gtk/gtkbox.c:295 ../gtk/gtktrayicon-x11.c:169
+#: ../gtk/gtkbox.c:297 ../gtk/gtktrayicon-x11.c:169
 msgid "Padding"
 msgstr "留空"
 
-#: ../gtk/gtkbox.c:296
+#: ../gtk/gtkbox.c:298
 msgid "Extra space to put between the child and its neighbors, in pixels"
 msgstr "加入�外的空�隔開�元件�周�的元件，以�素為單�"
 
-#: ../gtk/gtkbox.c:302
+#: ../gtk/gtkbox.c:304
 msgid "Pack type"
 msgstr "排列方�"
 
-#: ../gtk/gtkbox.c:303
+#: ../gtk/gtkbox.c:305
 msgid ""
 "A GtkPackType indicating whether the child is packed with reference to the "
 "start or end of the parent"
 msgstr "GtkPackType �指�元件的排列方�是從主元件的開始�置，還是從���置進行排列"
 
-#: ../gtk/gtkbox.c:309 ../gtk/gtknotebook.c:760 ../gtk/gtkpaned.c:326
-#: ../gtk/gtktoolitemgroup.c:1677
+#: ../gtk/gtkbox.c:311 ../gtk/gtknotebook.c:769 ../gtk/gtkpaned.c:349
+#: ../gtk/gtktoolitemgroup.c:1673
 msgid "Position"
 msgstr "�置"
 
-#: ../gtk/gtkbox.c:310 ../gtk/gtknotebook.c:761
+#: ../gtk/gtkbox.c:312 ../gtk/gtknotebook.c:770
 msgid "The index of the child in the parent"
 msgstr "�元件在�元件中的索引編號"
 
@@ -902,271 +912,271 @@ msgstr "翻譯網域"
 msgid "The translation domain used by gettext"
 msgstr "gettext 使用的翻譯網域"
 
-#: ../gtk/gtkbutton.c:228
+#: ../gtk/gtkbutton.c:229
 msgid ""
 "Text of the label widget inside the button, if the button contains a label "
 "widget"
 msgstr "如果按鈕中有標籤元件，指定該標籤元件中的文字"
 
-#: ../gtk/gtkbutton.c:235 ../gtk/gtkexpander.c:297 ../gtk/gtklabel.c:588
-#: ../gtk/gtkmenuitem.c:343 ../gtk/gtktoolbutton.c:208
+#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:298 ../gtk/gtklabel.c:750
+#: ../gtk/gtkmenuitem.c:398 ../gtk/gtktoolbutton.c:239
 msgid "Use underline"
 msgstr "使用底線"
 
-#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:298 ../gtk/gtklabel.c:589
-#: ../gtk/gtkmenuitem.c:344
+#: ../gtk/gtkbutton.c:237 ../gtk/gtkexpander.c:299 ../gtk/gtklabel.c:751
+#: ../gtk/gtkmenuitem.c:399
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "如果設定，文字的底線表示其後的字符應該當��徑�"
 
-#: ../gtk/gtkbutton.c:243 ../gtk/gtkimagemenuitem.c:164
+#: ../gtk/gtkbutton.c:244 ../gtk/gtkimagemenuitem.c:175
 msgid "Use stock"
 msgstr "使用內置"
 
-#: ../gtk/gtkbutton.c:244
+#: ../gtk/gtkbutton.c:245
 msgid ""
 "If set, the label is used to pick a stock item instead of being displayed"
 msgstr "若設置，該標籤內容用來指定內置圖示而�會被顯示"
 
-#: ../gtk/gtkbutton.c:251 ../gtk/gtkcombobox.c:791
-#: ../gtk/gtkfilechooserbutton.c:383
+#: ../gtk/gtkbutton.c:252 ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkfilechooserbutton.c:426
 msgid "Focus on click"
 msgstr "點�時�焦"
 
-#: ../gtk/gtkbutton.c:252 ../gtk/gtkfilechooserbutton.c:384
+#: ../gtk/gtkbutton.c:253 ../gtk/gtkfilechooserbutton.c:427
 msgid "Whether the button grabs focus when it is clicked with the mouse"
 msgstr "當該按鈕被滑鼠點�時是�自動�得焦點"
 
-#: ../gtk/gtkbutton.c:259
+#: ../gtk/gtkbutton.c:260
 msgid "Border relief"
 msgstr "邊緣樣�"
 
-#: ../gtk/gtkbutton.c:260
+#: ../gtk/gtkbutton.c:261
 msgid "The border relief style"
 msgstr "邊緣的樣�"
 
-#: ../gtk/gtkbutton.c:277
+#: ../gtk/gtkbutton.c:278
 msgid "Horizontal alignment for child"
 msgstr "�元件水平�齊"
 
-#: ../gtk/gtkbutton.c:296
+#: ../gtk/gtkbutton.c:297
 msgid "Vertical alignment for child"
 msgstr "�元件垂直�齊�置"
 
-#: ../gtk/gtkbutton.c:313 ../gtk/gtkimagemenuitem.c:149
+#: ../gtk/gtkbutton.c:314 ../gtk/gtkimagemenuitem.c:160
 msgid "Image widget"
 msgstr "圖片元件"
 
-#: ../gtk/gtkbutton.c:314
+#: ../gtk/gtkbutton.c:315
 msgid "Child widget to appear next to the button text"
 msgstr "按鈕文字�邊顯示的�元件"
 
-#: ../gtk/gtkbutton.c:328
+#: ../gtk/gtkbutton.c:329
 msgid "Image position"
 msgstr "圖片�置"
 
-#: ../gtk/gtkbutton.c:329
+#: ../gtk/gtkbutton.c:330
 msgid "The position of the image relative to the text"
 msgstr "圖片相�於文字的�置"
 
-#: ../gtk/gtkbutton.c:449
+#: ../gtk/gtkbutton.c:450
 msgid "Default Spacing"
 msgstr "�設間隔"
 
-#: ../gtk/gtkbutton.c:450
+#: ../gtk/gtkbutton.c:451
 msgid "Extra space to add for GTK_CAN_DEFAULT buttons"
 msgstr "加給 GTK_CAN_DEFAULT 的�外空間"
 
-#: ../gtk/gtkbutton.c:464
+#: ../gtk/gtkbutton.c:465
 msgid "Default Outside Spacing"
 msgstr "�設外部間隔"
 
-#: ../gtk/gtkbutton.c:465
+#: ../gtk/gtkbutton.c:466
 msgid ""
 "Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside "
 "the border"
 msgstr "加給 GTK_CAN_DEFAULT 按鈕邊緣外部的�外空間"
 
-#: ../gtk/gtkbutton.c:470
+#: ../gtk/gtkbutton.c:471
 msgid "Child X Displacement"
 msgstr "�元件的水平�移�離"
 
-#: ../gtk/gtkbutton.c:471
+#: ../gtk/gtkbutton.c:472
 msgid ""
 "How far in the x direction to move the child when the button is depressed"
 msgstr "當按鈕按下時期�元件應�移多�的水平�離"
 
-#: ../gtk/gtkbutton.c:478
+#: ../gtk/gtkbutton.c:479
 msgid "Child Y Displacement"
 msgstr "�元件的垂直�移�離"
 
-#: ../gtk/gtkbutton.c:479
+#: ../gtk/gtkbutton.c:480
 msgid ""
 "How far in the y direction to move the child when the button is depressed"
 msgstr "當按鈕按下時期�元件應�移多�的垂直�離"
 
-#: ../gtk/gtkbutton.c:495
+#: ../gtk/gtkbutton.c:496
 msgid "Displace focus"
 msgstr "焦點�移"
 
-#: ../gtk/gtkbutton.c:496
+#: ../gtk/gtkbutton.c:497
 msgid ""
 "Whether the child_displacement_x/_y properties should also affect the focus "
 "rectangle"
 msgstr "child_displacement_x/_y 屬性是�也影響焦點方塊"
 
-#: ../gtk/gtkbutton.c:509 ../gtk/gtkentry.c:789 ../gtk/gtkentry.c:1864
+#: ../gtk/gtkbutton.c:510 ../gtk/gtkentry.c:794 ../gtk/gtkentry.c:1869
 msgid "Inner Border"
 msgstr "內部框線"
 
-#: ../gtk/gtkbutton.c:510
+#: ../gtk/gtkbutton.c:511
 msgid "Border between button edges and child."
 msgstr "在按鈕邊緣與�項之間的框線。"
 
-#: ../gtk/gtkbutton.c:523
+#: ../gtk/gtkbutton.c:524
 msgid "Image spacing"
 msgstr "圖片間�"
 
-#: ../gtk/gtkbutton.c:524
+#: ../gtk/gtkbutton.c:525
 msgid "Spacing in pixels between the image and label"
 msgstr "圖片與文字標籤的之間的�離(�素)"
 
-#: ../gtk/gtkcalendar.c:468
+#: ../gtk/gtkcalendar.c:470
 msgid "Year"
 msgstr "å¹´"
 
-#: ../gtk/gtkcalendar.c:469
+#: ../gtk/gtkcalendar.c:471
 msgid "The selected year"
 msgstr "��的年份"
 
-#: ../gtk/gtkcalendar.c:482
+#: ../gtk/gtkcalendar.c:484
 msgid "Month"
 msgstr "月"
 
-#: ../gtk/gtkcalendar.c:483
+#: ../gtk/gtkcalendar.c:485
 msgid "The selected month (as a number between 0 and 11)"
 msgstr "��的月份（為 0 - 11 之間的數字）"
 
-#: ../gtk/gtkcalendar.c:497
+#: ../gtk/gtkcalendar.c:499
 msgid "Day"
 msgstr "天"
 
-#: ../gtk/gtkcalendar.c:498
+#: ../gtk/gtkcalendar.c:500
 msgid ""
 "The selected day (as a number between 1 and 31, or 0 to unselect the "
 "currently selected day)"
 msgstr "��的日期（為 1 - 31 之間的數字，或為 0 表示解除��目���的日期）"
 
-#: ../gtk/gtkcalendar.c:512
+#: ../gtk/gtkcalendar.c:514
 msgid "Show Heading"
 msgstr "顯示標頭"
 
-#: ../gtk/gtkcalendar.c:513
+#: ../gtk/gtkcalendar.c:515
 msgid "If TRUE, a heading is displayed"
 msgstr "如設為定為‘TRUE’，則顯示月份�年份標頭"
 
-#: ../gtk/gtkcalendar.c:527
+#: ../gtk/gtkcalendar.c:529
 msgid "Show Day Names"
 msgstr "顯示星期"
 
-#: ../gtk/gtkcalendar.c:528
+#: ../gtk/gtkcalendar.c:530
 msgid "If TRUE, day names are displayed"
 msgstr "如設為定為‘TRUE’，星期�會被顯示"
 
-#: ../gtk/gtkcalendar.c:541
+#: ../gtk/gtkcalendar.c:543
 msgid "No Month Change"
 msgstr "�更改月份"
 
-#: ../gtk/gtkcalendar.c:542
+#: ../gtk/gtkcalendar.c:544
 msgid "If TRUE, the selected month cannot be changed"
 msgstr "如設為定為‘TRUE’，�定的月份無法更改"
 
-#: ../gtk/gtkcalendar.c:556
+#: ../gtk/gtkcalendar.c:558
 msgid "Show Week Numbers"
 msgstr "顯示週數"
 
-#: ../gtk/gtkcalendar.c:557
+#: ../gtk/gtkcalendar.c:559
 msgid "If TRUE, week numbers are displayed"
 msgstr "如設為定為‘TRUE’，週次會被顯示"
 
-#: ../gtk/gtkcalendar.c:572
+#: ../gtk/gtkcalendar.c:574
 msgid "Details Width"
 msgstr "詳細資訊闊度"
 
-#: ../gtk/gtkcalendar.c:573
+#: ../gtk/gtkcalendar.c:575
 msgid "Details width in characters"
 msgstr "詳細資訊闊度（以字符計）"
 
-#: ../gtk/gtkcalendar.c:588
+#: ../gtk/gtkcalendar.c:590
 msgid "Details Height"
 msgstr "詳細資訊高度"
 
-#: ../gtk/gtkcalendar.c:589
+#: ../gtk/gtkcalendar.c:591
 msgid "Details height in rows"
 msgstr "列的詳細資訊高度"
 
-#: ../gtk/gtkcalendar.c:605
+#: ../gtk/gtkcalendar.c:607
 msgid "Show Details"
 msgstr "顯示詳細資料"
 
-#: ../gtk/gtkcalendar.c:606
+#: ../gtk/gtkcalendar.c:608
 msgid "If TRUE, details are shown"
 msgstr "如設為定為‘TRUE’，會顯示詳細資訊"
 
-#: ../gtk/gtkcalendar.c:618
+#: ../gtk/gtkcalendar.c:620
 msgid "Inner border"
 msgstr "內部框線"
 
-#: ../gtk/gtkcalendar.c:619
+#: ../gtk/gtkcalendar.c:621
 msgid "Inner border space"
 msgstr "內部框線間�"
 
-#: ../gtk/gtkcalendar.c:630
+#: ../gtk/gtkcalendar.c:632
 msgid "Vertical separation"
 msgstr "垂直分隔"
 
-#: ../gtk/gtkcalendar.c:631
+#: ../gtk/gtkcalendar.c:633
 msgid "Space between day headers and main area"
 msgstr "日標題與主��域之間的間�"
 
-#: ../gtk/gtkcalendar.c:642
+#: ../gtk/gtkcalendar.c:644
 msgid "Horizontal separation"
 msgstr "水平分隔"
 
-#: ../gtk/gtkcalendar.c:643
+#: ../gtk/gtkcalendar.c:645
 msgid "Space between week headers and main area"
 msgstr "週標題與主��域之間的間�"
 
-#: ../gtk/gtkcellareabox.c:319 ../gtk/gtktreeviewcolumn.c:272
+#: ../gtk/gtkcellareabox.c:318 ../gtk/gtktreeviewcolumn.c:284
 msgid "Space which is inserted between cells"
 msgstr "�入格�之間的間隔"
 
-#: ../gtk/gtkcellareabox.c:339
+#: ../gtk/gtkcellareabox.c:338
 msgid "Whether the cell expands"
 msgstr "該格�是�展開"
 
-#: ../gtk/gtkcellareabox.c:354
+#: ../gtk/gtkcellareabox.c:353
 msgid "Align"
 msgstr "�齊"
 
-#: ../gtk/gtkcellareabox.c:355
+#: ../gtk/gtkcellareabox.c:354
 msgid "Whether cell should align with adjacent rows"
 msgstr "格�是�應與鄰近的列�齊"
 
-#: ../gtk/gtkcellareabox.c:371
+#: ../gtk/gtkcellareabox.c:370
 msgid "Fixed Size"
 msgstr "固定大�"
 
-#: ../gtk/gtkcellareabox.c:372
+#: ../gtk/gtkcellareabox.c:371
 msgid "Whether cells should be the same size in all rows"
 msgstr "格�是�應與所有的列相�大�"
 
-#: ../gtk/gtkcellareabox.c:388
+#: ../gtk/gtkcellareabox.c:387
 msgid "Pack Type"
 msgstr "排列方�"
 
-#: ../gtk/gtkcellareabox.c:389
+#: ../gtk/gtkcellareabox.c:388
 msgid ""
 "A GtkPackType indicating whether the cell is packed with reference to the "
 "start or end of the cell area"
@@ -1196,28 +1206,28 @@ msgstr "編輯視窗元件"
 msgid "The widget currently editing the edited cell"
 msgstr "目�用來編輯格�的視窗元件"
 
-#: ../gtk/gtkcellareacontext.c:127
+#: ../gtk/gtkcellareacontext.c:119
 msgid "Area"
 msgstr "�域"
 
-#: ../gtk/gtkcellareacontext.c:128
+#: ../gtk/gtkcellareacontext.c:120
 msgid "The Cell Area this context was created for"
 msgstr "這個�項建立的格��域"
 
-#: ../gtk/gtkcellareacontext.c:144 ../gtk/gtkcellareacontext.c:163
-#: ../gtk/gtktreeviewcolumn.c:299
+#: ../gtk/gtkcellareacontext.c:136 ../gtk/gtkcellareacontext.c:155
+#: ../gtk/gtktreeviewcolumn.c:311
 msgid "Minimum Width"
 msgstr "最�闊度"
 
-#: ../gtk/gtkcellareacontext.c:145 ../gtk/gtkcellareacontext.c:164
+#: ../gtk/gtkcellareacontext.c:137 ../gtk/gtkcellareacontext.c:156
 msgid "Minimum cached width"
 msgstr "最�快�闊度"
 
-#: ../gtk/gtkcellareacontext.c:182 ../gtk/gtkcellareacontext.c:201
+#: ../gtk/gtkcellareacontext.c:174 ../gtk/gtkcellareacontext.c:193
 msgid "Minimum Height"
 msgstr "最�高度"
 
-#: ../gtk/gtkcellareacontext.c:183 ../gtk/gtkcellareacontext.c:202
+#: ../gtk/gtkcellareacontext.c:175 ../gtk/gtkcellareacontext.c:194
 msgid "Minimum cached height"
 msgstr "最�快�高度"
 
@@ -1229,35 +1239,35 @@ msgstr "編輯已�消"
 msgid "Indicates that editing has been canceled"
 msgstr "表示編輯動作已被�消"
 
-#: ../gtk/gtkcellrendereraccel.c:137
+#: ../gtk/gtkcellrendereraccel.c:152
 msgid "Accelerator key"
 msgstr "�徑�"
 
-#: ../gtk/gtkcellrendereraccel.c:138
+#: ../gtk/gtkcellrendereraccel.c:153
 msgid "The keyval of the accelerator"
 msgstr "�徑�的�值"
 
-#: ../gtk/gtkcellrendereraccel.c:154
+#: ../gtk/gtkcellrendereraccel.c:169
 msgid "Accelerator modifiers"
 msgstr "�徑�的特殊按�（例如 Alt�Ctrl）"
 
-#: ../gtk/gtkcellrendereraccel.c:155
+#: ../gtk/gtkcellrendereraccel.c:170
 msgid "The modifier mask of the accelerator"
 msgstr "�徑�的修飾字�罩"
 
-#: ../gtk/gtkcellrendereraccel.c:172
+#: ../gtk/gtkcellrendereraccel.c:187
 msgid "Accelerator keycode"
 msgstr "�徑�碼"
 
-#: ../gtk/gtkcellrendereraccel.c:173
+#: ../gtk/gtkcellrendereraccel.c:188
 msgid "The hardware keycode of the accelerator"
 msgstr "�徑�的硬件按�碼"
 
-#: ../gtk/gtkcellrendereraccel.c:192
+#: ../gtk/gtkcellrendereraccel.c:207
 msgid "Accelerator Mode"
 msgstr "�徑�模�"
 
-#: ../gtk/gtkcellrendereraccel.c:193
+#: ../gtk/gtkcellrendereraccel.c:208
 msgid "The type of accelerators"
 msgstr "�徑�類型"
 
@@ -1385,175 +1395,175 @@ msgstr "格�背景設定"
 msgid "Whether this tag affects the cell background color"
 msgstr "本標記�以變動該格�的背景�色"
 
-#: ../gtk/gtkcellrenderercombo.c:109
+#: ../gtk/gtkcellrenderercombo.c:130
 msgid "Model"
 msgstr "模型"
 
-#: ../gtk/gtkcellrenderercombo.c:110
+#: ../gtk/gtkcellrenderercombo.c:131
 msgid "The model containing the possible values for the combo box"
 msgstr "該組�方塊的模型（包��能的數值）"
 
-#: ../gtk/gtkcellrenderercombo.c:132
+#: ../gtk/gtkcellrenderercombo.c:153
 msgid "Text Column"
 msgstr "文字格�"
 
-#: ../gtk/gtkcellrenderercombo.c:133
+#: ../gtk/gtkcellrenderercombo.c:154
 msgid "A column in the data source model to get the strings from"
 msgstr "從資料來�模型�得字串資料的欄�"
 
-#: ../gtk/gtkcellrenderercombo.c:150 ../gtk/gtkcombobox.c:858
+#: ../gtk/gtkcellrenderercombo.c:171 ../gtk/gtkcombobox.c:859
 msgid "Has Entry"
 msgstr "具有欄�"
 
-#: ../gtk/gtkcellrenderercombo.c:151
+#: ../gtk/gtkcellrenderercombo.c:172
 msgid "If FALSE, don't allow to enter strings other than the chosen ones"
 msgstr "如果為 FALSE，將��許輸入�定字串以外的字"
 
-#: ../gtk/gtkcellrendererpixbuf.c:120
+#: ../gtk/gtkcellrendererpixbuf.c:140
 msgid "Pixbuf Object"
 msgstr "Pixbuf 物件"
 
-#: ../gtk/gtkcellrendererpixbuf.c:121
+#: ../gtk/gtkcellrendererpixbuf.c:141
 msgid "The pixbuf to render"
 msgstr "準備�繪的 pixbuf。"
 
-#: ../gtk/gtkcellrendererpixbuf.c:128
+#: ../gtk/gtkcellrendererpixbuf.c:148
 msgid "Pixbuf Expander Open"
 msgstr "Pixbuf 開展器開啟"
 
-#: ../gtk/gtkcellrendererpixbuf.c:129
+#: ../gtk/gtkcellrendererpixbuf.c:149
 msgid "Pixbuf for open expander"
 msgstr "用來開啟開展器的 Pixbuf"
 
-#: ../gtk/gtkcellrendererpixbuf.c:136
+#: ../gtk/gtkcellrendererpixbuf.c:156
 msgid "Pixbuf Expander Closed"
 msgstr "Pixbuf 開展器關閉"
 
-#: ../gtk/gtkcellrendererpixbuf.c:137
+#: ../gtk/gtkcellrendererpixbuf.c:157
 msgid "Pixbuf for closed expander"
 msgstr "用來關閉開展器的 Pixbuf"
 
-#: ../gtk/gtkcellrendererpixbuf.c:144 ../gtk/gtkimage.c:253
-#: ../gtk/gtkstatusicon.c:221
+#: ../gtk/gtkcellrendererpixbuf.c:164 ../gtk/gtkimage.c:254
+#: ../gtk/gtkstatusicon.c:251
 msgid "Stock ID"
 msgstr "內置圖示代碼"
 
-#: ../gtk/gtkcellrendererpixbuf.c:145
+#: ../gtk/gtkcellrendererpixbuf.c:165
 msgid "The stock ID of the stock icon to render"
 msgstr "準備顯示的內置圖示的代碼"
 
-#: ../gtk/gtkcellrendererpixbuf.c:152 ../gtk/gtkcellrendererspinner.c:151
-#: ../gtk/gtkrecentmanager.c:309 ../gtk/gtkstatusicon.c:262
+#: ../gtk/gtkcellrendererpixbuf.c:172 ../gtk/gtkcellrendererspinner.c:151
+#: ../gtk/gtkrecentmanager.c:309 ../gtk/gtkstatusicon.c:292
 msgid "Size"
 msgstr "大�"
 
-#: ../gtk/gtkcellrendererpixbuf.c:153
+#: ../gtk/gtkcellrendererpixbuf.c:173
 msgid "The GtkIconSize value that specifies the size of the rendered icon"
 msgstr "指定所��繪的圖示尺寸 (GtkIconSize)"
 
-#: ../gtk/gtkcellrendererpixbuf.c:162
+#: ../gtk/gtkcellrendererpixbuf.c:182
 msgid "Detail"
 msgstr "細節"
 
-#: ../gtk/gtkcellrendererpixbuf.c:163
+#: ../gtk/gtkcellrendererpixbuf.c:183
 msgid "Render detail to pass to the theme engine"
 msgstr "�傳�給布景主題引擎的�繪細節"
 
-#: ../gtk/gtkcellrendererpixbuf.c:196
+#: ../gtk/gtkcellrendererpixbuf.c:216
 msgid "Follow State"
 msgstr "跟隨狀態"
 
-#: ../gtk/gtkcellrendererpixbuf.c:197
+#: ../gtk/gtkcellrendererpixbuf.c:217
 msgid "Whether the rendered pixbuf should be colorized according to the state"
 msgstr "rendered pixbuf 是�跟隨狀狀�色"
 
-#: ../gtk/gtkcellrendererpixbuf.c:214 ../gtk/gtkimage.c:328
-#: ../gtk/gtkwindow.c:699
+#: ../gtk/gtkcellrendererpixbuf.c:234 ../gtk/gtkimage.c:329
+#: ../gtk/gtkwindow.c:703
 msgid "Icon"
 msgstr "圖示"
 
-#: ../gtk/gtkcellrendererprogress.c:127
+#: ../gtk/gtkcellrendererprogress.c:139
 msgid "Value of the progress bar"
 msgstr "進度列中所顯示的數值"
 
-#: ../gtk/gtkcellrendererprogress.c:144 ../gtk/gtkcellrenderertext.c:255
-#: ../gtk/gtkentry.c:832 ../gtk/gtkentrybuffer.c:352
-#: ../gtk/gtkmessagedialog.c:227 ../gtk/gtkprogressbar.c:177
-#: ../gtk/gtktextbuffer.c:210
+#: ../gtk/gtkcellrendererprogress.c:156 ../gtk/gtkcellrenderertext.c:254
+#: ../gtk/gtkentrybuffer.c:352 ../gtk/gtkentry.c:837
+#: ../gtk/gtkmessagedialog.c:229 ../gtk/gtkprogressbar.c:176
+#: ../gtk/gtktextbuffer.c:221
 msgid "Text"
 msgstr "文字"
 
-#: ../gtk/gtkcellrendererprogress.c:145
+#: ../gtk/gtkcellrendererprogress.c:157
 msgid "Text on the progress bar"
 msgstr "進度列中所顯示的文字"
 
-#: ../gtk/gtkcellrendererprogress.c:168 ../gtk/gtkcellrendererspinner.c:137
+#: ../gtk/gtkcellrendererprogress.c:180 ../gtk/gtkcellrendererspinner.c:137
 msgid "Pulse"
 msgstr "脈�"
 
-#: ../gtk/gtkcellrendererprogress.c:169
+#: ../gtk/gtkcellrendererprogress.c:181
 msgid ""
 "Set this to positive values to indicate that some progress is made, but you "
 "don't know how much."
 msgstr "將此項設為正值以表示已有�些進度，但你�知�實際有多少。"
 
-#: ../gtk/gtkcellrendererprogress.c:185
+#: ../gtk/gtkcellrendererprogress.c:197
 msgid "Text x alignment"
 msgstr "文字水平�齊方�"
 
-#: ../gtk/gtkcellrendererprogress.c:186
+#: ../gtk/gtkcellrendererprogress.c:198
 msgid ""
 "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
 msgstr "文字水平方��齊，從 0 (左)到 1 (�)。相��為�至左 (RTL) 排列。"
 
-#: ../gtk/gtkcellrendererprogress.c:202
+#: ../gtk/gtkcellrendererprogress.c:214
 msgid "Text y alignment"
 msgstr "文字垂直�齊方�"
 
-#: ../gtk/gtkcellrendererprogress.c:203
+#: ../gtk/gtkcellrendererprogress.c:215
 msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
 msgstr "文字垂直�齊方�，從 0（頂）到 1（底）。"
 
-#: ../gtk/gtkcellrendererprogress.c:214 ../gtk/gtkprogressbar.c:153
-#: ../gtk/gtkrange.c:424
+#: ../gtk/gtkcellrendererprogress.c:226 ../gtk/gtkprogressbar.c:152
+#: ../gtk/gtkrange.c:426
 msgid "Inverted"
 msgstr "�轉的"
 
-#: ../gtk/gtkcellrendererprogress.c:215 ../gtk/gtkprogressbar.c:154
+#: ../gtk/gtkcellrendererprogress.c:227 ../gtk/gtkprogressbar.c:153
 msgid "Invert the direction in which the progress bar grows"
 msgstr "�轉進度增加的方�"
 
-#: ../gtk/gtkcellrendererspin.c:91 ../gtk/gtkrange.c:416
-#: ../gtk/gtkscalebutton.c:236 ../gtk/gtkspinbutton.c:320
+#: ../gtk/gtkcellrendererspin.c:113 ../gtk/gtkrange.c:418
+#: ../gtk/gtkscalebutton.c:237 ../gtk/gtkspinbutton.c:323
 msgid "Adjustment"
 msgstr "調整"
 
-#: ../gtk/gtkcellrendererspin.c:92 ../gtk/gtkspinbutton.c:321
+#: ../gtk/gtkcellrendererspin.c:114 ../gtk/gtkspinbutton.c:324
 msgid "The adjustment that holds the value of the spin button"
 msgstr "�有微調按鈕數值的調整元件"
 
-#: ../gtk/gtkcellrendererspin.c:107
+#: ../gtk/gtkcellrendererspin.c:129
 msgid "Climb rate"
 msgstr "數值調整速率"
 
-#: ../gtk/gtkcellrendererspin.c:108 ../gtk/gtkspinbutton.c:329
+#: ../gtk/gtkcellrendererspin.c:130 ../gtk/gtkspinbutton.c:332
 msgid "The acceleration rate when you hold down a button"
 msgstr "按下按鈕時數值調整的加速度"
 
-#: ../gtk/gtkcellrendererspin.c:121 ../gtk/gtkscale.c:252
-#: ../gtk/gtkspinbutton.c:338
+#: ../gtk/gtkcellrendererspin.c:143 ../gtk/gtkscale.c:254
+#: ../gtk/gtkspinbutton.c:341
 msgid "Digits"
 msgstr "�數"
 
-#: ../gtk/gtkcellrendererspin.c:122 ../gtk/gtkspinbutton.c:339
+#: ../gtk/gtkcellrendererspin.c:144 ../gtk/gtkspinbutton.c:342
 msgid "The number of decimal places to display"
 msgstr "顯示的�數點後�數"
 
-#: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:106
-#: ../gtk/gtkmenu.c:586 ../gtk/gtkspinner.c:118 ../gtk/gtkswitch.c:801
-#: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:125
-#: ../gtk/gtktoggletoolbutton.c:112
+#: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkmenu.c:588 ../gtk/gtkspinner.c:115 ../gtk/gtkswitch.c:783
+#: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:178
+#: ../gtk/gtktoggletoolbutton.c:127
 msgid "Active"
 msgstr "使用中"
 
@@ -1569,416 +1579,418 @@ msgstr "轉輪的脈動"
 msgid "The GtkIconSize value that specifies the size of the rendered spinner"
 msgstr "指定所��繪的轉輪尺寸 (GtkIconSize) 數值"
 
-#: ../gtk/gtkcellrenderertext.c:256
+#: ../gtk/gtkcellrenderertext.c:255
 msgid "Text to render"
 msgstr "準備�繪的文字"
 
-#: ../gtk/gtkcellrenderertext.c:263
+#: ../gtk/gtkcellrenderertext.c:262
 msgid "Markup"
 msgstr "標記"
 
-#: ../gtk/gtkcellrenderertext.c:264
+#: ../gtk/gtkcellrenderertext.c:263
 msgid "Marked up text to render"
 msgstr "欲�繪的標記文字"
 
-#: ../gtk/gtkcellrenderertext.c:271 ../gtk/gtklabel.c:574
+#: ../gtk/gtkcellrenderertext.c:270 ../gtk/gtklabel.c:736
 msgid "Attributes"
 msgstr "屬性"
 
-#: ../gtk/gtkcellrenderertext.c:272
+#: ../gtk/gtkcellrenderertext.c:271
 msgid "A list of style attributes to apply to the text of the renderer"
 msgstr "�使用在輸出�(renderer)文字上的樣�屬性清單"
 
-#: ../gtk/gtkcellrenderertext.c:279
+#: ../gtk/gtkcellrenderertext.c:278
 msgid "Single Paragraph Mode"
 msgstr "單一段�模�"
 
-#: ../gtk/gtkcellrenderertext.c:280
+#: ../gtk/gtkcellrenderertext.c:279
 msgid "Whether to keep all text in a single paragraph"
 msgstr "是�將所有文字��為單一段�"
 
-#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:191
-#: ../gtk/gtktexttag.c:196
+#: ../gtk/gtkcellrenderertext.c:287 ../gtk/gtkcellview.c:191
+#: ../gtk/gtktexttag.c:199
 msgid "Background color name"
 msgstr "背景�色�稱"
 
-#: ../gtk/gtkcellrenderertext.c:289 ../gtk/gtkcellview.c:192
-#: ../gtk/gtktexttag.c:197
+#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:192
+#: ../gtk/gtktexttag.c:200
 msgid "Background color as a string"
 msgstr "背景�色（以字串表示）"
 
-#: ../gtk/gtkcellrenderertext.c:296 ../gtk/gtkcellview.c:198
-#: ../gtk/gtktexttag.c:204
+#: ../gtk/gtkcellrenderertext.c:295 ../gtk/gtkcellview.c:198
+#: ../gtk/gtktexttag.c:207
 msgid "Background color"
 msgstr "背景�色"
 
-#: ../gtk/gtkcellrenderertext.c:297 ../gtk/gtkcellview.c:199
+#: ../gtk/gtkcellrenderertext.c:296 ../gtk/gtkcellview.c:199
+#: ../gtk/gtktexttag.c:208
 msgid "Background color as a GdkColor"
 msgstr "背景�色（以 GdkColor 表示）"
 
-#: ../gtk/gtkcellrenderertext.c:311
+#: ../gtk/gtkcellrenderertext.c:310
 msgid "Background color as RGBA"
 msgstr "以 RGBA 表示的背景�色"
 
-#: ../gtk/gtkcellrenderertext.c:312 ../gtk/gtkcellview.c:213
+#: ../gtk/gtkcellrenderertext.c:311 ../gtk/gtkcellview.c:213
+#: ../gtk/gtktexttag.c:223
 msgid "Background color as a GdkRGBA"
 msgstr "以 GdkRGBA 表示的背景�色"
 
-#: ../gtk/gtkcellrenderertext.c:318 ../gtk/gtktexttag.c:220
+#: ../gtk/gtkcellrenderertext.c:317 ../gtk/gtktexttag.c:238
 msgid "Foreground color name"
 msgstr "�景�色�稱"
 
-#: ../gtk/gtkcellrenderertext.c:319 ../gtk/gtktexttag.c:221
+#: ../gtk/gtkcellrenderertext.c:318 ../gtk/gtktexttag.c:239
 msgid "Foreground color as a string"
 msgstr "以字串方�表�的�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:326 ../gtk/gtktexttag.c:228
+#: ../gtk/gtkcellrenderertext.c:325 ../gtk/gtktexttag.c:246
 #: ../gtk/gtktrayicon-x11.c:137
 msgid "Foreground color"
 msgstr "�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:327
+#: ../gtk/gtkcellrenderertext.c:326 ../gtk/gtktexttag.c:247
 msgid "Foreground color as a GdkColor"
 msgstr "以 GdkColor 方�表�的�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:341
+#: ../gtk/gtkcellrenderertext.c:340
 msgid "Foreground color as RGBA"
 msgstr "以 RGBA 表示的�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:342
+#: ../gtk/gtkcellrenderertext.c:341 ../gtk/gtktexttag.c:262
 msgid "Foreground color as a GdkRGBA"
 msgstr "以 GdkColor 方�表示的�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:350 ../gtk/gtkentry.c:756
-#: ../gtk/gtktexttag.c:245 ../gtk/gtktextview.c:684
+#: ../gtk/gtkcellrenderertext.c:349 ../gtk/gtkentry.c:761
+#: ../gtk/gtktexttag.c:278 ../gtk/gtktextview.c:686
 msgid "Editable"
 msgstr "�編輯"
 
-#: ../gtk/gtkcellrenderertext.c:351 ../gtk/gtktexttag.c:246
-#: ../gtk/gtktextview.c:685
+#: ../gtk/gtkcellrenderertext.c:350 ../gtk/gtktexttag.c:279
+#: ../gtk/gtktextview.c:687
 msgid "Whether the text can be modified by the user"
 msgstr "使用者��修改文字"
 
-#: ../gtk/gtkcellrenderertext.c:358 ../gtk/gtkcellrenderertext.c:366
-#: ../gtk/gtktexttag.c:261 ../gtk/gtktexttag.c:269
+#: ../gtk/gtkcellrenderertext.c:357 ../gtk/gtkcellrenderertext.c:365
+#: ../gtk/gtktexttag.c:294 ../gtk/gtktexttag.c:302
 msgid "Font"
 msgstr "å­—åž‹"
 
-#: ../gtk/gtkcellrenderertext.c:359 ../gtk/gtktexttag.c:262
+#: ../gtk/gtkcellrenderertext.c:358 ../gtk/gtktexttag.c:295
 msgid "Font description as a string, e.g. \"Sans Italic 12\""
 msgstr "以字串方�表�的字型，例如“Sans Italic 12�"
 
-#: ../gtk/gtkcellrenderertext.c:367 ../gtk/gtktexttag.c:270
+#: ../gtk/gtkcellrenderertext.c:366 ../gtk/gtktexttag.c:303
 msgid "Font description as a PangoFontDescription struct"
 msgstr "以 PangoFontDescription �構表示的字型"
 
-#: ../gtk/gtkcellrenderertext.c:375 ../gtk/gtktexttag.c:277
+#: ../gtk/gtkcellrenderertext.c:374 ../gtk/gtktexttag.c:310
 msgid "Font family"
 msgstr "字型�系"
 
-#: ../gtk/gtkcellrenderertext.c:376 ../gtk/gtktexttag.c:278
+#: ../gtk/gtkcellrenderertext.c:375 ../gtk/gtktexttag.c:311
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "字型�系�稱，例如：Sans�Helvetica�Times�Monospace"
 
-#: ../gtk/gtkcellrenderertext.c:383 ../gtk/gtkcellrenderertext.c:384
-#: ../gtk/gtktexttag.c:285
+#: ../gtk/gtkcellrenderertext.c:382 ../gtk/gtkcellrenderertext.c:383
+#: ../gtk/gtktexttag.c:318
 msgid "Font style"
 msgstr "字型樣�"
 
-#: ../gtk/gtkcellrenderertext.c:392 ../gtk/gtkcellrenderertext.c:393
-#: ../gtk/gtktexttag.c:294
+#: ../gtk/gtkcellrenderertext.c:391 ../gtk/gtkcellrenderertext.c:392
+#: ../gtk/gtktexttag.c:327
 msgid "Font variant"
 msgstr "字型變化"
 
-#: ../gtk/gtkcellrenderertext.c:401 ../gtk/gtkcellrenderertext.c:402
-#: ../gtk/gtktexttag.c:303
+#: ../gtk/gtkcellrenderertext.c:400 ../gtk/gtkcellrenderertext.c:401
+#: ../gtk/gtktexttag.c:336
 msgid "Font weight"
 msgstr "å­—åž‹ç²—ç´°"
 
-#: ../gtk/gtkcellrenderertext.c:411 ../gtk/gtkcellrenderertext.c:412
-#: ../gtk/gtktexttag.c:314
+#: ../gtk/gtkcellrenderertext.c:410 ../gtk/gtkcellrenderertext.c:411
+#: ../gtk/gtktexttag.c:347
 msgid "Font stretch"
 msgstr "字型寬緊"
 
-#: ../gtk/gtkcellrenderertext.c:420 ../gtk/gtkcellrenderertext.c:421
-#: ../gtk/gtktexttag.c:323
+#: ../gtk/gtkcellrenderertext.c:419 ../gtk/gtkcellrenderertext.c:420
+#: ../gtk/gtktexttag.c:356
 msgid "Font size"
 msgstr "字型大�"
 
-#: ../gtk/gtkcellrenderertext.c:430 ../gtk/gtktexttag.c:343
+#: ../gtk/gtkcellrenderertext.c:429 ../gtk/gtktexttag.c:376
 msgid "Font points"
 msgstr "字型點數"
 
-#: ../gtk/gtkcellrenderertext.c:431 ../gtk/gtktexttag.c:344
+#: ../gtk/gtkcellrenderertext.c:430 ../gtk/gtktexttag.c:377
 msgid "Font size in points"
 msgstr "以點數表�的字型大�"
 
-#: ../gtk/gtkcellrenderertext.c:440 ../gtk/gtktexttag.c:333
+#: ../gtk/gtkcellrenderertext.c:439 ../gtk/gtktexttag.c:366
 msgid "Font scale"
 msgstr "字型比例"
 
-#: ../gtk/gtkcellrenderertext.c:441
+#: ../gtk/gtkcellrenderertext.c:440
 msgid "Font scaling factor"
 msgstr "字型縮放系數"
 
-#: ../gtk/gtkcellrenderertext.c:450 ../gtk/gtktexttag.c:412
+#: ../gtk/gtkcellrenderertext.c:449 ../gtk/gtktexttag.c:445
 msgid "Rise"
 msgstr "�高"
 
-#: ../gtk/gtkcellrenderertext.c:451
+#: ../gtk/gtkcellrenderertext.c:450
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative)"
 msgstr "文字和底部基準線的�離 (如果�高的數值為負數，則表示低於基準線)"
 
-#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:452
+#: ../gtk/gtkcellrenderertext.c:461 ../gtk/gtktexttag.c:485
 msgid "Strikethrough"
 msgstr "刪除線"
 
-#: ../gtk/gtkcellrenderertext.c:463 ../gtk/gtktexttag.c:453
+#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:486
 msgid "Whether to strike through the text"
 msgstr "是�在文字中央加上刪除線"
 
-#: ../gtk/gtkcellrenderertext.c:470 ../gtk/gtktexttag.c:460
+#: ../gtk/gtkcellrenderertext.c:469 ../gtk/gtktexttag.c:493
 msgid "Underline"
 msgstr "底線"
 
-#: ../gtk/gtkcellrenderertext.c:471 ../gtk/gtktexttag.c:461
+#: ../gtk/gtkcellrenderertext.c:470 ../gtk/gtktexttag.c:494
 msgid "Style of underline for this text"
 msgstr "此文字的底線樣�"
 
-#: ../gtk/gtkcellrenderertext.c:479 ../gtk/gtktexttag.c:372
+#: ../gtk/gtkcellrenderertext.c:478 ../gtk/gtktexttag.c:405
 msgid "Language"
 msgstr "語言"
 
-#: ../gtk/gtkcellrenderertext.c:480
+#: ../gtk/gtkcellrenderertext.c:479
 msgid ""
 "The language this text is in, as an ISO code. Pango can use this as a hint "
 "when rendering the text. If you don't understand this parameter, you "
 "probably don't need it"
 msgstr "該文字所用的語言，以 ISO 代碼表示。Pango 在�繪文字時會使用這個設定作為�示。如果你�明白這個�數的�義，�是表示�需�使用它了。"
 
-#: ../gtk/gtkcellrenderertext.c:500 ../gtk/gtklabel.c:699
-#: ../gtk/gtkprogressbar.c:217
+#: ../gtk/gtkcellrenderertext.c:499 ../gtk/gtklabel.c:861
+#: ../gtk/gtkprogressbar.c:220
 msgid "Ellipsize"
 msgstr "簡化文字"
 
-#: ../gtk/gtkcellrenderertext.c:501
+#: ../gtk/gtkcellrenderertext.c:500
 msgid ""
 "The preferred place to ellipsize the string, if the cell renderer does not "
 "have enough room to display the entire string"
 msgstr "如果儲存格�顯示�沒有足夠的空間顯示整個字串時，用來簡化該字串的�好空間"
 
-#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtkfilechooserbutton.c:411
-#: ../gtk/gtklabel.c:720
+#: ../gtk/gtkcellrenderertext.c:519 ../gtk/gtkfilechooserbutton.c:454
+#: ../gtk/gtklabel.c:882
 msgid "Width In Characters"
 msgstr "按鈕闊度"
 
-#: ../gtk/gtkcellrenderertext.c:521 ../gtk/gtklabel.c:721
+#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtklabel.c:883
 msgid "The desired width of the label, in characters"
 msgstr "�求的標籤闊度，以字符計"
 
-#: ../gtk/gtkcellrenderertext.c:545 ../gtk/gtklabel.c:781
+#: ../gtk/gtkcellrenderertext.c:544 ../gtk/gtklabel.c:943
 msgid "Maximum Width In Characters"
 msgstr "最大闊度（以字符計）"
 
-#: ../gtk/gtkcellrenderertext.c:546
+#: ../gtk/gtkcellrenderertext.c:545
 msgid "The maximum width of the cell, in characters"
 msgstr "格�所需的最大闊度，以字符計"
 
-#: ../gtk/gtkcellrenderertext.c:564 ../gtk/gtktexttag.c:469
+#: ../gtk/gtkcellrenderertext.c:563 ../gtk/gtktexttag.c:502
 msgid "Wrap mode"
 msgstr "�行模�"
 
-#: ../gtk/gtkcellrenderertext.c:565
+#: ../gtk/gtkcellrenderertext.c:564
 msgid ""
 "How to break the string into multiple lines, if the cell renderer does not "
 "have enough room to display the entire string"
 msgstr "若格�顯示�沒有足夠的空間顯示整行字串時，如何將字串斷�多行"
 
-#: ../gtk/gtkcellrenderertext.c:584 ../gtk/gtkcombobox.c:680
+#: ../gtk/gtkcellrenderertext.c:583 ../gtk/gtkcombobox.c:681
 msgid "Wrap width"
 msgstr "�行闊度"
 
-#: ../gtk/gtkcellrenderertext.c:585
+#: ../gtk/gtkcellrenderertext.c:584
 msgid "The width at which the text is wrapped"
 msgstr "文字在那個長度後斷行"
 
-#: ../gtk/gtkcellrenderertext.c:605 ../gtk/gtktreeviewcolumn.c:352
+#: ../gtk/gtkcellrenderertext.c:604 ../gtk/gtktreeviewcolumn.c:364
 msgid "Alignment"
 msgstr "�齊"
 
-#: ../gtk/gtkcellrenderertext.c:606
+#: ../gtk/gtkcellrenderertext.c:605
 msgid "How to align the lines"
 msgstr "如何�齊�行"
 
-#: ../gtk/gtkcellrenderertext.c:618 ../gtk/gtkcellview.c:317
-#: ../gtk/gtktexttag.c:558
+#: ../gtk/gtkcellrenderertext.c:617 ../gtk/gtkcellview.c:317
+#: ../gtk/gtktexttag.c:605
 msgid "Background set"
 msgstr "背景設定"
 
-#: ../gtk/gtkcellrenderertext.c:619 ../gtk/gtkcellview.c:318
-#: ../gtk/gtktexttag.c:559
+#: ../gtk/gtkcellrenderertext.c:618 ../gtk/gtkcellview.c:318
+#: ../gtk/gtktexttag.c:606
 msgid "Whether this tag affects the background color"
 msgstr "本標記��影響背景�色"
 
-#: ../gtk/gtkcellrenderertext.c:622 ../gtk/gtktexttag.c:566
+#: ../gtk/gtkcellrenderertext.c:621 ../gtk/gtktexttag.c:613
 msgid "Foreground set"
 msgstr "�景設定"
 
-#: ../gtk/gtkcellrenderertext.c:623 ../gtk/gtktexttag.c:567
+#: ../gtk/gtkcellrenderertext.c:622 ../gtk/gtktexttag.c:614
 msgid "Whether this tag affects the foreground color"
 msgstr "本標記��影響�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:626 ../gtk/gtktexttag.c:570
+#: ../gtk/gtkcellrenderertext.c:625 ../gtk/gtktexttag.c:617
 msgid "Editability set"
 msgstr "�編輯性設定"
 
-#: ../gtk/gtkcellrenderertext.c:627 ../gtk/gtktexttag.c:571
+#: ../gtk/gtkcellrenderertext.c:626 ../gtk/gtktexttag.c:618
 msgid "Whether this tag affects text editability"
 msgstr "本標記��影響文字的�編輯性"
 
-#: ../gtk/gtkcellrenderertext.c:630 ../gtk/gtktexttag.c:574
+#: ../gtk/gtkcellrenderertext.c:629 ../gtk/gtktexttag.c:621
 msgid "Font family set"
 msgstr "字型�系設定"
 
-#: ../gtk/gtkcellrenderertext.c:631 ../gtk/gtktexttag.c:575
+#: ../gtk/gtkcellrenderertext.c:630 ../gtk/gtktexttag.c:622
 msgid "Whether this tag affects the font family"
 msgstr "此標籤是�影響字型�系"
 
-#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtktexttag.c:578
+#: ../gtk/gtkcellrenderertext.c:633 ../gtk/gtktexttag.c:625
 msgid "Font style set"
 msgstr "字型樣�設定"
 
-#: ../gtk/gtkcellrenderertext.c:635 ../gtk/gtktexttag.c:579
+#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtktexttag.c:626
 msgid "Whether this tag affects the font style"
 msgstr "此標籤是�影響字型樣�"
 
-#: ../gtk/gtkcellrenderertext.c:638 ../gtk/gtktexttag.c:582
+#: ../gtk/gtkcellrenderertext.c:637 ../gtk/gtktexttag.c:629
 msgid "Font variant set"
 msgstr "字型變化設定"
 
-#: ../gtk/gtkcellrenderertext.c:639 ../gtk/gtktexttag.c:583
+#: ../gtk/gtkcellrenderertext.c:638 ../gtk/gtktexttag.c:630
 msgid "Whether this tag affects the font variant"
 msgstr "此標籤是�影響字型變化"
 
-#: ../gtk/gtkcellrenderertext.c:642 ../gtk/gtktexttag.c:586
+#: ../gtk/gtkcellrenderertext.c:641 ../gtk/gtktexttag.c:633
 msgid "Font weight set"
 msgstr "字型粗細設定"
 
-#: ../gtk/gtkcellrenderertext.c:643 ../gtk/gtktexttag.c:587
+#: ../gtk/gtkcellrenderertext.c:642 ../gtk/gtktexttag.c:634
 msgid "Whether this tag affects the font weight"
 msgstr "此標籤是�影響字型粗細"
 
-#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtktexttag.c:590
+#: ../gtk/gtkcellrenderertext.c:645 ../gtk/gtktexttag.c:637
 msgid "Font stretch set"
 msgstr "字型寬緊設定"
 
-#: ../gtk/gtkcellrenderertext.c:647 ../gtk/gtktexttag.c:591
+#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtktexttag.c:638
 msgid "Whether this tag affects the font stretch"
 msgstr "此標籤是�影響字型寬緊"
 
-#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:594
+#: ../gtk/gtkcellrenderertext.c:649 ../gtk/gtktexttag.c:641
 msgid "Font size set"
 msgstr "字型大�設定"
 
-#: ../gtk/gtkcellrenderertext.c:651 ../gtk/gtktexttag.c:595
+#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:642
 msgid "Whether this tag affects the font size"
 msgstr "此標籤是�影響字型大�"
 
-#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:598
+#: ../gtk/gtkcellrenderertext.c:653 ../gtk/gtktexttag.c:645
 msgid "Font scale set"
 msgstr "字型縮放設定"
 
-#: ../gtk/gtkcellrenderertext.c:655 ../gtk/gtktexttag.c:599
+#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:646
 msgid "Whether this tag scales the font size by a factor"
 msgstr "本標記��縮放字型"
 
-#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:618
+#: ../gtk/gtkcellrenderertext.c:657 ../gtk/gtktexttag.c:665
 msgid "Rise set"
 msgstr "�高文字設定"
 
-#: ../gtk/gtkcellrenderertext.c:659 ../gtk/gtktexttag.c:619
+#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:666
 msgid "Whether this tag affects the rise"
 msgstr "此標籤是�影響文字�高的情�"
 
-#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:634
+#: ../gtk/gtkcellrenderertext.c:661 ../gtk/gtktexttag.c:681
 msgid "Strikethrough set"
 msgstr "刪除線設定"
 
-#: ../gtk/gtkcellrenderertext.c:663 ../gtk/gtktexttag.c:635
+#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:682
 msgid "Whether this tag affects strikethrough"
 msgstr "此標籤是�影響刪除線的設定"
 
-#: ../gtk/gtkcellrenderertext.c:666 ../gtk/gtktexttag.c:642
+#: ../gtk/gtkcellrenderertext.c:665 ../gtk/gtktexttag.c:689
 msgid "Underline set"
 msgstr "底線設定"
 
-#: ../gtk/gtkcellrenderertext.c:667 ../gtk/gtktexttag.c:643
+#: ../gtk/gtkcellrenderertext.c:666 ../gtk/gtktexttag.c:690
 msgid "Whether this tag affects underlining"
 msgstr "此標籤是�影響底線的設定"
 
-#: ../gtk/gtkcellrenderertext.c:670 ../gtk/gtktexttag.c:606
+#: ../gtk/gtkcellrenderertext.c:669 ../gtk/gtktexttag.c:653
 msgid "Language set"
 msgstr "語言設定"
 
-#: ../gtk/gtkcellrenderertext.c:671 ../gtk/gtktexttag.c:607
+#: ../gtk/gtkcellrenderertext.c:670 ../gtk/gtktexttag.c:654
 msgid "Whether this tag affects the language the text is rendered as"
 msgstr "本標記��影響文字�被�繪根據據的語言設定"
 
-#: ../gtk/gtkcellrenderertext.c:674
+#: ../gtk/gtkcellrenderertext.c:673
 msgid "Ellipsize set"
 msgstr "簡化文字設定"
 
-#: ../gtk/gtkcellrenderertext.c:675
+#: ../gtk/gtkcellrenderertext.c:674
 msgid "Whether this tag affects the ellipsize mode"
 msgstr "本標記��影響文字簡化的模�"
 
-#: ../gtk/gtkcellrenderertext.c:678
+#: ../gtk/gtkcellrenderertext.c:677
 msgid "Align set"
 msgstr "�齊設定"
 
-#: ../gtk/gtkcellrenderertext.c:679
+#: ../gtk/gtkcellrenderertext.c:678
 msgid "Whether this tag affects the alignment mode"
 msgstr "本標記��影響�齊的模�"
 
-#: ../gtk/gtkcellrenderertoggle.c:128
+#: ../gtk/gtkcellrenderertoggle.c:140
 msgid "Toggle state"
 msgstr "切�狀態"
 
-#: ../gtk/gtkcellrenderertoggle.c:129
+#: ../gtk/gtkcellrenderertoggle.c:141
 msgid "The toggle state of the button"
 msgstr "按鈕的切�狀態"
 
-#: ../gtk/gtkcellrenderertoggle.c:136
+#: ../gtk/gtkcellrenderertoggle.c:148
 msgid "Inconsistent state"
 msgstr "�相�狀態"
 
-#: ../gtk/gtkcellrenderertoggle.c:137
+#: ../gtk/gtkcellrenderertoggle.c:149
 msgid "The inconsistent state of the button"
 msgstr "按鈕的�相�狀態"
 
-#: ../gtk/gtkcellrenderertoggle.c:144
+#: ../gtk/gtkcellrenderertoggle.c:156
 msgid "Activatable"
 msgstr "�啟用"
 
-#: ../gtk/gtkcellrenderertoggle.c:145
+#: ../gtk/gtkcellrenderertoggle.c:157
 msgid "The toggle button can be activated"
 msgstr "該切�按鈕是�啟用的"
 
-#: ../gtk/gtkcellrenderertoggle.c:152
+#: ../gtk/gtkcellrenderertoggle.c:164
 msgid "Radio state"
 msgstr "�項狀態"
 
-#: ../gtk/gtkcellrenderertoggle.c:153
+#: ../gtk/gtkcellrenderertoggle.c:165
 msgid "Draw the toggle button as a radio button"
 msgstr "將切�按鈕繪製�單�按鈕"
 
-#: ../gtk/gtkcellrenderertoggle.c:160
+#: ../gtk/gtkcellrenderertoggle.c:172
 msgid "Indicator size"
 msgstr "指標大�"
 
-#: ../gtk/gtkcellrenderertoggle.c:161 ../gtk/gtkcheckbutton.c:78
-#: ../gtk/gtkcheckmenuitem.c:130
+#: ../gtk/gtkcellrenderertoggle.c:173 ../gtk/gtkcheckbutton.c:95
+#: ../gtk/gtkcheckmenuitem.c:146
 msgid "Size of check or radio indicator"
 msgstr "��或單�按鈕指示圖的大�"
 
@@ -1994,15 +2006,15 @@ msgstr "儲存格檢視模型"
 msgid "The model for cell view"
 msgstr "儲存格檢視的模型"
 
-#: ../gtk/gtkcellview.c:246 ../gtk/gtkcombobox.c:944
-#: ../gtk/gtkentrycompletion.c:448 ../gtk/gtkiconview.c:770
-#: ../gtk/gtktreemenu.c:329 ../gtk/gtktreeviewcolumn.c:415
+#: ../gtk/gtkcellview.c:246 ../gtk/gtkcombobox.c:945
+#: ../gtk/gtkentrycompletion.c:448 ../gtk/gtkiconview.c:768
+#: ../gtk/gtktreemenu.c:329 ../gtk/gtktreeviewcolumn.c:427
 msgid "Cell Area"
 msgstr "格��域"
 
-#: ../gtk/gtkcellview.c:247 ../gtk/gtkcombobox.c:945
-#: ../gtk/gtkentrycompletion.c:449 ../gtk/gtkiconview.c:771
-#: ../gtk/gtktreemenu.c:330 ../gtk/gtktreeviewcolumn.c:416
+#: ../gtk/gtkcellview.c:247 ../gtk/gtkcombobox.c:946
+#: ../gtk/gtkentrycompletion.c:449 ../gtk/gtkiconview.c:769
+#: ../gtk/gtktreemenu.c:330 ../gtk/gtktreeviewcolumn.c:428
 msgid "The GtkCellArea used to layout cells"
 msgstr "用來�置格�的 GtkCellArea"
 
@@ -2032,35 +2044,35 @@ msgstr "符�模型"
 msgid "Whether to request enough space for every row in the model"
 msgstr "在模型中是�為�一列�求足夠的空間"
 
-#: ../gtk/gtkcheckbutton.c:77 ../gtk/gtkcheckmenuitem.c:129
+#: ../gtk/gtkcheckbutton.c:94 ../gtk/gtkcheckmenuitem.c:145
 msgid "Indicator Size"
 msgstr "指示圖大�"
 
-#: ../gtk/gtkcheckbutton.c:85 ../gtk/gtkexpander.c:363
+#: ../gtk/gtkcheckbutton.c:102 ../gtk/gtkexpander.c:364
 msgid "Indicator Spacing"
 msgstr "指示圖間隔"
 
-#: ../gtk/gtkcheckbutton.c:86
+#: ../gtk/gtkcheckbutton.c:103
 msgid "Spacing around check or radio indicator"
 msgstr "��或單�按鈕指示圖周�的空間"
 
-#: ../gtk/gtkcheckmenuitem.c:107
+#: ../gtk/gtkcheckmenuitem.c:123
 msgid "Whether the menu item is checked"
 msgstr "�單項目是�被��"
 
-#: ../gtk/gtkcheckmenuitem.c:114 ../gtk/gtktogglebutton.c:133
+#: ../gtk/gtkcheckmenuitem.c:130 ../gtk/gtktogglebutton.c:186
 msgid "Inconsistent"
 msgstr "�一致"
 
-#: ../gtk/gtkcheckmenuitem.c:115
+#: ../gtk/gtkcheckmenuitem.c:131
 msgid "Whether to display an \"inconsistent\" state"
 msgstr "是�顯示 『�一致�狀態"
 
-#: ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkcheckmenuitem.c:138
 msgid "Draw as radio menu item"
 msgstr "繪製�單�項�單項目"
 
-#: ../gtk/gtkcheckmenuitem.c:123
+#: ../gtk/gtkcheckmenuitem.c:139
 msgid "Whether the menu item looks like a radio menu item"
 msgstr "是�該�單項目應開起來�單�項�單項目"
 
@@ -2072,9 +2084,9 @@ msgstr "使用�明度"
 msgid "Whether to give the color an alpha value"
 msgstr "是�讓�色包�有�明度的值"
 
-#: ../gtk/gtkcolorbutton.c:185 ../gtk/gtkfilechooserbutton.c:397
-#: ../gtk/gtkfontbutton.c:140 ../gtk/gtkprintjob.c:141
-#: ../gtk/gtkstatusicon.c:408 ../gtk/gtktreeviewcolumn.c:319
+#: ../gtk/gtkcolorbutton.c:185 ../gtk/gtkfilechooserbutton.c:440
+#: ../gtk/gtkfontbutton.c:150 ../gtk/gtkprintjob.c:141
+#: ../gtk/gtkstatusicon.c:438 ../gtk/gtktreeviewcolumn.c:331
 msgid "Title"
 msgstr "標題"
 
@@ -2082,7 +2094,7 @@ msgstr "標題"
 msgid "The title of the color selection dialog"
 msgstr "�色�擇�話盒的標題"
 
-#: ../gtk/gtkcolorbutton.c:200 ../gtk/gtkcolorsel.c:338
+#: ../gtk/gtkcolorbutton.c:200 ../gtk/gtkcolorsel.c:336
 msgid "Current Color"
 msgstr "目�的�色"
 
@@ -2090,7 +2102,7 @@ msgstr "目�的�色"
 msgid "The selected color"
 msgstr "��的�色"
 
-#: ../gtk/gtkcolorbutton.c:215 ../gtk/gtkcolorsel.c:345
+#: ../gtk/gtkcolorbutton.c:215 ../gtk/gtkcolorsel.c:343
 msgid "Current Alpha"
 msgstr "目�的�明度"
 
@@ -2106,636 +2118,634 @@ msgstr "目�的 RGBA �色"
 msgid "The selected RGBA color"
 msgstr "��的 RGBA �色"
 
-#: ../gtk/gtkcolorsel.c:324
+#: ../gtk/gtkcolorsel.c:322
 msgid "Has Opacity Control"
 msgstr "�控制�明度"
 
-#: ../gtk/gtkcolorsel.c:325
+#: ../gtk/gtkcolorsel.c:323
 msgid "Whether the color selector should allow setting opacity"
 msgstr "設定�色�擇程�是��許設定�明度"
 
-#: ../gtk/gtkcolorsel.c:331
+#: ../gtk/gtkcolorsel.c:329
 msgid "Has palette"
 msgstr "有色盤"
 
-#: ../gtk/gtkcolorsel.c:332
+#: ../gtk/gtkcolorsel.c:330
 msgid "Whether a palette should be used"
 msgstr "應�使用色盤"
 
-#: ../gtk/gtkcolorsel.c:339
+#: ../gtk/gtkcolorsel.c:337
 msgid "The current color"
 msgstr "目�的�色"
 
-#: ../gtk/gtkcolorsel.c:346
+#: ../gtk/gtkcolorsel.c:344
 msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr "目�的�明度（0 為完全�明，65535 為完全��明）"
 
-#: ../gtk/gtkcolorsel.c:360
+#: ../gtk/gtkcolorsel.c:358
 msgid "Current RGBA"
 msgstr "目�的 RGBA"
 
-#: ../gtk/gtkcolorsel.c:361
+#: ../gtk/gtkcolorsel.c:359
 msgid "The current RGBA color"
 msgstr "目�的 RGBA �色"
 
-#: ../gtk/gtkcolorseldialog.c:110
+#: ../gtk/gtkcolorseldialog.c:136
 msgid "Color Selection"
 msgstr "�色�擇"
 
-#: ../gtk/gtkcolorseldialog.c:111
+#: ../gtk/gtkcolorseldialog.c:137
 msgid "The color selection embedded in the dialog."
 msgstr "內嵌在�話盒的色彩���。"
 
-#: ../gtk/gtkcolorseldialog.c:117
+#: ../gtk/gtkcolorseldialog.c:143
 msgid "OK Button"
 msgstr "確定按鈕"
 
-#: ../gtk/gtkcolorseldialog.c:118
+#: ../gtk/gtkcolorseldialog.c:144
 msgid "The OK button of the dialog."
 msgstr "�話盒的確定按鈕。"
 
-#: ../gtk/gtkcolorseldialog.c:124
+#: ../gtk/gtkcolorseldialog.c:150
 msgid "Cancel Button"
 msgstr "�消按鈕"
 
-#: ../gtk/gtkcolorseldialog.c:125
+#: ../gtk/gtkcolorseldialog.c:151
 msgid "The cancel button of the dialog."
 msgstr "�話盒的�消按鈕。"
 
-#: ../gtk/gtkcolorseldialog.c:131
+#: ../gtk/gtkcolorseldialog.c:157
 msgid "Help Button"
 msgstr "求助按鈕"
 
-#: ../gtk/gtkcolorseldialog.c:132
+#: ../gtk/gtkcolorseldialog.c:158
 msgid "The help button of the dialog."
 msgstr "�話盒的求助按鈕。"
 
-#: ../gtk/gtkcombobox.c:663
+#: ../gtk/gtkcombobox.c:664
 msgid "ComboBox model"
 msgstr "組�方塊模型"
 
-#: ../gtk/gtkcombobox.c:664
+#: ../gtk/gtkcombobox.c:665
 msgid "The model for the combo box"
 msgstr "該組�方塊的模型"
 
-#: ../gtk/gtkcombobox.c:681
+#: ../gtk/gtkcombobox.c:682
 msgid "Wrap width for laying out the items in a grid"
 msgstr "將項目於方格中排列所設定的�行闊度"
 
-#: ../gtk/gtkcombobox.c:703 ../gtk/gtktreemenu.c:383
+#: ../gtk/gtkcombobox.c:704 ../gtk/gtktreemenu.c:383
 msgid "Row span column"
 msgstr "水平�併格�"
 
-#: ../gtk/gtkcombobox.c:704 ../gtk/gtktreemenu.c:384
+#: ../gtk/gtkcombobox.c:705 ../gtk/gtktreemenu.c:384
 msgid "TreeModel column containing the row span values"
 msgstr "包�有�併水平格數資料的 TreeModel 格�"
 
-#: ../gtk/gtkcombobox.c:725 ../gtk/gtktreemenu.c:404
+#: ../gtk/gtkcombobox.c:726 ../gtk/gtktreemenu.c:404
 msgid "Column span column"
 msgstr "垂直�併格�"
 
-#: ../gtk/gtkcombobox.c:726 ../gtk/gtktreemenu.c:405
+#: ../gtk/gtkcombobox.c:727 ../gtk/gtktreemenu.c:405
 msgid "TreeModel column containing the column span values"
 msgstr "包�有�併垂直格數資料的 TreeModel 格�"
 
-#: ../gtk/gtkcombobox.c:747
+#: ../gtk/gtkcombobox.c:748
 msgid "Active item"
 msgstr "啟用項目"
 
-#: ../gtk/gtkcombobox.c:748
+#: ../gtk/gtkcombobox.c:749
 msgid "The item which is currently active"
 msgstr "目�有效的項目"
 
-#: ../gtk/gtkcombobox.c:767 ../gtk/gtkuimanager.c:225
+#: ../gtk/gtkcombobox.c:768 ../gtk/gtkuimanager.c:479
 msgid "Add tearoffs to menus"
 msgstr "在�單上加上��下標記"
 
-#: ../gtk/gtkcombobox.c:768
+#: ../gtk/gtkcombobox.c:769
 msgid "Whether dropdowns should have a tearoff menu item"
 msgstr "下拉�單是�應有分離�單項目"
 
-#: ../gtk/gtkcombobox.c:783 ../gtk/gtkentry.c:781
+#: ../gtk/gtkcombobox.c:784 ../gtk/gtkentry.c:786
 msgid "Has Frame"
 msgstr "有框架"
 
-#: ../gtk/gtkcombobox.c:784
+#: ../gtk/gtkcombobox.c:785
 msgid "Whether the combo box draws a frame around the child"
 msgstr "組�方塊是�在�元件周�繪出框架"
 
-#: ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkcombobox.c:793
 msgid "Whether the combo box grabs focus when it is clicked with the mouse"
 msgstr "當該組�方塊被滑鼠點�時是�自動�得焦點"
 
-#: ../gtk/gtkcombobox.c:807 ../gtk/gtkmenu.c:641
+#: ../gtk/gtkcombobox.c:808 ../gtk/gtkmenu.c:643
 msgid "Tearoff Title"
 msgstr "�下標題"
 
-#: ../gtk/gtkcombobox.c:808
+#: ../gtk/gtkcombobox.c:809
 msgid ""
 "A title that may be displayed by the window manager when the popup is torn-"
 "off"
 msgstr "當此�單�下之後視窗管�員指定的視窗標題"
 
-#: ../gtk/gtkcombobox.c:825
+#: ../gtk/gtkcombobox.c:826
 msgid "Popup shown"
 msgstr "彈出�顯示"
 
-#: ../gtk/gtkcombobox.c:826
+#: ../gtk/gtkcombobox.c:827
 msgid "Whether the combo's dropdown is shown"
 msgstr "是�顯示組��項目的下拉�單"
 
-#: ../gtk/gtkcombobox.c:842
+#: ../gtk/gtkcombobox.c:843
 msgid "Button Sensitivity"
 msgstr "按鈕�感度"
 
-#: ../gtk/gtkcombobox.c:843
+#: ../gtk/gtkcombobox.c:844
 msgid "Whether the dropdown button is sensitive when the model is empty"
 msgstr "當模型內容是空的時是�讓下拉按鈕有作用"
 
-#: ../gtk/gtkcombobox.c:859
+#: ../gtk/gtkcombobox.c:860
 msgid "Whether combo box has an entry"
 msgstr "組�方塊是�有項目"
 
-#: ../gtk/gtkcombobox.c:874
+#: ../gtk/gtkcombobox.c:875
 msgid "Entry Text Column"
 msgstr "項目文字欄�"
 
-#: ../gtk/gtkcombobox.c:875
+#: ../gtk/gtkcombobox.c:876
 msgid ""
 "The column in the combo box's model to associate with strings from the entry "
 "if the combo was created with #GtkComboBox:has-entry = %TRUE"
 msgstr "如果組�方塊是以 #GtkComboBox:has-entry = %TRUE 建立，在組�方塊模型的欄��關�的項目字串"
 
-#: ../gtk/gtkcombobox.c:892
+#: ../gtk/gtkcombobox.c:893
 msgid "ID Column"
 msgstr "ID 欄"
 
-#: ../gtk/gtkcombobox.c:893
+#: ../gtk/gtkcombobox.c:894
 msgid ""
 "The column in the combo box's model that provides string IDs for the values "
 "in the model"
 msgstr "在組�方塊模型的欄�，�供模型中數值的字串 ID"
 
-#: ../gtk/gtkcombobox.c:908
+#: ../gtk/gtkcombobox.c:909
 msgid "Active id"
 msgstr "使用中 id"
 
-#: ../gtk/gtkcombobox.c:909
+#: ../gtk/gtkcombobox.c:910
 msgid "The value of the id column for the active row"
 msgstr "使用中的列的 id 欄數值"
 
-#: ../gtk/gtkcombobox.c:924
+#: ../gtk/gtkcombobox.c:925
 msgid "Popup Fixed Width"
 msgstr "彈出�視窗固定闊度"
 
-#: ../gtk/gtkcombobox.c:925
+#: ../gtk/gtkcombobox.c:926
 msgid ""
 "Whether the popup's width should be a fixed width matching the allocated "
 "width of the combo box"
 msgstr "彈出�視窗的闊度是�固定為符�原本組�方塊的闊度"
 
-#: ../gtk/gtkcombobox.c:951
+#: ../gtk/gtkcombobox.c:952
 msgid "Appears as list"
 msgstr "以清單顯示"
 
-#: ../gtk/gtkcombobox.c:952
+#: ../gtk/gtkcombobox.c:953
 msgid "Whether dropdowns should look like lists rather than menus"
 msgstr "組�方塊下拉�單是�應該顯示作清單樣而��單樣"
 
-#: ../gtk/gtkcombobox.c:968
+#: ../gtk/gtkcombobox.c:969
 msgid "Arrow Size"
 msgstr "箭頭大�"
 
-#: ../gtk/gtkcombobox.c:969
+#: ../gtk/gtkcombobox.c:970
 msgid "The minimum size of the arrow in the combo box"
 msgstr "組�方塊中箭頭的最�尺寸"
 
-#: ../gtk/gtkcombobox.c:986
+#: ../gtk/gtkcombobox.c:987
 msgid "The amount of space used by the arrow"
 msgstr "箭頭所佔空間大�"
 
-#: ../gtk/gtkcombobox.c:1001 ../gtk/gtkentry.c:881 ../gtk/gtkhandlebox.c:190
-#: ../gtk/gtkmenubar.c:207 ../gtk/gtkstatusbar.c:180 ../gtk/gtktoolbar.c:601
-#: ../gtk/gtkviewport.c:153
+#: ../gtk/gtkcombobox.c:1002 ../gtk/gtkentry.c:886 ../gtk/gtkhandlebox.c:218
+#: ../gtk/gtkmenubar.c:218 ../gtk/gtkstatusbar.c:182 ../gtk/gtktoolbar.c:613
+#: ../gtk/gtkviewport.c:155
 msgid "Shadow type"
 msgstr "陰影類型"
 
-#: ../gtk/gtkcombobox.c:1002
+#: ../gtk/gtkcombobox.c:1003
 msgid "Which kind of shadow to draw around the combo box"
 msgstr "組�方塊周��繪出何種類型的陰影"
 
-#: ../gtk/gtkcontainer.c:456
+#: ../gtk/gtkcontainer.c:457
 msgid "Resize mode"
 msgstr "調整尺寸模�"
 
-#: ../gtk/gtkcontainer.c:457
+#: ../gtk/gtkcontainer.c:458
 msgid "Specify how resize events are handled"
 msgstr "指定如何處�調整尺寸的�求"
 
-#: ../gtk/gtkcontainer.c:464
+#: ../gtk/gtkcontainer.c:465
 msgid "Border width"
 msgstr "邊框闊度"
 
-#: ../gtk/gtkcontainer.c:465
+#: ../gtk/gtkcontainer.c:466
 msgid "The width of the empty border outside the containers children"
 msgstr "容器�元件外部空白邊緣的闊度"
 
-#: ../gtk/gtkcontainer.c:473
+#: ../gtk/gtkcontainer.c:474
 msgid "Child"
 msgstr "�元件"
 
-#: ../gtk/gtkcontainer.c:474
+#: ../gtk/gtkcontainer.c:475
 msgid "Can be used to add a new child to the container"
 msgstr "�用來加入新的�元件於容器元件中"
 
-#: ../gtk/gtkdialog.c:289 ../gtk/gtkinfobar.c:426
+#: ../gtk/gtkdialog.c:291 ../gtk/gtkinfobar.c:427
 msgid "Content area border"
 msgstr "內容�域邊框"
 
-#: ../gtk/gtkdialog.c:290
+#: ../gtk/gtkdialog.c:292
 msgid "Width of border around the main dialog area"
 msgstr "主�話窗�域的邊框闊度"
 
-#: ../gtk/gtkdialog.c:307 ../gtk/gtkinfobar.c:443
+#: ../gtk/gtkdialog.c:309 ../gtk/gtkinfobar.c:444
 msgid "Content area spacing"
 msgstr "內容�域間�"
 
-#: ../gtk/gtkdialog.c:308
+#: ../gtk/gtkdialog.c:310
 msgid "Spacing between elements of the main dialog area"
 msgstr "主��話盒�域的元件間的間�"
 
-#: ../gtk/gtkdialog.c:315 ../gtk/gtkinfobar.c:459
+#: ../gtk/gtkdialog.c:317 ../gtk/gtkinfobar.c:460
 msgid "Button spacing"
 msgstr "按鈕間隔"
 
-#: ../gtk/gtkdialog.c:316 ../gtk/gtkinfobar.c:460
+#: ../gtk/gtkdialog.c:318 ../gtk/gtkinfobar.c:461
 msgid "Spacing between buttons"
 msgstr "按鈕之間的間隔"
 
-#: ../gtk/gtkdialog.c:324 ../gtk/gtkinfobar.c:475
+#: ../gtk/gtkdialog.c:326 ../gtk/gtkinfobar.c:476
 msgid "Action area border"
 msgstr "動作�域邊緣"
 
-#: ../gtk/gtkdialog.c:325
+#: ../gtk/gtkdialog.c:327
 msgid "Width of border around the button area at the bottom of the dialog"
 msgstr "�話盒按鈕下方按鈕�域的邊緣闊度"
 
-#: ../gtk/gtkentry.c:728
+#: ../gtk/gtkentrybuffer.c:353
+msgid "The contents of the buffer"
+msgstr "緩��的內容"
+
+#: ../gtk/gtkentrybuffer.c:367 ../gtk/gtkentry.c:917
+msgid "Text length"
+msgstr "文字闊度"
+
+#: ../gtk/gtkentrybuffer.c:368
+msgid "Length of the text currently in the buffer"
+msgstr "目�在緩��中文字的長度"
+
+#: ../gtk/gtkentrybuffer.c:382 ../gtk/gtkentry.c:769
+msgid "Maximum length"
+msgstr "最大長度"
+
+#: ../gtk/gtkentrybuffer.c:383 ../gtk/gtkentry.c:770
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr "輸入欄中字符數目的上�。0 為沒有上�"
+
+#: ../gtk/gtkentry.c:733
 msgid "Text Buffer"
 msgstr "文字緩��"
 
-#: ../gtk/gtkentry.c:729
+#: ../gtk/gtkentry.c:734
 msgid "Text buffer object which actually stores entry text"
 msgstr "實際儲存項目文字的文字緩��物件"
 
-#: ../gtk/gtkentry.c:736 ../gtk/gtklabel.c:662
+#: ../gtk/gtkentry.c:741 ../gtk/gtklabel.c:824
 msgid "Cursor Position"
 msgstr "游標�置"
 
-#: ../gtk/gtkentry.c:737 ../gtk/gtklabel.c:663
+#: ../gtk/gtkentry.c:742 ../gtk/gtklabel.c:825
 msgid "The current position of the insertion cursor in chars"
 msgstr "游標目�的�置，以字符計。"
 
-#: ../gtk/gtkentry.c:746 ../gtk/gtklabel.c:672
+#: ../gtk/gtkentry.c:751 ../gtk/gtklabel.c:834
 msgid "Selection Bound"
 msgstr "��邊界"
 
-#: ../gtk/gtkentry.c:747 ../gtk/gtklabel.c:673
+#: ../gtk/gtkentry.c:752 ../gtk/gtklabel.c:835
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars"
 msgstr "所��的部份中，游標到�一端�置的�離（字符為單�）"
 
-#: ../gtk/gtkentry.c:757
+#: ../gtk/gtkentry.c:762
 msgid "Whether the entry contents can be edited"
 msgstr "��編輯欄�的內容"
 
-#: ../gtk/gtkentry.c:764 ../gtk/gtkentrybuffer.c:382
-msgid "Maximum length"
-msgstr "最大長度"
-
-#: ../gtk/gtkentry.c:765 ../gtk/gtkentrybuffer.c:383
-msgid "Maximum number of characters for this entry. Zero if no maximum"
-msgstr "輸入欄中字符數目的上�。0 為沒有上�"
-
-#: ../gtk/gtkentry.c:773
+#: ../gtk/gtkentry.c:778
 msgid "Visibility"
 msgstr "�見狀態"
 
-#: ../gtk/gtkentry.c:774
+#: ../gtk/gtkentry.c:779
 msgid ""
 "FALSE displays the \"invisible char\" instead of the actual text (password "
 "mode)"
 msgstr "FALSE 表示顯示「隱形字符�而�實際文字（密碼模�）"
 
-#: ../gtk/gtkentry.c:782
+#: ../gtk/gtkentry.c:787
 msgid "FALSE removes outside bevel from entry"
 msgstr "FALSE �將外部�飾"
 
-#: ../gtk/gtkentry.c:790
+#: ../gtk/gtkentry.c:795
 msgid ""
 "Border between text and frame. Overrides the inner-border style property"
 msgstr "文字與框架之間的框線。此數值會蓋�內部框線樣�屬性"
 
-#: ../gtk/gtkentry.c:797 ../gtk/gtkentry.c:1393
+#: ../gtk/gtkentry.c:802 ../gtk/gtkentry.c:1398
 msgid "Invisible character"
 msgstr "隱形字符"
 
-#: ../gtk/gtkentry.c:798 ../gtk/gtkentry.c:1394
+#: ../gtk/gtkentry.c:803 ../gtk/gtkentry.c:1399
 msgid "The character to use when masking entry contents (in \"password mode\")"
 msgstr "用來�蓋輸入內容的字符（在「密碼模���）"
 
-#: ../gtk/gtkentry.c:805
+#: ../gtk/gtkentry.c:810
 msgid "Activates default"
 msgstr "啟動�設元件"
 
-#: ../gtk/gtkentry.c:806
+#: ../gtk/gtkentry.c:811
 msgid ""
 "Whether to activate the default widget (such as the default button in a "
 "dialog) when Enter is pressed"
 msgstr "當按下 Enter �時，是�啟動�設視窗元件（例如�話盒的按鈕）"
 
-#: ../gtk/gtkentry.c:812
+#: ../gtk/gtkentry.c:817
 msgid "Width in chars"
 msgstr "闊度（以字符計算）"
 
-#: ../gtk/gtkentry.c:813
+#: ../gtk/gtkentry.c:818
 msgid "Number of characters to leave space for in the entry"
 msgstr "輸入元件中�留的空白長度（單�為字符）"
 
-#: ../gtk/gtkentry.c:822
+#: ../gtk/gtkentry.c:827
 msgid "Scroll offset"
 msgstr "�動�移"
 
-#: ../gtk/gtkentry.c:823
+#: ../gtk/gtkentry.c:828
 msgid "Number of pixels of the entry scrolled off the screen to the left"
 msgstr "輸入元件相�於螢幕�左�動�移的程度（單�為�素）"
 
-#: ../gtk/gtkentry.c:833
+#: ../gtk/gtkentry.c:838
 msgid "The contents of the entry"
 msgstr "輸入的內容"
 
-#: ../gtk/gtkentry.c:848 ../gtk/gtkmisc.c:81
+#: ../gtk/gtkentry.c:853 ../gtk/gtkmisc.c:105
 msgid "X align"
 msgstr "水平排列"
 
-#: ../gtk/gtkentry.c:849 ../gtk/gtkmisc.c:82
+#: ../gtk/gtkentry.c:854 ../gtk/gtkmisc.c:106
 msgid ""
 "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
 msgstr "水平方��齊，0 為左，1 為�。相��為�至左 (RTL) 排列。"
 
-#: ../gtk/gtkentry.c:865
+#: ../gtk/gtkentry.c:870
 msgid "Truncate multiline"
 msgstr "截短多行"
 
-#: ../gtk/gtkentry.c:866
+#: ../gtk/gtkentry.c:871
 msgid "Whether to truncate multiline pastes to one line."
 msgstr "��將多列貼上截短為一列。"
 
-#: ../gtk/gtkentry.c:882
+#: ../gtk/gtkentry.c:887
 msgid "Which kind of shadow to draw around the entry when has-frame is set"
 msgstr "當設定 has-frame 時�在項目周�繪出何種類型的陰影"
 
-#: ../gtk/gtkentry.c:897 ../gtk/gtktextview.c:764
+#: ../gtk/gtkentry.c:902 ../gtk/gtktextview.c:766
 msgid "Overwrite mode"
 msgstr "覆寫模�"
 
-#: ../gtk/gtkentry.c:898
+#: ../gtk/gtkentry.c:903
 msgid "Whether new text overwrites existing text"
 msgstr "新的文字是��以覆寫既有文字"
 
-#: ../gtk/gtkentry.c:912 ../gtk/gtkentrybuffer.c:367
-msgid "Text length"
-msgstr "文字闊度"
-
-#: ../gtk/gtkentry.c:913
+#: ../gtk/gtkentry.c:918
 msgid "Length of the text currently in the entry"
 msgstr "目�在項目中文字的長度"
 
-#: ../gtk/gtkentry.c:928
+#: ../gtk/gtkentry.c:933
 msgid "Invisible character set"
 msgstr "隱形字符設定"
 
-#: ../gtk/gtkentry.c:929
+#: ../gtk/gtkentry.c:934
 msgid "Whether the invisible character has been set"
 msgstr "隱形字符是�已設定"
 
-#: ../gtk/gtkentry.c:947
+#: ../gtk/gtkentry.c:952
 msgid "Caps Lock warning"
 msgstr "Caps Lock 警告"
 
-#: ../gtk/gtkentry.c:948
+#: ../gtk/gtkentry.c:953
 msgid "Whether password entries will show a warning when Caps Lock is on"
 msgstr "密碼欄�是�在 Caps Lock 開啟時顯示警告"
 
-#: ../gtk/gtkentry.c:962
+#: ../gtk/gtkentry.c:967
 msgid "Progress Fraction"
 msgstr "進度列完�度"
 
-#: ../gtk/gtkentry.c:963
+#: ../gtk/gtkentry.c:968
 msgid "The current fraction of the task that's been completed"
 msgstr "工作目�已完�的程度"
 
-#: ../gtk/gtkentry.c:980
+#: ../gtk/gtkentry.c:985
 msgid "Progress Pulse Step"
 msgstr "進度列指示步進"
 
-#: ../gtk/gtkentry.c:981
+#: ../gtk/gtkentry.c:986
 msgid ""
 "The fraction of total entry width to move the progress bouncing block for "
 "each call to gtk_entry_progress_pulse()"
 msgstr "當�次呼� gtk_entry_progress_pulse() 後，進度�塊應移動的比例（以進度列全長為基準）"
 
-#: ../gtk/gtkentry.c:997
+#: ../gtk/gtkentry.c:1002
 msgid "Placeholder text"
-msgstr ""
+msgstr "佔�符文字"
 
-#: ../gtk/gtkentry.c:998
+#: ../gtk/gtkentry.c:1003
 msgid "Show text in the entry when it's empty and unfocused"
-msgstr ""
+msgstr "當項目留空並失去焦點時顯示其中的文字"
 
-#: ../gtk/gtkentry.c:1012
+#: ../gtk/gtkentry.c:1017
 msgid "Primary pixbuf"
 msgstr "主� pixbuf"
 
-#: ../gtk/gtkentry.c:1013
+#: ../gtk/gtkentry.c:1018
 msgid "Primary pixbuf for the entry"
 msgstr "用於此項目的主� pixbuf"
 
-#: ../gtk/gtkentry.c:1027
+#: ../gtk/gtkentry.c:1032
 msgid "Secondary pixbuf"
 msgstr "次� pixbuf"
 
-#: ../gtk/gtkentry.c:1028
+#: ../gtk/gtkentry.c:1033
 msgid "Secondary pixbuf for the entry"
 msgstr "用於此項目的次� pixbuf"
 
-#: ../gtk/gtkentry.c:1042
+#: ../gtk/gtkentry.c:1047
 msgid "Primary stock ID"
 msgstr "主�圖庫 ID"
 
-#: ../gtk/gtkentry.c:1043
+#: ../gtk/gtkentry.c:1048
 msgid "Stock ID for primary icon"
 msgstr "主�圖示的圖庫 ID"
 
-#: ../gtk/gtkentry.c:1057
+#: ../gtk/gtkentry.c:1062
 msgid "Secondary stock ID"
 msgstr "次�圖庫 ID"
 
-#: ../gtk/gtkentry.c:1058
+#: ../gtk/gtkentry.c:1063
 msgid "Stock ID for secondary icon"
 msgstr "次�圖示的圖庫 ID"
 
-#: ../gtk/gtkentry.c:1072
+#: ../gtk/gtkentry.c:1077
 msgid "Primary icon name"
 msgstr "主�圖示�稱"
 
-#: ../gtk/gtkentry.c:1073
+#: ../gtk/gtkentry.c:1078
 msgid "Icon name for primary icon"
 msgstr "主�圖示的�稱"
 
-#: ../gtk/gtkentry.c:1087
+#: ../gtk/gtkentry.c:1092
 msgid "Secondary icon name"
 msgstr "次�圖示�稱"
 
-#: ../gtk/gtkentry.c:1088
+#: ../gtk/gtkentry.c:1093
 msgid "Icon name for secondary icon"
 msgstr "次�圖示的�稱"
 
-#: ../gtk/gtkentry.c:1102
+#: ../gtk/gtkentry.c:1107
 msgid "Primary GIcon"
 msgstr "主� GIcon"
 
-#: ../gtk/gtkentry.c:1103
+#: ../gtk/gtkentry.c:1108
 msgid "GIcon for primary icon"
 msgstr "主�圖示的 GIcon"
 
-#: ../gtk/gtkentry.c:1117
+#: ../gtk/gtkentry.c:1122
 msgid "Secondary GIcon"
 msgstr "次� GIcon"
 
-#: ../gtk/gtkentry.c:1118
+#: ../gtk/gtkentry.c:1123
 msgid "GIcon for secondary icon"
 msgstr "次�圖示的 GIcon"
 
-#: ../gtk/gtkentry.c:1132
+#: ../gtk/gtkentry.c:1137
 msgid "Primary storage type"
 msgstr "主�儲存�類型"
 
-#: ../gtk/gtkentry.c:1133
+#: ../gtk/gtkentry.c:1138
 msgid "The representation being used for primary icon"
 msgstr "用於主�圖示的代表"
 
-#: ../gtk/gtkentry.c:1148
+#: ../gtk/gtkentry.c:1153
 msgid "Secondary storage type"
 msgstr "次�儲存�類型"
 
-#: ../gtk/gtkentry.c:1149
+#: ../gtk/gtkentry.c:1154
 msgid "The representation being used for secondary icon"
 msgstr "用於次�圖示的代表"
 
-#: ../gtk/gtkentry.c:1170
+#: ../gtk/gtkentry.c:1175
 msgid "Primary icon activatable"
 msgstr "主�圖示�用性"
 
-#: ../gtk/gtkentry.c:1171
+#: ../gtk/gtkentry.c:1176
 msgid "Whether the primary icon is activatable"
 msgstr "主�圖示是�在使用中"
 
-#: ../gtk/gtkentry.c:1191
+#: ../gtk/gtkentry.c:1196
 msgid "Secondary icon activatable"
 msgstr "次�圖示�用性"
 
-#: ../gtk/gtkentry.c:1192
+#: ../gtk/gtkentry.c:1197
 msgid "Whether the secondary icon is activatable"
 msgstr "次�圖示是�在使用中"
 
-#: ../gtk/gtkentry.c:1214
+#: ../gtk/gtkentry.c:1219
 msgid "Primary icon sensitive"
 msgstr "主�圖示�應"
 
-#: ../gtk/gtkentry.c:1215
+#: ../gtk/gtkentry.c:1220
 msgid "Whether the primary icon is sensitive"
 msgstr "主�圖示是�有�應"
 
-#: ../gtk/gtkentry.c:1236
+#: ../gtk/gtkentry.c:1241
 msgid "Secondary icon sensitive"
 msgstr "次�圖示�應"
 
-#: ../gtk/gtkentry.c:1237
+#: ../gtk/gtkentry.c:1242
 msgid "Whether the secondary icon is sensitive"
 msgstr "次�圖示是�有�應"
 
-#: ../gtk/gtkentry.c:1253
+#: ../gtk/gtkentry.c:1258
 msgid "Primary icon tooltip text"
 msgstr "主�圖示工具�示文字"
 
-#: ../gtk/gtkentry.c:1254 ../gtk/gtkentry.c:1290
+#: ../gtk/gtkentry.c:1259 ../gtk/gtkentry.c:1295
 msgid "The contents of the tooltip on the primary icon"
 msgstr "主�圖示工具�示的內容"
 
-#: ../gtk/gtkentry.c:1270
+#: ../gtk/gtkentry.c:1275
 msgid "Secondary icon tooltip text"
 msgstr "次�圖示工具�示文字"
 
-#: ../gtk/gtkentry.c:1271 ../gtk/gtkentry.c:1309
+#: ../gtk/gtkentry.c:1276 ../gtk/gtkentry.c:1314
 msgid "The contents of the tooltip on the secondary icon"
 msgstr "次�圖示工具�示的內容"
 
-#: ../gtk/gtkentry.c:1289
+#: ../gtk/gtkentry.c:1294
 msgid "Primary icon tooltip markup"
 msgstr "主�圖示工具�示標記"
 
-#: ../gtk/gtkentry.c:1308
+#: ../gtk/gtkentry.c:1313
 msgid "Secondary icon tooltip markup"
 msgstr "次�圖示工具�示標記"
 
-#: ../gtk/gtkentry.c:1328 ../gtk/gtktextview.c:792
+#: ../gtk/gtkentry.c:1333 ../gtk/gtktextview.c:794
 msgid "IM module"
 msgstr "IM 模組"
 
-#: ../gtk/gtkentry.c:1329 ../gtk/gtktextview.c:793
+#: ../gtk/gtkentry.c:1334 ../gtk/gtktextview.c:795
 msgid "Which IM module should be used"
 msgstr "�設�使用哪一個 IM 模組"
 
-#: ../gtk/gtkentry.c:1343
-#, fuzzy
-#| msgid "Completion Model"
+#: ../gtk/gtkentry.c:1348
 msgid "Completion"
-msgstr "自動完�模組"
+msgstr "補齊"
 
-#: ../gtk/gtkentry.c:1344
+#: ../gtk/gtkentry.c:1349
 msgid "The auxiliary completion object"
-msgstr ""
+msgstr "輔助補齊物件"
 
-#: ../gtk/gtkentry.c:1358
+#: ../gtk/gtkentry.c:1363
 msgid "Icon Prelight"
 msgstr "圖示�亮"
 
-#: ../gtk/gtkentry.c:1359
+#: ../gtk/gtkentry.c:1364
 msgid "Whether activatable icons should prelight when hovered"
 msgstr "使用中的圖示在滑鼠經�時是�顯示�亮"
 
-#: ../gtk/gtkentry.c:1372
+#: ../gtk/gtkentry.c:1377
 msgid "Progress Border"
 msgstr "進度列框線"
 
-#: ../gtk/gtkentry.c:1373
+#: ../gtk/gtkentry.c:1378
 msgid "Border around the progress bar"
 msgstr "進度列周�的框線"
 
-#: ../gtk/gtkentry.c:1865
+#: ../gtk/gtkentry.c:1870
 msgid "Border between text and frame."
 msgstr "文字與框架之間的框線。"
 
-#: ../gtk/gtkentrybuffer.c:353
-msgid "The contents of the buffer"
-msgstr "緩��的內容"
-
-#: ../gtk/gtkentrybuffer.c:368
-msgid "Length of the text currently in the buffer"
-msgstr "目�在緩��中文字的長度"
-
 #: ../gtk/gtkentrycompletion.c:320
 msgid "Completion Model"
 msgstr "自動完�模組"
@@ -2752,7 +2762,7 @@ msgstr "最�關�字長度"
 msgid "Minimum length of the search key in order to look up matches"
 msgstr "用來�尋的關�字的最�長度"
 
-#: ../gtk/gtkentrycompletion.c:344 ../gtk/gtkiconview.c:566
+#: ../gtk/gtkentrycompletion.c:344 ../gtk/gtkiconview.c:564
 msgid "Text column"
 msgstr "文字欄�"
 
@@ -2820,86 +2830,84 @@ msgid ""
 "child widget as opposed to below it."
 msgstr "是�事件方塊中攔截事件的視窗�覆蓋在�視窗元件之上，相�於至於其下。"
 
-#: ../gtk/gtkexpander.c:281
+#: ../gtk/gtkexpander.c:282
 msgid "Expanded"
 msgstr "展開"
 
-#: ../gtk/gtkexpander.c:282
+#: ../gtk/gtkexpander.c:283
 msgid "Whether the expander has been opened to reveal the child widget"
 msgstr "該�擴展元件是�已經展開，使其�元件顯露出來。"
 
-#: ../gtk/gtkexpander.c:290
+#: ../gtk/gtkexpander.c:291
 msgid "Text of the expander's label"
 msgstr "展開器標籤的文字"
 
-#: ../gtk/gtkexpander.c:305 ../gtk/gtklabel.c:581
+#: ../gtk/gtkexpander.c:306 ../gtk/gtklabel.c:743
 msgid "Use markup"
 msgstr "使用標記"
 
-#: ../gtk/gtkexpander.c:306 ../gtk/gtklabel.c:582
+#: ../gtk/gtkexpander.c:307 ../gtk/gtklabel.c:744
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "�擴展元件的文字標籤包�XML標記。詳見 pango_parse_markup()"
 
-#: ../gtk/gtkexpander.c:314
+#: ../gtk/gtkexpander.c:315
 msgid "Space to put between the label and the child"
 msgstr "�隔�元件與文字標籤的�外的空間"
 
-#: ../gtk/gtkexpander.c:323 ../gtk/gtkframe.c:168 ../gtk/gtktoolbutton.c:215
-#: ../gtk/gtktoolitemgroup.c:1603
+#: ../gtk/gtkexpander.c:324 ../gtk/gtkframe.c:206 ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolitemgroup.c:1599
 msgid "Label widget"
 msgstr "標籤元件"
 
-#: ../gtk/gtkexpander.c:324
+#: ../gtk/gtkexpander.c:325
 msgid "A widget to display in place of the usual expander label"
 msgstr "替代展開器原本文字標籤的視窗元件"
 
-#: ../gtk/gtkexpander.c:331
+#: ../gtk/gtkexpander.c:332
 msgid "Label fill"
 msgstr "標籤填滿"
 
-#: ../gtk/gtkexpander.c:332
+#: ../gtk/gtkexpander.c:333
 msgid "Whether the label widget should fill all available horizontal space"
 msgstr "籤標視窗元件是�應填滿所有�用的水平空間"
 
-#: ../gtk/gtkexpander.c:347
-#, fuzzy
-#| msgid "Resize mode"
-msgid "Resize tolevel"
-msgstr "調整尺寸模�"
-
 #: ../gtk/gtkexpander.c:348
+msgid "Resize toplevel"
+msgstr "改變頂端層級大�"
+
+#: ../gtk/gtkexpander.c:349
 msgid ""
 "Whether the expander will resize the toplevel window upon expanding and "
 "collapsing"
-msgstr ""
+msgstr "在展開和收摺時展開器是��改變頂層視窗的大�"
 
-#: ../gtk/gtkexpander.c:354 ../gtk/gtktoolitemgroup.c:1631
+#: ../gtk/gtkexpander.c:355 ../gtk/gtktoolitemgroup.c:1627
 #: ../gtk/gtktreeview.c:1187
 msgid "Expander Size"
 msgstr "展開器大�"
 
-#: ../gtk/gtkexpander.c:355 ../gtk/gtktoolitemgroup.c:1632
+#: ../gtk/gtkexpander.c:356 ../gtk/gtktoolitemgroup.c:1628
 #: ../gtk/gtktreeview.c:1188
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大�"
 
-#: ../gtk/gtkexpander.c:364
+#: ../gtk/gtkexpander.c:365
 msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周�的間�"
 
-#: ../gtk/gtkfilechooserbutton.c:366
+#: ../gtk/gtkfilechooserbutton.c:409
 msgid "Dialog"
 msgstr "�話盒"
 
-#: ../gtk/gtkfilechooserbutton.c:367
+#: ../gtk/gtkfilechooserbutton.c:410
 msgid "The file chooser dialog to use."
 msgstr "準備�用的檔案�擇�話盒類型。"
 
-#: ../gtk/gtkfilechooserbutton.c:398
+#: ../gtk/gtkfilechooserbutton.c:441
 msgid "The title of the file chooser dialog."
 msgstr "檔案�擇�話盒的標題。"
 
-#: ../gtk/gtkfilechooserbutton.c:412
+#: ../gtk/gtkfilechooserbutton.c:455
 msgid "The desired width of the button widget, in characters."
 msgstr "按鈕元件所需的闊度，以字符計。"
 
@@ -2996,7 +3004,7 @@ msgid ""
 "folders."
 msgstr "在開啟模�的檔案�擇程�是�讓使用者建立新的資料夾。"
 
-#: ../gtk/gtkfixed.c:152 ../gtk/gtklayout.c:634
+#: ../gtk/gtkfixed.c:152 ../gtk/gtklayout.c:634 ../gtk/gtktreeviewcolumn.c:264
 msgid "X position"
 msgstr "水平�置"
 
@@ -3012,550 +3020,559 @@ msgstr "垂直�置"
 msgid "Y position of child widget"
 msgstr "�元件的垂直�置"
 
-#: ../gtk/gtkfontbutton.c:141
-msgid "The title of the font selection dialog"
-msgstr "字型�擇�話盒的標題"
+#: ../gtk/gtkfontbutton.c:151
+msgid "The title of the font chooser dialog"
+msgstr "檔案�擇�話盒的標題"
 
-#: ../gtk/gtkfontbutton.c:156 ../gtk/gtkfontsel.c:219
+#: ../gtk/gtkfontbutton.c:166 ../gtk/gtkfontchooser.c:189
+#: ../gtk/gtkfontsel.c:244
 msgid "Font name"
 msgstr "字型�稱"
 
-#: ../gtk/gtkfontbutton.c:157
+#: ../gtk/gtkfontbutton.c:167
 msgid "The name of the selected font"
 msgstr "�擇字型的�稱"
 
-#: ../gtk/gtkfontbutton.c:158
+#: ../gtk/gtkfontbutton.c:168
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:173
+#: ../gtk/gtkfontbutton.c:183
 msgid "Use font in label"
 msgstr "字型本身�映在標籤內"
 
-#: ../gtk/gtkfontbutton.c:174
+#: ../gtk/gtkfontbutton.c:184
 msgid "Whether the label is drawn in the selected font"
 msgstr "標籤文字��使用�擇的字型"
 
-#: ../gtk/gtkfontbutton.c:189
+#: ../gtk/gtkfontbutton.c:199
 msgid "Use size in label"
 msgstr "文字標籤中使用尺寸"
 
-#: ../gtk/gtkfontbutton.c:190
+#: ../gtk/gtkfontbutton.c:200
 msgid "Whether the label is drawn with the selected font size"
 msgstr "標籤文字��使用�擇的字型大�"
 
-#: ../gtk/gtkfontbutton.c:206
+#: ../gtk/gtkfontbutton.c:216
 msgid "Show style"
 msgstr "顯示樣�"
 
-#: ../gtk/gtkfontbutton.c:207
+#: ../gtk/gtkfontbutton.c:217
 msgid "Whether the selected font style is shown in the label"
 msgstr "標籤文字��使用�擇的字型樣�"
 
-#: ../gtk/gtkfontbutton.c:222
+#: ../gtk/gtkfontbutton.c:232
 msgid "Show size"
 msgstr "顯示字型大�"
 
-#: ../gtk/gtkfontbutton.c:223
+#: ../gtk/gtkfontbutton.c:233
 msgid "Whether selected font size is shown in the label"
 msgstr "標籤文字是�顯示使用�擇的字型尺寸"
 
-#: ../gtk/gtkfontsel.c:220
+#: ../gtk/gtkfontchooser.c:190 ../gtk/gtkfontsel.c:245
 msgid "The string that represents this font"
 msgstr "表示本字型的字串"
 
-#: ../gtk/gtkfontsel.c:226
+#: ../gtk/gtkfontchooser.c:196 ../gtk/gtkfontsel.c:251
 msgid "Preview text"
 msgstr "�覽文字"
 
-#: ../gtk/gtkfontsel.c:227
+#: ../gtk/gtkfontchooser.c:197 ../gtk/gtkfontsel.c:252
 msgid "The text to display in order to demonstrate the selected font"
 msgstr "顯示�定的字型時所使用的字串"
 
-#: ../gtk/gtkframe.c:134
+#: ../gtk/gtkfontchooser.c:204
+msgid "Show preview text entry"
+msgstr "顯示�覽文字項目"
+
+#: ../gtk/gtkfontchooser.c:205
+msgid "Whether the preview text entry is shown or not"
+msgstr "是�顯示�覽文字項目"
+
+#: ../gtk/gtkframe.c:172
 msgid "Text of the frame's label"
 msgstr "框架的標籤文字"
 
-#: ../gtk/gtkframe.c:141
+#: ../gtk/gtkframe.c:179
 msgid "Label xalign"
 msgstr "標籤水平�置"
 
-#: ../gtk/gtkframe.c:142
+#: ../gtk/gtkframe.c:180
 msgid "The horizontal alignment of the label"
 msgstr "標籤的水平�置"
 
-#: ../gtk/gtkframe.c:150
+#: ../gtk/gtkframe.c:188
 msgid "Label yalign"
 msgstr "標籤垂直�置"
 
-#: ../gtk/gtkframe.c:151
+#: ../gtk/gtkframe.c:189
 msgid "The vertical alignment of the label"
 msgstr "標籤的垂直�置"
 
-#: ../gtk/gtkframe.c:159
+#: ../gtk/gtkframe.c:197
 msgid "Frame shadow"
 msgstr "框架陰影"
 
-#: ../gtk/gtkframe.c:160
+#: ../gtk/gtkframe.c:198
 msgid "Appearance of the frame border"
 msgstr "框架邊框的外觀"
 
-#: ../gtk/gtkframe.c:169
+#: ../gtk/gtkframe.c:207
 msgid "A widget to display in place of the usual frame label"
 msgstr "用來替代原本框架文字標籤的視窗元件"
 
-#: ../gtk/gtkgrid.c:1268 ../gtk/gtktable.c:175
+#: ../gtk/gtkgrid.c:1298 ../gtk/gtktable.c:209
 msgid "Row spacing"
 msgstr "列�"
 
-#: ../gtk/gtkgrid.c:1269 ../gtk/gtktable.c:176
+#: ../gtk/gtkgrid.c:1299 ../gtk/gtktable.c:210
 msgid "The amount of space between two consecutive rows"
 msgstr "兩列之間的�離"
 
-#: ../gtk/gtkgrid.c:1275 ../gtk/gtktable.c:184
+#: ../gtk/gtkgrid.c:1305 ../gtk/gtktable.c:218
 msgid "Column spacing"
 msgstr "行�"
 
-#: ../gtk/gtkgrid.c:1276 ../gtk/gtktable.c:185
+#: ../gtk/gtkgrid.c:1306 ../gtk/gtktable.c:219
 msgid "The amount of space between two consecutive columns"
 msgstr "兩行之間的�離"
 
-#: ../gtk/gtkgrid.c:1282
+#: ../gtk/gtkgrid.c:1312
 msgid "Row Homogeneous"
 msgstr "列高一致"
 
-#: ../gtk/gtkgrid.c:1283
+#: ../gtk/gtkgrid.c:1313
 msgid "If TRUE, the rows are all the same height"
 msgstr "如設為定為「TRUE�，表示所有列的高度都一樣"
 
-#: ../gtk/gtkgrid.c:1289
+#: ../gtk/gtkgrid.c:1319
 msgid "Column Homogeneous"
 msgstr "欄寬一致"
 
-#: ../gtk/gtkgrid.c:1290
+#: ../gtk/gtkgrid.c:1320
 msgid "If TRUE, the columns are all the same width"
 msgstr "如設為定為「TRUE�，表示所有欄的闊度都一樣"
 
-#: ../gtk/gtkgrid.c:1296 ../gtk/gtktable.c:201
+#: ../gtk/gtkgrid.c:1326 ../gtk/gtktable.c:235
 msgid "Left attachment"
 msgstr "左�附加"
 
-#: ../gtk/gtkgrid.c:1297 ../gtk/gtkmenu.c:759 ../gtk/gtktable.c:202
+#: ../gtk/gtkgrid.c:1327 ../gtk/gtkmenu.c:761 ../gtk/gtktable.c:236
 msgid "The column number to attach the left side of the child to"
 msgstr "��單的左�附加於指定的縱列數上"
 
-#: ../gtk/gtkgrid.c:1303 ../gtk/gtktable.c:215
+#: ../gtk/gtkgrid.c:1333 ../gtk/gtktable.c:249
 msgid "Top attachment"
 msgstr "頂端附加"
 
-#: ../gtk/gtkgrid.c:1304
+#: ../gtk/gtkgrid.c:1334
 msgid "The row number to attach the top side of a child widget to"
 msgstr "附加�元件頂端於其上的列數"
 
-#: ../gtk/gtkgrid.c:1310 ../gtk/gtklayout.c:660 ../gtk/gtktreeviewcolumn.c:262
+#: ../gtk/gtkgrid.c:1340 ../gtk/gtklayout.c:660 ../gtk/gtktreeviewcolumn.c:274
 msgid "Width"
 msgstr "闊度"
 
-#: ../gtk/gtkgrid.c:1311
+#: ../gtk/gtkgrid.c:1341
 msgid "The number of columns that a child spans"
 msgstr "�項跨�的欄數"
 
-#: ../gtk/gtkgrid.c:1317 ../gtk/gtklayout.c:669
+#: ../gtk/gtkgrid.c:1347 ../gtk/gtklayout.c:669
 msgid "Height"
 msgstr "高度"
 
-#: ../gtk/gtkgrid.c:1318
+#: ../gtk/gtkgrid.c:1348
 msgid "The number of rows that a child spans"
 msgstr "�項跨�的列數"
 
-#: ../gtk/gtkhandlebox.c:191
+#: ../gtk/gtkhandlebox.c:219
 msgid "Appearance of the shadow that surrounds the container"
 msgstr "容器元件周�的陰影的外觀"
 
-#: ../gtk/gtkhandlebox.c:199
+#: ../gtk/gtkhandlebox.c:227
 msgid "Handle position"
 msgstr "控制項�置"
 
-#: ../gtk/gtkhandlebox.c:200
+#: ../gtk/gtkhandlebox.c:228
 msgid "Position of the handle relative to the child widget"
 msgstr "相�於�元件的控制項�置"
 
-#: ../gtk/gtkhandlebox.c:208
+#: ../gtk/gtkhandlebox.c:236
 msgid "Snap edge"
 msgstr "貼齊邊緣"
 
-#: ../gtk/gtkhandlebox.c:209
+#: ../gtk/gtkhandlebox.c:237
 msgid ""
 "Side of the handlebox that's lined up with the docking point to dock the "
 "handlebox"
 msgstr "控制方塊的�邊與置入該方塊的置入點自動貼齊"
 
-#: ../gtk/gtkhandlebox.c:217
+#: ../gtk/gtkhandlebox.c:245
 msgid "Snap edge set"
 msgstr "貼齊邊緣設定"
 
-#: ../gtk/gtkhandlebox.c:218
+#: ../gtk/gtkhandlebox.c:246
 msgid ""
 "Whether to use the value from the snap_edge property or a value derived from "
 "handle_position"
 msgstr "是�根據 snap_edge 屬性，或採用 handle_position 的設定值"
 
-#: ../gtk/gtkhandlebox.c:225
+#: ../gtk/gtkhandlebox.c:253
 msgid "Child Detached"
 msgstr "�項目已分離"
 
-#: ../gtk/gtkhandlebox.c:226
+#: ../gtk/gtkhandlebox.c:254
 msgid ""
 "A boolean value indicating whether the handlebox's child is attached or "
 "detached."
 msgstr "一個用來表示把手方塊(handlebox)的�項是��或分離的�輯數值。"
 
-#: ../gtk/gtkiconview.c:529 ../gtk/gtktreeselection.c:131
+#: ../gtk/gtkiconview.c:527 ../gtk/gtktreeselection.c:131
 msgid "Selection mode"
 msgstr "�擇模�"
 
-#: ../gtk/gtkiconview.c:530
+#: ../gtk/gtkiconview.c:528
 msgid "The selection mode"
 msgstr "�擇模�"
 
-#: ../gtk/gtkiconview.c:548
+#: ../gtk/gtkiconview.c:546
 msgid "Pixbuf column"
 msgstr "Pixbuf 欄"
 
-#: ../gtk/gtkiconview.c:549
+#: ../gtk/gtkiconview.c:547
 msgid "Model column used to retrieve the icon pixbuf from"
 msgstr "用來�得圖示 pixbuf 的典型欄"
 
-#: ../gtk/gtkiconview.c:567
+#: ../gtk/gtkiconview.c:565
 msgid "Model column used to retrieve the text from"
 msgstr "用來�得文字 pixbuf 的典型欄"
 
-#: ../gtk/gtkiconview.c:586
+#: ../gtk/gtkiconview.c:584
 msgid "Markup column"
 msgstr "標記欄�"
 
-#: ../gtk/gtkiconview.c:587
+#: ../gtk/gtkiconview.c:585
 msgid "Model column used to retrieve the text if using Pango markup"
 msgstr "如果使用 Pango 標記時用來�得文字的典型欄"
 
-#: ../gtk/gtkiconview.c:594
+#: ../gtk/gtkiconview.c:592
 msgid "Icon View Model"
 msgstr "Icon View 模型"
 
-#: ../gtk/gtkiconview.c:595
+#: ../gtk/gtkiconview.c:593
 msgid "The model for the icon view"
 msgstr "圖示檢視所使用的模型"
 
-#: ../gtk/gtkiconview.c:611
+#: ../gtk/gtkiconview.c:609
 msgid "Number of columns"
 msgstr "欄�數目"
 
-#: ../gtk/gtkiconview.c:612
+#: ../gtk/gtkiconview.c:610
 msgid "Number of columns to display"
 msgstr "�顯示的欄數"
 
-#: ../gtk/gtkiconview.c:629
+#: ../gtk/gtkiconview.c:627
 msgid "Width for each item"
 msgstr "�項目的闊度"
 
-#: ../gtk/gtkiconview.c:630
+#: ../gtk/gtkiconview.c:628
 msgid "The width used for each item"
 msgstr "用於�個項目的闊度"
 
-#: ../gtk/gtkiconview.c:646
+#: ../gtk/gtkiconview.c:644
 msgid "Space which is inserted between cells of an item"
 msgstr "用來�入項目的格�之間的空間"
 
-#: ../gtk/gtkiconview.c:661
+#: ../gtk/gtkiconview.c:659
 msgid "Row Spacing"
 msgstr "行的間隔"
 
-#: ../gtk/gtkiconview.c:662
+#: ../gtk/gtkiconview.c:660
 msgid "Space which is inserted between grid rows"
 msgstr "用來�入格線列之間的空間"
 
-#: ../gtk/gtkiconview.c:677
+#: ../gtk/gtkiconview.c:675
 msgid "Column Spacing"
 msgstr "欄的間隔"
 
-#: ../gtk/gtkiconview.c:678
+#: ../gtk/gtkiconview.c:676
 msgid "Space which is inserted between grid columns"
 msgstr "用來�入格線欄之間的空間"
 
-#: ../gtk/gtkiconview.c:693
+#: ../gtk/gtkiconview.c:691
 msgid "Margin"
 msgstr "邊界"
 
-#: ../gtk/gtkiconview.c:694
+#: ../gtk/gtkiconview.c:692
 msgid "Space which is inserted at the edges of the icon view"
 msgstr "用來�入圖示檢視邊緣的空間"
 
-#: ../gtk/gtkiconview.c:709
+#: ../gtk/gtkiconview.c:707
 msgid "Item Orientation"
 msgstr "項目方�"
 
-#: ../gtk/gtkiconview.c:710
+#: ../gtk/gtkiconview.c:708
 msgid ""
 "How the text and icon of each item are positioned relative to each other"
 msgstr "�個項目的文字與圖示之間�如何排列"
 
-#: ../gtk/gtkiconview.c:726 ../gtk/gtktreeview.c:1022
-#: ../gtk/gtktreeviewcolumn.c:362
+#: ../gtk/gtkiconview.c:724 ../gtk/gtktreeview.c:1022
+#: ../gtk/gtktreeviewcolumn.c:374
 msgid "Reorderable"
 msgstr "��新排列"
 
-#: ../gtk/gtkiconview.c:727 ../gtk/gtktreeview.c:1023
+#: ../gtk/gtkiconview.c:725 ../gtk/gtktreeview.c:1023
 msgid "View is reorderable"
 msgstr "該顯示為�排�的"
 
-#: ../gtk/gtkiconview.c:734 ../gtk/gtktreeview.c:1173
+#: ../gtk/gtkiconview.c:732 ../gtk/gtktreeview.c:1173
 msgid "Tooltip Column"
 msgstr "工具�示欄�"
 
-#: ../gtk/gtkiconview.c:735
+#: ../gtk/gtkiconview.c:733
 msgid "The column in the model containing the tooltip texts for the items"
 msgstr "包�項目的工具�示文字的模型欄�"
 
-#: ../gtk/gtkiconview.c:752
+#: ../gtk/gtkiconview.c:750
 msgid "Item Padding"
 msgstr "項目留空"
 
-#: ../gtk/gtkiconview.c:753
+#: ../gtk/gtkiconview.c:751
 msgid "Padding around icon view items"
 msgstr "圖示檢視項目周�的留空"
 
-#: ../gtk/gtkiconview.c:784
+#: ../gtk/gtkiconview.c:782
 msgid "Selection Box Color"
 msgstr "���方塊色彩"
 
-#: ../gtk/gtkiconview.c:785
+#: ../gtk/gtkiconview.c:783
 msgid "Color of the selection box"
 msgstr "���方塊的色彩"
 
-#: ../gtk/gtkiconview.c:791
+#: ../gtk/gtkiconview.c:789
 msgid "Selection Box Alpha"
 msgstr "���方塊的α混色"
 
-#: ../gtk/gtkiconview.c:792
+#: ../gtk/gtkiconview.c:790
 msgid "Opacity of the selection box"
 msgstr "���方塊的�明度"
 
-#: ../gtk/gtkimage.c:236 ../gtk/gtkstatusicon.c:205
+#: ../gtk/gtkimage.c:237 ../gtk/gtkstatusicon.c:235
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtk/gtkimage.c:237 ../gtk/gtkstatusicon.c:206
+#: ../gtk/gtkimage.c:238 ../gtk/gtkstatusicon.c:236
 msgid "A GdkPixbuf to display"
 msgstr "準備顯示的 GdkPixbuf"
 
-#: ../gtk/gtkimage.c:244 ../gtk/gtkrecentmanager.c:294
-#: ../gtk/gtkstatusicon.c:213
+#: ../gtk/gtkimage.c:245 ../gtk/gtkrecentmanager.c:294
+#: ../gtk/gtkstatusicon.c:243
 msgid "Filename"
 msgstr "檔案�稱"
 
-#: ../gtk/gtkimage.c:245 ../gtk/gtkstatusicon.c:214
+#: ../gtk/gtkimage.c:246 ../gtk/gtkstatusicon.c:244
 msgid "Filename to load and display"
 msgstr "準備載入�顯示的檔案"
 
-#: ../gtk/gtkimage.c:254 ../gtk/gtkstatusicon.c:222
+#: ../gtk/gtkimage.c:255 ../gtk/gtkstatusicon.c:252
 msgid "Stock ID for a stock image to display"
 msgstr "欲顯示的內置圖示�稱"
 
-#: ../gtk/gtkimage.c:261
+#: ../gtk/gtkimage.c:262
 msgid "Icon set"
 msgstr "圖示集"
 
-#: ../gtk/gtkimage.c:262
+#: ../gtk/gtkimage.c:263
 msgid "Icon set to display"
 msgstr "準備顯示的圖示集"
 
-#: ../gtk/gtkimage.c:269 ../gtk/gtkscalebutton.c:227 ../gtk/gtktoolbar.c:518
-#: ../gtk/gtktoolpalette.c:1039
+#: ../gtk/gtkimage.c:270 ../gtk/gtkscalebutton.c:228 ../gtk/gtktoolbar.c:530
+#: ../gtk/gtktoolpalette.c:1008
 msgid "Icon size"
 msgstr "圖示大�"
 
-#: ../gtk/gtkimage.c:270
+#: ../gtk/gtkimage.c:271
 msgid "Symbolic size to use for stock icon, icon set or named icon"
 msgstr "內置圖示或圖示集或具�圖示的符號大�"
 
-#: ../gtk/gtkimage.c:286
+#: ../gtk/gtkimage.c:287
 msgid "Pixel size"
 msgstr "�素大�"
 
-#: ../gtk/gtkimage.c:287
+#: ../gtk/gtkimage.c:288
 msgid "Pixel size to use for named icon"
 msgstr "具�圖示的�素大�"
 
-#: ../gtk/gtkimage.c:295
+#: ../gtk/gtkimage.c:296
 msgid "Animation"
 msgstr "å‹•ç•«"
 
-#: ../gtk/gtkimage.c:296
+#: ../gtk/gtkimage.c:297
 msgid "GdkPixbufAnimation to display"
 msgstr "準備顯示的 GdkPixbufAnimation"
 
-#: ../gtk/gtkimage.c:336 ../gtk/gtkstatusicon.c:253
+#: ../gtk/gtkimage.c:337 ../gtk/gtkstatusicon.c:283
 msgid "Storage type"
 msgstr "儲存種類"
 
-#: ../gtk/gtkimage.c:337 ../gtk/gtkstatusicon.c:254
+#: ../gtk/gtkimage.c:338 ../gtk/gtkstatusicon.c:284
 msgid "The representation being used for image data"
 msgstr "圖片資料所使用的資料代表"
 
-#: ../gtk/gtkimage.c:355
+#: ../gtk/gtkimage.c:356
 msgid "Use Fallback"
 msgstr "使用後備"
 
-#: ../gtk/gtkimage.c:356
+#: ../gtk/gtkimage.c:357
 msgid "Whether to use icon names fallback"
 msgstr "是�使用圖示�稱後備"
 
-#: ../gtk/gtkimagemenuitem.c:150
+#: ../gtk/gtkimagemenuitem.c:161
 msgid "Child widget to appear next to the menu text"
 msgstr "�單文字�邊顯示的�元件"
 
-#: ../gtk/gtkimagemenuitem.c:165
+#: ../gtk/gtkimagemenuitem.c:176
 msgid "Whether to use the label text to create a stock menu item"
 msgstr "是�使用標籤文字來建立圖庫�單項目"
 
-#: ../gtk/gtkimagemenuitem.c:198 ../gtk/gtkmenu.c:601
+#: ../gtk/gtkimagemenuitem.c:209 ../gtk/gtkmenu.c:603
 msgid "Accel Group"
 msgstr "�徑�羣組"
 
-#: ../gtk/gtkimagemenuitem.c:199
+#: ../gtk/gtkimagemenuitem.c:210
 msgid "The Accel Group to use for stock accelerator keys"
 msgstr "圖庫�徑�的羣組"
 
-#: ../gtk/gtkinfobar.c:371 ../gtk/gtkmessagedialog.c:202
+#: ../gtk/gtkinfobar.c:372 ../gtk/gtkmessagedialog.c:204
 msgid "Message Type"
 msgstr "訊�類型"
 
-#: ../gtk/gtkinfobar.c:372 ../gtk/gtkmessagedialog.c:203
+#: ../gtk/gtkinfobar.c:373 ../gtk/gtkmessagedialog.c:205
 msgid "The type of message"
 msgstr "訊�的類型"
 
-#: ../gtk/gtkinfobar.c:427
+#: ../gtk/gtkinfobar.c:428
 msgid "Width of border around the content area"
 msgstr "內容�域的邊框闊度"
 
-#: ../gtk/gtkinfobar.c:444
+#: ../gtk/gtkinfobar.c:445
 msgid "Spacing between elements of the area"
 msgstr "�域中元件間的間�"
 
-#: ../gtk/gtkinfobar.c:476
+#: ../gtk/gtkinfobar.c:477
 msgid "Width of border around the action area"
 msgstr "動作�域的邊框闊度"
 
-#: ../gtk/gtkinvisible.c:89 ../gtk/gtkmountoperation.c:175
-#: ../gtk/gtkstatusicon.c:272 ../gtk/gtkstylecontext.c:546
-#: ../gtk/gtkwindow.c:730
+#: ../gtk/gtkinvisible.c:103 ../gtk/gtkmountoperation.c:173
+#: ../gtk/gtkstatusicon.c:302 ../gtk/gtkstylecontext.c:432
+#: ../gtk/gtkwindow.c:765
 msgid "Screen"
 msgstr "螢幕"
 
-#: ../gtk/gtkinvisible.c:90 ../gtk/gtkwindow.c:731
+#: ../gtk/gtkinvisible.c:104 ../gtk/gtkwindow.c:766
 msgid "The screen where this window will be displayed"
 msgstr "本視窗將顯示於第幾螢幕"
 
-#: ../gtk/gtklabel.c:568
+#: ../gtk/gtklabel.c:730
 msgid "The text of the label"
 msgstr "標籤中的文字"
 
-#: ../gtk/gtklabel.c:575
+#: ../gtk/gtklabel.c:737
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "標籤中的文字�以採用的樣�屬性清單"
 
-#: ../gtk/gtklabel.c:596 ../gtk/gtktexttag.c:353 ../gtk/gtktextview.c:701
+#: ../gtk/gtklabel.c:758 ../gtk/gtktexttag.c:386 ../gtk/gtktextview.c:703
 msgid "Justification"
 msgstr "�齊方�"
 
-#: ../gtk/gtklabel.c:597
+#: ../gtk/gtklabel.c:759
 msgid ""
 "The alignment of the lines in the text of the label relative to each other. "
 "This does NOT affect the alignment of the label within its allocation. See "
 "GtkMisc::xalign for that"
 msgstr "標籤文字中�一列文字相�的排列方�。此設定並�會影響該文字標籤的�置�置。詳見 GtkMisc::xalign "
 
-#: ../gtk/gtklabel.c:605
+#: ../gtk/gtklabel.c:767
 msgid "Pattern"
 msgstr "樣�"
 
-#: ../gtk/gtklabel.c:606
+#: ../gtk/gtklabel.c:768
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
 msgstr "�有底線(_)的字串中，字�會呈�有底線的相��置"
 
-#: ../gtk/gtklabel.c:613
+#: ../gtk/gtklabel.c:775
 msgid "Line wrap"
 msgstr "自動�行"
 
-#: ../gtk/gtklabel.c:614
+#: ../gtk/gtklabel.c:776
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "如使用本�項，當字�太長時會自動�行"
 
-#: ../gtk/gtklabel.c:629
+#: ../gtk/gtklabel.c:791
 msgid "Line wrap mode"
 msgstr "�行模�"
 
-#: ../gtk/gtklabel.c:630
+#: ../gtk/gtklabel.c:792
 msgid "If wrap is set, controls how linewrapping is done"
 msgstr "如果設定�行，這�控制如何完��行"
 
-#: ../gtk/gtklabel.c:637
+#: ../gtk/gtklabel.c:799
 msgid "Selectable"
 msgstr "���"
 
-#: ../gtk/gtklabel.c:638
+#: ../gtk/gtklabel.c:800
 msgid "Whether the label text can be selected with the mouse"
 msgstr "標籤文字��使用滑鼠來��"
 
-#: ../gtk/gtklabel.c:644
+#: ../gtk/gtklabel.c:806
 msgid "Mnemonic key"
 msgstr "速記�"
 
-#: ../gtk/gtklabel.c:645
+#: ../gtk/gtklabel.c:807
 msgid "The mnemonic accelerator key for this label"
 msgstr "本文字標籤的速記快��"
 
-#: ../gtk/gtklabel.c:653
+#: ../gtk/gtklabel.c:815
 msgid "Mnemonic widget"
 msgstr "速記元件"
 
-#: ../gtk/gtklabel.c:654
+#: ../gtk/gtklabel.c:816
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr "當文字標籤速記�按下時所啟動的元件"
 
-#: ../gtk/gtklabel.c:700
+#: ../gtk/gtklabel.c:862
 msgid ""
 "The preferred place to ellipsize the string, if the label does not have "
 "enough room to display the entire string"
 msgstr "如果標籤沒有足夠的空間顯示整個字串時，用來簡化該字串的空間"
 
-#: ../gtk/gtklabel.c:741
+#: ../gtk/gtklabel.c:903
 msgid "Single Line Mode"
 msgstr "單行模�"
 
-#: ../gtk/gtklabel.c:742
+#: ../gtk/gtklabel.c:904
 msgid "Whether the label is in single line mode"
 msgstr "標籤是�以單行的方�顯示"
 
-#: ../gtk/gtklabel.c:759
+#: ../gtk/gtklabel.c:921
 msgid "Angle"
 msgstr "角"
 
-#: ../gtk/gtklabel.c:760
+#: ../gtk/gtklabel.c:922
 msgid "Angle at which the label is rotated"
 msgstr "顯示標籤時旋轉的角度"
 
-#: ../gtk/gtklabel.c:782
+#: ../gtk/gtklabel.c:944
 msgid "The desired maximum width of the label, in characters"
 msgstr "標籤所需的最大闊度，以字符計"
 
-#: ../gtk/gtklabel.c:800
+#: ../gtk/gtklabel.c:962
 msgid "Track visited links"
 msgstr "追蹤已�覽的連�"
 
-#: ../gtk/gtklabel.c:801
+#: ../gtk/gtklabel.c:963
 msgid "Whether visited links should be tracked"
 msgstr "是�追蹤已�覽的連�"
 
@@ -3583,546 +3600,596 @@ msgstr "已�覽"
 msgid "Whether this link has been visited."
 msgstr "這個連�是�已�覽�。"
 
-#: ../gtk/gtkmenubar.c:181
+#: ../gtk/gtklockbutton.c:278
+msgid "Permission"
+msgstr "權�"
+
+#: ../gtk/gtklockbutton.c:279
+msgid "The GPermission object controlling this button"
+msgstr "GPermission 物件控制了這個按鈕"
+
+#: ../gtk/gtklockbutton.c:286
+msgid "Lock Text"
+msgstr "鎖定的文字"
+
+#: ../gtk/gtklockbutton.c:287
+msgid "The text to display when prompting the user to lock"
+msgstr "�示使用者鎖定時�顯示的文字"
+
+#: ../gtk/gtklockbutton.c:295
+msgid "Unlock Text"
+msgstr "解鎖的文字"
+
+#: ../gtk/gtklockbutton.c:296
+msgid "The text to display when prompting the user to unlock"
+msgstr "�示使用者解鎖時�顯示的文字"
+
+#: ../gtk/gtklockbutton.c:304
+msgid "Lock Tooltip"
+msgstr "鎖定的工具�示"
+
+#: ../gtk/gtklockbutton.c:305
+msgid "The tooltip to display when prompting the user to lock"
+msgstr "當�示使用者鎖定時�顯示的工具�示"
+
+#: ../gtk/gtklockbutton.c:313
+msgid "Unlock Tooltip"
+msgstr "解鎖的工具�示"
+
+#: ../gtk/gtklockbutton.c:314
+msgid "The tooltip to display when prompting the user to unlock"
+msgstr "當�示使用者解鎖時�顯示的工具�示"
+
+#: ../gtk/gtklockbutton.c:322
+msgid "Not Authorized Tooltip"
+msgstr "未驗證的工具�示"
+
+#: ../gtk/gtklockbutton.c:323
+msgid ""
+"The tooltip to display when prompting the user cannot obtain authorization"
+msgstr "當�示使用者�能通�驗證時�顯示的工具�示"
+
+#: ../gtk/gtkmenubar.c:192
 msgid "Pack direction"
 msgstr "排列方�"
 
-#: ../gtk/gtkmenubar.c:182
+#: ../gtk/gtkmenubar.c:193
 msgid "The pack direction of the menubar"
 msgstr "工具列的排列方�"
 
-#: ../gtk/gtkmenubar.c:198
+#: ../gtk/gtkmenubar.c:209
 msgid "Child Pack direction"
 msgstr "�元件排列方�"
 
-#: ../gtk/gtkmenubar.c:199
+#: ../gtk/gtkmenubar.c:210
 msgid "The child pack direction of the menubar"
 msgstr "�單列�元的件排列方�"
 
-#: ../gtk/gtkmenubar.c:208
+#: ../gtk/gtkmenubar.c:219
 msgid "Style of bevel around the menubar"
 msgstr "�單列的斜邊款�"
 
-#: ../gtk/gtkmenubar.c:215 ../gtk/gtktoolbar.c:568
+#: ../gtk/gtkmenubar.c:226 ../gtk/gtktoolbar.c:580
 msgid "Internal padding"
 msgstr "內部留空"
 
-#: ../gtk/gtkmenubar.c:216
+#: ../gtk/gtkmenubar.c:227
 msgid "Amount of border space between the menubar shadow and the menu items"
 msgstr "�單列陰影和�單項目之間的空間闊度"
 
-#: ../gtk/gtkmenu.c:587
+#: ../gtk/gtkmenu.c:589
 msgid "The currently selected menu item"
 msgstr "目���的�單項目"
 
-#: ../gtk/gtkmenu.c:602
+#: ../gtk/gtkmenu.c:604
 msgid "The accel group holding accelerators for the menu"
 msgstr "�存此�單�徑�的�徑�羣組"
 
-#: ../gtk/gtkmenu.c:616 ../gtk/gtkmenuitem.c:313
+#: ../gtk/gtkmenu.c:618 ../gtk/gtkmenuitem.c:368
 msgid "Accel Path"
 msgstr "�徑�路徑"
 
-#: ../gtk/gtkmenu.c:617
+#: ../gtk/gtkmenu.c:619
 msgid "An accel path used to conveniently construct accel paths of child items"
 msgstr "用來便利的建立�項目�徑�的路徑"
 
-#: ../gtk/gtkmenu.c:633
+#: ../gtk/gtkmenu.c:635
 msgid "Attach Widget"
 msgstr "附加視窗元件"
 
-#: ../gtk/gtkmenu.c:634
+#: ../gtk/gtkmenu.c:636
 msgid "The widget the menu is attached to"
 msgstr "此�單�附加的視窗元件"
 
-#: ../gtk/gtkmenu.c:642
+#: ../gtk/gtkmenu.c:644
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr "當此�單�下之後視窗管�員指定的視窗標題"
 
-#: ../gtk/gtkmenu.c:656
+#: ../gtk/gtkmenu.c:658
 msgid "Tearoff State"
 msgstr "分離狀態"
 
-#: ../gtk/gtkmenu.c:657
+#: ../gtk/gtkmenu.c:659
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "指出該�單是�分離的�輯值"
 
-#: ../gtk/gtkmenu.c:671
+#: ../gtk/gtkmenu.c:673
 msgid "Monitor"
 msgstr "監視器"
 
-#: ../gtk/gtkmenu.c:672
+#: ../gtk/gtkmenu.c:674
 msgid "The monitor the menu will be popped up on"
 msgstr "該�單�彈出到的螢幕"
 
-#: ../gtk/gtkmenu.c:678
+#: ../gtk/gtkmenu.c:680
 msgid "Vertical Padding"
 msgstr "垂直留空"
 
-#: ../gtk/gtkmenu.c:679
+#: ../gtk/gtkmenu.c:681
 msgid "Extra space at the top and bottom of the menu"
 msgstr "�單上下的�外空間"
 
-#: ../gtk/gtkmenu.c:701
+#: ../gtk/gtkmenu.c:703
 msgid "Reserve Toggle Size"
 msgstr "�留切�的大�"
 
-#: ../gtk/gtkmenu.c:702
+#: ../gtk/gtkmenu.c:704
 msgid ""
 "A boolean that indicates whether the menu reserves space for toggles and "
 "icons"
 msgstr "指出該�單是��留切�與圖示空間的�輯值"
 
-#: ../gtk/gtkmenu.c:708
+#: ../gtk/gtkmenu.c:710
 msgid "Horizontal Padding"
 msgstr "垂直留空"
 
-#: ../gtk/gtkmenu.c:709
+#: ../gtk/gtkmenu.c:711
 msgid "Extra space at the left and right edges of the menu"
 msgstr "�單左�的�外空間"
 
-#: ../gtk/gtkmenu.c:717
+#: ../gtk/gtkmenu.c:719
 msgid "Vertical Offset"
 msgstr "垂直�移"
 
-#: ../gtk/gtkmenu.c:718
+#: ../gtk/gtkmenu.c:720
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr "當此�單為��單，將其一此設定值垂直�移放置"
 
-#: ../gtk/gtkmenu.c:726
+#: ../gtk/gtkmenu.c:728
 msgid "Horizontal Offset"
 msgstr "水平�移"
 
-#: ../gtk/gtkmenu.c:727
+#: ../gtk/gtkmenu.c:729
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr "當此�單為��單，將其一此設定值水平�移放置"
 
-#: ../gtk/gtkmenu.c:735
+#: ../gtk/gtkmenu.c:737
 msgid "Double Arrows"
 msgstr "雙箭頭"
 
-#: ../gtk/gtkmenu.c:736
+#: ../gtk/gtkmenu.c:738
 msgid "When scrolling, always show both arrows."
 msgstr "在�動時，永�顯示兩端箭頭。"
 
-#: ../gtk/gtkmenu.c:749
+#: ../gtk/gtkmenu.c:751
 msgid "Arrow Placement"
 msgstr "箭號的放置"
 
-#: ../gtk/gtkmenu.c:750
+#: ../gtk/gtkmenu.c:752
 msgid "Indicates where scroll arrows should be placed"
 msgstr "指出�動軸箭頭應放置在哪�"
 
-#: ../gtk/gtkmenu.c:758
+#: ../gtk/gtkmenu.c:760
 msgid "Left Attach"
 msgstr "左�附加"
 
-#: ../gtk/gtkmenu.c:766
+#: ../gtk/gtkmenu.c:768
 msgid "Right Attach"
 msgstr "��附加"
 
-#: ../gtk/gtkmenu.c:767
+#: ../gtk/gtkmenu.c:769
 msgid "The column number to attach the right side of the child to"
 msgstr "��單的��附加於指定的縱列數上"
 
-#: ../gtk/gtkmenu.c:774
+#: ../gtk/gtkmenu.c:776
 msgid "Top Attach"
 msgstr "頂端附加"
 
-#: ../gtk/gtkmenu.c:775
+#: ../gtk/gtkmenu.c:777
 msgid "The row number to attach the top of the child to"
 msgstr "��單的頂端附加於指定的橫列數上"
 
-#: ../gtk/gtkmenu.c:782
+#: ../gtk/gtkmenu.c:784
 msgid "Bottom Attach"
 msgstr "底部附加"
 
-#: ../gtk/gtkmenu.c:783 ../gtk/gtktable.c:223
+#: ../gtk/gtkmenu.c:785 ../gtk/gtktable.c:257
 msgid "The row number to attach the bottom of the child to"
 msgstr "��單的底部附加於指定的橫列數上"
 
-#: ../gtk/gtkmenu.c:797
+#: ../gtk/gtkmenu.c:799
 msgid "Arbitrary constant to scale down the size of the scroll arrow"
 msgstr "縮放�動軸箭頭大�的任�常數"
 
-#: ../gtk/gtkmenuitem.c:281
+#: ../gtk/gtkmenuitem.c:336
 msgid "Right Justified"
 msgstr "���齊"
 
-#: ../gtk/gtkmenuitem.c:282
+#: ../gtk/gtkmenuitem.c:337
 msgid ""
 "Sets whether the menu item appears justified at the right side of a menu bar"
 msgstr "設定�單項目是�出�在�單列的�端"
 
-#: ../gtk/gtkmenuitem.c:296
+#: ../gtk/gtkmenuitem.c:351
 msgid "Submenu"
 msgstr "��單"
 
-#: ../gtk/gtkmenuitem.c:297
+#: ../gtk/gtkmenuitem.c:352
 msgid "The submenu attached to the menu item, or NULL if it has none"
 msgstr "�附加到�單項目的��單，若沒有則為 NULL"
 
-#: ../gtk/gtkmenuitem.c:314
+#: ../gtk/gtkmenuitem.c:369
 msgid "Sets the accelerator path of the menu item"
 msgstr "設定�單項目的�徑�路徑"
 
-#: ../gtk/gtkmenuitem.c:329
+#: ../gtk/gtkmenuitem.c:384
 msgid "The text for the child label"
 msgstr "�標籤的文字"
 
-#: ../gtk/gtkmenuitem.c:392
+#: ../gtk/gtkmenuitem.c:447
 msgid "Amount of space used up by arrow, relative to the menu item's font size"
 msgstr "箭頭所佔空間大�，相�於�單項目的字型大�"
 
-#: ../gtk/gtkmenuitem.c:405
+#: ../gtk/gtkmenuitem.c:460
 msgid "Width in Characters"
 msgstr "闊度(字符)"
 
-#: ../gtk/gtkmenuitem.c:406
+#: ../gtk/gtkmenuitem.c:461
 msgid "The minimum desired width of the menu item in characters"
 msgstr "此�單項目�求的最�闊度，以字符計"
 
-#: ../gtk/gtkmenushell.c:420
+#: ../gtk/gtkmenushell.c:447
 msgid "Take Focus"
 msgstr "�得焦點"
 
-#: ../gtk/gtkmenushell.c:421
+#: ../gtk/gtkmenushell.c:448
 msgid "A boolean that determines whether the menu grabs the keyboard focus"
 msgstr "決定�單是��得�盤焦點的�輯值"
 
-#: ../gtk/gtkmenutoolbutton.c:257
+#: ../gtk/gtkmenutoolbutton.c:293
 msgid "Menu"
 msgstr "�單"
 
-#: ../gtk/gtkmenutoolbutton.c:258
+#: ../gtk/gtkmenutoolbutton.c:294
 msgid "The dropdown menu"
 msgstr "下拉��單"
 
-#: ../gtk/gtkmessagedialog.c:185
+#: ../gtk/gtkmessagedialog.c:187
 msgid "Image/label border"
 msgstr "圖片/標籤邊框"
 
-#: ../gtk/gtkmessagedialog.c:186
+#: ../gtk/gtkmessagedialog.c:188
 msgid "Width of border around the label and image in the message dialog"
 msgstr "訊��話盒的標籤和圖片周�的邊框闊度"
 
-#: ../gtk/gtkmessagedialog.c:210
+#: ../gtk/gtkmessagedialog.c:212
 msgid "Message Buttons"
 msgstr "訊�按鈕"
 
-#: ../gtk/gtkmessagedialog.c:211
+#: ../gtk/gtkmessagedialog.c:213
 msgid "The buttons shown in the message dialog"
 msgstr "訊��話窗顯示的按鈕"
 
-#: ../gtk/gtkmessagedialog.c:228
+#: ../gtk/gtkmessagedialog.c:230
 msgid "The primary text of the message dialog"
 msgstr "訊��話盒中的主�文字"
 
-#: ../gtk/gtkmessagedialog.c:243
+#: ../gtk/gtkmessagedialog.c:245
 msgid "Use Markup"
 msgstr "使用標記"
 
-#: ../gtk/gtkmessagedialog.c:244
+#: ../gtk/gtkmessagedialog.c:246
 msgid "The primary text of the title includes Pango markup."
 msgstr "包� Pango 標記的標題主�文字。"
 
-#: ../gtk/gtkmessagedialog.c:258
+#: ../gtk/gtkmessagedialog.c:260
 msgid "Secondary Text"
 msgstr "次�文字"
 
-#: ../gtk/gtkmessagedialog.c:259
+#: ../gtk/gtkmessagedialog.c:261
 msgid "The secondary text of the message dialog"
 msgstr "訊��話盒中的次�文字"
 
-#: ../gtk/gtkmessagedialog.c:274
+#: ../gtk/gtkmessagedialog.c:276
 msgid "Use Markup in secondary"
 msgstr "在次�文件使用標記"
 
-#: ../gtk/gtkmessagedialog.c:275
+#: ../gtk/gtkmessagedialog.c:277
 msgid "The secondary text includes Pango markup."
 msgstr "次�文字包� Pango 標記。"
 
-#: ../gtk/gtkmessagedialog.c:289
+#: ../gtk/gtkmessagedialog.c:291
 msgid "Image"
 msgstr "圖片"
 
-#: ../gtk/gtkmessagedialog.c:290
+#: ../gtk/gtkmessagedialog.c:292
 msgid "The image"
 msgstr "圖片"
 
-#: ../gtk/gtkmessagedialog.c:306
+#: ../gtk/gtkmessagedialog.c:308
 msgid "Message area"
 msgstr "訊��域"
 
-#: ../gtk/gtkmessagedialog.c:307
+#: ../gtk/gtkmessagedialog.c:309
 msgid "GtkVBox that holds the dialog's primary and secondary labels"
 msgstr "�有這個�話盒主��次�標籤的 GtkVBox"
 
-#: ../gtk/gtkmisc.c:91
+#: ../gtk/gtkmisc.c:115
 msgid "Y align"
 msgstr "垂直排列"
 
-#: ../gtk/gtkmisc.c:92
+#: ../gtk/gtkmisc.c:116
 msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
 msgstr "垂直排列，由 0 (上) 至 1 (下)"
 
-#: ../gtk/gtkmisc.c:101
+#: ../gtk/gtkmisc.c:125
 msgid "X pad"
 msgstr "水平留空"
 
-#: ../gtk/gtkmisc.c:102
+#: ../gtk/gtkmisc.c:126
 msgid ""
 "The amount of space to add on the left and right of the widget, in pixels"
 msgstr "加在視窗元件左�的空間，單�為�素"
 
-#: ../gtk/gtkmisc.c:111
+#: ../gtk/gtkmisc.c:135
 msgid "Y pad"
 msgstr "垂直留空"
 
-#: ../gtk/gtkmisc.c:112
+#: ../gtk/gtkmisc.c:136
 msgid ""
 "The amount of space to add on the top and bottom of the widget, in pixels"
 msgstr "加在視窗元件上下的空間，單�為�素"
 
-#: ../gtk/gtkmountoperation.c:159
+#: ../gtk/gtkmountoperation.c:157
 msgid "Parent"
 msgstr "父項"
 
-#: ../gtk/gtkmountoperation.c:160
+#: ../gtk/gtkmountoperation.c:158
 msgid "The parent window"
 msgstr "父視窗"
 
-#: ../gtk/gtkmountoperation.c:167
+#: ../gtk/gtkmountoperation.c:165
 msgid "Is Showing"
 msgstr "顯示"
 
-#: ../gtk/gtkmountoperation.c:168
+#: ../gtk/gtkmountoperation.c:166
 msgid "Are we showing a dialog"
 msgstr "我們是��顯示�話盒"
 
-#: ../gtk/gtkmountoperation.c:176
+#: ../gtk/gtkmountoperation.c:174
 msgid "The screen where this window will be displayed."
 msgstr "本視窗將顯示於此螢幕。"
 
-#: ../gtk/gtknotebook.c:685
+#: ../gtk/gtknotebook.c:694
 msgid "Page"
 msgstr "�碼"
 
-#: ../gtk/gtknotebook.c:686
+#: ../gtk/gtknotebook.c:695
 msgid "The index of the current page"
 msgstr "目���的索引"
 
-#: ../gtk/gtknotebook.c:694
+#: ../gtk/gtknotebook.c:703
 msgid "Tab Position"
 msgstr "標簽�置"
 
-#: ../gtk/gtknotebook.c:695
+#: ../gtk/gtknotebook.c:704
 msgid "Which side of the notebook holds the tabs"
 msgstr "標簽�中�有標簽的一邊"
 
-#: ../gtk/gtknotebook.c:702
+#: ../gtk/gtknotebook.c:711
 msgid "Show Tabs"
 msgstr "顯示標簽"
 
-#: ../gtk/gtknotebook.c:703
+#: ../gtk/gtknotebook.c:712
 msgid "Whether tabs should be shown"
 msgstr "是�顯示分�"
 
-#: ../gtk/gtknotebook.c:709
+#: ../gtk/gtknotebook.c:718
 msgid "Show Border"
 msgstr "顯示邊框"
 
-#: ../gtk/gtknotebook.c:710
+#: ../gtk/gtknotebook.c:719
 msgid "Whether the border should be shown"
 msgstr "是�顯示框線"
 
-#: ../gtk/gtknotebook.c:716
+#: ../gtk/gtknotebook.c:725
 msgid "Scrollable"
 msgstr "��動"
 
-#: ../gtk/gtknotebook.c:717
+#: ../gtk/gtknotebook.c:726
 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
 msgstr "如設為定為‘TRUE’，如果標籤太多時，會在兩�加上箭頭"
 
-#: ../gtk/gtknotebook.c:723
+#: ../gtk/gtknotebook.c:732
 msgid "Enable Popup"
 msgstr "使用蹦出�單"
 
-#: ../gtk/gtknotebook.c:724
+#: ../gtk/gtknotebook.c:733
 msgid ""
 "If TRUE, pressing the right mouse button on the notebook pops up a menu that "
 "you can use to go to a page"
 msgstr "若為 TRUE，在標籤�按下滑鼠��時會蹦出��擇��的�單"
 
-#: ../gtk/gtknotebook.c:738
+#: ../gtk/gtknotebook.c:747
 msgid "Group Name"
 msgstr "羣組�稱"
 
-#: ../gtk/gtknotebook.c:739
+#: ../gtk/gtknotebook.c:748
 msgid "Group name for tab drag and drop"
 msgstr "分�拖放的羣組�稱"
 
-#: ../gtk/gtknotebook.c:746
+#: ../gtk/gtknotebook.c:755
 msgid "Tab label"
 msgstr "標籤文字"
 
-#: ../gtk/gtknotebook.c:747
+#: ../gtk/gtknotebook.c:756
 msgid "The string displayed on the child's tab label"
 msgstr "�分�標籤所顯示的文字"
 
-#: ../gtk/gtknotebook.c:753
+#: ../gtk/gtknotebook.c:762
 msgid "Menu label"
 msgstr "�單文字標籤"
 
-#: ../gtk/gtknotebook.c:754
+#: ../gtk/gtknotebook.c:763
 msgid "The string displayed in the child's menu entry"
 msgstr "��單項目顯示的字串"
 
-#: ../gtk/gtknotebook.c:767
+#: ../gtk/gtknotebook.c:776
 msgid "Tab expand"
 msgstr "擴展標籤"
 
-#: ../gtk/gtknotebook.c:768
+#: ../gtk/gtknotebook.c:777
 msgid "Whether to expand the child's tab"
 msgstr "是�擴展�分�"
 
-#: ../gtk/gtknotebook.c:774
+#: ../gtk/gtknotebook.c:783
 msgid "Tab fill"
 msgstr "標籤填滿"
 
-#: ../gtk/gtknotebook.c:775
+#: ../gtk/gtknotebook.c:784
 msgid "Whether the child's tab should fill the allocated area"
 msgstr "�分�是�應填滿�置的�域"
 
-#: ../gtk/gtknotebook.c:782
+#: ../gtk/gtknotebook.c:791
 msgid "Tab reorderable"
 msgstr "分��排�"
 
-#: ../gtk/gtknotebook.c:783
+#: ../gtk/gtknotebook.c:792
 msgid "Whether the tab is reorderable by user action"
 msgstr "分�是��由使用者動作來�新排�"
 
-#: ../gtk/gtknotebook.c:789
+#: ../gtk/gtknotebook.c:798
 msgid "Tab detachable"
 msgstr "分��分離"
 
-#: ../gtk/gtknotebook.c:790
+#: ../gtk/gtknotebook.c:799
 msgid "Whether the tab is detachable"
 msgstr "分�是��分離"
 
-#: ../gtk/gtknotebook.c:805 ../gtk/gtkscrollbar.c:102
+#: ../gtk/gtknotebook.c:814 ../gtk/gtkscrollbar.c:102
 msgid "Secondary backward stepper"
 msgstr "次�倒退指示器"
 
-#: ../gtk/gtknotebook.c:806
+#: ../gtk/gtknotebook.c:815
 msgid ""
 "Display a second backward arrow button on the opposite end of the tab area"
 msgstr "在標籤�域��顯示第二個用來倒退的箭頭"
 
-#: ../gtk/gtknotebook.c:821 ../gtk/gtkscrollbar.c:109
+#: ../gtk/gtknotebook.c:830 ../gtk/gtkscrollbar.c:109
 msgid "Secondary forward stepper"
 msgstr "次��進指示器"
 
-#: ../gtk/gtknotebook.c:822
+#: ../gtk/gtknotebook.c:831
 msgid ""
 "Display a second forward arrow button on the opposite end of the tab area"
 msgstr "在標籤�域��顯示第二個用來�進的箭頭"
 
-#: ../gtk/gtknotebook.c:836 ../gtk/gtkscrollbar.c:88
+#: ../gtk/gtknotebook.c:845 ../gtk/gtkscrollbar.c:88
 msgid "Backward stepper"
 msgstr "倒退指示器"
 
-#: ../gtk/gtknotebook.c:837 ../gtk/gtkscrollbar.c:89
+#: ../gtk/gtknotebook.c:846 ../gtk/gtkscrollbar.c:89
 msgid "Display the standard backward arrow button"
 msgstr "顯示標準倒退箭頭按鈕"
 
-#: ../gtk/gtknotebook.c:851 ../gtk/gtkscrollbar.c:95
+#: ../gtk/gtknotebook.c:860 ../gtk/gtkscrollbar.c:95
 msgid "Forward stepper"
 msgstr "�進指示器"
 
-#: ../gtk/gtknotebook.c:852 ../gtk/gtkscrollbar.c:96
+#: ../gtk/gtknotebook.c:861 ../gtk/gtkscrollbar.c:96
 msgid "Display the standard forward arrow button"
 msgstr "顯示標準�進箭頭按鈕"
 
-#: ../gtk/gtknotebook.c:866
+#: ../gtk/gtknotebook.c:875
 msgid "Tab overlap"
 msgstr "分�覆蓋"
 
-#: ../gtk/gtknotebook.c:867
+#: ../gtk/gtknotebook.c:876
 msgid "Size of tab overlap area"
 msgstr "分��疊�域的大�"
 
-#: ../gtk/gtknotebook.c:882
+#: ../gtk/gtknotebook.c:891
 msgid "Tab curvature"
 msgstr "分�曲率"
 
-#: ../gtk/gtknotebook.c:883
+#: ../gtk/gtknotebook.c:892
 msgid "Size of tab curvature"
 msgstr "分�曲率的大�"
 
-#: ../gtk/gtknotebook.c:899
+#: ../gtk/gtknotebook.c:908
 msgid "Arrow spacing"
 msgstr "箭號的間�"
 
-#: ../gtk/gtknotebook.c:900
+#: ../gtk/gtknotebook.c:909
 msgid "Scroll arrow spacing"
 msgstr "�動軸箭號的間�"
 
-#: ../gtk/gtknotebook.c:916
+#: ../gtk/gtknotebook.c:925
+#, fuzzy
 msgid "Initial gap"
-msgstr ""
+msgstr "Emigrant Gap"
 
-#: ../gtk/gtknotebook.c:917
+#: ../gtk/gtknotebook.c:926
 msgid "Initial gap before the first tab"
-msgstr ""
+msgstr "第一個分��的空隙"
 
-#: ../gtk/gtknumerableicon.c:652
+#: ../gtk/gtknumerableicon.c:653
 msgid "Icon's count"
 msgstr "圖示計數"
 
-#: ../gtk/gtknumerableicon.c:653
+#: ../gtk/gtknumerableicon.c:654
 msgid "The count of the emblem currently displayed"
 msgstr "目�顯示的圖章計數"
 
-#: ../gtk/gtknumerableicon.c:659
+#: ../gtk/gtknumerableicon.c:660
 msgid "Icon's label"
 msgstr "圖示標籤"
 
-#: ../gtk/gtknumerableicon.c:660
+#: ../gtk/gtknumerableicon.c:661
 msgid "The label to be displayed over the icon"
 msgstr "顯示於圖示的標籤"
 
-#: ../gtk/gtknumerableicon.c:666
+#: ../gtk/gtknumerableicon.c:667
 msgid "Icon's style context"
 msgstr "圖示的樣��項"
 
-#: ../gtk/gtknumerableicon.c:667
+#: ../gtk/gtknumerableicon.c:668
 msgid "The style context to theme the icon appearance"
 msgstr "用來布置圖示外觀的樣��項"
 
-#: ../gtk/gtknumerableicon.c:673
+#: ../gtk/gtknumerableicon.c:674
 msgid "Background icon"
 msgstr "背景圖示"
 
-#: ../gtk/gtknumerableicon.c:674
+#: ../gtk/gtknumerableicon.c:675
 msgid "The icon for the number emblem background"
 msgstr "數字圖章背景的圖示"
 
-#: ../gtk/gtknumerableicon.c:680
+#: ../gtk/gtknumerableicon.c:681
 msgid "Background icon name"
 msgstr "背景圖示�稱"
 
-#: ../gtk/gtknumerableicon.c:681
+#: ../gtk/gtknumerableicon.c:682
 msgid "The icon name for the number emblem background"
 msgstr "數字圖章背景的圖示�稱"
 
-#: ../gtk/gtkorientable.c:63 ../gtk/gtkstatusicon.c:312
+#: ../gtk/gtkorientable.c:63 ../gtk/gtkstatusicon.c:342
 #: ../gtk/gtktrayicon-x11.c:128
 msgid "Orientation"
 msgstr "方�"
@@ -4131,72 +4198,72 @@ msgstr "方�"
 msgid "The orientation of the orientable"
 msgstr "�定�的方�"
 
-#: ../gtk/gtkpaned.c:327
+#: ../gtk/gtkpaned.c:350
 msgid ""
 "Position of paned separator in pixels (0 means all the way to the left/top)"
 msgstr "分隔�的�置，單�為�素（0表示擴展至左/上）"
 
-#: ../gtk/gtkpaned.c:336
+#: ../gtk/gtkpaned.c:359
 msgid "Position Set"
 msgstr "�置設定"
 
-#: ../gtk/gtkpaned.c:337
+#: ../gtk/gtkpaned.c:360
 msgid "TRUE if the Position property should be used"
 msgstr "TRUE 表示應該使用�置屬性"
 
-#: ../gtk/gtkpaned.c:343
+#: ../gtk/gtkpaned.c:366
 msgid "Handle Size"
 msgstr "分隔�尺寸"
 
-#: ../gtk/gtkpaned.c:344
+#: ../gtk/gtkpaned.c:367
 msgid "Width of handle"
 msgstr "分隔�的闊度"
 
-#: ../gtk/gtkpaned.c:360
+#: ../gtk/gtkpaned.c:383
 msgid "Minimal Position"
 msgstr "最��置"
 
-#: ../gtk/gtkpaned.c:361
+#: ../gtk/gtkpaned.c:384
 msgid "Smallest possible value for the \"position\" property"
 msgstr "『�置�屬性的最��能值"
 
-#: ../gtk/gtkpaned.c:378
+#: ../gtk/gtkpaned.c:401
 msgid "Maximal Position"
 msgstr "最大�置"
 
-#: ../gtk/gtkpaned.c:379
+#: ../gtk/gtkpaned.c:402
 msgid "Largest possible value for the \"position\" property"
 msgstr "『�置�屬性的最大�能值"
 
-#: ../gtk/gtkpaned.c:396
+#: ../gtk/gtkpaned.c:419
 msgid "Resize"
 msgstr "�設大�"
 
-#: ../gtk/gtkpaned.c:397
+#: ../gtk/gtkpaned.c:420
 msgid "If TRUE, the child expands and shrinks along with the paned widget"
 msgstr "如設為定為‘TRUE’，�元件將隨分隔元件擴展或縮�"
 
-#: ../gtk/gtkpaned.c:412
+#: ../gtk/gtkpaned.c:435
 msgid "Shrink"
 msgstr "�縮�"
 
-#: ../gtk/gtkpaned.c:413
+#: ../gtk/gtkpaned.c:436
 msgid "If TRUE, the child can be made smaller than its requisition"
 msgstr "如設為定為‘TRUE’，�元件�以比原本指定的大�更�"
 
-#: ../gtk/gtkplug.c:201 ../gtk/gtkstatusicon.c:296
+#: ../gtk/gtkplug.c:203 ../gtk/gtkstatusicon.c:326
 msgid "Embedded"
 msgstr "內嵌的"
 
-#: ../gtk/gtkplug.c:202
+#: ../gtk/gtkplug.c:204
 msgid "Whether the plug is embedded"
 msgstr "此外掛是�為內嵌"
 
-#: ../gtk/gtkplug.c:216
+#: ../gtk/gtkplug.c:218
 msgid "Socket Window"
 msgstr "Socket 視窗"
 
-#: ../gtk/gtkplug.c:217
+#: ../gtk/gtkplug.c:219
 msgid "The window of the socket the plug is embedded in"
 msgstr "此外掛內嵌 socket 的視窗"
 
@@ -4280,11 +4347,19 @@ msgstr "正在接�工作"
 msgid "TRUE if this printer is accepting new jobs"
 msgstr "如果此打�機正在接�新工作則為 TRUE"
 
-#: ../gtk/gtkprinteroptionwidget.c:121
+#: ../gtk/gtkprinteroption.c:105
+msgid "Option Value"
+msgstr "�項數值"
+
+#: ../gtk/gtkprinteroption.c:106
+msgid "Value of the option"
+msgstr "�項的數值"
+
+#: ../gtk/gtkprinteroptionwidget.c:122
 msgid "Source option"
 msgstr "來��項"
 
-#: ../gtk/gtkprinteroptionwidget.c:122
+#: ../gtk/gtkprinteroptionwidget.c:123
 msgid "The PrinterOption backing this widget"
 msgstr "在此視窗元件之後的打�機�項"
 
@@ -4309,7 +4384,7 @@ msgid "Printer settings"
 msgstr "打�機設定值"
 
 #: ../gtk/gtkprintjob.c:168 ../gtk/gtkprintjob.c:169
-#: ../gtk/gtkprintunixdialog.c:298
+#: ../gtk/gtkprintunixdialog.c:368
 msgid "Page Setup"
 msgstr "��設定"
 
@@ -4331,11 +4406,11 @@ msgstr "�設��設定"
 msgid "The GtkPageSetup used by default"
 msgstr "�設使用的 GtkPageSetup"
 
-#: ../gtk/gtkprintoperation.c:1097 ../gtk/gtkprintunixdialog.c:316
+#: ../gtk/gtkprintoperation.c:1097 ../gtk/gtkprintunixdialog.c:386
 msgid "Print Settings"
 msgstr "打�設定值"
 
-#: ../gtk/gtkprintoperation.c:1098 ../gtk/gtkprintunixdialog.c:317
+#: ../gtk/gtkprintoperation.c:1098 ../gtk/gtkprintunixdialog.c:387
 msgid "The GtkPrintSettings used for initializing the dialog"
 msgstr "用來�始化�話盒的 GtkPrintSettings"
 
@@ -4355,11 +4430,11 @@ msgstr "�數"
 msgid "The number of pages in the document."
 msgstr "文件中的�數。"
 
-#: ../gtk/gtkprintoperation.c:1163 ../gtk/gtkprintunixdialog.c:306
+#: ../gtk/gtkprintoperation.c:1163 ../gtk/gtkprintunixdialog.c:376
 msgid "Current Page"
 msgstr "目�的��"
 
-#: ../gtk/gtkprintoperation.c:1164 ../gtk/gtkprintunixdialog.c:307
+#: ../gtk/gtkprintoperation.c:1164 ../gtk/gtkprintunixdialog.c:377
 msgid "The current page in the document"
 msgstr "文件中目�的��"
 
@@ -4431,7 +4506,7 @@ msgstr "自�分�標籤"
 msgid "Label for the tab containing custom widgets."
 msgstr "包�自�視窗元件分�的標籤。"
 
-#: ../gtk/gtkprintoperation.c:1360 ../gtk/gtkprintunixdialog.c:341
+#: ../gtk/gtkprintoperation.c:1360 ../gtk/gtkprintunixdialog.c:411
 msgid "Support Selection"
 msgstr "支授�擇�域"
 
@@ -4439,7 +4514,7 @@ msgstr "支授�擇�域"
 msgid "TRUE if the print operation will support print of selection."
 msgstr "如果打�動作支��擇�域的打�則設定為 TRUE。"
 
-#: ../gtk/gtkprintoperation.c:1377 ../gtk/gtkprintunixdialog.c:349
+#: ../gtk/gtkprintoperation.c:1377 ../gtk/gtkprintunixdialog.c:419
 msgid "Has Selection"
 msgstr "具有�擇�域"
 
@@ -4447,7 +4522,7 @@ msgstr "具有�擇�域"
 msgid "TRUE if a selection exists."
 msgstr "如果�擇�域存在則為 TRUE。"
 
-#: ../gtk/gtkprintoperation.c:1393 ../gtk/gtkprintunixdialog.c:357
+#: ../gtk/gtkprintoperation.c:1393 ../gtk/gtkprintunixdialog.c:427
 msgid "Embed Page Setup"
 msgstr "內嵌��設定"
 
@@ -4463,117 +4538,117 @@ msgstr "�打�的�數"
 msgid "The number of pages that will be printed."
 msgstr "將�打�的�數。"
 
-#: ../gtk/gtkprintunixdialog.c:299
+#: ../gtk/gtkprintunixdialog.c:369
 msgid "The GtkPageSetup to use"
 msgstr "�使用的 GtkPageSetup"
 
-#: ../gtk/gtkprintunixdialog.c:324
+#: ../gtk/gtkprintunixdialog.c:394
 msgid "Selected Printer"
 msgstr "��的打�機"
 
-#: ../gtk/gtkprintunixdialog.c:325
+#: ../gtk/gtkprintunixdialog.c:395
 msgid "The GtkPrinter which is selected"
 msgstr "��的 GtkPrinter"
 
-#: ../gtk/gtkprintunixdialog.c:332
+#: ../gtk/gtkprintunixdialog.c:402
 msgid "Manual Capabilities"
 msgstr "手冊容�"
 
-#: ../gtk/gtkprintunixdialog.c:333
+#: ../gtk/gtkprintunixdialog.c:403
 msgid "Capabilities the application can handle"
 msgstr "應用程��以處�的能力"
 
-#: ../gtk/gtkprintunixdialog.c:342
+#: ../gtk/gtkprintunixdialog.c:412
 msgid "Whether the dialog supports selection"
 msgstr "�話盒是�支��擇�域"
 
-#: ../gtk/gtkprintunixdialog.c:350
+#: ../gtk/gtkprintunixdialog.c:420
 msgid "Whether the application has a selection"
 msgstr "應用程�是�有�擇�域"
 
-#: ../gtk/gtkprintunixdialog.c:358
+#: ../gtk/gtkprintunixdialog.c:428
 msgid "TRUE if page setup combos are embedded in GtkPrintUnixDialog"
 msgstr "如果��設定組�內嵌於 GtkPrintUnixDialog 則設定為 TRUE"
 
-#: ../gtk/gtkprogressbar.c:161
+#: ../gtk/gtkprogressbar.c:160
 msgid "Fraction"
 msgstr "片段"
 
-#: ../gtk/gtkprogressbar.c:162
+#: ../gtk/gtkprogressbar.c:161
 msgid "The fraction of total work that has been completed"
 msgstr "工作已完�的片段"
 
-#: ../gtk/gtkprogressbar.c:169
+#: ../gtk/gtkprogressbar.c:168
 msgid "Pulse Step"
 msgstr "脈動步�"
 
-#: ../gtk/gtkprogressbar.c:170
+#: ../gtk/gtkprogressbar.c:169
 msgid "The fraction of total progress to move the bouncing block when pulsed"
 msgstr "當一次脈動後，來回�塊應移動的比例（以進度列全長為基準）"
 
-#: ../gtk/gtkprogressbar.c:178
+#: ../gtk/gtkprogressbar.c:177
 msgid "Text to be displayed in the progress bar"
 msgstr "進度列中所顯示的文字"
 
-#: ../gtk/gtkprogressbar.c:195
+#: ../gtk/gtkprogressbar.c:198
 msgid "Show text"
 msgstr "顯示文字"
 
-#: ../gtk/gtkprogressbar.c:196
+#: ../gtk/gtkprogressbar.c:199
 msgid "Whether the progress is shown as text."
 msgstr "進度是�以文字方�顯示。"
 
-#: ../gtk/gtkprogressbar.c:218
+#: ../gtk/gtkprogressbar.c:221
 msgid ""
 "The preferred place to ellipsize the string, if the progress bar does not "
 "have enough room to display the entire string, if at all."
 msgstr "如果進度列沒有足夠的空間顯示整個字串時，用來簡化該字串的空間。"
 
-#: ../gtk/gtkprogressbar.c:225
+#: ../gtk/gtkprogressbar.c:228
 msgid "X spacing"
 msgstr "X é–“è·�"
 
-#: ../gtk/gtkprogressbar.c:226
+#: ../gtk/gtkprogressbar.c:229
 msgid "Extra spacing applied to the width of a progress bar."
 msgstr "套用於進度列闊度的�外空間。"
 
-#: ../gtk/gtkprogressbar.c:231
+#: ../gtk/gtkprogressbar.c:234
 msgid "Y spacing"
 msgstr "Y é–“è·�"
 
-#: ../gtk/gtkprogressbar.c:232
+#: ../gtk/gtkprogressbar.c:235
 msgid "Extra spacing applied to the height of a progress bar."
 msgstr "套用於進度列高度的�外空間。"
 
-#: ../gtk/gtkprogressbar.c:245
+#: ../gtk/gtkprogressbar.c:248
 msgid "Minimum horizontal bar width"
 msgstr "最�水平列闊度"
 
-#: ../gtk/gtkprogressbar.c:246
+#: ../gtk/gtkprogressbar.c:249
 msgid "The minimum horizontal width of the progress bar"
 msgstr "進度列的最�水平闊度"
 
-#: ../gtk/gtkprogressbar.c:258
+#: ../gtk/gtkprogressbar.c:261
 msgid "Minimum horizontal bar height"
 msgstr "最�水平列高度"
 
-#: ../gtk/gtkprogressbar.c:259
+#: ../gtk/gtkprogressbar.c:262
 msgid "Minimum horizontal height of the progress bar"
 msgstr "進度列的最�水平高度"
 
-#: ../gtk/gtkprogressbar.c:271
+#: ../gtk/gtkprogressbar.c:274
 msgid "Minimum vertical bar width"
 msgstr "最�垂直列闊度"
 
-#: ../gtk/gtkprogressbar.c:272
+#: ../gtk/gtkprogressbar.c:275
 msgid "The minimum vertical width of the progress bar"
 msgstr "進度列的最�垂直闊度"
 
-#: ../gtk/gtkprogressbar.c:284
+#: ../gtk/gtkprogressbar.c:287
 msgid "Minimum vertical bar height"
 msgstr "最�垂直列高度"
 
-#: ../gtk/gtkprogressbar.c:285
+#: ../gtk/gtkprogressbar.c:288
 msgid "The minimum vertical height of the progress bar"
 msgstr "進度列的最�垂直高度"
 
@@ -4587,8 +4662,8 @@ msgid ""
 "is the current action of its group."
 msgstr "當此指令是該羣組的目�指令時，gtk_radio_action_get_current_value() 所傳回值"
 
-#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:163
-#: ../gtk/gtkradiomenuitem.c:374 ../gtk/gtkradiotoolbutton.c:65
+#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiomenuitem.c:426 ../gtk/gtkradiotoolbutton.c:85
 msgid "Group"
 msgstr "羣組"
 
@@ -4606,143 +4681,143 @@ msgid ""
 "action belongs."
 msgstr "這個動作所屬羣組目�使用�員的數值屬性。"
 
-#: ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiobutton.c:165
 msgid "The radio button whose group this widget belongs to."
 msgstr "此元件所屬的單�按鈕羣組。"
 
-#: ../gtk/gtkradiomenuitem.c:375
+#: ../gtk/gtkradiomenuitem.c:427
 msgid "The radio menu item whose group this widget belongs to."
 msgstr "此元件所屬的單��單羣組。"
 
-#: ../gtk/gtkradiotoolbutton.c:66
+#: ../gtk/gtkradiotoolbutton.c:86
 msgid "The radio tool button whose group this button belongs to."
 msgstr "此按鈕所屬的單�工具按鈕羣組。"
 
-#: ../gtk/gtkrange.c:417
+#: ../gtk/gtkrange.c:419
 msgid "The GtkAdjustment that contains the current value of this range object"
 msgstr "�有這個範�物件�在數值的 GtkAdjustment"
 
-#: ../gtk/gtkrange.c:425
+#: ../gtk/gtkrange.c:427
 msgid "Invert direction slider moves to increase range value"
 msgstr "�動�以相�的方�來增加範�數值"
 
-#: ../gtk/gtkrange.c:432
+#: ../gtk/gtkrange.c:434
 msgid "Lower stepper sensitivity"
 msgstr "較低�指示器�感度"
 
-#: ../gtk/gtkrange.c:433
+#: ../gtk/gtkrange.c:435
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's lower "
 "side"
 msgstr "指�調整鈕較低�的指示器�感度原則"
 
-#: ../gtk/gtkrange.c:441
+#: ../gtk/gtkrange.c:443
 msgid "Upper stepper sensitivity"
 msgstr "較高�指示器�感度"
 
-#: ../gtk/gtkrange.c:442
+#: ../gtk/gtkrange.c:444
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's upper "
 "side"
 msgstr "指�調整鈕較高�的指示器�感度原則"
 
-#: ../gtk/gtkrange.c:459
+#: ../gtk/gtkrange.c:461
 msgid "Show Fill Level"
 msgstr "顯示填充等級"
 
-#: ../gtk/gtkrange.c:460
+#: ../gtk/gtkrange.c:462
 msgid "Whether to display a fill level indicator graphics on trough."
 msgstr "是�在滑軌上顯示填充等級指示器。"
 
-#: ../gtk/gtkrange.c:476
+#: ../gtk/gtkrange.c:478
 msgid "Restrict to Fill Level"
 msgstr "�制的填充等級"
 
-#: ../gtk/gtkrange.c:477
+#: ../gtk/gtkrange.c:479
 msgid "Whether to restrict the upper boundary to the fill level."
 msgstr "是��制填充等級的上�。"
 
-#: ../gtk/gtkrange.c:492
+#: ../gtk/gtkrange.c:494
 msgid "Fill Level"
 msgstr "填充等級"
 
-#: ../gtk/gtkrange.c:493
+#: ../gtk/gtkrange.c:495
 msgid "The fill level."
 msgstr "填充等級"
 
-#: ../gtk/gtkrange.c:510
+#: ../gtk/gtkrange.c:512
 msgid "Round Digits"
 msgstr "四�五入�數"
 
-#: ../gtk/gtkrange.c:511
+#: ../gtk/gtkrange.c:513
 msgid "The number of digits to round the value to."
 msgstr "數值��四�五入的�數。"
 
-#: ../gtk/gtkrange.c:519 ../gtk/gtkswitch.c:836
+#: ../gtk/gtkrange.c:521 ../gtk/gtkswitch.c:817
 msgid "Slider Width"
 msgstr "�動�闊度"
 
-#: ../gtk/gtkrange.c:520
+#: ../gtk/gtkrange.c:522
 msgid "Width of scrollbar or scale thumb"
 msgstr "�動列或等比縮放指標的闊度"
 
-#: ../gtk/gtkrange.c:527
+#: ../gtk/gtkrange.c:529
 msgid "Trough Border"
 msgstr "�槽邊緣"
 
-#: ../gtk/gtkrange.c:528
+#: ../gtk/gtkrange.c:530
 msgid "Spacing between thumb/steppers and outer trough bevel"
 msgstr "指標/指示器按鈕與邊界外緣之間的空間"
 
-#: ../gtk/gtkrange.c:535
+#: ../gtk/gtkrange.c:537
 msgid "Stepper Size"
 msgstr "指示器按鈕尺寸"
 
-#: ../gtk/gtkrange.c:536
+#: ../gtk/gtkrange.c:538
 msgid "Length of step buttons at ends"
 msgstr "步�按鈕�一端的長度"
 
-#: ../gtk/gtkrange.c:549
+#: ../gtk/gtkrange.c:551
 msgid "Stepper Spacing"
 msgstr "指示器按鈕間隔"
 
-#: ../gtk/gtkrange.c:550
+#: ../gtk/gtkrange.c:552
 msgid "Spacing between step buttons and thumb"
 msgstr "步�按鈕以�指標之間的間隔"
 
-#: ../gtk/gtkrange.c:557
+#: ../gtk/gtkrange.c:559
 msgid "Arrow X Displacement"
 msgstr "箭頭水平�離"
 
-#: ../gtk/gtkrange.c:558
+#: ../gtk/gtkrange.c:560
 msgid ""
 "How far in the x direction to move the arrow when the button is depressed"
 msgstr "當按鈕按下時�在水平方�移動多�的�離"
 
-#: ../gtk/gtkrange.c:565
+#: ../gtk/gtkrange.c:567
 msgid "Arrow Y Displacement"
 msgstr "箭頭垂直�離"
 
-#: ../gtk/gtkrange.c:566
+#: ../gtk/gtkrange.c:568
 msgid ""
 "How far in the y direction to move the arrow when the button is depressed"
 msgstr "當按鈕按下時�在垂直方�移動多�的�離"
 
-#: ../gtk/gtkrange.c:582
+#: ../gtk/gtkrange.c:584
 msgid "Trough Under Steppers"
 msgstr "指示器下滑軌"
 
-#: ../gtk/gtkrange.c:583
+#: ../gtk/gtkrange.c:585
 msgid ""
 "Whether to draw trough for full length of range or exclude the steppers and "
 "spacing"
 msgstr "是�繪出完整長度的滑軌或是去除指示器和間�"
 
-#: ../gtk/gtkrange.c:596
+#: ../gtk/gtkrange.c:598
 msgid "Arrow scaling"
 msgstr "箭頭縮放"
 
-#: ../gtk/gtkrange.c:597
+#: ../gtk/gtkrange.c:599
 msgid "Arrow scaling with regard to scroll button size"
 msgstr "根據�動軸大�縮放箭頭"
 
@@ -4834,92 +4909,92 @@ msgstr "用來儲存和讀�清單的檔案完整路徑"
 msgid "The size of the recently used resources list"
 msgstr "目�使用的資�清單大�"
 
-#: ../gtk/gtkscalebutton.c:218
+#: ../gtk/gtkscalebutton.c:219
 msgid "The value of the scale"
 msgstr "縮放的數值"
 
-#: ../gtk/gtkscalebutton.c:228
+#: ../gtk/gtkscalebutton.c:229
 msgid "The icon size"
 msgstr "圖示大�"
 
-#: ../gtk/gtkscalebutton.c:237
+#: ../gtk/gtkscalebutton.c:238
 msgid ""
 "The GtkAdjustment that contains the current value of this scale button object"
 msgstr "�有這個縮放按鈕物件�在數值的 GtkAdjustment"
 
-#: ../gtk/gtkscalebutton.c:265
+#: ../gtk/gtkscalebutton.c:266
 msgid "Icons"
 msgstr "圖示"
 
-#: ../gtk/gtkscalebutton.c:266
+#: ../gtk/gtkscalebutton.c:267
 msgid "List of icon names"
 msgstr "圖示�稱清單"
 
-#: ../gtk/gtkscale.c:253
+#: ../gtk/gtkscale.c:255
 msgid "The number of decimal places that are displayed in the value"
 msgstr "此數值所顯示的�進��數"
 
-#: ../gtk/gtkscale.c:262
+#: ../gtk/gtkscale.c:264
 msgid "Draw Value"
 msgstr "繪製數值"
 
-#: ../gtk/gtkscale.c:263
+#: ../gtk/gtkscale.c:265
 msgid "Whether the current value is displayed as a string next to the slider"
 msgstr "是�目�數值�以字串方�顯示在�動��邊"
 
-#: ../gtk/gtkscale.c:270
+#: ../gtk/gtkscale.c:272
 msgid "Value Position"
 msgstr "數值�置"
 
-#: ../gtk/gtkscale.c:271
+#: ../gtk/gtkscale.c:273
 msgid "The position in which the current value is displayed"
 msgstr "目�數值所顯示的�置"
 
-#: ../gtk/gtkscale.c:278
+#: ../gtk/gtkscale.c:280
 msgid "Slider Length"
 msgstr "�動�長度"
 
-#: ../gtk/gtkscale.c:279
+#: ../gtk/gtkscale.c:281
 msgid "Length of scale's slider"
 msgstr "縮放尺��動�長度"
 
-#: ../gtk/gtkscale.c:287
+#: ../gtk/gtkscale.c:289
 msgid "Value spacing"
 msgstr "數值�離"
 
-#: ../gtk/gtkscale.c:288
+#: ../gtk/gtkscale.c:290
 msgid "Space between value text and the slider/trough area"
 msgstr "數值文字與滑動鈕/�槽�域間的間隔"
 
-#: ../gtk/gtkscrollable.c:86
+#: ../gtk/gtkscrollable.c:94
 msgid "Horizontal adjustment"
 msgstr "水平調整"
 
-#: ../gtk/gtkscrollable.c:87
+#: ../gtk/gtkscrollable.c:95
 msgid ""
 "Horizontal adjustment that is shared between the scrollable widget and its "
 "controller"
 msgstr "分享於��動視窗元件與它的控制器間的水平調整"
 
-#: ../gtk/gtkscrollable.c:103
+#: ../gtk/gtkscrollable.c:111
 msgid "Vertical adjustment"
 msgstr "垂直調整"
 
-#: ../gtk/gtkscrollable.c:104
+#: ../gtk/gtkscrollable.c:112
 msgid ""
 "Vertical adjustment that is shared between the scrollable widget and its "
 "controller"
 msgstr "分享於��動視窗元件與它的控制器間的垂直調整"
 
-#: ../gtk/gtkscrollable.c:120
+#: ../gtk/gtkscrollable.c:128
 msgid "Horizontal Scrollable Policy"
 msgstr "水平�動原則"
 
-#: ../gtk/gtkscrollable.c:121 ../gtk/gtkscrollable.c:137
+#: ../gtk/gtkscrollable.c:129 ../gtk/gtkscrollable.c:145
 msgid "How the size of the content should be determined"
 msgstr "內容的大��如何決定"
 
-#: ../gtk/gtkscrollable.c:136
+#: ../gtk/gtkscrollable.c:144
 msgid "Vertical Scrollable Policy"
 msgstr "垂直�動原則"
 
@@ -5507,239 +5582,249 @@ msgid ""
 "presses the mnemonic activator."
 msgstr "當按下記憶符啟動�時是��自動顯示或隱�記憶符。"
 
-#: ../gtk/gtksettings.c:1136
+#: ../gtk/gtksettings.c:1127
+msgid "Visible Focus"
+msgstr "顯示焦點"
+
+#: ../gtk/gtksettings.c:1128
+msgid ""
+"Whether 'focus rectangles' should be hidden until the user starts to use the "
+"keyboard."
+msgstr "「焦點方塊�在使用者開始使用�盤之�是�應隱�。"
+
+#: ../gtk/gtksettings.c:1154
 msgid "Application prefers a dark theme"
 msgstr "應用程��好暗色主題"
 
-#: ../gtk/gtksettings.c:1137
+#: ../gtk/gtksettings.c:1155
 msgid "Whether the application prefers to have a dark theme."
 msgstr "應用程�是��好暗色系布景主題。"
 
-#: ../gtk/gtksettings.c:1152
+#: ../gtk/gtksettings.c:1170
 msgid "Show button images"
 msgstr "顯示按鈕圖示"
 
-#: ../gtk/gtksettings.c:1153
+#: ../gtk/gtksettings.c:1171
 msgid "Whether images should be shown on buttons"
 msgstr "是�在按鈕中顯示圖片"
 
-#: ../gtk/gtksettings.c:1161 ../gtk/gtksettings.c:1255
+#: ../gtk/gtksettings.c:1179 ../gtk/gtksettings.c:1273
 msgid "Select on focus"
 msgstr "�焦時��"
 
-#: ../gtk/gtksettings.c:1162
+#: ../gtk/gtksettings.c:1180
 msgid "Whether to select the contents of an entry when it is focused"
 msgstr "當輸入元件�得焦點時，其內容是�呈�被��狀態"
 
-#: ../gtk/gtksettings.c:1179
+#: ../gtk/gtksettings.c:1197
 msgid "Password Hint Timeout"
 msgstr "密碼�示逾時時間"
 
-#: ../gtk/gtksettings.c:1180
+#: ../gtk/gtksettings.c:1198
 msgid "How long to show the last input character in hidden entries"
 msgstr "等待多久�顯示隱�項目中最後輸入的字符"
 
-#: ../gtk/gtksettings.c:1189
+#: ../gtk/gtksettings.c:1207
 msgid "Show menu images"
 msgstr "顯示�單圖示"
 
-#: ../gtk/gtksettings.c:1190
+#: ../gtk/gtksettings.c:1208
 msgid "Whether images should be shown in menus"
 msgstr "應�在�單項目中顯示圖示"
 
-#: ../gtk/gtksettings.c:1198
+#: ../gtk/gtksettings.c:1216
 msgid "Delay before drop down menus appear"
 msgstr "下拉�單出��的延�時間"
 
-#: ../gtk/gtksettings.c:1199
+#: ../gtk/gtksettings.c:1217
 msgid "Delay before the submenus of a menu bar appear"
 msgstr "�單列的��單出��的延�時間"
 
-#: ../gtk/gtksettings.c:1216
+#: ../gtk/gtksettings.c:1234
 msgid "Scrolled Window Placement"
 msgstr "�動列視窗放置"
 
-#: ../gtk/gtksettings.c:1217
+#: ../gtk/gtksettings.c:1235
 msgid ""
 "Where the contents of scrolled windows are located with respect to the "
 "scrollbars, if not overridden by the scrolled window's own placement."
 msgstr "若沒有設定�動列視窗自己的放置�置，�動列視窗的內容�置於相應於�動列哪個�置。"
 
-#: ../gtk/gtksettings.c:1226
+#: ../gtk/gtksettings.c:1244
 msgid "Can change accelerators"
 msgstr "�更改�徑�"
 
-#: ../gtk/gtksettings.c:1227
+#: ../gtk/gtksettings.c:1245
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr "是��在�單項目上按�來更改快��"
 
-#: ../gtk/gtksettings.c:1235
+#: ../gtk/gtksettings.c:1253
 msgid "Delay before submenus appear"
 msgstr "顯示��單�的延�時間"
 
-#: ../gtk/gtksettings.c:1236
+#: ../gtk/gtksettings.c:1254
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr "在�單項目上顯示��單所需的游標�滯最�時間"
 
-#: ../gtk/gtksettings.c:1245
+#: ../gtk/gtksettings.c:1263
 msgid "Delay before hiding a submenu"
 msgstr "隱���單�的延�時間"
 
-#: ../gtk/gtksettings.c:1246
+#: ../gtk/gtksettings.c:1264
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
 msgstr "游標移���單���單的顯示時間，超�則隱���單"
 
-#: ../gtk/gtksettings.c:1256
+#: ../gtk/gtksettings.c:1274
 msgid "Whether to select the contents of a selectable label when it is focused"
 msgstr "當��擇標籤�得焦點時，其內容是�呈�被��狀態"
 
-#: ../gtk/gtksettings.c:1264
+#: ../gtk/gtksettings.c:1282
 msgid "Custom palette"
 msgstr "自�色盤"
 
-#: ../gtk/gtksettings.c:1265
+#: ../gtk/gtksettings.c:1283
 msgid "Palette to use in the color selector"
 msgstr "�色�擇程�使用的色盤"
 
-#: ../gtk/gtksettings.c:1273
+#: ../gtk/gtksettings.c:1291
 msgid "IM Preedit style"
 msgstr "輸入法 Preedit 樣�"
 
-#: ../gtk/gtksettings.c:1274
+#: ../gtk/gtksettings.c:1292
 msgid "How to draw the input method preedit string"
 msgstr "如何顯示輸入法 preedit 字串"
 
-#: ../gtk/gtksettings.c:1283
+#: ../gtk/gtksettings.c:1301
 msgid "IM Status style"
 msgstr "輸入法狀態的�樣"
 
-#: ../gtk/gtksettings.c:1284
+#: ../gtk/gtksettings.c:1302
 msgid "How to draw the input method statusbar"
 msgstr "如何顯示輸入法的狀態列"
 
-#: ../gtk/gtksizegroup.c:301 ../gtk/gtktreeselection.c:130
+#: ../gtk/gtksizegroup.c:382 ../gtk/gtktreeselection.c:130
 msgid "Mode"
 msgstr "模�"
 
-#: ../gtk/gtksizegroup.c:302
+#: ../gtk/gtksizegroup.c:383
 msgid ""
 "The directions in which the size group affects the requested sizes of its "
 "component widgets"
 msgstr "大�羣組影響元件所�求大�的方�"
 
-#: ../gtk/gtksizegroup.c:318
+#: ../gtk/gtksizegroup.c:399
 msgid "Ignore hidden"
 msgstr "忽略隱�"
 
-#: ../gtk/gtksizegroup.c:319
+#: ../gtk/gtksizegroup.c:400
 msgid ""
 "If TRUE, unmapped widgets are ignored when determining the size of the group"
 msgstr "如設為定為‘TRUE’，當決定羣組的大�時會忽略未�應的元件"
 
-#: ../gtk/gtkspinbutton.c:328
+#: ../gtk/gtkspinbutton.c:331
 msgid "Climb Rate"
 msgstr "數值調整速度"
 
-#: ../gtk/gtkspinbutton.c:348
+#: ../gtk/gtkspinbutton.c:351
 msgid "Snap to Ticks"
 msgstr "校正數值"
 
-#: ../gtk/gtkspinbutton.c:349
+#: ../gtk/gtkspinbutton.c:352
 msgid ""
 "Whether erroneous values are automatically changed to a spin button's "
 "nearest step increment"
 msgstr "當微調按鈕內的數值�正確時，是�自動更�為最接近的正確數值"
 
-#: ../gtk/gtkspinbutton.c:356
+#: ../gtk/gtkspinbutton.c:359
 msgid "Numeric"
 msgstr "數字"
 
-#: ../gtk/gtkspinbutton.c:357
+#: ../gtk/gtkspinbutton.c:360
 msgid "Whether non-numeric characters should be ignored"
 msgstr "是�忽略�數字的字符"
 
-#: ../gtk/gtkspinbutton.c:364
+#: ../gtk/gtkspinbutton.c:367
 msgid "Wrap"
 msgstr "�行"
 
-#: ../gtk/gtkspinbutton.c:365
+#: ../gtk/gtkspinbutton.c:368
 msgid "Whether a spin button should wrap upon reaching its limits"
 msgstr "當到�界�時微調按鈕是��行"
 
-#: ../gtk/gtkspinbutton.c:372
+#: ../gtk/gtkspinbutton.c:375
 msgid "Update Policy"
 msgstr "更新方�"
 
-#: ../gtk/gtkspinbutton.c:373
+#: ../gtk/gtkspinbutton.c:376
 msgid ""
 "Whether the spin button should update always, or only when the value is legal"
 msgstr "微調按鈕應該任何時候都更新，還是�有輸入的數值�法時�會更新"
 
-#: ../gtk/gtkspinbutton.c:382
+#: ../gtk/gtkspinbutton.c:385
 msgid "Reads the current value, or sets a new value"
 msgstr "讀�目�的數值，或是設定新的數值"
 
-#: ../gtk/gtkspinbutton.c:391
+#: ../gtk/gtkspinbutton.c:394
 msgid "Style of bevel around the spin button"
 msgstr "微調按鈕周�的邊界樣�"
 
-#: ../gtk/gtkspinner.c:119
+#: ../gtk/gtkspinner.c:116
 msgid "Whether the spinner is active"
 msgstr "轉輪是�在使用中"
 
-#: ../gtk/gtkstatusbar.c:181
+#: ../gtk/gtkstatusbar.c:183
 msgid "Style of bevel around the statusbar text"
 msgstr "狀態列文字周�的邊界樣�"
 
-#: ../gtk/gtkstatusicon.c:263
+#: ../gtk/gtkstatusicon.c:293
 msgid "The size of the icon"
 msgstr "圖示大�"
 
-#: ../gtk/gtkstatusicon.c:273
+#: ../gtk/gtkstatusicon.c:303
 msgid "The screen where this status icon will be displayed"
 msgstr "這個狀態圖示將顯示的螢幕"
 
-#: ../gtk/gtkstatusicon.c:281
+#: ../gtk/gtkstatusicon.c:311
 msgid "Whether the status icon is visible"
 msgstr "狀態圖示是�顯示"
 
-#: ../gtk/gtkstatusicon.c:297
+#: ../gtk/gtkstatusicon.c:327
 msgid "Whether the status icon is embedded"
 msgstr "狀態圖示是�為內嵌"
 
-#: ../gtk/gtkstatusicon.c:313 ../gtk/gtktrayicon-x11.c:129
+#: ../gtk/gtkstatusicon.c:343 ../gtk/gtktrayicon-x11.c:129
 msgid "The orientation of the tray"
 msgstr "系統匣的方�"
 
-#: ../gtk/gtkstatusicon.c:340 ../gtk/gtkwidget.c:1072
+#: ../gtk/gtkstatusicon.c:370 ../gtk/gtkwidget.c:1091
 msgid "Has tooltip"
 msgstr "具有工具�示"
 
-#: ../gtk/gtkstatusicon.c:341
+#: ../gtk/gtkstatusicon.c:371
 msgid "Whether this tray icon has a tooltip"
 msgstr "此系統匣圖示是�具有工具�示"
 
-#: ../gtk/gtkstatusicon.c:366 ../gtk/gtkwidget.c:1093
+#: ../gtk/gtkstatusicon.c:396 ../gtk/gtkwidget.c:1112
 msgid "Tooltip Text"
 msgstr "工具�示文字"
 
-#: ../gtk/gtkstatusicon.c:367 ../gtk/gtkwidget.c:1094 ../gtk/gtkwidget.c:1115
+#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1113 ../gtk/gtkwidget.c:1134
 msgid "The contents of the tooltip for this widget"
 msgstr "此視窗元件工具�示的內容"
 
-#: ../gtk/gtkstatusicon.c:390 ../gtk/gtkwidget.c:1114
+#: ../gtk/gtkstatusicon.c:420 ../gtk/gtkwidget.c:1133
 msgid "Tooltip markup"
 msgstr "工具�示標記"
 
-#: ../gtk/gtkstatusicon.c:391
+#: ../gtk/gtkstatusicon.c:421
 msgid "The contents of the tooltip for this tray icon"
 msgstr "此系統匣圖示工具�示的內容"
 
-#: ../gtk/gtkstatusicon.c:409
+#: ../gtk/gtkstatusicon.c:439
 msgid "The title of this tray icon"
 msgstr "此系統匣圖示的標題"
 
@@ -5751,479 +5836,487 @@ msgstr "樣��項"
 msgid "GtkStyleContext to get style from"
 msgstr "��得樣�的 GtkStyleContext"
 
-#: ../gtk/gtkstylecontext.c:547
+#: ../gtk/gtkstylecontext.c:433
 msgid "The associated GdkScreen"
 msgstr "已關�的 GdkScreen"
 
-#: ../gtk/gtkstylecontext.c:553
+#: ../gtk/gtkstylecontext.c:439
 msgid "Direction"
 msgstr "方�"
 
-#: ../gtk/gtkstylecontext.c:554 ../gtk/gtktexttag.c:236
+#: ../gtk/gtkstylecontext.c:440 ../gtk/gtktexttag.c:269
 msgid "Text direction"
 msgstr "文字方�"
 
-#: ../gtk/gtkswitch.c:802
+#: ../gtk/gtkswitch.c:784
 msgid "Whether the switch is on or off"
 msgstr "此開關是開啟或關閉"
 
-#: ../gtk/gtkswitch.c:837
+#: ../gtk/gtkswitch.c:818
 msgid "The minimum width of the handle"
 msgstr "控制項的最�闊度"
 
-#: ../gtk/gtktable.c:157
+#: ../gtk/gtktable.c:191
 msgid "Rows"
 msgstr "列數"
 
-#: ../gtk/gtktable.c:158
+#: ../gtk/gtktable.c:192
 msgid "The number of rows in the table"
 msgstr "表格的列數"
 
-#: ../gtk/gtktable.c:166
+#: ../gtk/gtktable.c:200
 msgid "Columns"
 msgstr "行數"
 
-#: ../gtk/gtktable.c:167
+#: ../gtk/gtktable.c:201
 msgid "The number of columns in the table"
 msgstr "表格的行數"
 
-#: ../gtk/gtktable.c:194
+#: ../gtk/gtktable.c:228
 msgid "If TRUE, the table cells are all the same width/height"
 msgstr "如設為定為‘TRUE’，表示表格中所有儲存格尺寸都一樣"
 
-#: ../gtk/gtktable.c:208
+#: ../gtk/gtktable.c:242
 msgid "Right attachment"
 msgstr "��附加"
 
-#: ../gtk/gtktable.c:209
+#: ../gtk/gtktable.c:243
 msgid "The column number to attach the right side of a child widget to"
 msgstr "附加�元件��於其上的縱列格數"
 
-#: ../gtk/gtktable.c:216
+#: ../gtk/gtktable.c:250
 msgid "The row number to attach the top of a child widget to"
 msgstr "附加�元件於其頂端的列數"
 
-#: ../gtk/gtktable.c:222
+#: ../gtk/gtktable.c:256
 msgid "Bottom attachment"
 msgstr "底部附加"
 
-#: ../gtk/gtktable.c:229
+#: ../gtk/gtktable.c:263
 msgid "Horizontal options"
 msgstr "水平�項"
 
-#: ../gtk/gtktable.c:230
+#: ../gtk/gtktable.c:264
 msgid "Options specifying the horizontal behaviour of the child"
 msgstr "指定�元件水平行為的�項"
 
-#: ../gtk/gtktable.c:236
+#: ../gtk/gtktable.c:270
 msgid "Vertical options"
 msgstr "垂直�項"
 
-#: ../gtk/gtktable.c:237
+#: ../gtk/gtktable.c:271
 msgid "Options specifying the vertical behaviour of the child"
 msgstr "指定�元件垂直行為的�項"
 
-#: ../gtk/gtktable.c:243
+#: ../gtk/gtktable.c:277
 msgid "Horizontal padding"
 msgstr "水平留邊"
 
-#: ../gtk/gtktable.c:244
+#: ../gtk/gtktable.c:278
 msgid ""
 "Extra space to put between the child and its left and right neighbors, in "
 "pixels"
 msgstr "副元件與鄰接左�的元件之間的�外空�，以�素表示"
 
-#: ../gtk/gtktable.c:250
+#: ../gtk/gtktable.c:284
 msgid "Vertical padding"
 msgstr "垂直留邊"
 
-#: ../gtk/gtktable.c:251
+#: ../gtk/gtktable.c:285
 msgid ""
 "Extra space to put between the child and its upper and lower neighbors, in "
 "pixels"
 msgstr "副元件與鄰接上下的元件之間的�外空�，以�素表示"
 
-#: ../gtk/gtktextbuffer.c:192
+#: ../gtk/gtktextbuffer.c:203
 msgid "Tag Table"
 msgstr "標記表格"
 
-#: ../gtk/gtktextbuffer.c:193
+#: ../gtk/gtktextbuffer.c:204
 msgid "Text Tag Table"
 msgstr "文字標記表格"
 
-#: ../gtk/gtktextbuffer.c:211
+#: ../gtk/gtktextbuffer.c:222
 msgid "Current text of the buffer"
 msgstr "緩��目�的文字"
 
-#: ../gtk/gtktextbuffer.c:225
+#: ../gtk/gtktextbuffer.c:236
 msgid "Has selection"
 msgstr "具有�定的範�"
 
-#: ../gtk/gtktextbuffer.c:226
+#: ../gtk/gtktextbuffer.c:237
 msgid "Whether the buffer has some text currently selected"
 msgstr "緩��目�是�有�些文字被��"
 
-#: ../gtk/gtktextbuffer.c:242
+#: ../gtk/gtktextbuffer.c:253
 msgid "Cursor position"
 msgstr "游標�置"
 
-#: ../gtk/gtktextbuffer.c:243
+#: ../gtk/gtktextbuffer.c:254
 msgid ""
 "The position of the insert mark (as offset from the beginning of the buffer)"
 msgstr "�入標記的�置（從緩��開始的�移）"
 
-#: ../gtk/gtktextbuffer.c:258
+#: ../gtk/gtktextbuffer.c:269
 msgid "Copy target list"
 msgstr "複製目標清單"
 
-#: ../gtk/gtktextbuffer.c:259
+#: ../gtk/gtktextbuffer.c:270
 msgid ""
 "The list of targets this buffer supports for clipboard copying and DND source"
 msgstr "這個緩��支�剪貼簿複製與拖放(DND)來�的目標清單"
 
-#: ../gtk/gtktextbuffer.c:274
+#: ../gtk/gtktextbuffer.c:285
 msgid "Paste target list"
 msgstr "�貼上的目標清單"
 
-#: ../gtk/gtktextbuffer.c:275
+#: ../gtk/gtktextbuffer.c:286
 msgid ""
 "The list of targets this buffer supports for clipboard pasting and DND "
 "destination"
 msgstr "這個緩��支�剪貼簿貼上與拖放(DND)目的端的目標清單"
 
-#: ../gtk/gtktextmark.c:90
+#: ../gtk/gtktextmark.c:127
 msgid "Mark name"
 msgstr "標記�稱"
 
-#: ../gtk/gtktextmark.c:97
+#: ../gtk/gtktextmark.c:134
 msgid "Left gravity"
 msgstr "由�至左"
 
-#: ../gtk/gtktextmark.c:98
+#: ../gtk/gtktextmark.c:135
 msgid "Whether the mark has left gravity"
 msgstr "此標記是�為由�至左"
 
-#: ../gtk/gtktexttag.c:186
+#: ../gtk/gtktexttag.c:189
 msgid "Tag name"
 msgstr "標記�稱"
 
-#: ../gtk/gtktexttag.c:187
+#: ../gtk/gtktexttag.c:190
 msgid "Name used to refer to the text tag. NULL for anonymous tags"
 msgstr "文字標記的代表�稱。NULL 為匿�標記"
 
-#: ../gtk/gtktexttag.c:205
-msgid "Background color as a (possibly unallocated) GdkColor"
-msgstr "以 GdkColor 方�表�（�能�未�置）的背景�色"
+#: ../gtk/gtktexttag.c:222
+msgid "Background RGBA"
+msgstr "背景 RGBA"
 
-#: ../gtk/gtktexttag.c:212
+#: ../gtk/gtktexttag.c:230
 msgid "Background full height"
 msgstr "背景填滿高度"
 
-#: ../gtk/gtktexttag.c:213
+#: ../gtk/gtktexttag.c:231
 msgid ""
 "Whether the background color fills the entire line height or only the height "
 "of the tagged characters"
 msgstr "是�背景�色填滿整行行高，或者僅止於那些被標記的字符的高度"
 
-#: ../gtk/gtktexttag.c:229
-msgid "Foreground color as a (possibly unallocated) GdkColor"
-msgstr "以 GdkColor 方�表� (�能�未�置) 的�景�色"
+#: ../gtk/gtktexttag.c:261
+msgid "Foreground RGBA"
+msgstr "�景 RGBA"
 
-#: ../gtk/gtktexttag.c:237
+#: ../gtk/gtktexttag.c:270
 msgid "Text direction, e.g. right-to-left or left-to-right"
 msgstr "文字方�，例如左至�或�至左"
 
-#: ../gtk/gtktexttag.c:286
+#: ../gtk/gtktexttag.c:319
 msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
 msgstr "以 PangoStyle 方�表示的字型款�，例如 PANGO_STYLE_ITALIC"
 
-#: ../gtk/gtktexttag.c:295
+#: ../gtk/gtktexttag.c:328
 msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
 msgstr "以 PangoVariant 方�表示的字型變化，例如 PANGO_VARIANT_SMALL_CAPS"
 
-#: ../gtk/gtktexttag.c:304
+#: ../gtk/gtktexttag.c:337
 msgid ""
 "Font weight as an integer, see predefined values in PangoWeight; for "
 "example, PANGO_WEIGHT_BOLD"
 msgstr "以數字表示的字型粗幼度，請�考 PangoWeight 中�先定義的數值，例如 PANGO_WEIGHT_BOLD"
 
-#: ../gtk/gtktexttag.c:315
+#: ../gtk/gtktexttag.c:348
 msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
 msgstr "字型根據 PangoStrech 拉長, 例：PANGO_STRETCH_CONDENSED"
 
-#: ../gtk/gtktexttag.c:324
+#: ../gtk/gtktexttag.c:357
 msgid "Font size in Pango units"
 msgstr "以 Pango 單�表示的字型大�"
 
-#: ../gtk/gtktexttag.c:334
+#: ../gtk/gtktexttag.c:367
 msgid ""
 "Font size as a scale factor relative to the default font size. This properly "
 "adapts to theme changes etc. so is recommended. Pango predefines some scales "
 "such as PANGO_SCALE_X_LARGE"
 msgstr "字型大�作為縮放比例，相�於�設文字大�。本屬性隨布景主題等設定而改變，故建議使用。Pango�先定義了�些縮放比，例如 PANGO_SCALE_X_LARGE"
 
-#: ../gtk/gtktexttag.c:354 ../gtk/gtktextview.c:702
+#: ../gtk/gtktexttag.c:387 ../gtk/gtktextview.c:704
 msgid "Left, right, or center justification"
 msgstr "�左���或是置中�齊"
 
-#: ../gtk/gtktexttag.c:373
+#: ../gtk/gtktexttag.c:406
 msgid ""
 "The language this text is in, as an ISO code. Pango can use this as a hint "
 "when rendering the text. If not set, an appropriate default will be used."
 msgstr "該文字所用的語言，以 ISO 代碼表示。Pango 在�繪文字時會使用這個設定作為�示。如果沒有指定，則會自動�擇最�當的值。"
 
-#: ../gtk/gtktexttag.c:380
+#: ../gtk/gtktexttag.c:413
 msgid "Left margin"
 msgstr "左邊邊界"
 
-#: ../gtk/gtktexttag.c:381 ../gtk/gtktextview.c:711
+#: ../gtk/gtktexttag.c:414 ../gtk/gtktextview.c:713
 msgid "Width of the left margin in pixels"
 msgstr "左邊邊界的闊度，以�素數目表示"
 
-#: ../gtk/gtktexttag.c:390
+#: ../gtk/gtktexttag.c:423
 msgid "Right margin"
 msgstr "�邊邊界"
 
-#: ../gtk/gtktexttag.c:391 ../gtk/gtktextview.c:721
+#: ../gtk/gtktexttag.c:424 ../gtk/gtktextview.c:723
 msgid "Width of the right margin in pixels"
 msgstr "�邊邊界的闊度，以�素數目表示"
 
-#: ../gtk/gtktexttag.c:401 ../gtk/gtktextview.c:730
+#: ../gtk/gtktexttag.c:434 ../gtk/gtktextview.c:732
 msgid "Indent"
 msgstr "增加縮排"
 
-#: ../gtk/gtktexttag.c:402 ../gtk/gtktextview.c:731
+#: ../gtk/gtktexttag.c:435 ../gtk/gtktextview.c:733
 msgid "Amount to indent the paragraph, in pixels"
 msgstr "段�縮排的程度，以�素數目表示"
 
-#: ../gtk/gtktexttag.c:413
+#: ../gtk/gtktexttag.c:446
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative) "
 "in Pango units"
 msgstr "文字在基準線以上的�離（負數表示文字在基準線以下），以 Pango 單�表示"
 
-#: ../gtk/gtktexttag.c:422
+#: ../gtk/gtktexttag.c:455
 msgid "Pixels above lines"
 msgstr "段�頂端空間"
 
-#: ../gtk/gtktexttag.c:423 ../gtk/gtktextview.c:655
+#: ../gtk/gtktexttag.c:456 ../gtk/gtktextview.c:657
 msgid "Pixels of blank space above paragraphs"
 msgstr "段�頂端的空間的�素數目"
 
-#: ../gtk/gtktexttag.c:432
+#: ../gtk/gtktexttag.c:465
 msgid "Pixels below lines"
 msgstr "段�底部空間"
 
-#: ../gtk/gtktexttag.c:433 ../gtk/gtktextview.c:665
+#: ../gtk/gtktexttag.c:466 ../gtk/gtktextview.c:667
 msgid "Pixels of blank space below paragraphs"
 msgstr "段�底部的空間的�素數目"
 
-#: ../gtk/gtktexttag.c:442
+#: ../gtk/gtktexttag.c:475
 msgid "Pixels inside wrap"
 msgstr "�行時加上的�素"
 
-#: ../gtk/gtktexttag.c:443 ../gtk/gtktextview.c:675
+#: ../gtk/gtktexttag.c:476 ../gtk/gtktextview.c:677
 msgid "Pixels of blank space between wrapped lines in a paragraph"
 msgstr "段�內部的行�的�素數目"
 
-#: ../gtk/gtktexttag.c:470 ../gtk/gtktextview.c:693
+#: ../gtk/gtktexttag.c:503 ../gtk/gtktextview.c:695
 msgid ""
 "Whether to wrap lines never, at word boundaries, or at character boundaries"
 msgstr "�擇永���行�字詞邊界�行或是字符邊界�行"
 
-#: ../gtk/gtktexttag.c:479 ../gtk/gtktextview.c:740
+#: ../gtk/gtktexttag.c:512 ../gtk/gtktextview.c:742
 msgid "Tabs"
 msgstr "分�"
 
-#: ../gtk/gtktexttag.c:480 ../gtk/gtktextview.c:741
+#: ../gtk/gtktexttag.c:513 ../gtk/gtktextview.c:743
 msgid "Custom tabs for this text"
 msgstr "本文字的自� tab"
 
-#: ../gtk/gtktexttag.c:498
+#: ../gtk/gtktexttag.c:531
 msgid "Invisible"
 msgstr "隱形"
 
-#: ../gtk/gtktexttag.c:499
+#: ../gtk/gtktexttag.c:532
 msgid "Whether this text is hidden."
 msgstr "本文字是�隱�。"
 
-#: ../gtk/gtktexttag.c:513
+#: ../gtk/gtktexttag.c:546
 msgid "Paragraph background color name"
 msgstr "段�背景�色�稱"
 
-#: ../gtk/gtktexttag.c:514
+#: ../gtk/gtktexttag.c:547
 msgid "Paragraph background color as a string"
 msgstr "段�背景�色（以字串表示）"
 
-#: ../gtk/gtktexttag.c:529
+#: ../gtk/gtktexttag.c:561
 msgid "Paragraph background color"
 msgstr "段�背景�色"
 
-#: ../gtk/gtktexttag.c:530
-msgid "Paragraph background color as a (possibly unallocated) GdkColor"
-msgstr "以段�背景�色作為（�能�未�置）GdkColor"
+#: ../gtk/gtktexttag.c:562
+msgid "Paragraph background color as a GdkColor"
+msgstr "以段�背景�色�為 GdkColor"
+
+#: ../gtk/gtktexttag.c:576
+msgid "Paragraph background RGBA"
+msgstr "段�背景 RGBA"
 
-#: ../gtk/gtktexttag.c:548
+#: ../gtk/gtktexttag.c:577
+msgid "Paragraph background RGBA as a GdkRGBA"
+msgstr "以段�背景 RGBA �為 GdkRGBA"
+
+#: ../gtk/gtktexttag.c:595
 msgid "Margin Accumulates"
 msgstr "邊緣累計"
 
-#: ../gtk/gtktexttag.c:549
+#: ../gtk/gtktexttag.c:596
 msgid "Whether left and right margins accumulate."
 msgstr "左��邊緣是�累計。"
 
-#: ../gtk/gtktexttag.c:562
+#: ../gtk/gtktexttag.c:609
 msgid "Background full height set"
 msgstr "背景完整高度設定"
 
-#: ../gtk/gtktexttag.c:563
+#: ../gtk/gtktexttag.c:610
 msgid "Whether this tag affects background height"
 msgstr "此標記��影響背景高度"
 
-#: ../gtk/gtktexttag.c:602
+#: ../gtk/gtktexttag.c:649
 msgid "Justification set"
 msgstr "調整設定"
 
-#: ../gtk/gtktexttag.c:603
+#: ../gtk/gtktexttag.c:650
 msgid "Whether this tag affects paragraph justification"
 msgstr "此標記��影響段�調整"
 
-#: ../gtk/gtktexttag.c:610
+#: ../gtk/gtktexttag.c:657
 msgid "Left margin set"
 msgstr "左邊界設定"
 
-#: ../gtk/gtktexttag.c:611
+#: ../gtk/gtktexttag.c:658
 msgid "Whether this tag affects the left margin"
 msgstr "此標記��影響左邊界"
 
-#: ../gtk/gtktexttag.c:614
+#: ../gtk/gtktexttag.c:661
 msgid "Indent set"
 msgstr "縮排設定"
 
-#: ../gtk/gtktexttag.c:615
+#: ../gtk/gtktexttag.c:662
 msgid "Whether this tag affects indentation"
 msgstr "此標記��影響縮排"
 
-#: ../gtk/gtktexttag.c:622
+#: ../gtk/gtktexttag.c:669
 msgid "Pixels above lines set"
 msgstr "段�頂端空間設定"
 
-#: ../gtk/gtktexttag.c:623 ../gtk/gtktexttag.c:627
+#: ../gtk/gtktexttag.c:670 ../gtk/gtktexttag.c:674
 msgid "Whether this tag affects the number of pixels above lines"
 msgstr "此標記��影響段�頂端空間高度"
 
-#: ../gtk/gtktexttag.c:626
+#: ../gtk/gtktexttag.c:673
 msgid "Pixels below lines set"
 msgstr "段�底端空間設定"
 
-#: ../gtk/gtktexttag.c:630
+#: ../gtk/gtktexttag.c:677
 msgid "Pixels inside wrap set"
 msgstr "�行內部�素數設定"
 
-#: ../gtk/gtktexttag.c:631
+#: ../gtk/gtktexttag.c:678
 msgid "Whether this tag affects the number of pixels between wrapped lines"
 msgstr "此標記��影響�行段�內部行間的�離"
 
-#: ../gtk/gtktexttag.c:638
+#: ../gtk/gtktexttag.c:685
 msgid "Right margin set"
 msgstr "�邊邊界設定"
 
-#: ../gtk/gtktexttag.c:639
+#: ../gtk/gtktexttag.c:686
 msgid "Whether this tag affects the right margin"
 msgstr "此標記��影響�邊邊界"
 
-#: ../gtk/gtktexttag.c:646
+#: ../gtk/gtktexttag.c:693
 msgid "Wrap mode set"
 msgstr "�行模�設定"
 
-#: ../gtk/gtktexttag.c:647
+#: ../gtk/gtktexttag.c:694
 msgid "Whether this tag affects line wrap mode"
 msgstr "本標籤��影響�行模�"
 
-#: ../gtk/gtktexttag.c:650
+#: ../gtk/gtktexttag.c:697
 msgid "Tabs set"
 msgstr "Tab 設定"
 
-#: ../gtk/gtktexttag.c:651
+#: ../gtk/gtktexttag.c:698
 msgid "Whether this tag affects tabs"
 msgstr "標記��影響 Tab"
 
-#: ../gtk/gtktexttag.c:654
+#: ../gtk/gtktexttag.c:701
 msgid "Invisible set"
 msgstr "隱�設定"
 
-#: ../gtk/gtktexttag.c:655
+#: ../gtk/gtktexttag.c:702
 msgid "Whether this tag affects text visibility"
 msgstr "本標記是�影響文字�見度"
 
-#: ../gtk/gtktexttag.c:658
+#: ../gtk/gtktexttag.c:705
 msgid "Paragraph background set"
 msgstr "段�背景設定"
 
-#: ../gtk/gtktexttag.c:659
+#: ../gtk/gtktexttag.c:706
 msgid "Whether this tag affects the paragraph background color"
 msgstr "本標籤會�影響段�的背景�色"
 
-#: ../gtk/gtktextview.c:654
+#: ../gtk/gtktextview.c:656
 msgid "Pixels Above Lines"
 msgstr "�行頂部加上的�素"
 
-#: ../gtk/gtktextview.c:664
+#: ../gtk/gtktextview.c:666
 msgid "Pixels Below Lines"
 msgstr "�行底部加上的�素"
 
-#: ../gtk/gtktextview.c:674
+#: ../gtk/gtktextview.c:676
 msgid "Pixels Inside Wrap"
 msgstr "段�內部行�"
 
-#: ../gtk/gtktextview.c:692
+#: ../gtk/gtktextview.c:694
 msgid "Wrap Mode"
 msgstr "�行模�"
 
-#: ../gtk/gtktextview.c:710
+#: ../gtk/gtktextview.c:712
 msgid "Left Margin"
 msgstr "左邊邊界"
 
-#: ../gtk/gtktextview.c:720
+#: ../gtk/gtktextview.c:722
 msgid "Right Margin"
 msgstr "�邊邊界"
 
-#: ../gtk/gtktextview.c:748
+#: ../gtk/gtktextview.c:750
 msgid "Cursor Visible"
 msgstr "顯示游標"
 
-#: ../gtk/gtktextview.c:749
+#: ../gtk/gtktextview.c:751
 msgid "If the insertion cursor is shown"
 msgstr "是�顯示游標"
 
-#: ../gtk/gtktextview.c:756
+#: ../gtk/gtktextview.c:758
 msgid "Buffer"
 msgstr "緩��"
 
-#: ../gtk/gtktextview.c:757
+#: ../gtk/gtktextview.c:759
 msgid "The buffer which is displayed"
 msgstr "用來顯示的緩��"
 
-#: ../gtk/gtktextview.c:765
+#: ../gtk/gtktextview.c:767
 msgid "Whether entered text overwrites existing contents"
 msgstr "是�輸入文字�以覆寫既有文字"
 
-#: ../gtk/gtktextview.c:772
+#: ../gtk/gtktextview.c:774
 msgid "Accepts tab"
 msgstr "接�Tab�"
 
-#: ../gtk/gtktextview.c:773
+#: ../gtk/gtktextview.c:775
 msgid "Whether Tab will result in a tab character being entered"
 msgstr "是� Tab �會導致 Tab字符輸入"
 
-#: ../gtk/gtktextview.c:808
+#: ../gtk/gtktextview.c:810
 msgid "Error underline color"
 msgstr "錯誤的底線�色"
 
-#: ../gtk/gtktextview.c:809
+#: ../gtk/gtktextview.c:811
 msgid "Color with which to draw error-indication underlines"
 msgstr "繪畫游標使用的�色"
 
-#: ../gtk/gtkthemingengine.c:249
+#: ../gtk/gtkthemingengine.c:257
 msgid "Theming engine name"
 msgstr "布景引擎的�稱"
 
@@ -6239,227 +6332,227 @@ msgstr "是�該指令的代�看起來是單�指令代�"
 msgid "Whether the toggle action should be active"
 msgstr "該切�動作是�應該執行"
 
-#: ../gtk/gtktogglebutton.c:126 ../gtk/gtktoggletoolbutton.c:113
+#: ../gtk/gtktogglebutton.c:179 ../gtk/gtktoggletoolbutton.c:128
 msgid "If the toggle button should be pressed in"
 msgstr "該切�按鈕是�應該被按下"
 
-#: ../gtk/gtktogglebutton.c:134
+#: ../gtk/gtktogglebutton.c:187
 msgid "If the toggle button is in an \"in between\" state"
 msgstr "是�該開關按鈕處於『未定�狀態"
 
-#: ../gtk/gtktogglebutton.c:141
+#: ../gtk/gtktogglebutton.c:194
 msgid "Draw Indicator"
 msgstr "繪製指示標記"
 
-#: ../gtk/gtktogglebutton.c:142
+#: ../gtk/gtktogglebutton.c:195
 msgid "If the toggle part of the button is displayed"
 msgstr "是�顯示按鈕的開關部份"
 
-#: ../gtk/gtktoolbar.c:489 ../gtk/gtktoolpalette.c:1069
+#: ../gtk/gtktoolbar.c:501 ../gtk/gtktoolpalette.c:1038
 msgid "Toolbar Style"
 msgstr "工具列樣�"
 
-#: ../gtk/gtktoolbar.c:490
+#: ../gtk/gtktoolbar.c:502
 msgid "How to draw the toolbar"
 msgstr "如何繪製工具列"
 
-#: ../gtk/gtktoolbar.c:497
+#: ../gtk/gtktoolbar.c:509
 msgid "Show Arrow"
 msgstr "顯示箭頭"
 
-#: ../gtk/gtktoolbar.c:498
+#: ../gtk/gtktoolbar.c:510
 msgid "If an arrow should be shown if the toolbar doesn't fit"
 msgstr "若工具列大��符是�顯示箭頭"
 
-#: ../gtk/gtktoolbar.c:519
+#: ../gtk/gtktoolbar.c:531
 msgid "Size of icons in this toolbar"
 msgstr "此工具列的圖示大�"
 
-#: ../gtk/gtktoolbar.c:534 ../gtk/gtktoolpalette.c:1055
+#: ../gtk/gtktoolbar.c:546 ../gtk/gtktoolpalette.c:1024
 msgid "Icon size set"
 msgstr "圖示大�設定"
 
-#: ../gtk/gtktoolbar.c:535 ../gtk/gtktoolpalette.c:1056
+#: ../gtk/gtktoolbar.c:547 ../gtk/gtktoolpalette.c:1025
 msgid "Whether the icon-size property has been set"
 msgstr "圖示大�屬性是�已設定"
 
-#: ../gtk/gtktoolbar.c:544
+#: ../gtk/gtktoolbar.c:556
 msgid "Whether the item should receive extra space when the toolbar grows"
 msgstr "當工具列放大時其內項目應�隨之放大"
 
-#: ../gtk/gtktoolbar.c:552 ../gtk/gtktoolitemgroup.c:1650
+#: ../gtk/gtktoolbar.c:564 ../gtk/gtktoolitemgroup.c:1646
 msgid "Whether the item should be the same size as other homogeneous items"
 msgstr "工具項目的大�應�與其他�尺寸項目一致"
 
-#: ../gtk/gtktoolbar.c:559
+#: ../gtk/gtktoolbar.c:571
 msgid "Spacer size"
 msgstr "間隔大�"
 
-#: ../gtk/gtktoolbar.c:560
+#: ../gtk/gtktoolbar.c:572
 msgid "Size of spacers"
 msgstr "間隔的大�"
 
-#: ../gtk/gtktoolbar.c:569
+#: ../gtk/gtktoolbar.c:581
 msgid "Amount of border space between the toolbar shadow and the buttons"
 msgstr "工具列陰影與按鈕之間的邊緣空間"
 
-#: ../gtk/gtktoolbar.c:577
+#: ../gtk/gtktoolbar.c:589
 msgid "Maximum child expand"
 msgstr "最大�項目展開"
 
-#: ../gtk/gtktoolbar.c:578
+#: ../gtk/gtktoolbar.c:590
 msgid "Maximum amount of space an expandable item will be given"
 msgstr "給予�展開項目的最大空間"
 
-#: ../gtk/gtktoolbar.c:586
+#: ../gtk/gtktoolbar.c:598
 msgid "Space style"
 msgstr "間格樣�"
 
-#: ../gtk/gtktoolbar.c:587
+#: ../gtk/gtktoolbar.c:599
 msgid "Whether spacers are vertical lines or just blank"
 msgstr "是�間隔為垂直線，或是�是空白"
 
-#: ../gtk/gtktoolbar.c:594
+#: ../gtk/gtktoolbar.c:606
 msgid "Button relief"
 msgstr "按鈕斜邊"
 
-#: ../gtk/gtktoolbar.c:595
+#: ../gtk/gtktoolbar.c:607
 msgid "Type of bevel around toolbar buttons"
 msgstr "工具列按鈕邊緣的斜邊樣�"
 
-#: ../gtk/gtktoolbar.c:602
+#: ../gtk/gtktoolbar.c:614
 msgid "Style of bevel around the toolbar"
 msgstr "工具列邊緣的斜邊樣�"
 
-#: ../gtk/gtktoolbutton.c:202
+#: ../gtk/gtktoolbutton.c:233
 msgid "Text to show in the item."
 msgstr "項目內的文字。"
 
-#: ../gtk/gtktoolbutton.c:209
+#: ../gtk/gtktoolbutton.c:240
 msgid ""
 "If set, an underline in the label property indicates that the next character "
 "should be used for the mnemonic accelerator key in the overflow menu"
 msgstr "若設置，在 label 屬性中的文字中�有(_)字符的下一個字�將被用來當作超出邊界�單的速記快��"
 
-#: ../gtk/gtktoolbutton.c:216
+#: ../gtk/gtktoolbutton.c:247
 msgid "Widget to use as the item label"
 msgstr "當作項目文字標籤的替代視窗元件"
 
-#: ../gtk/gtktoolbutton.c:222
+#: ../gtk/gtktoolbutton.c:253
 msgid "Stock Id"
 msgstr "內置圖示代碼"
 
-#: ../gtk/gtktoolbutton.c:223
+#: ../gtk/gtktoolbutton.c:254
 msgid "The stock icon displayed on the item"
 msgstr "項目中所顯示的內置圖示"
 
-#: ../gtk/gtktoolbutton.c:239
+#: ../gtk/gtktoolbutton.c:270
 msgid "Icon name"
 msgstr "圖示�稱"
 
-#: ../gtk/gtktoolbutton.c:240
+#: ../gtk/gtktoolbutton.c:271
 msgid "The name of the themed icon displayed on the item"
 msgstr "在項目上顯示的布景圖示的�稱"
 
-#: ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolbutton.c:277
 msgid "Icon widget"
 msgstr "圖示元件"
 
-#: ../gtk/gtktoolbutton.c:247
+#: ../gtk/gtktoolbutton.c:278
 msgid "Icon widget to display in the item"
 msgstr "準備在項目中顯示的圖示原�"
 
-#: ../gtk/gtktoolbutton.c:260
+#: ../gtk/gtktoolbutton.c:291
 msgid "Icon spacing"
 msgstr "圖示間�"
 
-#: ../gtk/gtktoolbutton.c:261
+#: ../gtk/gtktoolbutton.c:292
 msgid "Spacing in pixels between the icon and label"
 msgstr "圖示與標籤間的間�(�素)"
 
-#: ../gtk/gtktoolitem.c:210
+#: ../gtk/gtktoolitem.c:209
 msgid ""
 "Whether the toolbar item is considered important. When TRUE, toolbar buttons "
 "show text in GTK_TOOLBAR_BOTH_HORIZ mode"
 msgstr "是�工具列物件被視為��的。若為 TRUE, 工具列按鈕以GTK_TOOLBAR_BOTH_HORIZ模�顯示文字"
 
-#: ../gtk/gtktoolitemgroup.c:1597
+#: ../gtk/gtktoolitemgroup.c:1593
 msgid "The human-readable title of this item group"
 msgstr "這個項目羣組的供人類閱讀標題"
 
-#: ../gtk/gtktoolitemgroup.c:1604
+#: ../gtk/gtktoolitemgroup.c:1600
 msgid "A widget to display in place of the usual label"
 msgstr "替代原本標籤的視窗元件"
 
-#: ../gtk/gtktoolitemgroup.c:1610
+#: ../gtk/gtktoolitemgroup.c:1606
 msgid "Collapsed"
 msgstr "已收摺"
 
-#: ../gtk/gtktoolitemgroup.c:1611
+#: ../gtk/gtktoolitemgroup.c:1607
 msgid "Whether the group has been collapsed and items are hidden"
 msgstr "是��將羣組收摺起來並隱�項目"
 
-#: ../gtk/gtktoolitemgroup.c:1617
+#: ../gtk/gtktoolitemgroup.c:1613
 msgid "ellipsize"
 msgstr "簡化文字"
 
-#: ../gtk/gtktoolitemgroup.c:1618
+#: ../gtk/gtktoolitemgroup.c:1614
 msgid "Ellipsize for item group headers"
 msgstr "簡化項目羣組的標頭"
 
-#: ../gtk/gtktoolitemgroup.c:1624
+#: ../gtk/gtktoolitemgroup.c:1620
 msgid "Header Relief"
 msgstr "標頭消除"
 
-#: ../gtk/gtktoolitemgroup.c:1625
+#: ../gtk/gtktoolitemgroup.c:1621
 msgid "Relief of the group header button"
 msgstr "消除羣組標頭按鈕"
 
-#: ../gtk/gtktoolitemgroup.c:1640
+#: ../gtk/gtktoolitemgroup.c:1636
 msgid "Header Spacing"
 msgstr "標頭間�"
 
-#: ../gtk/gtktoolitemgroup.c:1641
+#: ../gtk/gtktoolitemgroup.c:1637
 msgid "Spacing between expander arrow and caption"
 msgstr "展開器箭頭與說明之間的間�"
 
-#: ../gtk/gtktoolitemgroup.c:1657
+#: ../gtk/gtktoolitemgroup.c:1653
 msgid "Whether the item should receive extra space when the group grows"
 msgstr "當羣組增大時項目應�得到�外的空間"
 
-#: ../gtk/gtktoolitemgroup.c:1664
+#: ../gtk/gtktoolitemgroup.c:1660
 msgid "Whether the item should fill the available space"
 msgstr "項目是�應填滿所有�用的空間"
 
-#: ../gtk/gtktoolitemgroup.c:1670
+#: ../gtk/gtktoolitemgroup.c:1666
 msgid "New Row"
 msgstr "新增列"
 
-#: ../gtk/gtktoolitemgroup.c:1671
+#: ../gtk/gtktoolitemgroup.c:1667
 msgid "Whether the item should start a new row"
 msgstr "項目是�應新增一列"
 
-#: ../gtk/gtktoolitemgroup.c:1678
+#: ../gtk/gtktoolitemgroup.c:1674
 msgid "Position of the item within this group"
 msgstr "項目在這個羣組中的�置"
 
-#: ../gtk/gtktoolpalette.c:1040
+#: ../gtk/gtktoolpalette.c:1009
 msgid "Size of icons in this tool palette"
 msgstr "圖示在這個工具盤中的大�"
 
-#: ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktoolpalette.c:1039
 msgid "Style of items in the tool palette"
 msgstr "項目在這個工具盤中的樣�"
 
-#: ../gtk/gtktoolpalette.c:1086
+#: ../gtk/gtktoolpalette.c:1055
 msgid "Exclusive"
 msgstr "除外的"
 
-#: ../gtk/gtktoolpalette.c:1087
+#: ../gtk/gtktoolpalette.c:1056
 msgid "Whether the item group should be the only expanded at a given time"
 msgstr "項目羣組是��在指定時間展開"
 
-#: ../gtk/gtktoolpalette.c:1102
+#: ../gtk/gtktoolpalette.c:1071
 msgid ""
 "Whether the item group should receive extra space when the palette grows"
 msgstr "項目羣組是�在工具盤擴大時得到�外的空間"
@@ -6536,11 +6629,11 @@ msgstr "�列闊度"
 msgid "Wrap width for laying out items in a grid"
 msgstr "將項目於方格中排列所設定的�列闊度"
 
-#: ../gtk/gtktreemodelsort.c:312
+#: ../gtk/gtktreemodelsort.c:491
 msgid "TreeModelSort Model"
 msgstr "TreeModelSort 模型"
 
-#: ../gtk/gtktreemodelsort.c:313
+#: ../gtk/gtktreemodelsort.c:492
 msgid "The model for the TreeModelSort to sort"
 msgstr "給 TreeModelSort 排�的模型"
 
@@ -6750,119 +6843,123 @@ msgstr "樹狀線樣�"
 msgid "Dash pattern used to draw the tree view lines"
 msgstr "用來繪製樹狀檢視樹狀線的虛線樣�"
 
-#: ../gtk/gtktreeviewcolumn.c:247
+#: ../gtk/gtktreeviewcolumn.c:249
 msgid "Whether to display the column"
 msgstr "是�顯示該列資料"
 
-#: ../gtk/gtktreeviewcolumn.c:254 ../gtk/gtkwindow.c:646
+#: ../gtk/gtktreeviewcolumn.c:256 ../gtk/gtkwindow.c:650
 msgid "Resizable"
 msgstr "�調整尺寸"
 
-#: ../gtk/gtktreeviewcolumn.c:255
+#: ../gtk/gtktreeviewcolumn.c:257
 msgid "Column is user-resizable"
 msgstr "欄寬�以調整"
 
-#: ../gtk/gtktreeviewcolumn.c:263
+#: ../gtk/gtktreeviewcolumn.c:265
+msgid "Current X position of the column"
+msgstr "目�欄的 X �置"
+
+#: ../gtk/gtktreeviewcolumn.c:275
 msgid "Current width of the column"
 msgstr "目�的欄寬"
 
-#: ../gtk/gtktreeviewcolumn.c:280
+#: ../gtk/gtktreeviewcolumn.c:292
 msgid "Sizing"
 msgstr "調整大�"
 
-#: ../gtk/gtktreeviewcolumn.c:281
+#: ../gtk/gtktreeviewcolumn.c:293
 msgid "Resize mode of the column"
 msgstr "欄�的調整模�"
 
-#: ../gtk/gtktreeviewcolumn.c:289
+#: ../gtk/gtktreeviewcolumn.c:301
 msgid "Fixed Width"
 msgstr "固定闊度"
 
-#: ../gtk/gtktreeviewcolumn.c:290
+#: ../gtk/gtktreeviewcolumn.c:302
 msgid "Current fixed width of the column"
 msgstr "目�的固定欄寬"
 
-#: ../gtk/gtktreeviewcolumn.c:300
+#: ../gtk/gtktreeviewcolumn.c:312
 msgid "Minimum allowed width of the column"
 msgstr "�接�的最�欄寬"
 
-#: ../gtk/gtktreeviewcolumn.c:309
+#: ../gtk/gtktreeviewcolumn.c:321
 msgid "Maximum Width"
 msgstr "最大闊度"
 
-#: ../gtk/gtktreeviewcolumn.c:310
+#: ../gtk/gtktreeviewcolumn.c:322
 msgid "Maximum allowed width of the column"
 msgstr "�接�的最大欄寬"
 
-#: ../gtk/gtktreeviewcolumn.c:320
+#: ../gtk/gtktreeviewcolumn.c:332
 msgid "Title to appear in column header"
 msgstr "欄�標題中所顯示的文字"
 
-#: ../gtk/gtktreeviewcolumn.c:328
+#: ../gtk/gtktreeviewcolumn.c:340
 msgid "Column gets share of extra width allocated to the widget"
 msgstr "欄��得分享給所屬元件增加的闊度"
 
-#: ../gtk/gtktreeviewcolumn.c:335
+#: ../gtk/gtktreeviewcolumn.c:347
 msgid "Clickable"
 msgstr "�按下"
 
-#: ../gtk/gtktreeviewcolumn.c:336
+#: ../gtk/gtktreeviewcolumn.c:348
 msgid "Whether the header can be clicked"
 msgstr "��按下欄�標頭"
 
-#: ../gtk/gtktreeviewcolumn.c:344
+#: ../gtk/gtktreeviewcolumn.c:356
 msgid "Widget"
 msgstr "元件"
 
-#: ../gtk/gtktreeviewcolumn.c:345
+#: ../gtk/gtktreeviewcolumn.c:357
 msgid "Widget to put in column header button instead of column title"
 msgstr "在欄�標頭中，以指定元件代替標題文字"
 
-#: ../gtk/gtktreeviewcolumn.c:353
+#: ../gtk/gtktreeviewcolumn.c:365
 msgid "X Alignment of the column header text or widget"
 msgstr "欄�標頭文字或元件的水平�齊"
 
-#: ../gtk/gtktreeviewcolumn.c:363
+#: ../gtk/gtktreeviewcolumn.c:375
 msgid "Whether the column can be reordered around the headers"
 msgstr "是�該欄��以在標頭下�新排�"
 
-#: ../gtk/gtktreeviewcolumn.c:370
+#: ../gtk/gtktreeviewcolumn.c:382
 msgid "Sort indicator"
 msgstr "排�指示標記"
 
-#: ../gtk/gtktreeviewcolumn.c:371
+#: ../gtk/gtktreeviewcolumn.c:383
 msgid "Whether to show a sort indicator"
 msgstr "是�顯示排�指示標記"
 
-#: ../gtk/gtktreeviewcolumn.c:378
+#: ../gtk/gtktreeviewcolumn.c:390
 msgid "Sort order"
 msgstr "排列次�"
 
-#: ../gtk/gtktreeviewcolumn.c:379
+#: ../gtk/gtktreeviewcolumn.c:391
 msgid "Sort direction the sort indicator should indicate"
 msgstr "排�指示器應顯示的排�方�"
 
-#: ../gtk/gtktreeviewcolumn.c:395
+#: ../gtk/gtktreeviewcolumn.c:407
 msgid "Sort column ID"
 msgstr "排�欄 ID"
 
-#: ../gtk/gtktreeviewcolumn.c:396
+#: ../gtk/gtktreeviewcolumn.c:408
 msgid "Logical sort column ID this column sorts on when selected for sorting"
 msgstr "當�擇排�時這個欄�用來排�的�輯排�欄� ID"
 
-#: ../gtk/gtkuimanager.c:226
+#: ../gtk/gtkuimanager.c:480
 msgid "Whether tearoff menu items should be added to menus"
 msgstr "是�在�單上加上��下標記的�單項目"
 
-#: ../gtk/gtkuimanager.c:233
+#: ../gtk/gtkuimanager.c:487
 msgid "Merged UI definition"
 msgstr "整�的 UI 定義"
 
-#: ../gtk/gtkuimanager.c:234
+#: ../gtk/gtkuimanager.c:488
 msgid "An XML string describing the merged UI"
 msgstr "�述整� UI 的特定 XML 字串"
 
-#: ../gtk/gtkviewport.c:154
+#: ../gtk/gtkviewport.c:156
 msgid "Determines how the shadowed box around the viewport is drawn"
 msgstr "決定視埠元件周�的陰影方塊�如何繪製"
 
@@ -6874,605 +6971,633 @@ msgstr "使用符號圖示"
 msgid "Whether to use symbolic icons"
 msgstr "是�使用符號圖示"
 
-#: ../gtk/gtkwidget.c:931
+#: ../gtk/gtkwidget.c:950
 msgid "Widget name"
 msgstr "元件�稱"
 
-#: ../gtk/gtkwidget.c:932
+#: ../gtk/gtkwidget.c:951
 msgid "The name of the widget"
 msgstr "元件的�稱"
 
-#: ../gtk/gtkwidget.c:938
+#: ../gtk/gtkwidget.c:957
 msgid "Parent widget"
 msgstr "�元件"
 
-#: ../gtk/gtkwidget.c:939
+#: ../gtk/gtkwidget.c:958
 msgid "The parent widget of this widget. Must be a Container widget"
 msgstr "該元件的�元件，必須是容器元件"
 
-#: ../gtk/gtkwidget.c:946
+#: ../gtk/gtkwidget.c:965
 msgid "Width request"
 msgstr "指定闊度"
 
-#: ../gtk/gtkwidget.c:947
+#: ../gtk/gtkwidget.c:966
 msgid ""
 "Override for width request of the widget, or -1 if natural request should be "
 "used"
 msgstr "自行指定元件的闊度，使用 -1 則表示使用�設闊度"
 
-#: ../gtk/gtkwidget.c:955
+#: ../gtk/gtkwidget.c:974
 msgid "Height request"
 msgstr "指定高度"
 
-#: ../gtk/gtkwidget.c:956
+#: ../gtk/gtkwidget.c:975
 msgid ""
 "Override for height request of the widget, or -1 if natural request should "
 "be used"
 msgstr "自行指定元件的高度，使用 -1 則表示使用�設高度"
 
-#: ../gtk/gtkwidget.c:965
+#: ../gtk/gtkwidget.c:984
 msgid "Whether the widget is visible"
 msgstr "該元件是��見"
 
-#: ../gtk/gtkwidget.c:972
+#: ../gtk/gtkwidget.c:991
 msgid "Whether the widget responds to input"
 msgstr "元件是��輸入有�應"
 
-#: ../gtk/gtkwidget.c:978
+#: ../gtk/gtkwidget.c:997
 msgid "Application paintable"
 msgstr "應用程��繪製"
 
-#: ../gtk/gtkwidget.c:979
+#: ../gtk/gtkwidget.c:998
 msgid "Whether the application will paint directly on the widget"
 msgstr "應用程��以繪製"
 
-#: ../gtk/gtkwidget.c:985
+#: ../gtk/gtkwidget.c:1004
 msgid "Can focus"
 msgstr "�接�焦點"
 
-#: ../gtk/gtkwidget.c:986
+#: ../gtk/gtkwidget.c:1005
 msgid "Whether the widget can accept the input focus"
 msgstr "元件��接�輸入焦點"
 
-#: ../gtk/gtkwidget.c:992
+#: ../gtk/gtkwidget.c:1011
 msgid "Has focus"
 msgstr "�得焦點"
 
-#: ../gtk/gtkwidget.c:993
+#: ../gtk/gtkwidget.c:1012
 msgid "Whether the widget has the input focus"
 msgstr "元件是�在輸入焦點內"
 
-#: ../gtk/gtkwidget.c:999
+#: ../gtk/gtkwidget.c:1018
 msgid "Is focus"
 msgstr "作為焦點"
 
-#: ../gtk/gtkwidget.c:1000
+#: ../gtk/gtkwidget.c:1019
 msgid "Whether the widget is the focus widget within the toplevel"
 msgstr "是�該元件在頂端為自動�得焦點的元件"
 
-#: ../gtk/gtkwidget.c:1006
+#: ../gtk/gtkwidget.c:1025
 msgid "Can default"
 msgstr "��為�設元件"
 
-#: ../gtk/gtkwidget.c:1007
+#: ../gtk/gtkwidget.c:1026
 msgid "Whether the widget can be the default widget"
 msgstr "該元件���為�設的視窗元件"
 
-#: ../gtk/gtkwidget.c:1013
+#: ../gtk/gtkwidget.c:1032
 msgid "Has default"
 msgstr "是�設元件"
 
-#: ../gtk/gtkwidget.c:1014
+#: ../gtk/gtkwidget.c:1033
 msgid "Whether the widget is the default widget"
 msgstr "該元件是��設的視窗元件"
 
-#: ../gtk/gtkwidget.c:1020
+#: ../gtk/gtkwidget.c:1039
 msgid "Receives default"
 msgstr "接��設設置"
 
-#: ../gtk/gtkwidget.c:1021
+#: ../gtk/gtkwidget.c:1040
 msgid "If TRUE, the widget will receive the default action when it is focused"
 msgstr "如設為定為‘TRUE’，該元件接��設設置命令當�為焦點時"
 
-#: ../gtk/gtkwidget.c:1027
+#: ../gtk/gtkwidget.c:1046
 msgid "Composite child"
 msgstr "屬於組�元件"
 
-#: ../gtk/gtkwidget.c:1028
+#: ../gtk/gtkwidget.c:1047
 msgid "Whether the widget is part of a composite widget"
 msgstr "該元件是�組�元件的一部分"
 
-#: ../gtk/gtkwidget.c:1034
+#: ../gtk/gtkwidget.c:1053
 msgid "Style"
 msgstr "樣�"
 
-#: ../gtk/gtkwidget.c:1035
+#: ../gtk/gtkwidget.c:1054
 msgid ""
 "The style of the widget, which contains information about how it will look "
 "(colors etc)"
 msgstr "元件的樣�，包括與外觀有關的資訊（例如色彩）。"
 
-#: ../gtk/gtkwidget.c:1041
+#: ../gtk/gtkwidget.c:1060
 msgid "Events"
 msgstr "事件"
 
-#: ../gtk/gtkwidget.c:1042
+#: ../gtk/gtkwidget.c:1061
 msgid "The event mask that decides what kind of GdkEvents this widget gets"
 msgstr "決定此元件會接�何種 GdkEvent 的事件�罩"
 
-#: ../gtk/gtkwidget.c:1049
+#: ../gtk/gtkwidget.c:1068
 msgid "No show all"
 msgstr "�全部顯示"
 
-#: ../gtk/gtkwidget.c:1050
+#: ../gtk/gtkwidget.c:1069
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "是� gtk_widget_show_all() 呼�影響本元件"
 
-#: ../gtk/gtkwidget.c:1073
+#: ../gtk/gtkwidget.c:1092
 msgid "Whether this widget has a tooltip"
 msgstr "此視窗元件是�具有工具�示"
 
-#: ../gtk/gtkwidget.c:1129
+#: ../gtk/gtkwidget.c:1148
 msgid "Window"
 msgstr "視窗"
 
-#: ../gtk/gtkwidget.c:1130
+#: ../gtk/gtkwidget.c:1149
 msgid "The widget's window if it is realized"
 msgstr "調整大�後的視窗元件視窗"
 
-#: ../gtk/gtkwidget.c:1144
+#: ../gtk/gtkwidget.c:1163
 msgid "Double Buffered"
 msgstr "雙�緩�"
 
-#: ../gtk/gtkwidget.c:1145
+#: ../gtk/gtkwidget.c:1164
 msgid "Whether the widget is double buffered"
 msgstr "此視窗元件是�使用雙�緩�"
 
-#: ../gtk/gtkwidget.c:1160
+#: ../gtk/gtkwidget.c:1179
 msgid "How to position in extra horizontal space"
 msgstr "在�外的水平空間中如何定�"
 
-#: ../gtk/gtkwidget.c:1176
+#: ../gtk/gtkwidget.c:1195
 msgid "How to position in extra vertical space"
 msgstr "在�外的垂直空間中如何定�"
 
-#: ../gtk/gtkwidget.c:1195
+#: ../gtk/gtkwidget.c:1214
 msgid "Margin on Left"
 msgstr "左�邊界"
 
-#: ../gtk/gtkwidget.c:1196
+#: ../gtk/gtkwidget.c:1215
 msgid "Pixels of extra space on the left side"
 msgstr "左��外空間的�素"
 
-#: ../gtk/gtkwidget.c:1216
+#: ../gtk/gtkwidget.c:1235
 msgid "Margin on Right"
 msgstr "��邊界"
 
-#: ../gtk/gtkwidget.c:1217
+#: ../gtk/gtkwidget.c:1236
 msgid "Pixels of extra space on the right side"
 msgstr "���外空間的�素"
 
-#: ../gtk/gtkwidget.c:1237
+#: ../gtk/gtkwidget.c:1256
 msgid "Margin on Top"
 msgstr "頂端邊界"
 
-#: ../gtk/gtkwidget.c:1238
+#: ../gtk/gtkwidget.c:1257
 msgid "Pixels of extra space on the top side"
 msgstr "頂端�外空間的�素"
 
-#: ../gtk/gtkwidget.c:1258
+#: ../gtk/gtkwidget.c:1277
 msgid "Margin on Bottom"
 msgstr "底部邊界"
 
-#: ../gtk/gtkwidget.c:1259
+#: ../gtk/gtkwidget.c:1278
 msgid "Pixels of extra space on the bottom side"
 msgstr "底部�外空間的�素"
 
-#: ../gtk/gtkwidget.c:1276
+#: ../gtk/gtkwidget.c:1295
 msgid "All Margins"
 msgstr "所有邊界"
 
-#: ../gtk/gtkwidget.c:1277
+#: ../gtk/gtkwidget.c:1296
 msgid "Pixels of extra space on all four sides"
 msgstr "四個邊界�外空間的�素"
 
-#: ../gtk/gtkwidget.c:1310
+#: ../gtk/gtkwidget.c:1329
 msgid "Horizontal Expand"
 msgstr "水平擴展"
 
-#: ../gtk/gtkwidget.c:1311
+#: ../gtk/gtkwidget.c:1330
 msgid "Whether widget wants more horizontal space"
 msgstr "視窗元件是��有更多水平空間"
 
-#: ../gtk/gtkwidget.c:1325
+#: ../gtk/gtkwidget.c:1344
 msgid "Horizontal Expand Set"
 msgstr "水平擴展設定"
 
-#: ../gtk/gtkwidget.c:1326
+#: ../gtk/gtkwidget.c:1345
 msgid "Whether to use the hexpand property"
 msgstr "是�使用 hexpand 屬性"
 
-#: ../gtk/gtkwidget.c:1340
+#: ../gtk/gtkwidget.c:1359
 msgid "Vertical Expand"
 msgstr "垂直擴展"
 
-#: ../gtk/gtkwidget.c:1341
+#: ../gtk/gtkwidget.c:1360
 msgid "Whether widget wants more vertical space"
 msgstr "視窗元件是��有更多垂直空間"
 
-#: ../gtk/gtkwidget.c:1355
+#: ../gtk/gtkwidget.c:1374
 msgid "Vertical Expand Set"
 msgstr "垂直擴展設定"
 
-#: ../gtk/gtkwidget.c:1356
+#: ../gtk/gtkwidget.c:1375
 msgid "Whether to use the vexpand property"
 msgstr "是�使用 vexpand 屬性"
 
-#: ../gtk/gtkwidget.c:1370
+#: ../gtk/gtkwidget.c:1389
 msgid "Expand Both"
 msgstr "擴展兩者"
 
-#: ../gtk/gtkwidget.c:1371
+#: ../gtk/gtkwidget.c:1390
 msgid "Whether widget wants to expand in both directions"
 msgstr "視窗元件是�在兩個方�都擴展"
 
-#: ../gtk/gtkwidget.c:3008
+#: ../gtk/gtkwidget.c:3029
 msgid "Interior Focus"
 msgstr "在內部顯示焦點"
 
-#: ../gtk/gtkwidget.c:3009
+#: ../gtk/gtkwidget.c:3030
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "是�在視窗元件內部顯示焦點線"
 
-#: ../gtk/gtkwidget.c:3015
+#: ../gtk/gtkwidget.c:3036
 msgid "Focus linewidth"
 msgstr "焦點線闊度"
 
-#: ../gtk/gtkwidget.c:3016
+#: ../gtk/gtkwidget.c:3037
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "輸入焦點指示線的闊度，以�素為單�"
 
-#: ../gtk/gtkwidget.c:3022
+#: ../gtk/gtkwidget.c:3043
 msgid "Focus line dash pattern"
 msgstr "焦點線虛線樣�"
 
-#: ../gtk/gtkwidget.c:3023
+#: ../gtk/gtkwidget.c:3044
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "顯示輸入焦點指示線時使用的虛線樣�"
 
-#: ../gtk/gtkwidget.c:3028
+#: ../gtk/gtkwidget.c:3049
 msgid "Focus padding"
 msgstr "焦點指示線留邊"
 
-#: ../gtk/gtkwidget.c:3029
+#: ../gtk/gtkwidget.c:3050
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "輸入焦點指示線�視窗元件邊界之間的闊度，以�素為單�"
 
-#: ../gtk/gtkwidget.c:3034
+#: ../gtk/gtkwidget.c:3055
 msgid "Cursor color"
 msgstr "游標�色"
 
-#: ../gtk/gtkwidget.c:3035
+#: ../gtk/gtkwidget.c:3056
 msgid "Color with which to draw insertion cursor"
 msgstr "繪畫游標使用的�色"
 
-#: ../gtk/gtkwidget.c:3040
+#: ../gtk/gtkwidget.c:3061
 msgid "Secondary cursor color"
 msgstr "第二游標�色"
 
-#: ../gtk/gtkwidget.c:3041
+#: ../gtk/gtkwidget.c:3062
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
 msgstr "當編輯混��至左�左至�的文字時，繪畫第二個�入游標所使用的�色。"
 
-#: ../gtk/gtkwidget.c:3046
+#: ../gtk/gtkwidget.c:3067
 msgid "Cursor line aspect ratio"
 msgstr "游標長寬比"
 
-#: ../gtk/gtkwidget.c:3047
+#: ../gtk/gtkwidget.c:3068
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "繪畫游標時使用的長寬比例"
 
-#: ../gtk/gtkwidget.c:3053
+#: ../gtk/gtkwidget.c:3074
 msgid "Window dragging"
 msgstr "視窗拖拉"
 
-#: ../gtk/gtkwidget.c:3054
+#: ../gtk/gtkwidget.c:3075
 msgid "Whether windows can be dragged by clicking on empty areas"
 msgstr "視窗是��以在空白�域處點�來拖拉它"
 
-#: ../gtk/gtkwidget.c:3067
+#: ../gtk/gtkwidget.c:3088
 msgid "Unvisited Link Color"
 msgstr "未�訪連�色彩"
 
-#: ../gtk/gtkwidget.c:3068
+#: ../gtk/gtkwidget.c:3089
 msgid "Color of unvisited links"
 msgstr "尚未�訪連�的色彩"
 
-#: ../gtk/gtkwidget.c:3081
+#: ../gtk/gtkwidget.c:3102
 msgid "Visited Link Color"
 msgstr "已�覽連��色"
 
-#: ../gtk/gtkwidget.c:3082
+#: ../gtk/gtkwidget.c:3103
 msgid "Color of visited links"
 msgstr "已經�覽連�的色彩"
 
-#: ../gtk/gtkwidget.c:3096
+#: ../gtk/gtkwidget.c:3117
 msgid "Wide Separators"
 msgstr "寬分隔線"
 
-#: ../gtk/gtkwidget.c:3097
+#: ../gtk/gtkwidget.c:3118
 msgid ""
 "Whether separators have configurable width and should be drawn using a box "
 "instead of a line"
 msgstr "分隔線是�有�設定的闊度以�是�使用方塊繪製"
 
-#: ../gtk/gtkwidget.c:3111
+#: ../gtk/gtkwidget.c:3132
 msgid "Separator Width"
 msgstr "分隔線闊度"
 
-#: ../gtk/gtkwidget.c:3112
+#: ../gtk/gtkwidget.c:3133
 msgid "The width of separators if wide-separators is TRUE"
 msgstr "如果寬分隔線為 TRUE 時的分隔線闊度"
 
-#: ../gtk/gtkwidget.c:3126
+#: ../gtk/gtkwidget.c:3147
 msgid "Separator Height"
 msgstr "分隔線高度"
 
-#: ../gtk/gtkwidget.c:3127
+#: ../gtk/gtkwidget.c:3148
 msgid "The height of separators if \"wide-separators\" is TRUE"
 msgstr "如果「寬分隔線�為 TRUE 時的分隔線高度"
 
-#: ../gtk/gtkwidget.c:3141
+#: ../gtk/gtkwidget.c:3162
 msgid "Horizontal Scroll Arrow Length"
 msgstr "水平�動列箭頭長度"
 
-#: ../gtk/gtkwidget.c:3142
+#: ../gtk/gtkwidget.c:3163
 msgid "The length of horizontal scroll arrows"
 msgstr "水平�動列箭頭的長度"
 
-#: ../gtk/gtkwidget.c:3156
+#: ../gtk/gtkwidget.c:3177
 msgid "Vertical Scroll Arrow Length"
 msgstr "垂直�動列箭頭長度"
 
-#: ../gtk/gtkwidget.c:3157
+#: ../gtk/gtkwidget.c:3178
 msgid "The length of vertical scroll arrows"
 msgstr "垂直�動列箭頭的長度"
 
-#: ../gtk/gtkwindow.c:604
+#: ../gtk/gtkwindow.c:608
 msgid "Window Type"
 msgstr "視窗類型"
 
-#: ../gtk/gtkwindow.c:605
+#: ../gtk/gtkwindow.c:609
 msgid "The type of the window"
 msgstr "視窗的類型"
 
-#: ../gtk/gtkwindow.c:613
+#: ../gtk/gtkwindow.c:617
 msgid "Window Title"
 msgstr "視窗標題"
 
-#: ../gtk/gtkwindow.c:614
+#: ../gtk/gtkwindow.c:618
 msgid "The title of the window"
 msgstr "視窗的標題"
 
-#: ../gtk/gtkwindow.c:621
+#: ../gtk/gtkwindow.c:625
 msgid "Window Role"
 msgstr "視窗角色"
 
-#: ../gtk/gtkwindow.c:622
+#: ../gtk/gtkwindow.c:626
 msgid "Unique identifier for the window to be used when restoring a session"
 msgstr "當�置程�階段時視窗的專一的識別證明"
 
-#: ../gtk/gtkwindow.c:638
+#: ../gtk/gtkwindow.c:642
 msgid "Startup ID"
 msgstr "å•Ÿå‹• ID"
 
-#: ../gtk/gtkwindow.c:639
+#: ../gtk/gtkwindow.c:643
 msgid "Unique startup identifier for the window used by startup-notification"
 msgstr "用於啓動通知的視窗�有的啟動識別證明"
 
-#: ../gtk/gtkwindow.c:647
+#: ../gtk/gtkwindow.c:651
 msgid "If TRUE, users can resize the window"
 msgstr "如設為定為‘TRUE’，使用者�以調整視窗的尺寸"
 
-#: ../gtk/gtkwindow.c:654
+#: ../gtk/gtkwindow.c:658
 msgid "Modal"
 msgstr "強制回應"
 
-#: ../gtk/gtkwindow.c:655
+#: ../gtk/gtkwindow.c:659
 msgid ""
 "If TRUE, the window is modal (other windows are not usable while this one is "
 "up)"
 msgstr "如設為定為‘TRUE’，表示該視窗是強制回應的（當顯示該視窗時其它視窗�任何輸入都�會有�應）"
 
-#: ../gtk/gtkwindow.c:662
+#: ../gtk/gtkwindow.c:666
 msgid "Window Position"
 msgstr "視窗�置"
 
-#: ../gtk/gtkwindow.c:663
+#: ../gtk/gtkwindow.c:667
 msgid "The initial position of the window"
 msgstr "視窗的起始�置"
 
-#: ../gtk/gtkwindow.c:671
+#: ../gtk/gtkwindow.c:675
 msgid "Default Width"
 msgstr "�設闊度"
 
-#: ../gtk/gtkwindow.c:672
+#: ../gtk/gtkwindow.c:676
 msgid "The default width of the window, used when initially showing the window"
 msgstr "�設的視窗闊度，在�次顯示視窗時使用"
 
-#: ../gtk/gtkwindow.c:681
+#: ../gtk/gtkwindow.c:685
 msgid "Default Height"
 msgstr "�設高度"
 
-#: ../gtk/gtkwindow.c:682
+#: ../gtk/gtkwindow.c:686
 msgid ""
 "The default height of the window, used when initially showing the window"
 msgstr "�設的視窗高度，在�次顯示視窗時使用"
 
-#: ../gtk/gtkwindow.c:691
+#: ../gtk/gtkwindow.c:695
 msgid "Destroy with Parent"
 msgstr "隨主視窗關閉"
 
-#: ../gtk/gtkwindow.c:692
+#: ../gtk/gtkwindow.c:696
 msgid "If this window should be destroyed when the parent is destroyed"
 msgstr "當關閉主視窗時是�連本視窗也一起關閉"
 
-#: ../gtk/gtkwindow.c:700
+#: ../gtk/gtkwindow.c:704
 msgid "Icon for this window"
 msgstr "本視窗所用的圖示"
 
-#: ../gtk/gtkwindow.c:706
+#: ../gtk/gtkwindow.c:722
 msgid "Mnemonics Visible"
-msgstr "記憶符�視性"
+msgstr "記憶符顯示"
 
-#: ../gtk/gtkwindow.c:707
+#: ../gtk/gtkwindow.c:723
 msgid "Whether mnemonics are currently visible in this window"
-msgstr "記憶符目�在這個視窗中是��以看得到"
+msgstr "目�在這個視窗中是��以看得到記憶符"
 
-#: ../gtk/gtkwindow.c:723
+#: ../gtk/gtkwindow.c:741
+msgid "Focus Visible"
+msgstr "焦點的顯示"
+
+#: ../gtk/gtkwindow.c:742
+msgid "Whether focus rectangles are currently visible in this window"
+msgstr "目�在這個視窗中是��以看得到焦點矩形"
+
+#: ../gtk/gtkwindow.c:758
 msgid "Name of the themed icon for this window"
 msgstr "本視窗所用的主題圖示�稱"
 
-#: ../gtk/gtkwindow.c:738
+#: ../gtk/gtkwindow.c:773
 msgid "Is Active"
 msgstr "使用中"
 
-#: ../gtk/gtkwindow.c:739
+#: ../gtk/gtkwindow.c:774
 msgid "Whether the toplevel is the current active window"
 msgstr "是�頂端為目�活動的視窗"
 
-#: ../gtk/gtkwindow.c:746
+#: ../gtk/gtkwindow.c:781
 msgid "Focus in Toplevel"
 msgstr "焦點為頂端"
 
-#: ../gtk/gtkwindow.c:747
+#: ../gtk/gtkwindow.c:782
 msgid "Whether the input focus is within this GtkWindow"
 msgstr "輸入焦點是�在該 GtkWindow 之內"
 
-#: ../gtk/gtkwindow.c:754
+#: ../gtk/gtkwindow.c:789
 msgid "Type hint"
 msgstr "類型�示"
 
-#: ../gtk/gtkwindow.c:755
+#: ../gtk/gtkwindow.c:790
 msgid ""
 "Hint to help the desktop environment understand what kind of window this is "
 "and how to treat it."
 msgstr "為桌�環境�供�示，指定它是哪一種視窗�如何處�該種視窗。"
 
-#: ../gtk/gtkwindow.c:763
+#: ../gtk/gtkwindow.c:798
 msgid "Skip taskbar"
 msgstr "忽略工作列"
 
-#: ../gtk/gtkwindow.c:764
+#: ../gtk/gtkwindow.c:799
 msgid "TRUE if the window should not be in the task bar."
 msgstr "如果�想在桌�工作列內顯示該視窗的資訊則設定為 TRUE。"
 
-#: ../gtk/gtkwindow.c:771
+#: ../gtk/gtkwindow.c:806
 msgid "Skip pager"
 msgstr "忽略�型畫�管�程�"
 
-#: ../gtk/gtkwindow.c:772
+#: ../gtk/gtkwindow.c:807
 msgid "TRUE if the window should not be in the pager."
 msgstr "如果視窗�應該在�型畫�管�程�中出�則設定為 TRUE。"
 
-#: ../gtk/gtkwindow.c:779
+#: ../gtk/gtkwindow.c:814
 msgid "Urgent"
 msgstr "緊急"
 
-#: ../gtk/gtkwindow.c:780
+#: ../gtk/gtkwindow.c:815
 msgid "TRUE if the window should be brought to the user's attention."
 msgstr "如果視窗應當�引使用者的注�，則設為‘TRUE’"
 
-#: ../gtk/gtkwindow.c:794
+#: ../gtk/gtkwindow.c:829
 msgid "Accept focus"
 msgstr "接��焦"
 
-#: ../gtk/gtkwindow.c:795
+#: ../gtk/gtkwindow.c:830
 msgid "TRUE if the window should receive the input focus."
 msgstr "如果視窗應該接�輸入�焦則設定為 TRUE。"
 
-#: ../gtk/gtkwindow.c:809
+#: ../gtk/gtkwindow.c:844
 msgid "Focus on map"
 msgstr "點�時�焦"
 
-#: ../gtk/gtkwindow.c:810
+#: ../gtk/gtkwindow.c:845
 msgid "TRUE if the window should receive the input focus when mapped."
 msgstr "如果視窗應該接�輸入�焦則設定為 TRUE。"
 
-#: ../gtk/gtkwindow.c:824
+#: ../gtk/gtkwindow.c:859
 msgid "Decorated"
 msgstr "有�飾"
 
-#: ../gtk/gtkwindow.c:825
+#: ../gtk/gtkwindow.c:860
 msgid "Whether the window should be decorated by the window manager"
 msgstr "是�視窗管�員�在視窗四周加上�飾"
 
-#: ../gtk/gtkwindow.c:839
+#: ../gtk/gtkwindow.c:874
 msgid "Deletable"
 msgstr "�刪除"
 
-#: ../gtk/gtkwindow.c:840
+#: ../gtk/gtkwindow.c:875
 msgid "Whether the window frame should have a close button"
 msgstr "視窗框架是�加上關閉按鈕"
 
-#: ../gtk/gtkwindow.c:859
+#: ../gtk/gtkwindow.c:894
 msgid "Resize grip"
 msgstr "調整大�控制"
 
-#: ../gtk/gtkwindow.c:860
+#: ../gtk/gtkwindow.c:895
 msgid "Specifies whether the window should have a resize grip"
 msgstr "指定視窗是�加上調整大�控制"
 
-#: ../gtk/gtkwindow.c:874
+#: ../gtk/gtkwindow.c:909
 msgid "Resize grip is visible"
 msgstr "顯示調整大�控制"
 
-#: ../gtk/gtkwindow.c:875
+#: ../gtk/gtkwindow.c:910
 msgid "Specifies whether the window's resize grip is visible."
 msgstr "指定視窗是�顯示調整大�控制"
 
-#: ../gtk/gtkwindow.c:891
+#: ../gtk/gtkwindow.c:926
 msgid "Gravity"
 msgstr "定�"
 
-#: ../gtk/gtkwindow.c:892
+#: ../gtk/gtkwindow.c:927
 msgid "The window gravity of the window"
 msgstr "視窗的視窗定�"
 
-#: ../gtk/gtkwindow.c:909
+#: ../gtk/gtkwindow.c:944
 msgid "Transient for Window"
 msgstr "臨時視窗"
 
-#: ../gtk/gtkwindow.c:910
+#: ../gtk/gtkwindow.c:945
 msgid "The transient parent of the dialog"
 msgstr "�話盒的臨時父項"
 
-#: ../gtk/gtkwindow.c:925
+#: ../gtk/gtkwindow.c:960
 msgid "Opacity for Window"
 msgstr "視窗的�明度"
 
-#: ../gtk/gtkwindow.c:926
+#: ../gtk/gtkwindow.c:961
 msgid "The opacity of the window, from 0 to 1"
 msgstr "視窗的�明度，從 0 到 1"
 
-#: ../gtk/gtkwindow.c:936 ../gtk/gtkwindow.c:937
+#: ../gtk/gtkwindow.c:971 ../gtk/gtkwindow.c:972
 msgid "Width of resize grip"
 msgstr "調整大�控制的闊度"
 
-#: ../gtk/gtkwindow.c:942 ../gtk/gtkwindow.c:943
+#: ../gtk/gtkwindow.c:977 ../gtk/gtkwindow.c:978
 msgid "Height of resize grip"
 msgstr "調整大�控制的高度"
 
-#: ../gtk/gtkwindow.c:965
+#: ../gtk/gtkwindow.c:1000
 msgid "GtkApplication"
 msgstr "GtkApplication"
 
-#: ../gtk/gtkwindow.c:966
+#: ../gtk/gtkwindow.c:1001
 msgid "The GtkApplication for the window"
 msgstr "視窗的 GtkApplication"
 
+#: ../modules/printbackends/cups/gtkprintercups.c:95
+msgid "Color Profile Title"
+msgstr "�色設定組�的標題"
+
+#: ../modules/printbackends/cups/gtkprintercups.c:96
+msgid "The title of the color profile to use"
+msgstr "�色設定組�使用的標題"
+
+#~ msgid "The title of the font selection dialog"
+#~ msgstr "字型�擇�話盒的標題"
+
+#~ msgid "Background color as a (possibly unallocated) GdkColor"
+#~ msgstr "以 GdkColor 方�表�（�能�未�置）的背景�色"
+
+#~ msgid "Foreground color as a (possibly unallocated) GdkColor"
+#~ msgstr "以 GdkColor 方�表� (�能�未�置) 的�景�色"
+
+#~ msgid "Paragraph background color as a (possibly unallocated) GdkColor"
+#~ msgstr "以段�背景�色作為（�能�未�置）GdkColor"
+
 #~ msgid ""
 #~ "The label for the link to the website of the program. If this is not set, "
 #~ "it defaults to the URL"
diff --git a/po-properties/zh_TW.po b/po-properties/zh_TW.po
index e9c1eb6adf..c0262fc923 100644
--- a/po-properties/zh_TW.po
+++ b/po-properties/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 3.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 20:26+0800\n"
-"PO-Revision-Date: 2011-04-04 19:47+0800\n"
+"POT-Creation-Date: 2011-08-27 10:35+0800\n"
+"PO-Revision-Date: 2011-08-27 08:05+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -99,11 +99,11 @@ msgstr "�置中的軸數"
 msgid "Display for the device manager"
 msgstr "�置管�的顯示"
 
-#: ../gdk/gdkdisplaymanager.c:158
+#: ../gdk/gdkdisplaymanager.c:162
 msgid "Default Display"
 msgstr "�設顯示�"
 
-#: ../gdk/gdkdisplaymanager.c:159
+#: ../gdk/gdkdisplaymanager.c:163
 msgid "The default display for GDK"
 msgstr "GDK 的�設顯示�"
 
@@ -123,24 +123,15 @@ msgstr "字型解�度"
 msgid "The resolution for fonts on the screen"
 msgstr "螢幕上字型的解�度"
 
-#: ../gdk/gdkwindow.c:373 ../gdk/gdkwindow.c:374
+#: ../gdk/gdkwindow.c:376 ../gdk/gdkwindow.c:377
 msgid "Cursor"
 msgstr "游標"
 
-#: ../gdk/x11/gdkdevice-xi.c:140 ../gdk/x11/gdkdevice-xi.c:141
-#: ../gdk/x11/gdkdevice-xi2.c:130
-msgid "Device ID"
-msgstr "�置 ID"
-
-#: ../gdk/x11/gdkdevice-xi2.c:131
-msgid "Device identifier"
-msgstr "�置識別符"
-
-#: ../gdk/x11/gdkdevicemanager-xi2.c:118
+#: ../gdk/x11/gdkdevicemanager-xi2.c:119
 msgid "Opcode"
 msgstr "Opcode"
 
-#: ../gdk/x11/gdkdevicemanager-xi2.c:119
+#: ../gdk/x11/gdkdevicemanager-xi2.c:120
 msgid "Opcode for XInput2 requests"
 msgstr "XInput2 �求的 Opcode"
 
@@ -152,102 +143,111 @@ msgstr "事件基礎"
 msgid "Event base for XInput events"
 msgstr "XInput 事件的事件基礎"
 
-#: ../gtk/gtkaboutdialog.c:276
+#: ../gdk/x11/gdkdevice-xi2.c:130 ../gdk/x11/gdkdevice-xi.c:140
+#: ../gdk/x11/gdkdevice-xi.c:141
+msgid "Device ID"
+msgstr "�置 ID"
+
+#: ../gdk/x11/gdkdevice-xi2.c:131
+msgid "Device identifier"
+msgstr "�置識別符"
+
+#: ../gtk/gtkaboutdialog.c:275
 msgid "Program name"
 msgstr "程��稱"
 
-#: ../gtk/gtkaboutdialog.c:277
+#: ../gtk/gtkaboutdialog.c:276
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
 msgstr "程��稱，如果沒有設定則� g_get_application_name() 的回傳值。"
 
-#: ../gtk/gtkaboutdialog.c:291
+#: ../gtk/gtkaboutdialog.c:290
 msgid "Program version"
 msgstr "程�版本"
 
-#: ../gtk/gtkaboutdialog.c:292
+#: ../gtk/gtkaboutdialog.c:291
 msgid "The version of the program"
 msgstr "程�的版本"
 
-#: ../gtk/gtkaboutdialog.c:306
+#: ../gtk/gtkaboutdialog.c:305
 msgid "Copyright string"
 msgstr "版權資訊"
 
-#: ../gtk/gtkaboutdialog.c:307
+#: ../gtk/gtkaboutdialog.c:306
 msgid "Copyright information for the program"
 msgstr "該程�的版權資訊"
 
-#: ../gtk/gtkaboutdialog.c:324
+#: ../gtk/gtkaboutdialog.c:323
 msgid "Comments string"
 msgstr "程�說明"
 
-#: ../gtk/gtkaboutdialog.c:325
+#: ../gtk/gtkaboutdialog.c:324
 msgid "Comments about the program"
 msgstr "有關該程�的說明"
 
-#: ../gtk/gtkaboutdialog.c:375
+#: ../gtk/gtkaboutdialog.c:374
 msgid "License Type"
 msgstr "授權類型"
 
-#: ../gtk/gtkaboutdialog.c:376
+#: ../gtk/gtkaboutdialog.c:375
 msgid "The license type of the program"
 msgstr "本程�的授權類型"
 
-#: ../gtk/gtkaboutdialog.c:392
+#: ../gtk/gtkaboutdialog.c:391
 msgid "Website URL"
 msgstr "網站 URL"
 
-#: ../gtk/gtkaboutdialog.c:393
+#: ../gtk/gtkaboutdialog.c:392
 msgid "The URL for the link to the website of the program"
 msgstr "代表該程�的網站的 URL 連�"
 
-#: ../gtk/gtkaboutdialog.c:407
+#: ../gtk/gtkaboutdialog.c:406
 msgid "Website label"
 msgstr "網站標籤"
 
-#: ../gtk/gtkaboutdialog.c:408
+#: ../gtk/gtkaboutdialog.c:407
 msgid "The label for the link to the website of the program"
 msgstr "代表該程�的連�的標籤"
 
-#: ../gtk/gtkaboutdialog.c:424
+#: ../gtk/gtkaboutdialog.c:423
 msgid "Authors"
 msgstr "作者"
 
-#: ../gtk/gtkaboutdialog.c:425
+#: ../gtk/gtkaboutdialog.c:424
 msgid "List of authors of the program"
 msgstr "程�作者清單"
 
-#: ../gtk/gtkaboutdialog.c:441
+#: ../gtk/gtkaboutdialog.c:440
 msgid "Documenters"
 msgstr "文件編寫員"
 
-#: ../gtk/gtkaboutdialog.c:442
+#: ../gtk/gtkaboutdialog.c:441
 msgid "List of people documenting the program"
 msgstr "為程�編寫文件的人員�單"
 
-#: ../gtk/gtkaboutdialog.c:458
+#: ../gtk/gtkaboutdialog.c:457
 msgid "Artists"
 msgstr "美工人員"
 
-#: ../gtk/gtkaboutdialog.c:459
+#: ../gtk/gtkaboutdialog.c:458
 msgid "List of people who have contributed artwork to the program"
 msgstr "為程�製作美工繪圖"
 
-#: ../gtk/gtkaboutdialog.c:476
+#: ../gtk/gtkaboutdialog.c:475
 msgid "Translator credits"
 msgstr "鳴�翻譯者"
 
-#: ../gtk/gtkaboutdialog.c:477
+#: ../gtk/gtkaboutdialog.c:476
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr "翻譯者的相關訊�。本字串應該被標記為�翻譯的字串"
 
-#: ../gtk/gtkaboutdialog.c:492
+#: ../gtk/gtkaboutdialog.c:491
 msgid "Logo"
 msgstr "標誌"
 
-#: ../gtk/gtkaboutdialog.c:493
+#: ../gtk/gtkaboutdialog.c:492
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
@@ -255,19 +255,19 @@ msgstr ""
 "「關於��話盒中的標誌，如果沒有設定則�設使用 "
 "gtk_window_get_default_icon_list() 的回傳值。"
 
-#: ../gtk/gtkaboutdialog.c:508
+#: ../gtk/gtkaboutdialog.c:507
 msgid "Logo Icon Name"
 msgstr "標誌圖示�稱"
 
-#: ../gtk/gtkaboutdialog.c:509
+#: ../gtk/gtkaboutdialog.c:508
 msgid "A named icon to use as the logo for the about box."
 msgstr "用在「關於�方塊標誌的具�圖示。"
 
-#: ../gtk/gtkaboutdialog.c:522
+#: ../gtk/gtkaboutdialog.c:521
 msgid "Wrap license"
 msgstr "授權�款�行"
 
-#: ../gtk/gtkaboutdialog.c:523
+#: ../gtk/gtkaboutdialog.c:522
 msgid "Whether to wrap the license text."
 msgstr "授權�款是��行。"
 
@@ -288,7 +288,7 @@ msgid "The widget to be monitored for accelerator changes"
 msgstr "監視該視窗元件的�徑�變化"
 
 #: ../gtk/gtkaction.c:222 ../gtk/gtkactiongroup.c:228 ../gtk/gtkprinter.c:125
-#: ../gtk/gtktextmark.c:89 ../gtk/gtkthemingengine.c:248
+#: ../gtk/gtktextmark.c:126 ../gtk/gtkthemingengine.c:256
 msgid "Name"
 msgstr "�稱"
 
@@ -296,9 +296,9 @@ msgstr "�稱"
 msgid "A unique name for the action."
 msgstr "這個指令的特定�稱。"
 
-#: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:227 ../gtk/gtkexpander.c:289
-#: ../gtk/gtkframe.c:133 ../gtk/gtklabel.c:567 ../gtk/gtkmenuitem.c:328
-#: ../gtk/gtktoolbutton.c:201 ../gtk/gtktoolitemgroup.c:1596
+#: ../gtk/gtkaction.c:241 ../gtk/gtkbutton.c:228 ../gtk/gtkexpander.c:290
+#: ../gtk/gtkframe.c:171 ../gtk/gtklabel.c:729 ../gtk/gtkmenuitem.c:383
+#: ../gtk/gtktoolbutton.c:232 ../gtk/gtktoolitemgroup.c:1592
 msgid "Label"
 msgstr "標籤"
 
@@ -330,31 +330,31 @@ msgstr "內建圖示"
 msgid "The stock icon displayed in widgets representing this action."
 msgstr "在視窗元件中代表此動作的內建圖示"
 
-#: ../gtk/gtkaction.c:304 ../gtk/gtkstatusicon.c:245
+#: ../gtk/gtkaction.c:304 ../gtk/gtkstatusicon.c:275
 msgid "GIcon"
 msgstr "GIcon"
 
-#: ../gtk/gtkaction.c:305 ../gtk/gtkcellrendererpixbuf.c:215
-#: ../gtk/gtkimage.c:329 ../gtk/gtkstatusicon.c:246
+#: ../gtk/gtkaction.c:305 ../gtk/gtkcellrendererpixbuf.c:235
+#: ../gtk/gtkimage.c:330 ../gtk/gtkstatusicon.c:276
 msgid "The GIcon being displayed"
 msgstr "準備顯示的 GIcon"
 
-#: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:180
-#: ../gtk/gtkimage.c:311 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:229
-#: ../gtk/gtkwindow.c:722
+#: ../gtk/gtkaction.c:325 ../gtk/gtkcellrendererpixbuf.c:200
+#: ../gtk/gtkimage.c:312 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:259
+#: ../gtk/gtkwindow.c:757
 msgid "Icon Name"
 msgstr "圖示�稱"
 
-#: ../gtk/gtkaction.c:326 ../gtk/gtkcellrendererpixbuf.c:181
-#: ../gtk/gtkimage.c:312 ../gtk/gtkstatusicon.c:230
+#: ../gtk/gtkaction.c:326 ../gtk/gtkcellrendererpixbuf.c:201
+#: ../gtk/gtkimage.c:313 ../gtk/gtkstatusicon.c:260
 msgid "The name of the icon from the icon theme"
 msgstr "圖示主題的圖示�稱"
 
-#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:195
+#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:194
 msgid "Visible when horizontal"
 msgstr "水平顯示時為�見"
 
-#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:196
+#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:195
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a horizontal "
 "orientation."
@@ -370,17 +370,17 @@ msgid ""
 "overflow menu."
 msgstr "當為 TRUE 時，此指令的工具�項代�會被顯示在工具列 overflow �單。"
 
-#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:202
+#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:201
 msgid "Visible when vertical"
 msgstr "垂直顯示時為�見"
 
-#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:203
+#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:202
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a vertical "
 "orientation."
 msgstr "當工具列呈垂直顯示時工具列項目是�為�見。"
 
-#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:209
+#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:208
 msgid "Is important"
 msgstr "��的"
 
@@ -401,7 +401,7 @@ msgid "When TRUE, empty menu proxies for this action are hidden."
 msgstr "當為 TRUE 時，代�此指令的空�單會被隱�。"
 
 #: ../gtk/gtkaction.c:381 ../gtk/gtkactiongroup.c:235
-#: ../gtk/gtkcellrenderer.c:290 ../gtk/gtkwidget.c:971
+#: ../gtk/gtkcellrenderer.c:290 ../gtk/gtkwidget.c:990
 msgid "Sensitive"
 msgstr "有�應"
 
@@ -410,8 +410,8 @@ msgid "Whether the action is enabled."
 msgstr "本指令是�有效。"
 
 #: ../gtk/gtkaction.c:388 ../gtk/gtkactiongroup.c:242
-#: ../gtk/gtkstatusicon.c:280 ../gtk/gtktreeviewcolumn.c:246
-#: ../gtk/gtkwidget.c:964
+#: ../gtk/gtkstatusicon.c:310 ../gtk/gtktreeviewcolumn.c:248
+#: ../gtk/gtkwidget.c:983
 msgid "Visible"
 msgstr "�見的"
 
@@ -429,11 +429,11 @@ msgid ""
 "use)."
 msgstr "本 GtkAction 相關的 GtkActionGroup，或為 NULL (用作內部使用)。"
 
-#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:183
+#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:194
 msgid "Always show image"
 msgstr "永�顯示圖片"
 
-#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:184
+#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:195
 msgid "Whether the image will always be shown"
 msgstr "是�永�顯示圖片"
 
@@ -465,8 +465,8 @@ msgstr "使用動作外觀"
 msgid "Whether to use the related actions appearance properties"
 msgstr "是�使用相關動作外觀屬性"
 
-#: ../gtk/gtkadjustment.c:123 ../gtk/gtkcellrendererprogress.c:126
-#: ../gtk/gtkscalebutton.c:217 ../gtk/gtkspinbutton.c:381
+#: ../gtk/gtkadjustment.c:123 ../gtk/gtkcellrendererprogress.c:138
+#: ../gtk/gtkscalebutton.c:218 ../gtk/gtkspinbutton.c:384
 msgid "Value"
 msgstr "數值"
 
@@ -518,7 +518,7 @@ msgstr "調整元件的分�大�"
 msgid "Horizontal alignment"
 msgstr "水平�齊設定"
 
-#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:278
+#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:279
 msgid ""
 "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
 "right aligned"
@@ -528,7 +528,7 @@ msgstr "å­�元件在æ��供的空間裡的水平å°�齊方å¼�。0.0 表示é� å·¦å°
 msgid "Vertical alignment"
 msgstr "垂直�齊設定"
 
-#: ../gtk/gtkalignment.c:148 ../gtk/gtkbutton.c:297
+#: ../gtk/gtkalignment.c:148 ../gtk/gtkbutton.c:298
 msgid ""
 "Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
 "bottom aligned"
@@ -590,114 +590,114 @@ msgstr "��留空"
 msgid "The padding to insert at the right of the widget."
 msgstr "在視窗元件��置入的留空大�。"
 
-#: ../gtk/gtkappchooserbutton.c:555
+#: ../gtk/gtkappchooserbutton.c:557
 msgid "Include an 'Other...' item"
 msgstr "包�「其他…�項目"
 
-#: ../gtk/gtkappchooserbutton.c:556
+#: ../gtk/gtkappchooserbutton.c:558
 msgid ""
 "Whether the combobox should include an item that triggers a "
 "GtkAppChooserDialog"
 msgstr "組�方塊是�應包�觸發 GtkAppChooserDialog 的項目"
 
-#: ../gtk/gtkappchooserbutton.c:568 ../gtk/gtkappchooserdialog.c:722
+#: ../gtk/gtkappchooserbutton.c:570 ../gtk/gtkappchooserdialog.c:707
 msgid "Heading"
 msgstr "標題"
 
-#: ../gtk/gtkappchooserbutton.c:569 ../gtk/gtkappchooserdialog.c:723
+#: ../gtk/gtkappchooserbutton.c:571 ../gtk/gtkappchooserdialog.c:708
 msgid "The text to show at the top of the dialog"
 msgstr "在�話盒頂端顯示的文字"
 
-#: ../gtk/gtkappchooser.c:58
+#: ../gtk/gtkappchooser.c:61
 msgid "Content type"
 msgstr "內容類型"
 
-#: ../gtk/gtkappchooser.c:59
+#: ../gtk/gtkappchooser.c:62
 msgid "The content type used by the open with object"
 msgstr "以物件開啟所使用的內容類型"
 
-#: ../gtk/gtkappchooserdialog.c:708
+#: ../gtk/gtkappchooserdialog.c:693
 msgid "GFile"
 msgstr "GFile"
 
-#: ../gtk/gtkappchooserdialog.c:709
+#: ../gtk/gtkappchooserdialog.c:694
 msgid "The GFile used by the app chooser dialog"
 msgstr "程��擇�話盒使用的 GFile"
 
-#: ../gtk/gtkappchooserwidget.c:1015
+#: ../gtk/gtkappchooserwidget.c:1016
 msgid "Show default app"
 msgstr "顯示�設的程�"
 
-#: ../gtk/gtkappchooserwidget.c:1016
+#: ../gtk/gtkappchooserwidget.c:1017
 msgid "Whether the widget should show the default application"
 msgstr "該視窗元件是�應顯示�設的應用程�"
 
-#: ../gtk/gtkappchooserwidget.c:1029
+#: ../gtk/gtkappchooserwidget.c:1030
 msgid "Show recommended apps"
 msgstr "顯示建議的程�"
 
-#: ../gtk/gtkappchooserwidget.c:1030
+#: ../gtk/gtkappchooserwidget.c:1031
 msgid "Whether the widget should show recommended applications"
 msgstr "該視窗元件是�應顯示建議的應用程�"
 
-#: ../gtk/gtkappchooserwidget.c:1043
+#: ../gtk/gtkappchooserwidget.c:1044
 msgid "Show fallback apps"
 msgstr "顯示後備程�"
 
-#: ../gtk/gtkappchooserwidget.c:1044
+#: ../gtk/gtkappchooserwidget.c:1045
 msgid "Whether the widget should show fallback applications"
 msgstr "該視窗元件是�應顯示後備的應用程�"
 
-#: ../gtk/gtkappchooserwidget.c:1056
+#: ../gtk/gtkappchooserwidget.c:1057
 msgid "Show other apps"
 msgstr "顯示其他的程�"
 
-#: ../gtk/gtkappchooserwidget.c:1057
+#: ../gtk/gtkappchooserwidget.c:1058
 msgid "Whether the widget should show other applications"
 msgstr "該視窗元件是�應顯示其他的應用程�"
 
-#: ../gtk/gtkappchooserwidget.c:1070
+#: ../gtk/gtkappchooserwidget.c:1071
 msgid "Show all apps"
 msgstr "顯示所有的程�"
 
-#: ../gtk/gtkappchooserwidget.c:1071
+#: ../gtk/gtkappchooserwidget.c:1072
 msgid "Whether the widget should show all applications"
 msgstr "該視窗元件是�應顯示所有的應用程�"
 
-#: ../gtk/gtkappchooserwidget.c:1084
+#: ../gtk/gtkappchooserwidget.c:1085
 msgid "Widget's default text"
 msgstr "視窗元件的�設文字"
 
-#: ../gtk/gtkappchooserwidget.c:1085
+#: ../gtk/gtkappchooserwidget.c:1086
 msgid "The default text appearing when there are no applications"
 msgstr "當沒有應用程�時顯示的�設文字"
 
-#: ../gtk/gtkarrow.c:110
+#: ../gtk/gtkarrow.c:112
 msgid "Arrow direction"
 msgstr "箭頭方�"
 
-#: ../gtk/gtkarrow.c:111
+#: ../gtk/gtkarrow.c:113
 msgid "The direction the arrow should point"
 msgstr "箭頭所指的方�"
 
-#: ../gtk/gtkarrow.c:119
+#: ../gtk/gtkarrow.c:121
 msgid "Arrow shadow"
 msgstr "ç®­é ­é™°å½±"
 
-#: ../gtk/gtkarrow.c:120
+#: ../gtk/gtkarrow.c:122
 msgid "Appearance of the shadow surrounding the arrow"
 msgstr "箭頭周�出�的陰影"
 
-#: ../gtk/gtkarrow.c:127 ../gtk/gtkcombobox.c:985 ../gtk/gtkmenu.c:796
-#: ../gtk/gtkmenuitem.c:391
+#: ../gtk/gtkarrow.c:129 ../gtk/gtkcombobox.c:986 ../gtk/gtkmenu.c:798
+#: ../gtk/gtkmenuitem.c:446
 msgid "Arrow Scaling"
 msgstr "箭頭縮放"
 
-#: ../gtk/gtkarrow.c:128
+#: ../gtk/gtkarrow.c:130
 msgid "Amount of space used up by arrow"
 msgstr "箭頭所佔空間大�"
 
-#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1159
+#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1178
 msgid "Horizontal Alignment"
 msgstr "水平�齊�置"
 
@@ -705,7 +705,7 @@ msgstr "水平�齊�置"
 msgid "X alignment of the child"
 msgstr "�元件的水平�齊�置"
 
-#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1175
+#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1194
 msgid "Vertical Alignment"
 msgstr "垂直�齊�置"
 
@@ -729,99 +729,99 @@ msgstr "���元件"
 msgid "Force aspect ratio to match that of the frame's child"
 msgstr "強迫設定長寬比符�該框架裡的�元件的設定"
 
-#: ../gtk/gtkassistant.c:326
+#: ../gtk/gtkassistant.c:310
 msgid "Header Padding"
 msgstr "�首留空"
 
-#: ../gtk/gtkassistant.c:327
+#: ../gtk/gtkassistant.c:311
 msgid "Number of pixels around the header."
 msgstr "�首周��留的�素數。"
 
-#: ../gtk/gtkassistant.c:334
+#: ../gtk/gtkassistant.c:318
 msgid "Content Padding"
 msgstr "內容留空"
 
-#: ../gtk/gtkassistant.c:335
+#: ../gtk/gtkassistant.c:319
 msgid "Number of pixels around the content pages."
 msgstr "內容周��留的�素數。"
 
-#: ../gtk/gtkassistant.c:351
+#: ../gtk/gtkassistant.c:335
 msgid "Page type"
 msgstr "��類型"
 
-#: ../gtk/gtkassistant.c:352
+#: ../gtk/gtkassistant.c:336
 msgid "The type of the assistant page"
 msgstr "助���的類型"
 
-#: ../gtk/gtkassistant.c:369
+#: ../gtk/gtkassistant.c:351
 msgid "Page title"
 msgstr "��標題"
 
-#: ../gtk/gtkassistant.c:370
+#: ../gtk/gtkassistant.c:352
 msgid "The title of the assistant page"
 msgstr "助���的標題"
 
-#: ../gtk/gtkassistant.c:386
+#: ../gtk/gtkassistant.c:369
 msgid "Header image"
 msgstr "�首圖片"
 
-#: ../gtk/gtkassistant.c:387
+#: ../gtk/gtkassistant.c:370
 msgid "Header image for the assistant page"
 msgstr "助���的�首圖片"
 
-#: ../gtk/gtkassistant.c:403
+#: ../gtk/gtkassistant.c:386
 msgid "Sidebar image"
 msgstr "�邊欄圖片"
 
-#: ../gtk/gtkassistant.c:404
+#: ../gtk/gtkassistant.c:387
 msgid "Sidebar image for the assistant page"
 msgstr "助���的�邊欄圖片"
 
-#: ../gtk/gtkassistant.c:419
+#: ../gtk/gtkassistant.c:403
 msgid "Page complete"
 msgstr "��完�"
 
-#: ../gtk/gtkassistant.c:420
+#: ../gtk/gtkassistant.c:404
 msgid "Whether all required fields on the page have been filled out"
 msgstr "在此��中所有�求的欄�是�已填好"
 
-#: ../gtk/gtkbbox.c:152
+#: ../gtk/gtkbbox.c:159
 msgid "Minimum child width"
 msgstr "�元件寬度下�"
 
-#: ../gtk/gtkbbox.c:153
+#: ../gtk/gtkbbox.c:160
 msgid "Minimum width of buttons inside the box"
 msgstr "在按鈕方塊內按鈕的寬度下�"
 
-#: ../gtk/gtkbbox.c:161
+#: ../gtk/gtkbbox.c:168
 msgid "Minimum child height"
 msgstr "�元件高度下�"
 
-#: ../gtk/gtkbbox.c:162
+#: ../gtk/gtkbbox.c:169
 msgid "Minimum height of buttons inside the box"
 msgstr "在按鈕方塊內按鈕的高度下�"
 
-#: ../gtk/gtkbbox.c:170
+#: ../gtk/gtkbbox.c:177
 msgid "Child internal width padding"
 msgstr "�元件內部留空寬度"
 
-#: ../gtk/gtkbbox.c:171
+#: ../gtk/gtkbbox.c:178
 msgid "Amount to increase child's size on either side"
 msgstr "副元件左�兩邊增加的尺寸"
 
-#: ../gtk/gtkbbox.c:179
+#: ../gtk/gtkbbox.c:186
 msgid "Child internal height padding"
 msgstr "副元件內部高度留邊"
 
-#: ../gtk/gtkbbox.c:180
+#: ../gtk/gtkbbox.c:187
 msgid "Amount to increase child's size on the top and bottom"
 msgstr "�元件頂部�底部欲增加的尺寸"
 
-#: ../gtk/gtkbbox.c:188
+#: ../gtk/gtkbbox.c:195
 msgid "Layout style"
 msgstr "呈�樣�"
 
-#: ../gtk/gtkbbox.c:189
+#: ../gtk/gtkbbox.c:196
 msgid ""
 "How to lay out the buttons in the box. Possible values are: spread, edge, "
 "start and end"
@@ -829,49 +829,59 @@ msgstr ""
 "如何呈�方塊中的按鈕。�使用的值為「spread�(分散)�「edge�(邊緣)�「start�"
 "(開頭) �「end�(�尾)"
 
-#: ../gtk/gtkbbox.c:197
+#: ../gtk/gtkbbox.c:204
 msgid "Secondary"
 msgstr "次�的"
 
-#: ../gtk/gtkbbox.c:198
+#: ../gtk/gtkbbox.c:205
 msgid ""
 "If TRUE, the child appears in a secondary group of children, suitable for, e."
 "g., help buttons"
 msgstr "如設為定為‘TRUE’，�元件將出�於次�的�元件群組中，�用於：求助按鈕"
 
-#: ../gtk/gtkbox.c:239 ../gtk/gtkcellareabox.c:318 ../gtk/gtkexpander.c:313
-#: ../gtk/gtkiconview.c:645 ../gtk/gtktreeviewcolumn.c:271
+#: ../gtk/gtkbbox.c:212
+#, fuzzy
+msgid "Non-Homogeneous"
+msgstr "列高一致"
+
+#: ../gtk/gtkbbox.c:213
+#, fuzzy
+msgid "If TRUE, the child will not be subject to homogeneous sizing"
+msgstr "如設為定為‘TRUE’，�元件�以比原本指定的大�更�"
+
+#: ../gtk/gtkbox.c:241 ../gtk/gtkcellareabox.c:317 ../gtk/gtkexpander.c:314
+#: ../gtk/gtkiconview.c:643 ../gtk/gtktreeviewcolumn.c:283
 msgid "Spacing"
 msgstr "é–“è·�"
 
-#: ../gtk/gtkbox.c:240
+#: ../gtk/gtkbox.c:242
 msgid "The amount of space between children"
 msgstr "�元件之間的間�"
 
-#: ../gtk/gtkbox.c:249 ../gtk/gtktable.c:193 ../gtk/gtktoolbar.c:551
-#: ../gtk/gtktoolitemgroup.c:1649
+#: ../gtk/gtkbox.c:251 ../gtk/gtktable.c:227 ../gtk/gtktoolbar.c:563
+#: ../gtk/gtktoolitemgroup.c:1645
 msgid "Homogeneous"
 msgstr "尺寸一致"
 
-#: ../gtk/gtkbox.c:250
+#: ../gtk/gtkbox.c:252
 msgid "Whether the children should all be the same size"
 msgstr "�元件的大�應�全部相�"
 
-#: ../gtk/gtkbox.c:270 ../gtk/gtkcellareabox.c:338 ../gtk/gtktoolbar.c:543
-#: ../gtk/gtktoolitemgroup.c:1656 ../gtk/gtktoolpalette.c:1101
-#: ../gtk/gtktreeviewcolumn.c:327
+#: ../gtk/gtkbox.c:272 ../gtk/gtkcellareabox.c:337 ../gtk/gtktoolbar.c:555
+#: ../gtk/gtktoolitemgroup.c:1652 ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktreeviewcolumn.c:339
 msgid "Expand"
 msgstr "æ“´å¼µ"
 
-#: ../gtk/gtkbox.c:271
+#: ../gtk/gtkbox.c:273
 msgid "Whether the child should receive extra space when the parent grows"
 msgstr "當�元件擴展開來時�元件應��時隨之擴張"
 
-#: ../gtk/gtkbox.c:287 ../gtk/gtktoolitemgroup.c:1663
+#: ../gtk/gtkbox.c:289 ../gtk/gtktoolitemgroup.c:1659
 msgid "Fill"
 msgstr "填滿"
 
-#: ../gtk/gtkbox.c:288
+#: ../gtk/gtkbox.c:290
 msgid ""
 "Whether extra space given to the child should be allocated to the child or "
 "used as padding"
@@ -879,31 +889,31 @@ msgstr ""
 "當分�了�外的空間給�元件時，該空間應增加於�元件內部的尺寸，還是作為元件外"
 "部留空使用"
 
-#: ../gtk/gtkbox.c:295 ../gtk/gtktrayicon-x11.c:169
+#: ../gtk/gtkbox.c:297 ../gtk/gtktrayicon-x11.c:169
 msgid "Padding"
 msgstr "留空"
 
-#: ../gtk/gtkbox.c:296
+#: ../gtk/gtkbox.c:298
 msgid "Extra space to put between the child and its neighbors, in pixels"
 msgstr "加入�外的空�隔開�元件�周�的元件，以�素為單�"
 
-#: ../gtk/gtkbox.c:302
+#: ../gtk/gtkbox.c:304
 msgid "Pack type"
 msgstr "排列方�"
 
-#: ../gtk/gtkbox.c:303
+#: ../gtk/gtkbox.c:305
 msgid ""
 "A GtkPackType indicating whether the child is packed with reference to the "
 "start or end of the parent"
 msgstr ""
 "GtkPackType �指�元件的排列方�是從主元件的開始�置，還是從���置進行排列"
 
-#: ../gtk/gtkbox.c:309 ../gtk/gtknotebook.c:760 ../gtk/gtkpaned.c:326
-#: ../gtk/gtktoolitemgroup.c:1677
+#: ../gtk/gtkbox.c:311 ../gtk/gtknotebook.c:769 ../gtk/gtkpaned.c:349
+#: ../gtk/gtktoolitemgroup.c:1673
 msgid "Position"
 msgstr "�置"
 
-#: ../gtk/gtkbox.c:310 ../gtk/gtknotebook.c:761
+#: ../gtk/gtkbox.c:312 ../gtk/gtknotebook.c:770
 msgid "The index of the child in the parent"
 msgstr "�元件在�元件中的索引編號"
 
@@ -915,271 +925,271 @@ msgstr "翻譯網域"
 msgid "The translation domain used by gettext"
 msgstr "gettext 使用的翻譯網域"
 
-#: ../gtk/gtkbutton.c:228
+#: ../gtk/gtkbutton.c:229
 msgid ""
 "Text of the label widget inside the button, if the button contains a label "
 "widget"
 msgstr "如果按鈕中有標籤元件，指定該標籤元件中的文字"
 
-#: ../gtk/gtkbutton.c:235 ../gtk/gtkexpander.c:297 ../gtk/gtklabel.c:588
-#: ../gtk/gtkmenuitem.c:343 ../gtk/gtktoolbutton.c:208
+#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:298 ../gtk/gtklabel.c:750
+#: ../gtk/gtkmenuitem.c:398 ../gtk/gtktoolbutton.c:239
 msgid "Use underline"
 msgstr "使用底線"
 
-#: ../gtk/gtkbutton.c:236 ../gtk/gtkexpander.c:298 ../gtk/gtklabel.c:589
-#: ../gtk/gtkmenuitem.c:344
+#: ../gtk/gtkbutton.c:237 ../gtk/gtkexpander.c:299 ../gtk/gtklabel.c:751
+#: ../gtk/gtkmenuitem.c:399
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "如果設定，文字的底線表示其後的字元應該當��徑�"
 
-#: ../gtk/gtkbutton.c:243 ../gtk/gtkimagemenuitem.c:164
+#: ../gtk/gtkbutton.c:244 ../gtk/gtkimagemenuitem.c:175
 msgid "Use stock"
 msgstr "使用內建"
 
-#: ../gtk/gtkbutton.c:244
+#: ../gtk/gtkbutton.c:245
 msgid ""
 "If set, the label is used to pick a stock item instead of being displayed"
 msgstr "若設置，該標籤內容用來指定內建圖示而�會被顯示"
 
-#: ../gtk/gtkbutton.c:251 ../gtk/gtkcombobox.c:791
-#: ../gtk/gtkfilechooserbutton.c:383
+#: ../gtk/gtkbutton.c:252 ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkfilechooserbutton.c:426
 msgid "Focus on click"
 msgstr "點�時�焦"
 
-#: ../gtk/gtkbutton.c:252 ../gtk/gtkfilechooserbutton.c:384
+#: ../gtk/gtkbutton.c:253 ../gtk/gtkfilechooserbutton.c:427
 msgid "Whether the button grabs focus when it is clicked with the mouse"
 msgstr "當該按鈕被滑鼠點�時是�自動�得焦點"
 
-#: ../gtk/gtkbutton.c:259
+#: ../gtk/gtkbutton.c:260
 msgid "Border relief"
 msgstr "邊緣樣�"
 
-#: ../gtk/gtkbutton.c:260
+#: ../gtk/gtkbutton.c:261
 msgid "The border relief style"
 msgstr "邊緣的樣�"
 
-#: ../gtk/gtkbutton.c:277
+#: ../gtk/gtkbutton.c:278
 msgid "Horizontal alignment for child"
 msgstr "�元件水平�齊"
 
-#: ../gtk/gtkbutton.c:296
+#: ../gtk/gtkbutton.c:297
 msgid "Vertical alignment for child"
 msgstr "�元件垂直�齊�置"
 
-#: ../gtk/gtkbutton.c:313 ../gtk/gtkimagemenuitem.c:149
+#: ../gtk/gtkbutton.c:314 ../gtk/gtkimagemenuitem.c:160
 msgid "Image widget"
 msgstr "圖片元件"
 
-#: ../gtk/gtkbutton.c:314
+#: ../gtk/gtkbutton.c:315
 msgid "Child widget to appear next to the button text"
 msgstr "按鈕文字�邊顯示的�元件"
 
-#: ../gtk/gtkbutton.c:328
+#: ../gtk/gtkbutton.c:329
 msgid "Image position"
 msgstr "圖片�置"
 
-#: ../gtk/gtkbutton.c:329
+#: ../gtk/gtkbutton.c:330
 msgid "The position of the image relative to the text"
 msgstr "圖片相�於文字的�置"
 
-#: ../gtk/gtkbutton.c:449
+#: ../gtk/gtkbutton.c:450
 msgid "Default Spacing"
 msgstr "�設間隔"
 
-#: ../gtk/gtkbutton.c:450
+#: ../gtk/gtkbutton.c:451
 msgid "Extra space to add for GTK_CAN_DEFAULT buttons"
 msgstr "加給 GTK_CAN_DEFAULT 的�外空間"
 
-#: ../gtk/gtkbutton.c:464
+#: ../gtk/gtkbutton.c:465
 msgid "Default Outside Spacing"
 msgstr "�設外部間隔"
 
-#: ../gtk/gtkbutton.c:465
+#: ../gtk/gtkbutton.c:466
 msgid ""
 "Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside "
 "the border"
 msgstr "加給 GTK_CAN_DEFAULT 按鈕邊緣外部的�外空間"
 
-#: ../gtk/gtkbutton.c:470
+#: ../gtk/gtkbutton.c:471
 msgid "Child X Displacement"
 msgstr "�元件的水平�移�離"
 
-#: ../gtk/gtkbutton.c:471
+#: ../gtk/gtkbutton.c:472
 msgid ""
 "How far in the x direction to move the child when the button is depressed"
 msgstr "當按鈕按下時期�元件應�移多�的水平�離"
 
-#: ../gtk/gtkbutton.c:478
+#: ../gtk/gtkbutton.c:479
 msgid "Child Y Displacement"
 msgstr "�元件的垂直�移�離"
 
-#: ../gtk/gtkbutton.c:479
+#: ../gtk/gtkbutton.c:480
 msgid ""
 "How far in the y direction to move the child when the button is depressed"
 msgstr "當按鈕按下時期�元件應�移多�的垂直�離"
 
-#: ../gtk/gtkbutton.c:495
+#: ../gtk/gtkbutton.c:496
 msgid "Displace focus"
 msgstr "焦點�移"
 
-#: ../gtk/gtkbutton.c:496
+#: ../gtk/gtkbutton.c:497
 msgid ""
 "Whether the child_displacement_x/_y properties should also affect the focus "
 "rectangle"
 msgstr "child_displacement_x/_y 屬性是�也影響焦點方塊"
 
-#: ../gtk/gtkbutton.c:509 ../gtk/gtkentry.c:789 ../gtk/gtkentry.c:1864
+#: ../gtk/gtkbutton.c:510 ../gtk/gtkentry.c:794 ../gtk/gtkentry.c:1869
 msgid "Inner Border"
 msgstr "內部框線"
 
-#: ../gtk/gtkbutton.c:510
+#: ../gtk/gtkbutton.c:511
 msgid "Border between button edges and child."
 msgstr "在按鈕邊緣與�項之間的框線。"
 
-#: ../gtk/gtkbutton.c:523
+#: ../gtk/gtkbutton.c:524
 msgid "Image spacing"
 msgstr "圖片間�"
 
-#: ../gtk/gtkbutton.c:524
+#: ../gtk/gtkbutton.c:525
 msgid "Spacing in pixels between the image and label"
 msgstr "圖片與文字標籤的之間的�離(�素)"
 
-#: ../gtk/gtkcalendar.c:468
+#: ../gtk/gtkcalendar.c:470
 msgid "Year"
 msgstr "å¹´"
 
-#: ../gtk/gtkcalendar.c:469
+#: ../gtk/gtkcalendar.c:471
 msgid "The selected year"
 msgstr "��的年份"
 
-#: ../gtk/gtkcalendar.c:482
+#: ../gtk/gtkcalendar.c:484
 msgid "Month"
 msgstr "月"
 
-#: ../gtk/gtkcalendar.c:483
+#: ../gtk/gtkcalendar.c:485
 msgid "The selected month (as a number between 0 and 11)"
 msgstr "��的月份（為 0 - 11 之間的數字）"
 
-#: ../gtk/gtkcalendar.c:497
+#: ../gtk/gtkcalendar.c:499
 msgid "Day"
 msgstr "天"
 
-#: ../gtk/gtkcalendar.c:498
+#: ../gtk/gtkcalendar.c:500
 msgid ""
 "The selected day (as a number between 1 and 31, or 0 to unselect the "
 "currently selected day)"
 msgstr "��的日期（為 1 - 31 之間的數字，或為 0 表示解除��目���的日期）"
 
-#: ../gtk/gtkcalendar.c:512
+#: ../gtk/gtkcalendar.c:514
 msgid "Show Heading"
 msgstr "顯示標頭"
 
-#: ../gtk/gtkcalendar.c:513
+#: ../gtk/gtkcalendar.c:515
 msgid "If TRUE, a heading is displayed"
 msgstr "如設為定為‘TRUE’，則顯示月份�年份標頭"
 
-#: ../gtk/gtkcalendar.c:527
+#: ../gtk/gtkcalendar.c:529
 msgid "Show Day Names"
 msgstr "顯示星期"
 
-#: ../gtk/gtkcalendar.c:528
+#: ../gtk/gtkcalendar.c:530
 msgid "If TRUE, day names are displayed"
 msgstr "如設為定為‘TRUE’，星期�會被顯示"
 
-#: ../gtk/gtkcalendar.c:541
+#: ../gtk/gtkcalendar.c:543
 msgid "No Month Change"
 msgstr "�變更月份"
 
-#: ../gtk/gtkcalendar.c:542
+#: ../gtk/gtkcalendar.c:544
 msgid "If TRUE, the selected month cannot be changed"
 msgstr "如設為定為‘TRUE’，�定的月份無法更改"
 
-#: ../gtk/gtkcalendar.c:556
+#: ../gtk/gtkcalendar.c:558
 msgid "Show Week Numbers"
 msgstr "顯示週數"
 
-#: ../gtk/gtkcalendar.c:557
+#: ../gtk/gtkcalendar.c:559
 msgid "If TRUE, week numbers are displayed"
 msgstr "如設為定為‘TRUE’，週次會被顯示"
 
-#: ../gtk/gtkcalendar.c:572
+#: ../gtk/gtkcalendar.c:574
 msgid "Details Width"
 msgstr "詳細資訊寬度"
 
-#: ../gtk/gtkcalendar.c:573
+#: ../gtk/gtkcalendar.c:575
 msgid "Details width in characters"
 msgstr "詳細資訊寬度（以字元計）"
 
-#: ../gtk/gtkcalendar.c:588
+#: ../gtk/gtkcalendar.c:590
 msgid "Details Height"
 msgstr "詳細資訊高度"
 
-#: ../gtk/gtkcalendar.c:589
+#: ../gtk/gtkcalendar.c:591
 msgid "Details height in rows"
 msgstr "列的詳細資訊高度"
 
-#: ../gtk/gtkcalendar.c:605
+#: ../gtk/gtkcalendar.c:607
 msgid "Show Details"
 msgstr "顯示詳細資料"
 
-#: ../gtk/gtkcalendar.c:606
+#: ../gtk/gtkcalendar.c:608
 msgid "If TRUE, details are shown"
 msgstr "如設為定為‘TRUE’，會顯示詳細資訊"
 
-#: ../gtk/gtkcalendar.c:618
+#: ../gtk/gtkcalendar.c:620
 msgid "Inner border"
 msgstr "內部框線"
 
-#: ../gtk/gtkcalendar.c:619
+#: ../gtk/gtkcalendar.c:621
 msgid "Inner border space"
 msgstr "內部框線間�"
 
-#: ../gtk/gtkcalendar.c:630
+#: ../gtk/gtkcalendar.c:632
 msgid "Vertical separation"
 msgstr "垂直分隔"
 
-#: ../gtk/gtkcalendar.c:631
+#: ../gtk/gtkcalendar.c:633
 msgid "Space between day headers and main area"
 msgstr "日標題與主��域之間的間�"
 
-#: ../gtk/gtkcalendar.c:642
+#: ../gtk/gtkcalendar.c:644
 msgid "Horizontal separation"
 msgstr "水平分隔"
 
-#: ../gtk/gtkcalendar.c:643
+#: ../gtk/gtkcalendar.c:645
 msgid "Space between week headers and main area"
 msgstr "週標題與主��域之間的間�"
 
-#: ../gtk/gtkcellareabox.c:319 ../gtk/gtktreeviewcolumn.c:272
+#: ../gtk/gtkcellareabox.c:318 ../gtk/gtktreeviewcolumn.c:284
 msgid "Space which is inserted between cells"
 msgstr "�入格�之間的間隔"
 
-#: ../gtk/gtkcellareabox.c:339
+#: ../gtk/gtkcellareabox.c:338
 msgid "Whether the cell expands"
 msgstr "該格�是�展開"
 
-#: ../gtk/gtkcellareabox.c:354
+#: ../gtk/gtkcellareabox.c:353
 msgid "Align"
 msgstr "�齊"
 
-#: ../gtk/gtkcellareabox.c:355
+#: ../gtk/gtkcellareabox.c:354
 msgid "Whether cell should align with adjacent rows"
 msgstr "格�是�應與鄰近的列�齊"
 
-#: ../gtk/gtkcellareabox.c:371
+#: ../gtk/gtkcellareabox.c:370
 msgid "Fixed Size"
 msgstr "固定大�"
 
-#: ../gtk/gtkcellareabox.c:372
+#: ../gtk/gtkcellareabox.c:371
 msgid "Whether cells should be the same size in all rows"
 msgstr "格�是�應與所有的列相�大�"
 
-#: ../gtk/gtkcellareabox.c:388
+#: ../gtk/gtkcellareabox.c:387
 msgid "Pack Type"
 msgstr "排列方�"
 
-#: ../gtk/gtkcellareabox.c:389
+#: ../gtk/gtkcellareabox.c:388
 msgid ""
 "A GtkPackType indicating whether the cell is packed with reference to the "
 "start or end of the cell area"
@@ -1210,28 +1220,28 @@ msgstr "編輯視窗元件"
 msgid "The widget currently editing the edited cell"
 msgstr "目�用來編輯格�的視窗元件"
 
-#: ../gtk/gtkcellareacontext.c:127
+#: ../gtk/gtkcellareacontext.c:119
 msgid "Area"
 msgstr "�域"
 
-#: ../gtk/gtkcellareacontext.c:128
+#: ../gtk/gtkcellareacontext.c:120
 msgid "The Cell Area this context was created for"
 msgstr "這個�項建立的格��域"
 
-#: ../gtk/gtkcellareacontext.c:144 ../gtk/gtkcellareacontext.c:163
-#: ../gtk/gtktreeviewcolumn.c:299
+#: ../gtk/gtkcellareacontext.c:136 ../gtk/gtkcellareacontext.c:155
+#: ../gtk/gtktreeviewcolumn.c:311
 msgid "Minimum Width"
 msgstr "最�寬度"
 
-#: ../gtk/gtkcellareacontext.c:145 ../gtk/gtkcellareacontext.c:164
+#: ../gtk/gtkcellareacontext.c:137 ../gtk/gtkcellareacontext.c:156
 msgid "Minimum cached width"
 msgstr "最�快�寬度"
 
-#: ../gtk/gtkcellareacontext.c:182 ../gtk/gtkcellareacontext.c:201
+#: ../gtk/gtkcellareacontext.c:174 ../gtk/gtkcellareacontext.c:193
 msgid "Minimum Height"
 msgstr "最�高度"
 
-#: ../gtk/gtkcellareacontext.c:183 ../gtk/gtkcellareacontext.c:202
+#: ../gtk/gtkcellareacontext.c:175 ../gtk/gtkcellareacontext.c:194
 msgid "Minimum cached height"
 msgstr "最�快�高度"
 
@@ -1243,35 +1253,35 @@ msgstr "編輯已�消"
 msgid "Indicates that editing has been canceled"
 msgstr "表示編輯動作已被�消"
 
-#: ../gtk/gtkcellrendereraccel.c:137
+#: ../gtk/gtkcellrendereraccel.c:152
 msgid "Accelerator key"
 msgstr "�徑�"
 
-#: ../gtk/gtkcellrendereraccel.c:138
+#: ../gtk/gtkcellrendereraccel.c:153
 msgid "The keyval of the accelerator"
 msgstr "�徑�的�值"
 
-#: ../gtk/gtkcellrendereraccel.c:154
+#: ../gtk/gtkcellrendereraccel.c:169
 msgid "Accelerator modifiers"
 msgstr "�徑�的特殊按�（例如 Alt�Ctrl）"
 
-#: ../gtk/gtkcellrendereraccel.c:155
+#: ../gtk/gtkcellrendereraccel.c:170
 msgid "The modifier mask of the accelerator"
 msgstr "�徑�的修飾字�罩"
 
-#: ../gtk/gtkcellrendereraccel.c:172
+#: ../gtk/gtkcellrendereraccel.c:187
 msgid "Accelerator keycode"
 msgstr "�徑�碼"
 
-#: ../gtk/gtkcellrendereraccel.c:173
+#: ../gtk/gtkcellrendereraccel.c:188
 msgid "The hardware keycode of the accelerator"
 msgstr "�徑�的硬體按�碼"
 
-#: ../gtk/gtkcellrendereraccel.c:192
+#: ../gtk/gtkcellrendereraccel.c:207
 msgid "Accelerator Mode"
 msgstr "�徑�模�"
 
-#: ../gtk/gtkcellrendereraccel.c:193
+#: ../gtk/gtkcellrendereraccel.c:208
 msgid "The type of accelerators"
 msgstr "�徑�類型"
 
@@ -1399,175 +1409,175 @@ msgstr "格�背景設定"
 msgid "Whether this tag affects the cell background color"
 msgstr "本標記�以變動該格�的背景�色"
 
-#: ../gtk/gtkcellrenderercombo.c:109
+#: ../gtk/gtkcellrenderercombo.c:130
 msgid "Model"
 msgstr "模型"
 
-#: ../gtk/gtkcellrenderercombo.c:110
+#: ../gtk/gtkcellrenderercombo.c:131
 msgid "The model containing the possible values for the combo box"
 msgstr "該組�方塊的模型（包��能的數值）"
 
-#: ../gtk/gtkcellrenderercombo.c:132
+#: ../gtk/gtkcellrenderercombo.c:153
 msgid "Text Column"
 msgstr "文字格�"
 
-#: ../gtk/gtkcellrenderercombo.c:133
+#: ../gtk/gtkcellrenderercombo.c:154
 msgid "A column in the data source model to get the strings from"
 msgstr "從資料來�模型�得字串資料的欄�"
 
-#: ../gtk/gtkcellrenderercombo.c:150 ../gtk/gtkcombobox.c:858
+#: ../gtk/gtkcellrenderercombo.c:171 ../gtk/gtkcombobox.c:859
 msgid "Has Entry"
 msgstr "具有欄�"
 
-#: ../gtk/gtkcellrenderercombo.c:151
+#: ../gtk/gtkcellrenderercombo.c:172
 msgid "If FALSE, don't allow to enter strings other than the chosen ones"
 msgstr "如果為 FALSE，將��許輸入�定字串以外的字"
 
-#: ../gtk/gtkcellrendererpixbuf.c:120
+#: ../gtk/gtkcellrendererpixbuf.c:140
 msgid "Pixbuf Object"
 msgstr "Pixbuf 物件"
 
-#: ../gtk/gtkcellrendererpixbuf.c:121
+#: ../gtk/gtkcellrendererpixbuf.c:141
 msgid "The pixbuf to render"
 msgstr "準備�繪的 pixbuf。"
 
-#: ../gtk/gtkcellrendererpixbuf.c:128
+#: ../gtk/gtkcellrendererpixbuf.c:148
 msgid "Pixbuf Expander Open"
 msgstr "Pixbuf 開展器開啟"
 
-#: ../gtk/gtkcellrendererpixbuf.c:129
+#: ../gtk/gtkcellrendererpixbuf.c:149
 msgid "Pixbuf for open expander"
 msgstr "用來開啟開展器的 Pixbuf"
 
-#: ../gtk/gtkcellrendererpixbuf.c:136
+#: ../gtk/gtkcellrendererpixbuf.c:156
 msgid "Pixbuf Expander Closed"
 msgstr "Pixbuf 開展器關閉"
 
-#: ../gtk/gtkcellrendererpixbuf.c:137
+#: ../gtk/gtkcellrendererpixbuf.c:157
 msgid "Pixbuf for closed expander"
 msgstr "用來關閉開展器的 Pixbuf"
 
-#: ../gtk/gtkcellrendererpixbuf.c:144 ../gtk/gtkimage.c:253
-#: ../gtk/gtkstatusicon.c:221
+#: ../gtk/gtkcellrendererpixbuf.c:164 ../gtk/gtkimage.c:254
+#: ../gtk/gtkstatusicon.c:251
 msgid "Stock ID"
 msgstr "內建圖示代碼"
 
-#: ../gtk/gtkcellrendererpixbuf.c:145
+#: ../gtk/gtkcellrendererpixbuf.c:165
 msgid "The stock ID of the stock icon to render"
 msgstr "準備顯示的內建圖示的代碼"
 
-#: ../gtk/gtkcellrendererpixbuf.c:152 ../gtk/gtkcellrendererspinner.c:151
-#: ../gtk/gtkrecentmanager.c:309 ../gtk/gtkstatusicon.c:262
+#: ../gtk/gtkcellrendererpixbuf.c:172 ../gtk/gtkcellrendererspinner.c:151
+#: ../gtk/gtkrecentmanager.c:309 ../gtk/gtkstatusicon.c:292
 msgid "Size"
 msgstr "大�"
 
-#: ../gtk/gtkcellrendererpixbuf.c:153
+#: ../gtk/gtkcellrendererpixbuf.c:173
 msgid "The GtkIconSize value that specifies the size of the rendered icon"
 msgstr "指定所��繪的圖示尺寸 (GtkIconSize)"
 
-#: ../gtk/gtkcellrendererpixbuf.c:162
+#: ../gtk/gtkcellrendererpixbuf.c:182
 msgid "Detail"
 msgstr "細節"
 
-#: ../gtk/gtkcellrendererpixbuf.c:163
+#: ../gtk/gtkcellrendererpixbuf.c:183
 msgid "Render detail to pass to the theme engine"
 msgstr "�傳�給布景主題引擎的�繪細節"
 
-#: ../gtk/gtkcellrendererpixbuf.c:196
+#: ../gtk/gtkcellrendererpixbuf.c:216
 msgid "Follow State"
 msgstr "跟隨狀態"
 
-#: ../gtk/gtkcellrendererpixbuf.c:197
+#: ../gtk/gtkcellrendererpixbuf.c:217
 msgid "Whether the rendered pixbuf should be colorized according to the state"
 msgstr "rendered pixbuf 是�跟隨狀狀著色"
 
-#: ../gtk/gtkcellrendererpixbuf.c:214 ../gtk/gtkimage.c:328
-#: ../gtk/gtkwindow.c:699
+#: ../gtk/gtkcellrendererpixbuf.c:234 ../gtk/gtkimage.c:329
+#: ../gtk/gtkwindow.c:703
 msgid "Icon"
 msgstr "圖示"
 
-#: ../gtk/gtkcellrendererprogress.c:127
+#: ../gtk/gtkcellrendererprogress.c:139
 msgid "Value of the progress bar"
 msgstr "進度列中所顯示的數值"
 
-#: ../gtk/gtkcellrendererprogress.c:144 ../gtk/gtkcellrenderertext.c:255
-#: ../gtk/gtkentry.c:832 ../gtk/gtkentrybuffer.c:352
-#: ../gtk/gtkmessagedialog.c:227 ../gtk/gtkprogressbar.c:177
-#: ../gtk/gtktextbuffer.c:210
+#: ../gtk/gtkcellrendererprogress.c:156 ../gtk/gtkcellrenderertext.c:254
+#: ../gtk/gtkentrybuffer.c:352 ../gtk/gtkentry.c:837
+#: ../gtk/gtkmessagedialog.c:229 ../gtk/gtkprogressbar.c:176
+#: ../gtk/gtktextbuffer.c:221
 msgid "Text"
 msgstr "文字"
 
-#: ../gtk/gtkcellrendererprogress.c:145
+#: ../gtk/gtkcellrendererprogress.c:157
 msgid "Text on the progress bar"
 msgstr "進度列中所顯示的文字"
 
-#: ../gtk/gtkcellrendererprogress.c:168 ../gtk/gtkcellrendererspinner.c:137
+#: ../gtk/gtkcellrendererprogress.c:180 ../gtk/gtkcellrendererspinner.c:137
 msgid "Pulse"
 msgstr "脈�"
 
-#: ../gtk/gtkcellrendererprogress.c:169
+#: ../gtk/gtkcellrendererprogress.c:181
 msgid ""
 "Set this to positive values to indicate that some progress is made, but you "
 "don't know how much."
 msgstr "將此項設為正值以表示已有�些進度，但您�知�實際有多少。"
 
-#: ../gtk/gtkcellrendererprogress.c:185
+#: ../gtk/gtkcellrendererprogress.c:197
 msgid "Text x alignment"
 msgstr "文字水平�齊方�"
 
-#: ../gtk/gtkcellrendererprogress.c:186
+#: ../gtk/gtkcellrendererprogress.c:198
 msgid ""
 "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
 msgstr "文字水平方��齊，從 0 (左)到 1 (�)。相��為�至左 (RTL) 排列。"
 
-#: ../gtk/gtkcellrendererprogress.c:202
+#: ../gtk/gtkcellrendererprogress.c:214
 msgid "Text y alignment"
 msgstr "文字垂直�齊方�"
 
-#: ../gtk/gtkcellrendererprogress.c:203
+#: ../gtk/gtkcellrendererprogress.c:215
 msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
 msgstr "文字垂直�齊方�，從 0（頂）到 1（底）。"
 
-#: ../gtk/gtkcellrendererprogress.c:214 ../gtk/gtkprogressbar.c:153
-#: ../gtk/gtkrange.c:424
+#: ../gtk/gtkcellrendererprogress.c:226 ../gtk/gtkprogressbar.c:152
+#: ../gtk/gtkrange.c:426
 msgid "Inverted"
 msgstr "�轉的"
 
-#: ../gtk/gtkcellrendererprogress.c:215 ../gtk/gtkprogressbar.c:154
+#: ../gtk/gtkcellrendererprogress.c:227 ../gtk/gtkprogressbar.c:153
 msgid "Invert the direction in which the progress bar grows"
 msgstr "�轉進度增加的方�"
 
-#: ../gtk/gtkcellrendererspin.c:91 ../gtk/gtkrange.c:416
-#: ../gtk/gtkscalebutton.c:236 ../gtk/gtkspinbutton.c:320
+#: ../gtk/gtkcellrendererspin.c:113 ../gtk/gtkrange.c:418
+#: ../gtk/gtkscalebutton.c:237 ../gtk/gtkspinbutton.c:323
 msgid "Adjustment"
 msgstr "調整"
 
-#: ../gtk/gtkcellrendererspin.c:92 ../gtk/gtkspinbutton.c:321
+#: ../gtk/gtkcellrendererspin.c:114 ../gtk/gtkspinbutton.c:324
 msgid "The adjustment that holds the value of the spin button"
 msgstr "�有微調按鈕數值的調整元件"
 
-#: ../gtk/gtkcellrendererspin.c:107
+#: ../gtk/gtkcellrendererspin.c:129
 msgid "Climb rate"
 msgstr "數值調整速率"
 
-#: ../gtk/gtkcellrendererspin.c:108 ../gtk/gtkspinbutton.c:329
+#: ../gtk/gtkcellrendererspin.c:130 ../gtk/gtkspinbutton.c:332
 msgid "The acceleration rate when you hold down a button"
 msgstr "按下按鈕時數值調整的加速度"
 
-#: ../gtk/gtkcellrendererspin.c:121 ../gtk/gtkscale.c:252
-#: ../gtk/gtkspinbutton.c:338
+#: ../gtk/gtkcellrendererspin.c:143 ../gtk/gtkscale.c:254
+#: ../gtk/gtkspinbutton.c:341
 msgid "Digits"
 msgstr "�數"
 
-#: ../gtk/gtkcellrendererspin.c:122 ../gtk/gtkspinbutton.c:339
+#: ../gtk/gtkcellrendererspin.c:144 ../gtk/gtkspinbutton.c:342
 msgid "The number of decimal places to display"
 msgstr "顯示的�數點後�數"
 
-#: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:106
-#: ../gtk/gtkmenu.c:586 ../gtk/gtkspinner.c:118 ../gtk/gtkswitch.c:801
-#: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:125
-#: ../gtk/gtktoggletoolbutton.c:112
+#: ../gtk/gtkcellrendererspinner.c:119 ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkmenu.c:588 ../gtk/gtkspinner.c:115 ../gtk/gtkswitch.c:783
+#: ../gtk/gtktoggleaction.c:133 ../gtk/gtktogglebutton.c:178
+#: ../gtk/gtktoggletoolbutton.c:127
 msgid "Active"
 msgstr "使用中"
 
@@ -1583,188 +1593,190 @@ msgstr "轉輪的脈動"
 msgid "The GtkIconSize value that specifies the size of the rendered spinner"
 msgstr "指定所��繪的轉輪尺寸 (GtkIconSize) 數值"
 
-#: ../gtk/gtkcellrenderertext.c:256
+#: ../gtk/gtkcellrenderertext.c:255
 msgid "Text to render"
 msgstr "準備�繪的文字"
 
-#: ../gtk/gtkcellrenderertext.c:263
+#: ../gtk/gtkcellrenderertext.c:262
 msgid "Markup"
 msgstr "標記"
 
-#: ../gtk/gtkcellrenderertext.c:264
+#: ../gtk/gtkcellrenderertext.c:263
 msgid "Marked up text to render"
 msgstr "欲�繪的標記文字"
 
-#: ../gtk/gtkcellrenderertext.c:271 ../gtk/gtklabel.c:574
+#: ../gtk/gtkcellrenderertext.c:270 ../gtk/gtklabel.c:736
 msgid "Attributes"
 msgstr "屬性"
 
-#: ../gtk/gtkcellrenderertext.c:272
+#: ../gtk/gtkcellrenderertext.c:271
 msgid "A list of style attributes to apply to the text of the renderer"
 msgstr "�使用在輸出�(renderer)文字上的樣�屬性清單"
 
-#: ../gtk/gtkcellrenderertext.c:279
+#: ../gtk/gtkcellrenderertext.c:278
 msgid "Single Paragraph Mode"
 msgstr "單一段�模�"
 
-#: ../gtk/gtkcellrenderertext.c:280
+#: ../gtk/gtkcellrenderertext.c:279
 msgid "Whether to keep all text in a single paragraph"
 msgstr "是�將所有文字��為單一段�"
 
-#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:191
-#: ../gtk/gtktexttag.c:196
+#: ../gtk/gtkcellrenderertext.c:287 ../gtk/gtkcellview.c:191
+#: ../gtk/gtktexttag.c:199
 msgid "Background color name"
 msgstr "背景�色�稱"
 
-#: ../gtk/gtkcellrenderertext.c:289 ../gtk/gtkcellview.c:192
-#: ../gtk/gtktexttag.c:197
+#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:192
+#: ../gtk/gtktexttag.c:200
 msgid "Background color as a string"
 msgstr "背景�色（以字串表示）"
 
-#: ../gtk/gtkcellrenderertext.c:296 ../gtk/gtkcellview.c:198
-#: ../gtk/gtktexttag.c:204
+#: ../gtk/gtkcellrenderertext.c:295 ../gtk/gtkcellview.c:198
+#: ../gtk/gtktexttag.c:207
 msgid "Background color"
 msgstr "背景�色"
 
-#: ../gtk/gtkcellrenderertext.c:297 ../gtk/gtkcellview.c:199
+#: ../gtk/gtkcellrenderertext.c:296 ../gtk/gtkcellview.c:199
+#: ../gtk/gtktexttag.c:208
 msgid "Background color as a GdkColor"
 msgstr "背景�色（以 GdkColor 表示）"
 
-#: ../gtk/gtkcellrenderertext.c:311
+#: ../gtk/gtkcellrenderertext.c:310
 msgid "Background color as RGBA"
 msgstr "以 RGBA 表示的背景�色"
 
-#: ../gtk/gtkcellrenderertext.c:312 ../gtk/gtkcellview.c:213
+#: ../gtk/gtkcellrenderertext.c:311 ../gtk/gtkcellview.c:213
+#: ../gtk/gtktexttag.c:223
 msgid "Background color as a GdkRGBA"
 msgstr "以 GdkRGBA 表示的背景�色"
 
-#: ../gtk/gtkcellrenderertext.c:318 ../gtk/gtktexttag.c:220
+#: ../gtk/gtkcellrenderertext.c:317 ../gtk/gtktexttag.c:238
 msgid "Foreground color name"
 msgstr "�景�色�稱"
 
-#: ../gtk/gtkcellrenderertext.c:319 ../gtk/gtktexttag.c:221
+#: ../gtk/gtkcellrenderertext.c:318 ../gtk/gtktexttag.c:239
 msgid "Foreground color as a string"
 msgstr "以字串方�表�的�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:326 ../gtk/gtktexttag.c:228
+#: ../gtk/gtkcellrenderertext.c:325 ../gtk/gtktexttag.c:246
 #: ../gtk/gtktrayicon-x11.c:137
 msgid "Foreground color"
 msgstr "�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:327
+#: ../gtk/gtkcellrenderertext.c:326 ../gtk/gtktexttag.c:247
 msgid "Foreground color as a GdkColor"
 msgstr "以 GdkColor 方�表�的�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:341
+#: ../gtk/gtkcellrenderertext.c:340
 msgid "Foreground color as RGBA"
 msgstr "以 RGBA 表示的�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:342
+#: ../gtk/gtkcellrenderertext.c:341 ../gtk/gtktexttag.c:262
 msgid "Foreground color as a GdkRGBA"
 msgstr "以 GdkColor 方�表示的�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:350 ../gtk/gtkentry.c:756
-#: ../gtk/gtktexttag.c:245 ../gtk/gtktextview.c:684
+#: ../gtk/gtkcellrenderertext.c:349 ../gtk/gtkentry.c:761
+#: ../gtk/gtktexttag.c:278 ../gtk/gtktextview.c:686
 msgid "Editable"
 msgstr "�編輯"
 
-#: ../gtk/gtkcellrenderertext.c:351 ../gtk/gtktexttag.c:246
-#: ../gtk/gtktextview.c:685
+#: ../gtk/gtkcellrenderertext.c:350 ../gtk/gtktexttag.c:279
+#: ../gtk/gtktextview.c:687
 msgid "Whether the text can be modified by the user"
 msgstr "使用者��修改文字"
 
-#: ../gtk/gtkcellrenderertext.c:358 ../gtk/gtkcellrenderertext.c:366
-#: ../gtk/gtktexttag.c:261 ../gtk/gtktexttag.c:269
+#: ../gtk/gtkcellrenderertext.c:357 ../gtk/gtkcellrenderertext.c:365
+#: ../gtk/gtktexttag.c:294 ../gtk/gtktexttag.c:302
 msgid "Font"
 msgstr "å­—åž‹"
 
-#: ../gtk/gtkcellrenderertext.c:359 ../gtk/gtktexttag.c:262
+#: ../gtk/gtkcellrenderertext.c:358 ../gtk/gtktexttag.c:295
 msgid "Font description as a string, e.g. \"Sans Italic 12\""
 msgstr "以字串方�表�的字型，例如“Sans Italic 12�"
 
-#: ../gtk/gtkcellrenderertext.c:367 ../gtk/gtktexttag.c:270
+#: ../gtk/gtkcellrenderertext.c:366 ../gtk/gtktexttag.c:303
 msgid "Font description as a PangoFontDescription struct"
 msgstr "以 PangoFontDescription �構表示的字型"
 
-#: ../gtk/gtkcellrenderertext.c:375 ../gtk/gtktexttag.c:277
+#: ../gtk/gtkcellrenderertext.c:374 ../gtk/gtktexttag.c:310
 msgid "Font family"
 msgstr "字型�系"
 
-#: ../gtk/gtkcellrenderertext.c:376 ../gtk/gtktexttag.c:278
+#: ../gtk/gtkcellrenderertext.c:375 ../gtk/gtktexttag.c:311
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "字型�系�稱，例如：Sans�Helvetica�Times�Monospace"
 
-#: ../gtk/gtkcellrenderertext.c:383 ../gtk/gtkcellrenderertext.c:384
-#: ../gtk/gtktexttag.c:285
+#: ../gtk/gtkcellrenderertext.c:382 ../gtk/gtkcellrenderertext.c:383
+#: ../gtk/gtktexttag.c:318
 msgid "Font style"
 msgstr "字型樣�"
 
-#: ../gtk/gtkcellrenderertext.c:392 ../gtk/gtkcellrenderertext.c:393
-#: ../gtk/gtktexttag.c:294
+#: ../gtk/gtkcellrenderertext.c:391 ../gtk/gtkcellrenderertext.c:392
+#: ../gtk/gtktexttag.c:327
 msgid "Font variant"
 msgstr "字型變化"
 
-#: ../gtk/gtkcellrenderertext.c:401 ../gtk/gtkcellrenderertext.c:402
-#: ../gtk/gtktexttag.c:303
+#: ../gtk/gtkcellrenderertext.c:400 ../gtk/gtkcellrenderertext.c:401
+#: ../gtk/gtktexttag.c:336
 msgid "Font weight"
 msgstr "å­—åž‹ç²—ç´°"
 
-#: ../gtk/gtkcellrenderertext.c:411 ../gtk/gtkcellrenderertext.c:412
-#: ../gtk/gtktexttag.c:314
+#: ../gtk/gtkcellrenderertext.c:410 ../gtk/gtkcellrenderertext.c:411
+#: ../gtk/gtktexttag.c:347
 msgid "Font stretch"
 msgstr "字型寬緊"
 
-#: ../gtk/gtkcellrenderertext.c:420 ../gtk/gtkcellrenderertext.c:421
-#: ../gtk/gtktexttag.c:323
+#: ../gtk/gtkcellrenderertext.c:419 ../gtk/gtkcellrenderertext.c:420
+#: ../gtk/gtktexttag.c:356
 msgid "Font size"
 msgstr "字型大�"
 
-#: ../gtk/gtkcellrenderertext.c:430 ../gtk/gtktexttag.c:343
+#: ../gtk/gtkcellrenderertext.c:429 ../gtk/gtktexttag.c:376
 msgid "Font points"
 msgstr "字型點數"
 
-#: ../gtk/gtkcellrenderertext.c:431 ../gtk/gtktexttag.c:344
+#: ../gtk/gtkcellrenderertext.c:430 ../gtk/gtktexttag.c:377
 msgid "Font size in points"
 msgstr "以點數表�的字型大�"
 
-#: ../gtk/gtkcellrenderertext.c:440 ../gtk/gtktexttag.c:333
+#: ../gtk/gtkcellrenderertext.c:439 ../gtk/gtktexttag.c:366
 msgid "Font scale"
 msgstr "字型比例"
 
-#: ../gtk/gtkcellrenderertext.c:441
+#: ../gtk/gtkcellrenderertext.c:440
 msgid "Font scaling factor"
 msgstr "字型縮放係數"
 
-#: ../gtk/gtkcellrenderertext.c:450 ../gtk/gtktexttag.c:412
+#: ../gtk/gtkcellrenderertext.c:449 ../gtk/gtktexttag.c:445
 msgid "Rise"
 msgstr "�高"
 
-#: ../gtk/gtkcellrenderertext.c:451
+#: ../gtk/gtkcellrenderertext.c:450
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative)"
 msgstr "文字和底部基準線的�離 (如果�高的數值為負數，則表示低於基準線)"
 
-#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:452
+#: ../gtk/gtkcellrenderertext.c:461 ../gtk/gtktexttag.c:485
 msgid "Strikethrough"
 msgstr "刪除線"
 
-#: ../gtk/gtkcellrenderertext.c:463 ../gtk/gtktexttag.c:453
+#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:486
 msgid "Whether to strike through the text"
 msgstr "是�在文字中央加上刪除線"
 
-#: ../gtk/gtkcellrenderertext.c:470 ../gtk/gtktexttag.c:460
+#: ../gtk/gtkcellrenderertext.c:469 ../gtk/gtktexttag.c:493
 msgid "Underline"
 msgstr "底線"
 
-#: ../gtk/gtkcellrenderertext.c:471 ../gtk/gtktexttag.c:461
+#: ../gtk/gtkcellrenderertext.c:470 ../gtk/gtktexttag.c:494
 msgid "Style of underline for this text"
 msgstr "此文字的底線樣�"
 
-#: ../gtk/gtkcellrenderertext.c:479 ../gtk/gtktexttag.c:372
+#: ../gtk/gtkcellrenderertext.c:478 ../gtk/gtktexttag.c:405
 msgid "Language"
 msgstr "語言"
 
-#: ../gtk/gtkcellrenderertext.c:480
+#: ../gtk/gtkcellrenderertext.c:479
 msgid ""
 "The language this text is in, as an ISO code. Pango can use this as a hint "
 "when rendering the text. If you don't understand this parameter, you "
@@ -1773,229 +1785,229 @@ msgstr ""
 "該文字所用的語言，以 ISO 代碼表示。Pango 在�繪文字時會使用這個設定作為�示。"
 "如果您�明白這個�數的�義，�是表示�需�使用它了。"
 
-#: ../gtk/gtkcellrenderertext.c:500 ../gtk/gtklabel.c:699
-#: ../gtk/gtkprogressbar.c:217
+#: ../gtk/gtkcellrenderertext.c:499 ../gtk/gtklabel.c:861
+#: ../gtk/gtkprogressbar.c:220
 msgid "Ellipsize"
 msgstr "簡化文字"
 
-#: ../gtk/gtkcellrenderertext.c:501
+#: ../gtk/gtkcellrenderertext.c:500
 msgid ""
 "The preferred place to ellipsize the string, if the cell renderer does not "
 "have enough room to display the entire string"
 msgstr ""
 "如果儲存格�顯示�沒有足夠的空間顯示整個字串時，用來簡化該字串的�好空間"
 
-#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtkfilechooserbutton.c:411
-#: ../gtk/gtklabel.c:720
+#: ../gtk/gtkcellrenderertext.c:519 ../gtk/gtkfilechooserbutton.c:454
+#: ../gtk/gtklabel.c:882
 msgid "Width In Characters"
 msgstr "按鈕寬度"
 
-#: ../gtk/gtkcellrenderertext.c:521 ../gtk/gtklabel.c:721
+#: ../gtk/gtkcellrenderertext.c:520 ../gtk/gtklabel.c:883
 msgid "The desired width of the label, in characters"
 msgstr "�求的標籤寬度，以字元計"
 
-#: ../gtk/gtkcellrenderertext.c:545 ../gtk/gtklabel.c:781
+#: ../gtk/gtkcellrenderertext.c:544 ../gtk/gtklabel.c:943
 msgid "Maximum Width In Characters"
 msgstr "最大寬度（以字元計）"
 
-#: ../gtk/gtkcellrenderertext.c:546
+#: ../gtk/gtkcellrenderertext.c:545
 msgid "The maximum width of the cell, in characters"
 msgstr "格�所需的最大寬度，以字元計"
 
-#: ../gtk/gtkcellrenderertext.c:564 ../gtk/gtktexttag.c:469
+#: ../gtk/gtkcellrenderertext.c:563 ../gtk/gtktexttag.c:502
 msgid "Wrap mode"
 msgstr "�行模�"
 
-#: ../gtk/gtkcellrenderertext.c:565
+#: ../gtk/gtkcellrenderertext.c:564
 msgid ""
 "How to break the string into multiple lines, if the cell renderer does not "
 "have enough room to display the entire string"
 msgstr "若格�顯示�沒有足夠的空間顯示整行字串時，如何將字串斷�多行"
 
-#: ../gtk/gtkcellrenderertext.c:584 ../gtk/gtkcombobox.c:680
+#: ../gtk/gtkcellrenderertext.c:583 ../gtk/gtkcombobox.c:681
 msgid "Wrap width"
 msgstr "�行寬度"
 
-#: ../gtk/gtkcellrenderertext.c:585
+#: ../gtk/gtkcellrenderertext.c:584
 msgid "The width at which the text is wrapped"
 msgstr "文字在那個長度後斷行"
 
-#: ../gtk/gtkcellrenderertext.c:605 ../gtk/gtktreeviewcolumn.c:352
+#: ../gtk/gtkcellrenderertext.c:604 ../gtk/gtktreeviewcolumn.c:364
 msgid "Alignment"
 msgstr "�齊"
 
-#: ../gtk/gtkcellrenderertext.c:606
+#: ../gtk/gtkcellrenderertext.c:605
 msgid "How to align the lines"
 msgstr "如何�齊�行"
 
-#: ../gtk/gtkcellrenderertext.c:618 ../gtk/gtkcellview.c:317
-#: ../gtk/gtktexttag.c:558
+#: ../gtk/gtkcellrenderertext.c:617 ../gtk/gtkcellview.c:317
+#: ../gtk/gtktexttag.c:605
 msgid "Background set"
 msgstr "背景設定"
 
-#: ../gtk/gtkcellrenderertext.c:619 ../gtk/gtkcellview.c:318
-#: ../gtk/gtktexttag.c:559
+#: ../gtk/gtkcellrenderertext.c:618 ../gtk/gtkcellview.c:318
+#: ../gtk/gtktexttag.c:606
 msgid "Whether this tag affects the background color"
 msgstr "本標記��影響背景�色"
 
-#: ../gtk/gtkcellrenderertext.c:622 ../gtk/gtktexttag.c:566
+#: ../gtk/gtkcellrenderertext.c:621 ../gtk/gtktexttag.c:613
 msgid "Foreground set"
 msgstr "�景設定"
 
-#: ../gtk/gtkcellrenderertext.c:623 ../gtk/gtktexttag.c:567
+#: ../gtk/gtkcellrenderertext.c:622 ../gtk/gtktexttag.c:614
 msgid "Whether this tag affects the foreground color"
 msgstr "本標記��影響�景�色"
 
-#: ../gtk/gtkcellrenderertext.c:626 ../gtk/gtktexttag.c:570
+#: ../gtk/gtkcellrenderertext.c:625 ../gtk/gtktexttag.c:617
 msgid "Editability set"
 msgstr "�編輯性設定"
 
-#: ../gtk/gtkcellrenderertext.c:627 ../gtk/gtktexttag.c:571
+#: ../gtk/gtkcellrenderertext.c:626 ../gtk/gtktexttag.c:618
 msgid "Whether this tag affects text editability"
 msgstr "本標記��影響文字的�編輯性"
 
-#: ../gtk/gtkcellrenderertext.c:630 ../gtk/gtktexttag.c:574
+#: ../gtk/gtkcellrenderertext.c:629 ../gtk/gtktexttag.c:621
 msgid "Font family set"
 msgstr "字型�系設定"
 
-#: ../gtk/gtkcellrenderertext.c:631 ../gtk/gtktexttag.c:575
+#: ../gtk/gtkcellrenderertext.c:630 ../gtk/gtktexttag.c:622
 msgid "Whether this tag affects the font family"
 msgstr "此標籤是�影響字型�系"
 
-#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtktexttag.c:578
+#: ../gtk/gtkcellrenderertext.c:633 ../gtk/gtktexttag.c:625
 msgid "Font style set"
 msgstr "字型樣�設定"
 
-#: ../gtk/gtkcellrenderertext.c:635 ../gtk/gtktexttag.c:579
+#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtktexttag.c:626
 msgid "Whether this tag affects the font style"
 msgstr "此標籤是�影響字型樣�"
 
-#: ../gtk/gtkcellrenderertext.c:638 ../gtk/gtktexttag.c:582
+#: ../gtk/gtkcellrenderertext.c:637 ../gtk/gtktexttag.c:629
 msgid "Font variant set"
 msgstr "字型變化設定"
 
-#: ../gtk/gtkcellrenderertext.c:639 ../gtk/gtktexttag.c:583
+#: ../gtk/gtkcellrenderertext.c:638 ../gtk/gtktexttag.c:630
 msgid "Whether this tag affects the font variant"
 msgstr "此標籤是�影響字型變化"
 
-#: ../gtk/gtkcellrenderertext.c:642 ../gtk/gtktexttag.c:586
+#: ../gtk/gtkcellrenderertext.c:641 ../gtk/gtktexttag.c:633
 msgid "Font weight set"
 msgstr "字型粗細設定"
 
-#: ../gtk/gtkcellrenderertext.c:643 ../gtk/gtktexttag.c:587
+#: ../gtk/gtkcellrenderertext.c:642 ../gtk/gtktexttag.c:634
 msgid "Whether this tag affects the font weight"
 msgstr "此標籤是�影響字型粗細"
 
-#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtktexttag.c:590
+#: ../gtk/gtkcellrenderertext.c:645 ../gtk/gtktexttag.c:637
 msgid "Font stretch set"
 msgstr "字型寬緊設定"
 
-#: ../gtk/gtkcellrenderertext.c:647 ../gtk/gtktexttag.c:591
+#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtktexttag.c:638
 msgid "Whether this tag affects the font stretch"
 msgstr "此標籤是�影響字型寬緊"
 
-#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:594
+#: ../gtk/gtkcellrenderertext.c:649 ../gtk/gtktexttag.c:641
 msgid "Font size set"
 msgstr "字型大�設定"
 
-#: ../gtk/gtkcellrenderertext.c:651 ../gtk/gtktexttag.c:595
+#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:642
 msgid "Whether this tag affects the font size"
 msgstr "此標籤是�影響字型大�"
 
-#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:598
+#: ../gtk/gtkcellrenderertext.c:653 ../gtk/gtktexttag.c:645
 msgid "Font scale set"
 msgstr "字型縮放設定"
 
-#: ../gtk/gtkcellrenderertext.c:655 ../gtk/gtktexttag.c:599
+#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:646
 msgid "Whether this tag scales the font size by a factor"
 msgstr "本標記��縮放字型"
 
-#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:618
+#: ../gtk/gtkcellrenderertext.c:657 ../gtk/gtktexttag.c:665
 msgid "Rise set"
 msgstr "�高文字設定"
 
-#: ../gtk/gtkcellrenderertext.c:659 ../gtk/gtktexttag.c:619
+#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:666
 msgid "Whether this tag affects the rise"
 msgstr "此標籤是�影響文字�高的情�"
 
-#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:634
+#: ../gtk/gtkcellrenderertext.c:661 ../gtk/gtktexttag.c:681
 msgid "Strikethrough set"
 msgstr "刪除線設定"
 
-#: ../gtk/gtkcellrenderertext.c:663 ../gtk/gtktexttag.c:635
+#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:682
 msgid "Whether this tag affects strikethrough"
 msgstr "此標籤是�影響刪除線的設定"
 
-#: ../gtk/gtkcellrenderertext.c:666 ../gtk/gtktexttag.c:642
+#: ../gtk/gtkcellrenderertext.c:665 ../gtk/gtktexttag.c:689
 msgid "Underline set"
 msgstr "底線設定"
 
-#: ../gtk/gtkcellrenderertext.c:667 ../gtk/gtktexttag.c:643
+#: ../gtk/gtkcellrenderertext.c:666 ../gtk/gtktexttag.c:690
 msgid "Whether this tag affects underlining"
 msgstr "此標籤是�影響底線的設定"
 
-#: ../gtk/gtkcellrenderertext.c:670 ../gtk/gtktexttag.c:606
+#: ../gtk/gtkcellrenderertext.c:669 ../gtk/gtktexttag.c:653
 msgid "Language set"
 msgstr "語言設定"
 
-#: ../gtk/gtkcellrenderertext.c:671 ../gtk/gtktexttag.c:607
+#: ../gtk/gtkcellrenderertext.c:670 ../gtk/gtktexttag.c:654
 msgid "Whether this tag affects the language the text is rendered as"
 msgstr "本標記��影響文字�被�繪�據的語言設定"
 
-#: ../gtk/gtkcellrenderertext.c:674
+#: ../gtk/gtkcellrenderertext.c:673
 msgid "Ellipsize set"
 msgstr "簡化文字設定"
 
-#: ../gtk/gtkcellrenderertext.c:675
+#: ../gtk/gtkcellrenderertext.c:674
 msgid "Whether this tag affects the ellipsize mode"
 msgstr "本標記��影響文字簡化的模�"
 
-#: ../gtk/gtkcellrenderertext.c:678
+#: ../gtk/gtkcellrenderertext.c:677
 msgid "Align set"
 msgstr "�齊設定"
 
-#: ../gtk/gtkcellrenderertext.c:679
+#: ../gtk/gtkcellrenderertext.c:678
 msgid "Whether this tag affects the alignment mode"
 msgstr "本標記��影響�齊的模�"
 
-#: ../gtk/gtkcellrenderertoggle.c:128
+#: ../gtk/gtkcellrenderertoggle.c:140
 msgid "Toggle state"
 msgstr "切�狀態"
 
-#: ../gtk/gtkcellrenderertoggle.c:129
+#: ../gtk/gtkcellrenderertoggle.c:141
 msgid "The toggle state of the button"
 msgstr "按鈕的切�狀態"
 
-#: ../gtk/gtkcellrenderertoggle.c:136
+#: ../gtk/gtkcellrenderertoggle.c:148
 msgid "Inconsistent state"
 msgstr "�相�狀態"
 
-#: ../gtk/gtkcellrenderertoggle.c:137
+#: ../gtk/gtkcellrenderertoggle.c:149
 msgid "The inconsistent state of the button"
 msgstr "按鈕的�相�狀態"
 
-#: ../gtk/gtkcellrenderertoggle.c:144
+#: ../gtk/gtkcellrenderertoggle.c:156
 msgid "Activatable"
 msgstr "�啟用"
 
-#: ../gtk/gtkcellrenderertoggle.c:145
+#: ../gtk/gtkcellrenderertoggle.c:157
 msgid "The toggle button can be activated"
 msgstr "該切�按鈕是�啟用的"
 
-#: ../gtk/gtkcellrenderertoggle.c:152
+#: ../gtk/gtkcellrenderertoggle.c:164
 msgid "Radio state"
 msgstr "�項狀態"
 
-#: ../gtk/gtkcellrenderertoggle.c:153
+#: ../gtk/gtkcellrenderertoggle.c:165
 msgid "Draw the toggle button as a radio button"
 msgstr "將切�按鈕繪製�單�按鈕"
 
-#: ../gtk/gtkcellrenderertoggle.c:160
+#: ../gtk/gtkcellrenderertoggle.c:172
 msgid "Indicator size"
 msgstr "指標大�"
 
-#: ../gtk/gtkcellrenderertoggle.c:161 ../gtk/gtkcheckbutton.c:78
-#: ../gtk/gtkcheckmenuitem.c:130
+#: ../gtk/gtkcellrenderertoggle.c:173 ../gtk/gtkcheckbutton.c:95
+#: ../gtk/gtkcheckmenuitem.c:146
 msgid "Size of check or radio indicator"
 msgstr "��或單�按鈕指示圖的大�"
 
@@ -2011,15 +2023,15 @@ msgstr "儲存格檢視模型"
 msgid "The model for cell view"
 msgstr "儲存格檢視的模型"
 
-#: ../gtk/gtkcellview.c:246 ../gtk/gtkcombobox.c:944
-#: ../gtk/gtkentrycompletion.c:448 ../gtk/gtkiconview.c:770
-#: ../gtk/gtktreemenu.c:329 ../gtk/gtktreeviewcolumn.c:415
+#: ../gtk/gtkcellview.c:246 ../gtk/gtkcombobox.c:945
+#: ../gtk/gtkentrycompletion.c:448 ../gtk/gtkiconview.c:768
+#: ../gtk/gtktreemenu.c:329 ../gtk/gtktreeviewcolumn.c:427
 msgid "Cell Area"
 msgstr "格��域"
 
-#: ../gtk/gtkcellview.c:247 ../gtk/gtkcombobox.c:945
-#: ../gtk/gtkentrycompletion.c:449 ../gtk/gtkiconview.c:771
-#: ../gtk/gtktreemenu.c:330 ../gtk/gtktreeviewcolumn.c:416
+#: ../gtk/gtkcellview.c:247 ../gtk/gtkcombobox.c:946
+#: ../gtk/gtkentrycompletion.c:449 ../gtk/gtkiconview.c:769
+#: ../gtk/gtktreemenu.c:330 ../gtk/gtktreeviewcolumn.c:428
 msgid "The GtkCellArea used to layout cells"
 msgstr "用來�置格�的 GtkCellArea"
 
@@ -2049,35 +2061,35 @@ msgstr "符�模型"
 msgid "Whether to request enough space for every row in the model"
 msgstr "在模型中是�為�一列�求足夠的空間"
 
-#: ../gtk/gtkcheckbutton.c:77 ../gtk/gtkcheckmenuitem.c:129
+#: ../gtk/gtkcheckbutton.c:94 ../gtk/gtkcheckmenuitem.c:145
 msgid "Indicator Size"
 msgstr "指示圖大�"
 
-#: ../gtk/gtkcheckbutton.c:85 ../gtk/gtkexpander.c:363
+#: ../gtk/gtkcheckbutton.c:102 ../gtk/gtkexpander.c:364
 msgid "Indicator Spacing"
 msgstr "指示圖間隔"
 
-#: ../gtk/gtkcheckbutton.c:86
+#: ../gtk/gtkcheckbutton.c:103
 msgid "Spacing around check or radio indicator"
 msgstr "��或單�按鈕指示圖周�的空間"
 
-#: ../gtk/gtkcheckmenuitem.c:107
+#: ../gtk/gtkcheckmenuitem.c:123
 msgid "Whether the menu item is checked"
 msgstr "�單項目是�被��"
 
-#: ../gtk/gtkcheckmenuitem.c:114 ../gtk/gtktogglebutton.c:133
+#: ../gtk/gtkcheckmenuitem.c:130 ../gtk/gtktogglebutton.c:186
 msgid "Inconsistent"
 msgstr "�一致"
 
-#: ../gtk/gtkcheckmenuitem.c:115
+#: ../gtk/gtkcheckmenuitem.c:131
 msgid "Whether to display an \"inconsistent\" state"
 msgstr "是�顯示 『�一致�狀態"
 
-#: ../gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkcheckmenuitem.c:138
 msgid "Draw as radio menu item"
 msgstr "繪製�單�項�單項目"
 
-#: ../gtk/gtkcheckmenuitem.c:123
+#: ../gtk/gtkcheckmenuitem.c:139
 msgid "Whether the menu item looks like a radio menu item"
 msgstr "是�該�單項目應開起來�單�項�單項目"
 
@@ -2089,9 +2101,9 @@ msgstr "使用�明度"
 msgid "Whether to give the color an alpha value"
 msgstr "是�讓�色包�有�明度的值"
 
-#: ../gtk/gtkcolorbutton.c:185 ../gtk/gtkfilechooserbutton.c:397
-#: ../gtk/gtkfontbutton.c:140 ../gtk/gtkprintjob.c:141
-#: ../gtk/gtkstatusicon.c:408 ../gtk/gtktreeviewcolumn.c:319
+#: ../gtk/gtkcolorbutton.c:185 ../gtk/gtkfilechooserbutton.c:440
+#: ../gtk/gtkfontbutton.c:150 ../gtk/gtkprintjob.c:141
+#: ../gtk/gtkstatusicon.c:438 ../gtk/gtktreeviewcolumn.c:331
 msgid "Title"
 msgstr "標題"
 
@@ -2099,7 +2111,7 @@ msgstr "標題"
 msgid "The title of the color selection dialog"
 msgstr "�色�擇�話盒的標題"
 
-#: ../gtk/gtkcolorbutton.c:200 ../gtk/gtkcolorsel.c:338
+#: ../gtk/gtkcolorbutton.c:200 ../gtk/gtkcolorsel.c:336
 msgid "Current Color"
 msgstr "目�的�色"
 
@@ -2107,7 +2119,7 @@ msgstr "目�的�色"
 msgid "The selected color"
 msgstr "��的�色"
 
-#: ../gtk/gtkcolorbutton.c:215 ../gtk/gtkcolorsel.c:345
+#: ../gtk/gtkcolorbutton.c:215 ../gtk/gtkcolorsel.c:343
 msgid "Current Alpha"
 msgstr "目�的�明度"
 
@@ -2123,161 +2135,161 @@ msgstr "目�的 RGBA �色"
 msgid "The selected RGBA color"
 msgstr "��的 RGBA �色"
 
-#: ../gtk/gtkcolorsel.c:324
+#: ../gtk/gtkcolorsel.c:322
 msgid "Has Opacity Control"
 msgstr "�控制�明度"
 
-#: ../gtk/gtkcolorsel.c:325
+#: ../gtk/gtkcolorsel.c:323
 msgid "Whether the color selector should allow setting opacity"
 msgstr "設定�色�擇程�是��許設定�明度"
 
-#: ../gtk/gtkcolorsel.c:331
+#: ../gtk/gtkcolorsel.c:329
 msgid "Has palette"
 msgstr "有色盤"
 
-#: ../gtk/gtkcolorsel.c:332
+#: ../gtk/gtkcolorsel.c:330
 msgid "Whether a palette should be used"
 msgstr "應�使用色盤"
 
-#: ../gtk/gtkcolorsel.c:339
+#: ../gtk/gtkcolorsel.c:337
 msgid "The current color"
 msgstr "目�的�色"
 
-#: ../gtk/gtkcolorsel.c:346
+#: ../gtk/gtkcolorsel.c:344
 msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr "目�的�明度（0 為完全�明，65535 為完全��明）"
 
-#: ../gtk/gtkcolorsel.c:360
+#: ../gtk/gtkcolorsel.c:358
 msgid "Current RGBA"
 msgstr "目�的 RGBA"
 
-#: ../gtk/gtkcolorsel.c:361
+#: ../gtk/gtkcolorsel.c:359
 msgid "The current RGBA color"
 msgstr "目�的 RGBA �色"
 
-#: ../gtk/gtkcolorseldialog.c:110
+#: ../gtk/gtkcolorseldialog.c:136
 msgid "Color Selection"
 msgstr "�色�擇"
 
-#: ../gtk/gtkcolorseldialog.c:111
+#: ../gtk/gtkcolorseldialog.c:137
 msgid "The color selection embedded in the dialog."
 msgstr "內嵌在�話盒的色彩���。"
 
-#: ../gtk/gtkcolorseldialog.c:117
+#: ../gtk/gtkcolorseldialog.c:143
 msgid "OK Button"
 msgstr "確定按鈕"
 
-#: ../gtk/gtkcolorseldialog.c:118
+#: ../gtk/gtkcolorseldialog.c:144
 msgid "The OK button of the dialog."
 msgstr "�話盒的確定按鈕。"
 
-#: ../gtk/gtkcolorseldialog.c:124
+#: ../gtk/gtkcolorseldialog.c:150
 msgid "Cancel Button"
 msgstr "�消按鈕"
 
-#: ../gtk/gtkcolorseldialog.c:125
+#: ../gtk/gtkcolorseldialog.c:151
 msgid "The cancel button of the dialog."
 msgstr "�話盒的�消按鈕。"
 
-#: ../gtk/gtkcolorseldialog.c:131
+#: ../gtk/gtkcolorseldialog.c:157
 msgid "Help Button"
 msgstr "求助按鈕"
 
-#: ../gtk/gtkcolorseldialog.c:132
+#: ../gtk/gtkcolorseldialog.c:158
 msgid "The help button of the dialog."
 msgstr "�話盒的求助按鈕。"
 
-#: ../gtk/gtkcombobox.c:663
+#: ../gtk/gtkcombobox.c:664
 msgid "ComboBox model"
 msgstr "組�方塊模型"
 
-#: ../gtk/gtkcombobox.c:664
+#: ../gtk/gtkcombobox.c:665
 msgid "The model for the combo box"
 msgstr "該組�方塊的模型"
 
-#: ../gtk/gtkcombobox.c:681
+#: ../gtk/gtkcombobox.c:682
 msgid "Wrap width for laying out the items in a grid"
 msgstr "將項目於方格中排列所設定的�行寬度"
 
-#: ../gtk/gtkcombobox.c:703 ../gtk/gtktreemenu.c:383
+#: ../gtk/gtkcombobox.c:704 ../gtk/gtktreemenu.c:383
 msgid "Row span column"
 msgstr "水平�併格�"
 
-#: ../gtk/gtkcombobox.c:704 ../gtk/gtktreemenu.c:384
+#: ../gtk/gtkcombobox.c:705 ../gtk/gtktreemenu.c:384
 msgid "TreeModel column containing the row span values"
 msgstr "包�有�併水平格數資料的 TreeModel 格�"
 
-#: ../gtk/gtkcombobox.c:725 ../gtk/gtktreemenu.c:404
+#: ../gtk/gtkcombobox.c:726 ../gtk/gtktreemenu.c:404
 msgid "Column span column"
 msgstr "垂直�併格�"
 
-#: ../gtk/gtkcombobox.c:726 ../gtk/gtktreemenu.c:405
+#: ../gtk/gtkcombobox.c:727 ../gtk/gtktreemenu.c:405
 msgid "TreeModel column containing the column span values"
 msgstr "包�有�併垂直格數資料的 TreeModel 格�"
 
-#: ../gtk/gtkcombobox.c:747
+#: ../gtk/gtkcombobox.c:748
 msgid "Active item"
 msgstr "啟用項目"
 
-#: ../gtk/gtkcombobox.c:748
+#: ../gtk/gtkcombobox.c:749
 msgid "The item which is currently active"
 msgstr "目�有效的項目"
 
-#: ../gtk/gtkcombobox.c:767 ../gtk/gtkuimanager.c:225
+#: ../gtk/gtkcombobox.c:768 ../gtk/gtkuimanager.c:479
 msgid "Add tearoffs to menus"
 msgstr "在�單上加上��下標記"
 
-#: ../gtk/gtkcombobox.c:768
+#: ../gtk/gtkcombobox.c:769
 msgid "Whether dropdowns should have a tearoff menu item"
 msgstr "下拉�單是�應有分離�單項目"
 
-#: ../gtk/gtkcombobox.c:783 ../gtk/gtkentry.c:781
+#: ../gtk/gtkcombobox.c:784 ../gtk/gtkentry.c:786
 msgid "Has Frame"
 msgstr "有框架"
 
-#: ../gtk/gtkcombobox.c:784
+#: ../gtk/gtkcombobox.c:785
 msgid "Whether the combo box draws a frame around the child"
 msgstr "組�方塊是�在�元件周�繪出框架"
 
-#: ../gtk/gtkcombobox.c:792
+#: ../gtk/gtkcombobox.c:793
 msgid "Whether the combo box grabs focus when it is clicked with the mouse"
 msgstr "當該組�方塊被滑鼠點�時是�自動�得焦點"
 
-#: ../gtk/gtkcombobox.c:807 ../gtk/gtkmenu.c:641
+#: ../gtk/gtkcombobox.c:808 ../gtk/gtkmenu.c:643
 msgid "Tearoff Title"
 msgstr "�下標題"
 
-#: ../gtk/gtkcombobox.c:808
+#: ../gtk/gtkcombobox.c:809
 msgid ""
 "A title that may be displayed by the window manager when the popup is torn-"
 "off"
 msgstr "當此�單�下之後視窗管�員指定的視窗標題"
 
-#: ../gtk/gtkcombobox.c:825
+#: ../gtk/gtkcombobox.c:826
 msgid "Popup shown"
 msgstr "彈出�顯示"
 
-#: ../gtk/gtkcombobox.c:826
+#: ../gtk/gtkcombobox.c:827
 msgid "Whether the combo's dropdown is shown"
 msgstr "是�顯示組��項目的下拉�單"
 
-#: ../gtk/gtkcombobox.c:842
+#: ../gtk/gtkcombobox.c:843
 msgid "Button Sensitivity"
 msgstr "按鈕�感度"
 
-#: ../gtk/gtkcombobox.c:843
+#: ../gtk/gtkcombobox.c:844
 msgid "Whether the dropdown button is sensitive when the model is empty"
 msgstr "當模型內容是空的時是�讓下拉按鈕有作用"
 
-#: ../gtk/gtkcombobox.c:859
+#: ../gtk/gtkcombobox.c:860
 msgid "Whether combo box has an entry"
 msgstr "組�方塊是�有項目"
 
-#: ../gtk/gtkcombobox.c:874
+#: ../gtk/gtkcombobox.c:875
 msgid "Entry Text Column"
 msgstr "項目文字欄�"
 
-#: ../gtk/gtkcombobox.c:875
+#: ../gtk/gtkcombobox.c:876
 msgid ""
 "The column in the combo box's model to associate with strings from the entry "
 "if the combo was created with #GtkComboBox:has-entry = %TRUE"
@@ -2285,281 +2297,289 @@ msgstr ""
 "如果組�方塊是以 #GtkComboBox:has-entry = %TRUE 建立，在組�方塊模型的欄��"
 "關�的項目字串"
 
-#: ../gtk/gtkcombobox.c:892
+#: ../gtk/gtkcombobox.c:893
 msgid "ID Column"
 msgstr "ID 欄"
 
-#: ../gtk/gtkcombobox.c:893
+#: ../gtk/gtkcombobox.c:894
 msgid ""
 "The column in the combo box's model that provides string IDs for the values "
 "in the model"
 msgstr "在組�方塊模型的欄�，�供模型中數值的字串 ID"
 
-#: ../gtk/gtkcombobox.c:908
+#: ../gtk/gtkcombobox.c:909
 msgid "Active id"
 msgstr "使用中 id"
 
-#: ../gtk/gtkcombobox.c:909
+#: ../gtk/gtkcombobox.c:910
 msgid "The value of the id column for the active row"
 msgstr "使用中的列的 id 欄數值"
 
-#: ../gtk/gtkcombobox.c:924
+#: ../gtk/gtkcombobox.c:925
 msgid "Popup Fixed Width"
 msgstr "彈出�視窗固定寬度"
 
-#: ../gtk/gtkcombobox.c:925
+#: ../gtk/gtkcombobox.c:926
 msgid ""
 "Whether the popup's width should be a fixed width matching the allocated "
 "width of the combo box"
 msgstr "彈出�視窗的寬度是�固定為符�原本組�方塊的寬度"
 
-#: ../gtk/gtkcombobox.c:951
+#: ../gtk/gtkcombobox.c:952
 msgid "Appears as list"
 msgstr "以清單顯示"
 
-#: ../gtk/gtkcombobox.c:952
+#: ../gtk/gtkcombobox.c:953
 msgid "Whether dropdowns should look like lists rather than menus"
 msgstr "組�方塊下拉�單是�應該顯示作清單樣而��單樣"
 
-#: ../gtk/gtkcombobox.c:968
+#: ../gtk/gtkcombobox.c:969
 msgid "Arrow Size"
 msgstr "箭頭大�"
 
-#: ../gtk/gtkcombobox.c:969
+#: ../gtk/gtkcombobox.c:970
 msgid "The minimum size of the arrow in the combo box"
 msgstr "組�方塊中箭頭的最�尺寸"
 
-#: ../gtk/gtkcombobox.c:986
+#: ../gtk/gtkcombobox.c:987
 msgid "The amount of space used by the arrow"
 msgstr "箭頭所佔空間大�"
 
-#: ../gtk/gtkcombobox.c:1001 ../gtk/gtkentry.c:881 ../gtk/gtkhandlebox.c:190
-#: ../gtk/gtkmenubar.c:207 ../gtk/gtkstatusbar.c:180 ../gtk/gtktoolbar.c:601
-#: ../gtk/gtkviewport.c:153
+#: ../gtk/gtkcombobox.c:1002 ../gtk/gtkentry.c:886 ../gtk/gtkhandlebox.c:218
+#: ../gtk/gtkmenubar.c:218 ../gtk/gtkstatusbar.c:182 ../gtk/gtktoolbar.c:613
+#: ../gtk/gtkviewport.c:155
 msgid "Shadow type"
 msgstr "陰影類型"
 
-#: ../gtk/gtkcombobox.c:1002
+#: ../gtk/gtkcombobox.c:1003
 msgid "Which kind of shadow to draw around the combo box"
 msgstr "組�方塊周��繪出何種類型的陰影"
 
-#: ../gtk/gtkcontainer.c:456
+#: ../gtk/gtkcontainer.c:457
 msgid "Resize mode"
 msgstr "調整尺寸模�"
 
-#: ../gtk/gtkcontainer.c:457
+#: ../gtk/gtkcontainer.c:458
 msgid "Specify how resize events are handled"
 msgstr "指定如何處�調整尺寸的�求"
 
-#: ../gtk/gtkcontainer.c:464
+#: ../gtk/gtkcontainer.c:465
 msgid "Border width"
 msgstr "邊框寬度"
 
-#: ../gtk/gtkcontainer.c:465
+#: ../gtk/gtkcontainer.c:466
 msgid "The width of the empty border outside the containers children"
 msgstr "容器�元件外部空白邊緣的寬度"
 
-#: ../gtk/gtkcontainer.c:473
+#: ../gtk/gtkcontainer.c:474
 msgid "Child"
 msgstr "�元件"
 
-#: ../gtk/gtkcontainer.c:474
+#: ../gtk/gtkcontainer.c:475
 msgid "Can be used to add a new child to the container"
 msgstr "�用來加入新的�元件於容器元件中"
 
-#: ../gtk/gtkdialog.c:289 ../gtk/gtkinfobar.c:426
+#: ../gtk/gtkdialog.c:291 ../gtk/gtkinfobar.c:427
 msgid "Content area border"
 msgstr "內容�域邊框"
 
-#: ../gtk/gtkdialog.c:290
+#: ../gtk/gtkdialog.c:292
 msgid "Width of border around the main dialog area"
 msgstr "主�話窗�域的邊框寬度"
 
-#: ../gtk/gtkdialog.c:307 ../gtk/gtkinfobar.c:443
+#: ../gtk/gtkdialog.c:309 ../gtk/gtkinfobar.c:444
 msgid "Content area spacing"
 msgstr "內容�域間�"
 
-#: ../gtk/gtkdialog.c:308
+#: ../gtk/gtkdialog.c:310
 msgid "Spacing between elements of the main dialog area"
 msgstr "主��話盒�域的元件間的間�"
 
-#: ../gtk/gtkdialog.c:315 ../gtk/gtkinfobar.c:459
+#: ../gtk/gtkdialog.c:317 ../gtk/gtkinfobar.c:460
 msgid "Button spacing"
 msgstr "按鈕間隔"
 
-#: ../gtk/gtkdialog.c:316 ../gtk/gtkinfobar.c:460
+#: ../gtk/gtkdialog.c:318 ../gtk/gtkinfobar.c:461
 msgid "Spacing between buttons"
 msgstr "按鈕之間的間隔"
 
-#: ../gtk/gtkdialog.c:324 ../gtk/gtkinfobar.c:475
+#: ../gtk/gtkdialog.c:326 ../gtk/gtkinfobar.c:476
 msgid "Action area border"
 msgstr "動作�域邊緣"
 
-#: ../gtk/gtkdialog.c:325
+#: ../gtk/gtkdialog.c:327
 msgid "Width of border around the button area at the bottom of the dialog"
 msgstr "�話盒按鈕下方按鈕�域的邊緣寬度"
 
-#: ../gtk/gtkentry.c:728
+#: ../gtk/gtkentrybuffer.c:353
+msgid "The contents of the buffer"
+msgstr "緩��的內容"
+
+#: ../gtk/gtkentrybuffer.c:367 ../gtk/gtkentry.c:917
+msgid "Text length"
+msgstr "文字寬度"
+
+#: ../gtk/gtkentrybuffer.c:368
+msgid "Length of the text currently in the buffer"
+msgstr "目�在緩��中文字的長度"
+
+#: ../gtk/gtkentrybuffer.c:382 ../gtk/gtkentry.c:769
+msgid "Maximum length"
+msgstr "最大長度"
+
+#: ../gtk/gtkentrybuffer.c:383 ../gtk/gtkentry.c:770
+msgid "Maximum number of characters for this entry. Zero if no maximum"
+msgstr "輸入欄中字元數目的上�。0 為沒有上�"
+
+#: ../gtk/gtkentry.c:733
 msgid "Text Buffer"
 msgstr "文字緩��"
 
-#: ../gtk/gtkentry.c:729
+#: ../gtk/gtkentry.c:734
 msgid "Text buffer object which actually stores entry text"
 msgstr "實際儲存項目文字的文字緩��物件"
 
-#: ../gtk/gtkentry.c:736 ../gtk/gtklabel.c:662
+#: ../gtk/gtkentry.c:741 ../gtk/gtklabel.c:824
 msgid "Cursor Position"
 msgstr "游標�置"
 
-#: ../gtk/gtkentry.c:737 ../gtk/gtklabel.c:663
+#: ../gtk/gtkentry.c:742 ../gtk/gtklabel.c:825
 msgid "The current position of the insertion cursor in chars"
 msgstr "游標目�的�置，以字元計。"
 
-#: ../gtk/gtkentry.c:746 ../gtk/gtklabel.c:672
+#: ../gtk/gtkentry.c:751 ../gtk/gtklabel.c:834
 msgid "Selection Bound"
 msgstr "��邊界"
 
-#: ../gtk/gtkentry.c:747 ../gtk/gtklabel.c:673
+#: ../gtk/gtkentry.c:752 ../gtk/gtklabel.c:835
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars"
 msgstr "所��的部份中，游標到�一端�置的�離（字元為單�）"
 
-#: ../gtk/gtkentry.c:757
+#: ../gtk/gtkentry.c:762
 msgid "Whether the entry contents can be edited"
 msgstr "��編輯欄�的內容"
 
-#: ../gtk/gtkentry.c:764 ../gtk/gtkentrybuffer.c:382
-msgid "Maximum length"
-msgstr "最大長度"
-
-#: ../gtk/gtkentry.c:765 ../gtk/gtkentrybuffer.c:383
-msgid "Maximum number of characters for this entry. Zero if no maximum"
-msgstr "輸入欄中字元數目的上�。0 為沒有上�"
-
-#: ../gtk/gtkentry.c:773
+#: ../gtk/gtkentry.c:778
 msgid "Visibility"
 msgstr "�見狀態"
 
-#: ../gtk/gtkentry.c:774
+#: ../gtk/gtkentry.c:779
 msgid ""
 "FALSE displays the \"invisible char\" instead of the actual text (password "
 "mode)"
 msgstr "FALSE 表示顯示「隱形字元�而�實際文字（密碼模�）"
 
-#: ../gtk/gtkentry.c:782
+#: ../gtk/gtkentry.c:787
 msgid "FALSE removes outside bevel from entry"
 msgstr "FALSE �將外部�飾"
 
-#: ../gtk/gtkentry.c:790
+#: ../gtk/gtkentry.c:795
 msgid ""
 "Border between text and frame. Overrides the inner-border style property"
 msgstr "文字與框架之間的框線。此數值會蓋�內部框線樣�屬性"
 
-#: ../gtk/gtkentry.c:797 ../gtk/gtkentry.c:1393
+#: ../gtk/gtkentry.c:802 ../gtk/gtkentry.c:1398
 msgid "Invisible character"
 msgstr "隱形字元"
 
-#: ../gtk/gtkentry.c:798 ../gtk/gtkentry.c:1394
+#: ../gtk/gtkentry.c:803 ../gtk/gtkentry.c:1399
 msgid "The character to use when masking entry contents (in \"password mode\")"
 msgstr "用來�蓋輸入內容的字元（在「密碼模��裡）"
 
-#: ../gtk/gtkentry.c:805
+#: ../gtk/gtkentry.c:810
 msgid "Activates default"
 msgstr "啟動�設元件"
 
-#: ../gtk/gtkentry.c:806
+#: ../gtk/gtkentry.c:811
 msgid ""
 "Whether to activate the default widget (such as the default button in a "
 "dialog) when Enter is pressed"
 msgstr "當按下 Enter �時，是�啟動�設視窗元件（例如�話盒的按鈕）"
 
-#: ../gtk/gtkentry.c:812
+#: ../gtk/gtkentry.c:817
 msgid "Width in chars"
 msgstr "寬度（以字元計算）"
 
-#: ../gtk/gtkentry.c:813
+#: ../gtk/gtkentry.c:818
 msgid "Number of characters to leave space for in the entry"
 msgstr "輸入元件中�留的空白長度（單�為字元）"
 
-#: ../gtk/gtkentry.c:822
+#: ../gtk/gtkentry.c:827
 msgid "Scroll offset"
 msgstr "�動�移"
 
-#: ../gtk/gtkentry.c:823
+#: ../gtk/gtkentry.c:828
 msgid "Number of pixels of the entry scrolled off the screen to the left"
 msgstr "輸入元件相�於螢幕�左�動�移的程度（單�為�素）"
 
-#: ../gtk/gtkentry.c:833
+#: ../gtk/gtkentry.c:838
 msgid "The contents of the entry"
 msgstr "輸入的內容"
 
-#: ../gtk/gtkentry.c:848 ../gtk/gtkmisc.c:81
+#: ../gtk/gtkentry.c:853 ../gtk/gtkmisc.c:105
 msgid "X align"
 msgstr "水平排列"
 
-#: ../gtk/gtkentry.c:849 ../gtk/gtkmisc.c:82
+#: ../gtk/gtkentry.c:854 ../gtk/gtkmisc.c:106
 msgid ""
 "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
 msgstr "水平方��齊，0 為左，1 為�。相��為�至左 (RTL) 排列。"
 
-#: ../gtk/gtkentry.c:865
+#: ../gtk/gtkentry.c:870
 msgid "Truncate multiline"
 msgstr "截短多行"
 
-#: ../gtk/gtkentry.c:866
+#: ../gtk/gtkentry.c:871
 msgid "Whether to truncate multiline pastes to one line."
 msgstr "��將多列貼上截短為一列。"
 
-#: ../gtk/gtkentry.c:882
+#: ../gtk/gtkentry.c:887
 msgid "Which kind of shadow to draw around the entry when has-frame is set"
 msgstr "當設定 has-frame 時�在項目周�繪出何種類型的陰影"
 
-#: ../gtk/gtkentry.c:897 ../gtk/gtktextview.c:764
+#: ../gtk/gtkentry.c:902 ../gtk/gtktextview.c:766
 msgid "Overwrite mode"
 msgstr "覆寫模�"
 
-#: ../gtk/gtkentry.c:898
+#: ../gtk/gtkentry.c:903
 msgid "Whether new text overwrites existing text"
 msgstr "新的文字是��以覆寫既有文字"
 
-#: ../gtk/gtkentry.c:912 ../gtk/gtkentrybuffer.c:367
-msgid "Text length"
-msgstr "文字寬度"
-
-#: ../gtk/gtkentry.c:913
+#: ../gtk/gtkentry.c:918
 msgid "Length of the text currently in the entry"
 msgstr "目�在項目中文字的長度"
 
-#: ../gtk/gtkentry.c:928
+#: ../gtk/gtkentry.c:933
 msgid "Invisible character set"
 msgstr "隱形字元設定"
 
-#: ../gtk/gtkentry.c:929
+#: ../gtk/gtkentry.c:934
 msgid "Whether the invisible character has been set"
 msgstr "隱形字元是�已設定"
 
-#: ../gtk/gtkentry.c:947
+#: ../gtk/gtkentry.c:952
 msgid "Caps Lock warning"
 msgstr "Caps Lock 警告"
 
-#: ../gtk/gtkentry.c:948
+#: ../gtk/gtkentry.c:953
 msgid "Whether password entries will show a warning when Caps Lock is on"
 msgstr "密碼欄�是�在 Caps Lock 開啟時顯示警告"
 
-#: ../gtk/gtkentry.c:962
+#: ../gtk/gtkentry.c:967
 msgid "Progress Fraction"
 msgstr "進度列完�度"
 
-#: ../gtk/gtkentry.c:963
+#: ../gtk/gtkentry.c:968
 msgid "The current fraction of the task that's been completed"
 msgstr "工作目�已完�的程度"
 
-#: ../gtk/gtkentry.c:980
+#: ../gtk/gtkentry.c:985
 msgid "Progress Pulse Step"
 msgstr "進度列指示步進"
 
-#: ../gtk/gtkentry.c:981
+#: ../gtk/gtkentry.c:986
 msgid ""
 "The fraction of total entry width to move the progress bouncing block for "
 "each call to gtk_entry_progress_pulse()"
@@ -2567,196 +2587,186 @@ msgstr ""
 "當�次呼� gtk_entry_progress_pulse() 後，進度�塊應移動的比例（以進度列全長"
 "為基準）"
 
-#: ../gtk/gtkentry.c:997
+#: ../gtk/gtkentry.c:1002
 msgid "Placeholder text"
-msgstr ""
+msgstr "佔�符文字"
 
-#: ../gtk/gtkentry.c:998
+#: ../gtk/gtkentry.c:1003
 msgid "Show text in the entry when it's empty and unfocused"
-msgstr ""
+msgstr "當項目留空並失去焦點時顯示其中的文字"
 
-#: ../gtk/gtkentry.c:1012
+#: ../gtk/gtkentry.c:1017
 msgid "Primary pixbuf"
 msgstr "主� pixbuf"
 
-#: ../gtk/gtkentry.c:1013
+#: ../gtk/gtkentry.c:1018
 msgid "Primary pixbuf for the entry"
 msgstr "用於此項目的主� pixbuf"
 
-#: ../gtk/gtkentry.c:1027
+#: ../gtk/gtkentry.c:1032
 msgid "Secondary pixbuf"
 msgstr "次� pixbuf"
 
-#: ../gtk/gtkentry.c:1028
+#: ../gtk/gtkentry.c:1033
 msgid "Secondary pixbuf for the entry"
 msgstr "用於此項目的次� pixbuf"
 
-#: ../gtk/gtkentry.c:1042
+#: ../gtk/gtkentry.c:1047
 msgid "Primary stock ID"
 msgstr "主�圖庫 ID"
 
-#: ../gtk/gtkentry.c:1043
+#: ../gtk/gtkentry.c:1048
 msgid "Stock ID for primary icon"
 msgstr "主�圖示的圖庫 ID"
 
-#: ../gtk/gtkentry.c:1057
+#: ../gtk/gtkentry.c:1062
 msgid "Secondary stock ID"
 msgstr "次�圖庫 ID"
 
-#: ../gtk/gtkentry.c:1058
+#: ../gtk/gtkentry.c:1063
 msgid "Stock ID for secondary icon"
 msgstr "次�圖示的圖庫 ID"
 
-#: ../gtk/gtkentry.c:1072
+#: ../gtk/gtkentry.c:1077
 msgid "Primary icon name"
 msgstr "主�圖示�稱"
 
-#: ../gtk/gtkentry.c:1073
+#: ../gtk/gtkentry.c:1078
 msgid "Icon name for primary icon"
 msgstr "主�圖示的�稱"
 
-#: ../gtk/gtkentry.c:1087
+#: ../gtk/gtkentry.c:1092
 msgid "Secondary icon name"
 msgstr "次�圖示�稱"
 
-#: ../gtk/gtkentry.c:1088
+#: ../gtk/gtkentry.c:1093
 msgid "Icon name for secondary icon"
 msgstr "次�圖示的�稱"
 
-#: ../gtk/gtkentry.c:1102
+#: ../gtk/gtkentry.c:1107
 msgid "Primary GIcon"
 msgstr "主� GIcon"
 
-#: ../gtk/gtkentry.c:1103
+#: ../gtk/gtkentry.c:1108
 msgid "GIcon for primary icon"
 msgstr "主�圖示的 GIcon"
 
-#: ../gtk/gtkentry.c:1117
+#: ../gtk/gtkentry.c:1122
 msgid "Secondary GIcon"
 msgstr "次� GIcon"
 
-#: ../gtk/gtkentry.c:1118
+#: ../gtk/gtkentry.c:1123
 msgid "GIcon for secondary icon"
 msgstr "次�圖示的 GIcon"
 
-#: ../gtk/gtkentry.c:1132
+#: ../gtk/gtkentry.c:1137
 msgid "Primary storage type"
 msgstr "主�儲存�類型"
 
-#: ../gtk/gtkentry.c:1133
+#: ../gtk/gtkentry.c:1138
 msgid "The representation being used for primary icon"
 msgstr "用於主�圖示的代表"
 
-#: ../gtk/gtkentry.c:1148
+#: ../gtk/gtkentry.c:1153
 msgid "Secondary storage type"
 msgstr "次�儲存�類型"
 
-#: ../gtk/gtkentry.c:1149
+#: ../gtk/gtkentry.c:1154
 msgid "The representation being used for secondary icon"
 msgstr "用於次�圖示的代表"
 
-#: ../gtk/gtkentry.c:1170
+#: ../gtk/gtkentry.c:1175
 msgid "Primary icon activatable"
 msgstr "主�圖示�用性"
 
-#: ../gtk/gtkentry.c:1171
+#: ../gtk/gtkentry.c:1176
 msgid "Whether the primary icon is activatable"
 msgstr "主�圖示是�在使用中"
 
-#: ../gtk/gtkentry.c:1191
+#: ../gtk/gtkentry.c:1196
 msgid "Secondary icon activatable"
 msgstr "次�圖示�用性"
 
-#: ../gtk/gtkentry.c:1192
+#: ../gtk/gtkentry.c:1197
 msgid "Whether the secondary icon is activatable"
 msgstr "次�圖示是�在使用中"
 
-#: ../gtk/gtkentry.c:1214
+#: ../gtk/gtkentry.c:1219
 msgid "Primary icon sensitive"
 msgstr "主�圖示�應"
 
-#: ../gtk/gtkentry.c:1215
+#: ../gtk/gtkentry.c:1220
 msgid "Whether the primary icon is sensitive"
 msgstr "主�圖示是�有�應"
 
-#: ../gtk/gtkentry.c:1236
+#: ../gtk/gtkentry.c:1241
 msgid "Secondary icon sensitive"
 msgstr "次�圖示�應"
 
-#: ../gtk/gtkentry.c:1237
+#: ../gtk/gtkentry.c:1242
 msgid "Whether the secondary icon is sensitive"
 msgstr "次�圖示是�有�應"
 
-#: ../gtk/gtkentry.c:1253
+#: ../gtk/gtkentry.c:1258
 msgid "Primary icon tooltip text"
 msgstr "主�圖示工具�示文字"
 
-#: ../gtk/gtkentry.c:1254 ../gtk/gtkentry.c:1290
+#: ../gtk/gtkentry.c:1259 ../gtk/gtkentry.c:1295
 msgid "The contents of the tooltip on the primary icon"
 msgstr "主�圖示工具�示的內容"
 
-#: ../gtk/gtkentry.c:1270
+#: ../gtk/gtkentry.c:1275
 msgid "Secondary icon tooltip text"
 msgstr "次�圖示工具�示文字"
 
-#: ../gtk/gtkentry.c:1271 ../gtk/gtkentry.c:1309
+#: ../gtk/gtkentry.c:1276 ../gtk/gtkentry.c:1314
 msgid "The contents of the tooltip on the secondary icon"
 msgstr "次�圖示工具�示的內容"
 
-#: ../gtk/gtkentry.c:1289
+#: ../gtk/gtkentry.c:1294
 msgid "Primary icon tooltip markup"
 msgstr "主�圖示工具�示標記"
 
-#: ../gtk/gtkentry.c:1308
+#: ../gtk/gtkentry.c:1313
 msgid "Secondary icon tooltip markup"
 msgstr "次�圖示工具�示標記"
 
-#: ../gtk/gtkentry.c:1328 ../gtk/gtktextview.c:792
+#: ../gtk/gtkentry.c:1333 ../gtk/gtktextview.c:794
 msgid "IM module"
 msgstr "IM 模組"
 
-#: ../gtk/gtkentry.c:1329 ../gtk/gtktextview.c:793
+#: ../gtk/gtkentry.c:1334 ../gtk/gtktextview.c:795
 msgid "Which IM module should be used"
 msgstr "�設�使用哪一個 IM 模組"
 
-#: ../gtk/gtkentry.c:1343
-#, fuzzy
-#| msgid "Completion Model"
+#: ../gtk/gtkentry.c:1348
 msgid "Completion"
-msgstr "自動完�模組"
+msgstr "補齊"
 
-#: ../gtk/gtkentry.c:1344
+#: ../gtk/gtkentry.c:1349
 msgid "The auxiliary completion object"
-msgstr ""
+msgstr "輔助補齊物件"
 
-#: ../gtk/gtkentry.c:1358
+#: ../gtk/gtkentry.c:1363
 msgid "Icon Prelight"
 msgstr "圖示�亮"
 
-#: ../gtk/gtkentry.c:1359
+#: ../gtk/gtkentry.c:1364
 msgid "Whether activatable icons should prelight when hovered"
 msgstr "使用中的圖示在滑鼠經�時是�顯示�亮"
 
-#: ../gtk/gtkentry.c:1372
+#: ../gtk/gtkentry.c:1377
 msgid "Progress Border"
 msgstr "進度列框線"
 
-#: ../gtk/gtkentry.c:1373
+#: ../gtk/gtkentry.c:1378
 msgid "Border around the progress bar"
 msgstr "進度列周�的框線"
 
-#: ../gtk/gtkentry.c:1865
+#: ../gtk/gtkentry.c:1870
 msgid "Border between text and frame."
 msgstr "文字與框架之間的框線。"
 
-#: ../gtk/gtkentrybuffer.c:353
-msgid "The contents of the buffer"
-msgstr "緩��的內容"
-
-#: ../gtk/gtkentrybuffer.c:368
-msgid "Length of the text currently in the buffer"
-msgstr "目�在緩��中文字的長度"
-
 #: ../gtk/gtkentrycompletion.c:320
 msgid "Completion Model"
 msgstr "自動完�模組"
@@ -2773,7 +2783,7 @@ msgstr "最�關�字長度"
 msgid "Minimum length of the search key in order to look up matches"
 msgstr "用來�尋的關�字的最�長度"
 
-#: ../gtk/gtkentrycompletion.c:344 ../gtk/gtkiconview.c:566
+#: ../gtk/gtkentrycompletion.c:344 ../gtk/gtkiconview.c:564
 msgid "Text column"
 msgstr "文字欄�"
 
@@ -2841,86 +2851,84 @@ msgid ""
 "child widget as opposed to below it."
 msgstr "是�事件方塊中攔截事件的視窗�覆蓋在�視窗元件之上，相�於至於其下。"
 
-#: ../gtk/gtkexpander.c:281
+#: ../gtk/gtkexpander.c:282
 msgid "Expanded"
 msgstr "展開"
 
-#: ../gtk/gtkexpander.c:282
+#: ../gtk/gtkexpander.c:283
 msgid "Whether the expander has been opened to reveal the child widget"
 msgstr "該�擴展元件是�已經展開，使其�元件顯露出來。"
 
-#: ../gtk/gtkexpander.c:290
+#: ../gtk/gtkexpander.c:291
 msgid "Text of the expander's label"
 msgstr "展開器標籤的文字"
 
-#: ../gtk/gtkexpander.c:305 ../gtk/gtklabel.c:581
+#: ../gtk/gtkexpander.c:306 ../gtk/gtklabel.c:743
 msgid "Use markup"
 msgstr "使用標記"
 
-#: ../gtk/gtkexpander.c:306 ../gtk/gtklabel.c:582
+#: ../gtk/gtkexpander.c:307 ../gtk/gtklabel.c:744
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "�擴展元件的文字標籤包�XML標記。詳見 pango_parse_markup()"
 
-#: ../gtk/gtkexpander.c:314
+#: ../gtk/gtkexpander.c:315
 msgid "Space to put between the label and the child"
 msgstr "�隔�元件與文字標籤的�外的空間"
 
-#: ../gtk/gtkexpander.c:323 ../gtk/gtkframe.c:168 ../gtk/gtktoolbutton.c:215
-#: ../gtk/gtktoolitemgroup.c:1603
+#: ../gtk/gtkexpander.c:324 ../gtk/gtkframe.c:206 ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolitemgroup.c:1599
 msgid "Label widget"
 msgstr "標籤元件"
 
-#: ../gtk/gtkexpander.c:324
+#: ../gtk/gtkexpander.c:325
 msgid "A widget to display in place of the usual expander label"
 msgstr "替代展開器原本文字標籤的視窗元件"
 
-#: ../gtk/gtkexpander.c:331
+#: ../gtk/gtkexpander.c:332
 msgid "Label fill"
 msgstr "標籤填滿"
 
-#: ../gtk/gtkexpander.c:332
+#: ../gtk/gtkexpander.c:333
 msgid "Whether the label widget should fill all available horizontal space"
 msgstr "籤標視窗元件是�應填滿所有�用的水平空間"
 
-#: ../gtk/gtkexpander.c:347
-#, fuzzy
-#| msgid "Resize mode"
-msgid "Resize tolevel"
-msgstr "調整尺寸模�"
-
 #: ../gtk/gtkexpander.c:348
+msgid "Resize toplevel"
+msgstr "改變頂端層級大�"
+
+#: ../gtk/gtkexpander.c:349
 msgid ""
 "Whether the expander will resize the toplevel window upon expanding and "
 "collapsing"
-msgstr ""
+msgstr "在展開和收摺時展開器是��改變頂層視窗的大�"
 
-#: ../gtk/gtkexpander.c:354 ../gtk/gtktoolitemgroup.c:1631
+#: ../gtk/gtkexpander.c:355 ../gtk/gtktoolitemgroup.c:1627
 #: ../gtk/gtktreeview.c:1187
 msgid "Expander Size"
 msgstr "展開器大�"
 
-#: ../gtk/gtkexpander.c:355 ../gtk/gtktoolitemgroup.c:1632
+#: ../gtk/gtkexpander.c:356 ../gtk/gtktoolitemgroup.c:1628
 #: ../gtk/gtktreeview.c:1188
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大�"
 
-#: ../gtk/gtkexpander.c:364
+#: ../gtk/gtkexpander.c:365
 msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周�的間�"
 
-#: ../gtk/gtkfilechooserbutton.c:366
+#: ../gtk/gtkfilechooserbutton.c:409
 msgid "Dialog"
 msgstr "�話盒"
 
-#: ../gtk/gtkfilechooserbutton.c:367
+#: ../gtk/gtkfilechooserbutton.c:410
 msgid "The file chooser dialog to use."
 msgstr "準備�用的檔案�擇�話盒類型。"
 
-#: ../gtk/gtkfilechooserbutton.c:398
+#: ../gtk/gtkfilechooserbutton.c:441
 msgid "The title of the file chooser dialog."
 msgstr "檔案�擇�話盒的標題。"
 
-#: ../gtk/gtkfilechooserbutton.c:412
+#: ../gtk/gtkfilechooserbutton.c:455
 msgid "The desired width of the button widget, in characters."
 msgstr "按鈕元件所需的寬度，以字元計。"
 
@@ -3017,7 +3025,7 @@ msgid ""
 "folders."
 msgstr "在開啟模�的檔案�擇程�是�讓使用者建立新的資料夾。"
 
-#: ../gtk/gtkfixed.c:152 ../gtk/gtklayout.c:634
+#: ../gtk/gtkfixed.c:152 ../gtk/gtklayout.c:634 ../gtk/gtktreeviewcolumn.c:264
 msgid "X position"
 msgstr "水平�置"
 
@@ -3033,463 +3041,472 @@ msgstr "垂直�置"
 msgid "Y position of child widget"
 msgstr "�元件的垂直�置"
 
-#: ../gtk/gtkfontbutton.c:141
-msgid "The title of the font selection dialog"
-msgstr "字型�擇�話盒的標題"
+#: ../gtk/gtkfontbutton.c:151
+msgid "The title of the font chooser dialog"
+msgstr "檔案�擇�話盒的標題"
 
-#: ../gtk/gtkfontbutton.c:156 ../gtk/gtkfontsel.c:219
+#: ../gtk/gtkfontbutton.c:166 ../gtk/gtkfontchooser.c:189
+#: ../gtk/gtkfontsel.c:244
 msgid "Font name"
 msgstr "字型�稱"
 
-#: ../gtk/gtkfontbutton.c:157
+#: ../gtk/gtkfontbutton.c:167
 msgid "The name of the selected font"
 msgstr "�擇字型的�稱"
 
-#: ../gtk/gtkfontbutton.c:158
+#: ../gtk/gtkfontbutton.c:168
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:173
+#: ../gtk/gtkfontbutton.c:183
 msgid "Use font in label"
 msgstr "字型本身�映在標籤內"
 
-#: ../gtk/gtkfontbutton.c:174
+#: ../gtk/gtkfontbutton.c:184
 msgid "Whether the label is drawn in the selected font"
 msgstr "標籤文字��使用�擇的字型"
 
-#: ../gtk/gtkfontbutton.c:189
+#: ../gtk/gtkfontbutton.c:199
 msgid "Use size in label"
 msgstr "文字標籤中使用尺寸"
 
-#: ../gtk/gtkfontbutton.c:190
+#: ../gtk/gtkfontbutton.c:200
 msgid "Whether the label is drawn with the selected font size"
 msgstr "標籤文字��使用�擇的字型大�"
 
-#: ../gtk/gtkfontbutton.c:206
+#: ../gtk/gtkfontbutton.c:216
 msgid "Show style"
 msgstr "顯示樣�"
 
-#: ../gtk/gtkfontbutton.c:207
+#: ../gtk/gtkfontbutton.c:217
 msgid "Whether the selected font style is shown in the label"
 msgstr "標籤文字��使用�擇的字型樣�"
 
-#: ../gtk/gtkfontbutton.c:222
+#: ../gtk/gtkfontbutton.c:232
 msgid "Show size"
 msgstr "顯示字型大�"
 
-#: ../gtk/gtkfontbutton.c:223
+#: ../gtk/gtkfontbutton.c:233
 msgid "Whether selected font size is shown in the label"
 msgstr "標籤文字是�顯示使用�擇的字型尺寸"
 
-#: ../gtk/gtkfontsel.c:220
+#: ../gtk/gtkfontchooser.c:190 ../gtk/gtkfontsel.c:245
 msgid "The string that represents this font"
 msgstr "表示本字型的字串"
 
-#: ../gtk/gtkfontsel.c:226
+#: ../gtk/gtkfontchooser.c:196 ../gtk/gtkfontsel.c:251
 msgid "Preview text"
 msgstr "�覽文字"
 
-#: ../gtk/gtkfontsel.c:227
+#: ../gtk/gtkfontchooser.c:197 ../gtk/gtkfontsel.c:252
 msgid "The text to display in order to demonstrate the selected font"
 msgstr "顯示�定的字型時所使用的字串"
 
-#: ../gtk/gtkframe.c:134
+#: ../gtk/gtkfontchooser.c:204
+msgid "Show preview text entry"
+msgstr "顯示�覽文字項目"
+
+#: ../gtk/gtkfontchooser.c:205
+msgid "Whether the preview text entry is shown or not"
+msgstr "是�顯示�覽文字項目"
+
+#: ../gtk/gtkframe.c:172
 msgid "Text of the frame's label"
 msgstr "框架的標籤文字"
 
-#: ../gtk/gtkframe.c:141
+#: ../gtk/gtkframe.c:179
 msgid "Label xalign"
 msgstr "標籤水平�置"
 
-#: ../gtk/gtkframe.c:142
+#: ../gtk/gtkframe.c:180
 msgid "The horizontal alignment of the label"
 msgstr "標籤的水平�置"
 
-#: ../gtk/gtkframe.c:150
+#: ../gtk/gtkframe.c:188
 msgid "Label yalign"
 msgstr "標籤垂直�置"
 
-#: ../gtk/gtkframe.c:151
+#: ../gtk/gtkframe.c:189
 msgid "The vertical alignment of the label"
 msgstr "標籤的垂直�置"
 
-#: ../gtk/gtkframe.c:159
+#: ../gtk/gtkframe.c:197
 msgid "Frame shadow"
 msgstr "框架陰影"
 
-#: ../gtk/gtkframe.c:160
+#: ../gtk/gtkframe.c:198
 msgid "Appearance of the frame border"
 msgstr "框架邊框的外觀"
 
-#: ../gtk/gtkframe.c:169
+#: ../gtk/gtkframe.c:207
 msgid "A widget to display in place of the usual frame label"
 msgstr "用來替代原本框架文字標籤的視窗元件"
 
-#: ../gtk/gtkgrid.c:1268 ../gtk/gtktable.c:175
+#: ../gtk/gtkgrid.c:1298 ../gtk/gtktable.c:209
 msgid "Row spacing"
 msgstr "列�"
 
-#: ../gtk/gtkgrid.c:1269 ../gtk/gtktable.c:176
+#: ../gtk/gtkgrid.c:1299 ../gtk/gtktable.c:210
 msgid "The amount of space between two consecutive rows"
 msgstr "兩列之間的�離"
 
-#: ../gtk/gtkgrid.c:1275 ../gtk/gtktable.c:184
+#: ../gtk/gtkgrid.c:1305 ../gtk/gtktable.c:218
 msgid "Column spacing"
 msgstr "行�"
 
-#: ../gtk/gtkgrid.c:1276 ../gtk/gtktable.c:185
+#: ../gtk/gtkgrid.c:1306 ../gtk/gtktable.c:219
 msgid "The amount of space between two consecutive columns"
 msgstr "兩行之間的�離"
 
-#: ../gtk/gtkgrid.c:1282
+#: ../gtk/gtkgrid.c:1312
 msgid "Row Homogeneous"
 msgstr "列高一致"
 
-#: ../gtk/gtkgrid.c:1283
+#: ../gtk/gtkgrid.c:1313
 msgid "If TRUE, the rows are all the same height"
 msgstr "如設為定為「TRUE�，表示所有列的高度都一樣"
 
-#: ../gtk/gtkgrid.c:1289
+#: ../gtk/gtkgrid.c:1319
 msgid "Column Homogeneous"
 msgstr "欄寬一致"
 
-#: ../gtk/gtkgrid.c:1290
+#: ../gtk/gtkgrid.c:1320
 msgid "If TRUE, the columns are all the same width"
 msgstr "如設為定為「TRUE�，表示所有欄的寬度都一樣"
 
-#: ../gtk/gtkgrid.c:1296 ../gtk/gtktable.c:201
+#: ../gtk/gtkgrid.c:1326 ../gtk/gtktable.c:235
 msgid "Left attachment"
 msgstr "左�附加"
 
-#: ../gtk/gtkgrid.c:1297 ../gtk/gtkmenu.c:759 ../gtk/gtktable.c:202
+#: ../gtk/gtkgrid.c:1327 ../gtk/gtkmenu.c:761 ../gtk/gtktable.c:236
 msgid "The column number to attach the left side of the child to"
 msgstr "��單的左�附加於給定的縱列數上"
 
-#: ../gtk/gtkgrid.c:1303 ../gtk/gtktable.c:215
+#: ../gtk/gtkgrid.c:1333 ../gtk/gtktable.c:249
 msgid "Top attachment"
 msgstr "頂端附加"
 
-#: ../gtk/gtkgrid.c:1304
+#: ../gtk/gtkgrid.c:1334
 msgid "The row number to attach the top side of a child widget to"
 msgstr "附加�元件頂端於其上的列數"
 
-#: ../gtk/gtkgrid.c:1310 ../gtk/gtklayout.c:660 ../gtk/gtktreeviewcolumn.c:262
+#: ../gtk/gtkgrid.c:1340 ../gtk/gtklayout.c:660 ../gtk/gtktreeviewcolumn.c:274
 msgid "Width"
 msgstr "寬度"
 
-#: ../gtk/gtkgrid.c:1311
+#: ../gtk/gtkgrid.c:1341
 msgid "The number of columns that a child spans"
 msgstr "�項跨�的欄數"
 
-#: ../gtk/gtkgrid.c:1317 ../gtk/gtklayout.c:669
+#: ../gtk/gtkgrid.c:1347 ../gtk/gtklayout.c:669
 msgid "Height"
 msgstr "高度"
 
-#: ../gtk/gtkgrid.c:1318
+#: ../gtk/gtkgrid.c:1348
 msgid "The number of rows that a child spans"
 msgstr "�項跨�的列數"
 
-#: ../gtk/gtkhandlebox.c:191
+#: ../gtk/gtkhandlebox.c:219
 msgid "Appearance of the shadow that surrounds the container"
 msgstr "容器元件周�的陰影的外觀"
 
-#: ../gtk/gtkhandlebox.c:199
+#: ../gtk/gtkhandlebox.c:227
 msgid "Handle position"
 msgstr "控制項�置"
 
-#: ../gtk/gtkhandlebox.c:200
+#: ../gtk/gtkhandlebox.c:228
 msgid "Position of the handle relative to the child widget"
 msgstr "相�於�元件的控制項�置"
 
-#: ../gtk/gtkhandlebox.c:208
+#: ../gtk/gtkhandlebox.c:236
 msgid "Snap edge"
 msgstr "貼齊邊緣"
 
-#: ../gtk/gtkhandlebox.c:209
+#: ../gtk/gtkhandlebox.c:237
 msgid ""
 "Side of the handlebox that's lined up with the docking point to dock the "
 "handlebox"
 msgstr "控制方塊的�邊與置入該方塊的置入點自動貼齊"
 
-#: ../gtk/gtkhandlebox.c:217
+#: ../gtk/gtkhandlebox.c:245
 msgid "Snap edge set"
 msgstr "貼齊邊緣設定"
 
-#: ../gtk/gtkhandlebox.c:218
+#: ../gtk/gtkhandlebox.c:246
 msgid ""
 "Whether to use the value from the snap_edge property or a value derived from "
 "handle_position"
 msgstr "是��照 snap_edge 屬性，或採用 handle_position 的設定值"
 
-#: ../gtk/gtkhandlebox.c:225
+#: ../gtk/gtkhandlebox.c:253
 msgid "Child Detached"
 msgstr "�項目已分離"
 
-#: ../gtk/gtkhandlebox.c:226
+#: ../gtk/gtkhandlebox.c:254
 msgid ""
 "A boolean value indicating whether the handlebox's child is attached or "
 "detached."
 msgstr "一個用來表示把手方塊(handlebox)的�項是��或分離的布林數值。"
 
-#: ../gtk/gtkiconview.c:529 ../gtk/gtktreeselection.c:131
+#: ../gtk/gtkiconview.c:527 ../gtk/gtktreeselection.c:131
 msgid "Selection mode"
 msgstr "�擇模�"
 
-#: ../gtk/gtkiconview.c:530
+#: ../gtk/gtkiconview.c:528
 msgid "The selection mode"
 msgstr "�擇模�"
 
-#: ../gtk/gtkiconview.c:548
+#: ../gtk/gtkiconview.c:546
 msgid "Pixbuf column"
 msgstr "Pixbuf 欄"
 
-#: ../gtk/gtkiconview.c:549
+#: ../gtk/gtkiconview.c:547
 msgid "Model column used to retrieve the icon pixbuf from"
 msgstr "用來�得圖示 pixbuf 的典型欄"
 
-#: ../gtk/gtkiconview.c:567
+#: ../gtk/gtkiconview.c:565
 msgid "Model column used to retrieve the text from"
 msgstr "用來�得文字 pixbuf 的典型欄"
 
-#: ../gtk/gtkiconview.c:586
+#: ../gtk/gtkiconview.c:584
 msgid "Markup column"
 msgstr "標記欄�"
 
-#: ../gtk/gtkiconview.c:587
+#: ../gtk/gtkiconview.c:585
 msgid "Model column used to retrieve the text if using Pango markup"
 msgstr "如果使用 Pango 標記時用來�得文字的典型欄"
 
-#: ../gtk/gtkiconview.c:594
+#: ../gtk/gtkiconview.c:592
 msgid "Icon View Model"
 msgstr "Icon View 模型"
 
-#: ../gtk/gtkiconview.c:595
+#: ../gtk/gtkiconview.c:593
 msgid "The model for the icon view"
 msgstr "圖示檢視所使用的模型"
 
-#: ../gtk/gtkiconview.c:611
+#: ../gtk/gtkiconview.c:609
 msgid "Number of columns"
 msgstr "欄�數目"
 
-#: ../gtk/gtkiconview.c:612
+#: ../gtk/gtkiconview.c:610
 msgid "Number of columns to display"
 msgstr "�顯示的欄數"
 
-#: ../gtk/gtkiconview.c:629
+#: ../gtk/gtkiconview.c:627
 msgid "Width for each item"
 msgstr "�項目的寬度"
 
-#: ../gtk/gtkiconview.c:630
+#: ../gtk/gtkiconview.c:628
 msgid "The width used for each item"
 msgstr "用於�個項目的寬度"
 
-#: ../gtk/gtkiconview.c:646
+#: ../gtk/gtkiconview.c:644
 msgid "Space which is inserted between cells of an item"
 msgstr "用來�入項目的格�之間的空間"
 
-#: ../gtk/gtkiconview.c:661
+#: ../gtk/gtkiconview.c:659
 msgid "Row Spacing"
 msgstr "行的間隔"
 
-#: ../gtk/gtkiconview.c:662
+#: ../gtk/gtkiconview.c:660
 msgid "Space which is inserted between grid rows"
 msgstr "用來�入格線列之間的空間"
 
-#: ../gtk/gtkiconview.c:677
+#: ../gtk/gtkiconview.c:675
 msgid "Column Spacing"
 msgstr "欄的間隔"
 
-#: ../gtk/gtkiconview.c:678
+#: ../gtk/gtkiconview.c:676
 msgid "Space which is inserted between grid columns"
 msgstr "用來�入格線欄之間的空間"
 
-#: ../gtk/gtkiconview.c:693
+#: ../gtk/gtkiconview.c:691
 msgid "Margin"
 msgstr "邊界"
 
-#: ../gtk/gtkiconview.c:694
+#: ../gtk/gtkiconview.c:692
 msgid "Space which is inserted at the edges of the icon view"
 msgstr "用來�入圖示檢視邊緣的空間"
 
-#: ../gtk/gtkiconview.c:709
+#: ../gtk/gtkiconview.c:707
 msgid "Item Orientation"
 msgstr "項目方�"
 
-#: ../gtk/gtkiconview.c:710
+#: ../gtk/gtkiconview.c:708
 msgid ""
 "How the text and icon of each item are positioned relative to each other"
 msgstr "�個項目的文字與圖示之間�如何排列"
 
-#: ../gtk/gtkiconview.c:726 ../gtk/gtktreeview.c:1022
-#: ../gtk/gtktreeviewcolumn.c:362
+#: ../gtk/gtkiconview.c:724 ../gtk/gtktreeview.c:1022
+#: ../gtk/gtktreeviewcolumn.c:374
 msgid "Reorderable"
 msgstr "��新排列"
 
-#: ../gtk/gtkiconview.c:727 ../gtk/gtktreeview.c:1023
+#: ../gtk/gtkiconview.c:725 ../gtk/gtktreeview.c:1023
 msgid "View is reorderable"
 msgstr "該顯示為�排�的"
 
-#: ../gtk/gtkiconview.c:734 ../gtk/gtktreeview.c:1173
+#: ../gtk/gtkiconview.c:732 ../gtk/gtktreeview.c:1173
 msgid "Tooltip Column"
 msgstr "工具�示欄�"
 
-#: ../gtk/gtkiconview.c:735
+#: ../gtk/gtkiconview.c:733
 msgid "The column in the model containing the tooltip texts for the items"
 msgstr "包�項目的工具�示文字的模型欄�"
 
-#: ../gtk/gtkiconview.c:752
+#: ../gtk/gtkiconview.c:750
 msgid "Item Padding"
 msgstr "項目留空"
 
-#: ../gtk/gtkiconview.c:753
+#: ../gtk/gtkiconview.c:751
 msgid "Padding around icon view items"
 msgstr "圖示檢視項目周�的留空"
 
-#: ../gtk/gtkiconview.c:784
+#: ../gtk/gtkiconview.c:782
 msgid "Selection Box Color"
 msgstr "���方塊色彩"
 
-#: ../gtk/gtkiconview.c:785
+#: ../gtk/gtkiconview.c:783
 msgid "Color of the selection box"
 msgstr "���方塊的色彩"
 
-#: ../gtk/gtkiconview.c:791
+#: ../gtk/gtkiconview.c:789
 msgid "Selection Box Alpha"
 msgstr "���方塊的α混色"
 
-#: ../gtk/gtkiconview.c:792
+#: ../gtk/gtkiconview.c:790
 msgid "Opacity of the selection box"
 msgstr "���方塊的�明度"
 
-#: ../gtk/gtkimage.c:236 ../gtk/gtkstatusicon.c:205
+#: ../gtk/gtkimage.c:237 ../gtk/gtkstatusicon.c:235
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: ../gtk/gtkimage.c:237 ../gtk/gtkstatusicon.c:206
+#: ../gtk/gtkimage.c:238 ../gtk/gtkstatusicon.c:236
 msgid "A GdkPixbuf to display"
 msgstr "準備顯示的 GdkPixbuf"
 
-#: ../gtk/gtkimage.c:244 ../gtk/gtkrecentmanager.c:294
-#: ../gtk/gtkstatusicon.c:213
+#: ../gtk/gtkimage.c:245 ../gtk/gtkrecentmanager.c:294
+#: ../gtk/gtkstatusicon.c:243
 msgid "Filename"
 msgstr "檔案�稱"
 
-#: ../gtk/gtkimage.c:245 ../gtk/gtkstatusicon.c:214
+#: ../gtk/gtkimage.c:246 ../gtk/gtkstatusicon.c:244
 msgid "Filename to load and display"
 msgstr "準備載入�顯示的檔案"
 
-#: ../gtk/gtkimage.c:254 ../gtk/gtkstatusicon.c:222
+#: ../gtk/gtkimage.c:255 ../gtk/gtkstatusicon.c:252
 msgid "Stock ID for a stock image to display"
 msgstr "欲顯示的內建圖示�稱"
 
-#: ../gtk/gtkimage.c:261
+#: ../gtk/gtkimage.c:262
 msgid "Icon set"
 msgstr "圖示集"
 
-#: ../gtk/gtkimage.c:262
+#: ../gtk/gtkimage.c:263
 msgid "Icon set to display"
 msgstr "準備顯示的圖示集"
 
-#: ../gtk/gtkimage.c:269 ../gtk/gtkscalebutton.c:227 ../gtk/gtktoolbar.c:518
-#: ../gtk/gtktoolpalette.c:1039
+#: ../gtk/gtkimage.c:270 ../gtk/gtkscalebutton.c:228 ../gtk/gtktoolbar.c:530
+#: ../gtk/gtktoolpalette.c:1008
 msgid "Icon size"
 msgstr "圖示大�"
 
-#: ../gtk/gtkimage.c:270
+#: ../gtk/gtkimage.c:271
 msgid "Symbolic size to use for stock icon, icon set or named icon"
 msgstr "內建圖示或圖示集或具�圖示的符號大�"
 
-#: ../gtk/gtkimage.c:286
+#: ../gtk/gtkimage.c:287
 msgid "Pixel size"
 msgstr "�素大�"
 
-#: ../gtk/gtkimage.c:287
+#: ../gtk/gtkimage.c:288
 msgid "Pixel size to use for named icon"
 msgstr "具�圖示的�素大�"
 
-#: ../gtk/gtkimage.c:295
+#: ../gtk/gtkimage.c:296
 msgid "Animation"
 msgstr "å‹•ç•«"
 
-#: ../gtk/gtkimage.c:296
+#: ../gtk/gtkimage.c:297
 msgid "GdkPixbufAnimation to display"
 msgstr "準備顯示的 GdkPixbufAnimation"
 
-#: ../gtk/gtkimage.c:336 ../gtk/gtkstatusicon.c:253
+#: ../gtk/gtkimage.c:337 ../gtk/gtkstatusicon.c:283
 msgid "Storage type"
 msgstr "儲存種類"
 
-#: ../gtk/gtkimage.c:337 ../gtk/gtkstatusicon.c:254
+#: ../gtk/gtkimage.c:338 ../gtk/gtkstatusicon.c:284
 msgid "The representation being used for image data"
 msgstr "圖片資料所使用的資料代表"
 
-#: ../gtk/gtkimage.c:355
+#: ../gtk/gtkimage.c:356
 msgid "Use Fallback"
 msgstr "使用後備"
 
-#: ../gtk/gtkimage.c:356
+#: ../gtk/gtkimage.c:357
 msgid "Whether to use icon names fallback"
 msgstr "是�使用圖示�稱後備"
 
-#: ../gtk/gtkimagemenuitem.c:150
+#: ../gtk/gtkimagemenuitem.c:161
 msgid "Child widget to appear next to the menu text"
 msgstr "�單文字�邊顯示的�元件"
 
-#: ../gtk/gtkimagemenuitem.c:165
+#: ../gtk/gtkimagemenuitem.c:176
 msgid "Whether to use the label text to create a stock menu item"
 msgstr "是�使用標籤文字來建立圖庫�單項目"
 
-#: ../gtk/gtkimagemenuitem.c:198 ../gtk/gtkmenu.c:601
+#: ../gtk/gtkimagemenuitem.c:209 ../gtk/gtkmenu.c:603
 msgid "Accel Group"
 msgstr "�徑�群組"
 
-#: ../gtk/gtkimagemenuitem.c:199
+#: ../gtk/gtkimagemenuitem.c:210
 msgid "The Accel Group to use for stock accelerator keys"
 msgstr "圖庫�徑�的群組"
 
-#: ../gtk/gtkinfobar.c:371 ../gtk/gtkmessagedialog.c:202
+#: ../gtk/gtkinfobar.c:372 ../gtk/gtkmessagedialog.c:204
 msgid "Message Type"
 msgstr "訊�類型"
 
-#: ../gtk/gtkinfobar.c:372 ../gtk/gtkmessagedialog.c:203
+#: ../gtk/gtkinfobar.c:373 ../gtk/gtkmessagedialog.c:205
 msgid "The type of message"
 msgstr "訊�的類型"
 
-#: ../gtk/gtkinfobar.c:427
+#: ../gtk/gtkinfobar.c:428
 msgid "Width of border around the content area"
 msgstr "內容�域的邊框寬度"
 
-#: ../gtk/gtkinfobar.c:444
+#: ../gtk/gtkinfobar.c:445
 msgid "Spacing between elements of the area"
 msgstr "�域中元件間的間�"
 
-#: ../gtk/gtkinfobar.c:476
+#: ../gtk/gtkinfobar.c:477
 msgid "Width of border around the action area"
 msgstr "動作�域的邊框寬度"
 
-#: ../gtk/gtkinvisible.c:89 ../gtk/gtkmountoperation.c:175
-#: ../gtk/gtkstatusicon.c:272 ../gtk/gtkstylecontext.c:546
-#: ../gtk/gtkwindow.c:730
+#: ../gtk/gtkinvisible.c:103 ../gtk/gtkmountoperation.c:173
+#: ../gtk/gtkstatusicon.c:302 ../gtk/gtkstylecontext.c:432
+#: ../gtk/gtkwindow.c:765
 msgid "Screen"
 msgstr "螢幕"
 
-#: ../gtk/gtkinvisible.c:90 ../gtk/gtkwindow.c:731
+#: ../gtk/gtkinvisible.c:104 ../gtk/gtkwindow.c:766
 msgid "The screen where this window will be displayed"
 msgstr "本視窗將顯示於第幾螢幕"
 
-#: ../gtk/gtklabel.c:568
+#: ../gtk/gtklabel.c:730
 msgid "The text of the label"
 msgstr "標籤中的文字"
 
-#: ../gtk/gtklabel.c:575
+#: ../gtk/gtklabel.c:737
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "標籤中的文字�以採用的樣�屬性清單"
 
-#: ../gtk/gtklabel.c:596 ../gtk/gtktexttag.c:353 ../gtk/gtktextview.c:701
+#: ../gtk/gtklabel.c:758 ../gtk/gtktexttag.c:386 ../gtk/gtktextview.c:703
 msgid "Justification"
 msgstr "�齊方�"
 
-#: ../gtk/gtklabel.c:597
+#: ../gtk/gtklabel.c:759
 msgid ""
 "The alignment of the lines in the text of the label relative to each other. "
 "This does NOT affect the alignment of the label within its allocation. See "
@@ -3498,87 +3515,87 @@ msgstr ""
 "標籤文字中�一列文字相�的排列方�。此設定並�會影響該文字標籤的�置�置。詳"
 "見 GtkMisc::xalign "
 
-#: ../gtk/gtklabel.c:605
+#: ../gtk/gtklabel.c:767
 msgid "Pattern"
 msgstr "樣�"
 
-#: ../gtk/gtklabel.c:606
+#: ../gtk/gtklabel.c:768
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
 msgstr "�有底線(_)的字串中，字�會呈�有底線的相��置"
 
-#: ../gtk/gtklabel.c:613
+#: ../gtk/gtklabel.c:775
 msgid "Line wrap"
 msgstr "自動�行"
 
-#: ../gtk/gtklabel.c:614
+#: ../gtk/gtklabel.c:776
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "如使用本�項，當字�太長時會自動�行"
 
-#: ../gtk/gtklabel.c:629
+#: ../gtk/gtklabel.c:791
 msgid "Line wrap mode"
 msgstr "�行模�"
 
-#: ../gtk/gtklabel.c:630
+#: ../gtk/gtklabel.c:792
 msgid "If wrap is set, controls how linewrapping is done"
 msgstr "如果設定�行，這裡控制如何完��行"
 
-#: ../gtk/gtklabel.c:637
+#: ../gtk/gtklabel.c:799
 msgid "Selectable"
 msgstr "���"
 
-#: ../gtk/gtklabel.c:638
+#: ../gtk/gtklabel.c:800
 msgid "Whether the label text can be selected with the mouse"
 msgstr "標籤文字��使用滑鼠來��"
 
-#: ../gtk/gtklabel.c:644
+#: ../gtk/gtklabel.c:806
 msgid "Mnemonic key"
 msgstr "速記�"
 
-#: ../gtk/gtklabel.c:645
+#: ../gtk/gtklabel.c:807
 msgid "The mnemonic accelerator key for this label"
 msgstr "本文字標籤的速記快��"
 
-#: ../gtk/gtklabel.c:653
+#: ../gtk/gtklabel.c:815
 msgid "Mnemonic widget"
 msgstr "速記元件"
 
-#: ../gtk/gtklabel.c:654
+#: ../gtk/gtklabel.c:816
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr "當文字標籤速記�按下時所啟動的元件"
 
-#: ../gtk/gtklabel.c:700
+#: ../gtk/gtklabel.c:862
 msgid ""
 "The preferred place to ellipsize the string, if the label does not have "
 "enough room to display the entire string"
 msgstr "如果標籤沒有足夠的空間顯示整個字串時，用來簡化該字串的空間"
 
-#: ../gtk/gtklabel.c:741
+#: ../gtk/gtklabel.c:903
 msgid "Single Line Mode"
 msgstr "單行模�"
 
-#: ../gtk/gtklabel.c:742
+#: ../gtk/gtklabel.c:904
 msgid "Whether the label is in single line mode"
 msgstr "標籤是�以單行的方�顯示"
 
-#: ../gtk/gtklabel.c:759
+#: ../gtk/gtklabel.c:921
 msgid "Angle"
 msgstr "角"
 
-#: ../gtk/gtklabel.c:760
+#: ../gtk/gtklabel.c:922
 msgid "Angle at which the label is rotated"
 msgstr "顯示標籤時旋轉的角度"
 
-#: ../gtk/gtklabel.c:782
+#: ../gtk/gtklabel.c:944
 msgid "The desired maximum width of the label, in characters"
 msgstr "標籤所需的最大寬度，以字元計"
 
-#: ../gtk/gtklabel.c:800
+#: ../gtk/gtklabel.c:962
 msgid "Track visited links"
 msgstr "追蹤已�覽的連�"
 
-#: ../gtk/gtklabel.c:801
+#: ../gtk/gtklabel.c:963
 msgid "Whether visited links should be tracked"
 msgstr "是�追蹤已�覽的連�"
 
@@ -3606,546 +3623,596 @@ msgstr "已�覽"
 msgid "Whether this link has been visited."
 msgstr "這個連�是�已�覽�。"
 
-#: ../gtk/gtkmenubar.c:181
+#: ../gtk/gtklockbutton.c:278
+msgid "Permission"
+msgstr "權�"
+
+#: ../gtk/gtklockbutton.c:279
+msgid "The GPermission object controlling this button"
+msgstr "GPermission 物件控制了這個按鈕"
+
+#: ../gtk/gtklockbutton.c:286
+msgid "Lock Text"
+msgstr "鎖定的文字"
+
+#: ../gtk/gtklockbutton.c:287
+msgid "The text to display when prompting the user to lock"
+msgstr "�示使用者鎖定時�顯示的文字"
+
+#: ../gtk/gtklockbutton.c:295
+msgid "Unlock Text"
+msgstr "解鎖的文字"
+
+#: ../gtk/gtklockbutton.c:296
+msgid "The text to display when prompting the user to unlock"
+msgstr "�示使用者解鎖時�顯示的文字"
+
+#: ../gtk/gtklockbutton.c:304
+msgid "Lock Tooltip"
+msgstr "鎖定的工具�示"
+
+#: ../gtk/gtklockbutton.c:305
+msgid "The tooltip to display when prompting the user to lock"
+msgstr "當�示使用者鎖定時�顯示的工具�示"
+
+#: ../gtk/gtklockbutton.c:313
+msgid "Unlock Tooltip"
+msgstr "解鎖的工具�示"
+
+#: ../gtk/gtklockbutton.c:314
+msgid "The tooltip to display when prompting the user to unlock"
+msgstr "當�示使用者解鎖時�顯示的工具�示"
+
+#: ../gtk/gtklockbutton.c:322
+msgid "Not Authorized Tooltip"
+msgstr "未驗證的工具�示"
+
+#: ../gtk/gtklockbutton.c:323
+msgid ""
+"The tooltip to display when prompting the user cannot obtain authorization"
+msgstr "當�示使用者�能通�驗證時�顯示的工具�示"
+
+#: ../gtk/gtkmenubar.c:192
 msgid "Pack direction"
 msgstr "排列方�"
 
-#: ../gtk/gtkmenubar.c:182
+#: ../gtk/gtkmenubar.c:193
 msgid "The pack direction of the menubar"
 msgstr "工具列的排列方�"
 
-#: ../gtk/gtkmenubar.c:198
+#: ../gtk/gtkmenubar.c:209
 msgid "Child Pack direction"
 msgstr "�元件排列方�"
 
-#: ../gtk/gtkmenubar.c:199
+#: ../gtk/gtkmenubar.c:210
 msgid "The child pack direction of the menubar"
 msgstr "�單列�元的件排列方�"
 
-#: ../gtk/gtkmenubar.c:208
+#: ../gtk/gtkmenubar.c:219
 msgid "Style of bevel around the menubar"
 msgstr "�單列的斜邊款�"
 
-#: ../gtk/gtkmenubar.c:215 ../gtk/gtktoolbar.c:568
+#: ../gtk/gtkmenubar.c:226 ../gtk/gtktoolbar.c:580
 msgid "Internal padding"
 msgstr "內部留空"
 
-#: ../gtk/gtkmenubar.c:216
+#: ../gtk/gtkmenubar.c:227
 msgid "Amount of border space between the menubar shadow and the menu items"
 msgstr "�單列陰影和�單項目之間的空間寬度"
 
-#: ../gtk/gtkmenu.c:587
+#: ../gtk/gtkmenu.c:589
 msgid "The currently selected menu item"
 msgstr "目���的�單項目"
 
-#: ../gtk/gtkmenu.c:602
+#: ../gtk/gtkmenu.c:604
 msgid "The accel group holding accelerators for the menu"
 msgstr "�存此�單�徑�的�徑�群組"
 
-#: ../gtk/gtkmenu.c:616 ../gtk/gtkmenuitem.c:313
+#: ../gtk/gtkmenu.c:618 ../gtk/gtkmenuitem.c:368
 msgid "Accel Path"
 msgstr "�徑�路徑"
 
-#: ../gtk/gtkmenu.c:617
+#: ../gtk/gtkmenu.c:619
 msgid "An accel path used to conveniently construct accel paths of child items"
 msgstr "用來便利的建構�項目�徑�的路徑"
 
-#: ../gtk/gtkmenu.c:633
+#: ../gtk/gtkmenu.c:635
 msgid "Attach Widget"
 msgstr "附加視窗元件"
 
-#: ../gtk/gtkmenu.c:634
+#: ../gtk/gtkmenu.c:636
 msgid "The widget the menu is attached to"
 msgstr "此�單�附加的視窗元件"
 
-#: ../gtk/gtkmenu.c:642
+#: ../gtk/gtkmenu.c:644
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr "當此�單�下之後視窗管�員指定的視窗標題"
 
-#: ../gtk/gtkmenu.c:656
+#: ../gtk/gtkmenu.c:658
 msgid "Tearoff State"
 msgstr "分離狀態"
 
-#: ../gtk/gtkmenu.c:657
+#: ../gtk/gtkmenu.c:659
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "指出該�單是�分離的布林值"
 
-#: ../gtk/gtkmenu.c:671
+#: ../gtk/gtkmenu.c:673
 msgid "Monitor"
 msgstr "監視器"
 
-#: ../gtk/gtkmenu.c:672
+#: ../gtk/gtkmenu.c:674
 msgid "The monitor the menu will be popped up on"
 msgstr "該�單�彈出到的螢幕"
 
-#: ../gtk/gtkmenu.c:678
+#: ../gtk/gtkmenu.c:680
 msgid "Vertical Padding"
 msgstr "垂直留空"
 
-#: ../gtk/gtkmenu.c:679
+#: ../gtk/gtkmenu.c:681
 msgid "Extra space at the top and bottom of the menu"
 msgstr "�單上下的�外空間"
 
-#: ../gtk/gtkmenu.c:701
+#: ../gtk/gtkmenu.c:703
 msgid "Reserve Toggle Size"
 msgstr "�留切�的大�"
 
-#: ../gtk/gtkmenu.c:702
+#: ../gtk/gtkmenu.c:704
 msgid ""
 "A boolean that indicates whether the menu reserves space for toggles and "
 "icons"
 msgstr "指出該�單是��留切�與圖示空間的布林值"
 
-#: ../gtk/gtkmenu.c:708
+#: ../gtk/gtkmenu.c:710
 msgid "Horizontal Padding"
 msgstr "垂直留空"
 
-#: ../gtk/gtkmenu.c:709
+#: ../gtk/gtkmenu.c:711
 msgid "Extra space at the left and right edges of the menu"
 msgstr "�單左�的�外空間"
 
-#: ../gtk/gtkmenu.c:717
+#: ../gtk/gtkmenu.c:719
 msgid "Vertical Offset"
 msgstr "垂直�移"
 
-#: ../gtk/gtkmenu.c:718
+#: ../gtk/gtkmenu.c:720
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
 msgstr "當此�單為��單，將其一此設定值垂直�移放置"
 
-#: ../gtk/gtkmenu.c:726
+#: ../gtk/gtkmenu.c:728
 msgid "Horizontal Offset"
 msgstr "水平�移"
 
-#: ../gtk/gtkmenu.c:727
+#: ../gtk/gtkmenu.c:729
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
 msgstr "當此�單為��單，將其一此設定值水平�移放置"
 
-#: ../gtk/gtkmenu.c:735
+#: ../gtk/gtkmenu.c:737
 msgid "Double Arrows"
 msgstr "雙箭頭"
 
-#: ../gtk/gtkmenu.c:736
+#: ../gtk/gtkmenu.c:738
 msgid "When scrolling, always show both arrows."
 msgstr "在�動時，永�顯示兩端箭頭。"
 
-#: ../gtk/gtkmenu.c:749
+#: ../gtk/gtkmenu.c:751
 msgid "Arrow Placement"
 msgstr "箭號的放置"
 
-#: ../gtk/gtkmenu.c:750
+#: ../gtk/gtkmenu.c:752
 msgid "Indicates where scroll arrows should be placed"
 msgstr "指出�動軸箭頭應放置在哪裡"
 
-#: ../gtk/gtkmenu.c:758
+#: ../gtk/gtkmenu.c:760
 msgid "Left Attach"
 msgstr "左�附加"
 
-#: ../gtk/gtkmenu.c:766
+#: ../gtk/gtkmenu.c:768
 msgid "Right Attach"
 msgstr "��附加"
 
-#: ../gtk/gtkmenu.c:767
+#: ../gtk/gtkmenu.c:769
 msgid "The column number to attach the right side of the child to"
 msgstr "��單的��附加於給定的縱列數上"
 
-#: ../gtk/gtkmenu.c:774
+#: ../gtk/gtkmenu.c:776
 msgid "Top Attach"
 msgstr "頂端附加"
 
-#: ../gtk/gtkmenu.c:775
+#: ../gtk/gtkmenu.c:777
 msgid "The row number to attach the top of the child to"
 msgstr "��單的頂端附加於給定的橫列數上"
 
-#: ../gtk/gtkmenu.c:782
+#: ../gtk/gtkmenu.c:784
 msgid "Bottom Attach"
 msgstr "底部附加"
 
-#: ../gtk/gtkmenu.c:783 ../gtk/gtktable.c:223
+#: ../gtk/gtkmenu.c:785 ../gtk/gtktable.c:257
 msgid "The row number to attach the bottom of the child to"
 msgstr "��單的底部附加於給定的橫列數上"
 
-#: ../gtk/gtkmenu.c:797
+#: ../gtk/gtkmenu.c:799
 msgid "Arbitrary constant to scale down the size of the scroll arrow"
 msgstr "縮放�動軸箭頭大�的任�常數"
 
-#: ../gtk/gtkmenuitem.c:281
+#: ../gtk/gtkmenuitem.c:336
 msgid "Right Justified"
 msgstr "���齊"
 
-#: ../gtk/gtkmenuitem.c:282
+#: ../gtk/gtkmenuitem.c:337
 msgid ""
 "Sets whether the menu item appears justified at the right side of a menu bar"
 msgstr "設定�單項目是�出�在�單列的�端"
 
-#: ../gtk/gtkmenuitem.c:296
+#: ../gtk/gtkmenuitem.c:351
 msgid "Submenu"
 msgstr "��單"
 
-#: ../gtk/gtkmenuitem.c:297
+#: ../gtk/gtkmenuitem.c:352
 msgid "The submenu attached to the menu item, or NULL if it has none"
 msgstr "�附加到�單項目的��單，若沒有則為 NULL"
 
-#: ../gtk/gtkmenuitem.c:314
+#: ../gtk/gtkmenuitem.c:369
 msgid "Sets the accelerator path of the menu item"
 msgstr "設定�單項目的�徑�路徑"
 
-#: ../gtk/gtkmenuitem.c:329
+#: ../gtk/gtkmenuitem.c:384
 msgid "The text for the child label"
 msgstr "�標籤的文字"
 
-#: ../gtk/gtkmenuitem.c:392
+#: ../gtk/gtkmenuitem.c:447
 msgid "Amount of space used up by arrow, relative to the menu item's font size"
 msgstr "箭頭所佔空間大�，相�於�單項目的字型大�"
 
-#: ../gtk/gtkmenuitem.c:405
+#: ../gtk/gtkmenuitem.c:460
 msgid "Width in Characters"
 msgstr "寬度(字元)"
 
-#: ../gtk/gtkmenuitem.c:406
+#: ../gtk/gtkmenuitem.c:461
 msgid "The minimum desired width of the menu item in characters"
 msgstr "此�單項目�求的最�寬度，以字元計"
 
-#: ../gtk/gtkmenushell.c:420
+#: ../gtk/gtkmenushell.c:447
 msgid "Take Focus"
 msgstr "�得焦點"
 
-#: ../gtk/gtkmenushell.c:421
+#: ../gtk/gtkmenushell.c:448
 msgid "A boolean that determines whether the menu grabs the keyboard focus"
 msgstr "決定�單是��得�盤焦點的布林值"
 
-#: ../gtk/gtkmenutoolbutton.c:257
+#: ../gtk/gtkmenutoolbutton.c:293
 msgid "Menu"
 msgstr "�單"
 
-#: ../gtk/gtkmenutoolbutton.c:258
+#: ../gtk/gtkmenutoolbutton.c:294
 msgid "The dropdown menu"
 msgstr "下拉��單"
 
-#: ../gtk/gtkmessagedialog.c:185
+#: ../gtk/gtkmessagedialog.c:187
 msgid "Image/label border"
 msgstr "圖片/標籤邊框"
 
-#: ../gtk/gtkmessagedialog.c:186
+#: ../gtk/gtkmessagedialog.c:188
 msgid "Width of border around the label and image in the message dialog"
 msgstr "訊��話盒的標籤和圖片周�的邊框寬度"
 
-#: ../gtk/gtkmessagedialog.c:210
+#: ../gtk/gtkmessagedialog.c:212
 msgid "Message Buttons"
 msgstr "訊�按鈕"
 
-#: ../gtk/gtkmessagedialog.c:211
+#: ../gtk/gtkmessagedialog.c:213
 msgid "The buttons shown in the message dialog"
 msgstr "訊��話窗顯示的按鈕"
 
-#: ../gtk/gtkmessagedialog.c:228
+#: ../gtk/gtkmessagedialog.c:230
 msgid "The primary text of the message dialog"
 msgstr "訊��話盒中的主�文字"
 
-#: ../gtk/gtkmessagedialog.c:243
+#: ../gtk/gtkmessagedialog.c:245
 msgid "Use Markup"
 msgstr "使用標記"
 
-#: ../gtk/gtkmessagedialog.c:244
+#: ../gtk/gtkmessagedialog.c:246
 msgid "The primary text of the title includes Pango markup."
 msgstr "包� Pango 標記的標題主�文字。"
 
-#: ../gtk/gtkmessagedialog.c:258
+#: ../gtk/gtkmessagedialog.c:260
 msgid "Secondary Text"
 msgstr "次�文字"
 
-#: ../gtk/gtkmessagedialog.c:259
+#: ../gtk/gtkmessagedialog.c:261
 msgid "The secondary text of the message dialog"
 msgstr "訊��話盒中的次�文字"
 
-#: ../gtk/gtkmessagedialog.c:274
+#: ../gtk/gtkmessagedialog.c:276
 msgid "Use Markup in secondary"
 msgstr "在次�文件使用標記"
 
-#: ../gtk/gtkmessagedialog.c:275
+#: ../gtk/gtkmessagedialog.c:277
 msgid "The secondary text includes Pango markup."
 msgstr "次�文字包� Pango 標記。"
 
-#: ../gtk/gtkmessagedialog.c:289
+#: ../gtk/gtkmessagedialog.c:291
 msgid "Image"
 msgstr "圖片"
 
-#: ../gtk/gtkmessagedialog.c:290
+#: ../gtk/gtkmessagedialog.c:292
 msgid "The image"
 msgstr "圖片"
 
-#: ../gtk/gtkmessagedialog.c:306
+#: ../gtk/gtkmessagedialog.c:308
 msgid "Message area"
 msgstr "訊��域"
 
-#: ../gtk/gtkmessagedialog.c:307
+#: ../gtk/gtkmessagedialog.c:309
 msgid "GtkVBox that holds the dialog's primary and secondary labels"
 msgstr "�有這個�話盒主��次�標籤的 GtkVBox"
 
-#: ../gtk/gtkmisc.c:91
+#: ../gtk/gtkmisc.c:115
 msgid "Y align"
 msgstr "垂直排列"
 
-#: ../gtk/gtkmisc.c:92
+#: ../gtk/gtkmisc.c:116
 msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
 msgstr "垂直排列，由 0 (上) 至 1 (下)"
 
-#: ../gtk/gtkmisc.c:101
+#: ../gtk/gtkmisc.c:125
 msgid "X pad"
 msgstr "水平留空"
 
-#: ../gtk/gtkmisc.c:102
+#: ../gtk/gtkmisc.c:126
 msgid ""
 "The amount of space to add on the left and right of the widget, in pixels"
 msgstr "加在視窗元件左�的空間，單�為�素"
 
-#: ../gtk/gtkmisc.c:111
+#: ../gtk/gtkmisc.c:135
 msgid "Y pad"
 msgstr "垂直留空"
 
-#: ../gtk/gtkmisc.c:112
+#: ../gtk/gtkmisc.c:136
 msgid ""
 "The amount of space to add on the top and bottom of the widget, in pixels"
 msgstr "加在視窗元件上下的空間，單�為�素"
 
-#: ../gtk/gtkmountoperation.c:159
+#: ../gtk/gtkmountoperation.c:157
 msgid "Parent"
 msgstr "父項"
 
-#: ../gtk/gtkmountoperation.c:160
+#: ../gtk/gtkmountoperation.c:158
 msgid "The parent window"
 msgstr "父視窗"
 
-#: ../gtk/gtkmountoperation.c:167
+#: ../gtk/gtkmountoperation.c:165
 msgid "Is Showing"
 msgstr "顯示"
 
-#: ../gtk/gtkmountoperation.c:168
+#: ../gtk/gtkmountoperation.c:166
 msgid "Are we showing a dialog"
 msgstr "我們是��顯示�話盒"
 
-#: ../gtk/gtkmountoperation.c:176
+#: ../gtk/gtkmountoperation.c:174
 msgid "The screen where this window will be displayed."
 msgstr "本視窗將顯示於此螢幕。"
 
-#: ../gtk/gtknotebook.c:685
+#: ../gtk/gtknotebook.c:694
 msgid "Page"
 msgstr "�碼"
 
-#: ../gtk/gtknotebook.c:686
+#: ../gtk/gtknotebook.c:695
 msgid "The index of the current page"
 msgstr "目���的索引"
 
-#: ../gtk/gtknotebook.c:694
+#: ../gtk/gtknotebook.c:703
 msgid "Tab Position"
 msgstr "標簽�置"
 
-#: ../gtk/gtknotebook.c:695
+#: ../gtk/gtknotebook.c:704
 msgid "Which side of the notebook holds the tabs"
 msgstr "標簽�中�有標簽的一邊"
 
-#: ../gtk/gtknotebook.c:702
+#: ../gtk/gtknotebook.c:711
 msgid "Show Tabs"
 msgstr "顯示標簽"
 
-#: ../gtk/gtknotebook.c:703
+#: ../gtk/gtknotebook.c:712
 msgid "Whether tabs should be shown"
 msgstr "是�顯示分�"
 
-#: ../gtk/gtknotebook.c:709
+#: ../gtk/gtknotebook.c:718
 msgid "Show Border"
 msgstr "顯示邊框"
 
-#: ../gtk/gtknotebook.c:710
+#: ../gtk/gtknotebook.c:719
 msgid "Whether the border should be shown"
 msgstr "是�顯示框線"
 
-#: ../gtk/gtknotebook.c:716
+#: ../gtk/gtknotebook.c:725
 msgid "Scrollable"
 msgstr "��動"
 
-#: ../gtk/gtknotebook.c:717
+#: ../gtk/gtknotebook.c:726
 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
 msgstr "如設為定為‘TRUE’，如果標籤太多時，會在兩�加上箭頭"
 
-#: ../gtk/gtknotebook.c:723
+#: ../gtk/gtknotebook.c:732
 msgid "Enable Popup"
 msgstr "使用蹦出�單"
 
-#: ../gtk/gtknotebook.c:724
+#: ../gtk/gtknotebook.c:733
 msgid ""
 "If TRUE, pressing the right mouse button on the notebook pops up a menu that "
 "you can use to go to a page"
 msgstr "若為 TRUE，在標籤�按下滑鼠��時會蹦出��擇��的�單"
 
-#: ../gtk/gtknotebook.c:738
+#: ../gtk/gtknotebook.c:747
 msgid "Group Name"
 msgstr "群組�稱"
 
-#: ../gtk/gtknotebook.c:739
+#: ../gtk/gtknotebook.c:748
 msgid "Group name for tab drag and drop"
 msgstr "分�拖放的群組�稱"
 
-#: ../gtk/gtknotebook.c:746
+#: ../gtk/gtknotebook.c:755
 msgid "Tab label"
 msgstr "標籤文字"
 
-#: ../gtk/gtknotebook.c:747
+#: ../gtk/gtknotebook.c:756
 msgid "The string displayed on the child's tab label"
 msgstr "�分�標籤所顯示的文字"
 
-#: ../gtk/gtknotebook.c:753
+#: ../gtk/gtknotebook.c:762
 msgid "Menu label"
 msgstr "�單文字標籤"
 
-#: ../gtk/gtknotebook.c:754
+#: ../gtk/gtknotebook.c:763
 msgid "The string displayed in the child's menu entry"
 msgstr "��單項目顯示的字串"
 
-#: ../gtk/gtknotebook.c:767
+#: ../gtk/gtknotebook.c:776
 msgid "Tab expand"
 msgstr "擴展標籤"
 
-#: ../gtk/gtknotebook.c:768
+#: ../gtk/gtknotebook.c:777
 msgid "Whether to expand the child's tab"
 msgstr "是�擴展�分�"
 
-#: ../gtk/gtknotebook.c:774
+#: ../gtk/gtknotebook.c:783
 msgid "Tab fill"
 msgstr "標籤填滿"
 
-#: ../gtk/gtknotebook.c:775
+#: ../gtk/gtknotebook.c:784
 msgid "Whether the child's tab should fill the allocated area"
 msgstr "�分�是�應填滿�置的�域"
 
-#: ../gtk/gtknotebook.c:782
+#: ../gtk/gtknotebook.c:791
 msgid "Tab reorderable"
 msgstr "分��排�"
 
-#: ../gtk/gtknotebook.c:783
+#: ../gtk/gtknotebook.c:792
 msgid "Whether the tab is reorderable by user action"
 msgstr "分�是��由使用者動作來�新排�"
 
-#: ../gtk/gtknotebook.c:789
+#: ../gtk/gtknotebook.c:798
 msgid "Tab detachable"
 msgstr "分��分離"
 
-#: ../gtk/gtknotebook.c:790
+#: ../gtk/gtknotebook.c:799
 msgid "Whether the tab is detachable"
 msgstr "分�是��分離"
 
-#: ../gtk/gtknotebook.c:805 ../gtk/gtkscrollbar.c:102
+#: ../gtk/gtknotebook.c:814 ../gtk/gtkscrollbar.c:102
 msgid "Secondary backward stepper"
 msgstr "次�倒退指示器"
 
-#: ../gtk/gtknotebook.c:806
+#: ../gtk/gtknotebook.c:815
 msgid ""
 "Display a second backward arrow button on the opposite end of the tab area"
 msgstr "在標籤�域��顯示第二個用來倒退的箭頭"
 
-#: ../gtk/gtknotebook.c:821 ../gtk/gtkscrollbar.c:109
+#: ../gtk/gtknotebook.c:830 ../gtk/gtkscrollbar.c:109
 msgid "Secondary forward stepper"
 msgstr "次��進指示器"
 
-#: ../gtk/gtknotebook.c:822
+#: ../gtk/gtknotebook.c:831
 msgid ""
 "Display a second forward arrow button on the opposite end of the tab area"
 msgstr "在標籤�域��顯示第二個用來�進的箭頭"
 
-#: ../gtk/gtknotebook.c:836 ../gtk/gtkscrollbar.c:88
+#: ../gtk/gtknotebook.c:845 ../gtk/gtkscrollbar.c:88
 msgid "Backward stepper"
 msgstr "倒退指示器"
 
-#: ../gtk/gtknotebook.c:837 ../gtk/gtkscrollbar.c:89
+#: ../gtk/gtknotebook.c:846 ../gtk/gtkscrollbar.c:89
 msgid "Display the standard backward arrow button"
 msgstr "顯示標準倒退箭頭按鈕"
 
-#: ../gtk/gtknotebook.c:851 ../gtk/gtkscrollbar.c:95
+#: ../gtk/gtknotebook.c:860 ../gtk/gtkscrollbar.c:95
 msgid "Forward stepper"
 msgstr "�進指示器"
 
-#: ../gtk/gtknotebook.c:852 ../gtk/gtkscrollbar.c:96
+#: ../gtk/gtknotebook.c:861 ../gtk/gtkscrollbar.c:96
 msgid "Display the standard forward arrow button"
 msgstr "顯示標準�進箭頭按鈕"
 
-#: ../gtk/gtknotebook.c:866
+#: ../gtk/gtknotebook.c:875
 msgid "Tab overlap"
 msgstr "分�覆蓋"
 
-#: ../gtk/gtknotebook.c:867
+#: ../gtk/gtknotebook.c:876
 msgid "Size of tab overlap area"
 msgstr "分��疊�域的大�"
 
-#: ../gtk/gtknotebook.c:882
+#: ../gtk/gtknotebook.c:891
 msgid "Tab curvature"
 msgstr "分�曲率"
 
-#: ../gtk/gtknotebook.c:883
+#: ../gtk/gtknotebook.c:892
 msgid "Size of tab curvature"
 msgstr "分�曲率的大�"
 
-#: ../gtk/gtknotebook.c:899
+#: ../gtk/gtknotebook.c:908
 msgid "Arrow spacing"
 msgstr "箭號的間�"
 
-#: ../gtk/gtknotebook.c:900
+#: ../gtk/gtknotebook.c:909
 msgid "Scroll arrow spacing"
 msgstr "�動軸箭號的間�"
 
-#: ../gtk/gtknotebook.c:916
+#: ../gtk/gtknotebook.c:925
+#, fuzzy
 msgid "Initial gap"
-msgstr ""
+msgstr "Emigrant Gap"
 
-#: ../gtk/gtknotebook.c:917
+#: ../gtk/gtknotebook.c:926
 msgid "Initial gap before the first tab"
-msgstr ""
+msgstr "第一個分��的空隙"
 
-#: ../gtk/gtknumerableicon.c:652
+#: ../gtk/gtknumerableicon.c:653
 msgid "Icon's count"
 msgstr "圖示計數"
 
-#: ../gtk/gtknumerableicon.c:653
+#: ../gtk/gtknumerableicon.c:654
 msgid "The count of the emblem currently displayed"
 msgstr "目�顯示的圖章計數"
 
-#: ../gtk/gtknumerableicon.c:659
+#: ../gtk/gtknumerableicon.c:660
 msgid "Icon's label"
 msgstr "圖示標籤"
 
-#: ../gtk/gtknumerableicon.c:660
+#: ../gtk/gtknumerableicon.c:661
 msgid "The label to be displayed over the icon"
 msgstr "顯示於圖示的標籤"
 
-#: ../gtk/gtknumerableicon.c:666
+#: ../gtk/gtknumerableicon.c:667
 msgid "Icon's style context"
 msgstr "圖示的樣��項"
 
-#: ../gtk/gtknumerableicon.c:667
+#: ../gtk/gtknumerableicon.c:668
 msgid "The style context to theme the icon appearance"
 msgstr "用來布置圖示外觀的樣��項"
 
-#: ../gtk/gtknumerableicon.c:673
+#: ../gtk/gtknumerableicon.c:674
 msgid "Background icon"
 msgstr "背景圖示"
 
-#: ../gtk/gtknumerableicon.c:674
+#: ../gtk/gtknumerableicon.c:675
 msgid "The icon for the number emblem background"
 msgstr "數字圖章背景的圖示"
 
-#: ../gtk/gtknumerableicon.c:680
+#: ../gtk/gtknumerableicon.c:681
 msgid "Background icon name"
 msgstr "背景圖示�稱"
 
-#: ../gtk/gtknumerableicon.c:681
+#: ../gtk/gtknumerableicon.c:682
 msgid "The icon name for the number emblem background"
 msgstr "數字圖章背景的圖示�稱"
 
-#: ../gtk/gtkorientable.c:63 ../gtk/gtkstatusicon.c:312
+#: ../gtk/gtkorientable.c:63 ../gtk/gtkstatusicon.c:342
 #: ../gtk/gtktrayicon-x11.c:128
 msgid "Orientation"
 msgstr "方�"
@@ -4154,72 +4221,72 @@ msgstr "方�"
 msgid "The orientation of the orientable"
 msgstr "�定�的方�"
 
-#: ../gtk/gtkpaned.c:327
+#: ../gtk/gtkpaned.c:350
 msgid ""
 "Position of paned separator in pixels (0 means all the way to the left/top)"
 msgstr "分隔�的�置，單�為�素（0表示擴展至左/上）"
 
-#: ../gtk/gtkpaned.c:336
+#: ../gtk/gtkpaned.c:359
 msgid "Position Set"
 msgstr "�置設定"
 
-#: ../gtk/gtkpaned.c:337
+#: ../gtk/gtkpaned.c:360
 msgid "TRUE if the Position property should be used"
 msgstr "TRUE 表示應該使用�置屬性"
 
-#: ../gtk/gtkpaned.c:343
+#: ../gtk/gtkpaned.c:366
 msgid "Handle Size"
 msgstr "分隔�尺寸"
 
-#: ../gtk/gtkpaned.c:344
+#: ../gtk/gtkpaned.c:367
 msgid "Width of handle"
 msgstr "分隔�的寬度"
 
-#: ../gtk/gtkpaned.c:360
+#: ../gtk/gtkpaned.c:383
 msgid "Minimal Position"
 msgstr "最��置"
 
-#: ../gtk/gtkpaned.c:361
+#: ../gtk/gtkpaned.c:384
 msgid "Smallest possible value for the \"position\" property"
 msgstr "『�置�屬性的最��能值"
 
-#: ../gtk/gtkpaned.c:378
+#: ../gtk/gtkpaned.c:401
 msgid "Maximal Position"
 msgstr "最大�置"
 
-#: ../gtk/gtkpaned.c:379
+#: ../gtk/gtkpaned.c:402
 msgid "Largest possible value for the \"position\" property"
 msgstr "『�置�屬性的最大�能值"
 
-#: ../gtk/gtkpaned.c:396
+#: ../gtk/gtkpaned.c:419
 msgid "Resize"
 msgstr "�設大�"
 
-#: ../gtk/gtkpaned.c:397
+#: ../gtk/gtkpaned.c:420
 msgid "If TRUE, the child expands and shrinks along with the paned widget"
 msgstr "如設為定為‘TRUE’，�元件將隨分隔元件擴展或縮�"
 
-#: ../gtk/gtkpaned.c:412
+#: ../gtk/gtkpaned.c:435
 msgid "Shrink"
 msgstr "�縮�"
 
-#: ../gtk/gtkpaned.c:413
+#: ../gtk/gtkpaned.c:436
 msgid "If TRUE, the child can be made smaller than its requisition"
 msgstr "如設為定為‘TRUE’，�元件�以比原本指定的大�更�"
 
-#: ../gtk/gtkplug.c:201 ../gtk/gtkstatusicon.c:296
+#: ../gtk/gtkplug.c:203 ../gtk/gtkstatusicon.c:326
 msgid "Embedded"
 msgstr "內嵌的"
 
-#: ../gtk/gtkplug.c:202
+#: ../gtk/gtkplug.c:204
 msgid "Whether the plug is embedded"
 msgstr "此外掛是�為內嵌"
 
-#: ../gtk/gtkplug.c:216
+#: ../gtk/gtkplug.c:218
 msgid "Socket Window"
 msgstr "Socket 視窗"
 
-#: ../gtk/gtkplug.c:217
+#: ../gtk/gtkplug.c:219
 msgid "The window of the socket the plug is embedded in"
 msgstr "此外掛內嵌 socket 的視窗"
 
@@ -4303,11 +4370,19 @@ msgstr "正在接�工作"
 msgid "TRUE if this printer is accepting new jobs"
 msgstr "如果此�表機正在接�新工作則為 TRUE"
 
-#: ../gtk/gtkprinteroptionwidget.c:121
+#: ../gtk/gtkprinteroption.c:105
+msgid "Option Value"
+msgstr "�項數值"
+
+#: ../gtk/gtkprinteroption.c:106
+msgid "Value of the option"
+msgstr "�項的數值"
+
+#: ../gtk/gtkprinteroptionwidget.c:122
 msgid "Source option"
 msgstr "來��項"
 
-#: ../gtk/gtkprinteroptionwidget.c:122
+#: ../gtk/gtkprinteroptionwidget.c:123
 msgid "The PrinterOption backing this widget"
 msgstr "在此視窗元件之後的�表機�項"
 
@@ -4332,7 +4407,7 @@ msgid "Printer settings"
 msgstr "�表機設定值"
 
 #: ../gtk/gtkprintjob.c:168 ../gtk/gtkprintjob.c:169
-#: ../gtk/gtkprintunixdialog.c:298
+#: ../gtk/gtkprintunixdialog.c:368
 msgid "Page Setup"
 msgstr "��設定"
 
@@ -4356,11 +4431,11 @@ msgstr "�設��設定"
 msgid "The GtkPageSetup used by default"
 msgstr "�設使用的 GtkPageSetup"
 
-#: ../gtk/gtkprintoperation.c:1097 ../gtk/gtkprintunixdialog.c:316
+#: ../gtk/gtkprintoperation.c:1097 ../gtk/gtkprintunixdialog.c:386
 msgid "Print Settings"
 msgstr "列�設定值"
 
-#: ../gtk/gtkprintoperation.c:1098 ../gtk/gtkprintunixdialog.c:317
+#: ../gtk/gtkprintoperation.c:1098 ../gtk/gtkprintunixdialog.c:387
 msgid "The GtkPrintSettings used for initializing the dialog"
 msgstr "用來�始化�話盒的 GtkPrintSettings"
 
@@ -4380,11 +4455,11 @@ msgstr "�數"
 msgid "The number of pages in the document."
 msgstr "文件中的�數。"
 
-#: ../gtk/gtkprintoperation.c:1163 ../gtk/gtkprintunixdialog.c:306
+#: ../gtk/gtkprintoperation.c:1163 ../gtk/gtkprintunixdialog.c:376
 msgid "Current Page"
 msgstr "目�的��"
 
-#: ../gtk/gtkprintoperation.c:1164 ../gtk/gtkprintunixdialog.c:307
+#: ../gtk/gtkprintoperation.c:1164 ../gtk/gtkprintunixdialog.c:377
 msgid "The current page in the document"
 msgstr "文件中目�的��"
 
@@ -4458,7 +4533,7 @@ msgstr "自訂分�標籤"
 msgid "Label for the tab containing custom widgets."
 msgstr "包�自訂視窗元件分�的標籤。"
 
-#: ../gtk/gtkprintoperation.c:1360 ../gtk/gtkprintunixdialog.c:341
+#: ../gtk/gtkprintoperation.c:1360 ../gtk/gtkprintunixdialog.c:411
 msgid "Support Selection"
 msgstr "支授�擇�域"
 
@@ -4466,7 +4541,7 @@ msgstr "支授�擇�域"
 msgid "TRUE if the print operation will support print of selection."
 msgstr "如果列�動作支��擇�域的列�則設定為 TRUE。"
 
-#: ../gtk/gtkprintoperation.c:1377 ../gtk/gtkprintunixdialog.c:349
+#: ../gtk/gtkprintoperation.c:1377 ../gtk/gtkprintunixdialog.c:419
 msgid "Has Selection"
 msgstr "具有�擇�域"
 
@@ -4474,7 +4549,7 @@ msgstr "具有�擇�域"
 msgid "TRUE if a selection exists."
 msgstr "如果�擇�域存在則為 TRUE。"
 
-#: ../gtk/gtkprintoperation.c:1393 ../gtk/gtkprintunixdialog.c:357
+#: ../gtk/gtkprintoperation.c:1393 ../gtk/gtkprintunixdialog.c:427
 msgid "Embed Page Setup"
 msgstr "內嵌��設定"
 
@@ -4490,117 +4565,117 @@ msgstr "�列�的�數"
 msgid "The number of pages that will be printed."
 msgstr "將�列�的�數。"
 
-#: ../gtk/gtkprintunixdialog.c:299
+#: ../gtk/gtkprintunixdialog.c:369
 msgid "The GtkPageSetup to use"
 msgstr "�使用的 GtkPageSetup"
 
-#: ../gtk/gtkprintunixdialog.c:324
+#: ../gtk/gtkprintunixdialog.c:394
 msgid "Selected Printer"
 msgstr "��的�表機"
 
-#: ../gtk/gtkprintunixdialog.c:325
+#: ../gtk/gtkprintunixdialog.c:395
 msgid "The GtkPrinter which is selected"
 msgstr "��的 GtkPrinter"
 
-#: ../gtk/gtkprintunixdialog.c:332
+#: ../gtk/gtkprintunixdialog.c:402
 msgid "Manual Capabilities"
 msgstr "手冊容�"
 
-#: ../gtk/gtkprintunixdialog.c:333
+#: ../gtk/gtkprintunixdialog.c:403
 msgid "Capabilities the application can handle"
 msgstr "應用程��以處�的能力"
 
-#: ../gtk/gtkprintunixdialog.c:342
+#: ../gtk/gtkprintunixdialog.c:412
 msgid "Whether the dialog supports selection"
 msgstr "�話盒是�支��擇�域"
 
-#: ../gtk/gtkprintunixdialog.c:350
+#: ../gtk/gtkprintunixdialog.c:420
 msgid "Whether the application has a selection"
 msgstr "應用程�是�有�擇�域"
 
-#: ../gtk/gtkprintunixdialog.c:358
+#: ../gtk/gtkprintunixdialog.c:428
 msgid "TRUE if page setup combos are embedded in GtkPrintUnixDialog"
 msgstr "如果��設定組�內嵌於 GtkPrintUnixDialog 則設定為 TRUE"
 
-#: ../gtk/gtkprogressbar.c:161
+#: ../gtk/gtkprogressbar.c:160
 msgid "Fraction"
 msgstr "片段"
 
-#: ../gtk/gtkprogressbar.c:162
+#: ../gtk/gtkprogressbar.c:161
 msgid "The fraction of total work that has been completed"
 msgstr "工作已完�的片段"
 
-#: ../gtk/gtkprogressbar.c:169
+#: ../gtk/gtkprogressbar.c:168
 msgid "Pulse Step"
 msgstr "脈動步�"
 
-#: ../gtk/gtkprogressbar.c:170
+#: ../gtk/gtkprogressbar.c:169
 msgid "The fraction of total progress to move the bouncing block when pulsed"
 msgstr "當一次脈動後，來回�塊應移動的比例（以進度列全長為基準）"
 
-#: ../gtk/gtkprogressbar.c:178
+#: ../gtk/gtkprogressbar.c:177
 msgid "Text to be displayed in the progress bar"
 msgstr "進度列中所顯示的文字"
 
-#: ../gtk/gtkprogressbar.c:195
+#: ../gtk/gtkprogressbar.c:198
 msgid "Show text"
 msgstr "顯示文字"
 
-#: ../gtk/gtkprogressbar.c:196
+#: ../gtk/gtkprogressbar.c:199
 msgid "Whether the progress is shown as text."
 msgstr "進度是�以文字方�顯示。"
 
-#: ../gtk/gtkprogressbar.c:218
+#: ../gtk/gtkprogressbar.c:221
 msgid ""
 "The preferred place to ellipsize the string, if the progress bar does not "
 "have enough room to display the entire string, if at all."
 msgstr "如果進度列沒有足夠的空間顯示整個字串時，用來簡化該字串的空間。"
 
-#: ../gtk/gtkprogressbar.c:225
+#: ../gtk/gtkprogressbar.c:228
 msgid "X spacing"
 msgstr "X é–“è·�"
 
-#: ../gtk/gtkprogressbar.c:226
+#: ../gtk/gtkprogressbar.c:229
 msgid "Extra spacing applied to the width of a progress bar."
 msgstr "套用於進度列寬度的�外空間。"
 
-#: ../gtk/gtkprogressbar.c:231
+#: ../gtk/gtkprogressbar.c:234
 msgid "Y spacing"
 msgstr "Y é–“è·�"
 
-#: ../gtk/gtkprogressbar.c:232
+#: ../gtk/gtkprogressbar.c:235
 msgid "Extra spacing applied to the height of a progress bar."
 msgstr "套用於進度列高度的�外空間。"
 
-#: ../gtk/gtkprogressbar.c:245
+#: ../gtk/gtkprogressbar.c:248
 msgid "Minimum horizontal bar width"
 msgstr "最�水平列寬度"
 
-#: ../gtk/gtkprogressbar.c:246
+#: ../gtk/gtkprogressbar.c:249
 msgid "The minimum horizontal width of the progress bar"
 msgstr "進度列的最�水平寬度"
 
-#: ../gtk/gtkprogressbar.c:258
+#: ../gtk/gtkprogressbar.c:261
 msgid "Minimum horizontal bar height"
 msgstr "最�水平列高度"
 
-#: ../gtk/gtkprogressbar.c:259
+#: ../gtk/gtkprogressbar.c:262
 msgid "Minimum horizontal height of the progress bar"
 msgstr "進度列的最�水平高度"
 
-#: ../gtk/gtkprogressbar.c:271
+#: ../gtk/gtkprogressbar.c:274
 msgid "Minimum vertical bar width"
 msgstr "最�垂直列寬度"
 
-#: ../gtk/gtkprogressbar.c:272
+#: ../gtk/gtkprogressbar.c:275
 msgid "The minimum vertical width of the progress bar"
 msgstr "進度列的最�垂直寬度"
 
-#: ../gtk/gtkprogressbar.c:284
+#: ../gtk/gtkprogressbar.c:287
 msgid "Minimum vertical bar height"
 msgstr "最�垂直列高度"
 
-#: ../gtk/gtkprogressbar.c:285
+#: ../gtk/gtkprogressbar.c:288
 msgid "The minimum vertical height of the progress bar"
 msgstr "進度列的最�垂直高度"
 
@@ -4615,8 +4690,8 @@ msgid ""
 msgstr ""
 "當此指令是該群組的目�指令時，gtk_radio_action_get_current_value() 所傳回值"
 
-#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:163
-#: ../gtk/gtkradiomenuitem.c:374 ../gtk/gtkradiotoolbutton.c:65
+#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiomenuitem.c:426 ../gtk/gtkradiotoolbutton.c:85
 msgid "Group"
 msgstr "群組"
 
@@ -4634,143 +4709,143 @@ msgid ""
 "action belongs."
 msgstr "這個動作所屬群組目�使用�員的數值屬性。"
 
-#: ../gtk/gtkradiobutton.c:164
+#: ../gtk/gtkradiobutton.c:165
 msgid "The radio button whose group this widget belongs to."
 msgstr "此元件所屬的單�按鈕群組。"
 
-#: ../gtk/gtkradiomenuitem.c:375
+#: ../gtk/gtkradiomenuitem.c:427
 msgid "The radio menu item whose group this widget belongs to."
 msgstr "此元件所屬的單��單群組。"
 
-#: ../gtk/gtkradiotoolbutton.c:66
+#: ../gtk/gtkradiotoolbutton.c:86
 msgid "The radio tool button whose group this button belongs to."
 msgstr "此按鈕所屬的單�工具按鈕群組。"
 
-#: ../gtk/gtkrange.c:417
+#: ../gtk/gtkrange.c:419
 msgid "The GtkAdjustment that contains the current value of this range object"
 msgstr "�有這個範�物件�在數值的 GtkAdjustment"
 
-#: ../gtk/gtkrange.c:425
+#: ../gtk/gtkrange.c:427
 msgid "Invert direction slider moves to increase range value"
 msgstr "�動�以相�的方�來增加範�數值"
 
-#: ../gtk/gtkrange.c:432
+#: ../gtk/gtkrange.c:434
 msgid "Lower stepper sensitivity"
 msgstr "較低�指示器�感度"
 
-#: ../gtk/gtkrange.c:433
+#: ../gtk/gtkrange.c:435
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's lower "
 "side"
 msgstr "指�調整鈕較低�的指示器�感度原則"
 
-#: ../gtk/gtkrange.c:441
+#: ../gtk/gtkrange.c:443
 msgid "Upper stepper sensitivity"
 msgstr "較高�指示器�感度"
 
-#: ../gtk/gtkrange.c:442
+#: ../gtk/gtkrange.c:444
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's upper "
 "side"
 msgstr "指�調整鈕較高�的指示器�感度原則"
 
-#: ../gtk/gtkrange.c:459
+#: ../gtk/gtkrange.c:461
 msgid "Show Fill Level"
 msgstr "顯示填充等級"
 
-#: ../gtk/gtkrange.c:460
+#: ../gtk/gtkrange.c:462
 msgid "Whether to display a fill level indicator graphics on trough."
 msgstr "是�在滑軌上顯示填充等級指示器。"
 
-#: ../gtk/gtkrange.c:476
+#: ../gtk/gtkrange.c:478
 msgid "Restrict to Fill Level"
 msgstr "�制的填充等級"
 
-#: ../gtk/gtkrange.c:477
+#: ../gtk/gtkrange.c:479
 msgid "Whether to restrict the upper boundary to the fill level."
 msgstr "是��制填充等級的上�。"
 
-#: ../gtk/gtkrange.c:492
+#: ../gtk/gtkrange.c:494
 msgid "Fill Level"
 msgstr "填充等級"
 
-#: ../gtk/gtkrange.c:493
+#: ../gtk/gtkrange.c:495
 msgid "The fill level."
 msgstr "填充等級"
 
-#: ../gtk/gtkrange.c:510
+#: ../gtk/gtkrange.c:512
 msgid "Round Digits"
 msgstr "四�五入�數"
 
-#: ../gtk/gtkrange.c:511
+#: ../gtk/gtkrange.c:513
 msgid "The number of digits to round the value to."
 msgstr "數值��四�五入的�數。"
 
-#: ../gtk/gtkrange.c:519 ../gtk/gtkswitch.c:836
+#: ../gtk/gtkrange.c:521 ../gtk/gtkswitch.c:817
 msgid "Slider Width"
 msgstr "�動�寬度"
 
-#: ../gtk/gtkrange.c:520
+#: ../gtk/gtkrange.c:522
 msgid "Width of scrollbar or scale thumb"
 msgstr "�動列或等比縮放指標的寬度"
 
-#: ../gtk/gtkrange.c:527
+#: ../gtk/gtkrange.c:529
 msgid "Trough Border"
 msgstr "�槽邊緣"
 
-#: ../gtk/gtkrange.c:528
+#: ../gtk/gtkrange.c:530
 msgid "Spacing between thumb/steppers and outer trough bevel"
 msgstr "指標/指示器按鈕與邊界外緣之間的空間"
 
-#: ../gtk/gtkrange.c:535
+#: ../gtk/gtkrange.c:537
 msgid "Stepper Size"
 msgstr "指示器按鈕尺寸"
 
-#: ../gtk/gtkrange.c:536
+#: ../gtk/gtkrange.c:538
 msgid "Length of step buttons at ends"
 msgstr "步�按鈕�一端的長度"
 
-#: ../gtk/gtkrange.c:549
+#: ../gtk/gtkrange.c:551
 msgid "Stepper Spacing"
 msgstr "指示器按鈕間隔"
 
-#: ../gtk/gtkrange.c:550
+#: ../gtk/gtkrange.c:552
 msgid "Spacing between step buttons and thumb"
 msgstr "步�按鈕以�指標之間的間隔"
 
-#: ../gtk/gtkrange.c:557
+#: ../gtk/gtkrange.c:559
 msgid "Arrow X Displacement"
 msgstr "箭頭水平�離"
 
-#: ../gtk/gtkrange.c:558
+#: ../gtk/gtkrange.c:560
 msgid ""
 "How far in the x direction to move the arrow when the button is depressed"
 msgstr "當按鈕按下時�在水平方�移動多�的�離"
 
-#: ../gtk/gtkrange.c:565
+#: ../gtk/gtkrange.c:567
 msgid "Arrow Y Displacement"
 msgstr "箭頭垂直�離"
 
-#: ../gtk/gtkrange.c:566
+#: ../gtk/gtkrange.c:568
 msgid ""
 "How far in the y direction to move the arrow when the button is depressed"
 msgstr "當按鈕按下時�在垂直方�移動多�的�離"
 
-#: ../gtk/gtkrange.c:582
+#: ../gtk/gtkrange.c:584
 msgid "Trough Under Steppers"
 msgstr "指示器下滑軌"
 
-#: ../gtk/gtkrange.c:583
+#: ../gtk/gtkrange.c:585
 msgid ""
 "Whether to draw trough for full length of range or exclude the steppers and "
 "spacing"
 msgstr "是�繪出完整長度的滑軌或是去除指示器和間�"
 
-#: ../gtk/gtkrange.c:596
+#: ../gtk/gtkrange.c:598
 msgid "Arrow scaling"
 msgstr "箭頭縮放"
 
-#: ../gtk/gtkrange.c:597
+#: ../gtk/gtkrange.c:599
 msgid "Arrow scaling with regard to scroll button size"
 msgstr "��動軸大�縮放箭頭"
 
@@ -4862,92 +4937,92 @@ msgstr "用來儲存和讀�清單的檔案完整路徑"
 msgid "The size of the recently used resources list"
 msgstr "目�使用的資�清單大�"
 
-#: ../gtk/gtkscalebutton.c:218
+#: ../gtk/gtkscalebutton.c:219
 msgid "The value of the scale"
 msgstr "縮放的數值"
 
-#: ../gtk/gtkscalebutton.c:228
+#: ../gtk/gtkscalebutton.c:229
 msgid "The icon size"
 msgstr "圖示大�"
 
-#: ../gtk/gtkscalebutton.c:237
+#: ../gtk/gtkscalebutton.c:238
 msgid ""
 "The GtkAdjustment that contains the current value of this scale button object"
 msgstr "�有這個縮放按鈕物件�在數值的 GtkAdjustment"
 
-#: ../gtk/gtkscalebutton.c:265
+#: ../gtk/gtkscalebutton.c:266
 msgid "Icons"
 msgstr "圖示"
 
-#: ../gtk/gtkscalebutton.c:266
+#: ../gtk/gtkscalebutton.c:267
 msgid "List of icon names"
 msgstr "圖示�稱清單"
 
-#: ../gtk/gtkscale.c:253
+#: ../gtk/gtkscale.c:255
 msgid "The number of decimal places that are displayed in the value"
 msgstr "此數值所顯示的�進��數"
 
-#: ../gtk/gtkscale.c:262
+#: ../gtk/gtkscale.c:264
 msgid "Draw Value"
 msgstr "繪製數值"
 
-#: ../gtk/gtkscale.c:263
+#: ../gtk/gtkscale.c:265
 msgid "Whether the current value is displayed as a string next to the slider"
 msgstr "是�目�數值�以字串方�顯示在�動��邊"
 
-#: ../gtk/gtkscale.c:270
+#: ../gtk/gtkscale.c:272
 msgid "Value Position"
 msgstr "數值�置"
 
-#: ../gtk/gtkscale.c:271
+#: ../gtk/gtkscale.c:273
 msgid "The position in which the current value is displayed"
 msgstr "目�數值所顯示的�置"
 
-#: ../gtk/gtkscale.c:278
+#: ../gtk/gtkscale.c:280
 msgid "Slider Length"
 msgstr "�動�長度"
 
-#: ../gtk/gtkscale.c:279
+#: ../gtk/gtkscale.c:281
 msgid "Length of scale's slider"
 msgstr "縮放尺��動�長度"
 
-#: ../gtk/gtkscale.c:287
+#: ../gtk/gtkscale.c:289
 msgid "Value spacing"
 msgstr "數值�離"
 
-#: ../gtk/gtkscale.c:288
+#: ../gtk/gtkscale.c:290
 msgid "Space between value text and the slider/trough area"
 msgstr "數值文字與滑動鈕/�槽�域間的間隔"
 
-#: ../gtk/gtkscrollable.c:86
+#: ../gtk/gtkscrollable.c:94
 msgid "Horizontal adjustment"
 msgstr "水平調整"
 
-#: ../gtk/gtkscrollable.c:87
+#: ../gtk/gtkscrollable.c:95
 msgid ""
 "Horizontal adjustment that is shared between the scrollable widget and its "
 "controller"
 msgstr "分享於��動視窗元件與它的控制器間的水平調整"
 
-#: ../gtk/gtkscrollable.c:103
+#: ../gtk/gtkscrollable.c:111
 msgid "Vertical adjustment"
 msgstr "垂直調整"
 
-#: ../gtk/gtkscrollable.c:104
+#: ../gtk/gtkscrollable.c:112
 msgid ""
 "Vertical adjustment that is shared between the scrollable widget and its "
 "controller"
 msgstr "分享於��動視窗元件與它的控制器間的垂直調整"
 
-#: ../gtk/gtkscrollable.c:120
+#: ../gtk/gtkscrollable.c:128
 msgid "Horizontal Scrollable Policy"
 msgstr "水平�動原則"
 
-#: ../gtk/gtkscrollable.c:121 ../gtk/gtkscrollable.c:137
+#: ../gtk/gtkscrollable.c:129 ../gtk/gtkscrollable.c:145
 msgid "How the size of the content should be determined"
 msgstr "內容的大��如何決定"
 
-#: ../gtk/gtkscrollable.c:136
+#: ../gtk/gtkscrollable.c:144
 msgid "Vertical Scrollable Policy"
 msgstr "垂直�動原則"
 
@@ -5538,59 +5613,69 @@ msgid ""
 "presses the mnemonic activator."
 msgstr "當按下記憶符啟動�時是��自動顯示或隱�記憶符。"
 
-#: ../gtk/gtksettings.c:1136
+#: ../gtk/gtksettings.c:1127
+msgid "Visible Focus"
+msgstr "顯示焦點"
+
+#: ../gtk/gtksettings.c:1128
+msgid ""
+"Whether 'focus rectangles' should be hidden until the user starts to use the "
+"keyboard."
+msgstr "「焦點方塊�在使用者開始使用�盤之�是�應隱�。"
+
+#: ../gtk/gtksettings.c:1154
 msgid "Application prefers a dark theme"
 msgstr "應用程��好暗色主題"
 
-#: ../gtk/gtksettings.c:1137
+#: ../gtk/gtksettings.c:1155
 msgid "Whether the application prefers to have a dark theme."
 msgstr "應用程�是��好暗色系布景主題。"
 
-#: ../gtk/gtksettings.c:1152
+#: ../gtk/gtksettings.c:1170
 msgid "Show button images"
 msgstr "顯示按鈕圖示"
 
-#: ../gtk/gtksettings.c:1153
+#: ../gtk/gtksettings.c:1171
 msgid "Whether images should be shown on buttons"
 msgstr "是�在按鈕中顯示圖片"
 
-#: ../gtk/gtksettings.c:1161 ../gtk/gtksettings.c:1255
+#: ../gtk/gtksettings.c:1179 ../gtk/gtksettings.c:1273
 msgid "Select on focus"
 msgstr "�焦時��"
 
-#: ../gtk/gtksettings.c:1162
+#: ../gtk/gtksettings.c:1180
 msgid "Whether to select the contents of an entry when it is focused"
 msgstr "當輸入元件�得焦點時，其內容是�呈�被��狀態"
 
-#: ../gtk/gtksettings.c:1179
+#: ../gtk/gtksettings.c:1197
 msgid "Password Hint Timeout"
 msgstr "密碼�示逾時時間"
 
-#: ../gtk/gtksettings.c:1180
+#: ../gtk/gtksettings.c:1198
 msgid "How long to show the last input character in hidden entries"
 msgstr "等待多久�顯示隱�項目中最後輸入的字元"
 
-#: ../gtk/gtksettings.c:1189
+#: ../gtk/gtksettings.c:1207
 msgid "Show menu images"
 msgstr "顯示�單圖示"
 
-#: ../gtk/gtksettings.c:1190
+#: ../gtk/gtksettings.c:1208
 msgid "Whether images should be shown in menus"
 msgstr "應�在�單項目中顯示圖示"
 
-#: ../gtk/gtksettings.c:1198
+#: ../gtk/gtksettings.c:1216
 msgid "Delay before drop down menus appear"
 msgstr "下拉�單出��的延�時間"
 
-#: ../gtk/gtksettings.c:1199
+#: ../gtk/gtksettings.c:1217
 msgid "Delay before the submenus of a menu bar appear"
 msgstr "�單列的��單出��的延�時間"
 
-#: ../gtk/gtksettings.c:1216
+#: ../gtk/gtksettings.c:1234
 msgid "Scrolled Window Placement"
 msgstr "�動列視窗放置"
 
-#: ../gtk/gtksettings.c:1217
+#: ../gtk/gtksettings.c:1235
 msgid ""
 "Where the contents of scrolled windows are located with respect to the "
 "scrollbars, if not overridden by the scrolled window's own placement."
@@ -5598,181 +5683,181 @@ msgstr ""
 "若沒有設定�動列視窗自己的放置�置，�動列視窗的內容�置於相應於�動列哪個�"
 "置。"
 
-#: ../gtk/gtksettings.c:1226
+#: ../gtk/gtksettings.c:1244
 msgid "Can change accelerators"
 msgstr "�更改�徑�"
 
-#: ../gtk/gtksettings.c:1227
+#: ../gtk/gtksettings.c:1245
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr "是��在�單項目上按�來變更快��"
 
-#: ../gtk/gtksettings.c:1235
+#: ../gtk/gtksettings.c:1253
 msgid "Delay before submenus appear"
 msgstr "顯示��單�的延�時間"
 
-#: ../gtk/gtksettings.c:1236
+#: ../gtk/gtksettings.c:1254
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr "在�單項目上顯示��單所需的游標�滯最�時間"
 
-#: ../gtk/gtksettings.c:1245
+#: ../gtk/gtksettings.c:1263
 msgid "Delay before hiding a submenu"
 msgstr "隱���單�的延�時間"
 
-#: ../gtk/gtksettings.c:1246
+#: ../gtk/gtksettings.c:1264
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
 msgstr "游標移���單���單的顯示時間，超�則隱���單"
 
-#: ../gtk/gtksettings.c:1256
+#: ../gtk/gtksettings.c:1274
 msgid "Whether to select the contents of a selectable label when it is focused"
 msgstr "當��擇標籤�得焦點時，其內容是�呈�被��狀態"
 
-#: ../gtk/gtksettings.c:1264
+#: ../gtk/gtksettings.c:1282
 msgid "Custom palette"
 msgstr "自訂色盤"
 
-#: ../gtk/gtksettings.c:1265
+#: ../gtk/gtksettings.c:1283
 msgid "Palette to use in the color selector"
 msgstr "�色�擇程�使用的色盤"
 
-#: ../gtk/gtksettings.c:1273
+#: ../gtk/gtksettings.c:1291
 msgid "IM Preedit style"
 msgstr "輸入法 Preedit 樣�"
 
-#: ../gtk/gtksettings.c:1274
+#: ../gtk/gtksettings.c:1292
 msgid "How to draw the input method preedit string"
 msgstr "如何顯示輸入法 preedit 字串"
 
-#: ../gtk/gtksettings.c:1283
+#: ../gtk/gtksettings.c:1301
 msgid "IM Status style"
 msgstr "輸入法狀態的�樣"
 
-#: ../gtk/gtksettings.c:1284
+#: ../gtk/gtksettings.c:1302
 msgid "How to draw the input method statusbar"
 msgstr "如何顯示輸入法的狀態列"
 
-#: ../gtk/gtksizegroup.c:301 ../gtk/gtktreeselection.c:130
+#: ../gtk/gtksizegroup.c:382 ../gtk/gtktreeselection.c:130
 msgid "Mode"
 msgstr "模�"
 
-#: ../gtk/gtksizegroup.c:302
+#: ../gtk/gtksizegroup.c:383
 msgid ""
 "The directions in which the size group affects the requested sizes of its "
 "component widgets"
 msgstr "大�群組影響元件所�求大�的方�"
 
-#: ../gtk/gtksizegroup.c:318
+#: ../gtk/gtksizegroup.c:399
 msgid "Ignore hidden"
 msgstr "忽略隱�"
 
-#: ../gtk/gtksizegroup.c:319
+#: ../gtk/gtksizegroup.c:400
 msgid ""
 "If TRUE, unmapped widgets are ignored when determining the size of the group"
 msgstr "如設為定為‘TRUE’，當決定群組的大�時會忽略未�應的元件"
 
-#: ../gtk/gtkspinbutton.c:328
+#: ../gtk/gtkspinbutton.c:331
 msgid "Climb Rate"
 msgstr "數值調整速度"
 
-#: ../gtk/gtkspinbutton.c:348
+#: ../gtk/gtkspinbutton.c:351
 msgid "Snap to Ticks"
 msgstr "校正數值"
 
-#: ../gtk/gtkspinbutton.c:349
+#: ../gtk/gtkspinbutton.c:352
 msgid ""
 "Whether erroneous values are automatically changed to a spin button's "
 "nearest step increment"
 msgstr "當微調按鈕內的數值�正確時，是�自動更�為最接近的正確數值"
 
-#: ../gtk/gtkspinbutton.c:356
+#: ../gtk/gtkspinbutton.c:359
 msgid "Numeric"
 msgstr "數字"
 
-#: ../gtk/gtkspinbutton.c:357
+#: ../gtk/gtkspinbutton.c:360
 msgid "Whether non-numeric characters should be ignored"
 msgstr "是�忽略�數字的字元"
 
-#: ../gtk/gtkspinbutton.c:364
+#: ../gtk/gtkspinbutton.c:367
 msgid "Wrap"
 msgstr "�行"
 
-#: ../gtk/gtkspinbutton.c:365
+#: ../gtk/gtkspinbutton.c:368
 msgid "Whether a spin button should wrap upon reaching its limits"
 msgstr "當到�界�時微調按鈕是��行"
 
-#: ../gtk/gtkspinbutton.c:372
+#: ../gtk/gtkspinbutton.c:375
 msgid "Update Policy"
 msgstr "更新方�"
 
-#: ../gtk/gtkspinbutton.c:373
+#: ../gtk/gtkspinbutton.c:376
 msgid ""
 "Whether the spin button should update always, or only when the value is legal"
 msgstr "微調按鈕應該任何時候都更新，還是�有輸入的數值�法時�會更新"
 
-#: ../gtk/gtkspinbutton.c:382
+#: ../gtk/gtkspinbutton.c:385
 msgid "Reads the current value, or sets a new value"
 msgstr "讀�目�的數值，或是設定新的數值"
 
-#: ../gtk/gtkspinbutton.c:391
+#: ../gtk/gtkspinbutton.c:394
 msgid "Style of bevel around the spin button"
 msgstr "微調按鈕周�的邊界樣�"
 
-#: ../gtk/gtkspinner.c:119
+#: ../gtk/gtkspinner.c:116
 msgid "Whether the spinner is active"
 msgstr "轉輪是�在使用中"
 
-#: ../gtk/gtkstatusbar.c:181
+#: ../gtk/gtkstatusbar.c:183
 msgid "Style of bevel around the statusbar text"
 msgstr "狀態列文字周�的邊界樣�"
 
-#: ../gtk/gtkstatusicon.c:263
+#: ../gtk/gtkstatusicon.c:293
 msgid "The size of the icon"
 msgstr "圖示大�"
 
-#: ../gtk/gtkstatusicon.c:273
+#: ../gtk/gtkstatusicon.c:303
 msgid "The screen where this status icon will be displayed"
 msgstr "這個狀態圖示將顯示的螢幕"
 
-#: ../gtk/gtkstatusicon.c:281
+#: ../gtk/gtkstatusicon.c:311
 msgid "Whether the status icon is visible"
 msgstr "狀態圖示是�顯示"
 
-#: ../gtk/gtkstatusicon.c:297
+#: ../gtk/gtkstatusicon.c:327
 msgid "Whether the status icon is embedded"
 msgstr "狀態圖示是�為內嵌"
 
-#: ../gtk/gtkstatusicon.c:313 ../gtk/gtktrayicon-x11.c:129
+#: ../gtk/gtkstatusicon.c:343 ../gtk/gtktrayicon-x11.c:129
 msgid "The orientation of the tray"
 msgstr "系統匣的方�"
 
-#: ../gtk/gtkstatusicon.c:340 ../gtk/gtkwidget.c:1072
+#: ../gtk/gtkstatusicon.c:370 ../gtk/gtkwidget.c:1091
 msgid "Has tooltip"
 msgstr "具有工具�示"
 
-#: ../gtk/gtkstatusicon.c:341
+#: ../gtk/gtkstatusicon.c:371
 msgid "Whether this tray icon has a tooltip"
 msgstr "此系統匣圖示是�具有工具�示"
 
-#: ../gtk/gtkstatusicon.c:366 ../gtk/gtkwidget.c:1093
+#: ../gtk/gtkstatusicon.c:396 ../gtk/gtkwidget.c:1112
 msgid "Tooltip Text"
 msgstr "工具�示文字"
 
-#: ../gtk/gtkstatusicon.c:367 ../gtk/gtkwidget.c:1094 ../gtk/gtkwidget.c:1115
+#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1113 ../gtk/gtkwidget.c:1134
 msgid "The contents of the tooltip for this widget"
 msgstr "此視窗元件工具�示的內容"
 
-#: ../gtk/gtkstatusicon.c:390 ../gtk/gtkwidget.c:1114
+#: ../gtk/gtkstatusicon.c:420 ../gtk/gtkwidget.c:1133
 msgid "Tooltip markup"
 msgstr "工具�示標記"
 
-#: ../gtk/gtkstatusicon.c:391
+#: ../gtk/gtkstatusicon.c:421
 msgid "The contents of the tooltip for this tray icon"
 msgstr "此系統匣圖示工具�示的內容"
 
-#: ../gtk/gtkstatusicon.c:409
+#: ../gtk/gtkstatusicon.c:439
 msgid "The title of this tray icon"
 msgstr "此系統匣圖示的標題"
 
@@ -5784,197 +5869,197 @@ msgstr "樣��項"
 msgid "GtkStyleContext to get style from"
 msgstr "��得樣�的 GtkStyleContext"
 
-#: ../gtk/gtkstylecontext.c:547
+#: ../gtk/gtkstylecontext.c:433
 msgid "The associated GdkScreen"
 msgstr "已關�的 GdkScreen"
 
-#: ../gtk/gtkstylecontext.c:553
+#: ../gtk/gtkstylecontext.c:439
 msgid "Direction"
 msgstr "方�"
 
-#: ../gtk/gtkstylecontext.c:554 ../gtk/gtktexttag.c:236
+#: ../gtk/gtkstylecontext.c:440 ../gtk/gtktexttag.c:269
 msgid "Text direction"
 msgstr "文字方�"
 
-#: ../gtk/gtkswitch.c:802
+#: ../gtk/gtkswitch.c:784
 msgid "Whether the switch is on or off"
 msgstr "此開關是開啟或關閉"
 
-#: ../gtk/gtkswitch.c:837
+#: ../gtk/gtkswitch.c:818
 msgid "The minimum width of the handle"
 msgstr "控制項的最�寬度"
 
-#: ../gtk/gtktable.c:157
+#: ../gtk/gtktable.c:191
 msgid "Rows"
 msgstr "列數"
 
-#: ../gtk/gtktable.c:158
+#: ../gtk/gtktable.c:192
 msgid "The number of rows in the table"
 msgstr "表格的列數"
 
-#: ../gtk/gtktable.c:166
+#: ../gtk/gtktable.c:200
 msgid "Columns"
 msgstr "行數"
 
-#: ../gtk/gtktable.c:167
+#: ../gtk/gtktable.c:201
 msgid "The number of columns in the table"
 msgstr "表格的行數"
 
-#: ../gtk/gtktable.c:194
+#: ../gtk/gtktable.c:228
 msgid "If TRUE, the table cells are all the same width/height"
 msgstr "如設為定為‘TRUE’，表示表格中所有儲存格尺寸都一樣"
 
-#: ../gtk/gtktable.c:208
+#: ../gtk/gtktable.c:242
 msgid "Right attachment"
 msgstr "��附加"
 
-#: ../gtk/gtktable.c:209
+#: ../gtk/gtktable.c:243
 msgid "The column number to attach the right side of a child widget to"
 msgstr "附加�元件��於其上的縱列格數"
 
-#: ../gtk/gtktable.c:216
+#: ../gtk/gtktable.c:250
 msgid "The row number to attach the top of a child widget to"
 msgstr "附加�元件於其頂端的列數"
 
-#: ../gtk/gtktable.c:222
+#: ../gtk/gtktable.c:256
 msgid "Bottom attachment"
 msgstr "底部附加"
 
-#: ../gtk/gtktable.c:229
+#: ../gtk/gtktable.c:263
 msgid "Horizontal options"
 msgstr "水平�項"
 
-#: ../gtk/gtktable.c:230
+#: ../gtk/gtktable.c:264
 msgid "Options specifying the horizontal behaviour of the child"
 msgstr "指定�元件水平行為的�項"
 
-#: ../gtk/gtktable.c:236
+#: ../gtk/gtktable.c:270
 msgid "Vertical options"
 msgstr "垂直�項"
 
-#: ../gtk/gtktable.c:237
+#: ../gtk/gtktable.c:271
 msgid "Options specifying the vertical behaviour of the child"
 msgstr "指定�元件垂直行為的�項"
 
-#: ../gtk/gtktable.c:243
+#: ../gtk/gtktable.c:277
 msgid "Horizontal padding"
 msgstr "水平留邊"
 
-#: ../gtk/gtktable.c:244
+#: ../gtk/gtktable.c:278
 msgid ""
 "Extra space to put between the child and its left and right neighbors, in "
 "pixels"
 msgstr "副元件與鄰接左�的元件之間的�外空�，以�素表示"
 
-#: ../gtk/gtktable.c:250
+#: ../gtk/gtktable.c:284
 msgid "Vertical padding"
 msgstr "垂直留邊"
 
-#: ../gtk/gtktable.c:251
+#: ../gtk/gtktable.c:285
 msgid ""
 "Extra space to put between the child and its upper and lower neighbors, in "
 "pixels"
 msgstr "副元件與鄰接上下的元件之間的�外空�，以�素表示"
 
-#: ../gtk/gtktextbuffer.c:192
+#: ../gtk/gtktextbuffer.c:203
 msgid "Tag Table"
 msgstr "標記表格"
 
-#: ../gtk/gtktextbuffer.c:193
+#: ../gtk/gtktextbuffer.c:204
 msgid "Text Tag Table"
 msgstr "文字標記表格"
 
-#: ../gtk/gtktextbuffer.c:211
+#: ../gtk/gtktextbuffer.c:222
 msgid "Current text of the buffer"
 msgstr "緩��目�的文字"
 
-#: ../gtk/gtktextbuffer.c:225
+#: ../gtk/gtktextbuffer.c:236
 msgid "Has selection"
 msgstr "具有�定的範�"
 
-#: ../gtk/gtktextbuffer.c:226
+#: ../gtk/gtktextbuffer.c:237
 msgid "Whether the buffer has some text currently selected"
 msgstr "緩��目�是�有�些文字被��"
 
-#: ../gtk/gtktextbuffer.c:242
+#: ../gtk/gtktextbuffer.c:253
 msgid "Cursor position"
 msgstr "游標�置"
 
-#: ../gtk/gtktextbuffer.c:243
+#: ../gtk/gtktextbuffer.c:254
 msgid ""
 "The position of the insert mark (as offset from the beginning of the buffer)"
 msgstr "�入標記的�置（從緩��開始的�移）"
 
-#: ../gtk/gtktextbuffer.c:258
+#: ../gtk/gtktextbuffer.c:269
 msgid "Copy target list"
 msgstr "複製目標清單"
 
-#: ../gtk/gtktextbuffer.c:259
+#: ../gtk/gtktextbuffer.c:270
 msgid ""
 "The list of targets this buffer supports for clipboard copying and DND source"
 msgstr "這個緩��支�剪貼簿複製與拖放(DND)來�的目標清單"
 
-#: ../gtk/gtktextbuffer.c:274
+#: ../gtk/gtktextbuffer.c:285
 msgid "Paste target list"
 msgstr "�貼上的目標清單"
 
-#: ../gtk/gtktextbuffer.c:275
+#: ../gtk/gtktextbuffer.c:286
 msgid ""
 "The list of targets this buffer supports for clipboard pasting and DND "
 "destination"
 msgstr "這個緩��支�剪貼簿貼上與拖放(DND)目的端的目標清單"
 
-#: ../gtk/gtktextmark.c:90
+#: ../gtk/gtktextmark.c:127
 msgid "Mark name"
 msgstr "標記�稱"
 
-#: ../gtk/gtktextmark.c:97
+#: ../gtk/gtktextmark.c:134
 msgid "Left gravity"
 msgstr "由�至左"
 
-#: ../gtk/gtktextmark.c:98
+#: ../gtk/gtktextmark.c:135
 msgid "Whether the mark has left gravity"
 msgstr "此標記是�為由�至左"
 
-#: ../gtk/gtktexttag.c:186
+#: ../gtk/gtktexttag.c:189
 msgid "Tag name"
 msgstr "標記�稱"
 
-#: ../gtk/gtktexttag.c:187
+#: ../gtk/gtktexttag.c:190
 msgid "Name used to refer to the text tag. NULL for anonymous tags"
 msgstr "文字標記的代表�稱。NULL 為匿�標記"
 
-#: ../gtk/gtktexttag.c:205
-msgid "Background color as a (possibly unallocated) GdkColor"
-msgstr "以 GdkColor 方�表�（�能�未�置）的背景�色"
+#: ../gtk/gtktexttag.c:222
+msgid "Background RGBA"
+msgstr "背景 RGBA"
 
-#: ../gtk/gtktexttag.c:212
+#: ../gtk/gtktexttag.c:230
 msgid "Background full height"
 msgstr "背景填滿高度"
 
-#: ../gtk/gtktexttag.c:213
+#: ../gtk/gtktexttag.c:231
 msgid ""
 "Whether the background color fills the entire line height or only the height "
 "of the tagged characters"
 msgstr "是�背景�色填滿整行行高，或者僅止於那些被標記的字元的高度"
 
-#: ../gtk/gtktexttag.c:229
-msgid "Foreground color as a (possibly unallocated) GdkColor"
-msgstr "以 GdkColor 方�表� (�能�未�置) 的�景�色"
+#: ../gtk/gtktexttag.c:261
+msgid "Foreground RGBA"
+msgstr "�景 RGBA"
 
-#: ../gtk/gtktexttag.c:237
+#: ../gtk/gtktexttag.c:270
 msgid "Text direction, e.g. right-to-left or left-to-right"
 msgstr "文字方�，例如左至�或�至左"
 
-#: ../gtk/gtktexttag.c:286
+#: ../gtk/gtktexttag.c:319
 msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
 msgstr "以 PangoStyle 方�表示的字型款�，例如 PANGO_STYLE_ITALIC"
 
-#: ../gtk/gtktexttag.c:295
+#: ../gtk/gtktexttag.c:328
 msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
 msgstr "以 PangoVariant 方�表示的字型變化，例如 PANGO_VARIANT_SMALL_CAPS"
 
-#: ../gtk/gtktexttag.c:304
+#: ../gtk/gtktexttag.c:337
 msgid ""
 "Font weight as an integer, see predefined values in PangoWeight; for "
 "example, PANGO_WEIGHT_BOLD"
@@ -5982,15 +6067,15 @@ msgstr ""
 "以數字表示的字型粗幼度，請�考 PangoWeight 中�先定義的數值，例如 "
 "PANGO_WEIGHT_BOLD"
 
-#: ../gtk/gtktexttag.c:315
+#: ../gtk/gtktexttag.c:348
 msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
 msgstr "字型�照 PangoStrech 拉長, 例：PANGO_STRETCH_CONDENSED"
 
-#: ../gtk/gtktexttag.c:324
+#: ../gtk/gtktexttag.c:357
 msgid "Font size in Pango units"
 msgstr "以 Pango 單�表示的字型大�"
 
-#: ../gtk/gtktexttag.c:334
+#: ../gtk/gtktexttag.c:367
 msgid ""
 "Font size as a scale factor relative to the default font size. This properly "
 "adapts to theme changes etc. so is recommended. Pango predefines some scales "
@@ -5999,11 +6084,11 @@ msgstr ""
 "字型大�作為縮放比例，相�於�設文字大�。本屬性隨布景主題等設定而改變，故建"
 "議使用。Pango�先定義了�些縮放比，例如 PANGO_SCALE_X_LARGE"
 
-#: ../gtk/gtktexttag.c:354 ../gtk/gtktextview.c:702
+#: ../gtk/gtktexttag.c:387 ../gtk/gtktextview.c:704
 msgid "Left, right, or center justification"
 msgstr "�左���或是置中�齊"
 
-#: ../gtk/gtktexttag.c:373
+#: ../gtk/gtktexttag.c:406
 msgid ""
 "The language this text is in, as an ISO code. Pango can use this as a hint "
 "when rendering the text. If not set, an appropriate default will be used."
@@ -6011,258 +6096,266 @@ msgstr ""
 "該文字所用的語言，以 ISO 代碼表示。Pango 在�繪文字時會使用這個設定作為�示。"
 "如果沒有指定，則會自動�擇最�當的值。"
 
-#: ../gtk/gtktexttag.c:380
+#: ../gtk/gtktexttag.c:413
 msgid "Left margin"
 msgstr "左邊邊界"
 
-#: ../gtk/gtktexttag.c:381 ../gtk/gtktextview.c:711
+#: ../gtk/gtktexttag.c:414 ../gtk/gtktextview.c:713
 msgid "Width of the left margin in pixels"
 msgstr "左邊邊界的寬度，以�素數目表示"
 
-#: ../gtk/gtktexttag.c:390
+#: ../gtk/gtktexttag.c:423
 msgid "Right margin"
 msgstr "�邊邊界"
 
-#: ../gtk/gtktexttag.c:391 ../gtk/gtktextview.c:721
+#: ../gtk/gtktexttag.c:424 ../gtk/gtktextview.c:723
 msgid "Width of the right margin in pixels"
 msgstr "�邊邊界的寬度，以�素數目表示"
 
-#: ../gtk/gtktexttag.c:401 ../gtk/gtktextview.c:730
+#: ../gtk/gtktexttag.c:434 ../gtk/gtktextview.c:732
 msgid "Indent"
 msgstr "增加縮排"
 
-#: ../gtk/gtktexttag.c:402 ../gtk/gtktextview.c:731
+#: ../gtk/gtktexttag.c:435 ../gtk/gtktextview.c:733
 msgid "Amount to indent the paragraph, in pixels"
 msgstr "段�縮排的程度，以�素數目表示"
 
-#: ../gtk/gtktexttag.c:413
+#: ../gtk/gtktexttag.c:446
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative) "
 "in Pango units"
 msgstr "文字在基準線以上的�離（負數表示文字在基準線以下），以 Pango 單�表示"
 
-#: ../gtk/gtktexttag.c:422
+#: ../gtk/gtktexttag.c:455
 msgid "Pixels above lines"
 msgstr "段�頂端空間"
 
-#: ../gtk/gtktexttag.c:423 ../gtk/gtktextview.c:655
+#: ../gtk/gtktexttag.c:456 ../gtk/gtktextview.c:657
 msgid "Pixels of blank space above paragraphs"
 msgstr "段�頂端的空間的�素數目"
 
-#: ../gtk/gtktexttag.c:432
+#: ../gtk/gtktexttag.c:465
 msgid "Pixels below lines"
 msgstr "段�底部空間"
 
-#: ../gtk/gtktexttag.c:433 ../gtk/gtktextview.c:665
+#: ../gtk/gtktexttag.c:466 ../gtk/gtktextview.c:667
 msgid "Pixels of blank space below paragraphs"
 msgstr "段�底部的空間的�素數目"
 
-#: ../gtk/gtktexttag.c:442
+#: ../gtk/gtktexttag.c:475
 msgid "Pixels inside wrap"
 msgstr "�行時加上的�素"
 
-#: ../gtk/gtktexttag.c:443 ../gtk/gtktextview.c:675
+#: ../gtk/gtktexttag.c:476 ../gtk/gtktextview.c:677
 msgid "Pixels of blank space between wrapped lines in a paragraph"
 msgstr "段�內部的行�的�素數目"
 
-#: ../gtk/gtktexttag.c:470 ../gtk/gtktextview.c:693
+#: ../gtk/gtktexttag.c:503 ../gtk/gtktextview.c:695
 msgid ""
 "Whether to wrap lines never, at word boundaries, or at character boundaries"
 msgstr "�擇永���行�字詞邊界�行或是字元邊界�行"
 
-#: ../gtk/gtktexttag.c:479 ../gtk/gtktextview.c:740
+#: ../gtk/gtktexttag.c:512 ../gtk/gtktextview.c:742
 msgid "Tabs"
 msgstr "分�"
 
-#: ../gtk/gtktexttag.c:480 ../gtk/gtktextview.c:741
+#: ../gtk/gtktexttag.c:513 ../gtk/gtktextview.c:743
 msgid "Custom tabs for this text"
 msgstr "本文字的自訂 tab"
 
-#: ../gtk/gtktexttag.c:498
+#: ../gtk/gtktexttag.c:531
 msgid "Invisible"
 msgstr "隱形"
 
-#: ../gtk/gtktexttag.c:499
+#: ../gtk/gtktexttag.c:532
 msgid "Whether this text is hidden."
 msgstr "本文字是�隱�。"
 
-#: ../gtk/gtktexttag.c:513
+#: ../gtk/gtktexttag.c:546
 msgid "Paragraph background color name"
 msgstr "段�背景�色�稱"
 
-#: ../gtk/gtktexttag.c:514
+#: ../gtk/gtktexttag.c:547
 msgid "Paragraph background color as a string"
 msgstr "段�背景�色（以字串表示）"
 
-#: ../gtk/gtktexttag.c:529
+#: ../gtk/gtktexttag.c:561
 msgid "Paragraph background color"
 msgstr "段�背景�色"
 
-#: ../gtk/gtktexttag.c:530
-msgid "Paragraph background color as a (possibly unallocated) GdkColor"
-msgstr "以段�背景�色作為（�能�未�置）GdkColor"
+#: ../gtk/gtktexttag.c:562
+msgid "Paragraph background color as a GdkColor"
+msgstr "以段�背景�色�為 GdkColor"
+
+#: ../gtk/gtktexttag.c:576
+msgid "Paragraph background RGBA"
+msgstr "段�背景 RGBA"
 
-#: ../gtk/gtktexttag.c:548
+#: ../gtk/gtktexttag.c:577
+msgid "Paragraph background RGBA as a GdkRGBA"
+msgstr "以段�背景 RGBA �為 GdkRGBA"
+
+#: ../gtk/gtktexttag.c:595
 msgid "Margin Accumulates"
 msgstr "邊緣累計"
 
-#: ../gtk/gtktexttag.c:549
+#: ../gtk/gtktexttag.c:596
 msgid "Whether left and right margins accumulate."
 msgstr "左��邊緣是�累計。"
 
-#: ../gtk/gtktexttag.c:562
+#: ../gtk/gtktexttag.c:609
 msgid "Background full height set"
 msgstr "背景完整高度設定"
 
-#: ../gtk/gtktexttag.c:563
+#: ../gtk/gtktexttag.c:610
 msgid "Whether this tag affects background height"
 msgstr "此標記��影響背景高度"
 
-#: ../gtk/gtktexttag.c:602
+#: ../gtk/gtktexttag.c:649
 msgid "Justification set"
 msgstr "調整設定"
 
-#: ../gtk/gtktexttag.c:603
+#: ../gtk/gtktexttag.c:650
 msgid "Whether this tag affects paragraph justification"
 msgstr "此標記��影響段�調整"
 
-#: ../gtk/gtktexttag.c:610
+#: ../gtk/gtktexttag.c:657
 msgid "Left margin set"
 msgstr "左邊界設定"
 
-#: ../gtk/gtktexttag.c:611
+#: ../gtk/gtktexttag.c:658
 msgid "Whether this tag affects the left margin"
 msgstr "此標記��影響左邊界"
 
-#: ../gtk/gtktexttag.c:614
+#: ../gtk/gtktexttag.c:661
 msgid "Indent set"
 msgstr "縮排設定"
 
-#: ../gtk/gtktexttag.c:615
+#: ../gtk/gtktexttag.c:662
 msgid "Whether this tag affects indentation"
 msgstr "此標記��影響縮排"
 
-#: ../gtk/gtktexttag.c:622
+#: ../gtk/gtktexttag.c:669
 msgid "Pixels above lines set"
 msgstr "段�頂端空間設定"
 
-#: ../gtk/gtktexttag.c:623 ../gtk/gtktexttag.c:627
+#: ../gtk/gtktexttag.c:670 ../gtk/gtktexttag.c:674
 msgid "Whether this tag affects the number of pixels above lines"
 msgstr "此標記��影響段�頂端空間高度"
 
-#: ../gtk/gtktexttag.c:626
+#: ../gtk/gtktexttag.c:673
 msgid "Pixels below lines set"
 msgstr "段�底端空間設定"
 
-#: ../gtk/gtktexttag.c:630
+#: ../gtk/gtktexttag.c:677
 msgid "Pixels inside wrap set"
 msgstr "�行內部�素數設定"
 
-#: ../gtk/gtktexttag.c:631
+#: ../gtk/gtktexttag.c:678
 msgid "Whether this tag affects the number of pixels between wrapped lines"
 msgstr "此標記��影響�行段�內部行間的�離"
 
-#: ../gtk/gtktexttag.c:638
+#: ../gtk/gtktexttag.c:685
 msgid "Right margin set"
 msgstr "�邊邊界設定"
 
-#: ../gtk/gtktexttag.c:639
+#: ../gtk/gtktexttag.c:686
 msgid "Whether this tag affects the right margin"
 msgstr "此標記��影響�邊邊界"
 
-#: ../gtk/gtktexttag.c:646
+#: ../gtk/gtktexttag.c:693
 msgid "Wrap mode set"
 msgstr "�行模�設定"
 
-#: ../gtk/gtktexttag.c:647
+#: ../gtk/gtktexttag.c:694
 msgid "Whether this tag affects line wrap mode"
 msgstr "本標籤��影響�行模�"
 
-#: ../gtk/gtktexttag.c:650
+#: ../gtk/gtktexttag.c:697
 msgid "Tabs set"
 msgstr "Tab 設定"
 
-#: ../gtk/gtktexttag.c:651
+#: ../gtk/gtktexttag.c:698
 msgid "Whether this tag affects tabs"
 msgstr "標記��影響 Tab"
 
-#: ../gtk/gtktexttag.c:654
+#: ../gtk/gtktexttag.c:701
 msgid "Invisible set"
 msgstr "隱�設定"
 
-#: ../gtk/gtktexttag.c:655
+#: ../gtk/gtktexttag.c:702
 msgid "Whether this tag affects text visibility"
 msgstr "本標記是�影響文字�見度"
 
-#: ../gtk/gtktexttag.c:658
+#: ../gtk/gtktexttag.c:705
 msgid "Paragraph background set"
 msgstr "段�背景設定"
 
-#: ../gtk/gtktexttag.c:659
+#: ../gtk/gtktexttag.c:706
 msgid "Whether this tag affects the paragraph background color"
 msgstr "本標籤會�影響段�的背景�色"
 
-#: ../gtk/gtktextview.c:654
+#: ../gtk/gtktextview.c:656
 msgid "Pixels Above Lines"
 msgstr "�行頂部加上的�素"
 
-#: ../gtk/gtktextview.c:664
+#: ../gtk/gtktextview.c:666
 msgid "Pixels Below Lines"
 msgstr "�行底部加上的�素"
 
-#: ../gtk/gtktextview.c:674
+#: ../gtk/gtktextview.c:676
 msgid "Pixels Inside Wrap"
 msgstr "段�內部行�"
 
-#: ../gtk/gtktextview.c:692
+#: ../gtk/gtktextview.c:694
 msgid "Wrap Mode"
 msgstr "�行模�"
 
-#: ../gtk/gtktextview.c:710
+#: ../gtk/gtktextview.c:712
 msgid "Left Margin"
 msgstr "左邊邊界"
 
-#: ../gtk/gtktextview.c:720
+#: ../gtk/gtktextview.c:722
 msgid "Right Margin"
 msgstr "�邊邊界"
 
-#: ../gtk/gtktextview.c:748
+#: ../gtk/gtktextview.c:750
 msgid "Cursor Visible"
 msgstr "顯示游標"
 
-#: ../gtk/gtktextview.c:749
+#: ../gtk/gtktextview.c:751
 msgid "If the insertion cursor is shown"
 msgstr "是�顯示游標"
 
-#: ../gtk/gtktextview.c:756
+#: ../gtk/gtktextview.c:758
 msgid "Buffer"
 msgstr "緩��"
 
-#: ../gtk/gtktextview.c:757
+#: ../gtk/gtktextview.c:759
 msgid "The buffer which is displayed"
 msgstr "用來顯示的緩��"
 
-#: ../gtk/gtktextview.c:765
+#: ../gtk/gtktextview.c:767
 msgid "Whether entered text overwrites existing contents"
 msgstr "是�輸入文字�以覆寫既有文字"
 
-#: ../gtk/gtktextview.c:772
+#: ../gtk/gtktextview.c:774
 msgid "Accepts tab"
 msgstr "接�Tab�"
 
-#: ../gtk/gtktextview.c:773
+#: ../gtk/gtktextview.c:775
 msgid "Whether Tab will result in a tab character being entered"
 msgstr "是� Tab �會導致 Tab字元輸入"
 
-#: ../gtk/gtktextview.c:808
+#: ../gtk/gtktextview.c:810
 msgid "Error underline color"
 msgstr "錯誤的底線�色"
 
-#: ../gtk/gtktextview.c:809
+#: ../gtk/gtktextview.c:811
 msgid "Color with which to draw error-indication underlines"
 msgstr "繪畫游標使用的�色"
 
-#: ../gtk/gtkthemingengine.c:249
+#: ../gtk/gtkthemingengine.c:257
 msgid "Theming engine name"
 msgstr "布景引擎的�稱"
 
@@ -6278,103 +6371,103 @@ msgstr "是�該指令的代�看起來是單�指令代�"
 msgid "Whether the toggle action should be active"
 msgstr "該切�動作是�應該執行"
 
-#: ../gtk/gtktogglebutton.c:126 ../gtk/gtktoggletoolbutton.c:113
+#: ../gtk/gtktogglebutton.c:179 ../gtk/gtktoggletoolbutton.c:128
 msgid "If the toggle button should be pressed in"
 msgstr "該切�按鈕是�應該被按下"
 
-#: ../gtk/gtktogglebutton.c:134
+#: ../gtk/gtktogglebutton.c:187
 msgid "If the toggle button is in an \"in between\" state"
 msgstr "是�該開關按鈕處於『未定�狀態"
 
-#: ../gtk/gtktogglebutton.c:141
+#: ../gtk/gtktogglebutton.c:194
 msgid "Draw Indicator"
 msgstr "繪製指示標記"
 
-#: ../gtk/gtktogglebutton.c:142
+#: ../gtk/gtktogglebutton.c:195
 msgid "If the toggle part of the button is displayed"
 msgstr "是�顯示按鈕的開關部份"
 
-#: ../gtk/gtktoolbar.c:489 ../gtk/gtktoolpalette.c:1069
+#: ../gtk/gtktoolbar.c:501 ../gtk/gtktoolpalette.c:1038
 msgid "Toolbar Style"
 msgstr "工具列樣�"
 
-#: ../gtk/gtktoolbar.c:490
+#: ../gtk/gtktoolbar.c:502
 msgid "How to draw the toolbar"
 msgstr "如何繪製工具列"
 
-#: ../gtk/gtktoolbar.c:497
+#: ../gtk/gtktoolbar.c:509
 msgid "Show Arrow"
 msgstr "顯示箭頭"
 
-#: ../gtk/gtktoolbar.c:498
+#: ../gtk/gtktoolbar.c:510
 msgid "If an arrow should be shown if the toolbar doesn't fit"
 msgstr "若工具列大��符是�顯示箭頭"
 
-#: ../gtk/gtktoolbar.c:519
+#: ../gtk/gtktoolbar.c:531
 msgid "Size of icons in this toolbar"
 msgstr "此工具列的圖示大�"
 
-#: ../gtk/gtktoolbar.c:534 ../gtk/gtktoolpalette.c:1055
+#: ../gtk/gtktoolbar.c:546 ../gtk/gtktoolpalette.c:1024
 msgid "Icon size set"
 msgstr "圖示大�設定"
 
-#: ../gtk/gtktoolbar.c:535 ../gtk/gtktoolpalette.c:1056
+#: ../gtk/gtktoolbar.c:547 ../gtk/gtktoolpalette.c:1025
 msgid "Whether the icon-size property has been set"
 msgstr "圖示大�屬性是�已設定"
 
-#: ../gtk/gtktoolbar.c:544
+#: ../gtk/gtktoolbar.c:556
 msgid "Whether the item should receive extra space when the toolbar grows"
 msgstr "當工具列放大時其內項目應�隨之放大"
 
-#: ../gtk/gtktoolbar.c:552 ../gtk/gtktoolitemgroup.c:1650
+#: ../gtk/gtktoolbar.c:564 ../gtk/gtktoolitemgroup.c:1646
 msgid "Whether the item should be the same size as other homogeneous items"
 msgstr "工具項目的大�應�與其他�尺寸項目一致"
 
-#: ../gtk/gtktoolbar.c:559
+#: ../gtk/gtktoolbar.c:571
 msgid "Spacer size"
 msgstr "間隔大�"
 
-#: ../gtk/gtktoolbar.c:560
+#: ../gtk/gtktoolbar.c:572
 msgid "Size of spacers"
 msgstr "間隔的大�"
 
-#: ../gtk/gtktoolbar.c:569
+#: ../gtk/gtktoolbar.c:581
 msgid "Amount of border space between the toolbar shadow and the buttons"
 msgstr "工具列陰影與按鈕之間的邊緣空間"
 
-#: ../gtk/gtktoolbar.c:577
+#: ../gtk/gtktoolbar.c:589
 msgid "Maximum child expand"
 msgstr "最大�項目展開"
 
-#: ../gtk/gtktoolbar.c:578
+#: ../gtk/gtktoolbar.c:590
 msgid "Maximum amount of space an expandable item will be given"
 msgstr "給予�展開項目的最大空間"
 
-#: ../gtk/gtktoolbar.c:586
+#: ../gtk/gtktoolbar.c:598
 msgid "Space style"
 msgstr "間格樣�"
 
-#: ../gtk/gtktoolbar.c:587
+#: ../gtk/gtktoolbar.c:599
 msgid "Whether spacers are vertical lines or just blank"
 msgstr "是�間隔為垂直線，或是�是空白"
 
-#: ../gtk/gtktoolbar.c:594
+#: ../gtk/gtktoolbar.c:606
 msgid "Button relief"
 msgstr "按鈕斜邊"
 
-#: ../gtk/gtktoolbar.c:595
+#: ../gtk/gtktoolbar.c:607
 msgid "Type of bevel around toolbar buttons"
 msgstr "工具列按鈕邊緣的斜邊樣�"
 
-#: ../gtk/gtktoolbar.c:602
+#: ../gtk/gtktoolbar.c:614
 msgid "Style of bevel around the toolbar"
 msgstr "工具列邊緣的斜邊樣�"
 
-#: ../gtk/gtktoolbutton.c:202
+#: ../gtk/gtktoolbutton.c:233
 msgid "Text to show in the item."
 msgstr "項目內的文字。"
 
-#: ../gtk/gtktoolbutton.c:209
+#: ../gtk/gtktoolbutton.c:240
 msgid ""
 "If set, an underline in the label property indicates that the next character "
 "should be used for the mnemonic accelerator key in the overflow menu"
@@ -6382,43 +6475,43 @@ msgstr ""
 "若設置，在 label 屬性中的文字中�有(_)字元的下一個字�將被用來當作超出邊界�"
 "單的速記快��"
 
-#: ../gtk/gtktoolbutton.c:216
+#: ../gtk/gtktoolbutton.c:247
 msgid "Widget to use as the item label"
 msgstr "當作項目文字標籤的替代視窗元件"
 
-#: ../gtk/gtktoolbutton.c:222
+#: ../gtk/gtktoolbutton.c:253
 msgid "Stock Id"
 msgstr "內建圖示代碼"
 
-#: ../gtk/gtktoolbutton.c:223
+#: ../gtk/gtktoolbutton.c:254
 msgid "The stock icon displayed on the item"
 msgstr "項目中所顯示的內建圖示"
 
-#: ../gtk/gtktoolbutton.c:239
+#: ../gtk/gtktoolbutton.c:270
 msgid "Icon name"
 msgstr "圖示�稱"
 
-#: ../gtk/gtktoolbutton.c:240
+#: ../gtk/gtktoolbutton.c:271
 msgid "The name of the themed icon displayed on the item"
 msgstr "在項目上顯示的布景圖示的�稱"
 
-#: ../gtk/gtktoolbutton.c:246
+#: ../gtk/gtktoolbutton.c:277
 msgid "Icon widget"
 msgstr "圖示元件"
 
-#: ../gtk/gtktoolbutton.c:247
+#: ../gtk/gtktoolbutton.c:278
 msgid "Icon widget to display in the item"
 msgstr "準備在項目中顯示的圖示原�"
 
-#: ../gtk/gtktoolbutton.c:260
+#: ../gtk/gtktoolbutton.c:291
 msgid "Icon spacing"
 msgstr "圖示間�"
 
-#: ../gtk/gtktoolbutton.c:261
+#: ../gtk/gtktoolbutton.c:292
 msgid "Spacing in pixels between the icon and label"
 msgstr "圖示與標籤間的間�(�素)"
 
-#: ../gtk/gtktoolitem.c:210
+#: ../gtk/gtktoolitem.c:209
 msgid ""
 "Whether the toolbar item is considered important. When TRUE, toolbar buttons "
 "show text in GTK_TOOLBAR_BOTH_HORIZ mode"
@@ -6426,83 +6519,83 @@ msgstr ""
 "是�工具列物件被視為��的。若為 TRUE, 工具列按鈕以GTK_TOOLBAR_BOTH_HORIZ模�"
 "顯示文字"
 
-#: ../gtk/gtktoolitemgroup.c:1597
+#: ../gtk/gtktoolitemgroup.c:1593
 msgid "The human-readable title of this item group"
 msgstr "這個項目群組的供人類閱讀標題"
 
-#: ../gtk/gtktoolitemgroup.c:1604
+#: ../gtk/gtktoolitemgroup.c:1600
 msgid "A widget to display in place of the usual label"
 msgstr "替代原本標籤的視窗元件"
 
-#: ../gtk/gtktoolitemgroup.c:1610
+#: ../gtk/gtktoolitemgroup.c:1606
 msgid "Collapsed"
 msgstr "已收摺"
 
-#: ../gtk/gtktoolitemgroup.c:1611
+#: ../gtk/gtktoolitemgroup.c:1607
 msgid "Whether the group has been collapsed and items are hidden"
 msgstr "是��將群組收摺起來並隱�項目"
 
-#: ../gtk/gtktoolitemgroup.c:1617
+#: ../gtk/gtktoolitemgroup.c:1613
 msgid "ellipsize"
 msgstr "簡化文字"
 
-#: ../gtk/gtktoolitemgroup.c:1618
+#: ../gtk/gtktoolitemgroup.c:1614
 msgid "Ellipsize for item group headers"
 msgstr "簡化項目群組的標頭"
 
-#: ../gtk/gtktoolitemgroup.c:1624
+#: ../gtk/gtktoolitemgroup.c:1620
 msgid "Header Relief"
 msgstr "標頭消除"
 
-#: ../gtk/gtktoolitemgroup.c:1625
+#: ../gtk/gtktoolitemgroup.c:1621
 msgid "Relief of the group header button"
 msgstr "消除群組標頭按鈕"
 
-#: ../gtk/gtktoolitemgroup.c:1640
+#: ../gtk/gtktoolitemgroup.c:1636
 msgid "Header Spacing"
 msgstr "標頭間�"
 
-#: ../gtk/gtktoolitemgroup.c:1641
+#: ../gtk/gtktoolitemgroup.c:1637
 msgid "Spacing between expander arrow and caption"
 msgstr "展開器箭頭與說明之間的間�"
 
-#: ../gtk/gtktoolitemgroup.c:1657
+#: ../gtk/gtktoolitemgroup.c:1653
 msgid "Whether the item should receive extra space when the group grows"
 msgstr "當群組增大時項目應�得到�外的空間"
 
-#: ../gtk/gtktoolitemgroup.c:1664
+#: ../gtk/gtktoolitemgroup.c:1660
 msgid "Whether the item should fill the available space"
 msgstr "項目是�應填滿所有�用的空間"
 
-#: ../gtk/gtktoolitemgroup.c:1670
+#: ../gtk/gtktoolitemgroup.c:1666
 msgid "New Row"
 msgstr "新增列"
 
-#: ../gtk/gtktoolitemgroup.c:1671
+#: ../gtk/gtktoolitemgroup.c:1667
 msgid "Whether the item should start a new row"
 msgstr "項目是�應新增一列"
 
-#: ../gtk/gtktoolitemgroup.c:1678
+#: ../gtk/gtktoolitemgroup.c:1674
 msgid "Position of the item within this group"
 msgstr "項目在這個群組中的�置"
 
-#: ../gtk/gtktoolpalette.c:1040
+#: ../gtk/gtktoolpalette.c:1009
 msgid "Size of icons in this tool palette"
 msgstr "圖示在這個工具盤中的大�"
 
-#: ../gtk/gtktoolpalette.c:1070
+#: ../gtk/gtktoolpalette.c:1039
 msgid "Style of items in the tool palette"
 msgstr "項目在這個工具盤中的樣�"
 
-#: ../gtk/gtktoolpalette.c:1086
+#: ../gtk/gtktoolpalette.c:1055
 msgid "Exclusive"
 msgstr "除外的"
 
-#: ../gtk/gtktoolpalette.c:1087
+#: ../gtk/gtktoolpalette.c:1056
 msgid "Whether the item group should be the only expanded at a given time"
 msgstr "項目群組是��在指定時間展開"
 
-#: ../gtk/gtktoolpalette.c:1102
+#: ../gtk/gtktoolpalette.c:1071
 msgid ""
 "Whether the item group should receive extra space when the palette grows"
 msgstr "項目群組是�在工具盤擴大時得到�外的空間"
@@ -6579,11 +6672,11 @@ msgstr "�列寬度"
 msgid "Wrap width for laying out items in a grid"
 msgstr "將項目於方格中排列所設定的�列寬度"
 
-#: ../gtk/gtktreemodelsort.c:312
+#: ../gtk/gtktreemodelsort.c:491
 msgid "TreeModelSort Model"
 msgstr "TreeModelSort 模型"
 
-#: ../gtk/gtktreemodelsort.c:313
+#: ../gtk/gtktreemodelsort.c:492
 msgid "The model for the TreeModelSort to sort"
 msgstr "給 TreeModelSort 排�的模型"
 
@@ -6793,119 +6886,123 @@ msgstr "樹狀線樣�"
 msgid "Dash pattern used to draw the tree view lines"
 msgstr "用來繪製樹狀檢視樹狀線的虛線樣�"
 
-#: ../gtk/gtktreeviewcolumn.c:247
+#: ../gtk/gtktreeviewcolumn.c:249
 msgid "Whether to display the column"
 msgstr "是�顯示該列資料"
 
-#: ../gtk/gtktreeviewcolumn.c:254 ../gtk/gtkwindow.c:646
+#: ../gtk/gtktreeviewcolumn.c:256 ../gtk/gtkwindow.c:650
 msgid "Resizable"
 msgstr "�調整尺寸"
 
-#: ../gtk/gtktreeviewcolumn.c:255
+#: ../gtk/gtktreeviewcolumn.c:257
 msgid "Column is user-resizable"
 msgstr "欄寬�以調整"
 
-#: ../gtk/gtktreeviewcolumn.c:263
+#: ../gtk/gtktreeviewcolumn.c:265
+msgid "Current X position of the column"
+msgstr "目�欄的 X �置"
+
+#: ../gtk/gtktreeviewcolumn.c:275
 msgid "Current width of the column"
 msgstr "目�的欄寬"
 
-#: ../gtk/gtktreeviewcolumn.c:280
+#: ../gtk/gtktreeviewcolumn.c:292
 msgid "Sizing"
 msgstr "調整大�"
 
-#: ../gtk/gtktreeviewcolumn.c:281
+#: ../gtk/gtktreeviewcolumn.c:293
 msgid "Resize mode of the column"
 msgstr "欄�的調整模�"
 
-#: ../gtk/gtktreeviewcolumn.c:289
+#: ../gtk/gtktreeviewcolumn.c:301
 msgid "Fixed Width"
 msgstr "固定寬度"
 
-#: ../gtk/gtktreeviewcolumn.c:290
+#: ../gtk/gtktreeviewcolumn.c:302
 msgid "Current fixed width of the column"
 msgstr "目�的固定欄寬"
 
-#: ../gtk/gtktreeviewcolumn.c:300
+#: ../gtk/gtktreeviewcolumn.c:312
 msgid "Minimum allowed width of the column"
 msgstr "�接�的最�欄寬"
 
-#: ../gtk/gtktreeviewcolumn.c:309
+#: ../gtk/gtktreeviewcolumn.c:321
 msgid "Maximum Width"
 msgstr "最大寬度"
 
-#: ../gtk/gtktreeviewcolumn.c:310
+#: ../gtk/gtktreeviewcolumn.c:322
 msgid "Maximum allowed width of the column"
 msgstr "�接�的最大欄寬"
 
-#: ../gtk/gtktreeviewcolumn.c:320
+#: ../gtk/gtktreeviewcolumn.c:332
 msgid "Title to appear in column header"
 msgstr "欄�標題中所顯示的文字"
 
-#: ../gtk/gtktreeviewcolumn.c:328
+#: ../gtk/gtktreeviewcolumn.c:340
 msgid "Column gets share of extra width allocated to the widget"
 msgstr "欄��得分享給所屬元件增加的寬度"
 
-#: ../gtk/gtktreeviewcolumn.c:335
+#: ../gtk/gtktreeviewcolumn.c:347
 msgid "Clickable"
 msgstr "�按下"
 
-#: ../gtk/gtktreeviewcolumn.c:336
+#: ../gtk/gtktreeviewcolumn.c:348
 msgid "Whether the header can be clicked"
 msgstr "��按下欄�標頭"
 
-#: ../gtk/gtktreeviewcolumn.c:344
+#: ../gtk/gtktreeviewcolumn.c:356
 msgid "Widget"
 msgstr "元件"
 
-#: ../gtk/gtktreeviewcolumn.c:345
+#: ../gtk/gtktreeviewcolumn.c:357
 msgid "Widget to put in column header button instead of column title"
 msgstr "在欄�標頭中，以指定元件代替標題文字"
 
-#: ../gtk/gtktreeviewcolumn.c:353
+#: ../gtk/gtktreeviewcolumn.c:365
 msgid "X Alignment of the column header text or widget"
 msgstr "欄�標頭文字或元件的水平�齊"
 
-#: ../gtk/gtktreeviewcolumn.c:363
+#: ../gtk/gtktreeviewcolumn.c:375
 msgid "Whether the column can be reordered around the headers"
 msgstr "是�該欄��以在標頭下�新排�"
 
-#: ../gtk/gtktreeviewcolumn.c:370
+#: ../gtk/gtktreeviewcolumn.c:382
 msgid "Sort indicator"
 msgstr "排�指示標記"
 
-#: ../gtk/gtktreeviewcolumn.c:371
+#: ../gtk/gtktreeviewcolumn.c:383
 msgid "Whether to show a sort indicator"
 msgstr "是�顯示排�指示標記"
 
-#: ../gtk/gtktreeviewcolumn.c:378
+#: ../gtk/gtktreeviewcolumn.c:390
 msgid "Sort order"
 msgstr "排列次�"
 
-#: ../gtk/gtktreeviewcolumn.c:379
+#: ../gtk/gtktreeviewcolumn.c:391
 msgid "Sort direction the sort indicator should indicate"
 msgstr "排�指示器應顯示的排�方�"
 
-#: ../gtk/gtktreeviewcolumn.c:395
+#: ../gtk/gtktreeviewcolumn.c:407
 msgid "Sort column ID"
 msgstr "排�欄 ID"
 
-#: ../gtk/gtktreeviewcolumn.c:396
+#: ../gtk/gtktreeviewcolumn.c:408
 msgid "Logical sort column ID this column sorts on when selected for sorting"
 msgstr "當�擇排�時這個欄�用來排�的�輯排�欄� ID"
 
-#: ../gtk/gtkuimanager.c:226
+#: ../gtk/gtkuimanager.c:480
 msgid "Whether tearoff menu items should be added to menus"
 msgstr "是�在�單上加上��下標記的�單項目"
 
-#: ../gtk/gtkuimanager.c:233
+#: ../gtk/gtkuimanager.c:487
 msgid "Merged UI definition"
 msgstr "整�的 UI 定義"
 
-#: ../gtk/gtkuimanager.c:234
+#: ../gtk/gtkuimanager.c:488
 msgid "An XML string describing the merged UI"
 msgstr "�述整� UI 的特定 XML 字串"
 
-#: ../gtk/gtkviewport.c:154
+#: ../gtk/gtkviewport.c:156
 msgid "Determines how the shadowed box around the viewport is drawn"
 msgstr "決定視埠元件周�的陰影方塊�如何繪製"
 
@@ -6917,413 +7014,413 @@ msgstr "使用符號圖示"
 msgid "Whether to use symbolic icons"
 msgstr "是�使用符號圖示"
 
-#: ../gtk/gtkwidget.c:931
+#: ../gtk/gtkwidget.c:950
 msgid "Widget name"
 msgstr "元件�稱"
 
-#: ../gtk/gtkwidget.c:932
+#: ../gtk/gtkwidget.c:951
 msgid "The name of the widget"
 msgstr "元件的�稱"
 
-#: ../gtk/gtkwidget.c:938
+#: ../gtk/gtkwidget.c:957
 msgid "Parent widget"
 msgstr "�元件"
 
-#: ../gtk/gtkwidget.c:939
+#: ../gtk/gtkwidget.c:958
 msgid "The parent widget of this widget. Must be a Container widget"
 msgstr "該元件的�元件，必須是容器元件"
 
-#: ../gtk/gtkwidget.c:946
+#: ../gtk/gtkwidget.c:965
 msgid "Width request"
 msgstr "指定寬度"
 
-#: ../gtk/gtkwidget.c:947
+#: ../gtk/gtkwidget.c:966
 msgid ""
 "Override for width request of the widget, or -1 if natural request should be "
 "used"
 msgstr "自行指定元件的寬度，使用 -1 則表示使用�設寬度"
 
-#: ../gtk/gtkwidget.c:955
+#: ../gtk/gtkwidget.c:974
 msgid "Height request"
 msgstr "指定高度"
 
-#: ../gtk/gtkwidget.c:956
+#: ../gtk/gtkwidget.c:975
 msgid ""
 "Override for height request of the widget, or -1 if natural request should "
 "be used"
 msgstr "自行指定元件的高度，使用 -1 則表示使用�設高度"
 
-#: ../gtk/gtkwidget.c:965
+#: ../gtk/gtkwidget.c:984
 msgid "Whether the widget is visible"
 msgstr "該元件是��見"
 
-#: ../gtk/gtkwidget.c:972
+#: ../gtk/gtkwidget.c:991
 msgid "Whether the widget responds to input"
 msgstr "元件是��輸入有�應"
 
-#: ../gtk/gtkwidget.c:978
+#: ../gtk/gtkwidget.c:997
 msgid "Application paintable"
 msgstr "應用程��繪製"
 
-#: ../gtk/gtkwidget.c:979
+#: ../gtk/gtkwidget.c:998
 msgid "Whether the application will paint directly on the widget"
 msgstr "應用程��以繪製"
 
-#: ../gtk/gtkwidget.c:985
+#: ../gtk/gtkwidget.c:1004
 msgid "Can focus"
 msgstr "�接�焦點"
 
-#: ../gtk/gtkwidget.c:986
+#: ../gtk/gtkwidget.c:1005
 msgid "Whether the widget can accept the input focus"
 msgstr "元件��接�輸入焦點"
 
-#: ../gtk/gtkwidget.c:992
+#: ../gtk/gtkwidget.c:1011
 msgid "Has focus"
 msgstr "�得焦點"
 
-#: ../gtk/gtkwidget.c:993
+#: ../gtk/gtkwidget.c:1012
 msgid "Whether the widget has the input focus"
 msgstr "元件是�在輸入焦點內"
 
-#: ../gtk/gtkwidget.c:999
+#: ../gtk/gtkwidget.c:1018
 msgid "Is focus"
 msgstr "作為焦點"
 
-#: ../gtk/gtkwidget.c:1000
+#: ../gtk/gtkwidget.c:1019
 msgid "Whether the widget is the focus widget within the toplevel"
 msgstr "是�該元件在頂端為自動�得焦點的元件"
 
-#: ../gtk/gtkwidget.c:1006
+#: ../gtk/gtkwidget.c:1025
 msgid "Can default"
 msgstr "��為�設元件"
 
-#: ../gtk/gtkwidget.c:1007
+#: ../gtk/gtkwidget.c:1026
 msgid "Whether the widget can be the default widget"
 msgstr "該元件���為�設的視窗元件"
 
-#: ../gtk/gtkwidget.c:1013
+#: ../gtk/gtkwidget.c:1032
 msgid "Has default"
 msgstr "是�設元件"
 
-#: ../gtk/gtkwidget.c:1014
+#: ../gtk/gtkwidget.c:1033
 msgid "Whether the widget is the default widget"
 msgstr "該元件是��設的視窗元件"
 
-#: ../gtk/gtkwidget.c:1020
+#: ../gtk/gtkwidget.c:1039
 msgid "Receives default"
 msgstr "接��設設置"
 
-#: ../gtk/gtkwidget.c:1021
+#: ../gtk/gtkwidget.c:1040
 msgid "If TRUE, the widget will receive the default action when it is focused"
 msgstr "如設為定為‘TRUE’，該元件接��設設置命令當�為焦點時"
 
-#: ../gtk/gtkwidget.c:1027
+#: ../gtk/gtkwidget.c:1046
 msgid "Composite child"
 msgstr "屬於組�元件"
 
-#: ../gtk/gtkwidget.c:1028
+#: ../gtk/gtkwidget.c:1047
 msgid "Whether the widget is part of a composite widget"
 msgstr "該元件是�組�元件的一部分"
 
-#: ../gtk/gtkwidget.c:1034
+#: ../gtk/gtkwidget.c:1053
 msgid "Style"
 msgstr "樣�"
 
-#: ../gtk/gtkwidget.c:1035
+#: ../gtk/gtkwidget.c:1054
 msgid ""
 "The style of the widget, which contains information about how it will look "
 "(colors etc)"
 msgstr "元件的樣�，包括與外觀有關的資訊（例如色彩）。"
 
-#: ../gtk/gtkwidget.c:1041
+#: ../gtk/gtkwidget.c:1060
 msgid "Events"
 msgstr "事件"
 
-#: ../gtk/gtkwidget.c:1042
+#: ../gtk/gtkwidget.c:1061
 msgid "The event mask that decides what kind of GdkEvents this widget gets"
 msgstr "決定此元件會接�何種 GdkEvent 的事件�罩"
 
-#: ../gtk/gtkwidget.c:1049
+#: ../gtk/gtkwidget.c:1068
 msgid "No show all"
 msgstr "�全部顯示"
 
-#: ../gtk/gtkwidget.c:1050
+#: ../gtk/gtkwidget.c:1069
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "是� gtk_widget_show_all() 呼�影響本元件"
 
-#: ../gtk/gtkwidget.c:1073
+#: ../gtk/gtkwidget.c:1092
 msgid "Whether this widget has a tooltip"
 msgstr "此視窗元件是�具有工具�示"
 
-#: ../gtk/gtkwidget.c:1129
+#: ../gtk/gtkwidget.c:1148
 msgid "Window"
 msgstr "視窗"
 
-#: ../gtk/gtkwidget.c:1130
+#: ../gtk/gtkwidget.c:1149
 msgid "The widget's window if it is realized"
 msgstr "調整大�後的視窗元件視窗"
 
-#: ../gtk/gtkwidget.c:1144
+#: ../gtk/gtkwidget.c:1163
 msgid "Double Buffered"
 msgstr "雙�緩�"
 
-#: ../gtk/gtkwidget.c:1145
+#: ../gtk/gtkwidget.c:1164
 msgid "Whether the widget is double buffered"
 msgstr "此視窗元件是�使用雙�緩�"
 
-#: ../gtk/gtkwidget.c:1160
+#: ../gtk/gtkwidget.c:1179
 msgid "How to position in extra horizontal space"
 msgstr "在�外的水平空間中如何定�"
 
-#: ../gtk/gtkwidget.c:1176
+#: ../gtk/gtkwidget.c:1195
 msgid "How to position in extra vertical space"
 msgstr "在�外的垂直空間中如何定�"
 
-#: ../gtk/gtkwidget.c:1195
+#: ../gtk/gtkwidget.c:1214
 msgid "Margin on Left"
 msgstr "左�邊界"
 
-#: ../gtk/gtkwidget.c:1196
+#: ../gtk/gtkwidget.c:1215
 msgid "Pixels of extra space on the left side"
 msgstr "左��外空間的�素"
 
-#: ../gtk/gtkwidget.c:1216
+#: ../gtk/gtkwidget.c:1235
 msgid "Margin on Right"
 msgstr "��邊界"
 
-#: ../gtk/gtkwidget.c:1217
+#: ../gtk/gtkwidget.c:1236
 msgid "Pixels of extra space on the right side"
 msgstr "���外空間的�素"
 
-#: ../gtk/gtkwidget.c:1237
+#: ../gtk/gtkwidget.c:1256
 msgid "Margin on Top"
 msgstr "頂端邊界"
 
-#: ../gtk/gtkwidget.c:1238
+#: ../gtk/gtkwidget.c:1257
 msgid "Pixels of extra space on the top side"
 msgstr "頂端�外空間的�素"
 
-#: ../gtk/gtkwidget.c:1258
+#: ../gtk/gtkwidget.c:1277
 msgid "Margin on Bottom"
 msgstr "底部邊界"
 
-#: ../gtk/gtkwidget.c:1259
+#: ../gtk/gtkwidget.c:1278
 msgid "Pixels of extra space on the bottom side"
 msgstr "底部�外空間的�素"
 
-#: ../gtk/gtkwidget.c:1276
+#: ../gtk/gtkwidget.c:1295
 msgid "All Margins"
 msgstr "所有邊界"
 
-#: ../gtk/gtkwidget.c:1277
+#: ../gtk/gtkwidget.c:1296
 msgid "Pixels of extra space on all four sides"
 msgstr "四個邊界�外空間的�素"
 
-#: ../gtk/gtkwidget.c:1310
+#: ../gtk/gtkwidget.c:1329
 msgid "Horizontal Expand"
 msgstr "水平擴展"
 
-#: ../gtk/gtkwidget.c:1311
+#: ../gtk/gtkwidget.c:1330
 msgid "Whether widget wants more horizontal space"
 msgstr "視窗元件是��有更多水平空間"
 
-#: ../gtk/gtkwidget.c:1325
+#: ../gtk/gtkwidget.c:1344
 msgid "Horizontal Expand Set"
 msgstr "水平擴展設定"
 
-#: ../gtk/gtkwidget.c:1326
+#: ../gtk/gtkwidget.c:1345
 msgid "Whether to use the hexpand property"
 msgstr "是�使用 hexpand 屬性"
 
-#: ../gtk/gtkwidget.c:1340
+#: ../gtk/gtkwidget.c:1359
 msgid "Vertical Expand"
 msgstr "垂直擴展"
 
-#: ../gtk/gtkwidget.c:1341
+#: ../gtk/gtkwidget.c:1360
 msgid "Whether widget wants more vertical space"
 msgstr "視窗元件是��有更多垂直空間"
 
-#: ../gtk/gtkwidget.c:1355
+#: ../gtk/gtkwidget.c:1374
 msgid "Vertical Expand Set"
 msgstr "垂直擴展設定"
 
-#: ../gtk/gtkwidget.c:1356
+#: ../gtk/gtkwidget.c:1375
 msgid "Whether to use the vexpand property"
 msgstr "是�使用 vexpand 屬性"
 
-#: ../gtk/gtkwidget.c:1370
+#: ../gtk/gtkwidget.c:1389
 msgid "Expand Both"
 msgstr "擴展兩者"
 
-#: ../gtk/gtkwidget.c:1371
+#: ../gtk/gtkwidget.c:1390
 msgid "Whether widget wants to expand in both directions"
 msgstr "視窗元件是�在兩個方�都擴展"
 
-#: ../gtk/gtkwidget.c:3008
+#: ../gtk/gtkwidget.c:3029
 msgid "Interior Focus"
 msgstr "在內部顯示焦點"
 
-#: ../gtk/gtkwidget.c:3009
+#: ../gtk/gtkwidget.c:3030
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "是�在視窗元件內部顯示焦點線"
 
-#: ../gtk/gtkwidget.c:3015
+#: ../gtk/gtkwidget.c:3036
 msgid "Focus linewidth"
 msgstr "焦點線寬度"
 
-#: ../gtk/gtkwidget.c:3016
+#: ../gtk/gtkwidget.c:3037
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "輸入焦點指示線的寬度，以�素為單�"
 
-#: ../gtk/gtkwidget.c:3022
+#: ../gtk/gtkwidget.c:3043
 msgid "Focus line dash pattern"
 msgstr "焦點線虛線樣�"
 
-#: ../gtk/gtkwidget.c:3023
+#: ../gtk/gtkwidget.c:3044
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "顯示輸入焦點指示線時使用的虛線樣�"
 
-#: ../gtk/gtkwidget.c:3028
+#: ../gtk/gtkwidget.c:3049
 msgid "Focus padding"
 msgstr "焦點指示線留邊"
 
-#: ../gtk/gtkwidget.c:3029
+#: ../gtk/gtkwidget.c:3050
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "輸入焦點指示線�視窗元件邊界之間的寬度，以�素為單�"
 
-#: ../gtk/gtkwidget.c:3034
+#: ../gtk/gtkwidget.c:3055
 msgid "Cursor color"
 msgstr "游標�色"
 
-#: ../gtk/gtkwidget.c:3035
+#: ../gtk/gtkwidget.c:3056
 msgid "Color with which to draw insertion cursor"
 msgstr "繪畫游標使用的�色"
 
-#: ../gtk/gtkwidget.c:3040
+#: ../gtk/gtkwidget.c:3061
 msgid "Secondary cursor color"
 msgstr "第二游標�色"
 
-#: ../gtk/gtkwidget.c:3041
+#: ../gtk/gtkwidget.c:3062
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
 msgstr "當編輯混��至左�左至�的文字時，繪畫第二個�入游標所使用的�色。"
 
-#: ../gtk/gtkwidget.c:3046
+#: ../gtk/gtkwidget.c:3067
 msgid "Cursor line aspect ratio"
 msgstr "游標長寬比"
 
-#: ../gtk/gtkwidget.c:3047
+#: ../gtk/gtkwidget.c:3068
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "繪畫游標時使用的長寬比例"
 
-#: ../gtk/gtkwidget.c:3053
+#: ../gtk/gtkwidget.c:3074
 msgid "Window dragging"
 msgstr "視窗拖拉"
 
-#: ../gtk/gtkwidget.c:3054
+#: ../gtk/gtkwidget.c:3075
 msgid "Whether windows can be dragged by clicking on empty areas"
 msgstr "視窗是��以在空白�域處點�來拖拉它"
 
-#: ../gtk/gtkwidget.c:3067
+#: ../gtk/gtkwidget.c:3088
 msgid "Unvisited Link Color"
 msgstr "未�訪連�色彩"
 
-#: ../gtk/gtkwidget.c:3068
+#: ../gtk/gtkwidget.c:3089
 msgid "Color of unvisited links"
 msgstr "尚未�訪連�的色彩"
 
-#: ../gtk/gtkwidget.c:3081
+#: ../gtk/gtkwidget.c:3102
 msgid "Visited Link Color"
 msgstr "已�覽連��色"
 
-#: ../gtk/gtkwidget.c:3082
+#: ../gtk/gtkwidget.c:3103
 msgid "Color of visited links"
 msgstr "已經�覽連�的色彩"
 
-#: ../gtk/gtkwidget.c:3096
+#: ../gtk/gtkwidget.c:3117
 msgid "Wide Separators"
 msgstr "寬分隔線"
 
-#: ../gtk/gtkwidget.c:3097
+#: ../gtk/gtkwidget.c:3118
 msgid ""
 "Whether separators have configurable width and should be drawn using a box "
 "instead of a line"
 msgstr "分隔線是�有�設定的寬度以�是�使用方塊繪製"
 
-#: ../gtk/gtkwidget.c:3111
+#: ../gtk/gtkwidget.c:3132
 msgid "Separator Width"
 msgstr "分隔線寬度"
 
-#: ../gtk/gtkwidget.c:3112
+#: ../gtk/gtkwidget.c:3133
 msgid "The width of separators if wide-separators is TRUE"
 msgstr "如果寬分隔線為 TRUE 時的分隔線寬度"
 
-#: ../gtk/gtkwidget.c:3126
+#: ../gtk/gtkwidget.c:3147
 msgid "Separator Height"
 msgstr "分隔線高度"
 
-#: ../gtk/gtkwidget.c:3127
+#: ../gtk/gtkwidget.c:3148
 msgid "The height of separators if \"wide-separators\" is TRUE"
 msgstr "如果「寬分隔線�為 TRUE 時的分隔線高度"
 
-#: ../gtk/gtkwidget.c:3141
+#: ../gtk/gtkwidget.c:3162
 msgid "Horizontal Scroll Arrow Length"
 msgstr "水平�動列箭頭長度"
 
-#: ../gtk/gtkwidget.c:3142
+#: ../gtk/gtkwidget.c:3163
 msgid "The length of horizontal scroll arrows"
 msgstr "水平�動列箭頭的長度"
 
-#: ../gtk/gtkwidget.c:3156
+#: ../gtk/gtkwidget.c:3177
 msgid "Vertical Scroll Arrow Length"
 msgstr "垂直�動列箭頭長度"
 
-#: ../gtk/gtkwidget.c:3157
+#: ../gtk/gtkwidget.c:3178
 msgid "The length of vertical scroll arrows"
 msgstr "垂直�動列箭頭的長度"
 
-#: ../gtk/gtkwindow.c:604
+#: ../gtk/gtkwindow.c:608
 msgid "Window Type"
 msgstr "視窗類型"
 
-#: ../gtk/gtkwindow.c:605
+#: ../gtk/gtkwindow.c:609
 msgid "The type of the window"
 msgstr "視窗的類型"
 
-#: ../gtk/gtkwindow.c:613
+#: ../gtk/gtkwindow.c:617
 msgid "Window Title"
 msgstr "視窗標題"
 
-#: ../gtk/gtkwindow.c:614
+#: ../gtk/gtkwindow.c:618
 msgid "The title of the window"
 msgstr "視窗的標題"
 
-#: ../gtk/gtkwindow.c:621
+#: ../gtk/gtkwindow.c:625
 msgid "Window Role"
 msgstr "視窗角色"
 
-#: ../gtk/gtkwindow.c:622
+#: ../gtk/gtkwindow.c:626
 msgid "Unique identifier for the window to be used when restoring a session"
 msgstr "當�置程�階段時視窗的專一的識別證明"
 
-#: ../gtk/gtkwindow.c:638
+#: ../gtk/gtkwindow.c:642
 msgid "Startup ID"
 msgstr "å•Ÿå‹• ID"
 
-#: ../gtk/gtkwindow.c:639
+#: ../gtk/gtkwindow.c:643
 msgid "Unique startup identifier for the window used by startup-notification"
 msgstr "用於啓動通知的視窗�有的啟動識別證明"
 
-#: ../gtk/gtkwindow.c:647
+#: ../gtk/gtkwindow.c:651
 msgid "If TRUE, users can resize the window"
 msgstr "如設為定為‘TRUE’，使用者�以調整視窗的尺寸"
 
-#: ../gtk/gtkwindow.c:654
+#: ../gtk/gtkwindow.c:658
 msgid "Modal"
 msgstr "強制回應"
 
-#: ../gtk/gtkwindow.c:655
+#: ../gtk/gtkwindow.c:659
 msgid ""
 "If TRUE, the window is modal (other windows are not usable while this one is "
 "up)"
@@ -7331,193 +7428,221 @@ msgstr ""
 "如設為定為‘TRUE’，表示該視窗是強制回應的（當顯示該視窗時其它視窗�任何輸入都"
 "�會有�應）"
 
-#: ../gtk/gtkwindow.c:662
+#: ../gtk/gtkwindow.c:666
 msgid "Window Position"
 msgstr "視窗�置"
 
-#: ../gtk/gtkwindow.c:663
+#: ../gtk/gtkwindow.c:667
 msgid "The initial position of the window"
 msgstr "視窗的起始�置"
 
-#: ../gtk/gtkwindow.c:671
+#: ../gtk/gtkwindow.c:675
 msgid "Default Width"
 msgstr "�設寬度"
 
-#: ../gtk/gtkwindow.c:672
+#: ../gtk/gtkwindow.c:676
 msgid "The default width of the window, used when initially showing the window"
 msgstr "�設的視窗寬度，在�次顯示視窗時使用"
 
-#: ../gtk/gtkwindow.c:681
+#: ../gtk/gtkwindow.c:685
 msgid "Default Height"
 msgstr "�設高度"
 
-#: ../gtk/gtkwindow.c:682
+#: ../gtk/gtkwindow.c:686
 msgid ""
 "The default height of the window, used when initially showing the window"
 msgstr "�設的視窗高度，在�次顯示視窗時使用"
 
-#: ../gtk/gtkwindow.c:691
+#: ../gtk/gtkwindow.c:695
 msgid "Destroy with Parent"
 msgstr "隨主視窗關閉"
 
-#: ../gtk/gtkwindow.c:692
+#: ../gtk/gtkwindow.c:696
 msgid "If this window should be destroyed when the parent is destroyed"
 msgstr "當關閉主視窗時是�連本視窗也一起關閉"
 
-#: ../gtk/gtkwindow.c:700
+#: ../gtk/gtkwindow.c:704
 msgid "Icon for this window"
 msgstr "本視窗所用的圖示"
 
-#: ../gtk/gtkwindow.c:706
+#: ../gtk/gtkwindow.c:722
 msgid "Mnemonics Visible"
-msgstr "記憶符�視性"
+msgstr "記憶符顯示"
 
-#: ../gtk/gtkwindow.c:707
+#: ../gtk/gtkwindow.c:723
 msgid "Whether mnemonics are currently visible in this window"
-msgstr "記憶符目�在這個視窗中是��以看得到"
+msgstr "目�在這個視窗中是��以看得到記憶符"
 
-#: ../gtk/gtkwindow.c:723
+#: ../gtk/gtkwindow.c:741
+msgid "Focus Visible"
+msgstr "焦點的顯示"
+
+#: ../gtk/gtkwindow.c:742
+msgid "Whether focus rectangles are currently visible in this window"
+msgstr "目�在這個視窗中是��以看得到焦點矩形"
+
+#: ../gtk/gtkwindow.c:758
 msgid "Name of the themed icon for this window"
 msgstr "本視窗所用的主題圖示�稱"
 
-#: ../gtk/gtkwindow.c:738
+#: ../gtk/gtkwindow.c:773
 msgid "Is Active"
 msgstr "使用中"
 
-#: ../gtk/gtkwindow.c:739
+#: ../gtk/gtkwindow.c:774
 msgid "Whether the toplevel is the current active window"
 msgstr "是�頂端為目�活動的視窗"
 
-#: ../gtk/gtkwindow.c:746
+#: ../gtk/gtkwindow.c:781
 msgid "Focus in Toplevel"
 msgstr "焦點為頂端"
 
-#: ../gtk/gtkwindow.c:747
+#: ../gtk/gtkwindow.c:782
 msgid "Whether the input focus is within this GtkWindow"
 msgstr "輸入焦點是�在該 GtkWindow 之內"
 
-#: ../gtk/gtkwindow.c:754
+#: ../gtk/gtkwindow.c:789
 msgid "Type hint"
 msgstr "類型�示"
 
-#: ../gtk/gtkwindow.c:755
+#: ../gtk/gtkwindow.c:790
 msgid ""
 "Hint to help the desktop environment understand what kind of window this is "
 "and how to treat it."
 msgstr "為桌�環境�供�示，指定它是哪一種視窗�如何處�該種視窗。"
 
-#: ../gtk/gtkwindow.c:763
+#: ../gtk/gtkwindow.c:798
 msgid "Skip taskbar"
 msgstr "忽略工作列"
 
-#: ../gtk/gtkwindow.c:764
+#: ../gtk/gtkwindow.c:799
 msgid "TRUE if the window should not be in the task bar."
 msgstr "如果�想在桌�工作列內顯示該視窗的資訊則設定為 TRUE。"
 
-#: ../gtk/gtkwindow.c:771
+#: ../gtk/gtkwindow.c:806
 msgid "Skip pager"
 msgstr "忽略�型畫�管�程�"
 
-#: ../gtk/gtkwindow.c:772
+#: ../gtk/gtkwindow.c:807
 msgid "TRUE if the window should not be in the pager."
 msgstr "如果視窗�應該在�型畫�管�程�中出�則設定為 TRUE。"
 
-#: ../gtk/gtkwindow.c:779
+#: ../gtk/gtkwindow.c:814
 msgid "Urgent"
 msgstr "緊急"
 
-#: ../gtk/gtkwindow.c:780
+#: ../gtk/gtkwindow.c:815
 msgid "TRUE if the window should be brought to the user's attention."
 msgstr "如果視窗應當�引使用者的注�，則設為‘TRUE’"
 
-#: ../gtk/gtkwindow.c:794
+#: ../gtk/gtkwindow.c:829
 msgid "Accept focus"
 msgstr "接��焦"
 
-#: ../gtk/gtkwindow.c:795
+#: ../gtk/gtkwindow.c:830
 msgid "TRUE if the window should receive the input focus."
 msgstr "如果視窗應該接�輸入�焦則設定為 TRUE。"
 
-#: ../gtk/gtkwindow.c:809
+#: ../gtk/gtkwindow.c:844
 msgid "Focus on map"
 msgstr "點�時�焦"
 
-#: ../gtk/gtkwindow.c:810
+#: ../gtk/gtkwindow.c:845
 msgid "TRUE if the window should receive the input focus when mapped."
 msgstr "如果視窗應該接�輸入�焦則設定為 TRUE。"
 
-#: ../gtk/gtkwindow.c:824
+#: ../gtk/gtkwindow.c:859
 msgid "Decorated"
 msgstr "有�飾"
 
-#: ../gtk/gtkwindow.c:825
+#: ../gtk/gtkwindow.c:860
 msgid "Whether the window should be decorated by the window manager"
 msgstr "是�視窗管�員�在視窗四周加上�飾"
 
-#: ../gtk/gtkwindow.c:839
+#: ../gtk/gtkwindow.c:874
 msgid "Deletable"
 msgstr "�刪除"
 
-#: ../gtk/gtkwindow.c:840
+#: ../gtk/gtkwindow.c:875
 msgid "Whether the window frame should have a close button"
 msgstr "視窗框架是�加上關閉按鈕"
 
-#: ../gtk/gtkwindow.c:859
+#: ../gtk/gtkwindow.c:894
 msgid "Resize grip"
 msgstr "調整大�控制"
 
-#: ../gtk/gtkwindow.c:860
+#: ../gtk/gtkwindow.c:895
 msgid "Specifies whether the window should have a resize grip"
 msgstr "指定視窗是�加上調整大�控制"
 
-#: ../gtk/gtkwindow.c:874
+#: ../gtk/gtkwindow.c:909
 msgid "Resize grip is visible"
 msgstr "顯示調整大�控制"
 
-#: ../gtk/gtkwindow.c:875
+#: ../gtk/gtkwindow.c:910
 msgid "Specifies whether the window's resize grip is visible."
 msgstr "指定視窗是�顯示調整大�控制"
 
-#: ../gtk/gtkwindow.c:891
+#: ../gtk/gtkwindow.c:926
 msgid "Gravity"
 msgstr "定�"
 
-#: ../gtk/gtkwindow.c:892
+#: ../gtk/gtkwindow.c:927
 msgid "The window gravity of the window"
 msgstr "視窗的視窗定�"
 
-#: ../gtk/gtkwindow.c:909
+#: ../gtk/gtkwindow.c:944
 msgid "Transient for Window"
 msgstr "臨時視窗"
 
-#: ../gtk/gtkwindow.c:910
+#: ../gtk/gtkwindow.c:945
 msgid "The transient parent of the dialog"
 msgstr "�話盒的臨時父項"
 
-#: ../gtk/gtkwindow.c:925
+#: ../gtk/gtkwindow.c:960
 msgid "Opacity for Window"
 msgstr "視窗的�明度"
 
-#: ../gtk/gtkwindow.c:926
+#: ../gtk/gtkwindow.c:961
 msgid "The opacity of the window, from 0 to 1"
 msgstr "視窗的�明度，從 0 到 1"
 
-#: ../gtk/gtkwindow.c:936 ../gtk/gtkwindow.c:937
+#: ../gtk/gtkwindow.c:971 ../gtk/gtkwindow.c:972
 msgid "Width of resize grip"
 msgstr "調整大�控制的寬度"
 
-#: ../gtk/gtkwindow.c:942 ../gtk/gtkwindow.c:943
+#: ../gtk/gtkwindow.c:977 ../gtk/gtkwindow.c:978
 msgid "Height of resize grip"
 msgstr "調整大�控制的高度"
 
-#: ../gtk/gtkwindow.c:965
+#: ../gtk/gtkwindow.c:1000
 msgid "GtkApplication"
 msgstr "GtkApplication"
 
-#: ../gtk/gtkwindow.c:966
+#: ../gtk/gtkwindow.c:1001
 msgid "The GtkApplication for the window"
 msgstr "視窗的 GtkApplication"
 
+#: ../modules/printbackends/cups/gtkprintercups.c:95
+msgid "Color Profile Title"
+msgstr "�色設定組�的標題"
+
+#: ../modules/printbackends/cups/gtkprintercups.c:96
+msgid "The title of the color profile to use"
+msgstr "�色設定組�使用的標題"
+
+#~ msgid "The title of the font selection dialog"
+#~ msgstr "字型�擇�話盒的標題"
+
+#~ msgid "Background color as a (possibly unallocated) GdkColor"
+#~ msgstr "以 GdkColor 方�表�（�能�未�置）的背景�色"
+
+#~ msgid "Foreground color as a (possibly unallocated) GdkColor"
+#~ msgstr "以 GdkColor 方�表� (�能�未�置) 的�景�色"
+
+#~ msgid "Paragraph background color as a (possibly unallocated) GdkColor"
+#~ msgstr "以段�背景�色作為（�能�未�置）GdkColor"
+
 #~ msgid ""
 #~ "The label for the link to the website of the program. If this is not set, "
 #~ "it defaults to the URL"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 264d7cb762..986d8b5dd1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -95,6 +95,9 @@ gtk/gtkfilesystem.c
 gtk/gtkfilesystemmodel.c
 gtk/gtkfixed.c
 gtk/gtkfontbutton.c
+gtk/gtkfontchooser.c
+gtk/gtkfontchooser.c
+gtk/gtkfontchooserdialog.c
 gtk/gtkfontsel.c
 gtk/gtkframe.c
 gtk/gtkgrid.c
@@ -254,4 +257,3 @@ modules/printbackends/file/gtkprintbackendfile.c
 modules/printbackends/lpr/gtkprintbackendlpr.c
 modules/printbackends/papi/gtkprintbackendpapi.c
 modules/printbackends/test/gtkprintbackendtest.c
-tests/testfilechooser.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0f3232e198..34a0d5c5bf 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,65 @@
 demos/gtk-demo/demo.ui
 gtk/paper_names.c
+tests/a11y/accessible-name.ui
+tests/a11y/assistant.ui
+tests/a11y/buttons.ui
+tests/a11y/entries.ui
+tests/a11y/expander.ui
+tests/a11y/hello-world.ui
+tests/a11y/infobar.ui
+tests/a11y/link.ui
+tests/a11y/menus.ui
+tests/a11y/menu.ui
+tests/a11y/messagedialog.ui
+tests/a11y/mnemonic.ui
+tests/a11y/notebook.ui
+tests/a11y/paned.ui
+tests/a11y/placeholder-text.ui
+tests/a11y/tree.ui
+tests/reftests/background-area.ref.ui
+tests/reftests/background-area.ui
+tests/reftests/border-image-gradient.ref.ui
+tests/reftests/border-image-gradient.ui
+tests/reftests/border-image-url.ref.ui
+tests/reftests/border-image-url.ui
+tests/reftests/box-packing.ui
+tests/reftests/box-pseudo-classes.ref.ui
+tests/reftests/box-pseudo-classes.ui
+tests/reftests/css-match-inherit.ref.ui
+tests/reftests/css-match-inherit.ui
+tests/reftests/css-match-region-matches-star.ref.ui
+tests/reftests/css-match-region-matches-star.ui
+tests/reftests/css-match-regions.ref.ui
+tests/reftests/css-match-regions.ui
+tests/reftests/css-match-style-property-order.ref.ui
+tests/reftests/css-match-style-property-order.ui
+tests/reftests/entry-progress-coloring.ref.ui
+tests/reftests/entry-progress-coloring.ui
+tests/reftests/grid-wfh.ref.ui
+tests/reftests/grid-wfh.ui
+tests/reftests/label-shadows.ref.ui
+tests/reftests/label-shadows.ui
+tests/reftests/label-sizing.ref.ui
+tests/reftests/label-sizing.ui
+tests/reftests/label-small-ellipsized.ref.ui
+tests/reftests/label-small-ellipsized.ui
+tests/reftests/label-wrap-justify.ref.ui
+tests/reftests/label-wrap-justify.ui
+tests/reftests/messagedialog-secondarytext.ref.ui
+tests/reftests/messagedialog-secondarytext.ui
+tests/reftests/misc-alignment.ref.ui
+tests/reftests/misc-alignment.ui
+tests/reftests/no-colors.ref.ui
+tests/reftests/no-colors.ui
+tests/reftests/nonresizable-size.ref.ui
+tests/reftests/nonresizable-size.ui
+tests/reftests/notebook-childproperties.ref.ui
+tests/reftests/notebook-childproperties.ui
+tests/reftests/quit-mnemonic.ref.ui
+tests/reftests/quit-mnemonic.ui
+tests/reftests/rotated-layout.ref.ui
+tests/reftests/rotated-layout.ui
+tests/reftests/toplevel-vs-popup.ref.ui
+tests/reftests/toplevel-vs-popup.ui
+tests/testfilechooser.c
+tests/widget-factory.ui
diff --git a/po/es.po b/po/es.po
index ee35915a51..e1fd0019a0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,10 +15,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
-"%2b&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-07-10 12:45+0000\n"
-"PO-Revision-Date: 2011-07-10 21:04+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%"
+"2b&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-08-23 22:10+0000\n"
+"PO-Revision-Date: 2011-08-24 12:29+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -543,7 +543,7 @@ msgstr "Arte por"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:156
+#: ../gtk/gtkaccellabel.c:158
 msgctxt "keyboard label"
 msgid "Shift"
 msgstr "Mayús"
@@ -553,7 +553,7 @@ msgstr "Mayús"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:162
+#: ../gtk/gtkaccellabel.c:164
 msgctxt "keyboard label"
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -563,7 +563,7 @@ msgstr "Ctrl"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:168
+#: ../gtk/gtkaccellabel.c:170
 msgctxt "keyboard label"
 msgid "Alt"
 msgstr "Alt"
@@ -573,7 +573,7 @@ msgstr "Alt"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:787
+#: ../gtk/gtkaccellabel.c:789
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -583,7 +583,7 @@ msgstr "Super"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:800
+#: ../gtk/gtkaccellabel.c:802
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Hyper"
@@ -593,17 +593,17 @@ msgstr "Hyper"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:814
+#: ../gtk/gtkaccellabel.c:816
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"
 
-#: ../gtk/gtkaccellabel.c:830
+#: ../gtk/gtkaccellabel.c:832
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Espacio"
 
-#: ../gtk/gtkaccellabel.c:833
+#: ../gtk/gtkaccellabel.c:835
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Contrabarra"
@@ -671,7 +671,8 @@ msgstr "Olvidar asociación"
 msgid "Show other applications"
 msgstr "Mostrar otras aplicaciones"
 
-#: ../gtk/gtkappchooserdialog.c:533
+#: ../gtk/gtkappchooserdialog.c:533 ../gtk/gtkcolorseldialog.c:199
+#: ../gtk/gtkfontchooserdialog.c:125
 msgid "_Select"
 msgstr "_Seleccionar"
 
@@ -691,15 +692,15 @@ msgstr "Aplicaciones relacionadas"
 msgid "Other Applications"
 msgstr "Otras aplicaciones"
 
-#: ../gtk/gtkassistant.c:1000
+#: ../gtk/gtkassistant.c:999
 msgid "C_ontinue"
 msgstr "C_onectar"
 
-#: ../gtk/gtkassistant.c:1003
+#: ../gtk/gtkassistant.c:1002
 msgid "Go _Back"
 msgstr "A_trás"
 
-#: ../gtk/gtkassistant.c:1007
+#: ../gtk/gtkassistant.c:1006
 msgid "_Finish"
 msgstr "_Terminar"
 
@@ -734,7 +735,7 @@ msgstr "Etiqueta no soportada: «%s»"
 #. * text direction of RTL and specify "calendar:YM", then the year
 #. * will appear to the right of the month.
 #.
-#: ../gtk/gtkcalendar.c:874
+#: ../gtk/gtkcalendar.c:873
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -742,7 +743,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:912
+#: ../gtk/gtkcalendar.c:911
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -751,7 +752,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1913
+#: ../gtk/gtkcalendar.c:1912
 msgctxt "year measurement template"
 msgid "2000"
 msgstr "2000"
@@ -766,7 +767,7 @@ msgstr "2000"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: ../gtk/gtkcalendar.c:1944 ../gtk/gtkcalendar.c:2641
+#: ../gtk/gtkcalendar.c:1943 ../gtk/gtkcalendar.c:2640
 #, c-format
 msgctxt "calendar:day:digits"
 msgid "%d"
@@ -782,7 +783,7 @@ msgstr "%d"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: ../gtk/gtkcalendar.c:1976 ../gtk/gtkcalendar.c:2502
+#: ../gtk/gtkcalendar.c:1975 ../gtk/gtkcalendar.c:2501
 #, c-format
 msgctxt "calendar:week:digits"
 msgid "%d"
@@ -798,7 +799,7 @@ msgstr "%Id"
 #. *
 #. * "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:2271
+#: ../gtk/gtkcalendar.c:2270
 msgctxt "calendar year format"
 msgid "%Y"
 msgstr "%Y"
@@ -863,7 +864,8 @@ msgid "Position on the color wheel."
 msgstr "Posición en la rueda de colores."
 
 #: ../gtk/gtkcolorsel.c:455
-msgid "_Saturation:"
+#| msgid "_Saturation:"
+msgid "S_aturation:"
 msgstr "_Saturación:"
 
 #: ../gtk/gtkcolorsel.c:456
@@ -974,7 +976,7 @@ msgstr ""
 "Para cambiar esta entrada, arrastre un color de muestra aquí o pulse con el "
 "botón derecho sobre éste y seleccione «Guardar color aquí»."
 
-#: ../gtk/gtkcolorseldialog.c:213
+#: ../gtk/gtkcolorseldialog.c:217
 msgid "Color Selection"
 msgstr "Selección de color"
 
@@ -1042,23 +1044,23 @@ msgstr "_Derecho:"
 msgid "Paper Margins"
 msgstr "Márgenes del papel"
 
-#: ../gtk/gtkentry.c:8949 ../gtk/gtktextview.c:8277
+#: ../gtk/gtkentry.c:8956 ../gtk/gtktextview.c:8277
 msgid "Input _Methods"
 msgstr "_Métodos de entrada"
 
-#: ../gtk/gtkentry.c:8963 ../gtk/gtktextview.c:8291
+#: ../gtk/gtkentry.c:8970 ../gtk/gtktextview.c:8291
 msgid "_Insert Unicode Control Character"
 msgstr "_Insertar un carácter de control Unicode"
 
-#: ../gtk/gtkentry.c:10434
+#: ../gtk/gtkentry.c:10441
 msgid "Caps Lock and Num Lock are on"
 msgstr "Bloq Mayús y Bloq Num están activados"
 
-#: ../gtk/gtkentry.c:10436
+#: ../gtk/gtkentry.c:10443
 msgid "Num Lock is on"
 msgstr "Bloq Num está activado"
 
-#: ../gtk/gtkentry.c:10438
+#: ../gtk/gtkentry.c:10445
 msgid "Caps Lock is on"
 msgstr "Bloq Mayús está activado"
 
@@ -1107,7 +1109,7 @@ msgstr "Bloq Mayús está activado"
 msgid "Select a File"
 msgstr "Seleccionar un archivo"
 
-#: ../gtk/gtkfilechooserbutton.c:106 ../gtk/gtkfilechooserdefault.c:1809
+#: ../gtk/gtkfilechooserbutton.c:106 ../gtk/gtkfilechooserdefault.c:1817
 msgid "Desktop"
 msgstr "Escritorio"
 
@@ -1120,27 +1122,27 @@ msgstr "(Ninguno)"
 msgid "Other..."
 msgstr "Otra…"
 
-#: ../gtk/gtkfilechooserdefault.c:148
+#: ../gtk/gtkfilechooserdefault.c:153
 msgid "Type name of new folder"
 msgstr "Teclee el nombre de la carpeta nueva"
 
-#: ../gtk/gtkfilechooserdefault.c:960
+#: ../gtk/gtkfilechooserdefault.c:968
 msgid "Could not retrieve information about the file"
 msgstr "No se pudo obtener la información acerca del archivo"
 
-#: ../gtk/gtkfilechooserdefault.c:971
+#: ../gtk/gtkfilechooserdefault.c:979
 msgid "Could not add a bookmark"
 msgstr "No se pudo añadir un marcador"
 
-#: ../gtk/gtkfilechooserdefault.c:982
+#: ../gtk/gtkfilechooserdefault.c:990
 msgid "Could not remove bookmark"
 msgstr "No se pudo quitar el marcador"
 
-#: ../gtk/gtkfilechooserdefault.c:993
+#: ../gtk/gtkfilechooserdefault.c:1001
 msgid "The folder could not be created"
 msgstr "No se pudo crear la carpeta"
 
-#: ../gtk/gtkfilechooserdefault.c:1006
+#: ../gtk/gtkfilechooserdefault.c:1014
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1148,16 +1150,16 @@ msgstr ""
 "No se pudo crear la carpeta, debido a que ya existe un archivo con el mismo "
 "nombre. Intenta usar un nombre distinto o renombre el archivo primero."
 
-#: ../gtk/gtkfilechooserdefault.c:1020
+#: ../gtk/gtkfilechooserdefault.c:1028
 msgid "You need to choose a valid filename."
 msgstr "Debe elegir un nombre de archivo válido."
 
-#: ../gtk/gtkfilechooserdefault.c:1023
+#: ../gtk/gtkfilechooserdefault.c:1031
 #, c-format
 msgid "Cannot create a file under %s as it is not a folder"
 msgstr "No se puede crear un archivo bajo %s ya que no es una carpeta"
 
-#: ../gtk/gtkfilechooserdefault.c:1035
+#: ../gtk/gtkfilechooserdefault.c:1043
 msgid ""
 "You may only select folders.  The item that you selected is not a folder; "
 "try using a different item."
@@ -1165,11 +1167,11 @@ msgstr ""
 "Sólo puede seleccionar carpetas. El elemento que ha seleccionado no es una "
 "carpeta; intentélo seleccionar un elemento diferente."
 
-#: ../gtk/gtkfilechooserdefault.c:1045
+#: ../gtk/gtkfilechooserdefault.c:1053
 msgid "Invalid file name"
 msgstr "Nombre de archivo no válido"
 
-#: ../gtk/gtkfilechooserdefault.c:1055
+#: ../gtk/gtkfilechooserdefault.c:1063
 msgid "The folder contents could not be displayed"
 msgstr "No se pudo mostrar el contenido de la carpeta"
 
@@ -1177,203 +1179,208 @@ msgstr "No se pudo mostrar el contenido de la carpeta"
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: ../gtk/gtkfilechooserdefault.c:1581
+#: ../gtk/gtkfilechooserdefault.c:1589
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 
-#: ../gtk/gtkfilechooserdefault.c:1730
+#: ../gtk/gtkfilechooserdefault.c:1738
 msgid "Search"
 msgstr "Buscar"
 
-#: ../gtk/gtkfilechooserdefault.c:1754 ../gtk/gtkfilechooserdefault.c:4871
+#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4960
 msgid "Recently Used"
 msgstr "Usados recientemente"
 
-#: ../gtk/gtkfilechooserdefault.c:2353
+#: ../gtk/gtkfilechooserdefault.c:2361
 msgid "Select which types of files are shown"
 msgstr "Seleccionar qué tipos de archivos se muestran"
 
-#: ../gtk/gtkfilechooserdefault.c:2712
+#: ../gtk/gtkfilechooserdefault.c:2720
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Añadir la carpeta «%s» a los marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:2756
+#: ../gtk/gtkfilechooserdefault.c:2764
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Añadir la carpeta actual a los marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:2758
+#: ../gtk/gtkfilechooserdefault.c:2766
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Añadir las carpetas seleccionadas a los marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:2796
+#: ../gtk/gtkfilechooserdefault.c:2804
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Quitar el marcador «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:2798
+#: ../gtk/gtkfilechooserdefault.c:2806
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "No se puede quitar el marcador «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:2805 ../gtk/gtkfilechooserdefault.c:3690
+#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3698
 msgid "Remove the selected bookmark"
 msgstr "Quitar el marcador seleccionado"
 
-#: ../gtk/gtkfilechooserdefault.c:3369
+#: ../gtk/gtkfilechooserdefault.c:3377
 msgid "Remove"
 msgstr "Quitar"
 
-#: ../gtk/gtkfilechooserdefault.c:3378
+#: ../gtk/gtkfilechooserdefault.c:3386
 msgid "Rename..."
 msgstr "Renombrar…"
 
 #. Accessible object name for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3542
+#: ../gtk/gtkfilechooserdefault.c:3550
 msgid "Places"
 msgstr "Lugares"
 
 #. Column header for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3599
+#: ../gtk/gtkfilechooserdefault.c:3607
 msgid "_Places"
 msgstr "_Lugares"
 
-#: ../gtk/gtkfilechooserdefault.c:3678
+#: ../gtk/gtkfilechooserdefault.c:3686
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Añade la carpeta seleccionada a los marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:3825
+#: ../gtk/gtkfilechooserdefault.c:3925
 msgid "Could not select file"
 msgstr "No se pudo seleccionar el archivo"
 
-#: ../gtk/gtkfilechooserdefault.c:3998
+#: ../gtk/gtkfilechooserdefault.c:4116
+#| msgid "Copy _Location"
+msgid "_Copy file's location"
+msgstr "_Copiar la ubicación del archivo"
+
+#: ../gtk/gtkfilechooserdefault.c:4125
 msgid "_Add to Bookmarks"
 msgstr "_Añadir a los marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:4011
+#: ../gtk/gtkfilechooserdefault.c:4138
 msgid "Show _Hidden Files"
 msgstr "Mostrar archivos _ocultos"
 
-#: ../gtk/gtkfilechooserdefault.c:4018
+#: ../gtk/gtkfilechooserdefault.c:4145
 msgid "Show _Size Column"
 msgstr "Mostrar columna de _tamaño"
 
-#: ../gtk/gtkfilechooserdefault.c:4243
+#: ../gtk/gtkfilechooserdefault.c:4373
 msgid "Files"
 msgstr "Archivos"
 
-#: ../gtk/gtkfilechooserdefault.c:4294
+#: ../gtk/gtkfilechooserdefault.c:4424
 msgid "Name"
 msgstr "Nombre"
 
-#: ../gtk/gtkfilechooserdefault.c:4317
+#: ../gtk/gtkfilechooserdefault.c:4447
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../gtk/gtkfilechooserdefault.c:4331
+#: ../gtk/gtkfilechooserdefault.c:4461
 msgid "Modified"
 msgstr "Modificado"
 
 #. Label
-#: ../gtk/gtkfilechooserdefault.c:4412 ../gtk/gtkprinteroptionwidget.c:799
+#: ../gtk/gtkfilechooserdefault.c:4556 ../gtk/gtkprinteroptionwidget.c:799
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: ../gtk/gtkfilechooserdefault.c:4709
+#: ../gtk/gtkfilechooserdefault.c:4798
 msgid "Type a file name"
 msgstr "Teclee un nombre de archivo"
 
-#: ../gtk/gtkfilechooserdefault.c:4756 ../gtk/gtkfilechooserdefault.c:4767
+#: ../gtk/gtkfilechooserdefault.c:4845 ../gtk/gtkfilechooserdefault.c:4856
 msgid "Please select a folder below"
 msgstr "Seleccionar una carpeta a continuación"
 
-#: ../gtk/gtkfilechooserdefault.c:4762
+#: ../gtk/gtkfilechooserdefault.c:4851
 msgid "Please type a file name"
 msgstr "Escriba un nombre de archivo"
 
 # C en conflicto con Cancelar
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:4833
+#: ../gtk/gtkfilechooserdefault.c:4922
 msgid "Create Fo_lder"
 msgstr "Crear car_peta"
 
-#: ../gtk/gtkfilechooserdefault.c:4881
+#: ../gtk/gtkfilechooserdefault.c:4970
 msgid "Search:"
 msgstr "Buscar:"
 
-#: ../gtk/gtkfilechooserdefault.c:4928
+#: ../gtk/gtkfilechooserdefault.c:5021
 msgid "_Location:"
 msgstr "_Lugar:"
 
 # El acelerador c entra en conflicto con cancelar
-#: ../gtk/gtkfilechooserdefault.c:5245
+#: ../gtk/gtkfilechooserdefault.c:5474
 msgid "Save in _folder:"
 msgstr "_Guardar en la carpeta:"
 
-#: ../gtk/gtkfilechooserdefault.c:5247
+#: ../gtk/gtkfilechooserdefault.c:5476
 msgid "Create in _folder:"
 msgstr "Crear en la _carpeta:"
 
-#: ../gtk/gtkfilechooserdefault.c:6341
+#: ../gtk/gtkfilechooserdefault.c:6570
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "No se pudo leer el contenido de %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6345
+#: ../gtk/gtkfilechooserdefault.c:6574
 msgid "Could not read the contents of the folder"
 msgstr "No se pudo leer el contenido del la carpeta"
 
-#: ../gtk/gtkfilechooserdefault.c:6438 ../gtk/gtkfilechooserdefault.c:6506
-#: ../gtk/gtkfilechooserdefault.c:6658
+#: ../gtk/gtkfilechooserdefault.c:6667 ../gtk/gtkfilechooserdefault.c:6735
+#: ../gtk/gtkfilechooserdefault.c:6887
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../gtk/gtkfilechooserdefault.c:6453
+#: ../gtk/gtkfilechooserdefault.c:6682
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: ../gtk/gtkfilechooserdefault.c:6455
+#: ../gtk/gtkfilechooserdefault.c:6684
 msgid "Yesterday at %H:%M"
 msgstr "Ayer a las %H:%M"
 
-#: ../gtk/gtkfilechooserdefault.c:7140
+#: ../gtk/gtkfilechooserdefault.c:7359
 msgid "Cannot change to folder because it is not local"
 msgstr "No se pudo cambiar a la carpeta porque no es local"
 
-#: ../gtk/gtkfilechooserdefault.c:7740 ../gtk/gtkfilechooserdefault.c:7761
+#: ../gtk/gtkfilechooserdefault.c:7959 ../gtk/gtkfilechooserdefault.c:7980
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "La combinación %s ya existe"
 
-#: ../gtk/gtkfilechooserdefault.c:7851
+#: ../gtk/gtkfilechooserdefault.c:8070
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "La combinación %s no existe"
 
-#: ../gtk/gtkfilechooserdefault.c:8097 ../gtk/gtkprintunixdialog.c:550
+#: ../gtk/gtkfilechooserdefault.c:8316 ../gtk/gtkprintunixdialog.c:550
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Ya existe un archivo llamado «%s». ¿Quiere reemplazarlo?"
 
-#: ../gtk/gtkfilechooserdefault.c:8100 ../gtk/gtkprintunixdialog.c:554
+#: ../gtk/gtkfilechooserdefault.c:8319 ../gtk/gtkprintunixdialog.c:554
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "El archivo ya existe en «%s». Si lo reemplaza sobreescribirá su contenido."
 
-#: ../gtk/gtkfilechooserdefault.c:8105 ../gtk/gtkprintunixdialog.c:561
+#: ../gtk/gtkfilechooserdefault.c:8324 ../gtk/gtkprintunixdialog.c:561
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: ../gtk/gtkfilechooserdefault.c:8858
+#: ../gtk/gtkfilechooserdefault.c:9130
 msgid "Could not start the search process"
 msgstr "No se ha podido iniciar el proceso de búsqueda"
 
-#: ../gtk/gtkfilechooserdefault.c:8859
+#: ../gtk/gtkfilechooserdefault.c:9131
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
@@ -1381,11 +1388,11 @@ msgstr ""
 "El programa no fue capaz de crear una conexión con el demonio indexador. Por "
 "favor asegúrese de que se está ejecutando."
 
-#: ../gtk/gtkfilechooserdefault.c:8873
+#: ../gtk/gtkfilechooserdefault.c:9145
 msgid "Could not send the search request"
 msgstr "No se ha podido enviar la petición de búsqueda"
 
-#: ../gtk/gtkfilechooserdefault.c:9665
+#: ../gtk/gtkfilechooserdefault.c:9771
 #, c-format
 msgid "Could not mount %s"
 msgstr "No se pudo montar %s"
@@ -1458,48 +1465,52 @@ msgstr "La ruta no existe"
 msgid "File System"
 msgstr "Sistema de archivos"
 
-#: ../gtk/gtkfontbutton.c:153 ../gtk/gtkfontbutton.c:277
+#: ../gtk/gtkfontbutton.c:152 ../gtk/gtkfontbutton.c:276
 msgid "Pick a Font"
 msgstr "Escoja una tipografía"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:271
+#: ../gtk/gtkfontbutton.c:270
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:796
+#: ../gtk/gtkfontbutton.c:787
 msgid "Font"
 msgstr "Tipografía"
 
+#: ../gtk/gtkfontchooser.c:628
+msgid "Search font name"
+msgstr "Buscar nombre de tipografía"
+
+#: ../gtk/gtkfontchooserdialog.c:134 ../gtk/gtkfontsel.c:1738
+msgid "Font Selection"
+msgstr "Selección de tipografías"
+
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:119
+#: ../gtk/gtkfontsel.c:125
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr ""
 "El veloz murciélago hindú comía feliz cardillo y kiwi. La cigüeña tocaba el "
 "saxofón detrás del palenque de paja."
 
-#: ../gtk/gtkfontsel.c:388
+#: ../gtk/gtkfontsel.c:394
 msgid "_Family:"
 msgstr "_Familia:"
 
-#: ../gtk/gtkfontsel.c:395
+#: ../gtk/gtkfontsel.c:401
 msgid "_Style:"
 msgstr "_Estilo:"
 
-#: ../gtk/gtkfontsel.c:402
+#: ../gtk/gtkfontsel.c:408
 msgid "Si_ze:"
 msgstr "_Tamaño:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:579
+#: ../gtk/gtkfontsel.c:585
 msgid "_Preview:"
 msgstr "_Vista previa:"
 
-#: ../gtk/gtkfontsel.c:1701
-msgid "Font Selection"
-msgstr "Selección de tipografías"
-
 #: ../gtk/gtkicontheme.c:1605
 #, c-format
 msgid "Icon '%s' not present in theme"
@@ -1531,12 +1542,12 @@ msgid "System (%s)"
 msgstr "Sistema (%s)"
 
 #. Open Link
-#: ../gtk/gtklabel.c:6309
+#: ../gtk/gtklabel.c:6293
 msgid "_Open Link"
 msgstr "_Abrir enlace"
 
 #. Copy Link Address
-#: ../gtk/gtklabel.c:6321
+#: ../gtk/gtklabel.c:6305
 msgid "Copy _Link Address"
 msgstr "Copiar la dirección del _enlace"
 
@@ -1683,32 +1694,32 @@ msgstr ""
 "No se puede matar el proceso con PID %d. La operación no está implementada."
 
 #. translators: this string is a name for the 'less' command
-#: ../gtk/gtkmountoperation-x11.c:859
+#: ../gtk/gtkmountoperation-x11.c:959
 msgid "Terminal Pager"
 msgstr "Paginador del terminal («less»)"
 
-#: ../gtk/gtkmountoperation-x11.c:860
+#: ../gtk/gtkmountoperation-x11.c:960
 msgid "Top Command"
 msgstr "Comando top"
 
-#: ../gtk/gtkmountoperation-x11.c:861
+#: ../gtk/gtkmountoperation-x11.c:961
 msgid "Bourne Again Shell"
 msgstr "Shell Bourne Again"
 
-#: ../gtk/gtkmountoperation-x11.c:862
+#: ../gtk/gtkmountoperation-x11.c:962
 msgid "Bourne Shell"
 msgstr "Shell Bourne"
 
-#: ../gtk/gtkmountoperation-x11.c:863
+#: ../gtk/gtkmountoperation-x11.c:963
 msgid "Z Shell"
 msgstr "Shell Z"
 
-#: ../gtk/gtkmountoperation-x11.c:960
+#: ../gtk/gtkmountoperation-x11.c:1060
 #, c-format
 msgid "Cannot end process with PID %d: %s"
 msgstr "No se puede finalizar el proceso con PID %d: %s"
 
-#: ../gtk/gtknotebook.c:4922 ../gtk/gtknotebook.c:7611
+#: ../gtk/gtknotebook.c:4902 ../gtk/gtknotebook.c:7587
 #, c-format
 msgid "Page %u"
 msgstr "Página %u"
@@ -1892,7 +1903,7 @@ msgstr "Papel agotado"
 
 #. Translators: this is a printer status.
 #: ../gtk/gtkprintoperation-win32.c:615
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2022
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2036
 msgid "Paused"
 msgstr "Pausada"
 
@@ -2019,42 +2030,42 @@ msgstr "General"
 #. * multiple pages on a sheet when printing
 #.
 #: ../gtk/gtkprintunixdialog.c:3109
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3572
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3586
 msgid "Left to right, top to bottom"
 msgstr "De izquierda a derecha, de arriba a abajo"
 
 #: ../gtk/gtkprintunixdialog.c:3109
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3572
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3586
 msgid "Left to right, bottom to top"
 msgstr "De izquierda a derecha, de abajo a arriba"
 
 #: ../gtk/gtkprintunixdialog.c:3110
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3573
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3587
 msgid "Right to left, top to bottom"
 msgstr "De derecha a izquierda, de arriba a abajo"
 
 #: ../gtk/gtkprintunixdialog.c:3110
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3573
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3587
 msgid "Right to left, bottom to top"
 msgstr "De derecha a izquierda, de abajo a arriba"
 
 #: ../gtk/gtkprintunixdialog.c:3111
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3574
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3588
 msgid "Top to bottom, left to right"
 msgstr "De arriba a abajo, de izquierda a derecha"
 
 #: ../gtk/gtkprintunixdialog.c:3111
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3574
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3588
 msgid "Top to bottom, right to left"
 msgstr "De arriba a abajo, de derecha a izquierda"
 
 #: ../gtk/gtkprintunixdialog.c:3112
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3575
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3589
 msgid "Bottom to top, left to right"
 msgstr "De abajo a arriba, de izquierda a derecha"
 
 #: ../gtk/gtkprintunixdialog.c:3112
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3575
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3589
 msgid "Bottom to top, right to left"
 msgstr "De abajo a arriba, de derecha a izquierda"
 
@@ -2062,7 +2073,7 @@ msgstr "De abajo a arriba, de derecha a izquierda"
 #. * dialog that controls in what order multiple pages are arranged
 #.
 #: ../gtk/gtkprintunixdialog.c:3116 ../gtk/gtkprintunixdialog.c:3129
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3609
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3623
 msgid "Page Ordering"
 msgstr "Orden de las hojas"
 
@@ -2870,7 +2881,7 @@ msgstr "_Reducir"
 #. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
 #. * the state
 #.
-#: ../gtk/gtkswitch.c:336 ../gtk/gtkswitch.c:396 ../gtk/gtkswitch.c:603
+#: ../gtk/gtkswitch.c:335 ../gtk/gtkswitch.c:395 ../gtk/gtkswitch.c:602
 msgctxt "switch"
 msgid "ON"
 msgstr "�"
@@ -2878,7 +2889,7 @@ msgstr "�"
 #. Translators: if the "off" state label requires more than three
 #. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
 #.
-#: ../gtk/gtkswitch.c:344 ../gtk/gtkswitch.c:397 ../gtk/gtkswitch.c:632
+#: ../gtk/gtkswitch.c:343 ../gtk/gtkswitch.c:396 ../gtk/gtkswitch.c:631
 msgctxt "switch"
 msgid "OFF"
 msgstr "â—‹"
@@ -4081,258 +4092,258 @@ msgstr "Vietnamita (VIQR)"
 msgid "X Input Method"
 msgstr "Método de entrada X"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:828
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1038
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:829
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1048
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:829
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1047
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:830
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1057
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:868
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1060
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:869
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1070
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
 msgstr ""
 "Se necesita autenticación para imprimir el documento «%s» en la impresora %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:870
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:871
 #, c-format
 msgid "Authentication is required to print a document on %s"
 msgstr "Se necesita autenticación para imprimir el documento en %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:874
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:875
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
 msgstr "Se necesita autenticación para obtener los atributos del trabajo «%s»"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:876
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:877
 msgid "Authentication is required to get attributes of a job"
 msgstr "Se necesita autenticación para obtener los atributos de un trabajo"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:880
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:881
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
 msgstr ""
 "Se necesita autenticación para obtener los atributos de la impresora %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:882
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:883
 msgid "Authentication is required to get attributes of a printer"
 msgstr "Se necesita autenticación para obtener los atributos de una impresora"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:885
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:886
 #, c-format
 msgid "Authentication is required to get default printer of %s"
 msgstr ""
 "Se necesita autenticación para obtener la impresora predeterminada de %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:888
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:889
 #, c-format
 msgid "Authentication is required to get printers from %s"
 msgstr "Se necesita autenticación para obtener las impresoras de %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:893
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:894
 #, c-format
 msgid "Authentication is required to get a file from %s"
 msgstr "Se necesita autenticación para obtener un archivo de %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:895
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:896
 #, c-format
 msgid "Authentication is required on %s"
 msgstr "Se necesita autenticación en %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1032
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1042
 msgid "Domain:"
 msgstr "Dominio:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1062
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1072
 #, c-format
 msgid "Authentication is required to print document '%s'"
 msgstr "Se necesita autenticación para imprimir el documento «%s»"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1067
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1077
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
 msgstr ""
 "Se necesita autenticación para imprimir este documento en la impresora %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1069
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1079
 msgid "Authentication is required to print this document"
 msgstr "Se necesita autenticación para imprimir este documento"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1690
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1704
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "A la impresora «%s» le queda poco tóner."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1691
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1705
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "A la impresora «%s» no le queda tóner."
 
 #. Translators: "Developer" like on photo development context
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1693
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1707
 #, c-format
 msgid "Printer '%s' is low on developer."
 msgstr "A la impresora «%s» le queda poco revelador."
 
 #. Translators: "Developer" like on photo development context
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1695
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1709
 #, c-format
 msgid "Printer '%s' is out of developer."
 msgstr "A la impresora «%s» no le queda revelador."
 
 #. Translators: "marker" is one color bin of the printer
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1697
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1711
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
 msgstr "A la impresora «%s» le queda poco de, al menos, un cartucho."
 
 #. Translators: "marker" is one color bin of the printer
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1699
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1713
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
 msgstr "A la impresora «%s» no le queda, al menos, un cartucho."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1700
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1714
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "La tapa de la impresora «%s» está abierta."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1701
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1715
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "La puerta de la impresora «%s» está abierta."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1702
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1716
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "La impresora «%s» tiene poco papel."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1703
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1717
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "La impresora «%s» no tiene papel."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1704
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1718
 #, c-format
 msgid "Printer '%s' is currently offline."
 msgstr "La impresora «%s» está actualmente desconectada."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1705
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1719
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "Existe un problema con la impresora «%s»."
 
 #. Translators: this is a printer status.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2019
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2033
 msgid "Paused ; Rejecting Jobs"
 msgstr "Pausado; rechazando trabajos"
 
 #. Translators: this is a printer status.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2025
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2039
 msgid "Rejecting Jobs"
 msgstr "Rechazando trabajos"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2798
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2812
 msgid "Two Sided"
 msgstr "Dos caras"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2799
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2813
 msgid "Paper Type"
 msgstr "Tipo de papel"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2800
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2814
 msgid "Paper Source"
 msgstr "Fuente de papel"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2801
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2815
 msgid "Output Tray"
 msgstr "Bandeja de salida"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2802
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2816
 msgid "Resolution"
 msgstr "Resolución"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2803
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2817
 msgid "GhostScript pre-filtering"
 msgstr "Prefiltrado GhostScript"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2812
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2826
 msgid "One Sided"
 msgstr "Una cara"
 
 #. Translators: this is an option of "Two Sided"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2814
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2828
 msgid "Long Edge (Standard)"
 msgstr "Margen largo (estándar)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2816
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2830
 msgid "Short Edge (Flip)"
 msgstr "Margen corto (girar)"
 
 #. Translators: this is an option of "Paper Source"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2818
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2820
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2828
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2832
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2834
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2842
 msgid "Auto Select"
 msgstr "Autoseleccionar"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2822
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2824
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2826
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2830
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3326
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2836
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2838
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2840
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2844
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3340
 msgid "Printer Default"
 msgstr "Predeterminado de la impresora"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2832
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2846
 msgid "Embed GhostScript fonts only"
 msgstr "Sólo empotrar tipografías GhostScript"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2834
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2848
 msgid "Convert to PS level 1"
 msgstr "Convertir a PS de nivel 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2836
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2850
 msgid "Convert to PS level 2"
 msgstr "Convertir a PS de nivel 2"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2838
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2852
 msgid "No pre-filtering"
 msgstr "Sin prefiltrado"
 
 #. 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:2847
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2861
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Urgent"
 msgstr "Urgente"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "High"
 msgstr "Alta"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Medium"
 msgstr "Media"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Low"
 msgstr "Baja"
 
@@ -4340,21 +4351,21 @@ msgstr "Baja"
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3593
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3607
 msgid "Pages per Sheet"
 msgstr "Páginas por hoja"
 
 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3630
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3644
 msgid "Job Priority"
 msgstr "Prioridad del trabajo"
 
 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3641
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3655
 msgid "Billing Info"
 msgstr "Información de facturación"
 
@@ -4362,45 +4373,45 @@ msgstr "Información de facturación"
 #. Translators, these strings are names for various 'standard' cover
 #. * pages that the printing system may support.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "None"
 msgstr "Ninguna"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Classified"
 msgstr "Clasificado"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Standard"
 msgstr "Estándar"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Top Secret"
 msgstr "Alto secreto"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Unclassified"
 msgstr "Desclasificado"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3691
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3705
 msgid "Before"
 msgstr "Antes"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3706
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3720
 msgid "After"
 msgstr "Después"
 
@@ -4408,14 +4419,14 @@ msgstr "Después"
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3726
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3740
 msgid "Print at"
 msgstr "Imprimir en"
 
 #. 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:3737
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3751
 msgid "Print at time"
 msgstr "Imprimir a la hora"
 
@@ -4423,17 +4434,17 @@ msgstr "Imprimir a la hora"
 #. * size. The two placeholders are replaced with the width and height
 #. * in points. E.g: "Custom 230.4x142.9"
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3772
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3786
 #, c-format
 msgid "Custom %sx%s"
 msgstr "Personalizado %sx%s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3853
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3867
 msgid "Printer Profile"
 msgstr "Perfil de la impresora"
 
 #. TRANSLATORS: this is when color profile information is unavailable
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3860
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3874
 msgid "Unavailable"
 msgstr "No disponible"
 
@@ -4445,13 +4456,11 @@ msgstr "Gestión del color no disponible"
 
 #. TRANSLATORS: when there is no color profile available
 #: ../modules/printbackends/cups/gtkprintercups.c:234
-#| msgid "Not available"
 msgid "No profile available"
 msgstr "No hay un perfil disponible"
 
 #. TRANSLATORS: when the color profile has no title
 #: ../modules/printbackends/cups/gtkprintercups.c:245
-#| msgid "Unspecified error"
 msgid "Unspecified profile"
 msgstr "Perfil no especificado"
 
@@ -4537,23 +4546,17 @@ msgstr "salida-de-prueba.%s"
 msgid "Print to Test Printer"
 msgstr "Imprimir a la impresora de prueba"
 
-#: ../tests/testfilechooser.c:207
-#, c-format
-msgid "Could not get information for file '%s': %s"
-msgstr "No se ha podido obtener información para el archivo «%s» : %s"
+#~ msgid "Could not get information for file '%s': %s"
+#~ msgstr "No se ha podido obtener información para el archivo «%s» : %s"
 
-#: ../tests/testfilechooser.c:222
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "No se ha podido abrir el archivo «%s»: %s"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "No se ha podido abrir el archivo «%s»: %s"
 
-#: ../tests/testfilechooser.c:267
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"No se ha podido cargar la imagen «%s»: el motivo es desconocido, "
-"probablemente el archivo gráfico esté corrupto"
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "No se ha podido cargar la imagen «%s»: el motivo es desconocido, "
+#~ "probablemente el archivo gráfico esté corrupto"
 
 #~ msgid "_Browse for other folders"
 #~ msgstr "_Buscar otras carpetas"
@@ -4586,8 +4589,8 @@ msgstr ""
 
 #~ msgid "different idatas found for symlinked '%s' and '%s'\n"
 #~ msgstr ""
-#~ "se encontraron diferentes idatas para el «%s» enlazado simbólicamente y "
-#~ "«%s»\n"
+#~ "se encontraron diferentes idatas para el «%s» enlazado simbólicamente y «%"
+#~ "s»\n"
 
 #~ msgid "_Add"
 #~ msgstr "_Añadir"
@@ -4699,8 +4702,8 @@ msgstr ""
 #~ "Internal error: Image loader module '%s' failed to complete an operation, "
 #~ "but didn't give a reason for the failure"
 #~ msgstr ""
-#~ "Error interno: El módulo de carga de imágenes «%s» ha fallado al "
-#~ "completar una operación, pero no ha dado ninguna razón del fallo"
+#~ "Error interno: El módulo de carga de imágenes «%s» ha fallado al completar "
+#~ "una operación, pero no ha dado ninguna razón del fallo"
 
 #~ msgid "Incremental loading of image type '%s' is not supported"
 #~ msgstr ""
@@ -4903,8 +4906,8 @@ msgstr ""
 #~ "JPEG quality must be a value between 0 and 100; value '%s' could not be "
 #~ "parsed."
 #~ msgstr ""
-#~ "La calidad de un JPEG debe ser un valor entre 0 y 100; el valor «%s» no "
-#~ "se puede interpretar."
+#~ "La calidad de un JPEG debe ser un valor entre 0 y 100; el valor «%s» no se "
+#~ "puede interpretar."
 
 #~ msgid ""
 #~ "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
@@ -5001,15 +5004,15 @@ msgstr ""
 #~ "PNG compression level must be a value between 0 and 9; value '%s' could "
 #~ "not be parsed."
 #~ msgstr ""
-#~ "El nivel de compresión PNG debe ser un valor entre 0 y 9; el valor «%s» "
-#~ "no se puede interpretar."
+#~ "El nivel de compresión PNG debe ser un valor entre 0 y 9; el valor «%s» no "
+#~ "se puede interpretar."
 
 #~ msgid ""
 #~ "PNG compression level must be a value between 0 and 9; value '%d' is not "
 #~ "allowed."
 #~ msgstr ""
-#~ "El nivel de compresión PNG debe ser un valor entre 0 y 9; el valor «%d» "
-#~ "no está permitido."
+#~ "El nivel de compresión PNG debe ser un valor entre 0 y 9; el valor «%d» no "
+#~ "está permitido."
 
 #~ msgid ""
 #~ "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
diff --git a/po/gl.po b/po/gl.po
index 2ae3c4f3b8..ffc865687a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-master-po-gl-77922___.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-16 13:28+0200\n"
-"PO-Revision-Date: 2011-07-11 00:11+0200\n"
+"POT-Creation-Date: 2011-08-24 21:00+0200\n"
+"PO-Revision-Date: 2011-08-24 21:02+0200\n"
 "Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -577,7 +577,7 @@ msgstr "Alt"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:789
+#: ../gtk/gtkaccellabel.c:805
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -587,7 +587,7 @@ msgstr "Super"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:802
+#: ../gtk/gtkaccellabel.c:818
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Híper"
@@ -597,22 +597,22 @@ msgstr "Híper"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:816
+#: ../gtk/gtkaccellabel.c:832
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"
 
-#: ../gtk/gtkaccellabel.c:832
+#: ../gtk/gtkaccellabel.c:848
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Espazo"
 
-#: ../gtk/gtkaccellabel.c:835
+#: ../gtk/gtkaccellabel.c:851
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Barra invertida"
 
-#: ../gtk/gtkappchooserbutton.c:268
+#: ../gtk/gtkappchooserbutton.c:270
 msgid "Other application..."
 msgstr "Outro aplicativo…"
 
@@ -671,11 +671,12 @@ msgstr ""
 msgid "Forget association"
 msgstr "Esquecer a asociación"
 
-#: ../gtk/gtkappchooserdialog.c:515
+#: ../gtk/gtkappchooserdialog.c:514
 msgid "Show other applications"
 msgstr "Mostrar outros aplicativos"
 
-#: ../gtk/gtkappchooserdialog.c:533
+#: ../gtk/gtkappchooserdialog.c:530 ../gtk/gtkcolorseldialog.c:199
+#: ../gtk/gtkfontchooserdialog.c:138
 msgid "_Select"
 msgstr "_Selección: "
 
@@ -839,7 +840,7 @@ msgctxt "progress bar label"
 msgid "%d %%"
 msgstr "%d %%"
 
-#: ../gtk/gtkcolorbutton.c:187 ../gtk/gtkcolorbutton.c:483
+#: ../gtk/gtkcolorbutton.c:187 ../gtk/gtkcolorbutton.c:485
 msgid "Pick a Color"
 msgstr "Seleccione unha cor"
 
@@ -868,7 +869,7 @@ msgid "Position on the color wheel."
 msgstr "Posición na roda de cores."
 
 #: ../gtk/gtkcolorsel.c:455
-msgid "_Saturation:"
+msgid "S_aturation:"
 msgstr "_Saturación:"
 
 #: ../gtk/gtkcolorsel.c:456
@@ -1112,7 +1113,7 @@ msgstr "Bloq Maiús está activado"
 msgid "Select a File"
 msgstr "Seleccionar un ficheiro"
 
-#: ../gtk/gtkfilechooserbutton.c:106 ../gtk/gtkfilechooserdefault.c:1812
+#: ../gtk/gtkfilechooserbutton.c:106 ../gtk/gtkfilechooserdefault.c:1817
 msgid "Desktop"
 msgstr "Escritorio"
 
@@ -1124,27 +1125,27 @@ msgstr "(Ningún)"
 msgid "Other..."
 msgstr "Outro…"
 
-#: ../gtk/gtkfilechooserdefault.c:148
+#: ../gtk/gtkfilechooserdefault.c:153
 msgid "Type name of new folder"
 msgstr "Escriba o nome do cartafol novo"
 
-#: ../gtk/gtkfilechooserdefault.c:963
+#: ../gtk/gtkfilechooserdefault.c:968
 msgid "Could not retrieve information about the file"
 msgstr "Non foi posíbel recuperar a información sobre o ficheiro"
 
-#: ../gtk/gtkfilechooserdefault.c:974
+#: ../gtk/gtkfilechooserdefault.c:979
 msgid "Could not add a bookmark"
 msgstr "Non foi posíbel engadir un marcador"
 
-#: ../gtk/gtkfilechooserdefault.c:985
+#: ../gtk/gtkfilechooserdefault.c:990
 msgid "Could not remove bookmark"
 msgstr "Non foi posíbel eliminar o marcador"
 
-#: ../gtk/gtkfilechooserdefault.c:996
+#: ../gtk/gtkfilechooserdefault.c:1001
 msgid "The folder could not be created"
 msgstr "Non foi posíbel crear o cartafol"
 
-#: ../gtk/gtkfilechooserdefault.c:1009
+#: ../gtk/gtkfilechooserdefault.c:1014
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1152,16 +1153,16 @@ msgstr ""
 "Non foi posíbel crear o cartafol: xa existe un ficheiro co mesmo nome. Tente "
 "usar un nome diferente para o cartafol ou renomee o ficheiro primeiro."
 
-#: ../gtk/gtkfilechooserdefault.c:1023
+#: ../gtk/gtkfilechooserdefault.c:1028
 msgid "You need to choose a valid filename."
 msgstr "Debe seleccionar un nome de ficheiro válido."
 
-#: ../gtk/gtkfilechooserdefault.c:1026
+#: ../gtk/gtkfilechooserdefault.c:1031
 #, c-format
 msgid "Cannot create a file under %s as it is not a folder"
 msgstr "Non é posíbel crear un ficheiro baixo %s xa que non é un cartafol"
 
-#: ../gtk/gtkfilechooserdefault.c:1038
+#: ../gtk/gtkfilechooserdefault.c:1043
 msgid ""
 "You may only select folders.  The item that you selected is not a folder; "
 "try using a different item."
@@ -1169,11 +1170,11 @@ msgstr ""
 "Debe seleccionar só cartafoles. O elemento que vostede seleccionou non é un "
 "cartafol. Tente usar un elemento diferente."
 
-#: ../gtk/gtkfilechooserdefault.c:1048
+#: ../gtk/gtkfilechooserdefault.c:1053
 msgid "Invalid file name"
 msgstr "O nome do ficheiro é incorrecto"
 
-#: ../gtk/gtkfilechooserdefault.c:1058
+#: ../gtk/gtkfilechooserdefault.c:1063
 msgid "The folder contents could not be displayed"
 msgstr "Non foi posíbel mostrar o contido do cartafol"
 
@@ -1181,201 +1182,205 @@ msgstr "Non foi posíbel mostrar o contido do cartafol"
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: ../gtk/gtkfilechooserdefault.c:1584
+#: ../gtk/gtkfilechooserdefault.c:1589
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 
-#: ../gtk/gtkfilechooserdefault.c:1733
+#: ../gtk/gtkfilechooserdefault.c:1738
 msgid "Search"
 msgstr "Buscar"
 
-#: ../gtk/gtkfilechooserdefault.c:1757 ../gtk/gtkfilechooserdefault.c:4835
+#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4960
 msgid "Recently Used"
 msgstr "Usado recentemente"
 
-#: ../gtk/gtkfilechooserdefault.c:2356
+#: ../gtk/gtkfilechooserdefault.c:2361
 msgid "Select which types of files are shown"
 msgstr "Seleccione que tipos de ficheiros se mostran"
 
-#: ../gtk/gtkfilechooserdefault.c:2715
+#: ../gtk/gtkfilechooserdefault.c:2720
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Engadirlle o cartafol «%s» aos marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:2759
+#: ../gtk/gtkfilechooserdefault.c:2764
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Engadirlle o cartafol actual aos marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:2761
+#: ../gtk/gtkfilechooserdefault.c:2766
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Engadirlle os cartafoles seleccionados aos marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:2799
+#: ../gtk/gtkfilechooserdefault.c:2804
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Eliminar o marcador «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:2801
+#: ../gtk/gtkfilechooserdefault.c:2806
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "O marcador «%s» non pode ser eliminado"
 
-#: ../gtk/gtkfilechooserdefault.c:2808 ../gtk/gtkfilechooserdefault.c:3693
+#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3698
 msgid "Remove the selected bookmark"
 msgstr "Eliminar o marcador seleccionado"
 
-#: ../gtk/gtkfilechooserdefault.c:3372
+#: ../gtk/gtkfilechooserdefault.c:3377
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../gtk/gtkfilechooserdefault.c:3381
+#: ../gtk/gtkfilechooserdefault.c:3386
 msgid "Rename..."
 msgstr "Renomear…"
 
 #. Accessible object name for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3545
+#: ../gtk/gtkfilechooserdefault.c:3550
 msgid "Places"
 msgstr "Lugares"
 
 #. Column header for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3602
+#: ../gtk/gtkfilechooserdefault.c:3607
 msgid "_Places"
 msgstr "_Lugares"
 
-#: ../gtk/gtkfilechooserdefault.c:3681
+#: ../gtk/gtkfilechooserdefault.c:3686
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Engadir o cartafol seleccionado aos marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:3828
+#: ../gtk/gtkfilechooserdefault.c:3925
 msgid "Could not select file"
 msgstr "Non foi posíbel seleccionar o ficheiro"
 
-#: ../gtk/gtkfilechooserdefault.c:4001
+#: ../gtk/gtkfilechooserdefault.c:4116
+msgid "_Copy file's location"
+msgstr "_Copiar a localización do ficheiro"
+
+#: ../gtk/gtkfilechooserdefault.c:4125
 msgid "_Add to Bookmarks"
 msgstr "_Engadir aos marcadores"
 
-#: ../gtk/gtkfilechooserdefault.c:4014
+#: ../gtk/gtkfilechooserdefault.c:4138
 msgid "Show _Hidden Files"
 msgstr "Mostrar os ficheiros _ocultos"
 
-#: ../gtk/gtkfilechooserdefault.c:4021
+#: ../gtk/gtkfilechooserdefault.c:4145
 msgid "Show _Size Column"
 msgstr "Mostrar a columna de _tamaño"
 
-#: ../gtk/gtkfilechooserdefault.c:4248
+#: ../gtk/gtkfilechooserdefault.c:4373
 msgid "Files"
 msgstr "Ficheiros"
 
-#: ../gtk/gtkfilechooserdefault.c:4299
+#: ../gtk/gtkfilechooserdefault.c:4424
 msgid "Name"
 msgstr "Nome"
 
-#: ../gtk/gtkfilechooserdefault.c:4322
+#: ../gtk/gtkfilechooserdefault.c:4447
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../gtk/gtkfilechooserdefault.c:4336
+#: ../gtk/gtkfilechooserdefault.c:4461
 msgid "Modified"
 msgstr "Modificado"
 
 #. Label
-#: ../gtk/gtkfilechooserdefault.c:4431 ../gtk/gtkprinteroptionwidget.c:799
+#: ../gtk/gtkfilechooserdefault.c:4556 ../gtk/gtkprinteroptionwidget.c:799
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../gtk/gtkfilechooserdefault.c:4673
+#: ../gtk/gtkfilechooserdefault.c:4798
 msgid "Type a file name"
 msgstr "Teclee un nome de ficheiro"
 
-#: ../gtk/gtkfilechooserdefault.c:4720 ../gtk/gtkfilechooserdefault.c:4731
+#: ../gtk/gtkfilechooserdefault.c:4845 ../gtk/gtkfilechooserdefault.c:4856
 msgid "Please select a folder below"
 msgstr "Seleccionar un cartafol de embaixo"
 
-#: ../gtk/gtkfilechooserdefault.c:4726
+#: ../gtk/gtkfilechooserdefault.c:4851
 msgid "Please type a file name"
 msgstr "Escriba o nome dun ficheiro"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:4797
+#: ../gtk/gtkfilechooserdefault.c:4922
 msgid "Create Fo_lder"
 msgstr "Crear car_tafol"
 
-#: ../gtk/gtkfilechooserdefault.c:4845
+#: ../gtk/gtkfilechooserdefault.c:4970
 msgid "Search:"
 msgstr "Buscar:"
 
-#: ../gtk/gtkfilechooserdefault.c:4896
+#: ../gtk/gtkfilechooserdefault.c:5021
 msgid "_Location:"
 msgstr "_Localización:"
 
-#: ../gtk/gtkfilechooserdefault.c:5349
+#: ../gtk/gtkfilechooserdefault.c:5474
 msgid "Save in _folder:"
 msgstr "Gardar no _cartafol:"
 
-#: ../gtk/gtkfilechooserdefault.c:5351
+#: ../gtk/gtkfilechooserdefault.c:5476
 msgid "Create in _folder:"
 msgstr "Crear no _cartafol:"
 
-#: ../gtk/gtkfilechooserdefault.c:6445
+#: ../gtk/gtkfilechooserdefault.c:6570
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "Non foi posíbel ler os contidos do %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6449
+#: ../gtk/gtkfilechooserdefault.c:6574
 msgid "Could not read the contents of the folder"
 msgstr "Non foi posíbel ler os contidos do cartafol"
 
-#: ../gtk/gtkfilechooserdefault.c:6542 ../gtk/gtkfilechooserdefault.c:6610
-#: ../gtk/gtkfilechooserdefault.c:6762
+#: ../gtk/gtkfilechooserdefault.c:6667 ../gtk/gtkfilechooserdefault.c:6735
+#: ../gtk/gtkfilechooserdefault.c:6887
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../gtk/gtkfilechooserdefault.c:6557
+#: ../gtk/gtkfilechooserdefault.c:6682
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: ../gtk/gtkfilechooserdefault.c:6559
+#: ../gtk/gtkfilechooserdefault.c:6684
 msgid "Yesterday at %H:%M"
 msgstr "Onte ás %H:%M"
 
-#: ../gtk/gtkfilechooserdefault.c:7234
+#: ../gtk/gtkfilechooserdefault.c:7359
 msgid "Cannot change to folder because it is not local"
 msgstr "Non é posíbel cambiar ao cartafol porque non é local"
 
-#: ../gtk/gtkfilechooserdefault.c:7834 ../gtk/gtkfilechooserdefault.c:7855
+#: ../gtk/gtkfilechooserdefault.c:7959 ../gtk/gtkfilechooserdefault.c:7980
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "O atallo %s xa existe"
 
-#: ../gtk/gtkfilechooserdefault.c:7945
+#: ../gtk/gtkfilechooserdefault.c:8070
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "O atallo %s non existe"
 
-#: ../gtk/gtkfilechooserdefault.c:8191 ../gtk/gtkprintunixdialog.c:550
+#: ../gtk/gtkfilechooserdefault.c:8316 ../gtk/gtkprintunixdialog.c:550
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Xa existe un ficheiro con nome «%s». Quere substituílo?"
 
-#: ../gtk/gtkfilechooserdefault.c:8194 ../gtk/gtkprintunixdialog.c:554
+#: ../gtk/gtkfilechooserdefault.c:8319 ../gtk/gtkprintunixdialog.c:554
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "O ficheiro xa existe en «%s». Se o substitúe sobrescribirá os seus contidos."
 
-#: ../gtk/gtkfilechooserdefault.c:8199 ../gtk/gtkprintunixdialog.c:561
+#: ../gtk/gtkfilechooserdefault.c:8324 ../gtk/gtkprintunixdialog.c:561
 msgid "_Replace"
 msgstr "_Substituír"
 
-#: ../gtk/gtkfilechooserdefault.c:9005
+#: ../gtk/gtkfilechooserdefault.c:9130
 msgid "Could not start the search process"
 msgstr "Non foi posíbel iniciar o proceso de busca"
 
-#: ../gtk/gtkfilechooserdefault.c:9006
+#: ../gtk/gtkfilechooserdefault.c:9131
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
@@ -1383,11 +1388,11 @@ msgstr ""
 "O programa non puido crear unha conexión co daemon indexador.  Asegúrese de "
 "que está en execución."
 
-#: ../gtk/gtkfilechooserdefault.c:9020
+#: ../gtk/gtkfilechooserdefault.c:9145
 msgid "Could not send the search request"
 msgstr "Non foi posíbel enviar a solicitude de busca"
 
-#: ../gtk/gtkfilechooserdefault.c:9646
+#: ../gtk/gtkfilechooserdefault.c:9771
 #, c-format
 msgid "Could not mount %s"
 msgstr "Non foi posíbel montar %s"
@@ -1473,6 +1478,14 @@ msgstr "Sans 12"
 msgid "Font"
 msgstr "Tipo de letra"
 
+#: ../gtk/gtkfontchooser.c:670
+msgid "Search font name"
+msgstr "Buscar nome de tipo de letra"
+
+#: ../gtk/gtkfontchooserdialog.c:147 ../gtk/gtkfontsel.c:1738
+msgid "Font Selection"
+msgstr "Selección do tipo de letra"
+
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
 #: ../gtk/gtkfontsel.c:125
@@ -1496,10 +1509,6 @@ msgstr "_Tamaño:"
 msgid "_Preview:"
 msgstr "_Previsualización:"
 
-#: ../gtk/gtkfontsel.c:1738
-msgid "Font Selection"
-msgstr "Selección do tipo de letra"
-
 #: ../gtk/gtkicontheme.c:1605
 #, c-format
 msgid "Icon '%s' not present in theme"
@@ -1530,12 +1539,12 @@ msgid "System (%s)"
 msgstr "Sistema (%s)"
 
 #. Open Link
-#: ../gtk/gtklabel.c:6308
+#: ../gtk/gtklabel.c:6293
 msgid "_Open Link"
 msgstr "_Abrir a ligazón"
 
 #. Copy Link Address
-#: ../gtk/gtklabel.c:6320
+#: ../gtk/gtklabel.c:6305
 msgid "Copy _Link Address"
 msgstr "Copiar o enderezo da _ligazón"
 
@@ -4535,23 +4544,17 @@ msgstr "saída-de-proba.%s"
 msgid "Print to Test Printer"
 msgstr "Imprimir para probar a impresora"
 
-#: ../tests/testfilechooser.c:207
-#, c-format
-msgid "Could not get information for file '%s': %s"
-msgstr "Non foi posíbel obter información para o ficheiro «%s»: %s"
+#~ msgid "Could not get information for file '%s': %s"
+#~ msgstr "Non foi posíbel obter información para o ficheiro «%s»: %s"
 
-#: ../tests/testfilechooser.c:222
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Produciuse un fallo ao abrir o ficheiro «%s»: %s"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Produciuse un fallo ao abrir o ficheiro «%s»: %s"
 
-#: ../tests/testfilechooser.c:267
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Produciuse un fallo ao cargar a imaxe «%s»: o motivo é descoñecido, é "
-"probábel que o ficheiro de imaxe estea corrupto"
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Produciuse un fallo ao cargar a imaxe «%s»: o motivo é descoñecido, é "
+#~ "probábel que o ficheiro de imaxe estea corrupto"
 
 #~ msgid "_Browse for other folders"
 #~ msgstr "_Buscar outros cartafoles"
diff --git a/po/nb.po b/po/nb.po
index 33fa27a0f5..f457e7cfbb 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.92.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-12 12:44+0200\n"
-"PO-Revision-Date: 2011-07-12 12:45+0200\n"
+"POT-Creation-Date: 2011-08-24 18:53+0200\n"
+"PO-Revision-Date: 2011-08-24 18:53+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "Language: nn\n"
@@ -533,7 +533,7 @@ msgstr "Grafikk av"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:156
+#: ../gtk/gtkaccellabel.c:158
 msgctxt "keyboard label"
 msgid "Shift"
 msgstr "Shift"
@@ -543,7 +543,7 @@ msgstr "Shift"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:162
+#: ../gtk/gtkaccellabel.c:164
 msgctxt "keyboard label"
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -553,7 +553,7 @@ msgstr "Ctrl"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:168
+#: ../gtk/gtkaccellabel.c:170
 msgctxt "keyboard label"
 msgid "Alt"
 msgstr "Alt"
@@ -563,7 +563,7 @@ msgstr "Alt"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:787
+#: ../gtk/gtkaccellabel.c:805
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -573,7 +573,7 @@ msgstr "Super"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:800
+#: ../gtk/gtkaccellabel.c:818
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Hyper"
@@ -583,22 +583,22 @@ msgstr "Hyper"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: ../gtk/gtkaccellabel.c:814
+#: ../gtk/gtkaccellabel.c:832
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"
 
-#: ../gtk/gtkaccellabel.c:830
+#: ../gtk/gtkaccellabel.c:848
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Mellomrom"
 
-#: ../gtk/gtkaccellabel.c:833
+#: ../gtk/gtkaccellabel.c:851
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Backslash"
 
-#: ../gtk/gtkappchooserbutton.c:268
+#: ../gtk/gtkappchooserbutton.c:270
 msgid "Other application..."
 msgstr "Annet program..."
 
@@ -657,11 +657,12 @@ msgstr ""
 msgid "Forget association"
 msgstr "Glem kobling"
 
-#: ../gtk/gtkappchooserdialog.c:515
+#: ../gtk/gtkappchooserdialog.c:514
 msgid "Show other applications"
 msgstr "Vis andre programmer"
 
-#: ../gtk/gtkappchooserdialog.c:533
+#: ../gtk/gtkappchooserdialog.c:530 ../gtk/gtkcolorseldialog.c:199
+#: ../gtk/gtkfontchooserdialog.c:138
 msgid "_Select"
 msgstr "Vel_g"
 
@@ -681,15 +682,15 @@ msgstr "Relaterte programmer"
 msgid "Other Applications"
 msgstr "Andre programmer"
 
-#: ../gtk/gtkassistant.c:1000
+#: ../gtk/gtkassistant.c:999
 msgid "C_ontinue"
 msgstr "F_ortsett"
 
-#: ../gtk/gtkassistant.c:1003
+#: ../gtk/gtkassistant.c:1002
 msgid "Go _Back"
 msgstr "GÃ¥ til_bake"
 
-#: ../gtk/gtkassistant.c:1007
+#: ../gtk/gtkassistant.c:1006
 msgid "_Finish"
 msgstr "_Fullfør"
 
@@ -723,7 +724,7 @@ msgstr "Uhåndtert tag «%s»"
 #. * text direction of RTL and specify "calendar:YM", then the year
 #. * will appear to the right of the month.
 #.
-#: ../gtk/gtkcalendar.c:874
+#: ../gtk/gtkcalendar.c:873
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -731,7 +732,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: ../gtk/gtkcalendar.c:912
+#: ../gtk/gtkcalendar.c:911
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -740,7 +741,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: ../gtk/gtkcalendar.c:1913
+#: ../gtk/gtkcalendar.c:1912
 msgctxt "year measurement template"
 msgid "2000"
 msgstr "2000"
@@ -755,7 +756,7 @@ msgstr "2000"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: ../gtk/gtkcalendar.c:1944 ../gtk/gtkcalendar.c:2641
+#: ../gtk/gtkcalendar.c:1943 ../gtk/gtkcalendar.c:2640
 #, c-format
 msgctxt "calendar:day:digits"
 msgid "%d"
@@ -771,7 +772,7 @@ msgstr "%d"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: ../gtk/gtkcalendar.c:1976 ../gtk/gtkcalendar.c:2502
+#: ../gtk/gtkcalendar.c:1975 ../gtk/gtkcalendar.c:2501
 #, c-format
 msgctxt "calendar:week:digits"
 msgid "%d"
@@ -787,7 +788,7 @@ msgstr "%d"
 #. *
 #. * "%Y" is appropriate for most locales.
 #.
-#: ../gtk/gtkcalendar.c:2271
+#: ../gtk/gtkcalendar.c:2270
 msgctxt "calendar year format"
 msgid "%Y"
 msgstr "%Y"
@@ -823,7 +824,7 @@ msgctxt "progress bar label"
 msgid "%d %%"
 msgstr "%d %%"
 
-#: ../gtk/gtkcolorbutton.c:187 ../gtk/gtkcolorbutton.c:483
+#: ../gtk/gtkcolorbutton.c:187 ../gtk/gtkcolorbutton.c:485
 msgid "Pick a Color"
 msgstr "Velg en farge"
 
@@ -852,7 +853,7 @@ msgid "Position on the color wheel."
 msgstr "Posisjon på fargehjulet."
 
 #: ../gtk/gtkcolorsel.c:455
-msgid "_Saturation:"
+msgid "S_aturation:"
 msgstr "_Metning:"
 
 #: ../gtk/gtkcolorsel.c:456
@@ -960,7 +961,7 @@ msgstr ""
 "endre denne oppføringen drar du en fargeprøve hit eller høyreklikk den og "
 "velg «Lagre farge her.»"
 
-#: ../gtk/gtkcolorseldialog.c:213
+#: ../gtk/gtkcolorseldialog.c:217
 msgid "Color Selection"
 msgstr "Fargevalg"
 
@@ -1028,23 +1029,23 @@ msgstr "Høy_re:"
 msgid "Paper Margins"
 msgstr "Papirmarger"
 
-#: ../gtk/gtkentry.c:8949 ../gtk/gtktextview.c:8277
+#: ../gtk/gtkentry.c:8956 ../gtk/gtktextview.c:8277
 msgid "Input _Methods"
 msgstr "Inndata_metoder"
 
-#: ../gtk/gtkentry.c:8963 ../gtk/gtktextview.c:8291
+#: ../gtk/gtkentry.c:8970 ../gtk/gtktextview.c:8291
 msgid "_Insert Unicode Control Character"
 msgstr "Sett _inn Unicode kontrolltegn"
 
-#: ../gtk/gtkentry.c:10434
+#: ../gtk/gtkentry.c:10441
 msgid "Caps Lock and Num Lock are on"
 msgstr "Caps Lock og Num Lock er på"
 
-#: ../gtk/gtkentry.c:10436
+#: ../gtk/gtkentry.c:10443
 msgid "Num Lock is on"
 msgstr "Num Lock er på"
 
-#: ../gtk/gtkentry.c:10438
+#: ../gtk/gtkentry.c:10445
 msgid "Caps Lock is on"
 msgstr "Caps Lock er på"
 
@@ -1093,7 +1094,7 @@ msgstr "Caps Lock er på"
 msgid "Select a File"
 msgstr "Velg en fil"
 
-#: ../gtk/gtkfilechooserbutton.c:106 ../gtk/gtkfilechooserdefault.c:1809
+#: ../gtk/gtkfilechooserbutton.c:106 ../gtk/gtkfilechooserdefault.c:1817
 msgid "Desktop"
 msgstr "Skrivebord"
 
@@ -1105,27 +1106,27 @@ msgstr "(Ingen)"
 msgid "Other..."
 msgstr "Annet …"
 
-#: ../gtk/gtkfilechooserdefault.c:148
+#: ../gtk/gtkfilechooserdefault.c:153
 msgid "Type name of new folder"
 msgstr "Skriv inn navn på ny mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:960
+#: ../gtk/gtkfilechooserdefault.c:968
 msgid "Could not retrieve information about the file"
 msgstr "Klarte ikke å hente informasjon om filen"
 
-#: ../gtk/gtkfilechooserdefault.c:971
+#: ../gtk/gtkfilechooserdefault.c:979
 msgid "Could not add a bookmark"
 msgstr "Klarte ikke å legge til bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:982
+#: ../gtk/gtkfilechooserdefault.c:990
 msgid "Could not remove bookmark"
 msgstr "Klarte ikke å fjerne bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:993
+#: ../gtk/gtkfilechooserdefault.c:1001
 msgid "The folder could not be created"
 msgstr "Klarte ikke å lage mappen"
 
-#: ../gtk/gtkfilechooserdefault.c:1006
+#: ../gtk/gtkfilechooserdefault.c:1014
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1133,16 +1134,16 @@ msgstr ""
 "Klarte ikke å lage mappen på grunn av at det allerede eksisterer en fil med "
 "samme navn. Bruk et annet navn for mappen eller gi et nytt navn til filen."
 
-#: ../gtk/gtkfilechooserdefault.c:1020
+#: ../gtk/gtkfilechooserdefault.c:1028
 msgid "You need to choose a valid filename."
 msgstr "Du må velge et gyldig filnavn."
 
-#: ../gtk/gtkfilechooserdefault.c:1023
+#: ../gtk/gtkfilechooserdefault.c:1031
 #, c-format
 msgid "Cannot create a file under %s as it is not a folder"
 msgstr "Kan ikke lage en fil under %s fordi den ikke er en mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:1035
+#: ../gtk/gtkfilechooserdefault.c:1043
 msgid ""
 "You may only select folders.  The item that you selected is not a folder; "
 "try using a different item."
@@ -1150,11 +1151,11 @@ msgstr ""
 "Du kan kun velge mapper. Oppføringen du valgte er ikke en mappe. Prøv å "
 "bruke en annen oppføring."
 
-#: ../gtk/gtkfilechooserdefault.c:1045
+#: ../gtk/gtkfilechooserdefault.c:1053
 msgid "Invalid file name"
 msgstr "Ugyldig filnavn"
 
-#: ../gtk/gtkfilechooserdefault.c:1055
+#: ../gtk/gtkfilechooserdefault.c:1063
 msgid "The folder contents could not be displayed"
 msgstr "Mappeinholdet kunne ikke vises"
 
@@ -1162,186 +1163,190 @@ msgstr "Mappeinholdet kunne ikke vises"
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: ../gtk/gtkfilechooserdefault.c:1581
+#: ../gtk/gtkfilechooserdefault.c:1589
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
-#: ../gtk/gtkfilechooserdefault.c:1730
+#: ../gtk/gtkfilechooserdefault.c:1738
 msgid "Search"
 msgstr "Søk"
 
-#: ../gtk/gtkfilechooserdefault.c:1754 ../gtk/gtkfilechooserdefault.c:4871
+#: ../gtk/gtkfilechooserdefault.c:1762 ../gtk/gtkfilechooserdefault.c:4960
 msgid "Recently Used"
 msgstr "Sist brukt"
 
-#: ../gtk/gtkfilechooserdefault.c:2353
+#: ../gtk/gtkfilechooserdefault.c:2361
 msgid "Select which types of files are shown"
 msgstr "Velg hvilke filtyper som skal vises"
 
-#: ../gtk/gtkfilechooserdefault.c:2712
+#: ../gtk/gtkfilechooserdefault.c:2720
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Legg til mappe «%s» i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2756
+#: ../gtk/gtkfilechooserdefault.c:2764
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Legg til aktiv mappe i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2758
+#: ../gtk/gtkfilechooserdefault.c:2766
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Legg til valgte mapper i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:2796
+#: ../gtk/gtkfilechooserdefault.c:2804
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Fjern bokmerke «%s»"
 
-#: ../gtk/gtkfilechooserdefault.c:2798
+#: ../gtk/gtkfilechooserdefault.c:2806
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "Bokmerke «%s» kan ikke fjernes"
 
-#: ../gtk/gtkfilechooserdefault.c:2805 ../gtk/gtkfilechooserdefault.c:3690
+#: ../gtk/gtkfilechooserdefault.c:2813 ../gtk/gtkfilechooserdefault.c:3698
 msgid "Remove the selected bookmark"
 msgstr "Fjern valgt bokmerke"
 
-#: ../gtk/gtkfilechooserdefault.c:3369
+#: ../gtk/gtkfilechooserdefault.c:3377
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../gtk/gtkfilechooserdefault.c:3378
+#: ../gtk/gtkfilechooserdefault.c:3386
 msgid "Rename..."
 msgstr "Gi nytt navn …"
 
 #. Accessible object name for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3542
+#: ../gtk/gtkfilechooserdefault.c:3550
 msgid "Places"
 msgstr "Steder"
 
 #. Column header for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3599
+#: ../gtk/gtkfilechooserdefault.c:3607
 msgid "_Places"
 msgstr "_Steder"
 
-#: ../gtk/gtkfilechooserdefault.c:3678
+#: ../gtk/gtkfilechooserdefault.c:3686
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Legg til valgt mappe i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:3825
+#: ../gtk/gtkfilechooserdefault.c:3925
 msgid "Could not select file"
 msgstr "Klarte ikke å merke filen"
 
-#: ../gtk/gtkfilechooserdefault.c:3998
+#: ../gtk/gtkfilechooserdefault.c:4116
+msgid "_Copy file's location"
+msgstr "_Kopier filens lokasjon"
+
+#: ../gtk/gtkfilechooserdefault.c:4125
 msgid "_Add to Bookmarks"
 msgstr "L_egg til i bokmerker"
 
-#: ../gtk/gtkfilechooserdefault.c:4011
+#: ../gtk/gtkfilechooserdefault.c:4138
 msgid "Show _Hidden Files"
 msgstr "Vis sk_julte filer"
 
-#: ../gtk/gtkfilechooserdefault.c:4018
+#: ../gtk/gtkfilechooserdefault.c:4145
 msgid "Show _Size Column"
 msgstr "Vis kolonne for _størrelse"
 
-#: ../gtk/gtkfilechooserdefault.c:4243
+#: ../gtk/gtkfilechooserdefault.c:4373
 msgid "Files"
 msgstr "Filer"
 
-#: ../gtk/gtkfilechooserdefault.c:4294
+#: ../gtk/gtkfilechooserdefault.c:4424
 msgid "Name"
 msgstr "Navn"
 
-#: ../gtk/gtkfilechooserdefault.c:4317
+#: ../gtk/gtkfilechooserdefault.c:4447
 msgid "Size"
 msgstr "Størrelse"
 
-#: ../gtk/gtkfilechooserdefault.c:4331
+#: ../gtk/gtkfilechooserdefault.c:4461
 msgid "Modified"
 msgstr "Endret"
 
 #. Label
-#: ../gtk/gtkfilechooserdefault.c:4412 ../gtk/gtkprinteroptionwidget.c:799
+#: ../gtk/gtkfilechooserdefault.c:4556 ../gtk/gtkprinteroptionwidget.c:799
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: ../gtk/gtkfilechooserdefault.c:4709
+#: ../gtk/gtkfilechooserdefault.c:4798
 msgid "Type a file name"
 msgstr "Skriv et filnavn"
 
-#: ../gtk/gtkfilechooserdefault.c:4756 ../gtk/gtkfilechooserdefault.c:4767
+#: ../gtk/gtkfilechooserdefault.c:4845 ../gtk/gtkfilechooserdefault.c:4856
 msgid "Please select a folder below"
 msgstr "Velg en mappe under"
 
-#: ../gtk/gtkfilechooserdefault.c:4762
+#: ../gtk/gtkfilechooserdefault.c:4851
 msgid "Please type a file name"
 msgstr "Skriv et filnavn"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:4833
+#: ../gtk/gtkfilechooserdefault.c:4922
 msgid "Create Fo_lder"
 msgstr "Opprett _mappe"
 
-#: ../gtk/gtkfilechooserdefault.c:4881
+#: ../gtk/gtkfilechooserdefault.c:4970
 msgid "Search:"
 msgstr "Søk:"
 
-#: ../gtk/gtkfilechooserdefault.c:4928
+#: ../gtk/gtkfilechooserdefault.c:5021
 msgid "_Location:"
 msgstr "_Adresse:"
 
-#: ../gtk/gtkfilechooserdefault.c:5245
+#: ../gtk/gtkfilechooserdefault.c:5474
 msgid "Save in _folder:"
 msgstr "Lagre i _mappe:"
 
-#: ../gtk/gtkfilechooserdefault.c:5247
+#: ../gtk/gtkfilechooserdefault.c:5476
 msgid "Create in _folder:"
 msgstr "Opprett i _mappe:"
 
-#: ../gtk/gtkfilechooserdefault.c:6341
+#: ../gtk/gtkfilechooserdefault.c:6570
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "Klarte ikke å lese innholdet av %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6345
+#: ../gtk/gtkfilechooserdefault.c:6574
 msgid "Could not read the contents of the folder"
 msgstr "Klarte ikke å lese innholdet i mappen"
 
-#: ../gtk/gtkfilechooserdefault.c:6438 ../gtk/gtkfilechooserdefault.c:6506
-#: ../gtk/gtkfilechooserdefault.c:6658
+#: ../gtk/gtkfilechooserdefault.c:6667 ../gtk/gtkfilechooserdefault.c:6735
+#: ../gtk/gtkfilechooserdefault.c:6887
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../gtk/gtkfilechooserdefault.c:6453
+#: ../gtk/gtkfilechooserdefault.c:6682
 msgid "%H:%M"
 msgstr "%H.%M"
 
-#: ../gtk/gtkfilechooserdefault.c:6455
+#: ../gtk/gtkfilechooserdefault.c:6684
 msgid "Yesterday at %H:%M"
 msgstr "I går kl. %H.%M"
 
-#: ../gtk/gtkfilechooserdefault.c:7140
+#: ../gtk/gtkfilechooserdefault.c:7359
 msgid "Cannot change to folder because it is not local"
 msgstr "Kan ikke gå til mappen fordi den ikke er lokal"
 
-#: ../gtk/gtkfilechooserdefault.c:7740 ../gtk/gtkfilechooserdefault.c:7761
+#: ../gtk/gtkfilechooserdefault.c:7959 ../gtk/gtkfilechooserdefault.c:7980
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "Snarvei %s eksisterer allerede"
 
-#: ../gtk/gtkfilechooserdefault.c:7851
+#: ../gtk/gtkfilechooserdefault.c:8070
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Snarvei %s eksisterer ikke"
 
-#: ../gtk/gtkfilechooserdefault.c:8097 ../gtk/gtkprintunixdialog.c:550
+#: ../gtk/gtkfilechooserdefault.c:8316 ../gtk/gtkprintunixdialog.c:550
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "En fil med navn «%s» eksisterer allerede. Vil du erstatte den?"
 
-#: ../gtk/gtkfilechooserdefault.c:8100 ../gtk/gtkprintunixdialog.c:554
+#: ../gtk/gtkfilechooserdefault.c:8319 ../gtk/gtkprintunixdialog.c:554
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
@@ -1349,15 +1354,15 @@ msgstr ""
 "Fila eksisterer allerede i «%s». Hvis du erstatter denne vil du overskrive "
 "innholdet."
 
-#: ../gtk/gtkfilechooserdefault.c:8105 ../gtk/gtkprintunixdialog.c:561
+#: ../gtk/gtkfilechooserdefault.c:8324 ../gtk/gtkprintunixdialog.c:561
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../gtk/gtkfilechooserdefault.c:8858
+#: ../gtk/gtkfilechooserdefault.c:9130
 msgid "Could not start the search process"
 msgstr "Klarte ikke å starte søkeprosessen"
 
-#: ../gtk/gtkfilechooserdefault.c:8859
+#: ../gtk/gtkfilechooserdefault.c:9131
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
@@ -1365,11 +1370,11 @@ msgstr ""
 "Programmet kunne ikke opprette en tilkobling til indekseringstjenesten. "
 "Sjekk at denne kjører."
 
-#: ../gtk/gtkfilechooserdefault.c:8873
+#: ../gtk/gtkfilechooserdefault.c:9145
 msgid "Could not send the search request"
 msgstr "Klarte ikke å sende søkeforespørselen"
 
-#: ../gtk/gtkfilechooserdefault.c:9665
+#: ../gtk/gtkfilechooserdefault.c:9771
 #, c-format
 msgid "Could not mount %s"
 msgstr "Klarte ikke å montere %s"
@@ -1442,46 +1447,50 @@ msgstr "Stien eksisterer ikke"
 msgid "File System"
 msgstr "Filsystem"
 
-#: ../gtk/gtkfontbutton.c:153 ../gtk/gtkfontbutton.c:277
+#: ../gtk/gtkfontbutton.c:152 ../gtk/gtkfontbutton.c:276
 msgid "Pick a Font"
 msgstr "Velg en skrift"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:271
+#: ../gtk/gtkfontbutton.c:270
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:796
+#: ../gtk/gtkfontbutton.c:787
 msgid "Font"
 msgstr "Skrift"
 
+#: ../gtk/gtkfontchooser.c:670
+msgid "Search font name"
+msgstr "Søk etter navn på skrift"
+
+#: ../gtk/gtkfontchooserdialog.c:147 ../gtk/gtkfontsel.c:1738
+msgid "Font Selection"
+msgstr "Valg av skrift"
+
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:119
+#: ../gtk/gtkfontsel.c:125
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdefghijk ABCDEFGHIJK"
 
-#: ../gtk/gtkfontsel.c:388
+#: ../gtk/gtkfontsel.c:394
 msgid "_Family:"
 msgstr "_Familie:"
 
-#: ../gtk/gtkfontsel.c:395
+#: ../gtk/gtkfontsel.c:401
 msgid "_Style:"
 msgstr "_Stil:"
 
-#: ../gtk/gtkfontsel.c:402
+#: ../gtk/gtkfontsel.c:408
 msgid "Si_ze:"
 msgstr "St_ørrelse:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:579
+#: ../gtk/gtkfontsel.c:585
 msgid "_Preview:"
 msgstr "_Forhåndsvisning:"
 
-#: ../gtk/gtkfontsel.c:1701
-msgid "Font Selection"
-msgstr "Valg av skrift"
-
 #: ../gtk/gtkicontheme.c:1605
 #, c-format
 msgid "Icon '%s' not present in theme"
@@ -1512,12 +1521,12 @@ msgid "System (%s)"
 msgstr "System (%s)"
 
 #. Open Link
-#: ../gtk/gtklabel.c:6309
+#: ../gtk/gtklabel.c:6293
 msgid "_Open Link"
 msgstr "_Ã…pne lenke"
 
 #. Copy Link Address
-#: ../gtk/gtklabel.c:6321
+#: ../gtk/gtklabel.c:6305
 msgid "Copy _Link Address"
 msgstr "Kopier _lenkas adresse"
 
@@ -1689,7 +1698,7 @@ msgstr "Z Shell"
 msgid "Cannot end process with PID %d: %s"
 msgstr "Kan ikke avslutte prosess med PID %d: %s"
 
-#: ../gtk/gtknotebook.c:4922 ../gtk/gtknotebook.c:7611
+#: ../gtk/gtknotebook.c:4902 ../gtk/gtknotebook.c:7587
 #, c-format
 msgid "Page %u"
 msgstr "Side %u"
@@ -1874,7 +1883,7 @@ msgstr "Tom for papir"
 
 #. Translators: this is a printer status.
 #: ../gtk/gtkprintoperation-win32.c:615
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2022
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2036
 msgid "Paused"
 msgstr "Pause"
 
@@ -2001,42 +2010,42 @@ msgstr "Generelt"
 #. * multiple pages on a sheet when printing
 #.
 #: ../gtk/gtkprintunixdialog.c:3109
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3572
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3586
 msgid "Left to right, top to bottom"
 msgstr "Venstre til høyre, topp til bunn"
 
 #: ../gtk/gtkprintunixdialog.c:3109
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3572
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3586
 msgid "Left to right, bottom to top"
 msgstr "Venstre til høyre, bunn til topp"
 
 #: ../gtk/gtkprintunixdialog.c:3110
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3573
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3587
 msgid "Right to left, top to bottom"
 msgstr "Høyre til venstre, topp til bunn"
 
 #: ../gtk/gtkprintunixdialog.c:3110
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3573
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3587
 msgid "Right to left, bottom to top"
 msgstr "Høyre til venstre, bunn til topp"
 
 #: ../gtk/gtkprintunixdialog.c:3111
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3574
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3588
 msgid "Top to bottom, left to right"
 msgstr "Topp til bunn, venstre til høyre"
 
 #: ../gtk/gtkprintunixdialog.c:3111
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3574
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3588
 msgid "Top to bottom, right to left"
 msgstr "Topp til bunn, høyre til venstre"
 
 #: ../gtk/gtkprintunixdialog.c:3112
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3575
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3589
 msgid "Bottom to top, left to right"
 msgstr "Bunn til topp, venstre til høyre"
 
 #: ../gtk/gtkprintunixdialog.c:3112
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3575
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3589
 msgid "Bottom to top, right to left"
 msgstr "Bunn til topp, høyre til venstre"
 
@@ -2044,7 +2053,7 @@ msgstr "Bunn til topp, høyre til venstre"
 #. * dialog that controls in what order multiple pages are arranged
 #.
 #: ../gtk/gtkprintunixdialog.c:3116 ../gtk/gtkprintunixdialog.c:3129
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3609
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3623
 msgid "Page Ordering"
 msgstr "Siderekkefølge"
 
@@ -2849,7 +2858,7 @@ msgstr "Zoom _ut"
 #. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
 #. * the state
 #.
-#: ../gtk/gtkswitch.c:336 ../gtk/gtkswitch.c:396 ../gtk/gtkswitch.c:603
+#: ../gtk/gtkswitch.c:335 ../gtk/gtkswitch.c:395 ../gtk/gtkswitch.c:602
 msgctxt "switch"
 msgid "ON"
 msgstr "PÃ…"
@@ -2857,7 +2866,7 @@ msgstr "PÃ…"
 #. Translators: if the "off" state label requires more than three
 #. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
 #.
-#: ../gtk/gtkswitch.c:344 ../gtk/gtkswitch.c:397 ../gtk/gtkswitch.c:632
+#: ../gtk/gtkswitch.c:343 ../gtk/gtkswitch.c:396 ../gtk/gtkswitch.c:631
 msgctxt "switch"
 msgid "OFF"
 msgstr "AV"
@@ -4058,254 +4067,254 @@ msgstr "Vietnamesisk (VIQR)"
 msgid "X Input Method"
 msgstr "X-inndatametode"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:828
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1038
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:829
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1048
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:829
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1047
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:830
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1057
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:868
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1060
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:869
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1070
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
 msgstr "Autentisering kreves for å skrive ut dokument «%s» på skriver %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:870
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:871
 #, c-format
 msgid "Authentication is required to print a document on %s"
 msgstr "Autentisering kreves for å skrive ut et dokument på %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:874
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:875
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
 msgstr "Autentisering kreves for å hente attributter for jobb «%s»"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:876
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:877
 msgid "Authentication is required to get attributes of a job"
 msgstr "Autentisering kreves for å hente attributter for en jobb"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:880
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:881
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
 msgstr "Autentisering kreves for å hente attributter for skriver %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:882
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:883
 msgid "Authentication is required to get attributes of a printer"
 msgstr "Autentisering kreves for å hente attributter for en skriver"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:885
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:886
 #, c-format
 msgid "Authentication is required to get default printer of %s"
 msgstr "Autentisering kreves for å hente forvalgt skriver for %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:888
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:889
 #, c-format
 msgid "Authentication is required to get printers from %s"
 msgstr "Autentisering kreves for å hente skrivere fra %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:893
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:894
 #, c-format
 msgid "Authentication is required to get a file from %s"
 msgstr "Autentisering kreves for å hente en fil fra %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:895
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:896
 #, c-format
 msgid "Authentication is required on %s"
 msgstr "Autentisering kreves på %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1032
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1042
 msgid "Domain:"
 msgstr "Domene:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1062
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1072
 #, c-format
 msgid "Authentication is required to print document '%s'"
 msgstr "Autentisering kreves for å skrive ut dokument «%s»"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1067
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1077
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
 msgstr "Autentisering kreves for å skrive ut dette dokumentet på skriver %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1069
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1079
 msgid "Authentication is required to print this document"
 msgstr "Autentisering kreves for å skrive ut dette dokumentet"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1690
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1704
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "Skriver «%s» har lite toner."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1691
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1705
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "Skriver «%s» er tom for toner."
 
 #. Translators: "Developer" like on photo development context
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1693
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1707
 #, c-format
 msgid "Printer '%s' is low on developer."
 msgstr "Skriver «%s» har lite framkallingsmiddel."
 
 #. Translators: "Developer" like on photo development context
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1695
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1709
 #, c-format
 msgid "Printer '%s' is out of developer."
 msgstr "Skriver «%s» er tom for framkallingsmiddel."
 
 #. Translators: "marker" is one color bin of the printer
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1697
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1711
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
 msgstr "Skriver «%s» har minst en tonerkassett som snart er tom."
 
 #. Translators: "marker" is one color bin of the printer
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1699
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1713
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
 msgstr "Skriver «%s» har minst en tom tonerkassett."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1700
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1714
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "Lokket er åpent på skriver «%s»."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1701
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1715
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "Døren er åpen på skriver «%s»."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1702
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1716
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "Skriver «%s» har lite papir."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1703
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1717
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "Skriver «%s» er tom for papir."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1704
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1718
 #, c-format
 msgid "Printer '%s' is currently offline."
 msgstr "Skriver «%s» er frakoblet for tiden."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1705
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1719
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "Det er et problem med skriver «%s»."
 
 #. Translators: this is a printer status.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2019
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2033
 msgid "Paused ; Rejecting Jobs"
 msgstr "Satt på pause. Avviser jobber"
 
 #. Translators: this is a printer status.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2025
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2039
 msgid "Rejecting Jobs"
 msgstr "Avviser jobber"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2798
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2812
 msgid "Two Sided"
 msgstr "Tosidig"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2799
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2813
 msgid "Paper Type"
 msgstr "Papirtype"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2800
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2814
 msgid "Paper Source"
 msgstr "Papirkilde"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2801
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2815
 msgid "Output Tray"
 msgstr "Utskuff"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2802
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2816
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2803
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2817
 msgid "GhostScript pre-filtering"
 msgstr "Forhåndsfiltrering med GhostScript"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2812
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2826
 msgid "One Sided"
 msgstr "Ensidig"
 
 #. Translators: this is an option of "Two Sided"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2814
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2828
 msgid "Long Edge (Standard)"
 msgstr "Lang kant (standard)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2816
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2830
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (vend)"
 
 #. Translators: this is an option of "Paper Source"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2818
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2820
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2828
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2832
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2834
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2842
 msgid "Auto Select"
 msgstr "Velg automatisk"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2822
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2824
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2826
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2830
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3326
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2836
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2838
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2840
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2844
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3340
 msgid "Printer Default"
 msgstr "Forvalg for skriver"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2832
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2846
 msgid "Embed GhostScript fonts only"
 msgstr "Bygg kun inn GhostScript-skrifter"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2834
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2848
 msgid "Convert to PS level 1"
 msgstr "Konverter til PS nivå 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2836
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2850
 msgid "Convert to PS level 2"
 msgstr "Konverter til PS nivå 2"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2838
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2852
 msgid "No pre-filtering"
 msgstr "Ingen forhåndsfiltrering"
 
 #. 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:2847
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2861
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Urgent"
 msgstr "Haster"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "High"
 msgstr "Høy"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Medium"
 msgstr "Middels"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Low"
 msgstr "Lav"
 
@@ -4313,66 +4322,66 @@ msgstr "Lav"
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3593
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3607
 msgid "Pages per Sheet"
 msgstr "Sider per ark"
 
 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3630
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3644
 msgid "Job Priority"
 msgstr "Prioritet for jobb"
 
 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3641
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3655
 msgid "Billing Info"
 msgstr "Faktureringsinformasjon:"
 
 #. Translators, these strings are names for various 'standard' cover
 #. * pages that the printing system may support.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Classified"
 msgstr "Klassifisert"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Secret"
 msgstr "Hemmelig"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Standard"
 msgstr "Vanlig"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Top Secret"
 msgstr "Topphemmelig"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Unclassified"
 msgstr "Ikke klassifisert"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3691
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3705
 msgid "Before"
 msgstr "Før"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3706
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3720
 msgid "After"
 msgstr "Etter"
 
@@ -4380,14 +4389,14 @@ msgstr "Etter"
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3726
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3740
 msgid "Print at"
 msgstr "Tidspunkt for utskrift"
 
 #. 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:3737
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3751
 msgid "Print at time"
 msgstr "Tidspunkt for utskrift"
 
@@ -4395,17 +4404,17 @@ msgstr "Tidspunkt for utskrift"
 #. * size. The two placeholders are replaced with the width and height
 #. * in points. E.g: "Custom 230.4x142.9"
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3772
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3786
 #, c-format
 msgid "Custom %sx%s"
 msgstr "Egendefinert %s×%s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3853
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3867
 msgid "Printer Profile"
 msgstr "Skriverprofil"
 
 #. TRANSLATORS: this is when color profile information is unavailable
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3860
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3874
 msgid "Unavailable"
 msgstr "Ikke tilgjengelig"
 
@@ -4506,21 +4515,3 @@ msgstr "testutfil.%s"
 #: ../modules/printbackends/test/gtkprintbackendtest.c:467
 msgid "Print to Test Printer"
 msgstr "Skriv ut til testskriver"
-
-#: ../tests/testfilechooser.c:207
-#, c-format
-msgid "Could not get information for file '%s': %s"
-msgstr "Klarte ikke å hente informasjon for fil «%s»: %s"
-
-#: ../tests/testfilechooser.c:222
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Klarte ikke å åpne fil «%s»: %s"
-
-#: ../tests/testfilechooser.c:267
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Feil under lasting av bilde «%s»: årsak ikke kjent, sannsynligvis korrupt "
-"bildefil"
diff --git a/po/sr.po b/po/sr.po
index 6ba80e7243..2ee7f1594b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,326 +1,457 @@
 # Serbian translation of gtk
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006, 2007.
-#
 # This file is distributed under the same license as the gtk package.
-#
 # Maintainer: Данило Шеган <dsegan@gmx.net>
 # Reviewed on 2004-02-19 by: Данило Шеган <dsegan@gmx.net>
 # Reviewed on 2005-07-08 by: Данило Шеган <dsegan@gmx.net>
 # Милош Поповић <gpopac@gmail.com>, 2010.
-#
+# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 15:41-0400\n"
-"PO-Revision-Date: 2010-08-26 14:33+0200\n"
-"Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%"
+"2b&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-08-23 14:18+0000\n"
+"PO-Revision-Date: 2011-05-30 11:44+0200\n"
+"Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: Serbian (sr)\n"
 "Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
+"X-Generator: Virtaal 0.5.2\n"
 
-#: gdk/gdk.c:103
+#: ../gdk/gdk.c:135
 #, c-format
 msgid "Error parsing option --gdk-debug"
-msgstr "Грешка у обради опције --gdk-debug"
+msgstr "Грешка у обради опције „--gdk-debug“"
 
-#: gdk/gdk.c:123
+#: ../gdk/gdk.c:155
 #, c-format
 msgid "Error parsing option --gdk-no-debug"
-msgstr "Грешка у обради опције --gdk-no-debug"
+msgstr "Грешка у обради опције „--gdk-no-debug“"
 
 #. Description of --class=CLASS in --help output
-#: gdk/gdk.c:151
+#: ../gdk/gdk.c:183
 msgid "Program class as used by the window manager"
 msgstr "Кла�а програма коју кори�ти управљач прозора"
 
 #. Placeholder in --class=CLASS in --help output
-#: gdk/gdk.c:152
+#: ../gdk/gdk.c:184
 msgid "CLASS"
 msgstr "КЛ�С�"
 
 #. Description of --name=NAME in --help output
-#: gdk/gdk.c:154
+#: ../gdk/gdk.c:186
 msgid "Program name as used by the window manager"
 msgstr "Име програма како га приказује управљач прозора"
 
 #. Placeholder in --name=NAME in --help output
-#: gdk/gdk.c:155
+#: ../gdk/gdk.c:187
 msgid "NAME"
 msgstr "ИМЕ"
 
 #. Description of --display=DISPLAY in --help output
-#: gdk/gdk.c:157
+#: ../gdk/gdk.c:189
 msgid "X display to use"
-msgstr "Ик� приказ који кори�тити"
+msgstr "Ик� приказ за коришћење"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: gdk/gdk.c:158
+#: ../gdk/gdk.c:190
 msgid "DISPLAY"
 msgstr "ПРИК�З"
 
-#. Description of --screen=SCREEN in --help output
-#: gdk/gdk.c:160
-msgid "X screen to use"
-msgstr "Ик� екран који да кори�ти"
-
-#. Placeholder in --screen=SCREEN in --help output
-#: gdk/gdk.c:161
-msgid "SCREEN"
-msgstr "ЕКР��"
-
 #. Description of --gdk-debug=FLAGS in --help output
-#: gdk/gdk.c:164
-#, fuzzy
+#: ../gdk/gdk.c:193
 msgid "GDK debugging flags to set"
-msgstr "Које Гтк+ опције за налажење грешака укључити"
+msgstr "ГДК за�тавице за отклањање грешака за по�тављање"
 
 #. Placeholder in --gdk-debug=FLAGS in --help output
 #. 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:165 gdk/gdk.c:168 gtk/gtkmain.c:533 gtk/gtkmain.c:536
+#: ../gdk/gdk.c:194 ../gdk/gdk.c:197 ../gtk/gtkmain.c:569 ../gtk/gtkmain.c:572
 msgid "FLAGS"
 msgstr "ОПЦИЈЕ"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: gdk/gdk.c:167
-#, fuzzy
+#: ../gdk/gdk.c:196
 msgid "GDK debugging flags to unset"
-msgstr "Које Гтк+ опције за налажење грешака и�кључити"
+msgstr "ГДК за�тавице за отклањање грешака за уклањање"
 
-#: gdk/keyname-table.h:3940
+#.
+#. * Translators, the strings in the 'keyboard label' context are
+#. * display names for keyboard keys. Some of them have prefixes like
+#. * XF86 or ISO_ - these should be removed in the translation. Similarly,
+#. * underscores should be replaced by spaces. The prefix 'KP_' stands
+#. * for 'key pad' and you may want to include that in your translation.
+#. * Here are some examples of English translations:
+#. * XF86AudioMute - Audio mute
+#. * Scroll_lock   - Scroll lock
+#. * KP_Space      - Space (keypad)
+#.
+#: ../gdk/keyname-table.h:3951
 msgctxt "keyboard label"
 msgid "BackSpace"
 msgstr "BackSpace"
 
-#: gdk/keyname-table.h:3941
+#: ../gdk/keyname-table.h:3952
 msgctxt "keyboard label"
 msgid "Tab"
 msgstr "Tab"
 
-#: gdk/keyname-table.h:3942
+#: ../gdk/keyname-table.h:3953
 msgctxt "keyboard label"
 msgid "Return"
 msgstr "Return"
 
-#: gdk/keyname-table.h:3943
+#: ../gdk/keyname-table.h:3954
 msgctxt "keyboard label"
 msgid "Pause"
 msgstr "Pause"
 
-#: gdk/keyname-table.h:3944
+#: ../gdk/keyname-table.h:3955
 msgctxt "keyboard label"
 msgid "Scroll_Lock"
 msgstr "Scroll_Lock"
 
-#: gdk/keyname-table.h:3945
+#: ../gdk/keyname-table.h:3956
 msgctxt "keyboard label"
 msgid "Sys_Req"
 msgstr "Sys_Req"
 
-#: gdk/keyname-table.h:3946
+#: ../gdk/keyname-table.h:3957
 msgctxt "keyboard label"
 msgid "Escape"
 msgstr "Escape"
 
-#: gdk/keyname-table.h:3947
+#: ../gdk/keyname-table.h:3958
 msgctxt "keyboard label"
 msgid "Multi_key"
 msgstr "Вишефункциј�ки та�тер"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: gdk/keyname-table.h:3948
+#: ../gdk/keyname-table.h:3959
 msgctxt "keyboard label"
 msgid "Home"
 msgstr "Лично"
 
-#: gdk/keyname-table.h:3949
+#: ../gdk/keyname-table.h:3960
 msgctxt "keyboard label"
 msgid "Left"
 msgstr "Лево"
 
-#: gdk/keyname-table.h:3950
+#: ../gdk/keyname-table.h:3961
 msgctxt "keyboard label"
 msgid "Up"
 msgstr "Горе"
 
-#: gdk/keyname-table.h:3951
+#: ../gdk/keyname-table.h:3962
 msgctxt "keyboard label"
 msgid "Right"
 msgstr "Де�но"
 
-#: gdk/keyname-table.h:3952
+#: ../gdk/keyname-table.h:3963
 msgctxt "keyboard label"
 msgid "Down"
 msgstr "Доле"
 
-#: gdk/keyname-table.h:3953
+#: ../gdk/keyname-table.h:3964
 msgctxt "keyboard label"
 msgid "Page_Up"
 msgstr "Page_Up"
 
-#: gdk/keyname-table.h:3954
+#: ../gdk/keyname-table.h:3965
 msgctxt "keyboard label"
 msgid "Page_Down"
 msgstr "Page_Down"
 
-#: gdk/keyname-table.h:3955
+#: ../gdk/keyname-table.h:3966
 msgctxt "keyboard label"
 msgid "End"
 msgstr "End"
 
-#: gdk/keyname-table.h:3956
+#: ../gdk/keyname-table.h:3967
 msgctxt "keyboard label"
 msgid "Begin"
 msgstr "Begin"
 
-#: gdk/keyname-table.h:3957
+#: ../gdk/keyname-table.h:3968
 msgctxt "keyboard label"
 msgid "Print"
 msgstr "Штампај"
 
-#: gdk/keyname-table.h:3958
+#: ../gdk/keyname-table.h:3969
 msgctxt "keyboard label"
 msgid "Insert"
 msgstr "Insert"
 
-#: gdk/keyname-table.h:3959
+#: ../gdk/keyname-table.h:3970
 msgctxt "keyboard label"
 msgid "Num_Lock"
 msgstr "Num_Lock"
 
-#: gdk/keyname-table.h:3960
+#. Translators: KP_ means 'key pad' here
+#: ../gdk/keyname-table.h:3972
 msgctxt "keyboard label"
 msgid "KP_Space"
 msgstr "KP_Space"
 
-#: gdk/keyname-table.h:3961
+#: ../gdk/keyname-table.h:3973
 msgctxt "keyboard label"
 msgid "KP_Tab"
 msgstr "KP_Tab"
 
-#: gdk/keyname-table.h:3962
+#: ../gdk/keyname-table.h:3974
 msgctxt "keyboard label"
 msgid "KP_Enter"
 msgstr "KP_Enter"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: gdk/keyname-table.h:3963
+#: ../gdk/keyname-table.h:3975
 msgctxt "keyboard label"
 msgid "KP_Home"
 msgstr "KP_Home"
 
-#: gdk/keyname-table.h:3964
+#: ../gdk/keyname-table.h:3976
 msgctxt "keyboard label"
 msgid "KP_Left"
 msgstr "KP_Лево"
 
-#: gdk/keyname-table.h:3965
+#: ../gdk/keyname-table.h:3977
 msgctxt "keyboard label"
 msgid "KP_Up"
 msgstr "KP_Горе"
 
-#: gdk/keyname-table.h:3966
+#: ../gdk/keyname-table.h:3978
 msgctxt "keyboard label"
 msgid "KP_Right"
 msgstr "KP_Де�но"
 
-#: gdk/keyname-table.h:3967
+#: ../gdk/keyname-table.h:3979
 msgctxt "keyboard label"
 msgid "KP_Down"
 msgstr "KP_Доле"
 
-#: gdk/keyname-table.h:3968
+#: ../gdk/keyname-table.h:3980
 msgctxt "keyboard label"
 msgid "KP_Page_Up"
 msgstr "KP_Page_Up"
 
-#: gdk/keyname-table.h:3969
+#: ../gdk/keyname-table.h:3981
 msgctxt "keyboard label"
 msgid "KP_Prior"
 msgstr "KP_Prior"
 
-#: gdk/keyname-table.h:3970
+#: ../gdk/keyname-table.h:3982
 msgctxt "keyboard label"
 msgid "KP_Page_Down"
 msgstr "KP_Page_Down"
 
-#: gdk/keyname-table.h:3971
+#: ../gdk/keyname-table.h:3983
 msgctxt "keyboard label"
 msgid "KP_Next"
 msgstr "KP_Next"
 
-#: gdk/keyname-table.h:3972
+#: ../gdk/keyname-table.h:3984
 msgctxt "keyboard label"
 msgid "KP_End"
 msgstr "KP_End"
 
-#: gdk/keyname-table.h:3973
+#: ../gdk/keyname-table.h:3985
 msgctxt "keyboard label"
 msgid "KP_Begin"
 msgstr "KP_Begin"
 
-#: gdk/keyname-table.h:3974
+#: ../gdk/keyname-table.h:3986
 msgctxt "keyboard label"
 msgid "KP_Insert"
 msgstr "KP_Insert"
 
-#: gdk/keyname-table.h:3975
+#: ../gdk/keyname-table.h:3987
 msgctxt "keyboard label"
 msgid "KP_Delete"
 msgstr "KP_Delete"
 
-#: gdk/keyname-table.h:3976
+#: ../gdk/keyname-table.h:3988
 msgctxt "keyboard label"
 msgid "Delete"
 msgstr "Delete"
 
+#. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
+#: ../gdk/keyname-table.h:3990
+msgctxt "keyboard label"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86МонПовећајО�ветљено�т"
+
+#: ../gdk/keyname-table.h:3991
+msgctxt "keyboard label"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86МонСмањиО�ветљено�т"
+
+#: ../gdk/keyname-table.h:3992
+msgctxt "keyboard label"
+msgid "XF86AudioMute"
+msgstr "XF86И�кључи�удио"
+
+#: ../gdk/keyname-table.h:3993
+msgctxt "keyboard label"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86Утишај�удио"
+
+#: ../gdk/keyname-table.h:3994
+msgctxt "keyboard label"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86Појачај�удио"
+
+#: ../gdk/keyname-table.h:3995
+msgctxt "keyboard label"
+msgid "XF86AudioPlay"
+msgstr "XF86Пу�ти�удио"
+
+#: ../gdk/keyname-table.h:3996
+msgctxt "keyboard label"
+msgid "XF86AudioStop"
+msgstr "XF86Зау�тави�удио"
+
+#: ../gdk/keyname-table.h:3997
+msgctxt "keyboard label"
+msgid "XF86AudioNext"
+msgstr "XF86Следеће"
+
+#: ../gdk/keyname-table.h:3998
+msgctxt "keyboard label"
+msgid "XF86AudioPrev"
+msgstr "XF86Претходно"
+
+#: ../gdk/keyname-table.h:3999
+msgctxt "keyboard label"
+msgid "XF86AudioRecord"
+msgstr "XF86Снимај"
+
+#: ../gdk/keyname-table.h:4000
+msgctxt "keyboard label"
+msgid "XF86AudioPause"
+msgstr "XF86Паузирај"
+
+#: ../gdk/keyname-table.h:4001
+msgctxt "keyboard label"
+msgid "XF86AudioRewind"
+msgstr "XF86Премотај"
+
+#: ../gdk/keyname-table.h:4002
+msgctxt "keyboard label"
+msgid "XF86AudioMedia"
+msgstr "XF86�удиоМедиј"
+
+#: ../gdk/keyname-table.h:4003
+msgctxt "keyboard label"
+msgid "XF86ScreenSaver"
+msgstr "XF86ЧуварЕкрана"
+
+#: ../gdk/keyname-table.h:4004
+msgctxt "keyboard label"
+msgid "XF86Battery"
+msgstr "XF86Батерија"
+
+#: ../gdk/keyname-table.h:4005
+msgctxt "keyboard label"
+msgid "XF86Launch1"
+msgstr "XF86Покрени1"
+
+#: ../gdk/keyname-table.h:4006
+msgctxt "keyboard label"
+msgid "XF86Forward"
+msgstr "XF86�апред"
+
+#: ../gdk/keyname-table.h:4007
+msgctxt "keyboard label"
+msgid "XF86Back"
+msgstr "XF86�азад"
+
+#: ../gdk/keyname-table.h:4008
+msgctxt "keyboard label"
+msgid "XF86Sleep"
+msgstr "XF86Спавај"
+
+#: ../gdk/keyname-table.h:4009
+msgctxt "keyboard label"
+msgid "XF86Hibernate"
+msgstr "XF86Замрзни"
+
+#: ../gdk/keyname-table.h:4010
+msgctxt "keyboard label"
+msgid "XF86WLAN"
+msgstr "XF86Бежична"
+
+#: ../gdk/keyname-table.h:4011
+msgctxt "keyboard label"
+msgid "XF86WebCam"
+msgstr "XF86ВебКамерица"
+
+#: ../gdk/keyname-table.h:4012
+msgctxt "keyboard label"
+msgid "XF86Display"
+msgstr "XF86Прикажи"
+
+#: ../gdk/keyname-table.h:4013
+msgctxt "keyboard label"
+msgid "XF86TouchpadToggle"
+msgstr "XF86ПребацивачДодирне табле"
+
+#: ../gdk/keyname-table.h:4014
+msgctxt "keyboard label"
+msgid "XF86WakeUp"
+msgstr "XF86Пробуди �е"
+
+#: ../gdk/keyname-table.h:4015
+msgctxt "keyboard label"
+msgid "XF86Suspend"
+msgstr "XF86Обу�тави"
+
 #. Description of --sync in --help output
-#: gdk/win32/gdkmain-win32.c:54
+#: ../gdk/win32/gdkmain-win32.c:55
 msgid "Don't batch GDI requests"
-msgstr "�е �пајај ГДИ захтеве"
+msgstr "�е групише ГДИ захтеве"
 
 #. Description of --no-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:56
+#: ../gdk/win32/gdkmain-win32.c:57
 msgid "Don't use the Wintab API for tablet support"
-msgstr "�е кори�ти Wintab �ПИ за подршку таблета"
+msgstr "�е кори�ти Винтаб �ПИ за подршку таблета"
 
 #. Description of --ignore-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:58
+#: ../gdk/win32/gdkmain-win32.c:59
 msgid "Same as --no-wintab"
-msgstr "И�то што и --no-wintab"
+msgstr "И�то што и „--no-wintab“"
 
 #. Description of --use-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:60
+#: ../gdk/win32/gdkmain-win32.c:61
 msgid "Do use the Wintab API [default]"
-msgstr "�е кори�ти Wintab �ПИ [подразумевано]"
+msgstr "Кори�ти Винтаб �ПИ [подразумевано]"
 
 #. Description of --max-colors=COLORS in --help output
-#: gdk/win32/gdkmain-win32.c:62
+#: ../gdk/win32/gdkmain-win32.c:63
 msgid "Size of the palette in 8 bit mode"
 msgstr "Величина палете у 8-битном режиму"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: gdk/win32/gdkmain-win32.c:63
+#: ../gdk/win32/gdkmain-win32.c:64
 msgid "COLORS"
 msgstr "БОЈЕ"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:312
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:294
 #, c-format
 msgid "Starting %s"
-msgstr "Покрећем %s"
+msgstr "Покрећем „%s“"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:316
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:307
 #, c-format
 msgid "Opening %s"
 msgstr "Отварам „%s“"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:321
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:312
 #, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
@@ -329,64 +460,81 @@ msgstr[1] "Отварам %d �тавке"
 msgstr[2] "Отварам %d �тавки"
 msgstr[3] "Отварам �тавку"
 
-#. Description of --sync in --help output
-#: gdk/x11/gdkmain-x11.c:96
-msgid "Make X calls synchronous"
-msgstr "Учини Ик� позиве �инхроним"
+#: ../gtk/a11y/gtkspinneraccessible.c:42
+msgctxt "throbbing progress animation widget"
+msgid "Spinner"
+msgstr "Вртешка"
+
+#: ../gtk/a11y/gtkspinneraccessible.c:43
+msgid "Provides visual indication of progress"
+msgstr "Обезбеђује видљив приказ напретка неке радње"
+
+#: ../gtk/a11y/gtkswitchaccessible.c:65
+msgctxt "light switch widget"
+msgid "Switch"
+msgstr "Прекидач"
+
+#: ../gtk/a11y/gtkswitchaccessible.c:66
+msgid "Switches between on and off states"
+msgstr "Пребацује �а укљученог на и�кључено и обратно"
 
 #. Translators: this is the license preamble; the string at the end
 #. * contains the URL of the license.
 #.
-#: gtk/gtkaboutdialog.c:101
+#: ../gtk/gtkaboutdialog.c:103
 #, c-format
-msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s"
+msgid ""
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit <a href="
+"\"%s\">%s</a>"
 msgstr ""
-"Овај програм �е и�поручује без икакве гаранције! За више података по�етите %s"
+"Овај програм �е и�поручује БЕЗ ИК�КВЕ Г�Р��ЦИЈЕ! За више података по�етите "
+"<a href=„%s“>%s</a>"
 
-#: gtk/gtkaboutdialog.c:339 gtk/gtkaboutdialog.c:2235
+#: ../gtk/gtkaboutdialog.c:345
 msgid "License"
 msgstr "Лиценца"
 
-#: gtk/gtkaboutdialog.c:340
+#: ../gtk/gtkaboutdialog.c:346
 msgid "The license of the program"
 msgstr "Лиценца програма"
 
 #. Add the credits button
-#: gtk/gtkaboutdialog.c:621
+#: ../gtk/gtkaboutdialog.c:738
 msgid "C_redits"
 msgstr "_За�луге"
 
 #. Add the license button
-#: gtk/gtkaboutdialog.c:635
+#: ../gtk/gtkaboutdialog.c:751
 msgid "_License"
 msgstr "_Лиценца"
 
-#: gtk/gtkaboutdialog.c:839
+#: ../gtk/gtkaboutdialog.c:956
 msgid "Could not show link"
 msgstr "�е могу да прикажем везу"
 
-#: gtk/gtkaboutdialog.c:932
+# ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
+#: ../gtk/gtkaboutdialog.c:993
+msgid "Homepage"
+msgstr "Лично"
+
+#: ../gtk/gtkaboutdialog.c:1047
 #, c-format
 msgid "About %s"
-msgstr "О %s"
-
-#: gtk/gtkaboutdialog.c:2153
-msgid "Credits"
-msgstr "За�луге"
+msgstr "О програму: %s"
 
-#: gtk/gtkaboutdialog.c:2185
-msgid "Written by"
+#: ../gtk/gtkaboutdialog.c:2371
+msgid "Created by"
 msgstr "�утори"
 
-#: gtk/gtkaboutdialog.c:2188
+#: ../gtk/gtkaboutdialog.c:2374
 msgid "Documented by"
 msgstr "Документација"
 
-#: gtk/gtkaboutdialog.c:2200
+#: ../gtk/gtkaboutdialog.c:2384
 msgid "Translated by"
 msgstr "Превод"
 
-#: gtk/gtkaboutdialog.c:2204
+#: ../gtk/gtkaboutdialog.c:2389
 msgid "Artwork by"
 msgstr "Графика"
 
@@ -395,7 +543,7 @@ msgstr "Графика"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:160
+#: ../gtk/gtkaccellabel.c:158
 msgctxt "keyboard label"
 msgid "Shift"
 msgstr "Shift"
@@ -405,7 +553,7 @@ msgstr "Shift"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:166
+#: ../gtk/gtkaccellabel.c:164
 msgctxt "keyboard label"
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -415,7 +563,7 @@ msgstr "Ctrl"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:172
+#: ../gtk/gtkaccellabel.c:170
 msgctxt "keyboard label"
 msgid "Alt"
 msgstr "Alt"
@@ -425,7 +573,7 @@ msgstr "Alt"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:770
+#: ../gtk/gtkaccellabel.c:789
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -435,7 +583,7 @@ msgstr "Super"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:783
+#: ../gtk/gtkaccellabel.c:802
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Hyper"
@@ -445,37 +593,141 @@ msgstr "Hyper"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:797
+#: ../gtk/gtkaccellabel.c:816
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"
 
-#: gtk/gtkaccellabel.c:813
+#: ../gtk/gtkaccellabel.c:832
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Размак"
 
-#: gtk/gtkaccellabel.c:816
+#: ../gtk/gtkaccellabel.c:835
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Контра ко�а црта"
 
-#: gtk/gtkbuilderparser.c:343
+#: ../gtk/gtkappchooserbutton.c:268
+msgid "Other application..."
+msgstr "Други програм..."
+
+#: ../gtk/gtkappchooserdialog.c:130
+msgid "Failed to look for applications online"
+msgstr "�и�ам у�пео да потражим програме на мрежи"
+
+#: ../gtk/gtkappchooserdialog.c:171
+msgid "Find applications online"
+msgstr "�алази програме на мрежи"
+
+#: ../gtk/gtkappchooserdialog.c:221
+msgid "Could not run application"
+msgstr "�е могу да покренем програм"
+
+#: ../gtk/gtkappchooserdialog.c:234
+#, c-format
+msgid "Could not find '%s'"
+msgstr "�е могу да пронађем „%s“"
+
+#: ../gtk/gtkappchooserdialog.c:237
+msgid "Could not find application"
+msgstr "�е могу да пронађем програм"
+
+#. Translators: %s is a filename
+#: ../gtk/gtkappchooserdialog.c:355
+#, c-format
+msgid "Select an application to open \"%s\""
+msgstr "Изаберите програм којим ћете отворити „%s“"
+
+#: ../gtk/gtkappchooserdialog.c:356 ../gtk/gtkappchooserwidget.c:643
+#, c-format
+msgid "No applications available to open \"%s\""
+msgstr "�ема до�тупних програма за отварање „%s“"
+
+#. Translators: %s is a file type description
+#: ../gtk/gtkappchooserdialog.c:362
+#, c-format
+msgid "Select an application for \"%s\" files"
+msgstr "Изаберите програм за „%s“ датотеке"
+
+#: ../gtk/gtkappchooserdialog.c:364
+#, c-format
+msgid "No applications available to open \"%s\" files"
+msgstr "�ема до�тупних програма за отварање „%s“ датотека"
+
+#: ../gtk/gtkappchooserdialog.c:380
+msgid ""
+"Click \"Show other applications\", for more options, or \"Find applications "
+"online\" to install a new application"
+msgstr ""
+"Кликните на „Прикажи о�тале програме“, за више опција, или „�ађи програме на "
+"мрежи“ да ин�талирате нови програм"
+
+#: ../gtk/gtkappchooserdialog.c:450
+msgid "Forget association"
+msgstr "Заборави удружења"
+
+#: ../gtk/gtkappchooserdialog.c:515
+msgid "Show other applications"
+msgstr "Прикажи о�тале програме"
+
+#: ../gtk/gtkappchooserdialog.c:533 ../gtk/gtkcolorseldialog.c:199
+msgid "_Select"
+msgstr "_Изабери"
+
+#: ../gtk/gtkappchooserwidget.c:592
+msgid "Default Application"
+msgstr "О�новни програм"
+
+#: ../gtk/gtkappchooserwidget.c:730
+msgid "Recommended Applications"
+msgstr "Препоручени програми"
+
+#: ../gtk/gtkappchooserwidget.c:745
+msgid "Related Applications"
+msgstr "Повезани програми"
+
+#: ../gtk/gtkappchooserwidget.c:759
+msgid "Other Applications"
+msgstr "О�тали програми"
+
+#: ../gtk/gtkassistant.c:999
+#, fuzzy
+#| msgctxt "Stock label"
+#| msgid "C_onnect"
+msgid "C_ontinue"
+msgstr "У�по�тави ве_зу"
+
+#: ../gtk/gtkassistant.c:1002
+#, fuzzy
+#| msgctxt "Stock label, navigation"
+#| msgid "_Back"
+msgid "Go _Back"
+msgstr "_�азад"
+
+#: ../gtk/gtkassistant.c:1006
+#, fuzzy
+#| msgctxt "print operation status"
+#| msgid "Finished"
+msgid "_Finish"
+msgstr "Завршено"
+
+#: ../gtk/gtkbuilderparser.c:342
 #, c-format
 msgid "Invalid type function on line %d: '%s'"
 msgstr "�еи�правна функција типа у реду %d: „%s“"
 
-#: gtk/gtkbuilderparser.c:407
-#, fuzzy, c-format
+#: ../gtk/gtkbuilderparser.c:406
+#, c-format
 msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
-msgstr "Дупликат ИД објекта „%s“ у реду %d (претходно у реду %d)"
+msgstr "Дупликат ИД објекта „%s“ у %d° реду (претходно у %d° реду)"
 
-#: gtk/gtkbuilderparser.c:859
+#: ../gtk/gtkbuilderparser.c:858
 #, c-format
 msgid "Invalid root element: '%s'"
 msgstr "�еи�праван елемент корена: „%s“"
 
-#: gtk/gtkbuilderparser.c:898
+#: ../gtk/gtkbuilderparser.c:897
 #, c-format
 msgid "Unhandled tag: '%s'"
 msgstr "�еподржана ознака: „%s“"
@@ -490,7 +742,7 @@ msgstr "�еподржана ознака: „%s“"
 #. * text direction of RTL and specify "calendar:YM", then the year
 #. * will appear to the right of the month.
 #.
-#: gtk/gtkcalendar.c:883
+#: ../gtk/gtkcalendar.c:873
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -498,7 +750,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: gtk/gtkcalendar.c:921
+#: ../gtk/gtkcalendar.c:911
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -507,7 +759,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: gtk/gtkcalendar.c:2006
+#: ../gtk/gtkcalendar.c:1912
 msgctxt "year measurement template"
 msgid "2000"
 msgstr "2000"
@@ -522,7 +774,7 @@ msgstr "2000"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: gtk/gtkcalendar.c:2037 gtk/gtkcalendar.c:2719
+#: ../gtk/gtkcalendar.c:1943 ../gtk/gtkcalendar.c:2640
 #, c-format
 msgctxt "calendar:day:digits"
 msgid "%d"
@@ -538,7 +790,7 @@ msgstr "%Id"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: gtk/gtkcalendar.c:2069 gtk/gtkcalendar.c:2579
+#: ../gtk/gtkcalendar.c:1975 ../gtk/gtkcalendar.c:2501
 #, c-format
 msgctxt "calendar:week:digits"
 msgid "%d"
@@ -554,7 +806,7 @@ msgstr "%Id"
 #. *
 #. * "%Y" is appropriate for most locales.
 #.
-#: gtk/gtkcalendar.c:2361
+#: ../gtk/gtkcalendar.c:2270
 msgctxt "calendar year format"
 msgid "%Y"
 msgstr "%Y"
@@ -562,43 +814,39 @@ msgstr "%Y"
 #. This label is displayed in a treeview cell displaying
 #. * a disabled accelerator key combination.
 #.
-#: gtk/gtkcellrendereraccel.c:272
+#: ../gtk/gtkcellrendereraccel.c:286
 msgctxt "Accelerator"
 msgid "Disabled"
-msgstr "И�кључено"
+msgstr "И�кључена"
 
 #. This label is displayed in a treeview cell displaying
 #. * an accelerator key combination that is not valid according
 #. * to gtk_accelerator_valid().
 #.
-#: gtk/gtkcellrendereraccel.c:282
+#: ../gtk/gtkcellrendereraccel.c:296
 msgctxt "Accelerator"
 msgid "Invalid"
-msgstr "�еи�праван"
+msgstr "�еи�правна"
 
 #. This label is displayed in a treeview cell displaying
 #. * an accelerator when the cell is clicked to change the
 #. * acelerator.
 #.
-#: gtk/gtkcellrendereraccel.c:418 gtk/gtkcellrendereraccel.c:675
+#: ../gtk/gtkcellrendereraccel.c:432 ../gtk/gtkcellrendereraccel.c:745
 msgid "New accelerator..."
 msgstr "�ова пречица..."
 
-#: gtk/gtkcellrendererprogress.c:362 gtk/gtkcellrendererprogress.c:452
+#: ../gtk/gtkcellrendererprogress.c:374 ../gtk/gtkcellrendererprogress.c:464
 #, c-format
 msgctxt "progress bar label"
 msgid "%d %%"
 msgstr "%d %%"
 
-#: gtk/gtkcolorbutton.c:176 gtk/gtkcolorbutton.c:445
+#: ../gtk/gtkcolorbutton.c:187 ../gtk/gtkcolorbutton.c:483
 msgid "Pick a Color"
 msgstr "Изаберите боју"
 
-#: gtk/gtkcolorbutton.c:336
-msgid "Received invalid color data\n"
-msgstr "Примио је неи�правне податке о бојама\n"
-
-#: gtk/gtkcolorsel.c:384
+#: ../gtk/gtkcolorsel.c:416
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -606,7 +854,7 @@ msgstr ""
 "Изаберите боју коју желите из �пољног пр�тена. Изаберите о�ветљено�т или "
 "затамњено�т те боје помоћу унутрашњег пр�тена."
 
-#: gtk/gtkcolorsel.c:408
+#: ../gtk/gtkcolorsel.c:442
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -614,85 +862,87 @@ msgstr ""
 "Кликните на капало, а затим кликните на боју било где на вашем екрану да је "
 "изаберете."
 
-#: gtk/gtkcolorsel.c:417
+#: ../gtk/gtkcolorsel.c:452
 msgid "_Hue:"
 msgstr "_�ијан�а:"
 
-#: gtk/gtkcolorsel.c:418
+#: ../gtk/gtkcolorsel.c:453
 msgid "Position on the color wheel."
 msgstr "Положај на точку боја."
 
-#: gtk/gtkcolorsel.c:420
-msgid "_Saturation:"
+#: ../gtk/gtkcolorsel.c:455
+#, fuzzy
+#| msgid "_Saturation:"
+msgid "S_aturation:"
 msgstr "_За�ићено�т:"
 
-#: gtk/gtkcolorsel.c:421
+#: ../gtk/gtkcolorsel.c:456
 msgid "Intensity of the color."
 msgstr "За�ићено�т боје."
 
-#: gtk/gtkcolorsel.c:422
+#: ../gtk/gtkcolorsel.c:457
 msgid "_Value:"
 msgstr "_Вредно�т:"
 
 # Mozda "vedrina boje"?
-#: gtk/gtkcolorsel.c:423
+#: ../gtk/gtkcolorsel.c:458
 msgid "Brightness of the color."
 msgstr "О�ветљено�т боје."
 
-#: gtk/gtkcolorsel.c:424
+#: ../gtk/gtkcolorsel.c:459
 msgid "_Red:"
 msgstr "_Црвена:"
 
-#: gtk/gtkcolorsel.c:425
+#: ../gtk/gtkcolorsel.c:460
 msgid "Amount of red light in the color."
 msgstr "Количина црвене �ветло�ти у боји."
 
-#: gtk/gtkcolorsel.c:426
+#: ../gtk/gtkcolorsel.c:461
 msgid "_Green:"
 msgstr "_Зелена:"
 
-#: gtk/gtkcolorsel.c:427
+#: ../gtk/gtkcolorsel.c:462
 msgid "Amount of green light in the color."
 msgstr "Количина зелене �ветло�ти у боји."
 
-#: gtk/gtkcolorsel.c:428
+#: ../gtk/gtkcolorsel.c:463
 msgid "_Blue:"
 msgstr "_Плава:"
 
-#: gtk/gtkcolorsel.c:429
+#: ../gtk/gtkcolorsel.c:464
 msgid "Amount of blue light in the color."
 msgstr "Количина плаве �ветло�ти у боји."
 
 # Ово значи „непровидно�т“, али и�товремено �е одређује и провидно�т, па нема забуне.
-#: gtk/gtkcolorsel.c:432
+#: ../gtk/gtkcolorsel.c:467
 msgid "Op_acity:"
 msgstr "_Провидно�т:"
 
-#: gtk/gtkcolorsel.c:439 gtk/gtkcolorsel.c:449
+#: ../gtk/gtkcolorsel.c:475 ../gtk/gtkcolorsel.c:485
 msgid "Transparency of the color."
 msgstr "Провидно�т боје."
 
-#: gtk/gtkcolorsel.c:456
+#: ../gtk/gtkcolorsel.c:492
 msgid "Color _name:"
 msgstr "_Име боје:"
 
-#: gtk/gtkcolorsel.c:470
+#: ../gtk/gtkcolorsel.c:507
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
 msgstr ""
-"Овде можете унети боју на HTML начин као хек�адекадну вредно�т, или "
-"једно�тавно енгле�ко име боје као што је „orange“."
+"Овде можете унети хек�адецималну вредно�т боје у ХТМЛ �тилу, или једно�тавно "
+"енгле�ко име боје као што је „orange“."
 
-#: gtk/gtkcolorsel.c:500
+#: ../gtk/gtkcolorsel.c:539
 msgid "_Palette:"
 msgstr "_Палета"
 
-#: gtk/gtkcolorsel.c:529
+#: ../gtk/gtkcolorsel.c:569
 msgid "Color Wheel"
 msgstr "Точак боја"
 
-#: gtk/gtkcolorsel.c:988
+#: ../gtk/gtkcolorsel.c:1042
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -702,7 +952,7 @@ msgstr ""
 "можете одвући на �тавку палете, или изабрати ову боју као текућу одвлачећи "
 "је на преглед тренутно изабране боје."
 
-#: gtk/gtkcolorsel.c:991
+#: ../gtk/gtkcolorsel.c:1048
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -710,21 +960,21 @@ msgstr ""
 "Боја коју �те изабрали. Можете одвући ову боју на �тавку палете како би је "
 "�ачували за накнадну употребу."
 
-#: gtk/gtkcolorsel.c:996
+#: ../gtk/gtkcolorsel.c:1054
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now."
 msgstr "Већ изабрана боја, за поређење �а бојом коју �те �ада изабрали."
 
-#: gtk/gtkcolorsel.c:999
+#: ../gtk/gtkcolorsel.c:1058
 msgid "The color you've chosen."
 msgstr "Изабрана боја."
 
-#: gtk/gtkcolorsel.c:1396
+#: ../gtk/gtkcolorsel.c:1460
 msgid "_Save color here"
 msgstr "Овде _�ачувај боју"
 
-#: gtk/gtkcolorsel.c:1601
+#: ../gtk/gtkcolorsel.c:1665
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -733,7 +983,7 @@ msgstr ""
 "ову �тавку, довуците овде боју или кликните де�ним та�тером миша и изаберите "
 "„Овде �ачувај боју“."
 
-#: gtk/gtkcolorseldialog.c:189
+#: ../gtk/gtkcolorseldialog.c:217
 msgid "Color Selection"
 msgstr "Избор боје"
 
@@ -743,136 +993,192 @@ msgstr "Избор боје"
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
-#: gtk/gtkcustompaperunixdialog.c:116
+#: ../gtk/gtkcustompaperunixdialog.c:116
 msgid "default:mm"
 msgstr "default:mm"
 
 #. And show the custom paper dialog
-#: gtk/gtkcustompaperunixdialog.c:374 gtk/gtkprintunixdialog.c:3233
+#: ../gtk/gtkcustompaperunixdialog.c:372 ../gtk/gtkprintunixdialog.c:3325
 msgid "Manage Custom Sizes"
-msgstr "Одреди по�ебне величине"
+msgstr "Одреди произвољне величине"
 
-#: gtk/gtkcustompaperunixdialog.c:534 gtk/gtkpagesetupunixdialog.c:790
+#: ../gtk/gtkcustompaperunixdialog.c:533 ../gtk/gtkpagesetupunixdialog.c:783
 msgid "inch"
 msgstr "инч"
 
-#: gtk/gtkcustompaperunixdialog.c:536 gtk/gtkpagesetupunixdialog.c:788
+#: ../gtk/gtkcustompaperunixdialog.c:535 ../gtk/gtkpagesetupunixdialog.c:781
 msgid "mm"
 msgstr "mm"
 
-#: gtk/gtkcustompaperunixdialog.c:581
+#: ../gtk/gtkcustompaperunixdialog.c:580
 msgid "Margins from Printer..."
 msgstr "Маргине као у штампачу..."
 
-#: gtk/gtkcustompaperunixdialog.c:747
+#: ../gtk/gtkcustompaperunixdialog.c:746
 #, c-format
 msgid "Custom Size %d"
 msgstr "По�ебна величина  %d"
 
-#: gtk/gtkcustompaperunixdialog.c:1059
+#: ../gtk/gtkcustompaperunixdialog.c:1084
 msgid "_Width:"
 msgstr "_Ширина:"
 
-#: gtk/gtkcustompaperunixdialog.c:1071
+#: ../gtk/gtkcustompaperunixdialog.c:1097
 msgid "_Height:"
 msgstr "_Ви�ина:"
 
-#: gtk/gtkcustompaperunixdialog.c:1083
+#: ../gtk/gtkcustompaperunixdialog.c:1110
 msgid "Paper Size"
 msgstr "Величина папира"
 
-#: gtk/gtkcustompaperunixdialog.c:1092
+#: ../gtk/gtkcustompaperunixdialog.c:1119
 msgid "_Top:"
 msgstr "_Горе:"
 
-#: gtk/gtkcustompaperunixdialog.c:1104
+#: ../gtk/gtkcustompaperunixdialog.c:1132
 msgid "_Bottom:"
 msgstr "_Доле:"
 
-#: gtk/gtkcustompaperunixdialog.c:1116
+#: ../gtk/gtkcustompaperunixdialog.c:1145
 msgid "_Left:"
 msgstr "_Лево:"
 
-#: gtk/gtkcustompaperunixdialog.c:1128
+#: ../gtk/gtkcustompaperunixdialog.c:1158
 msgid "_Right:"
 msgstr "Д_е�но:"
 
-#: gtk/gtkcustompaperunixdialog.c:1169
+#: ../gtk/gtkcustompaperunixdialog.c:1200
 msgid "Paper Margins"
 msgstr "Маргине"
 
-#: gtk/gtkentry.c:8601 gtk/gtktextview.c:8248
+#: ../gtk/gtkentry.c:8956 ../gtk/gtktextview.c:8277
 msgid "Input _Methods"
 msgstr "_�ачини уно�а"
 
-#: gtk/gtkentry.c:8615 gtk/gtktextview.c:8262
+#: ../gtk/gtkentry.c:8970 ../gtk/gtktextview.c:8291
 msgid "_Insert Unicode Control Character"
 msgstr "_Убаци контролни Уникод знак"
 
-#: gtk/gtkentry.c:10015
+#: ../gtk/gtkentry.c:10441
 msgid "Caps Lock and Num Lock are on"
 msgstr "�умерички и та�тер за велика �лова �у укључени"
 
-#: gtk/gtkentry.c:10017
+#: ../gtk/gtkentry.c:10443
 msgid "Num Lock is on"
 msgstr "�умерички та�тер је укључен"
 
-#: gtk/gtkentry.c:10019
+#: ../gtk/gtkentry.c:10445
 msgid "Caps Lock is on"
 msgstr "Та�тер за велика �лова је укључен"
 
+#. *
+#. * SECTION:gtkfilechooserbutton
+#. * @Short_description: A button to launch a file selection dialog
+#. * @Title: GtkFileChooserButton
+#. * @See_also:#GtkFileChooserDialog
+#. *
+#. * The #GtkFileChooserButton is a widget that lets the user select a
+#. * file.  It implements the #GtkFileChooser interface.  Visually, it is a
+#. * file name with a button to bring up a #GtkFileChooserDialog.
+#. * The user can then use that dialog to change the file associated with
+#. * that button.  This widget does not support setting the
+#. * #GtkFileChooser:select-multiple property to %TRUE.
+#. *
+#. * <example>
+#. * <title>Create a button to let the user select a file in /etc</title>
+#. * <programlisting>
+#. * {
+#. *   GtkWidget *button;
+#. *
+#. *   button = gtk_file_chooser_button_new (_("Select a file"),
+#. *                                         GTK_FILE_CHOOSER_ACTION_OPEN);
+#. *   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (button),
+#. *                                        "/etc");
+#. * }
+#. * </programlisting>
+#. * </example>
+#. *
+#. * The #GtkFileChooserButton supports the #GtkFileChooserAction<!-- -->s
+#. * %GTK_FILE_CHOOSER_ACTION_OPEN and %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER.
+#. *
+#. * <important>
+#. * The #GtkFileChooserButton will ellipsize the label,
+#. * and thus will thus request little horizontal space.  To give the button
+#. * more space, you should call gtk_widget_get_preferred_size(),
+#. * gtk_file_chooser_button_set_width_chars(), or pack the button in
+#. * such a way that other interface elements give space to the widget.
+#. * </important>
+#.
 #. **************** *
 #. *  Private Macros  *
 #. * ****************
-#: gtk/gtkfilechooserbutton.c:61
-msgid "Select A File"
+#: ../gtk/gtkfilechooserbutton.c:105
+msgid "Select a File"
 msgstr "Изабери датотеку"
 
-#: gtk/gtkfilechooserbutton.c:62 gtk/gtkfilechooserdefault.c:1812
+#: ../gtk/gtkfilechooserbutton.c:106 ../gtk/gtkfilechooserdefault.c:1812
 msgid "Desktop"
 msgstr "Радна површ"
 
-#: gtk/gtkfilechooserbutton.c:63
+#: ../gtk/gtkfilechooserbutton.c:107
 msgid "(None)"
 msgstr "(ништа)"
 
-#: gtk/gtkfilechooserbutton.c:2005
+#: ../gtk/gtkfilechooserbutton.c:2046
 msgid "Other..."
 msgstr "�ека друга..."
 
-#: gtk/gtkfilechooserdefault.c:148
+#: ../gtk/gtkfilechooserdefault.c:148
 msgid "Type name of new folder"
 msgstr "Уне�ите име нове фа�цикле"
 
-#: gtk/gtkfilechooserdefault.c:938
+#: ../gtk/gtkfilechooserdefault.c:963
 msgid "Could not retrieve information about the file"
 msgstr "�е могу да �азнам податке о датотеци"
 
-#: gtk/gtkfilechooserdefault.c:949
+#: ../gtk/gtkfilechooserdefault.c:974
 msgid "Could not add a bookmark"
 msgstr "�е могу да додам обележивач"
 
-#: gtk/gtkfilechooserdefault.c:960
+#: ../gtk/gtkfilechooserdefault.c:985
 msgid "Could not remove bookmark"
 msgstr "�е могу да уклоним обележивач"
 
-#: gtk/gtkfilechooserdefault.c:971
+#: ../gtk/gtkfilechooserdefault.c:996
 msgid "The folder could not be created"
 msgstr "�е могу да направим фа�циклу"
 
-#: gtk/gtkfilechooserdefault.c:984
+#: ../gtk/gtkfilechooserdefault.c:1009
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
-"Фа�цикла �е не може направити, пошто већ по�тоји датотека и�тог имена.  "
-"Кори�тите друго име за фа�циклу, или прво преименујте датотеку."
+"Фа�цикла не може бити направљена, пошто већ по�тоји датотека �а и�тим "
+"именом.  Кори�тите неко друго име за фа�циклу, или као прво преименујте "
+"датотеку."
+
+#: ../gtk/gtkfilechooserdefault.c:1023
+msgid "You need to choose a valid filename."
+msgstr "Морате да изаберете и�правно име датотеке."
+
+#: ../gtk/gtkfilechooserdefault.c:1026
+#, c-format
+msgid "Cannot create a file under %s as it is not a folder"
+msgstr "�е могу да направим датотеку под „%s“ зато што то није фа�цикла"
+
+#: ../gtk/gtkfilechooserdefault.c:1038
+msgid ""
+"You may only select folders.  The item that you selected is not a folder; "
+"try using a different item."
+msgstr ""
+"Можете једино да изаберете фа�цикле. Ставка коју �те изабрали није фа�цикла; "
+"покушајте да кори�тите неку другу �тавку."
 
-#: gtk/gtkfilechooserdefault.c:995
+#: ../gtk/gtkfilechooserdefault.c:1048
 msgid "Invalid file name"
 msgstr "�еи�правно име датотеке"
 
-#: gtk/gtkfilechooserdefault.c:1005
+#: ../gtk/gtkfilechooserdefault.c:1058
 msgid "The folder contents could not be displayed"
 msgstr "�е могу да прикажем �адржај фа�цикле"
 
@@ -880,186 +1186,190 @@ msgstr "�е могу да прикажем �адржај фа�цикле"
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: gtk/gtkfilechooserdefault.c:1555
+#: ../gtk/gtkfilechooserdefault.c:1584
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
-#: gtk/gtkfilechooserdefault.c:1731
+#: ../gtk/gtkfilechooserdefault.c:1733
 msgid "Search"
 msgstr "Тражи"
 
-#: gtk/gtkfilechooserdefault.c:1755 gtk/gtkfilechooserdefault.c:9289
+#: ../gtk/gtkfilechooserdefault.c:1757 ../gtk/gtkfilechooserdefault.c:4835
 msgid "Recently Used"
 msgstr "Скоро коришћено"
 
-#: gtk/gtkfilechooserdefault.c:2409
+#: ../gtk/gtkfilechooserdefault.c:2356
 msgid "Select which types of files are shown"
 msgstr "Изабери које вр�те датотека �е приказују"
 
-#: gtk/gtkfilechooserdefault.c:2768
+#: ../gtk/gtkfilechooserdefault.c:2715
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Додај фа�циклу „%s“ у обележиваче"
 
-#: gtk/gtkfilechooserdefault.c:2812
+#: ../gtk/gtkfilechooserdefault.c:2759
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Додај текућу фа�циклу међу обележиваче"
 
-#: gtk/gtkfilechooserdefault.c:2814
+#: ../gtk/gtkfilechooserdefault.c:2761
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Додај изабране фа�цикле међу обележиваче"
 
-#: gtk/gtkfilechooserdefault.c:2852
+#: ../gtk/gtkfilechooserdefault.c:2799
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Уклони обележивач „%s“"
 
-#: gtk/gtkfilechooserdefault.c:2854
+#: ../gtk/gtkfilechooserdefault.c:2801
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "�е могу да уклоним обележивач „%s“"
 
-#: gtk/gtkfilechooserdefault.c:2861 gtk/gtkfilechooserdefault.c:3725
+#: ../gtk/gtkfilechooserdefault.c:2808 ../gtk/gtkfilechooserdefault.c:3693
 msgid "Remove the selected bookmark"
 msgstr "Уклони изабрани обележивач"
 
-#: gtk/gtkfilechooserdefault.c:3421
+#: ../gtk/gtkfilechooserdefault.c:3372
 msgid "Remove"
 msgstr "Уклони"
 
-#: gtk/gtkfilechooserdefault.c:3430
+#: ../gtk/gtkfilechooserdefault.c:3381
 msgid "Rename..."
 msgstr "Преименуј..."
 
 #. Accessible object name for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3593
+#: ../gtk/gtkfilechooserdefault.c:3545
 msgid "Places"
 msgstr "Ме�та"
 
 #. Column header for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3650
+#: ../gtk/gtkfilechooserdefault.c:3602
 msgid "_Places"
 msgstr "_Ме�та"
 
-#: gtk/gtkfilechooserdefault.c:3706
-msgid "_Add"
-msgstr "_Додај"
-
-#: gtk/gtkfilechooserdefault.c:3713
+#: ../gtk/gtkfilechooserdefault.c:3681
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Додај изабрану фа�циклу у обележиваче"
 
-#: gtk/gtkfilechooserdefault.c:3718
-msgid "_Remove"
-msgstr "_Уклони"
-
-#: gtk/gtkfilechooserdefault.c:3860
+#: ../gtk/gtkfilechooserdefault.c:3828
 msgid "Could not select file"
 msgstr "�е могу да изаберем датотеку"
 
-#: gtk/gtkfilechooserdefault.c:4035
+#: ../gtk/gtkfilechooserdefault.c:4001
 msgid "_Add to Bookmarks"
 msgstr "_Додај међу обележиваче"
 
-#: gtk/gtkfilechooserdefault.c:4048
+#: ../gtk/gtkfilechooserdefault.c:4014
 msgid "Show _Hidden Files"
 msgstr "Прикажи �а_кривене датотеке"
 
-#: gtk/gtkfilechooserdefault.c:4055
+#: ../gtk/gtkfilechooserdefault.c:4021
 msgid "Show _Size Column"
-msgstr "Прикажи колоне �а _величином"
+msgstr "Прикажи колону _величина"
 
-#: gtk/gtkfilechooserdefault.c:4281
+#: ../gtk/gtkfilechooserdefault.c:4248
 msgid "Files"
 msgstr "Датотеке"
 
-#: gtk/gtkfilechooserdefault.c:4332
+#: ../gtk/gtkfilechooserdefault.c:4299
 msgid "Name"
 msgstr "Име:"
 
-#: gtk/gtkfilechooserdefault.c:4355
+#: ../gtk/gtkfilechooserdefault.c:4322
 msgid "Size"
 msgstr "Величина"
 
-#: gtk/gtkfilechooserdefault.c:4369
+#: ../gtk/gtkfilechooserdefault.c:4336
 msgid "Modified"
 msgstr "Измењена"
 
 #. Label
-#: gtk/gtkfilechooserdefault.c:4624 gtk/gtkprinteroptionwidget.c:801
+#: ../gtk/gtkfilechooserdefault.c:4431 ../gtk/gtkprinteroptionwidget.c:799
 msgid "_Name:"
 msgstr "_Име:"
 
-#: gtk/gtkfilechooserdefault.c:4667
-msgid "_Browse for other folders"
-msgstr "_Разгледај о�тале фа�цикле"
-
-#: gtk/gtkfilechooserdefault.c:4937
+#: ../gtk/gtkfilechooserdefault.c:4673
 msgid "Type a file name"
-msgstr "Уне�и име датотеке"
+msgstr "Упиши име датотеке"
+
+#: ../gtk/gtkfilechooserdefault.c:4720 ../gtk/gtkfilechooserdefault.c:4731
+#, fuzzy
+#| msgid "Select a folder"
+msgid "Please select a folder below"
+msgstr "Изаберите фа�циклу"
+
+#: ../gtk/gtkfilechooserdefault.c:4726
+#, fuzzy
+#| msgid "Type a file name"
+msgid "Please type a file name"
+msgstr "Упиши име датотеке"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:4980
+#: ../gtk/gtkfilechooserdefault.c:4797
 msgid "Create Fo_lder"
 msgstr "�аправи _фа�циклу"
 
-#: gtk/gtkfilechooserdefault.c:4990
+#: ../gtk/gtkfilechooserdefault.c:4845
+msgid "Search:"
+msgstr "Тражи:"
+
+#: ../gtk/gtkfilechooserdefault.c:4896
 msgid "_Location:"
 msgstr "_Путања:"
 
-#: gtk/gtkfilechooserdefault.c:5194
+#: ../gtk/gtkfilechooserdefault.c:5349
 msgid "Save in _folder:"
 msgstr "Сачувај у _фа�цикли:"
 
-#: gtk/gtkfilechooserdefault.c:5196
+#: ../gtk/gtkfilechooserdefault.c:5351
 msgid "Create in _folder:"
 msgstr "�аправи у _фа�цикли:"
 
-#: gtk/gtkfilechooserdefault.c:6248
+#: ../gtk/gtkfilechooserdefault.c:6445
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "�е могу да прочитам �адржај %s"
 
-#: gtk/gtkfilechooserdefault.c:6252
+#: ../gtk/gtkfilechooserdefault.c:6449
 msgid "Could not read the contents of the folder"
 msgstr "�е могу да прочитам �адржај фа�цикле"
 
-#: gtk/gtkfilechooserdefault.c:6345 gtk/gtkfilechooserdefault.c:6413
-#: gtk/gtkfilechooserdefault.c:6558
+#: ../gtk/gtkfilechooserdefault.c:6542 ../gtk/gtkfilechooserdefault.c:6610
+#: ../gtk/gtkfilechooserdefault.c:6762
 msgid "Unknown"
 msgstr "�епознато"
 
-#: gtk/gtkfilechooserdefault.c:6360
+#: ../gtk/gtkfilechooserdefault.c:6557
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: gtk/gtkfilechooserdefault.c:6362
+#: ../gtk/gtkfilechooserdefault.c:6559
 msgid "Yesterday at %H:%M"
 msgstr "Јуче у %H:%M"
 
-#: gtk/gtkfilechooserdefault.c:7028
+#: ../gtk/gtkfilechooserdefault.c:7234
 msgid "Cannot change to folder because it is not local"
 msgstr "�е могу да уђем у фа�циклу зато што није локална"
 
-#: gtk/gtkfilechooserdefault.c:7625 gtk/gtkfilechooserdefault.c:7646
+#: ../gtk/gtkfilechooserdefault.c:7834 ../gtk/gtkfilechooserdefault.c:7855
 #, c-format
 msgid "Shortcut %s already exists"
-msgstr "Пречица %s већ по�тоји"
+msgstr "Пречица „%s“ већ по�тоји"
 
-#: gtk/gtkfilechooserdefault.c:7736
+#: ../gtk/gtkfilechooserdefault.c:7945
 #, c-format
 msgid "Shortcut %s does not exist"
-msgstr "Пречица %s не по�тоји"
+msgstr "Пречица „%s“ не по�тоји"
 
-#: gtk/gtkfilechooserdefault.c:7997 gtk/gtkprintunixdialog.c:480
+#: ../gtk/gtkfilechooserdefault.c:8191 ../gtk/gtkprintunixdialog.c:550
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Датотека „%s“ већ по�тоји. Да ли да препишем преко?"
+msgstr "Датотека „%s“ већ по�тоји. Да ли желите да је замените?"
 
-#: gtk/gtkfilechooserdefault.c:8000 gtk/gtkprintunixdialog.c:484
+#: ../gtk/gtkfilechooserdefault.c:8194 ../gtk/gtkprintunixdialog.c:554
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
@@ -1067,52 +1377,50 @@ msgstr ""
 "Ова датотека већ по�тоји у „%s“. �ко је замените �а новом, �адржај ће бити "
 "препи�ан."
 
-#: gtk/gtkfilechooserdefault.c:8005 gtk/gtkprintunixdialog.c:491
+#: ../gtk/gtkfilechooserdefault.c:8199 ../gtk/gtkprintunixdialog.c:561
 msgid "_Replace"
 msgstr "_Замени"
 
-#: gtk/gtkfilechooserdefault.c:8658
+#: ../gtk/gtkfilechooserdefault.c:9005
 msgid "Could not start the search process"
 msgstr "�е могу да започнем претраживање"
 
-#: gtk/gtkfilechooserdefault.c:8659
+#: ../gtk/gtkfilechooserdefault.c:9006
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
 msgstr ""
-"Програм не може да у�по�тави везу �а �ерви�ом индек�ирања. Увери �е да је он "
+"Програм не може да у�по�тави везу �а �ерви�ом индек�ирања. Уверите �е да је "
 "покренут."
 
-#: gtk/gtkfilechooserdefault.c:8673
+#: ../gtk/gtkfilechooserdefault.c:9020
 msgid "Could not send the search request"
 msgstr "�е могу да пошаљем захтев претраге"
 
-#: gtk/gtkfilechooserdefault.c:8861
-msgid "Search:"
-msgstr "Тражи:"
-
-#: gtk/gtkfilechooserdefault.c:9466
+#: ../gtk/gtkfilechooserdefault.c:9646
 #, c-format
 msgid "Could not mount %s"
-msgstr "�е могу да прикључим %s"
+msgstr "�е могу да прикључим „%s“"
 
 #. Translators: this is shown in the feedback for Tab-completion in a file
 #. * chooser's text entry, when the user enters an invalid path.
-#: gtk/gtkfilechooserentry.c:702 gtk/gtkfilechooserentry.c:1169
+#: ../gtk/gtkfilechooserentry.c:702 ../gtk/gtkfilechooserentry.c:1174
+#: ../gtk/gtkfilesystem.c:721
+#, c-format
 msgid "Invalid path"
 msgstr "�еи�правна путања"
 
 #. translators: this text is shown when there are no completions
 #. * for something the user typed in a file chooser entry
 #.
-#: gtk/gtkfilechooserentry.c:1101
+#: ../gtk/gtkfilechooserentry.c:1106
 msgid "No match"
 msgstr "Без поклапања"
 
 #. translators: this text is shown when there is exactly one completion
 #. * for something the user typed in a file chooser entry
 #.
-#: gtk/gtkfilechooserentry.c:1112
+#: ../gtk/gtkfilechooserentry.c:1117
 msgid "Sole completion"
 msgstr "Један могући на�тавак"
 
@@ -1120,13 +1428,13 @@ msgstr "Један могући на�тавак"
 #. * entry is a complete filename, but could be continued to find
 #. * a longer match
 #.
-#: gtk/gtkfilechooserentry.c:1128
+#: ../gtk/gtkfilechooserentry.c:1133
 msgid "Complete, but not unique"
 msgstr "Поклапање, али има и других"
 
 #. Translators: this text is shown while the system is searching
 #. * for possible completions for filenames in a file chooser entry.
-#: gtk/gtkfilechooserentry.c:1160
+#: ../gtk/gtkfilechooserentry.c:1165
 msgid "Completing..."
 msgstr "�а�тављам..."
 
@@ -1134,7 +1442,7 @@ msgstr "�а�тављам..."
 #. Translators: this is shown in the feedback for Tab-completion in a
 #. * file chooser's text entry when the user enters something like
 #. * "sftp://blahblah" in an app that only supports local filenames.
-#: gtk/gtkfilechooserentry.c:1182 gtk/gtkfilechooserentry.c:1207
+#: ../gtk/gtkfilechooserentry.c:1187 ../gtk/gtkfilechooserentry.c:1212
 msgid "Only local files may be selected"
 msgstr "Можете изабрати �амо локалне датотеке"
 
@@ -1142,162 +1450,168 @@ msgstr "Можете изабрати �амо локалне датотеке"
 #. Translators: this is shown in the feedback for Tab-completion in a
 #. * file chooser's text entry when the user hasn't entered the first '/'
 #. * after a hostname and yet hits Tab (such as "sftp://blahblah[Tab]")
-#: gtk/gtkfilechooserentry.c:1191
+#: ../gtk/gtkfilechooserentry.c:1196
 msgid "Incomplete hostname; end it with '/'"
-msgstr "Половично име домаћина; завршите га �а „/“"
+msgstr "�епотпуно име домаћина; завршите га �а „/“"
 
 #. Translators: this is shown in the feedback for Tab-completion in a file
 #. * chooser's text entry when the user enters a path that does not exist
 #. * and then hits Tab
-#: gtk/gtkfilechooserentry.c:1202
+#: ../gtk/gtkfilechooserentry.c:1207
 msgid "Path does not exist"
 msgstr "Путања не по�тоји"
 
-#: gtk/gtkfilechoosersettings.c:486
-#, c-format
-msgid "Error creating folder '%s': %s"
-msgstr "Грешка при прављењу фа�цикле „%s“: %s"
-
 #. The pointers we return for a GtkFileSystemVolume are opaque tokens; they are
 #. * really pointers to GDrive, GVolume or GMount objects.  We need an extra
 #. * token for the fake "File System" volume.  So, we'll return a pointer to
 #. * this particular string.
 #.
-#: gtk/gtkfilesystem.c:48
+#: ../gtk/gtkfilesystem.c:48
 msgid "File System"
 msgstr "Си�тем датотека"
 
-#: gtk/gtkfontbutton.c:142 gtk/gtkfontbutton.c:266
+#: ../gtk/gtkfontbutton.c:152 ../gtk/gtkfontbutton.c:276
 msgid "Pick a Font"
 msgstr "Изаберите фонт"
 
 #. Initialize fields
-#: gtk/gtkfontbutton.c:260
+#: ../gtk/gtkfontbutton.c:270
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: gtk/gtkfontbutton.c:785
+#: ../gtk/gtkfontbutton.c:787
 msgid "Font"
 msgstr "Фонт"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: gtk/gtkfontsel.c:103
+#: ../gtk/gtkfontsel.c:125
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "абвгдђшжчћљњџ �БВГДЂШЖЧЋЉЊ� abc�ćdđ ABCČĆD�"
 
-#: gtk/gtkfontsel.c:370
+#: ../gtk/gtkfontsel.c:394
 msgid "_Family:"
 msgstr "_Породица:"
 
-#: gtk/gtkfontsel.c:376
+#: ../gtk/gtkfontsel.c:401
 msgid "_Style:"
 msgstr "_Стил:"
 
-#: gtk/gtkfontsel.c:382
+#: ../gtk/gtkfontsel.c:408
 msgid "Si_ze:"
 msgstr "_Величина:"
 
 #. create the text entry widget
-#: gtk/gtkfontsel.c:559
+#: ../gtk/gtkfontsel.c:585
 msgid "_Preview:"
 msgstr "Пре_глед:"
 
-#: gtk/gtkfontsel.c:1659
+#: ../gtk/gtkfontsel.c:1738
 msgid "Font Selection"
 msgstr "Избор фонта"
 
-#. Remove this icon source so we don't keep trying to
-#. * load it.
-#.
-#: gtk/gtkiconfactory.c:1356
-#, c-format
-msgid "Error loading icon: %s"
-msgstr "Грешка при учитавању иконе: %s"
-
-#: gtk/gtkicontheme.c:1354
-#, c-format
-msgid ""
-"Could not find the icon '%s'. The '%s' theme\n"
-"was not found either, perhaps you need to install it.\n"
-"You can get a copy from:\n"
-"\t%s"
-msgstr ""
-"�е могу да нађем икону „%s“. �и тема „%s“ није \n"
-"нађена, можда треба да је ин�талирате.\n"
-"Можете набавити примерак �а:\n"
-"\t%s"
-
-#: gtk/gtkicontheme.c:1535
+#: ../gtk/gtkicontheme.c:1605
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Икона „%s“ није при�утна у теми"
 
-#: gtk/gtkicontheme.c:3048
+#: ../gtk/gtkicontheme.c:3115
 msgid "Failed to load icon"
 msgstr "�еу�пело учитавање иконице"
 
-#: gtk/gtkimmodule.c:526
+#: ../gtk/gtkimmodule.c:525
 msgid "Simple"
 msgstr "Једно�тавна"
 
-#: gtk/gtkimmulticontext.c:588
+#: ../gtk/gtkimmulticontext.c:588
 msgctxt "input method menu"
 msgid "System"
 msgstr "Си�тем"
 
-#: gtk/gtkimmulticontext.c:598
+#: ../gtk/gtkimmulticontext.c:598
 msgctxt "input method menu"
 msgid "None"
 msgstr "�ишта"
 
-#: gtk/gtkimmulticontext.c:681
+#: ../gtk/gtkimmulticontext.c:681
 #, c-format
 msgctxt "input method menu"
 msgid "System (%s)"
 msgstr "Си�тем (%s)"
 
 #. Open Link
-#: gtk/gtklabel.c:6202
+#: ../gtk/gtklabel.c:6293
 msgid "_Open Link"
 msgstr "Отвори _везу"
 
 #. Copy Link Address
-#: gtk/gtklabel.c:6214
+#: ../gtk/gtklabel.c:6305
 msgid "Copy _Link Address"
 msgstr "Умножи _адре�у везе"
 
-#: gtk/gtklinkbutton.c:449
+#: ../gtk/gtklinkbutton.c:484
 msgid "Copy URL"
 msgstr "Умножи УРЛ"
 
-#: gtk/gtklinkbutton.c:601
+#: ../gtk/gtklinkbutton.c:647
 msgid "Invalid URI"
 msgstr "�еи�праван УРЛ"
 
+#: ../gtk/gtklockbutton.c:288
+msgid "Lock"
+msgstr "Закључај"
+
+#: ../gtk/gtklockbutton.c:297
+msgid "Unlock"
+msgstr "Откључај"
+
+#: ../gtk/gtklockbutton.c:306
+msgid ""
+"Dialog is unlocked.\n"
+"Click to prevent further changes"
+msgstr ""
+"Прозорче је откључано.\n"
+"Кликните да �пречите даље измене."
+
+#: ../gtk/gtklockbutton.c:315
+msgid ""
+"Dialog is locked.\n"
+"Click to make changes"
+msgstr ""
+"Прозорче је закључано.\n"
+"Кликните да уне�ете измене."
+
+#: ../gtk/gtklockbutton.c:324
+msgid ""
+"System policy prevents changes.\n"
+"Contact your system administrator"
+msgstr ""
+"Сигурно�т �и�тема �пречава измене.\n"
+"Обратите �е админи�тратору �и�тема."
+
 # допун�ки додаци? „добар фазон“... црни Данило
 #. Description of --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:526
+#: ../gtk/gtkmain.c:562
 msgid "Load additional GTK+ modules"
-msgstr "Учитај допун�ке Гтк+ додатке"
+msgstr "Учитава допун�ке Гтк+ додатке"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:527
+#: ../gtk/gtkmain.c:563
 msgid "MODULES"
 msgstr "ДОД�ЦИ"
 
 #. Description of --g-fatal-warnings in --help output
-#: gtk/gtkmain.c:529
+#: ../gtk/gtkmain.c:565
 msgid "Make all warnings fatal"
-msgstr "Учини �ва упозорења кобним"
+msgstr "Чини �ва упозорења кобним"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: gtk/gtkmain.c:532
+#: ../gtk/gtkmain.c:568
 msgid "GTK+ debugging flags to set"
 msgstr "Које Гтк+ опције за налажење грешака укључити"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: gtk/gtkmain.c:535
+#: ../gtk/gtkmain.c:571
 msgid "GTK+ debugging flags to unset"
 msgstr "Које Гтк+ опције за налажење грешака и�кључити"
 
@@ -1306,122 +1620,131 @@ msgstr "Које Гтк+ опције за налажење грешака иÑ�Ð
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: gtk/gtkmain.c:798
+#: ../gtk/gtkmain.c:848
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: gtk/gtkmain.c:863
+#: ../gtk/gtkmain.c:914
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "�е могу да при�тупим екрану: %s"
 
-#: gtk/gtkmain.c:922
+#: ../gtk/gtkmain.c:980
 msgid "GTK+ Options"
 msgstr "Гтк+ опције"
 
-#: gtk/gtkmain.c:922
+#: ../gtk/gtkmain.c:980
 msgid "Show GTK+ Options"
 msgstr "Прикажи Гтк+ опције"
 
-#: gtk/gtkmountoperation.c:491
+#: ../gtk/gtkmountoperation.c:489
 msgid "Co_nnect"
 msgstr "Повежи _�е"
 
-#: gtk/gtkmountoperation.c:558
+#: ../gtk/gtkmountoperation.c:559
 msgid "Connect _anonymously"
 msgstr "Повежи �е _анонимно"
 
-#: gtk/gtkmountoperation.c:567
+#: ../gtk/gtkmountoperation.c:568
 msgid "Connect as u_ser:"
 msgstr "Повежи �е као _кори�ник:"
 
-#: gtk/gtkmountoperation.c:605
+#: ../gtk/gtkmountoperation.c:602
 msgid "_Username:"
 msgstr "_Кори�ничко име:"
 
-#: gtk/gtkmountoperation.c:610
+#: ../gtk/gtkmountoperation.c:607
 msgid "_Domain:"
 msgstr "_Домен:"
 
-#: gtk/gtkmountoperation.c:616
+#: ../gtk/gtkmountoperation.c:613
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: gtk/gtkmountoperation.c:634
+#: ../gtk/gtkmountoperation.c:631
 msgid "Forget password _immediately"
 msgstr "_Одмах заборави лозинку"
 
-#: gtk/gtkmountoperation.c:644
+#: ../gtk/gtkmountoperation.c:641
 msgid "Remember password until you _logout"
 msgstr "Запамти лозинку _до одјављивања"
 
-#: gtk/gtkmountoperation.c:654
+#: ../gtk/gtkmountoperation.c:651
 msgid "Remember _forever"
 msgstr "Запамти _заувек"
 
-#: gtk/gtkmountoperation.c:883
-#, fuzzy, c-format
+#: ../gtk/gtkmountoperation.c:880
+#, c-format
 msgid "Unknown Application (PID %d)"
 msgstr "�епознат програм (под бројем %d)"
 
-#: gtk/gtkmountoperation.c:1066
-#, c-format
+#: ../gtk/gtkmountoperation.c:1063
 msgid "Unable to end process"
 msgstr "�е могу да окончам проце�"
 
-#: gtk/gtkmountoperation.c:1103
+#: ../gtk/gtkmountoperation.c:1100
 msgid "_End Process"
 msgstr "_Окончај проце�"
 
-#: gtk/gtkmountoperation-stub.c:64
-#, fuzzy, c-format
+#: ../gtk/gtkmountoperation-stub.c:64
+#, c-format
 msgid "Cannot kill process with PID %d. Operation is not implemented."
-msgstr "�е кому да окончам проце� под бројем %d. Радња још увек није подржана."
+msgstr "�е могу да окончам проце� под бројем %d. Радња још увек није подржана."
 
 #. translators: this string is a name for the 'less' command
-#: gtk/gtkmountoperation-x11.c:862
+#: ../gtk/gtkmountoperation-x11.c:959
 msgid "Terminal Pager"
 msgstr "�аредба „less“"
 
-#: gtk/gtkmountoperation-x11.c:863
+#: ../gtk/gtkmountoperation-x11.c:960
 msgid "Top Command"
 msgstr "�аредба „top“"
 
-#: gtk/gtkmountoperation-x11.c:864
+#: ../gtk/gtkmountoperation-x11.c:961
 msgid "Bourne Again Shell"
 msgstr "�ова Борнова љу�ка"
 
-#: gtk/gtkmountoperation-x11.c:865
+#: ../gtk/gtkmountoperation-x11.c:962
 msgid "Bourne Shell"
 msgstr "Борнова љу�ка"
 
-#: gtk/gtkmountoperation-x11.c:866
+#: ../gtk/gtkmountoperation-x11.c:963
 msgid "Z Shell"
 msgstr "Z љу�ка"
 
-#: gtk/gtkmountoperation-x11.c:963
-#, fuzzy, c-format
+#: ../gtk/gtkmountoperation-x11.c:1060
+#, c-format
 msgid "Cannot end process with PID %d: %s"
 msgstr "�е могу да окончам проце� под бројем %d: %s"
 
-#: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170
+#: ../gtk/gtknotebook.c:4902 ../gtk/gtknotebook.c:7587
 #, c-format
 msgid "Page %u"
 msgstr "Ли�т %u"
 
-#: gtk/gtkpagesetup.c:596 gtk/gtkpapersize.c:838 gtk/gtkpapersize.c:880
+#. Translators: the format here is used to build the string that will be rendered
+#. * in the number emblem.
+#.
+#: ../gtk/gtknumerableicon.c:482
+#, c-format
+msgctxt "Number format"
+msgid "%d"
+msgstr "%Id"
+
+#: ../gtk/gtkpagesetup.c:648 ../gtk/gtkpapersize.c:849
+#: ../gtk/gtkpapersize.c:889
 msgid "Not a valid page setup file"
 msgstr "Датотека �а по�тавком �транице није и�правна"
 
-#: gtk/gtkpagesetupunixdialog.c:179
+#: ../gtk/gtkpagesetupunixdialog.c:172
 msgid "Any Printer"
 msgstr "Било који штампач"
 
-#: gtk/gtkpagesetupunixdialog.c:179
+#: ../gtk/gtkpagesetupunixdialog.c:172
 msgid "For portable documents"
 msgstr "За прено�иве документе"
 
-#: gtk/gtkpagesetupunixdialog.c:809
+#: ../gtk/gtkpagesetupunixdialog.c:802
 #, c-format
 msgid ""
 "Margins:\n"
@@ -1436,51 +1759,51 @@ msgstr ""
 " Горе: %s %s\n"
 " Доле: %s %s"
 
-#: gtk/gtkpagesetupunixdialog.c:858 gtk/gtkprintunixdialog.c:3284
+#: ../gtk/gtkpagesetupunixdialog.c:851 ../gtk/gtkprintunixdialog.c:3376
 msgid "Manage Custom Sizes..."
-msgstr "Одреди по�ебне величине..."
+msgstr "Одреди произвољне величине..."
 
-#: gtk/gtkpagesetupunixdialog.c:909
+#: ../gtk/gtkpagesetupunixdialog.c:902
 msgid "_Format for:"
 msgstr "_Формат за:"
 
-#: gtk/gtkpagesetupunixdialog.c:931 gtk/gtkprintunixdialog.c:3456
+#: ../gtk/gtkpagesetupunixdialog.c:925 ../gtk/gtkprintunixdialog.c:3556
 msgid "_Paper size:"
 msgstr "Величина _папира:"
 
-#: gtk/gtkpagesetupunixdialog.c:962
+#: ../gtk/gtkpagesetupunixdialog.c:958
 msgid "_Orientation:"
 msgstr "_У�мерење:"
 
-#: gtk/gtkpagesetupunixdialog.c:1026 gtk/gtkprintunixdialog.c:3518
+#: ../gtk/gtkpagesetupunixdialog.c:1023 ../gtk/gtkprintunixdialog.c:3620
 msgid "Page Setup"
 msgstr "Подешавање �тране"
 
-#: gtk/gtkpathbar.c:154
+#: ../gtk/gtkpathbar.c:156
 msgid "Up Path"
 msgstr "Уз путању"
 
-#: gtk/gtkpathbar.c:156
+#: ../gtk/gtkpathbar.c:158
 msgid "Down Path"
 msgstr "�из путању"
 
-#: gtk/gtkpathbar.c:1497
+#: ../gtk/gtkpathbar.c:1516
 msgid "File System Root"
 msgstr "Корен �и�тема датотека"
 
-#: gtk/gtkprintbackend.c:749
+#: ../gtk/gtkprintbackend.c:749
 msgid "Authentication"
-msgstr "Пријава"
+msgstr "Потврђивање идентитета"
 
-#: gtk/gtkprinteroptionwidget.c:694
+#: ../gtk/gtkprinteroptionwidget.c:692
 msgid "Not available"
 msgstr "�ије до�тупно"
 
-#: gtk/gtkprinteroptionwidget.c:794
+#: ../gtk/gtkprinteroptionwidget.c:792
 msgid "Select a folder"
 msgstr "Изаберите фа�циклу"
 
-#: gtk/gtkprinteroptionwidget.c:813
+#: ../gtk/gtkprinteroptionwidget.c:812
 msgid "_Save in folder:"
 msgstr "_Сачувај у фа�цикли:"
 
@@ -1488,216 +1811,213 @@ msgstr "_Сачувај у фа�цикли:"
 #. * jobs. %s gets replaced by the application name, %d gets replaced
 #. * by the job number.
 #.
-#: gtk/gtkprintoperation.c:190
+#: ../gtk/gtkprintoperation.c:263
 #, c-format
 msgid "%s job #%d"
 msgstr "%s — по�ао #%d"
 
-#: gtk/gtkprintoperation.c:1695
+#: ../gtk/gtkprintoperation.c:1768
 msgctxt "print operation status"
 msgid "Initial state"
 msgstr "Покретање"
 
-#: gtk/gtkprintoperation.c:1696
+#: ../gtk/gtkprintoperation.c:1769
 msgctxt "print operation status"
 msgid "Preparing to print"
 msgstr "Припремам за штампу"
 
-#: gtk/gtkprintoperation.c:1697
+#: ../gtk/gtkprintoperation.c:1770
 msgctxt "print operation status"
 msgid "Generating data"
 msgstr "Образујем податке"
 
-#: gtk/gtkprintoperation.c:1698
+#: ../gtk/gtkprintoperation.c:1771
 msgctxt "print operation status"
 msgid "Sending data"
 msgstr "Шаљем податке"
 
-#: gtk/gtkprintoperation.c:1699
+#: ../gtk/gtkprintoperation.c:1772
 msgctxt "print operation status"
 msgid "Waiting"
 msgstr "Чекам"
 
-#: gtk/gtkprintoperation.c:1700
+#: ../gtk/gtkprintoperation.c:1773
 msgctxt "print operation status"
 msgid "Blocking on issue"
 msgstr "Зау�тављено због проблема"
 
-#: gtk/gtkprintoperation.c:1701
+#: ../gtk/gtkprintoperation.c:1774
 msgctxt "print operation status"
 msgid "Printing"
 msgstr "Штампам"
 
-#: gtk/gtkprintoperation.c:1702
+#: ../gtk/gtkprintoperation.c:1775
 msgctxt "print operation status"
 msgid "Finished"
 msgstr "Завршено"
 
-#: gtk/gtkprintoperation.c:1703
+#: ../gtk/gtkprintoperation.c:1776
 msgctxt "print operation status"
 msgid "Finished with error"
 msgstr "Завршено уз грешку"
 
-#: gtk/gtkprintoperation.c:2270
+#: ../gtk/gtkprintoperation.c:2343
 #, c-format
 msgid "Preparing %d"
-msgstr "Припремам %d"
+msgstr "Припремам „%d“"
 
-#: gtk/gtkprintoperation.c:2272 gtk/gtkprintoperation.c:2902
-#, c-format
+#: ../gtk/gtkprintoperation.c:2345 ../gtk/gtkprintoperation.c:2975
 msgid "Preparing"
 msgstr "Припремам"
 
-#: gtk/gtkprintoperation.c:2275
+#: ../gtk/gtkprintoperation.c:2348
 #, c-format
 msgid "Printing %d"
-msgstr "Штампам %d"
+msgstr "Штампам „%d“"
 
-#: gtk/gtkprintoperation.c:2932
-#, c-format
+#: ../gtk/gtkprintoperation.c:3005
 msgid "Error creating print preview"
 msgstr "Грешка при изради прегледа"
 
-#: gtk/gtkprintoperation.c:2935
-#, c-format
+#: ../gtk/gtkprintoperation.c:3008
 msgid "The most probable reason is that a temporary file could not be created."
 msgstr "�ајчешћи разлог је да није могуће направити привремену датотеку."
 
-#: gtk/gtkprintoperation-unix.c:297
+#: ../gtk/gtkprintoperation-unix.c:304
 msgid "Error launching preview"
 msgstr "Грешка при покретању прегледа"
 
-#: gtk/gtkprintoperation-unix.c:470 gtk/gtkprintoperation-win32.c:1447
+#: ../gtk/gtkprintoperation-unix.c:477 ../gtk/gtkprintoperation-win32.c:1447
 msgid "Application"
 msgstr "Програм"
 
-#: gtk/gtkprintoperation-win32.c:611
+#: ../gtk/gtkprintoperation-win32.c:611
 msgid "Printer offline"
 msgstr "Штампач је и�кључен"
 
-#: gtk/gtkprintoperation-win32.c:613
+#: ../gtk/gtkprintoperation-win32.c:613
 msgid "Out of paper"
 msgstr "�ема папира"
 
 #. Translators: this is a printer status.
-#: gtk/gtkprintoperation-win32.c:615
-#: modules/printbackends/cups/gtkprintbackendcups.c:1998
+#: ../gtk/gtkprintoperation-win32.c:615
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2036
 msgid "Paused"
 msgstr "Зау�тављено"
 
-#: gtk/gtkprintoperation-win32.c:617
+#: ../gtk/gtkprintoperation-win32.c:617
 msgid "Need user intervention"
-msgstr "Потребна интервенција кори�ника"
+msgstr "Потребна је интервенција кори�ника"
 
-#: gtk/gtkprintoperation-win32.c:717
+#: ../gtk/gtkprintoperation-win32.c:717
 msgid "Custom size"
-msgstr "По�ебна величина"
+msgstr "Произвољна величина"
 
-#: gtk/gtkprintoperation-win32.c:1539
+#: ../gtk/gtkprintoperation-win32.c:1539
 msgid "No printer found"
 msgstr "Штампач није пронађен"
 
-#: gtk/gtkprintoperation-win32.c:1566
+#: ../gtk/gtkprintoperation-win32.c:1566
 msgid "Invalid argument to CreateDC"
-msgstr "�еи�праван аргумент за CreateDC"
+msgstr "�еи�праван аргумент за „CreateDC“"
 
-#: gtk/gtkprintoperation-win32.c:1602 gtk/gtkprintoperation-win32.c:1829
+#: ../gtk/gtkprintoperation-win32.c:1602 ../gtk/gtkprintoperation-win32.c:1829
 msgid "Error from StartDoc"
-msgstr "Грешка у StartDoc"
+msgstr "Грешка у „StartDoc“"
 
-#: gtk/gtkprintoperation-win32.c:1684 gtk/gtkprintoperation-win32.c:1707
-#: gtk/gtkprintoperation-win32.c:1755
+#: ../gtk/gtkprintoperation-win32.c:1684 ../gtk/gtkprintoperation-win32.c:1707
+#: ../gtk/gtkprintoperation-win32.c:1755
 msgid "Not enough free memory"
 msgstr "�ема довољно �лободне меморије"
 
-#: gtk/gtkprintoperation-win32.c:1760
+#: ../gtk/gtkprintoperation-win32.c:1760
 msgid "Invalid argument to PrintDlgEx"
-msgstr "�еи�праван аргумент �а PrintDlgEx"
+msgstr "�еи�праван аргумент �а „PrintDlgEx“"
 
-#: gtk/gtkprintoperation-win32.c:1765
+#: ../gtk/gtkprintoperation-win32.c:1765
 msgid "Invalid pointer to PrintDlgEx"
-msgstr "�еи�праван показивач на PrintDlgEx"
+msgstr "�еи�праван показивач на „PrintDlgEx“"
 
-#: gtk/gtkprintoperation-win32.c:1770
+#: ../gtk/gtkprintoperation-win32.c:1770
 msgid "Invalid handle to PrintDlgEx"
-msgstr "�еи�правна закачка ка PrintDlgEx"
+msgstr "�еи�правна закачка ка „PrintDlgEx“"
 
-#: gtk/gtkprintoperation-win32.c:1775
+#: ../gtk/gtkprintoperation-win32.c:1775
 msgid "Unspecified error"
 msgstr "�епозната грешка"
 
-#: gtk/gtkprintunixdialog.c:618
+#: ../gtk/gtkprintunixdialog.c:688
 msgid "Getting printer information failed"
 msgstr "�е могу да прикупим податке о штампачу"
 
-#: gtk/gtkprintunixdialog.c:1873
+#: ../gtk/gtkprintunixdialog.c:1942
 msgid "Getting printer information..."
 msgstr "Прикупљам податке о штампачу..."
 
-#: gtk/gtkprintunixdialog.c:2139
+#: ../gtk/gtkprintunixdialog.c:2216
 msgid "Printer"
 msgstr "Штампач"
 
 #. Translators: this is the header for the location column in the print dialog
-#: gtk/gtkprintunixdialog.c:2149
+#: ../gtk/gtkprintunixdialog.c:2226
 msgid "Location"
 msgstr "Путања"
 
 #. Translators: this is the header for the printer status column in the print dialog
-#: gtk/gtkprintunixdialog.c:2160
+#: ../gtk/gtkprintunixdialog.c:2237
 msgid "Status"
 msgstr "Стање"
 
-#: gtk/gtkprintunixdialog.c:2186
+#: ../gtk/gtkprintunixdialog.c:2263
 msgid "Range"
 msgstr "Оп�ег"
 
-#: gtk/gtkprintunixdialog.c:2190
+#: ../gtk/gtkprintunixdialog.c:2267
 msgid "_All Pages"
 msgstr "_Све ли�тове"
 
-#: gtk/gtkprintunixdialog.c:2197
+#: ../gtk/gtkprintunixdialog.c:2274
 msgid "C_urrent Page"
 msgstr "_Тренутну"
 
-#: gtk/gtkprintunixdialog.c:2207
+#: ../gtk/gtkprintunixdialog.c:2284
 msgid "Se_lection"
 msgstr "_Избор"
 
-#: gtk/gtkprintunixdialog.c:2216
+#: ../gtk/gtkprintunixdialog.c:2293
 msgid "Pag_es:"
 msgstr "Страниц_е:"
 
-#: gtk/gtkprintunixdialog.c:2217
+#: ../gtk/gtkprintunixdialog.c:2294
 msgid ""
 "Specify one or more page ranges,\n"
 " e.g. 1-3,7,11"
 msgstr ""
-"�аведи један или више оп�ега �траница,\n"
+"�аведите један или више оп�ега �траница,\n"
 " нпр. 1-3,7,11"
 
-#: gtk/gtkprintunixdialog.c:2227
+#: ../gtk/gtkprintunixdialog.c:2304
 msgid "Pages"
 msgstr "Стране"
 
-#: gtk/gtkprintunixdialog.c:2240
+#: ../gtk/gtkprintunixdialog.c:2317
 msgid "Copies"
 msgstr "Примерака"
 
 #. FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns
-#: gtk/gtkprintunixdialog.c:2245
+#: ../gtk/gtkprintunixdialog.c:2322
 msgid "Copie_s:"
 msgstr "Примера_ка:"
 
-#: gtk/gtkprintunixdialog.c:2263
+#: ../gtk/gtkprintunixdialog.c:2341
 msgid "C_ollate"
 msgstr "_Сложи"
 
-#: gtk/gtkprintunixdialog.c:2271
+#: ../gtk/gtkprintunixdialog.c:2349
 msgid "_Reverse"
 msgstr "_Обрни"
 
-#: gtk/gtkprintunixdialog.c:2291
+#: ../gtk/gtkprintunixdialog.c:2369
 msgid "General"
 msgstr "Опште"
 
@@ -1707,169 +2027,169 @@ msgstr "Опште"
 #. Translators: These strings name the possible arrangements of
 #. * multiple pages on a sheet when printing
 #.
-#: gtk/gtkprintunixdialog.c:3017
-#: modules/printbackends/cups/gtkprintbackendcups.c:3508
+#: ../gtk/gtkprintunixdialog.c:3109
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3586
 msgid "Left to right, top to bottom"
 msgstr "С лева на де�но, одозго на доле"
 
-#: gtk/gtkprintunixdialog.c:3017
-#: modules/printbackends/cups/gtkprintbackendcups.c:3508
+#: ../gtk/gtkprintunixdialog.c:3109
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3586
 msgid "Left to right, bottom to top"
 msgstr "С лева на де�но, одоздо на горе"
 
-#: gtk/gtkprintunixdialog.c:3018
-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
+#: ../gtk/gtkprintunixdialog.c:3110
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3587
 msgid "Right to left, top to bottom"
 msgstr "С де�на на лево, одозго на доле"
 
-#: gtk/gtkprintunixdialog.c:3018
-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
+#: ../gtk/gtkprintunixdialog.c:3110
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3587
 msgid "Right to left, bottom to top"
 msgstr "С де�на на лево, одоздо на горе"
 
-#: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
+#: ../gtk/gtkprintunixdialog.c:3111
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3588
 msgid "Top to bottom, left to right"
 msgstr "Одозго на доле, � лева на де�но"
 
-#: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
+#: ../gtk/gtkprintunixdialog.c:3111
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3588
 msgid "Top to bottom, right to left"
 msgstr "Одозго на доле, � де�на на лево"
 
-#: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
+#: ../gtk/gtkprintunixdialog.c:3112
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3589
 msgid "Bottom to top, left to right"
 msgstr "Одоздо на горе, � лева на де�но"
 
-#: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
+#: ../gtk/gtkprintunixdialog.c:3112
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3589
 msgid "Bottom to top, right to left"
 msgstr "Одоздо на горе, � де�на на лево"
 
 #. Translators, this string is used to label the option in the print
 #. * dialog that controls in what order multiple pages are arranged
 #.
-#: gtk/gtkprintunixdialog.c:3024 gtk/gtkprintunixdialog.c:3037
-#: modules/printbackends/cups/gtkprintbackendcups.c:3543
+#: ../gtk/gtkprintunixdialog.c:3116 ../gtk/gtkprintunixdialog.c:3129
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3623
 msgid "Page Ordering"
 msgstr "Слагање �трана"
 
-#: gtk/gtkprintunixdialog.c:3053
+#: ../gtk/gtkprintunixdialog.c:3145
 msgid "Left to right"
 msgstr "Са лева на де�но"
 
-#: gtk/gtkprintunixdialog.c:3054
+#: ../gtk/gtkprintunixdialog.c:3146
 msgid "Right to left"
 msgstr "Са де�на на лево"
 
-#: gtk/gtkprintunixdialog.c:3066
+#: ../gtk/gtkprintunixdialog.c:3158
 msgid "Top to bottom"
 msgstr "Одозго на доле"
 
-#: gtk/gtkprintunixdialog.c:3067
+#: ../gtk/gtkprintunixdialog.c:3159
 msgid "Bottom to top"
 msgstr "Одоздо на горе"
 
-#: gtk/gtkprintunixdialog.c:3307
+#: ../gtk/gtkprintunixdialog.c:3399
 msgid "Layout"
 msgstr "Ра�поред"
 
-#: gtk/gtkprintunixdialog.c:3311
+#: ../gtk/gtkprintunixdialog.c:3403
 msgid "T_wo-sided:"
 msgstr "Д_во�трано:"
 
-#: gtk/gtkprintunixdialog.c:3326
+#: ../gtk/gtkprintunixdialog.c:3419
 msgid "Pages per _side:"
 msgstr "_Страна на ли�ту:"
 
-#: gtk/gtkprintunixdialog.c:3343
+#: ../gtk/gtkprintunixdialog.c:3437
 msgid "Page or_dering:"
 msgstr "Ре_до�лед �трана:"
 
-#: gtk/gtkprintunixdialog.c:3359
+#: ../gtk/gtkprintunixdialog.c:3454
 msgid "_Only print:"
 msgstr "Штампај �ам_о:"
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:3374
+#: ../gtk/gtkprintunixdialog.c:3470
 msgid "All sheets"
 msgstr "Све ли�тове"
 
-#: gtk/gtkprintunixdialog.c:3375
+#: ../gtk/gtkprintunixdialog.c:3471
 msgid "Even sheets"
 msgstr "Парне ли�тове"
 
-#: gtk/gtkprintunixdialog.c:3376
+#: ../gtk/gtkprintunixdialog.c:3472
 msgid "Odd sheets"
 msgstr "�епарне ли�тове"
 
-#: gtk/gtkprintunixdialog.c:3379
+#: ../gtk/gtkprintunixdialog.c:3475
 msgid "Sc_ale:"
 msgstr "Р_азмера:"
 
-#: gtk/gtkprintunixdialog.c:3406
+#: ../gtk/gtkprintunixdialog.c:3503
 msgid "Paper"
 msgstr "Папир"
 
-#: gtk/gtkprintunixdialog.c:3410
+#: ../gtk/gtkprintunixdialog.c:3507
 msgid "Paper _type:"
 msgstr "_Тип папира:"
 
-#: gtk/gtkprintunixdialog.c:3425
+#: ../gtk/gtkprintunixdialog.c:3523
 msgid "Paper _source:"
 msgstr "_Фиока за папир:"
 
-#: gtk/gtkprintunixdialog.c:3440
+#: ../gtk/gtkprintunixdialog.c:3539
 msgid "Output t_ray:"
 msgstr "Излазна т_рака:"
 
-#: gtk/gtkprintunixdialog.c:3480
+#: ../gtk/gtkprintunixdialog.c:3581
 msgid "Or_ientation:"
 msgstr "_У�мерење:"
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:3495
+#: ../gtk/gtkprintunixdialog.c:3597
 msgid "Portrait"
 msgstr "У�правно"
 
-#: gtk/gtkprintunixdialog.c:3496
+#: ../gtk/gtkprintunixdialog.c:3598
 msgid "Landscape"
 msgstr "Положено"
 
-#: gtk/gtkprintunixdialog.c:3497
+#: ../gtk/gtkprintunixdialog.c:3599
 msgid "Reverse portrait"
 msgstr "Обрнуто, у�правно"
 
-#: gtk/gtkprintunixdialog.c:3498
+#: ../gtk/gtkprintunixdialog.c:3600
 msgid "Reverse landscape"
 msgstr "Обрнуто, положено"
 
-#: gtk/gtkprintunixdialog.c:3543
+#: ../gtk/gtkprintunixdialog.c:3645
 msgid "Job Details"
 msgstr "Подаци о по�лу"
 
-#: gtk/gtkprintunixdialog.c:3549
+#: ../gtk/gtkprintunixdialog.c:3651
 msgid "Pri_ority:"
 msgstr "Важн_о�т:"
 
 # bug(goran): ???
-#: gtk/gtkprintunixdialog.c:3564
+#: ../gtk/gtkprintunixdialog.c:3667
 msgid "_Billing info:"
 msgstr "Подаци за _фактури�ање:"
 
-#: gtk/gtkprintunixdialog.c:3582
+#: ../gtk/gtkprintunixdialog.c:3686
 msgid "Print Document"
 msgstr "Штампај документ"
 
 #. Translators: this is one of the choices for the print at option
 #. * in the print dialog
 #.
-#: gtk/gtkprintunixdialog.c:3591
+#: ../gtk/gtkprintunixdialog.c:3695
 msgid "_Now"
 msgstr "_Сад"
 
-#: gtk/gtkprintunixdialog.c:3602
+#: ../gtk/gtkprintunixdialog.c:3706
 msgid "A_t:"
 msgstr "_У:"
 
@@ -1877,7 +2197,7 @@ msgstr "_У:"
 #. * You can remove the am/pm values below for your locale if they are not
 #. * supported.
 #.
-#: gtk/gtkprintunixdialog.c:3608
+#: ../gtk/gtkprintunixdialog.c:3712
 msgid ""
 "Specify the time of print,\n"
 " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
@@ -1885,121 +2205,105 @@ msgstr ""
 "Одредите време за пошетак штампе,\n"
 "�а пример: 18, 15:30, 14:15:20"
 
-#: gtk/gtkprintunixdialog.c:3618
+#: ../gtk/gtkprintunixdialog.c:3722
 msgid "Time of print"
 msgstr "Време штампања"
 
-#: gtk/gtkprintunixdialog.c:3634
+#: ../gtk/gtkprintunixdialog.c:3738
 msgid "On _hold"
 msgstr "�а _чекању"
 
-#: gtk/gtkprintunixdialog.c:3635
+#: ../gtk/gtkprintunixdialog.c:3739
 msgid "Hold the job until it is explicitly released"
 msgstr "Задржи по�ао док �е изричито не затражи штампа"
 
-#: gtk/gtkprintunixdialog.c:3655
+#: ../gtk/gtkprintunixdialog.c:3759
 msgid "Add Cover Page"
 msgstr "Додај на�ловну �трану"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: gtk/gtkprintunixdialog.c:3664
+#: ../gtk/gtkprintunixdialog.c:3768
 msgid "Be_fore:"
 msgstr "П_ре:"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: gtk/gtkprintunixdialog.c:3682
+#: ../gtk/gtkprintunixdialog.c:3787
 msgid "_After:"
 msgstr "П_о�ле:"
 
 #. Translators: this is the tab label for the notebook tab containing
 #. * job-specific options in the print dialog
 #.
-#: gtk/gtkprintunixdialog.c:3700
+#: ../gtk/gtkprintunixdialog.c:3806
 msgid "Job"
 msgstr "По�ао"
 
-#: gtk/gtkprintunixdialog.c:3766
+#: ../gtk/gtkprintunixdialog.c:3872
 msgid "Advanced"
 msgstr "�апредно"
 
 #. Translators: this will appear as tab label in print dialog.
-#: gtk/gtkprintunixdialog.c:3804
+#: ../gtk/gtkprintunixdialog.c:3910
 msgid "Image Quality"
 msgstr "Квалитет �лике"
 
 #. Translators: this will appear as tab label in print dialog.
-#: gtk/gtkprintunixdialog.c:3808
+#: ../gtk/gtkprintunixdialog.c:3914
 msgid "Color"
 msgstr "Боја"
 
 #. Translators: this will appear as tab label in print dialog.
 #. It's a typographical term, as in "Binding and finishing"
-#: gtk/gtkprintunixdialog.c:3813
+#: ../gtk/gtkprintunixdialog.c:3919
 msgid "Finishing"
 msgstr "Завршавам"
 
-#: gtk/gtkprintunixdialog.c:3823
+#: ../gtk/gtkprintunixdialog.c:3929
 msgid "Some of the settings in the dialog conflict"
-msgstr "�ека подешавања у прозорчету �е �ударају"
+msgstr "�ека подешавања у прозорчету �е �укобљавају"
 
-#: gtk/gtkprintunixdialog.c:3846
+#: ../gtk/gtkprintunixdialog.c:3952
 msgid "Print"
 msgstr "Штампај"
 
-#: gtk/gtkrc.c:2834
-#, c-format
-msgid "Unable to find include file: \"%s\""
-msgstr "�е могу пронаћи датотеку за укључивање: „%s“"
-
-#: gtk/gtkrc.c:3470 gtk/gtkrc.c:3473
-#, c-format
-msgid "Unable to locate image file in pixmap_path: \"%s\""
-msgstr "�е могу пронаћи датотеку �а �ликом у pixmap_path: „%s“"
-
-#: gtk/gtkrecentaction.c:165 gtk/gtkrecentaction.c:173
-#: gtk/gtkrecentchoosermenu.c:615 gtk/gtkrecentchoosermenu.c:623
-#, c-format
-msgid "This function is not implemented for widgets of class '%s'"
-msgstr "Ова функција није имплементирана за контроле у кла�и „%s“"
-
-#: gtk/gtkrecentchooserdefault.c:482
+#: ../gtk/gtkrecentchooserdefault.c:485
 msgid "Select which type of documents are shown"
-msgstr "Изабери које вр�те докумената �е приказују"
+msgstr "Изаберите које вр�те докумената �е приказују"
 
-#: gtk/gtkrecentchooserdefault.c:1138 gtk/gtkrecentchooserdefault.c:1175
+#: ../gtk/gtkrecentchooserdefault.c:1142 ../gtk/gtkrecentchooserdefault.c:1179
 #, c-format
 msgid "No item for URI '%s' found"
-msgstr "�ије пронађена �тавка за УРИ „%s“"
+msgstr "�и�ам пронашао �тавку за адре�у „%s“"
 
-#: gtk/gtkrecentchooserdefault.c:1302
+#: ../gtk/gtkrecentchooserdefault.c:1306
 msgid "Untitled filter"
 msgstr "�еименовани филтер"
 
-#: gtk/gtkrecentchooserdefault.c:1655
+#: ../gtk/gtkrecentchooserdefault.c:1659
 msgid "Could not remove item"
-msgstr "�е могу да изаберем �тавку"
+msgstr "�е могу да уклоним �тавку"
 
-#: gtk/gtkrecentchooserdefault.c:1699
+#: ../gtk/gtkrecentchooserdefault.c:1703
 msgid "Could not clear list"
-msgstr "�е могу да очи�тим ли�ту"
+msgstr "�е могу да очи�тим �пи�ак"
 
-#: gtk/gtkrecentchooserdefault.c:1783
+#: ../gtk/gtkrecentchooserdefault.c:1787
 msgid "Copy _Location"
 msgstr "Умножи _путању"
 
-#: gtk/gtkrecentchooserdefault.c:1796
+#: ../gtk/gtkrecentchooserdefault.c:1800
 msgid "_Remove From List"
-msgstr "У_клони из ли�те"
+msgstr "У_клони �а �пи�ка"
 
-#: gtk/gtkrecentchooserdefault.c:1805
+#: ../gtk/gtkrecentchooserdefault.c:1809
 msgid "_Clear List"
-msgstr "_Очи�ти ли�ту"
+msgstr "_Очи�ти �пи�ак"
 
-#: gtk/gtkrecentchooserdefault.c:1819
+#: ../gtk/gtkrecentchooserdefault.c:1823
 msgid "Show _Private Resources"
 msgstr "Прикажи _приватне ре�ур�е"
 
@@ -2013,21 +2317,21 @@ msgstr "Прикажи _приватне ре�ур�е"
 #. * user appended or prepended custom menu items to the
 #. * recent chooser menu widget.
 #.
-#: gtk/gtkrecentchoosermenu.c:369
+#: ../gtk/gtkrecentchoosermenu.c:362
 msgid "No items found"
-msgstr "�и једна �тавка није пронађена"
+msgstr "�и�ам пронашао ниједну �тавку"
 
-#: gtk/gtkrecentchoosermenu.c:535 gtk/gtkrecentchoosermenu.c:591
+#: ../gtk/gtkrecentchoosermenu.c:528 ../gtk/gtkrecentchoosermenu.c:584
 #, c-format
 msgid "No recently used resource found with URI `%s'"
-msgstr "�ије пронађен �коро коришћен ре�ур� �а УРИ адре�ом „%s“"
+msgstr "�и�ам пронашао �корашње коришћен ре�ур� �а адре�ом „%s“"
 
-#: gtk/gtkrecentchoosermenu.c:802
+#: ../gtk/gtkrecentchoosermenu.c:794
 #, c-format
 msgid "Open '%s'"
 msgstr "Отвори „%s“"
 
-#: gtk/gtkrecentchoosermenu.c:832
+#: ../gtk/gtkrecentchoosermenu.c:824
 msgid "Unknown item"
 msgstr "�епозната �тавка"
 
@@ -2036,7 +2340,7 @@ msgstr "�епозната �тавка"
 #. * the %s is the name of the item. Please keep the _ in front
 #. * of the number to give these menu items a mnemonic.
 #.
-#: gtk/gtkrecentchoosermenu.c:843
+#: ../gtk/gtkrecentchoosermenu.c:835
 #, c-format
 msgctxt "recent menu label"
 msgid "_%d. %s"
@@ -2045,46 +2349,43 @@ msgstr "_%d. %s"
 #. This is the format that is used for items in a recent files menu.
 #. * The %d is the number of the item, the %s is the name of the item.
 #.
-#: gtk/gtkrecentchoosermenu.c:848
+#: ../gtk/gtkrecentchoosermenu.c:840
 #, c-format
 msgctxt "recent menu label"
 msgid "%d. %s"
 msgstr "%d. %s"
 
-#: gtk/gtkrecentmanager.c:980 gtk/gtkrecentmanager.c:993
-#: gtk/gtkrecentmanager.c:1131 gtk/gtkrecentmanager.c:1141
-#: gtk/gtkrecentmanager.c:1194 gtk/gtkrecentmanager.c:1203
-#: gtk/gtkrecentmanager.c:1218
+#: ../gtk/gtkrecentmanager.c:1006 ../gtk/gtkrecentmanager.c:1019
+#: ../gtk/gtkrecentmanager.c:1156 ../gtk/gtkrecentmanager.c:1166
+#: ../gtk/gtkrecentmanager.c:1218 ../gtk/gtkrecentmanager.c:1227
+#: ../gtk/gtkrecentmanager.c:1242
 #, c-format
 msgid "Unable to find an item with URI '%s'"
-msgstr "�е могу пронаћи �тавка �а УРИ адре�ом „%s“"
-
-#: gtk/gtkspinner.c:456
-msgctxt "throbbing progress animation widget"
-msgid "Spinner"
-msgstr "Вртешка"
+msgstr "�е могу да пронађем �тавку �а адре�ом „%s“"
 
-#: gtk/gtkspinner.c:457
-msgid "Provides visual indication of progress"
-msgstr "Једно�тавно приказује напредак неке радње"
+#: ../gtk/gtkrecentmanager.c:2442
+#, c-format
+msgid "No registered application with name '%s' for item with URI '%s' found"
+msgstr ""
+"�и�ам пронашао реги�трован програм под називом „%s“ за �тавку �а адре�ом „%s“"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: gtk/gtkstock.c:313
+#: ../gtk/gtkstock.c:313
 msgctxt "Stock label"
 msgid "Information"
 msgstr "Обавештење"
 
-#: gtk/gtkstock.c:314
+#: ../gtk/gtkstock.c:314
 msgctxt "Stock label"
 msgid "Warning"
 msgstr "Упозорење"
 
-#: gtk/gtkstock.c:315
+#: ../gtk/gtkstock.c:315
 msgctxt "Stock label"
 msgid "Error"
 msgstr "Грешка"
 
-#: gtk/gtkstock.c:316
+#: ../gtk/gtkstock.c:316
 msgctxt "Stock label"
 msgid "Question"
 msgstr "Питање"
@@ -2092,1946 +2393,1956 @@ msgstr "Питање"
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: gtk/gtkstock.c:321
+#: ../gtk/gtkstock.c:321
 msgctxt "Stock label"
 msgid "_About"
 msgstr "_О програму"
 
-#: gtk/gtkstock.c:322
+#: ../gtk/gtkstock.c:322
 msgctxt "Stock label"
 msgid "_Add"
 msgstr "_Додај"
 
-#: gtk/gtkstock.c:323
+#: ../gtk/gtkstock.c:323
 msgctxt "Stock label"
 msgid "_Apply"
 msgstr "_Примени"
 
-#: gtk/gtkstock.c:324
+#: ../gtk/gtkstock.c:324
 msgctxt "Stock label"
 msgid "_Bold"
-msgstr "За_црњено"
+msgstr "_Подебљано"
 
-#: gtk/gtkstock.c:325
+#: ../gtk/gtkstock.c:325
 msgctxt "Stock label"
 msgid "_Cancel"
 msgstr "О_ду�тани"
 
-#: gtk/gtkstock.c:326
-#, fuzzy
+#: ../gtk/gtkstock.c:326
 msgctxt "Stock label"
 msgid "_CD-ROM"
 msgstr "_ЦД уређај"
 
-#: gtk/gtkstock.c:327
+#: ../gtk/gtkstock.c:327
 msgctxt "Stock label"
 msgid "_Clear"
 msgstr "_Очи�ти"
 
-#: gtk/gtkstock.c:328
+#: ../gtk/gtkstock.c:328
 msgctxt "Stock label"
 msgid "_Close"
 msgstr "_Затвори"
 
-#: gtk/gtkstock.c:329
+#: ../gtk/gtkstock.c:329
 msgctxt "Stock label"
 msgid "C_onnect"
 msgstr "У�по�тави ве_зу"
 
-#: gtk/gtkstock.c:330
+#: ../gtk/gtkstock.c:330
 msgctxt "Stock label"
 msgid "_Convert"
 msgstr "_Претвори"
 
-#: gtk/gtkstock.c:331
+#: ../gtk/gtkstock.c:331
 msgctxt "Stock label"
 msgid "_Copy"
 msgstr "_Умножи"
 
-#: gtk/gtkstock.c:332
+#: ../gtk/gtkstock.c:332
 msgctxt "Stock label"
 msgid "Cu_t"
 msgstr "_И�еци"
 
-#: gtk/gtkstock.c:333
+#: ../gtk/gtkstock.c:333
 msgctxt "Stock label"
 msgid "_Delete"
 msgstr "_Обриши"
 
-#: gtk/gtkstock.c:334
+#: ../gtk/gtkstock.c:334
 msgctxt "Stock label"
 msgid "_Discard"
 msgstr "_Одбаци"
 
-#: gtk/gtkstock.c:335
+#: ../gtk/gtkstock.c:335
 msgctxt "Stock label"
 msgid "_Disconnect"
 msgstr "П_рекини везу"
 
-#: gtk/gtkstock.c:336
+#: ../gtk/gtkstock.c:336
 msgctxt "Stock label"
 msgid "_Execute"
 msgstr "_Изврши"
 
-#: gtk/gtkstock.c:337
+#: ../gtk/gtkstock.c:337
 msgctxt "Stock label"
 msgid "_Edit"
 msgstr "_Уреди"
 
-#: gtk/gtkstock.c:338
+#: ../gtk/gtkstock.c:338
 msgctxt "Stock label"
 msgid "_File"
 msgstr "_Датотека"
 
-#: gtk/gtkstock.c:339
+#: ../gtk/gtkstock.c:339
 msgctxt "Stock label"
 msgid "_Find"
 msgstr "_�ађи"
 
-#: gtk/gtkstock.c:340
+#: ../gtk/gtkstock.c:340
 msgctxt "Stock label"
 msgid "Find and _Replace"
 msgstr "�ађи и _замени"
 
-#: gtk/gtkstock.c:341
+#: ../gtk/gtkstock.c:341
 msgctxt "Stock label"
 msgid "_Floppy"
 msgstr "Ди�_кета"
 
-#: gtk/gtkstock.c:342
+#: ../gtk/gtkstock.c:342
 msgctxt "Stock label"
 msgid "_Fullscreen"
 msgstr "_Цео екран"
 
-#: gtk/gtkstock.c:343
+#: ../gtk/gtkstock.c:343
 msgctxt "Stock label"
 msgid "_Leave Fullscreen"
 msgstr "�апу�ти _цео екран"
 
 #. This is a navigation label as in "go to the bottom of the page"
-#: gtk/gtkstock.c:345
+#: ../gtk/gtkstock.c:345
 msgctxt "Stock label, navigation"
 msgid "_Bottom"
-msgstr "_Доле:"
+msgstr "_Доле"
 
 #. This is a navigation label as in "go to the first page"
-#: gtk/gtkstock.c:347
+#: ../gtk/gtkstock.c:347
 msgctxt "Stock label, navigation"
 msgid "_First"
-msgstr "П_рви"
+msgstr "П_рво"
 
 #. This is a navigation label as in "go to the last page"
-#: gtk/gtkstock.c:349
+#: ../gtk/gtkstock.c:349
 msgctxt "Stock label, navigation"
 msgid "_Last"
-msgstr "По�лед_њи"
+msgstr "По�лед_ње"
 
 #. This is a navigation label as in "go to the top of the page"
-#: gtk/gtkstock.c:351
+#: ../gtk/gtkstock.c:351
 msgctxt "Stock label, navigation"
 msgid "_Top"
 msgstr "_Горе:"
 
 #. This is a navigation label as in "go back"
-#: gtk/gtkstock.c:353
+#: ../gtk/gtkstock.c:353
 msgctxt "Stock label, navigation"
 msgid "_Back"
 msgstr "_�азад"
 
 #. This is a navigation label as in "go down"
-#: gtk/gtkstock.c:355
+#: ../gtk/gtkstock.c:355
 msgctxt "Stock label, navigation"
 msgid "_Down"
 msgstr "_Доле"
 
 #. This is a navigation label as in "go forward"
-#: gtk/gtkstock.c:357
+#: ../gtk/gtkstock.c:357
 msgctxt "Stock label, navigation"
 msgid "_Forward"
 msgstr "�а_пред"
 
 #. This is a navigation label as in "go up"
-#: gtk/gtkstock.c:359
+#: ../gtk/gtkstock.c:359
 msgctxt "Stock label, navigation"
 msgid "_Up"
 msgstr "_Горе"
 
 # Или „хард ди�к“
-#: gtk/gtkstock.c:360
-#, fuzzy
+#: ../gtk/gtkstock.c:360
 msgctxt "Stock label"
 msgid "_Hard Disk"
 msgstr "_Тврди ди�к"
 
-#: gtk/gtkstock.c:361
+#: ../gtk/gtkstock.c:361
 msgctxt "Stock label"
 msgid "_Help"
 msgstr "_Помоћ"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: gtk/gtkstock.c:362
+#: ../gtk/gtkstock.c:362
 msgctxt "Stock label"
 msgid "_Home"
 msgstr "_Почетак"
 
-#: gtk/gtkstock.c:363
+#: ../gtk/gtkstock.c:363
 msgctxt "Stock label"
 msgid "Increase Indent"
 msgstr "Повећај увлачење"
 
-#: gtk/gtkstock.c:364
+#: ../gtk/gtkstock.c:364
 msgctxt "Stock label"
 msgid "Decrease Indent"
 msgstr "Умањи увлачење"
 
-#: gtk/gtkstock.c:365
+#: ../gtk/gtkstock.c:365
 msgctxt "Stock label"
 msgid "_Index"
 msgstr "_Индек�"
 
-#: gtk/gtkstock.c:366
+#: ../gtk/gtkstock.c:366
 msgctxt "Stock label"
 msgid "_Information"
 msgstr "По_даци"
 
-#: gtk/gtkstock.c:367
+#: ../gtk/gtkstock.c:367
 msgctxt "Stock label"
 msgid "_Italic"
 msgstr "_Курзив"
 
-#: gtk/gtkstock.c:368
+#: ../gtk/gtkstock.c:368
 msgctxt "Stock label"
 msgid "_Jump to"
 msgstr "_Иди на"
 
 #. This is about text justification, "centered text"
-#: gtk/gtkstock.c:370
+#: ../gtk/gtkstock.c:370
 msgctxt "Stock label"
 msgid "_Center"
-msgstr "_Претвори"
+msgstr "_Центрирај"
 
 #. This is about text justification
-#: gtk/gtkstock.c:372
+#: ../gtk/gtkstock.c:372
 msgctxt "Stock label"
 msgid "_Fill"
-msgstr "Дато_теке"
+msgstr "_Попуни"
 
 #. This is about text justification, "left-justified text"
-#: gtk/gtkstock.c:374
+#: ../gtk/gtkstock.c:374
 msgctxt "Stock label"
 msgid "_Left"
-msgstr "_Лево:"
+msgstr "_Лево"
 
 #. This is about text justification, "right-justified text"
-#: gtk/gtkstock.c:376
+#: ../gtk/gtkstock.c:376
 msgctxt "Stock label"
 msgid "_Right"
-msgstr "Д_е�но:"
+msgstr "Д_е�но"
 
 #. Media label, as in "fast forward"
-#: gtk/gtkstock.c:379
+#: ../gtk/gtkstock.c:379
 msgctxt "Stock label, media"
 msgid "_Forward"
 msgstr "�а_пред"
 
 #. Media label, as in "next song"
-#: gtk/gtkstock.c:381
+#: ../gtk/gtkstock.c:381
 msgctxt "Stock label, media"
 msgid "_Next"
-msgstr "_�ово"
+msgstr "_Следеће"
 
 #. Media label, as in "pause music"
-#: gtk/gtkstock.c:383
+#: ../gtk/gtkstock.c:383
 msgctxt "Stock label, media"
 msgid "P_ause"
-msgstr "Зау�тављено"
+msgstr "Па_узирај"
 
 #. Media label, as in "play music"
-#: gtk/gtkstock.c:385
+#: ../gtk/gtkstock.c:385
 msgctxt "Stock label, media"
 msgid "_Play"
-msgstr "_Ме�та"
+msgstr "_Пу�ти"
 
 #. Media label, as in  "previous song"
-#: gtk/gtkstock.c:387
+#: ../gtk/gtkstock.c:387
 msgctxt "Stock label, media"
 msgid "Pre_vious"
-msgstr "Пре_тходна"
+msgstr "Пре_тходно"
 
 #. Media label
-#: gtk/gtkstock.c:389
+#: ../gtk/gtkstock.c:389
 msgctxt "Stock label, media"
 msgid "_Record"
 msgstr "С_ними"
 
 # хм, хм?
 #. Media label
-#: gtk/gtkstock.c:391
+#: ../gtk/gtkstock.c:391
 msgctxt "Stock label, media"
 msgid "R_ewind"
 msgstr "Пре_мотај"
 
 #. Media label
-#: gtk/gtkstock.c:393
+#: ../gtk/gtkstock.c:393
 msgctxt "Stock label, media"
 msgid "_Stop"
 msgstr "_Зау�тави"
 
-#: gtk/gtkstock.c:394
+#: ../gtk/gtkstock.c:394
 msgctxt "Stock label"
 msgid "_Network"
 msgstr "_Мрежа"
 
-#: gtk/gtkstock.c:395
+#: ../gtk/gtkstock.c:395
 msgctxt "Stock label"
 msgid "_New"
 msgstr "_�ово"
 
-#: gtk/gtkstock.c:396
+#: ../gtk/gtkstock.c:396
 msgctxt "Stock label"
 msgid "_No"
 msgstr "_�е"
 
-#: gtk/gtkstock.c:397
+#: ../gtk/gtkstock.c:397
 msgctxt "Stock label"
 msgid "_OK"
 msgstr "У _реду"
 
-#: gtk/gtkstock.c:398
+#: ../gtk/gtkstock.c:398
 msgctxt "Stock label"
 msgid "_Open"
 msgstr "_Отвори"
 
 #. Page orientation
-#: gtk/gtkstock.c:400
+#: ../gtk/gtkstock.c:400
 msgctxt "Stock label"
 msgid "Landscape"
 msgstr "Положено"
 
 #. Page orientation
-#: gtk/gtkstock.c:402
+#: ../gtk/gtkstock.c:402
 msgctxt "Stock label"
 msgid "Portrait"
-msgstr "Обрнуто"
+msgstr "У�правно"
 
 #. Page orientation
-#: gtk/gtkstock.c:404
+#: ../gtk/gtkstock.c:404
 msgctxt "Stock label"
 msgid "Reverse landscape"
 msgstr "Обрнуто, положено"
 
 #. Page orientation
-#: gtk/gtkstock.c:406
+#: ../gtk/gtkstock.c:406
 msgctxt "Stock label"
 msgid "Reverse portrait"
 msgstr "Обрнуто, у�правно"
 
-#: gtk/gtkstock.c:407
+#: ../gtk/gtkstock.c:407
 msgctxt "Stock label"
 msgid "Page Set_up"
 msgstr "Поде_шавање �тране"
 
-#: gtk/gtkstock.c:408
+#: ../gtk/gtkstock.c:408
 msgctxt "Stock label"
 msgid "_Paste"
 msgstr "У_баци"
 
-#: gtk/gtkstock.c:409
+#: ../gtk/gtkstock.c:409
 msgctxt "Stock label"
 msgid "_Preferences"
 msgstr "По�_тавке"
 
-#: gtk/gtkstock.c:410
+#: ../gtk/gtkstock.c:410
 msgctxt "Stock label"
 msgid "_Print"
 msgstr "_Штампај"
 
-#: gtk/gtkstock.c:411
+#: ../gtk/gtkstock.c:411
 msgctxt "Stock label"
 msgid "Print Pre_view"
 msgstr "Пре_глед пред штампу"
 
-#: gtk/gtkstock.c:412
+#: ../gtk/gtkstock.c:412
 msgctxt "Stock label"
 msgid "_Properties"
 msgstr "_О�обине"
 
-#: gtk/gtkstock.c:413
+#: ../gtk/gtkstock.c:413
 msgctxt "Stock label"
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: gtk/gtkstock.c:414
+#: ../gtk/gtkstock.c:414
 msgctxt "Stock label"
 msgid "_Redo"
 msgstr "_Понови"
 
-#: gtk/gtkstock.c:415
+#: ../gtk/gtkstock.c:415
 msgctxt "Stock label"
 msgid "_Refresh"
 msgstr "_О�вежи"
 
-#: gtk/gtkstock.c:416
+#: ../gtk/gtkstock.c:416
 msgctxt "Stock label"
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: gtk/gtkstock.c:417
+#: ../gtk/gtkstock.c:417
 msgctxt "Stock label"
 msgid "_Revert"
 msgstr "_Врати"
 
-#: gtk/gtkstock.c:418
+#: ../gtk/gtkstock.c:418
 msgctxt "Stock label"
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: gtk/gtkstock.c:419
+#: ../gtk/gtkstock.c:419
 msgctxt "Stock label"
 msgid "Save _As"
 msgstr "Сачувај _као"
 
-#: gtk/gtkstock.c:420
+#: ../gtk/gtkstock.c:420
 msgctxt "Stock label"
 msgid "Select _All"
 msgstr "Изабери _�ве"
 
-#: gtk/gtkstock.c:421
+#: ../gtk/gtkstock.c:421
 msgctxt "Stock label"
 msgid "_Color"
 msgstr "_Боја"
 
-#: gtk/gtkstock.c:422
+#: ../gtk/gtkstock.c:422
 msgctxt "Stock label"
 msgid "_Font"
 msgstr "_Фонт"
 
 #. Sorting direction
-#: gtk/gtkstock.c:424
+#: ../gtk/gtkstock.c:424
 msgctxt "Stock label"
 msgid "_Ascending"
 msgstr "_Ра�тући"
 
 #. Sorting direction
-#: gtk/gtkstock.c:426
+#: ../gtk/gtkstock.c:426
 msgctxt "Stock label"
 msgid "_Descending"
 msgstr "_Опадајући"
 
-#: gtk/gtkstock.c:427
+#: ../gtk/gtkstock.c:427
 msgctxt "Stock label"
 msgid "_Spell Check"
 msgstr "_Провера пи�ања"
 
-#: gtk/gtkstock.c:428
+#: ../gtk/gtkstock.c:428
 msgctxt "Stock label"
 msgid "_Stop"
 msgstr "_Зау�тави"
 
 #. Font variant
-#: gtk/gtkstock.c:430
+#: ../gtk/gtkstock.c:430
 msgctxt "Stock label"
 msgid "_Strikethrough"
 msgstr "_Прецртај"
 
-#: gtk/gtkstock.c:431
+#: ../gtk/gtkstock.c:431
 msgctxt "Stock label"
 msgid "_Undelete"
 msgstr "_Поврати"
 
 #. Font variant
-#: gtk/gtkstock.c:433
+#: ../gtk/gtkstock.c:433
 msgctxt "Stock label"
 msgid "_Underline"
 msgstr "_Подвуци"
 
-#: gtk/gtkstock.c:434
+#: ../gtk/gtkstock.c:434
 msgctxt "Stock label"
 msgid "_Undo"
 msgstr "_Опозови"
 
-#: gtk/gtkstock.c:435
+#: ../gtk/gtkstock.c:435
 msgctxt "Stock label"
 msgid "_Yes"
 msgstr "_Да"
 
 #. Zoom
-#: gtk/gtkstock.c:437
+#: ../gtk/gtkstock.c:437
 msgctxt "Stock label"
 msgid "_Normal Size"
 msgstr "_Обична величина"
 
 #. Zoom
-#: gtk/gtkstock.c:439
+#: ../gtk/gtkstock.c:439
 msgctxt "Stock label"
 msgid "Best _Fit"
 msgstr "_�ајбоље �лагање"
 
-#: gtk/gtkstock.c:440
+#: ../gtk/gtkstock.c:440
 msgctxt "Stock label"
 msgid "Zoom _In"
 msgstr "У_већај"
 
-#: gtk/gtkstock.c:441
+#: ../gtk/gtkstock.c:441
 msgctxt "Stock label"
 msgid "Zoom _Out"
 msgstr "У_мањи"
 
-#: gtk/gtktextbufferrichtext.c:650
+#. Translators: if the "on" state label requires more than three
+#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
+#. * the state
+#.
+#: ../gtk/gtkswitch.c:335 ../gtk/gtkswitch.c:395 ../gtk/gtkswitch.c:602
+msgctxt "switch"
+msgid "ON"
+msgstr "УКЉ"
+
+#. Translators: if the "off" state label requires more than three
+#. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
+#.
+#: ../gtk/gtkswitch.c:343 ../gtk/gtkswitch.c:396 ../gtk/gtkswitch.c:631
+msgctxt "switch"
+msgid "OFF"
+msgstr "ИСК"
+
+#: ../gtk/gtktextbufferrichtext.c:651
 #, c-format
 msgid "Unknown error when trying to deserialize %s"
-msgstr "�епозната грешка при ра�пакивању из ни�ке за %s"
+msgstr "�епозната грешка при ра�пакивању „%s“"
 
-#: gtk/gtktextbufferrichtext.c:709
+#: ../gtk/gtktextbufferrichtext.c:710
 #, c-format
 msgid "No deserialize function found for format %s"
-msgstr "�ије пронађена функција за ра�пакивање формата %s из ни�ке"
+msgstr "�и�ам пронашао функцију за ра�пакивање формата „%s“"
 
-#: gtk/gtktextbufferserialize.c:795 gtk/gtktextbufferserialize.c:821
+#: ../gtk/gtktextbufferserialize.c:800 ../gtk/gtktextbufferserialize.c:826
 #, c-format
 msgid "Both \"id\" and \"name\" were found on the <%s> element"
-msgstr "И „id“ и „name“ �у пронађени у елементу <%s>"
+msgstr "Пронашао �ам и „id“ и „name“ у елементу <%s>"
 
-#: gtk/gtktextbufferserialize.c:805 gtk/gtktextbufferserialize.c:831
+#: ../gtk/gtktextbufferserialize.c:810 ../gtk/gtktextbufferserialize.c:836
 #, c-format
 msgid "The attribute \"%s\" was found twice on the <%s> element"
-msgstr "�трибут „%s“ је пронађен два пута у елементу <%s>"
+msgstr "�трибут „%s“ �ам пронашао два пута у елементу <%s>"
 
-#: gtk/gtktextbufferserialize.c:845
-#, fuzzy, c-format
+#: ../gtk/gtktextbufferserialize.c:852
+#, c-format
 msgid "<%s> element has invalid ID \"%s\""
-msgstr "Елемент <%s> има неи�правну ИД ознаку „%s“"
+msgstr "Елемент <%s> има неи�праван ИД „%s“"
 
-#: gtk/gtktextbufferserialize.c:855
+#: ../gtk/gtktextbufferserialize.c:862
 #, c-format
 msgid "<%s> element has neither a \"name\" nor an \"id\" attribute"
 msgstr "Елемент <%s> нема ни атрибут „id“ нити „name“"
 
-#: gtk/gtktextbufferserialize.c:942
+#: ../gtk/gtktextbufferserialize.c:949
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
-msgstr "�трибут „%s“ је поновљен два пута у и�том елементу <%s>"
+msgstr "�трибут „%s“ је поновљен два пута у и�том <%s> елементу"
 
-#: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985
+#: ../gtk/gtktextbufferserialize.c:967 ../gtk/gtktextbufferserialize.c:992
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "�трибут „%s“ не може бити на овај начин унутар елемента <%s>"
 
-#: gtk/gtktextbufferserialize.c:1024
+#: ../gtk/gtktextbufferserialize.c:1031
 #, c-format
 msgid "Tag \"%s\" has not been defined."
 msgstr "Ознака „%s“ није дефини�ана."
 
-#: gtk/gtktextbufferserialize.c:1036
+#: ../gtk/gtktextbufferserialize.c:1043
 msgid "Anonymous tag found and tags can not be created."
 msgstr "Безимена ознака је пронађена па ознаке не могу бити направљене."
 
-#: gtk/gtktextbufferserialize.c:1047
+#: ../gtk/gtktextbufferserialize.c:1054
 #, c-format
 msgid "Tag \"%s\" does not exist in buffer and tags can not be created."
 msgstr "Ознака „%s“ не по�тоји у баферу па ознаке не могу бити направљене."
 
-#: gtk/gtktextbufferserialize.c:1146 gtk/gtktextbufferserialize.c:1221
-#: gtk/gtktextbufferserialize.c:1324 gtk/gtktextbufferserialize.c:1398
+#: ../gtk/gtktextbufferserialize.c:1153 ../gtk/gtktextbufferserialize.c:1228
+#: ../gtk/gtktextbufferserialize.c:1333 ../gtk/gtktextbufferserialize.c:1407
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
-msgstr "Елемент <%s> не може бити и�под <%s>"
+msgstr "Елемент <%s> не може да �тоји и�под <%s>"
 
-#: gtk/gtktextbufferserialize.c:1177
+#: ../gtk/gtktextbufferserialize.c:1184
 #, c-format
 msgid "\"%s\" is not a valid attribute type"
 msgstr "„%s“ није и�праван тип атрибута"
 
-#: gtk/gtktextbufferserialize.c:1185
+#: ../gtk/gtktextbufferserialize.c:1192
 #, c-format
 msgid "\"%s\" is not a valid attribute name"
 msgstr "„%s“ није и�правно име атрибута"
 
-#: gtk/gtktextbufferserialize.c:1195
+#: ../gtk/gtktextbufferserialize.c:1202
 #, c-format
 msgid ""
 "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
 msgstr "�ије могуће претворити „%s“ у вредно�т типа „%s“ за атрибут „%s“"
 
-#: gtk/gtktextbufferserialize.c:1204
+#: ../gtk/gtktextbufferserialize.c:1211
 #, c-format
 msgid "\"%s\" is not a valid value for attribute \"%s\""
 msgstr "„%s“ није и�прана вредно�т атрибута „%s“"
 
-#: gtk/gtktextbufferserialize.c:1289
+#: ../gtk/gtktextbufferserialize.c:1296
 #, c-format
 msgid "Tag \"%s\" already defined"
 msgstr "Ознака „%s“ је већ дефини�ана"
 
-#: gtk/gtktextbufferserialize.c:1300
+#: ../gtk/gtktextbufferserialize.c:1309
 #, c-format
 msgid "Tag \"%s\" has invalid priority \"%s\""
 msgstr "Ознака „%s“ има неи�праван приоритет „%s“"
 
-#: gtk/gtktextbufferserialize.c:1353
+#: ../gtk/gtktextbufferserialize.c:1362
 #, c-format
 msgid "Outermost element in text must be <text_view_markup> not <%s>"
 msgstr "Први �пољашњи елемент у тек�ту мора бити <text_view_markup> а не <%s>"
 
-#: gtk/gtktextbufferserialize.c:1362 gtk/gtktextbufferserialize.c:1378
+#: ../gtk/gtktextbufferserialize.c:1371 ../gtk/gtktextbufferserialize.c:1387
 #, c-format
 msgid "A <%s> element has already been specified"
 msgstr "Елемент <%s> је већ наведен"
 
-#: gtk/gtktextbufferserialize.c:1384
+#: ../gtk/gtktextbufferserialize.c:1393
 msgid "A <text> element can't occur before a <tags> element"
 msgstr "Елемент <text> �е не може појавити пре елемента <tags>"
 
-#: gtk/gtktextbufferserialize.c:1784
+#: ../gtk/gtktextbufferserialize.c:1793
 msgid "Serialized data is malformed"
 msgstr "Подаци ни�у лепо запаковани у ни�ку"
 
-#: gtk/gtktextbufferserialize.c:1862
+#: ../gtk/gtktextbufferserialize.c:1871
 msgid ""
 "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
 msgstr ""
-"Подаци ни�у лепо запаковани у ни�ку. Прва обла�т није "
-"GTKTEXTBUFFERCONTENTS-0001"
+"Подаци ни�у лепо запаковани у ни�ку. Прва обла�т није „GTKTEXTBUFFERCONTENTS-"
+"0001“"
 
-#: gtk/gtktextutil.c:60
+#: ../gtk/gtktextutil.c:60
 msgid "LRM _Left-to-right mark"
-msgstr "LRM Обележивач за �_лева-на-де�но"
+msgstr "LRM — Обележивач за �_лева-на-де�но"
 
-#: gtk/gtktextutil.c:61
+#: ../gtk/gtktextutil.c:61
 msgid "RLM _Right-to-left mark"
-msgstr "RLM Обележивач за �_де�на-на-лево"
+msgstr "RLM — Обележивач за �_де�на-на-лево"
 
-#: gtk/gtktextutil.c:62
+#: ../gtk/gtktextutil.c:62
 msgid "LRE Left-to-right _embedding"
-msgstr "LRE _убацивање �лева-на-де�но"
+msgstr "LRE — _убацивање �лева-на-де�но"
 
-#: gtk/gtktextutil.c:63
+#: ../gtk/gtktextutil.c:63
 msgid "RLE Right-to-left e_mbedding"
-msgstr "RLE у_бацивање �де�на-на-лево"
+msgstr "RLE — у_бацивање �де�на-на-лево"
 
-#: gtk/gtktextutil.c:64
+#: ../gtk/gtktextutil.c:64
 msgid "LRO Left-to-right _override"
-msgstr "LRO пр_иморавање �лева-на-де�но"
+msgstr "LRO — пр_иморавање �лева-на-де�но"
 
-#: gtk/gtktextutil.c:65
+#: ../gtk/gtktextutil.c:65
 msgid "RLO Right-to-left o_verride"
-msgstr "RLO приморава_ње �де�на-на-лево"
+msgstr "RLO — приморава_ње �де�на-на-лево"
 
-#: gtk/gtktextutil.c:66
+#: ../gtk/gtktextutil.c:66
 msgid "PDF _Pop directional formatting"
-msgstr "PDF _Почни у�мерен запи�"
+msgstr "PDF — _Почни у�мерен запи�"
 
-#: gtk/gtktextutil.c:67
+#: ../gtk/gtktextutil.c:67
 msgid "ZWS _Zero width space"
-msgstr "ZWS _размак без ширине"
+msgstr "ZWS — _размак без ширине"
 
-#: gtk/gtktextutil.c:68
+#: ../gtk/gtktextutil.c:68
 msgid "ZWJ Zero width _joiner"
-msgstr "ZWJ _�појница без ширине"
+msgstr "ZWJ — _�појница без ширине"
 
-#: gtk/gtktextutil.c:69
+#: ../gtk/gtktextutil.c:69
 msgid "ZWNJ Zero width _non-joiner"
-msgstr "ZWNJ _не�појница без ширине"
-
-#: gtk/gtkthemes.c:72
-#, c-format
-msgid "Unable to locate theme engine in module_path: \"%s\","
-msgstr "�е могу да пронађем мотор теме у путањи за модуле: „%s“,"
+msgstr "ZWNJ — _не�појница без ширине"
 
-#: gtk/gtkuimanager.c:1505
+#: ../gtk/gtkuimanager.c:1760
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
-msgstr "�еочекивана почетна ознака „%s“ у %d. реду, %d. знак"
+msgstr "�еочекивана почетна ознака „%s“ у %d° реду, знак %d"
 
-#: gtk/gtkuimanager.c:1595
+#: ../gtk/gtkuimanager.c:1850
 #, c-format
 msgid "Unexpected character data on line %d char %d"
-msgstr "�еочекивани знаковни подаци у %d. реду, %d. знак"
+msgstr "�еочекивани знаковни подаци у %d° реду, знак %d"
 
-#: gtk/gtkuimanager.c:2427
+#: ../gtk/gtkuimanager.c:2682
 msgid "Empty"
 msgstr "Празно"
 
-#: gtk/gtkvolumebutton.c:83
+#: ../gtk/gtkvolumebutton.c:170
 msgid "Volume"
-msgstr "Јачина"
+msgstr "Јачина звука"
 
-#: gtk/gtkvolumebutton.c:85
+#: ../gtk/gtkvolumebutton.c:172
 msgid "Turns volume down or up"
-msgstr "Мења јачину на доле или горе"
+msgstr "Појачава или �мањује јачину звука"
 
-#: gtk/gtkvolumebutton.c:88
+#: ../gtk/gtkvolumebutton.c:175
 msgid "Adjusts the volume"
-msgstr "Подешава јачину"
+msgstr "Подешава јачину звука"
 
-#: gtk/gtkvolumebutton.c:94 gtk/gtkvolumebutton.c:97
+#: ../gtk/gtkvolumebutton.c:181 ../gtk/gtkvolumebutton.c:184
 msgid "Volume Down"
-msgstr "Потишај"
+msgstr "Утишај"
 
-#: gtk/gtkvolumebutton.c:96
+#: ../gtk/gtkvolumebutton.c:183
 msgid "Decreases the volume"
-msgstr "Потишај звук"
+msgstr "Смањује јачину звука"
 
-#: gtk/gtkvolumebutton.c:100 gtk/gtkvolumebutton.c:103
+#: ../gtk/gtkvolumebutton.c:187 ../gtk/gtkvolumebutton.c:190
 msgid "Volume Up"
 msgstr "Појачај"
 
-#: gtk/gtkvolumebutton.c:102
+#: ../gtk/gtkvolumebutton.c:189
 msgid "Increases the volume"
-msgstr "Појачај звук"
+msgstr "Појачава јачину звука"
 
-#: gtk/gtkvolumebutton.c:160
+#: ../gtk/gtkvolumebutton.c:247
 msgid "Muted"
 msgstr "Утишано"
 
-#: gtk/gtkvolumebutton.c:164
+#: ../gtk/gtkvolumebutton.c:251
 msgid "Full Volume"
-msgstr "Пуна јачина"
+msgstr "Пуна јачина звука"
 
 #. Translators: this is the percentage of the current volume,
 #. * as used in the tooltip, eg. "49 %".
 #. * Translate the "%d" to "%Id" if you want to use localised digits,
 #. * or otherwise translate the "%d" to "%d".
 #.
-#: gtk/gtkvolumebutton.c:177
+#: ../gtk/gtkvolumebutton.c:264
 #, c-format
 msgctxt "volume percentage"
 msgid "%d %%"
 msgstr "%d %%"
 
-#: gtk/paper_names_offsets.c:4
+#: ../gtk/paper_names_offsets.c:4
 msgctxt "paper size"
 msgid "asme_f"
 msgstr "asme_f"
 
-#: gtk/paper_names_offsets.c:5
+#: ../gtk/paper_names_offsets.c:5
 msgctxt "paper size"
 msgid "A0x2"
 msgstr "�0x2"
 
-#: gtk/paper_names_offsets.c:6
+#: ../gtk/paper_names_offsets.c:6
 msgctxt "paper size"
 msgid "A0"
 msgstr "�0"
 
-#: gtk/paper_names_offsets.c:7
+#: ../gtk/paper_names_offsets.c:7
 msgctxt "paper size"
 msgid "A0x3"
 msgstr "�0x3"
 
-#: gtk/paper_names_offsets.c:8
+#: ../gtk/paper_names_offsets.c:8
 msgctxt "paper size"
 msgid "A1"
 msgstr "�1"
 
-#: gtk/paper_names_offsets.c:9
+#: ../gtk/paper_names_offsets.c:9
 msgctxt "paper size"
 msgid "A10"
 msgstr "�10"
 
-#: gtk/paper_names_offsets.c:10
+#: ../gtk/paper_names_offsets.c:10
 msgctxt "paper size"
 msgid "A1x3"
 msgstr "�1x3"
 
-#: gtk/paper_names_offsets.c:11
+#: ../gtk/paper_names_offsets.c:11
 msgctxt "paper size"
 msgid "A1x4"
 msgstr "�1x4"
 
-#: gtk/paper_names_offsets.c:12
+#: ../gtk/paper_names_offsets.c:12
 msgctxt "paper size"
 msgid "A2"
 msgstr "�2"
 
-#: gtk/paper_names_offsets.c:13
+#: ../gtk/paper_names_offsets.c:13
 msgctxt "paper size"
 msgid "A2x3"
 msgstr "�2x3"
 
-#: gtk/paper_names_offsets.c:14
+#: ../gtk/paper_names_offsets.c:14
 msgctxt "paper size"
 msgid "A2x4"
 msgstr "�2x4"
 
-#: gtk/paper_names_offsets.c:15
+#: ../gtk/paper_names_offsets.c:15
 msgctxt "paper size"
 msgid "A2x5"
 msgstr "�2x5"
 
-#: gtk/paper_names_offsets.c:16
+#: ../gtk/paper_names_offsets.c:16
 msgctxt "paper size"
 msgid "A3"
 msgstr "�3"
 
-#: gtk/paper_names_offsets.c:17
+#: ../gtk/paper_names_offsets.c:17
 msgctxt "paper size"
 msgid "A3 Extra"
-msgstr "�3 Extra"
+msgstr "�3 ек�тра"
 
-#: gtk/paper_names_offsets.c:18
+#: ../gtk/paper_names_offsets.c:18
 msgctxt "paper size"
 msgid "A3x3"
 msgstr "�3x3"
 
-#: gtk/paper_names_offsets.c:19
+#: ../gtk/paper_names_offsets.c:19
 msgctxt "paper size"
 msgid "A3x4"
 msgstr "�3x4"
 
-#: gtk/paper_names_offsets.c:20
+#: ../gtk/paper_names_offsets.c:20
 msgctxt "paper size"
 msgid "A3x5"
 msgstr "�3x5"
 
-#: gtk/paper_names_offsets.c:21
+#: ../gtk/paper_names_offsets.c:21
 msgctxt "paper size"
 msgid "A3x6"
 msgstr "�3x6"
 
-#: gtk/paper_names_offsets.c:22
+#: ../gtk/paper_names_offsets.c:22
 msgctxt "paper size"
 msgid "A3x7"
 msgstr "�3x7"
 
-#: gtk/paper_names_offsets.c:23
+#: ../gtk/paper_names_offsets.c:23
 msgctxt "paper size"
 msgid "A4"
 msgstr "�4"
 
-#: gtk/paper_names_offsets.c:24
+#: ../gtk/paper_names_offsets.c:24
 msgctxt "paper size"
 msgid "A4 Extra"
-msgstr "Ек�тра �4"
+msgstr "�4 ек�тра"
 
-#: gtk/paper_names_offsets.c:25
+#: ../gtk/paper_names_offsets.c:25
 msgctxt "paper size"
 msgid "A4 Tab"
 msgstr "�4 ролна"
 
-#: gtk/paper_names_offsets.c:26
+#: ../gtk/paper_names_offsets.c:26
 msgctxt "paper size"
 msgid "A4x3"
 msgstr "�4x3"
 
-#: gtk/paper_names_offsets.c:27
+#: ../gtk/paper_names_offsets.c:27
 msgctxt "paper size"
 msgid "A4x4"
 msgstr "�4x4"
 
-#: gtk/paper_names_offsets.c:28
+#: ../gtk/paper_names_offsets.c:28
 msgctxt "paper size"
 msgid "A4x5"
 msgstr "�4x5"
 
-#: gtk/paper_names_offsets.c:29
+#: ../gtk/paper_names_offsets.c:29
 msgctxt "paper size"
 msgid "A4x6"
 msgstr "�4x6"
 
-#: gtk/paper_names_offsets.c:30
+#: ../gtk/paper_names_offsets.c:30
 msgctxt "paper size"
 msgid "A4x7"
 msgstr "�4x7"
 
-#: gtk/paper_names_offsets.c:31
+#: ../gtk/paper_names_offsets.c:31
 msgctxt "paper size"
 msgid "A4x8"
 msgstr "�4x8"
 
-#: gtk/paper_names_offsets.c:32
+#: ../gtk/paper_names_offsets.c:32
 msgctxt "paper size"
 msgid "A4x9"
 msgstr "�4x9"
 
-#: gtk/paper_names_offsets.c:33
+#: ../gtk/paper_names_offsets.c:33
 msgctxt "paper size"
 msgid "A5"
 msgstr "�5"
 
-#: gtk/paper_names_offsets.c:34
+#: ../gtk/paper_names_offsets.c:34
 msgctxt "paper size"
 msgid "A5 Extra"
-msgstr "Ек�тра �5"
+msgstr "�5 ек�тра"
 
-#: gtk/paper_names_offsets.c:35
+#: ../gtk/paper_names_offsets.c:35
 msgctxt "paper size"
 msgid "A6"
 msgstr "�6"
 
-#: gtk/paper_names_offsets.c:36
+#: ../gtk/paper_names_offsets.c:36
 msgctxt "paper size"
 msgid "A7"
 msgstr "�7"
 
-#: gtk/paper_names_offsets.c:37
+#: ../gtk/paper_names_offsets.c:37
 msgctxt "paper size"
 msgid "A8"
 msgstr "�8"
 
-#: gtk/paper_names_offsets.c:38
+#: ../gtk/paper_names_offsets.c:38
 msgctxt "paper size"
 msgid "A9"
 msgstr "�9"
 
-#: gtk/paper_names_offsets.c:39
+#: ../gtk/paper_names_offsets.c:39
 msgctxt "paper size"
 msgid "B0"
 msgstr "Б0"
 
-#: gtk/paper_names_offsets.c:40
+#: ../gtk/paper_names_offsets.c:40
 msgctxt "paper size"
 msgid "B1"
 msgstr "Б1"
 
-#: gtk/paper_names_offsets.c:41
+#: ../gtk/paper_names_offsets.c:41
 msgctxt "paper size"
 msgid "B10"
 msgstr "Б10"
 
-#: gtk/paper_names_offsets.c:42
+#: ../gtk/paper_names_offsets.c:42
 msgctxt "paper size"
 msgid "B2"
 msgstr "Б2"
 
-#: gtk/paper_names_offsets.c:43
+#: ../gtk/paper_names_offsets.c:43
 msgctxt "paper size"
 msgid "B3"
 msgstr "Б3"
 
-#: gtk/paper_names_offsets.c:44
+#: ../gtk/paper_names_offsets.c:44
 msgctxt "paper size"
 msgid "B4"
 msgstr "Б4"
 
-#: gtk/paper_names_offsets.c:45
+#: ../gtk/paper_names_offsets.c:45
 msgctxt "paper size"
 msgid "B5"
 msgstr "Б5"
 
-#: gtk/paper_names_offsets.c:46
+#: ../gtk/paper_names_offsets.c:46
 msgctxt "paper size"
 msgid "B5 Extra"
-msgstr "Ек�тра Б5"
+msgstr "Б5 ек�тра"
 
-#: gtk/paper_names_offsets.c:47
+#: ../gtk/paper_names_offsets.c:47
 msgctxt "paper size"
 msgid "B6"
 msgstr "Б6"
 
-#: gtk/paper_names_offsets.c:48
+#: ../gtk/paper_names_offsets.c:48
 msgctxt "paper size"
 msgid "B6/C4"
 msgstr "Б6/Ц4"
 
-#: gtk/paper_names_offsets.c:49
+#: ../gtk/paper_names_offsets.c:49
 msgctxt "paper size"
 msgid "B7"
 msgstr "Б7"
 
-#: gtk/paper_names_offsets.c:50
+#: ../gtk/paper_names_offsets.c:50
 msgctxt "paper size"
 msgid "B8"
 msgstr "Б8"
 
-#: gtk/paper_names_offsets.c:51
+#: ../gtk/paper_names_offsets.c:51
 msgctxt "paper size"
 msgid "B9"
 msgstr "Б9"
 
-#: gtk/paper_names_offsets.c:52
+#: ../gtk/paper_names_offsets.c:52
 msgctxt "paper size"
 msgid "C0"
 msgstr "Ц0"
 
-#: gtk/paper_names_offsets.c:53
+#: ../gtk/paper_names_offsets.c:53
 msgctxt "paper size"
 msgid "C1"
 msgstr "Ц1"
 
-#: gtk/paper_names_offsets.c:54
+#: ../gtk/paper_names_offsets.c:54
 msgctxt "paper size"
 msgid "C10"
 msgstr "Ц10"
 
-#: gtk/paper_names_offsets.c:55
+#: ../gtk/paper_names_offsets.c:55
 msgctxt "paper size"
 msgid "C2"
 msgstr "Ц2"
 
-#: gtk/paper_names_offsets.c:56
+#: ../gtk/paper_names_offsets.c:56
 msgctxt "paper size"
 msgid "C3"
 msgstr "Ц3"
 
-#: gtk/paper_names_offsets.c:57
+#: ../gtk/paper_names_offsets.c:57
 msgctxt "paper size"
 msgid "C4"
 msgstr "Ц4"
 
-#: gtk/paper_names_offsets.c:58
+#: ../gtk/paper_names_offsets.c:58
 msgctxt "paper size"
 msgid "C5"
 msgstr "Ц5"
 
-#: gtk/paper_names_offsets.c:59
+#: ../gtk/paper_names_offsets.c:59
 msgctxt "paper size"
 msgid "C6"
 msgstr "Ц6"
 
-#: gtk/paper_names_offsets.c:60
+#: ../gtk/paper_names_offsets.c:60
 msgctxt "paper size"
 msgid "C6/C5"
 msgstr "Ц6/Ц5"
 
-#: gtk/paper_names_offsets.c:61
+#: ../gtk/paper_names_offsets.c:61
 msgctxt "paper size"
 msgid "C7"
 msgstr "Ц7"
 
-#: gtk/paper_names_offsets.c:62
+#: ../gtk/paper_names_offsets.c:62
 msgctxt "paper size"
 msgid "C7/C6"
 msgstr "Ц7/Ц6"
 
-#: gtk/paper_names_offsets.c:63
+#: ../gtk/paper_names_offsets.c:63
 msgctxt "paper size"
 msgid "C8"
 msgstr "Ц8"
 
-#: gtk/paper_names_offsets.c:64
+#: ../gtk/paper_names_offsets.c:64
 msgctxt "paper size"
 msgid "C9"
 msgstr "Ц9"
 
-#: gtk/paper_names_offsets.c:65
+#: ../gtk/paper_names_offsets.c:65
 msgctxt "paper size"
 msgid "DL Envelope"
 msgstr "ДЛ коверта"
 
-#: gtk/paper_names_offsets.c:66
+#: ../gtk/paper_names_offsets.c:66
 msgctxt "paper size"
 msgid "RA0"
 msgstr "Р�0"
 
-#: gtk/paper_names_offsets.c:67
+#: ../gtk/paper_names_offsets.c:67
 msgctxt "paper size"
 msgid "RA1"
 msgstr "Р�1"
 
-#: gtk/paper_names_offsets.c:68
+#: ../gtk/paper_names_offsets.c:68
 msgctxt "paper size"
 msgid "RA2"
 msgstr "Р�2"
 
-#: gtk/paper_names_offsets.c:69
+#: ../gtk/paper_names_offsets.c:69
 msgctxt "paper size"
 msgid "SRA0"
 msgstr "СР�0"
 
-#: gtk/paper_names_offsets.c:70
+#: ../gtk/paper_names_offsets.c:70
 msgctxt "paper size"
 msgid "SRA1"
 msgstr "СР�1"
 
-#: gtk/paper_names_offsets.c:71
+#: ../gtk/paper_names_offsets.c:71
 msgctxt "paper size"
 msgid "SRA2"
 msgstr "СР�2"
 
-#: gtk/paper_names_offsets.c:72
+#: ../gtk/paper_names_offsets.c:72
 msgctxt "paper size"
 msgid "JB0"
 msgstr "ЈБ0"
 
-#: gtk/paper_names_offsets.c:73
+#: ../gtk/paper_names_offsets.c:73
 msgctxt "paper size"
 msgid "JB1"
 msgstr "ЈБ1"
 
-#: gtk/paper_names_offsets.c:74
+#: ../gtk/paper_names_offsets.c:74
 msgctxt "paper size"
 msgid "JB10"
 msgstr "ЈБ10"
 
-#: gtk/paper_names_offsets.c:75
+#: ../gtk/paper_names_offsets.c:75
 msgctxt "paper size"
 msgid "JB2"
 msgstr "ЈБ2"
 
-#: gtk/paper_names_offsets.c:76
+#: ../gtk/paper_names_offsets.c:76
 msgctxt "paper size"
 msgid "JB3"
 msgstr "ЈБ3"
 
-#: gtk/paper_names_offsets.c:77
+#: ../gtk/paper_names_offsets.c:77
 msgctxt "paper size"
 msgid "JB4"
 msgstr "ЈБ4"
 
-#: gtk/paper_names_offsets.c:78
+#: ../gtk/paper_names_offsets.c:78
 msgctxt "paper size"
 msgid "JB5"
 msgstr "ЈБ5"
 
-#: gtk/paper_names_offsets.c:79
+#: ../gtk/paper_names_offsets.c:79
 msgctxt "paper size"
 msgid "JB6"
 msgstr "ЈБ6"
 
-#: gtk/paper_names_offsets.c:80
+#: ../gtk/paper_names_offsets.c:80
 msgctxt "paper size"
 msgid "JB7"
 msgstr "ЈБ7"
 
-#: gtk/paper_names_offsets.c:81
+#: ../gtk/paper_names_offsets.c:81
 msgctxt "paper size"
 msgid "JB8"
 msgstr "ЈБ8"
 
-#: gtk/paper_names_offsets.c:82
+#: ../gtk/paper_names_offsets.c:82
 msgctxt "paper size"
 msgid "JB9"
 msgstr "ЈБ9"
 
-#: gtk/paper_names_offsets.c:83
+#: ../gtk/paper_names_offsets.c:83
 msgctxt "paper size"
 msgid "jis exec"
-msgstr "jis exec"
+msgstr "ји� ек�ек"
 
-#: gtk/paper_names_offsets.c:84
+#: ../gtk/paper_names_offsets.c:84
 msgctxt "paper size"
 msgid "Choukei 2 Envelope"
 msgstr "чукеи 2 коверта"
 
-#: gtk/paper_names_offsets.c:85
+#: ../gtk/paper_names_offsets.c:85
 msgctxt "paper size"
 msgid "Choukei 3 Envelope"
 msgstr "чукеи 3 коверта"
 
-#: gtk/paper_names_offsets.c:86
+#: ../gtk/paper_names_offsets.c:86
 msgctxt "paper size"
 msgid "Choukei 4 Envelope"
 msgstr "чукеи 4 коверта"
 
-#: gtk/paper_names_offsets.c:87
+#: ../gtk/paper_names_offsets.c:87
 msgctxt "paper size"
 msgid "hagaki (postcard)"
 msgstr "хангаи (разгледница)"
 
-#: gtk/paper_names_offsets.c:88
+#: ../gtk/paper_names_offsets.c:88
 msgctxt "paper size"
 msgid "kahu Envelope"
 msgstr "каху коверта"
 
-#: gtk/paper_names_offsets.c:89
+#: ../gtk/paper_names_offsets.c:89
 msgctxt "paper size"
 msgid "kaku2 Envelope"
 msgstr "каху2 коверта"
 
-#: gtk/paper_names_offsets.c:90
+#: ../gtk/paper_names_offsets.c:90
 msgctxt "paper size"
 msgid "oufuku (reply postcard)"
 msgstr "оуфуку (одздравна разгледница)"
 
-#: gtk/paper_names_offsets.c:91
+#: ../gtk/paper_names_offsets.c:91
 msgctxt "paper size"
 msgid "you4 Envelope"
 msgstr "ју4 коверта"
 
-#: gtk/paper_names_offsets.c:92
+#: ../gtk/paper_names_offsets.c:92
 msgctxt "paper size"
 msgid "10x11"
 msgstr "10x11"
 
-#: gtk/paper_names_offsets.c:93
+#: ../gtk/paper_names_offsets.c:93
 msgctxt "paper size"
 msgid "10x13"
 msgstr "10x13"
 
-#: gtk/paper_names_offsets.c:94
+#: ../gtk/paper_names_offsets.c:94
 msgctxt "paper size"
 msgid "10x14"
 msgstr "10x14"
 
-#: gtk/paper_names_offsets.c:95 gtk/paper_names_offsets.c:96
+#: ../gtk/paper_names_offsets.c:95 ../gtk/paper_names_offsets.c:96
 msgctxt "paper size"
 msgid "10x15"
 msgstr "10x15"
 
-#: gtk/paper_names_offsets.c:97
+#: ../gtk/paper_names_offsets.c:97
 msgctxt "paper size"
 msgid "11x12"
 msgstr "11x12"
 
-#: gtk/paper_names_offsets.c:98
+#: ../gtk/paper_names_offsets.c:98
 msgctxt "paper size"
 msgid "11x15"
 msgstr "11x15"
 
-#: gtk/paper_names_offsets.c:99
+#: ../gtk/paper_names_offsets.c:99
 msgctxt "paper size"
 msgid "12x19"
 msgstr "12x19"
 
-#: gtk/paper_names_offsets.c:100
+#: ../gtk/paper_names_offsets.c:100
 msgctxt "paper size"
 msgid "5x7"
 msgstr "5x7"
 
-#: gtk/paper_names_offsets.c:101
+#: ../gtk/paper_names_offsets.c:101
 msgctxt "paper size"
 msgid "6x9 Envelope"
 msgstr "6x9 коверта"
 
-#: gtk/paper_names_offsets.c:102
+#: ../gtk/paper_names_offsets.c:102
 msgctxt "paper size"
 msgid "7x9 Envelope"
 msgstr "7x9 коверта"
 
-#: gtk/paper_names_offsets.c:103
+#: ../gtk/paper_names_offsets.c:103
 msgctxt "paper size"
 msgid "9x11 Envelope"
 msgstr "9x11 коверта"
 
-#: gtk/paper_names_offsets.c:104
+#: ../gtk/paper_names_offsets.c:104
 msgctxt "paper size"
 msgid "a2 Envelope"
 msgstr "а2 коверта"
 
-#: gtk/paper_names_offsets.c:105
+#: ../gtk/paper_names_offsets.c:105
 msgctxt "paper size"
 msgid "Arch A"
-msgstr "�рч �"
+msgstr "арч �"
 
-#: gtk/paper_names_offsets.c:106
+#: ../gtk/paper_names_offsets.c:106
 msgctxt "paper size"
 msgid "Arch B"
-msgstr "�рч Б"
+msgstr "арч Б"
 
-#: gtk/paper_names_offsets.c:107
+#: ../gtk/paper_names_offsets.c:107
 msgctxt "paper size"
 msgid "Arch C"
-msgstr "�рч Ц"
+msgstr "арч Ц"
 
-#: gtk/paper_names_offsets.c:108
+#: ../gtk/paper_names_offsets.c:108
 msgctxt "paper size"
 msgid "Arch D"
-msgstr "�рч Д"
+msgstr "арч Д"
 
-#: gtk/paper_names_offsets.c:109
+#: ../gtk/paper_names_offsets.c:109
 msgctxt "paper size"
 msgid "Arch E"
-msgstr "�рч Е"
+msgstr "арч Е"
 
-#: gtk/paper_names_offsets.c:110
+#: ../gtk/paper_names_offsets.c:110
 msgctxt "paper size"
 msgid "b-plus"
 msgstr "б-плу�"
 
-#: gtk/paper_names_offsets.c:111
+#: ../gtk/paper_names_offsets.c:111
 msgctxt "paper size"
 msgid "c"
 msgstr "ц"
 
-#: gtk/paper_names_offsets.c:112
+#: ../gtk/paper_names_offsets.c:112
 msgctxt "paper size"
 msgid "c5 Envelope"
 msgstr "ц5 коверта"
 
-#: gtk/paper_names_offsets.c:113
+#: ../gtk/paper_names_offsets.c:113
 msgctxt "paper size"
 msgid "d"
 msgstr "д"
 
-#: gtk/paper_names_offsets.c:114
+#: ../gtk/paper_names_offsets.c:114
 msgctxt "paper size"
 msgid "e"
 msgstr "е"
 
-#: gtk/paper_names_offsets.c:115
+#: ../gtk/paper_names_offsets.c:115
 msgctxt "paper size"
 msgid "edp"
 msgstr "едп"
 
-#: gtk/paper_names_offsets.c:116
+#: ../gtk/paper_names_offsets.c:116
 msgctxt "paper size"
 msgid "European edp"
 msgstr "европ�ки едп"
 
-#: gtk/paper_names_offsets.c:117
+#: ../gtk/paper_names_offsets.c:117
 msgctxt "paper size"
 msgid "Executive"
 msgstr "извршна коверта"
 
-#: gtk/paper_names_offsets.c:118
+#: ../gtk/paper_names_offsets.c:118
 msgctxt "paper size"
 msgid "f"
 msgstr "Ñ„"
 
-#: gtk/paper_names_offsets.c:119
+#: ../gtk/paper_names_offsets.c:119
 msgctxt "paper size"
 msgid "FanFold European"
 msgstr "европ�ки фан-фолд"
 
-#: gtk/paper_names_offsets.c:120
+#: ../gtk/paper_names_offsets.c:120
 msgctxt "paper size"
 msgid "FanFold US"
 msgstr "амерички фан-фолд"
 
-#: gtk/paper_names_offsets.c:121
+#: ../gtk/paper_names_offsets.c:121
 msgctxt "paper size"
 msgid "FanFold German Legal"
 msgstr "немачки правнички фан-фолд"
 
-#: gtk/paper_names_offsets.c:122
+#: ../gtk/paper_names_offsets.c:122
 msgctxt "paper size"
 msgid "Government Legal"
 msgstr "амерички званични"
 
-#: gtk/paper_names_offsets.c:123
+#: ../gtk/paper_names_offsets.c:123
 msgctxt "paper size"
 msgid "Government Letter"
 msgstr "америчко званично пи�мо"
 
-#: gtk/paper_names_offsets.c:124
+#: ../gtk/paper_names_offsets.c:124
 msgctxt "paper size"
 msgid "Index 3x5"
-msgstr "Индек� 3x5"
+msgstr "индек� 3x5"
 
-#: gtk/paper_names_offsets.c:125
+#: ../gtk/paper_names_offsets.c:125
 msgctxt "paper size"
 msgid "Index 4x6 (postcard)"
-msgstr "Индек� 4x6 (разгледница)"
+msgstr "индек� 4x6 (разгледница)"
 
-#: gtk/paper_names_offsets.c:126
+#: ../gtk/paper_names_offsets.c:126
 msgctxt "paper size"
 msgid "Index 4x6 ext"
-msgstr "Индек� 4x6 проширени"
+msgstr "индек� 4x6 проширени"
 
-#: gtk/paper_names_offsets.c:127
+#: ../gtk/paper_names_offsets.c:127
 msgctxt "paper size"
 msgid "Index 5x8"
-msgstr "Индек� 5x8"
+msgstr "индек� 5x8"
 
-#: gtk/paper_names_offsets.c:128
+#: ../gtk/paper_names_offsets.c:128
 msgctxt "paper size"
 msgid "Invoice"
-msgstr "Рачун"
+msgstr "рачун"
 
-#: gtk/paper_names_offsets.c:129
+#: ../gtk/paper_names_offsets.c:129
 msgctxt "paper size"
 msgid "Tabloid"
-msgstr "Таблоид"
+msgstr "таблоид"
 
-#: gtk/paper_names_offsets.c:130
+#: ../gtk/paper_names_offsets.c:130
 msgctxt "paper size"
 msgid "US Legal"
 msgstr "амерички правнички"
 
-#: gtk/paper_names_offsets.c:131
+#: ../gtk/paper_names_offsets.c:131
 msgctxt "paper size"
 msgid "US Legal Extra"
 msgstr "проширени амерички правнички"
 
-#: gtk/paper_names_offsets.c:132
+#: ../gtk/paper_names_offsets.c:132
 msgctxt "paper size"
 msgid "US Letter"
 msgstr "америчко пи�мо"
 
-#: gtk/paper_names_offsets.c:133
+#: ../gtk/paper_names_offsets.c:133
 msgctxt "paper size"
 msgid "US Letter Extra"
 msgstr "проширено америчко пи�мо"
 
-#: gtk/paper_names_offsets.c:134
+#: ../gtk/paper_names_offsets.c:134
 msgctxt "paper size"
 msgid "US Letter Plus"
 msgstr "америчко пи�мо плу�"
 
-#: gtk/paper_names_offsets.c:135
+#: ../gtk/paper_names_offsets.c:135
 msgctxt "paper size"
 msgid "Monarch Envelope"
-msgstr "Монарх коверта"
+msgstr "монарх коверта"
 
-#: gtk/paper_names_offsets.c:136
+#: ../gtk/paper_names_offsets.c:136
 msgctxt "paper size"
 msgid "#10 Envelope"
 msgstr "коверта #10"
 
-#: gtk/paper_names_offsets.c:137
+#: ../gtk/paper_names_offsets.c:137
 msgctxt "paper size"
 msgid "#11 Envelope"
 msgstr "коверта #11"
 
-#: gtk/paper_names_offsets.c:138
+#: ../gtk/paper_names_offsets.c:138
 msgctxt "paper size"
 msgid "#12 Envelope"
 msgstr "коверта #12"
 
-#: gtk/paper_names_offsets.c:139
+#: ../gtk/paper_names_offsets.c:139
 msgctxt "paper size"
 msgid "#14 Envelope"
 msgstr "коверта #14"
 
-#: gtk/paper_names_offsets.c:140
+#: ../gtk/paper_names_offsets.c:140
 msgctxt "paper size"
 msgid "#9 Envelope"
 msgstr "коверта #9"
 
-#: gtk/paper_names_offsets.c:141
+#: ../gtk/paper_names_offsets.c:141
 msgctxt "paper size"
 msgid "Personal Envelope"
 msgstr "лична коверта"
 
-#: gtk/paper_names_offsets.c:142
+#: ../gtk/paper_names_offsets.c:142
 msgctxt "paper size"
 msgid "Quarto"
-msgstr "Четвртина"
+msgstr "четврт"
 
-#: gtk/paper_names_offsets.c:143
+#: ../gtk/paper_names_offsets.c:143
 msgctxt "paper size"
 msgid "Super A"
-msgstr "Супер �"
+msgstr "�упер �"
 
-#: gtk/paper_names_offsets.c:144
+#: ../gtk/paper_names_offsets.c:144
 msgctxt "paper size"
 msgid "Super B"
-msgstr "Супер Б"
+msgstr "�упер Б"
 
-#: gtk/paper_names_offsets.c:145
+#: ../gtk/paper_names_offsets.c:145
 msgctxt "paper size"
 msgid "Wide Format"
-msgstr "Широки формат"
+msgstr "широки формат"
 
-#: gtk/paper_names_offsets.c:146
+#: ../gtk/paper_names_offsets.c:146
 msgctxt "paper size"
 msgid "Dai-pa-kai"
-msgstr "Даи-па-каи"
+msgstr "даи-па-каи"
 
-#: gtk/paper_names_offsets.c:147
+#: ../gtk/paper_names_offsets.c:147
 msgctxt "paper size"
 msgid "Folio"
-msgstr "Фолио"
+msgstr "фолио"
 
-#: gtk/paper_names_offsets.c:148
+#: ../gtk/paper_names_offsets.c:148
 msgctxt "paper size"
 msgid "Folio sp"
-msgstr "Фолио �п"
+msgstr "фолио �п"
 
-#: gtk/paper_names_offsets.c:149
+#: ../gtk/paper_names_offsets.c:149
 msgctxt "paper size"
 msgid "Invite Envelope"
 msgstr "коверта за позивнице"
 
-#: gtk/paper_names_offsets.c:150
+#: ../gtk/paper_names_offsets.c:150
 msgctxt "paper size"
 msgid "Italian Envelope"
 msgstr "италијан�ка коверта"
 
-#: gtk/paper_names_offsets.c:151
+#: ../gtk/paper_names_offsets.c:151
 msgctxt "paper size"
 msgid "juuro-ku-kai"
 msgstr "јуро-ку-каи"
 
-#: gtk/paper_names_offsets.c:152
+#: ../gtk/paper_names_offsets.c:152
 msgctxt "paper size"
 msgid "pa-kai"
 msgstr "па-каи"
 
-#: gtk/paper_names_offsets.c:153
+#: ../gtk/paper_names_offsets.c:153
 msgctxt "paper size"
 msgid "Postfix Envelope"
-msgstr "Поштан�ка коверта"
+msgstr "поштан�ка коверта"
 
-#: gtk/paper_names_offsets.c:154
+#: ../gtk/paper_names_offsets.c:154
 msgctxt "paper size"
 msgid "Small Photo"
-msgstr "Мала фотографија"
+msgstr "мала фотографија"
 
-#: gtk/paper_names_offsets.c:155
+#: ../gtk/paper_names_offsets.c:155
 msgctxt "paper size"
 msgid "prc1 Envelope"
 msgstr "прц1 коверта"
 
-#: gtk/paper_names_offsets.c:156
+#: ../gtk/paper_names_offsets.c:156
 msgctxt "paper size"
 msgid "prc10 Envelope"
 msgstr "прц10 коверта"
 
-#: gtk/paper_names_offsets.c:157
+#: ../gtk/paper_names_offsets.c:157
 msgctxt "paper size"
 msgid "prc 16k"
 msgstr "прц 16к"
 
-#: gtk/paper_names_offsets.c:158
+#: ../gtk/paper_names_offsets.c:158
 msgctxt "paper size"
 msgid "prc2 Envelope"
 msgstr "прц2 коверта"
 
-#: gtk/paper_names_offsets.c:159
+#: ../gtk/paper_names_offsets.c:159
 msgctxt "paper size"
 msgid "prc3 Envelope"
 msgstr "прц3 коверта"
 
-#: gtk/paper_names_offsets.c:160
+#: ../gtk/paper_names_offsets.c:160
 msgctxt "paper size"
 msgid "prc 32k"
 msgstr "прц 32к"
 
-#: gtk/paper_names_offsets.c:161
+#: ../gtk/paper_names_offsets.c:161
 msgctxt "paper size"
 msgid "prc4 Envelope"
 msgstr "прц4 коверта"
 
-#: gtk/paper_names_offsets.c:162
+#: ../gtk/paper_names_offsets.c:162
 msgctxt "paper size"
 msgid "prc5 Envelope"
 msgstr "прц5 коверта"
 
-#: gtk/paper_names_offsets.c:163
+#: ../gtk/paper_names_offsets.c:163
 msgctxt "paper size"
 msgid "prc6 Envelope"
 msgstr "прц6 коверта"
 
-#: gtk/paper_names_offsets.c:164
+#: ../gtk/paper_names_offsets.c:164
 msgctxt "paper size"
 msgid "prc7 Envelope"
 msgstr "прц7 коверта"
 
-#: gtk/paper_names_offsets.c:165
+#: ../gtk/paper_names_offsets.c:165
 msgctxt "paper size"
 msgid "prc8 Envelope"
 msgstr "прц8 коверта"
 
-#: gtk/paper_names_offsets.c:166
+#: ../gtk/paper_names_offsets.c:166
 msgctxt "paper size"
 msgid "prc9 Envelope"
 msgstr "прц9 коверта"
 
-#: gtk/paper_names_offsets.c:167
+#: ../gtk/paper_names_offsets.c:167
 msgctxt "paper size"
 msgid "ROC 16k"
 msgstr "РОК 16к"
 
-#: gtk/paper_names_offsets.c:168
+#: ../gtk/paper_names_offsets.c:168
 msgctxt "paper size"
 msgid "ROC 8k"
 msgstr "РОК 8к"
 
-#: gtk/updateiconcache.c:492 gtk/updateiconcache.c:552
-#, c-format
-msgid "different idatas found for symlinked '%s' and '%s'\n"
-msgstr ""
-"различите idatas �труктуре �у пронађене за �имболички везане „%s“ и „%s“\n"
-
-#: gtk/updateiconcache.c:1374
+#: ../gtk/updateiconcache.c:1370
 #, c-format
 msgid "Failed to write header\n"
-msgstr "�еу�пело пи�ање заглавља\n"
+msgstr "�и�ам у�пео да запишем заглавље\n"
 
-#: gtk/updateiconcache.c:1380
+#: ../gtk/updateiconcache.c:1376
 #, c-format
 msgid "Failed to write hash table\n"
-msgstr "�еу�пело пи�ања хеш табеле\n"
+msgstr "�и�ам у�пео да запишем хеш табелу\n"
 
-#: gtk/updateiconcache.c:1386
+#: ../gtk/updateiconcache.c:1382
 #, c-format
 msgid "Failed to write folder index\n"
-msgstr "�еу�пело пи�ање индек�а фа�цикле\n"
+msgstr "�и�ам у�пео да запишем индек� фа�цикле\n"
 
-#: gtk/updateiconcache.c:1394
+#: ../gtk/updateiconcache.c:1390
 #, c-format
 msgid "Failed to rewrite header\n"
-msgstr "�еу�пело препи�ивање заглавља\n"
+msgstr "�и�ам у�пео да препишем заглавље\n"
 
-#: gtk/updateiconcache.c:1463
+#: ../gtk/updateiconcache.c:1484
 #, c-format
 msgid "Failed to open file %s : %s\n"
-msgstr "�е могу да отворим датотеку „%s“: %s\n"
+msgstr "�и�ам у�пео да отворим датотеку „%s“: %s\n"
 
-#: gtk/updateiconcache.c:1471
+#: ../gtk/updateiconcache.c:1492 ../gtk/updateiconcache.c:1522
 #, c-format
 msgid "Failed to write cache file: %s\n"
-msgstr "�еу�пео упи� датотеке у о�тави: %s\n"
+msgstr "�и�ам у�пео да запишем датотеку из о�таве: %s\n"
 
-#: gtk/updateiconcache.c:1507
+#: ../gtk/updateiconcache.c:1533
 #, c-format
 msgid "The generated cache was invalid.\n"
-msgstr "Креирана о�тава није и�правна.\n"
+msgstr "Створена о�тава није и�правна.\n"
 
-#: gtk/updateiconcache.c:1521
+#: ../gtk/updateiconcache.c:1547
 #, c-format
 msgid "Could not rename %s to %s: %s, removing %s then.\n"
-msgstr "�еу�пело премештање %s у %s: %s, и зато уклањам %s.\n"
+msgstr "�е могу да преименујем „%s“ у „%s“: %s, и зато уклањам „%s“.\n"
 
-#: gtk/updateiconcache.c:1535
+#: ../gtk/updateiconcache.c:1561
 #, c-format
 msgid "Could not rename %s to %s: %s\n"
-msgstr "�еу�пело премештање %s у %s: %s\n"
+msgstr "�е могу да преименујем „%s“ у „%s“: %s\n"
 
-#: gtk/updateiconcache.c:1545
+#: ../gtk/updateiconcache.c:1571
 #, c-format
 msgid "Could not rename %s back to %s: %s.\n"
-msgstr "�еу�пело премештање %s назад у %s: %s.\n"
+msgstr "�е могу да преименујем „%s“ назад у „%s“: %s.\n"
 
-#: gtk/updateiconcache.c:1572
+#: ../gtk/updateiconcache.c:1598
 #, c-format
 msgid "Cache file created successfully.\n"
 msgstr "Датотека у о�тави је у�пешно направљена.\n"
 
-#: gtk/updateiconcache.c:1611
+#: ../gtk/updateiconcache.c:1637
 msgid "Overwrite an existing cache, even if up to date"
-msgstr "Препи�ивање по�тојеће о�таве, чак и ако је ажурна"
+msgstr "Препиши по�тојећу о�таву, чак и ако је ажурна"
 
-#: gtk/updateiconcache.c:1612
+#: ../gtk/updateiconcache.c:1638
 msgid "Don't check for the existence of index.theme"
-msgstr "�е провервај при�у�тво index.theme датотеке"
+msgstr "�е провервај при�у�тво датотеке „index.theme“"
 
-#: gtk/updateiconcache.c:1613
+#: ../gtk/updateiconcache.c:1639
 msgid "Don't include image data in the cache"
 msgstr "�е укључуј податке �лике у о�таву"
 
-#: gtk/updateiconcache.c:1614
+#: ../gtk/updateiconcache.c:1640
 msgid "Output a C header file"
 msgstr "И�пиши датотеку Ц заглавља"
 
-#: gtk/updateiconcache.c:1615
+#: ../gtk/updateiconcache.c:1641
 msgid "Turn off verbose output"
 msgstr "И�кључи опширно�т и�пи�а"
 
-#: gtk/updateiconcache.c:1616
+#: ../gtk/updateiconcache.c:1642
 msgid "Validate existing icon cache"
 msgstr "Провери и�правно�т по�тојеће о�таве иконица"
 
-#: gtk/updateiconcache.c:1683
+#: ../gtk/updateiconcache.c:1709
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Датотека није пронађена: %s\n"
 
-#: gtk/updateiconcache.c:1689
+#: ../gtk/updateiconcache.c:1715
 #, c-format
 msgid "Not a valid icon cache: %s\n"
 msgstr "�еи�правна о�тава за иконице: %s\n"
 
-#: gtk/updateiconcache.c:1702
+#: ../gtk/updateiconcache.c:1728
 #, c-format
 msgid "No theme index file.\n"
 msgstr "�ије нађена индек� датотека за тему.\n"
 
-#: gtk/updateiconcache.c:1706
+#: ../gtk/updateiconcache.c:1732
 #, c-format
 msgid ""
 "No theme index file in '%s'.\n"
 "If you really want to create an icon cache here, use --ignore-theme-index.\n"
 msgstr ""
 "�ије пронађена индек� датотека теме у „%s“.\n"
-"�ко заи�та желите да направите о�таву за иконице овде, наведите --ignore-"
-"theme-index.\n"
+"�ко заи�та желите да направите о�таву за иконице овде, наведите „--ignore-"
+"theme-index“.\n"
 
 #. ID
-#: modules/input/imam-et.c:454
+#: ../modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "�мхар�ки (EZ+)"
 
 #. ID
-#: modules/input/imcedilla.c:92
+#: ../modules/input/imcedilla.c:92
 msgid "Cedilla"
 msgstr "Седиља"
 
 #. ID
-#: modules/input/imcyrillic-translit.c:217
+#: ../modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Ћирилично (тран�литеровано)"
 
 #. ID
-#: modules/input/iminuktitut.c:127
+#: ../modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Инуктитут (тран�литеровано)"
 
 #. ID
-#: modules/input/imipa.c:145
+#: ../modules/input/imipa.c:145
 msgid "IPA"
-msgstr "IPA (Међународна фонет�ка азбука)"
+msgstr "ИП� (Међународна фонет�ка азбука)"
 
 #. ID
-#: modules/input/immultipress.c:31
+#: ../modules/input/immultipress.c:31
 msgid "Multipress"
 msgstr "Више�труки при�ти�ци"
 
 #. ID
-#: modules/input/imthai.c:35
+#: ../modules/input/imthai.c:35
 msgid "Thai-Lao"
 msgstr "Таи-Лао"
 
 #. ID
-#: modules/input/imti-er.c:453
+#: ../modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Тигригна-Еритреј�ки (EZ+)"
 
 #. ID
-#: modules/input/imti-et.c:453
+#: ../modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Тигригна-Етиопиј�ки (EZ+)"
 
 #. ID
-#: modules/input/imviqr.c:244
+#: ../modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Вијетнам�ки (VIQR)"
 
 #. ID
-#: modules/input/imxim.c:28
+#: ../modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "Ик�ов начин уно�а (XIM)"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:811
-#: modules/printbackends/cups/gtkprintbackendcups.c:1020
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:829
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1048
 msgid "Username:"
 msgstr "Кори�ничко име:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:812
-#: modules/printbackends/cups/gtkprintbackendcups.c:1029
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:830
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1057
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:850
-#, c-format
-msgid "Authentication is required to get a file from %s"
-msgstr "Потребна је пријава за прикупљање датотеке �а %s"
-
-#: modules/printbackends/cups/gtkprintbackendcups.c:854
-#: modules/printbackends/cups/gtkprintbackendcups.c:1042
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:869
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1070
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
-msgstr "Потребна је пријава за штампање документа „%s“ на штампачу %s"
+msgstr ""
+"Потребно је потврђивање идентитета за штампање документа „%s“ на штампачу „%"
+"s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:856
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:871
 #, c-format
 msgid "Authentication is required to print a document on %s"
-msgstr "Потребна је пријава за штампање документа на %s"
+msgstr "Потребно је потврђивање идентитета за штампање документа на „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:860
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:875
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
-msgstr "Потребна је пријава за прикупљање података о задужењу „%s“"
+msgstr ""
+"Потребно је потврђивање идентитета за прикупљање података о задужењу „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:862
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:877
 msgid "Authentication is required to get attributes of a job"
-msgstr "Потребна је пријава за прикупљање података о задужењу"
+msgstr "Потребно је потврђивање идентитета за прикупљање података о задужењу"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:866
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:881
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
-msgstr "Потребна је пријава за прикупљање података од штампача %s"
+msgstr ""
+"Потребно је потврђивање идентитета за прикупљање података штампача „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:868
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:883
 msgid "Authentication is required to get attributes of a printer"
-msgstr "Потребна је пријава за прикупљање података од штампача"
+msgstr "Потребно је потврђивање идентитета за прикупљање података штампача"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:871
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:886
 #, c-format
 msgid "Authentication is required to get default printer of %s"
-msgstr "Потребна је пријава за подразумевани штампач од %s"
+msgstr "Потребно је потврђивање идентитета за подразумевани штампач од „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:874
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:889
 #, c-format
 msgid "Authentication is required to get printers from %s"
-msgstr "Потребна је пријава за штампаче из %s"
+msgstr "Потребно је потврђивање идентитета за штампаче из „%s“"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:894
+#, c-format
+msgid "Authentication is required to get a file from %s"
+msgstr "Потребно је потврђивање идентитета за преузимање датотеке �а „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:877
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:896
 #, c-format
 msgid "Authentication is required on %s"
-msgstr "Потребна је пријава за %s"
+msgstr "Потребно је потврђивање идентитета за „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1014
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1042
 msgid "Domain:"
 msgstr "Домен:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1044
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1072
 #, c-format
 msgid "Authentication is required to print document '%s'"
-msgstr "Потребна је пријава за штампање документа „%s“"
+msgstr "Потребно је потврђивање идентитета за штампање документа „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1049
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1077
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
-msgstr "Потребна је пријава за штампање овог документа на штампачу %s"
+msgstr ""
+"Потребно је потврђивање идентитета за штампање овог документа на штампачу „%"
+"s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1051
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1079
 msgid "Authentication is required to print this document"
-msgstr "Потребна је пријава за штампање овог документа"
+msgstr "Потребно је потврђивање идентитета за штампање овог документа"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1672
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1704
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "Штампачу „%s“ поне�таје тонер."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1673
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1705
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "Штампач „%s“ је о�тао без тонера."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1675
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1707
 #, c-format
 msgid "Printer '%s' is low on developer."
 msgstr "Штампачу „%s“ �лаби развијач."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1677
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1709
 #, c-format
 msgid "Printer '%s' is out of developer."
 msgstr "Штампач „%s“ је о�тао без развијача."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1679
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1711
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
-msgstr "Штампачу „%s“ поне�таје најмање једне боје."
+msgstr "Штампачу „%s“ поне�таје најмање једна боја."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1681
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1713
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
 msgstr "Штампач „%s“ је о�тао без најмање једне боје."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1682
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1714
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "Поклопац је отворен на штампачу „%s“."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1683
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1715
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "Вратанца �у отворена на штампачу „%s“."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1684
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1716
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "Штампач „%s“ о�таје без папира."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1685
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1717
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "Штампач „%s“ је о�тао без папира."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1686
-#, fuzzy, c-format
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1718
+#, c-format
 msgid "Printer '%s' is currently offline."
-msgstr "Штампач „%s“ је и�кључен."
+msgstr "Штампач „%s“ тренутно није прикључен."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1687
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1719
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "Проблем на штампачу „%s“."
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:1995
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2033
 msgid "Paused ; Rejecting Jobs"
 msgstr "Зау�тављен ; Одбија по�лове"
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2001
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2039
 msgid "Rejecting Jobs"
 msgstr "Одбија по�лове"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2777
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2812
 msgid "Two Sided"
 msgstr "Дво�трано"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2778
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2813
 msgid "Paper Type"
 msgstr "Тип папира"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2779
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2814
 msgid "Paper Source"
 msgstr "Извор папира"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2780
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2815
 msgid "Output Tray"
 msgstr "Излазна трака"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2781
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2816
 msgid "Resolution"
 msgstr "Резолуција"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2782
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2817
 msgid "GhostScript pre-filtering"
-msgstr "GhostScript предфилтер"
+msgstr "Го�т �крипт предфилтер"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2791
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2826
 msgid "One Sided"
 msgstr "Једно�трано"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2793
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2828
 msgid "Long Edge (Standard)"
 msgstr "По дужој �трани (�тандардно)"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2795
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2830
 msgid "Short Edge (Flip)"
 msgstr "По краћој �трани (окренуто)"
 
 #. Translators: this is an option of "Paper Source"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2797
-#: modules/printbackends/cups/gtkprintbackendcups.c:2799
-#: modules/printbackends/cups/gtkprintbackendcups.c:2807
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2832
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2834
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2842
 msgid "Auto Select"
 msgstr "Сам одреди"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2801
-#: modules/printbackends/cups/gtkprintbackendcups.c:2803
-#: modules/printbackends/cups/gtkprintbackendcups.c:2805
-#: modules/printbackends/cups/gtkprintbackendcups.c:2809
-#: modules/printbackends/cups/gtkprintbackendcups.c:3295
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2836
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2838
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2840
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2844
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3340
 msgid "Printer Default"
 msgstr "Подразумевано"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2811
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2846
 msgid "Embed GhostScript fonts only"
-msgstr "Само угњеждени GhostScript фонтови"
+msgstr "Само угњеждени Го�т �крипт фонтови"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2813
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2848
 msgid "Convert to PS level 1"
-msgstr "Преведи у 1. ниво по�т�крипта"
+msgstr "Преведи у 1° ниво по�т�крипта"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2815
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2850
 msgid "Convert to PS level 2"
-msgstr "Преведи у 2. ниво по�т�крипта"
+msgstr "Преведи у 2° ниво по�т�крипта"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2817
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2852
 msgid "No pre-filtering"
 msgstr "Без предфилтрирања"
 
 #. 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:2826
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2861
 msgid "Miscellaneous"
 msgstr "Додатна подешавања"
 
 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Urgent"
 msgstr "Хитно"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "High"
 msgstr "Важно"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Medium"
 msgstr "Средње"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Low"
 msgstr "�ебитно"
 
@@ -4039,14 +4350,14 @@ msgstr "�ебитно"
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3527
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3607
 msgid "Pages per Sheet"
 msgstr "Страна на ли�ту"
 
 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3564
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3644
 msgid "Job Priority"
 msgstr "Важно�т"
 
@@ -4054,52 +4365,52 @@ msgstr "Важно�т"
 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3575
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3655
 msgid "Billing Info"
 msgstr "Фактури�ање"
 
 #. Translators, these strings are names for various 'standard' cover
 #. * pages that the printing system may support.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "None"
-msgstr "�ема"
+msgstr "�ишта"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Classified"
 msgstr "Категори�ано"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Confidential"
 msgstr "Поверљиво"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Secret"
-msgstr "Тајна"
+msgstr "Тајно"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Standard"
 msgstr "Обично"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Top Secret"
-msgstr "Велика тајна"
+msgstr "Строго поверљиво"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Unclassified"
 msgstr "�екатегори�ано"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3625
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3705
 msgid "Before"
 msgstr "Пре"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3640
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3720
 msgid "After"
 msgstr "По�ле"
 
@@ -4107,14 +4418,14 @@ msgstr "По�ле"
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3660
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3740
 msgid "Print at"
 msgstr "Закажи штампу"
 
 #. 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:3671
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3751
 msgid "Print at time"
 msgstr "Штампај у"
 
@@ -4122,110 +4433,203 @@ msgstr "Штампај у"
 #. * size. The two placeholders are replaced with the width and height
 #. * in points. E.g: "Custom 230.4x142.9"
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3706
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3786
 #, c-format
 msgid "Custom %sx%s"
-msgstr "По�ебно %sx%s"
+msgstr "Произвољно %sx%s"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3867
+#, fuzzy
+#| msgid "Printer offline"
+msgid "Printer Profile"
+msgstr "Штампач је и�кључен"
+
+#. TRANSLATORS: this is when color profile information is unavailable
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3874
+#, fuzzy
+#| msgid "Not available"
+msgid "Unavailable"
+msgstr "�ије до�тупно"
+
+#. TRANSLATORS: when we're running an old CUPS, and
+#. * it hasn't registered the device with colord
+#: ../modules/printbackends/cups/gtkprintercups.c:222
+msgid "Color management unavailable"
+msgstr ""
+
+#. TRANSLATORS: when there is no color profile available
+#: ../modules/printbackends/cups/gtkprintercups.c:234
+#, fuzzy
+#| msgid "Not available"
+msgid "No profile available"
+msgstr "�ије до�тупно"
+
+#. TRANSLATORS: when the color profile has no title
+#: ../modules/printbackends/cups/gtkprintercups.c:245
+#, fuzzy
+#| msgid "Unspecified error"
+msgid "Unspecified profile"
+msgstr "�епозната грешка"
 
 #. default filename used for print-to-file
-#: modules/printbackends/file/gtkprintbackendfile.c:250
+#: ../modules/printbackends/file/gtkprintbackendfile.c:250
 #, c-format
 msgid "output.%s"
 msgstr "излаз.%s"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:493
+#: ../modules/printbackends/file/gtkprintbackendfile.c:501
 msgid "Print to File"
 msgstr "Штампај у датотеку"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:627
 msgid "PDF"
 msgstr "ПДФ"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:627
 msgid "Postscript"
 msgstr "По�т�крипт"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:627
 msgid "SVG"
-msgstr "SVG"
+msgstr "СВГ"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:582
-#: modules/printbackends/test/gtkprintbackendtest.c:503
+#: ../modules/printbackends/file/gtkprintbackendfile.c:640
+#: ../modules/printbackends/test/gtkprintbackendtest.c:503
 msgid "Pages per _sheet:"
 msgstr "_Страница на ли�ту:"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:641
+#: ../modules/printbackends/file/gtkprintbackendfile.c:699
 msgid "File"
 msgstr "Датотека"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:651
+#: ../modules/printbackends/file/gtkprintbackendfile.c:709
 msgid "_Output format"
 msgstr "Ф_ормат излаза"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:395
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:395
 msgid "Print to LPR"
-msgstr "Штампај преко LPR"
+msgstr "Штампај преко ЛПР"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:421
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:421
 msgid "Pages Per Sheet"
 msgstr "Страна на ли�ту"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:428
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:428
 msgid "Command Line"
 msgstr "Командна линија"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:811
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:811
 msgid "printer offline"
 msgstr "штампач је и�кључен"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:829
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:829
 msgid "ready to print"
 msgstr "�преман за штампу"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:832
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:832
 msgid "processing job"
-msgstr "обрађује задужење"
+msgstr "обрађујем задужење"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:836
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:836
 msgid "paused"
 msgstr "паузиран"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:839
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:839
 msgid "unknown"
 msgstr "непознато"
 
 #. default filename used for print-to-test
-#: modules/printbackends/test/gtkprintbackendtest.c:234
+#: ../modules/printbackends/test/gtkprintbackendtest.c:234
 #, c-format
 msgid "test-output.%s"
 msgstr "те�т-излаз.%s"
 
-#: modules/printbackends/test/gtkprintbackendtest.c:467
+#: ../modules/printbackends/test/gtkprintbackendtest.c:467
 msgid "Print to Test Printer"
-msgstr "Те�тирај штампу"
+msgstr "Штампај на пробном штампачу"
 
-#: tests/testfilechooser.c:207
+#: ../tests/testfilechooser.c:207
 #, c-format
 msgid "Could not get information for file '%s': %s"
-msgstr "�е могу да �азнам податке о датотеци „%s“: %s"
+msgstr "�е могу да набавим податке о датотеци „%s“: %s"
 
-#: tests/testfilechooser.c:222
+#: ../tests/testfilechooser.c:222
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "�е могу да отворим датотеку „%s“: %s"
+msgstr "�и�ам у�пео да отворим датотеку „%s“: %s"
 
 # ово има највише �ми�ла
-#: tests/testfilechooser.c:267
+#: ../tests/testfilechooser.c:267
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"�е могу да учитам �лику „%s“: разлог непознат, вероватно неи�праван запи�"
+"�и�ам у�пео да учитам �лику „%s“: разлог непознат, вероватно неи�праван запи�"
+
+#~ msgid "Received invalid color data\n"
+#~ msgstr "Примио �ам неи�правне податке о бојама\n"
+
+#~ msgid "_Browse for other folders"
+#~ msgstr "_Разгледај о�тале фа�цикле"
+
+#~ msgid "X screen to use"
+#~ msgstr "Ик� екран који да кори�ти"
+
+#~ msgid "SCREEN"
+#~ msgstr "ЕКР��"
+
+#~ msgid "Make X calls synchronous"
+#~ msgstr "Учини Ик� позиве �инхроним"
+
+#~ msgid "Credits"
+#~ msgstr "За�луге"
+
+#~ msgid "Written by"
+#~ msgstr "�утори"
+
+#~ msgid "_Add"
+#~ msgstr "_Додај"
+
+#~ msgid "_Remove"
+#~ msgstr "_Уклони"
+
+#~ msgid "Error creating folder '%s': %s"
+#~ msgstr "Грешка при прављењу фа�цикле „%s“: %s"
+
+#~ msgid "Error loading icon: %s"
+#~ msgstr "Грешка при учитавању иконе: %s"
+
+#~ msgid ""
+#~ "Could not find the icon '%s'. The '%s' theme\n"
+#~ "was not found either, perhaps you need to install it.\n"
+#~ "You can get a copy from:\n"
+#~ "\t%s"
+#~ msgstr ""
+#~ "�е могу да нађем икону „%s“. �и тема „%s“ није \n"
+#~ "нађена, можда треба да је ин�талирате.\n"
+#~ "Можете набавити примерак �а:\n"
+#~ "\t%s"
+
+#~ msgid "Unable to find include file: \"%s\""
+#~ msgstr "�е могу пронаћи датотеку за укључивање: „%s“"
+
+#~ msgid "Unable to locate image file in pixmap_path: \"%s\""
+#~ msgstr "�е могу пронаћи датотеку �а �ликом у pixmap_path: „%s“"
+
+#~ msgid "This function is not implemented for widgets of class '%s'"
+#~ msgstr "Ова функција није имплементирана за контроле у кла�и „%s“"
+
+#~ msgid "Unable to locate theme engine in module_path: \"%s\","
+#~ msgstr "�е могу да пронађем мотор теме у путањи за модуле: „%s“,"
+
+#~ msgid "different idatas found for symlinked '%s' and '%s'\n"
+#~ msgstr ""
+#~ "различите idatas �труктуре �у пронађене за �имболички везане „%s“ и „%s“\n"
 
 #~ msgid "Gdk debugging flags to set"
 #~ msgstr "Које Гдк опције за налажење грешака укључити"
@@ -4946,9 +5350,6 @@ msgstr ""
 #~ msgid "_Folder name:"
 #~ msgstr "_Име фа�цикле:"
 
-#~ msgid "C_reate"
-#~ msgstr "�_аправи"
-
 #~ msgid ""
 #~ "The filename \"%s\" contains symbols that are not allowed in filenames"
 #~ msgstr ""
@@ -4981,9 +5382,6 @@ msgstr ""
 #~ msgid "_Rename"
 #~ msgstr "_Преименуј"
 
-#~ msgid "_Selection: "
-#~ msgstr "_Избор: "
-
 #~ msgid ""
 #~ "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
 #~ "environment variable G_FILENAME_ENCODING): %s"
@@ -5862,9 +6260,6 @@ msgstr ""
 #~ msgid "This file system does not support icons for everything"
 #~ msgstr "Овај �и�тем датотека не подржава иконе за �ве"
 
-#~ msgid "Could not find the path"
-#~ msgstr "�е могу да нађем путању"
-
 #~ msgid "Input Methods"
 #~ msgstr "�ачини уно�а"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index ecf1d83164..5f2fc97f65 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,326 +1,457 @@
 # Serbian translation of gtk
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006, 2007.
-#
 # This file is distributed under the same license as the gtk package.
-#
 # Maintainer: Danilo Å egan <dsegan@gmx.net>
 # Reviewed on 2004-02-19 by: Danilo Å egan <dsegan@gmx.net>
 # Reviewed on 2005-07-08 by: Danilo Å egan <dsegan@gmx.net>
 # Miloš Popović <gpopac@gmail.com>, 2010.
-#
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.14\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 15:41-0400\n"
-"PO-Revision-Date: 2010-08-26 14:33+0200\n"
-"Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%"
+"2b&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-08-23 14:18+0000\n"
+"PO-Revision-Date: 2011-05-30 11:44+0200\n"
+"Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: Serbian (sr)\n"
 "Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
+"X-Generator: Virtaal 0.5.2\n"
 
-#: gdk/gdk.c:103
+#: ../gdk/gdk.c:135
 #, c-format
 msgid "Error parsing option --gdk-debug"
-msgstr "Greška u obradi opcije --gdk-debug"
+msgstr "Greška u obradi opcije „--gdk-debug“"
 
-#: gdk/gdk.c:123
+#: ../gdk/gdk.c:155
 #, c-format
 msgid "Error parsing option --gdk-no-debug"
-msgstr "Greška u obradi opcije --gdk-no-debug"
+msgstr "Greška u obradi opcije „--gdk-no-debug“"
 
 #. Description of --class=CLASS in --help output
-#: gdk/gdk.c:151
+#: ../gdk/gdk.c:183
 msgid "Program class as used by the window manager"
 msgstr "Klasa programa koju koristi upravlja� prozora"
 
 #. Placeholder in --class=CLASS in --help output
-#: gdk/gdk.c:152
+#: ../gdk/gdk.c:184
 msgid "CLASS"
 msgstr "KLASA"
 
 #. Description of --name=NAME in --help output
-#: gdk/gdk.c:154
+#: ../gdk/gdk.c:186
 msgid "Program name as used by the window manager"
 msgstr "Ime programa kako ga prikazuje upravlja� prozora"
 
 #. Placeholder in --name=NAME in --help output
-#: gdk/gdk.c:155
+#: ../gdk/gdk.c:187
 msgid "NAME"
 msgstr "IME"
 
 #. Description of --display=DISPLAY in --help output
-#: gdk/gdk.c:157
+#: ../gdk/gdk.c:189
 msgid "X display to use"
-msgstr "Iks prikaz koji koristiti"
+msgstr "Iks prikaz za korišćenje"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: gdk/gdk.c:158
+#: ../gdk/gdk.c:190
 msgid "DISPLAY"
 msgstr "PRIKAZ"
 
-#. Description of --screen=SCREEN in --help output
-#: gdk/gdk.c:160
-msgid "X screen to use"
-msgstr "Iks ekran koji da koristi"
-
-#. Placeholder in --screen=SCREEN in --help output
-#: gdk/gdk.c:161
-msgid "SCREEN"
-msgstr "EKRAN"
-
 #. Description of --gdk-debug=FLAGS in --help output
-#: gdk/gdk.c:164
-#, fuzzy
+#: ../gdk/gdk.c:193
 msgid "GDK debugging flags to set"
-msgstr "Koje Gtk+ opcije za nalaženje grešaka uklju�iti"
+msgstr "GDK zastavice za otklanjanje grešaka za postavljanje"
 
 #. Placeholder in --gdk-debug=FLAGS in --help output
 #. 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:165 gdk/gdk.c:168 gtk/gtkmain.c:533 gtk/gtkmain.c:536
+#: ../gdk/gdk.c:194 ../gdk/gdk.c:197 ../gtk/gtkmain.c:569 ../gtk/gtkmain.c:572
 msgid "FLAGS"
 msgstr "OPCIJE"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: gdk/gdk.c:167
-#, fuzzy
+#: ../gdk/gdk.c:196
 msgid "GDK debugging flags to unset"
-msgstr "Koje Gtk+ opcije za nalaženje grešaka isklju�iti"
+msgstr "GDK zastavice za otklanjanje grešaka za uklanjanje"
 
-#: gdk/keyname-table.h:3940
+#.
+#. * Translators, the strings in the 'keyboard label' context are
+#. * display names for keyboard keys. Some of them have prefixes like
+#. * XF86 or ISO_ - these should be removed in the translation. Similarly,
+#. * underscores should be replaced by spaces. The prefix 'KP_' stands
+#. * for 'key pad' and you may want to include that in your translation.
+#. * Here are some examples of English translations:
+#. * XF86AudioMute - Audio mute
+#. * Scroll_lock   - Scroll lock
+#. * KP_Space      - Space (keypad)
+#.
+#: ../gdk/keyname-table.h:3951
 msgctxt "keyboard label"
 msgid "BackSpace"
 msgstr "BackSpace"
 
-#: gdk/keyname-table.h:3941
+#: ../gdk/keyname-table.h:3952
 msgctxt "keyboard label"
 msgid "Tab"
 msgstr "Tab"
 
-#: gdk/keyname-table.h:3942
+#: ../gdk/keyname-table.h:3953
 msgctxt "keyboard label"
 msgid "Return"
 msgstr "Return"
 
-#: gdk/keyname-table.h:3943
+#: ../gdk/keyname-table.h:3954
 msgctxt "keyboard label"
 msgid "Pause"
 msgstr "Pause"
 
-#: gdk/keyname-table.h:3944
+#: ../gdk/keyname-table.h:3955
 msgctxt "keyboard label"
 msgid "Scroll_Lock"
 msgstr "Scroll_Lock"
 
-#: gdk/keyname-table.h:3945
+#: ../gdk/keyname-table.h:3956
 msgctxt "keyboard label"
 msgid "Sys_Req"
 msgstr "Sys_Req"
 
-#: gdk/keyname-table.h:3946
+#: ../gdk/keyname-table.h:3957
 msgctxt "keyboard label"
 msgid "Escape"
 msgstr "Escape"
 
-#: gdk/keyname-table.h:3947
+#: ../gdk/keyname-table.h:3958
 msgctxt "keyboard label"
 msgid "Multi_key"
 msgstr "Višefunkcijski taster"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: gdk/keyname-table.h:3948
+#: ../gdk/keyname-table.h:3959
 msgctxt "keyboard label"
 msgid "Home"
 msgstr "Li�no"
 
-#: gdk/keyname-table.h:3949
+#: ../gdk/keyname-table.h:3960
 msgctxt "keyboard label"
 msgid "Left"
 msgstr "Levo"
 
-#: gdk/keyname-table.h:3950
+#: ../gdk/keyname-table.h:3961
 msgctxt "keyboard label"
 msgid "Up"
 msgstr "Gore"
 
-#: gdk/keyname-table.h:3951
+#: ../gdk/keyname-table.h:3962
 msgctxt "keyboard label"
 msgid "Right"
 msgstr "Desno"
 
-#: gdk/keyname-table.h:3952
+#: ../gdk/keyname-table.h:3963
 msgctxt "keyboard label"
 msgid "Down"
 msgstr "Dole"
 
-#: gdk/keyname-table.h:3953
+#: ../gdk/keyname-table.h:3964
 msgctxt "keyboard label"
 msgid "Page_Up"
 msgstr "Page_Up"
 
-#: gdk/keyname-table.h:3954
+#: ../gdk/keyname-table.h:3965
 msgctxt "keyboard label"
 msgid "Page_Down"
 msgstr "Page_Down"
 
-#: gdk/keyname-table.h:3955
+#: ../gdk/keyname-table.h:3966
 msgctxt "keyboard label"
 msgid "End"
 msgstr "End"
 
-#: gdk/keyname-table.h:3956
+#: ../gdk/keyname-table.h:3967
 msgctxt "keyboard label"
 msgid "Begin"
 msgstr "Begin"
 
-#: gdk/keyname-table.h:3957
+#: ../gdk/keyname-table.h:3968
 msgctxt "keyboard label"
 msgid "Print"
 msgstr "Å tampaj"
 
-#: gdk/keyname-table.h:3958
+#: ../gdk/keyname-table.h:3969
 msgctxt "keyboard label"
 msgid "Insert"
 msgstr "Insert"
 
-#: gdk/keyname-table.h:3959
+#: ../gdk/keyname-table.h:3970
 msgctxt "keyboard label"
 msgid "Num_Lock"
 msgstr "Num_Lock"
 
-#: gdk/keyname-table.h:3960
+#. Translators: KP_ means 'key pad' here
+#: ../gdk/keyname-table.h:3972
 msgctxt "keyboard label"
 msgid "KP_Space"
 msgstr "KP_Space"
 
-#: gdk/keyname-table.h:3961
+#: ../gdk/keyname-table.h:3973
 msgctxt "keyboard label"
 msgid "KP_Tab"
 msgstr "KP_Tab"
 
-#: gdk/keyname-table.h:3962
+#: ../gdk/keyname-table.h:3974
 msgctxt "keyboard label"
 msgid "KP_Enter"
 msgstr "KP_Enter"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: gdk/keyname-table.h:3963
+#: ../gdk/keyname-table.h:3975
 msgctxt "keyboard label"
 msgid "KP_Home"
 msgstr "KP_Home"
 
-#: gdk/keyname-table.h:3964
+#: ../gdk/keyname-table.h:3976
 msgctxt "keyboard label"
 msgid "KP_Left"
 msgstr "KP_Levo"
 
-#: gdk/keyname-table.h:3965
+#: ../gdk/keyname-table.h:3977
 msgctxt "keyboard label"
 msgid "KP_Up"
 msgstr "KP_Gore"
 
-#: gdk/keyname-table.h:3966
+#: ../gdk/keyname-table.h:3978
 msgctxt "keyboard label"
 msgid "KP_Right"
 msgstr "KP_Desno"
 
-#: gdk/keyname-table.h:3967
+#: ../gdk/keyname-table.h:3979
 msgctxt "keyboard label"
 msgid "KP_Down"
 msgstr "KP_Dole"
 
-#: gdk/keyname-table.h:3968
+#: ../gdk/keyname-table.h:3980
 msgctxt "keyboard label"
 msgid "KP_Page_Up"
 msgstr "KP_Page_Up"
 
-#: gdk/keyname-table.h:3969
+#: ../gdk/keyname-table.h:3981
 msgctxt "keyboard label"
 msgid "KP_Prior"
 msgstr "KP_Prior"
 
-#: gdk/keyname-table.h:3970
+#: ../gdk/keyname-table.h:3982
 msgctxt "keyboard label"
 msgid "KP_Page_Down"
 msgstr "KP_Page_Down"
 
-#: gdk/keyname-table.h:3971
+#: ../gdk/keyname-table.h:3983
 msgctxt "keyboard label"
 msgid "KP_Next"
 msgstr "KP_Next"
 
-#: gdk/keyname-table.h:3972
+#: ../gdk/keyname-table.h:3984
 msgctxt "keyboard label"
 msgid "KP_End"
 msgstr "KP_End"
 
-#: gdk/keyname-table.h:3973
+#: ../gdk/keyname-table.h:3985
 msgctxt "keyboard label"
 msgid "KP_Begin"
 msgstr "KP_Begin"
 
-#: gdk/keyname-table.h:3974
+#: ../gdk/keyname-table.h:3986
 msgctxt "keyboard label"
 msgid "KP_Insert"
 msgstr "KP_Insert"
 
-#: gdk/keyname-table.h:3975
+#: ../gdk/keyname-table.h:3987
 msgctxt "keyboard label"
 msgid "KP_Delete"
 msgstr "KP_Delete"
 
-#: gdk/keyname-table.h:3976
+#: ../gdk/keyname-table.h:3988
 msgctxt "keyboard label"
 msgid "Delete"
 msgstr "Delete"
 
+#. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
+#: ../gdk/keyname-table.h:3990
+msgctxt "keyboard label"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonPovećajOsvetljenost"
+
+#: ../gdk/keyname-table.h:3991
+msgctxt "keyboard label"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonSmanjiOsvetljenost"
+
+#: ../gdk/keyname-table.h:3992
+msgctxt "keyboard label"
+msgid "XF86AudioMute"
+msgstr "XF86Isklju�iAudio"
+
+#: ../gdk/keyname-table.h:3993
+msgctxt "keyboard label"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86UtišajAudio"
+
+#: ../gdk/keyname-table.h:3994
+msgctxt "keyboard label"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86Poja�ajAudio"
+
+#: ../gdk/keyname-table.h:3995
+msgctxt "keyboard label"
+msgid "XF86AudioPlay"
+msgstr "XF86PustiAudio"
+
+#: ../gdk/keyname-table.h:3996
+msgctxt "keyboard label"
+msgid "XF86AudioStop"
+msgstr "XF86ZaustaviAudio"
+
+#: ../gdk/keyname-table.h:3997
+msgctxt "keyboard label"
+msgid "XF86AudioNext"
+msgstr "XF86Sledeće"
+
+#: ../gdk/keyname-table.h:3998
+msgctxt "keyboard label"
+msgid "XF86AudioPrev"
+msgstr "XF86Prethodno"
+
+#: ../gdk/keyname-table.h:3999
+msgctxt "keyboard label"
+msgid "XF86AudioRecord"
+msgstr "XF86Snimaj"
+
+#: ../gdk/keyname-table.h:4000
+msgctxt "keyboard label"
+msgid "XF86AudioPause"
+msgstr "XF86Pauziraj"
+
+#: ../gdk/keyname-table.h:4001
+msgctxt "keyboard label"
+msgid "XF86AudioRewind"
+msgstr "XF86Premotaj"
+
+#: ../gdk/keyname-table.h:4002
+msgctxt "keyboard label"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedij"
+
+#: ../gdk/keyname-table.h:4003
+msgctxt "keyboard label"
+msgid "XF86ScreenSaver"
+msgstr "XF86ÄŒuvarEkrana"
+
+#: ../gdk/keyname-table.h:4004
+msgctxt "keyboard label"
+msgid "XF86Battery"
+msgstr "XF86Baterija"
+
+#: ../gdk/keyname-table.h:4005
+msgctxt "keyboard label"
+msgid "XF86Launch1"
+msgstr "XF86Pokreni1"
+
+#: ../gdk/keyname-table.h:4006
+msgctxt "keyboard label"
+msgid "XF86Forward"
+msgstr "XF86Napred"
+
+#: ../gdk/keyname-table.h:4007
+msgctxt "keyboard label"
+msgid "XF86Back"
+msgstr "XF86Nazad"
+
+#: ../gdk/keyname-table.h:4008
+msgctxt "keyboard label"
+msgid "XF86Sleep"
+msgstr "XF86Spavaj"
+
+#: ../gdk/keyname-table.h:4009
+msgctxt "keyboard label"
+msgid "XF86Hibernate"
+msgstr "XF86Zamrzni"
+
+#: ../gdk/keyname-table.h:4010
+msgctxt "keyboard label"
+msgid "XF86WLAN"
+msgstr "XF86Beži�na"
+
+#: ../gdk/keyname-table.h:4011
+msgctxt "keyboard label"
+msgid "XF86WebCam"
+msgstr "XF86VebKamerica"
+
+#: ../gdk/keyname-table.h:4012
+msgctxt "keyboard label"
+msgid "XF86Display"
+msgstr "XF86Prikaži"
+
+#: ../gdk/keyname-table.h:4013
+msgctxt "keyboard label"
+msgid "XF86TouchpadToggle"
+msgstr "XF86Prebaciva�Dodirne table"
+
+#: ../gdk/keyname-table.h:4014
+msgctxt "keyboard label"
+msgid "XF86WakeUp"
+msgstr "XF86Probudi se"
+
+#: ../gdk/keyname-table.h:4015
+msgctxt "keyboard label"
+msgid "XF86Suspend"
+msgstr "XF86Obustavi"
+
 #. Description of --sync in --help output
-#: gdk/win32/gdkmain-win32.c:54
+#: ../gdk/win32/gdkmain-win32.c:55
 msgid "Don't batch GDI requests"
-msgstr "Ne spajaj GDI zahteve"
+msgstr "Ne grupiše GDI zahteve"
 
 #. Description of --no-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:56
+#: ../gdk/win32/gdkmain-win32.c:57
 msgid "Don't use the Wintab API for tablet support"
-msgstr "Ne koristi Wintab API za podršku tableta"
+msgstr "Ne koristi Vintab API za podršku tableta"
 
 #. Description of --ignore-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:58
+#: ../gdk/win32/gdkmain-win32.c:59
 msgid "Same as --no-wintab"
-msgstr "Isto Å¡to i --no-wintab"
+msgstr "Isto što i „--no-wintab“"
 
 #. Description of --use-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:60
+#: ../gdk/win32/gdkmain-win32.c:61
 msgid "Do use the Wintab API [default]"
-msgstr "Ne koristi Wintab API [podrazumevano]"
+msgstr "Koristi Vintab API [podrazumevano]"
 
 #. Description of --max-colors=COLORS in --help output
-#: gdk/win32/gdkmain-win32.c:62
+#: ../gdk/win32/gdkmain-win32.c:63
 msgid "Size of the palette in 8 bit mode"
 msgstr "Veli�ina palete u 8-bitnom režimu"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: gdk/win32/gdkmain-win32.c:63
+#: ../gdk/win32/gdkmain-win32.c:64
 msgid "COLORS"
 msgstr "BOJE"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:312
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:294
 #, c-format
 msgid "Starting %s"
-msgstr "Pokrećem %s"
+msgstr "Pokrećem „%s“"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:316
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:307
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram „%s“"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:321
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:312
 #, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
@@ -329,64 +460,81 @@ msgstr[1] "Otvaram %d stavke"
 msgstr[2] "Otvaram %d stavki"
 msgstr[3] "Otvaram stavku"
 
-#. Description of --sync in --help output
-#: gdk/x11/gdkmain-x11.c:96
-msgid "Make X calls synchronous"
-msgstr "U�ini Iks pozive sinhronim"
+#: ../gtk/a11y/gtkspinneraccessible.c:42
+msgctxt "throbbing progress animation widget"
+msgid "Spinner"
+msgstr "Vrteška"
+
+#: ../gtk/a11y/gtkspinneraccessible.c:43
+msgid "Provides visual indication of progress"
+msgstr "Obezbeđuje vidljiv prikaz napretka neke radnje"
+
+#: ../gtk/a11y/gtkswitchaccessible.c:65
+msgctxt "light switch widget"
+msgid "Switch"
+msgstr "Prekida�"
+
+#: ../gtk/a11y/gtkswitchaccessible.c:66
+msgid "Switches between on and off states"
+msgstr "Prebacuje sa uklju�enog na isklju�eno i obratno"
 
 #. Translators: this is the license preamble; the string at the end
 #. * contains the URL of the license.
 #.
-#: gtk/gtkaboutdialog.c:101
+#: ../gtk/gtkaboutdialog.c:103
 #, c-format
-msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s"
+msgid ""
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit <a href="
+"\"%s\">%s</a>"
 msgstr ""
-"Ovaj program se isporu�uje bez ikakve garancije! Za više podataka posetite %s"
+"Ovaj program se isporu�uje BEZ IKAKVE GARANCIJE! Za više podataka posetite "
+"<a href=„%s“>%s</a>"
 
-#: gtk/gtkaboutdialog.c:339 gtk/gtkaboutdialog.c:2235
+#: ../gtk/gtkaboutdialog.c:345
 msgid "License"
 msgstr "Licenca"
 
-#: gtk/gtkaboutdialog.c:340
+#: ../gtk/gtkaboutdialog.c:346
 msgid "The license of the program"
 msgstr "Licenca programa"
 
 #. Add the credits button
-#: gtk/gtkaboutdialog.c:621
+#: ../gtk/gtkaboutdialog.c:738
 msgid "C_redits"
 msgstr "_Zasluge"
 
 #. Add the license button
-#: gtk/gtkaboutdialog.c:635
+#: ../gtk/gtkaboutdialog.c:751
 msgid "_License"
 msgstr "_Licenca"
 
-#: gtk/gtkaboutdialog.c:839
+#: ../gtk/gtkaboutdialog.c:956
 msgid "Could not show link"
 msgstr "Ne mogu da prikažem vezu"
 
-#: gtk/gtkaboutdialog.c:932
+# ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
+#: ../gtk/gtkaboutdialog.c:993
+msgid "Homepage"
+msgstr "Li�no"
+
+#: ../gtk/gtkaboutdialog.c:1047
 #, c-format
 msgid "About %s"
-msgstr "O %s"
+msgstr "O programu: %s"
 
-#: gtk/gtkaboutdialog.c:2153
-msgid "Credits"
-msgstr "Zasluge"
-
-#: gtk/gtkaboutdialog.c:2185
-msgid "Written by"
+#: ../gtk/gtkaboutdialog.c:2371
+msgid "Created by"
 msgstr "Autori"
 
-#: gtk/gtkaboutdialog.c:2188
+#: ../gtk/gtkaboutdialog.c:2374
 msgid "Documented by"
 msgstr "Dokumentacija"
 
-#: gtk/gtkaboutdialog.c:2200
+#: ../gtk/gtkaboutdialog.c:2384
 msgid "Translated by"
 msgstr "Prevod"
 
-#: gtk/gtkaboutdialog.c:2204
+#: ../gtk/gtkaboutdialog.c:2389
 msgid "Artwork by"
 msgstr "Grafika"
 
@@ -395,7 +543,7 @@ msgstr "Grafika"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:160
+#: ../gtk/gtkaccellabel.c:158
 msgctxt "keyboard label"
 msgid "Shift"
 msgstr "Shift"
@@ -405,7 +553,7 @@ msgstr "Shift"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:166
+#: ../gtk/gtkaccellabel.c:164
 msgctxt "keyboard label"
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -415,7 +563,7 @@ msgstr "Ctrl"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:172
+#: ../gtk/gtkaccellabel.c:170
 msgctxt "keyboard label"
 msgid "Alt"
 msgstr "Alt"
@@ -425,7 +573,7 @@ msgstr "Alt"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:770
+#: ../gtk/gtkaccellabel.c:789
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -435,7 +583,7 @@ msgstr "Super"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:783
+#: ../gtk/gtkaccellabel.c:802
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Hyper"
@@ -445,37 +593,141 @@ msgstr "Hyper"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:797
+#: ../gtk/gtkaccellabel.c:816
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"
 
-#: gtk/gtkaccellabel.c:813
+#: ../gtk/gtkaccellabel.c:832
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Razmak"
 
-#: gtk/gtkaccellabel.c:816
+#: ../gtk/gtkaccellabel.c:835
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Kontra kosa crta"
 
-#: gtk/gtkbuilderparser.c:343
+#: ../gtk/gtkappchooserbutton.c:268
+msgid "Other application..."
+msgstr "Drugi program..."
+
+#: ../gtk/gtkappchooserdialog.c:130
+msgid "Failed to look for applications online"
+msgstr "Nisam uspeo da potražim programe na mreži"
+
+#: ../gtk/gtkappchooserdialog.c:171
+msgid "Find applications online"
+msgstr "Nalazi programe na mreži"
+
+#: ../gtk/gtkappchooserdialog.c:221
+msgid "Could not run application"
+msgstr "Ne mogu da pokrenem program"
+
+#: ../gtk/gtkappchooserdialog.c:234
+#, c-format
+msgid "Could not find '%s'"
+msgstr "Ne mogu da pronađem „%s“"
+
+#: ../gtk/gtkappchooserdialog.c:237
+msgid "Could not find application"
+msgstr "Ne mogu da pronađem program"
+
+#. Translators: %s is a filename
+#: ../gtk/gtkappchooserdialog.c:355
+#, c-format
+msgid "Select an application to open \"%s\""
+msgstr "Izaberite program kojim ćete otvoriti „%s“"
+
+#: ../gtk/gtkappchooserdialog.c:356 ../gtk/gtkappchooserwidget.c:643
+#, c-format
+msgid "No applications available to open \"%s\""
+msgstr "Nema dostupnih programa za otvaranje „%s“"
+
+#. Translators: %s is a file type description
+#: ../gtk/gtkappchooserdialog.c:362
+#, c-format
+msgid "Select an application for \"%s\" files"
+msgstr "Izaberite program za „%s“ datoteke"
+
+#: ../gtk/gtkappchooserdialog.c:364
+#, c-format
+msgid "No applications available to open \"%s\" files"
+msgstr "Nema dostupnih programa za otvaranje „%s“ datoteka"
+
+#: ../gtk/gtkappchooserdialog.c:380
+msgid ""
+"Click \"Show other applications\", for more options, or \"Find applications "
+"online\" to install a new application"
+msgstr ""
+"Kliknite na „Prikaži ostale programe“, za više opcija, ili „Nađi programe na "
+"mreži“ da instalirate novi program"
+
+#: ../gtk/gtkappchooserdialog.c:450
+msgid "Forget association"
+msgstr "Zaboravi udruženja"
+
+#: ../gtk/gtkappchooserdialog.c:515
+msgid "Show other applications"
+msgstr "Prikaži ostale programe"
+
+#: ../gtk/gtkappchooserdialog.c:533 ../gtk/gtkcolorseldialog.c:199
+msgid "_Select"
+msgstr "_Izaberi"
+
+#: ../gtk/gtkappchooserwidget.c:592
+msgid "Default Application"
+msgstr "Osnovni program"
+
+#: ../gtk/gtkappchooserwidget.c:730
+msgid "Recommended Applications"
+msgstr "Preporu�eni programi"
+
+#: ../gtk/gtkappchooserwidget.c:745
+msgid "Related Applications"
+msgstr "Povezani programi"
+
+#: ../gtk/gtkappchooserwidget.c:759
+msgid "Other Applications"
+msgstr "Ostali programi"
+
+#: ../gtk/gtkassistant.c:999
+#, fuzzy
+#| msgctxt "Stock label"
+#| msgid "C_onnect"
+msgid "C_ontinue"
+msgstr "Uspostavi ve_zu"
+
+#: ../gtk/gtkassistant.c:1002
+#, fuzzy
+#| msgctxt "Stock label, navigation"
+#| msgid "_Back"
+msgid "Go _Back"
+msgstr "_Nazad"
+
+#: ../gtk/gtkassistant.c:1006
+#, fuzzy
+#| msgctxt "print operation status"
+#| msgid "Finished"
+msgid "_Finish"
+msgstr "Završeno"
+
+#: ../gtk/gtkbuilderparser.c:342
 #, c-format
 msgid "Invalid type function on line %d: '%s'"
 msgstr "Neispravna funkcija tipa u redu %d: „%s“"
 
-#: gtk/gtkbuilderparser.c:407
-#, fuzzy, c-format
+#: ../gtk/gtkbuilderparser.c:406
+#, c-format
 msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
-msgstr "Duplikat ID objekta „%s“ u redu %d (prethodno u redu %d)"
+msgstr "Duplikat ID objekta „%s“ u %d° redu (prethodno u %d° redu)"
 
-#: gtk/gtkbuilderparser.c:859
+#: ../gtk/gtkbuilderparser.c:858
 #, c-format
 msgid "Invalid root element: '%s'"
 msgstr "Neispravan element korena: „%s“"
 
-#: gtk/gtkbuilderparser.c:898
+#: ../gtk/gtkbuilderparser.c:897
 #, c-format
 msgid "Unhandled tag: '%s'"
 msgstr "Nepodržana oznaka: „%s“"
@@ -490,7 +742,7 @@ msgstr "Nepodržana oznaka: „%s“"
 #. * text direction of RTL and specify "calendar:YM", then the year
 #. * will appear to the right of the month.
 #.
-#: gtk/gtkcalendar.c:883
+#: ../gtk/gtkcalendar.c:873
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -498,7 +750,7 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
-#: gtk/gtkcalendar.c:921
+#: ../gtk/gtkcalendar.c:911
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -507,7 +759,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: gtk/gtkcalendar.c:2006
+#: ../gtk/gtkcalendar.c:1912
 msgctxt "year measurement template"
 msgid "2000"
 msgstr "2000"
@@ -522,7 +774,7 @@ msgstr "2000"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: gtk/gtkcalendar.c:2037 gtk/gtkcalendar.c:2719
+#: ../gtk/gtkcalendar.c:1943 ../gtk/gtkcalendar.c:2640
 #, c-format
 msgctxt "calendar:day:digits"
 msgid "%d"
@@ -538,7 +790,7 @@ msgstr "%Id"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: gtk/gtkcalendar.c:2069 gtk/gtkcalendar.c:2579
+#: ../gtk/gtkcalendar.c:1975 ../gtk/gtkcalendar.c:2501
 #, c-format
 msgctxt "calendar:week:digits"
 msgid "%d"
@@ -554,7 +806,7 @@ msgstr "%Id"
 #. *
 #. * "%Y" is appropriate for most locales.
 #.
-#: gtk/gtkcalendar.c:2361
+#: ../gtk/gtkcalendar.c:2270
 msgctxt "calendar year format"
 msgid "%Y"
 msgstr "%Y"
@@ -562,43 +814,39 @@ msgstr "%Y"
 #. This label is displayed in a treeview cell displaying
 #. * a disabled accelerator key combination.
 #.
-#: gtk/gtkcellrendereraccel.c:272
+#: ../gtk/gtkcellrendereraccel.c:286
 msgctxt "Accelerator"
 msgid "Disabled"
-msgstr "Isklju�eno"
+msgstr "Isklju�ena"
 
 #. This label is displayed in a treeview cell displaying
 #. * an accelerator key combination that is not valid according
 #. * to gtk_accelerator_valid().
 #.
-#: gtk/gtkcellrendereraccel.c:282
+#: ../gtk/gtkcellrendereraccel.c:296
 msgctxt "Accelerator"
 msgid "Invalid"
-msgstr "Neispravan"
+msgstr "Neispravna"
 
 #. This label is displayed in a treeview cell displaying
 #. * an accelerator when the cell is clicked to change the
 #. * acelerator.
 #.
-#: gtk/gtkcellrendereraccel.c:418 gtk/gtkcellrendereraccel.c:675
+#: ../gtk/gtkcellrendereraccel.c:432 ../gtk/gtkcellrendereraccel.c:745
 msgid "New accelerator..."
 msgstr "Nova pre�ica..."
 
-#: gtk/gtkcellrendererprogress.c:362 gtk/gtkcellrendererprogress.c:452
+#: ../gtk/gtkcellrendererprogress.c:374 ../gtk/gtkcellrendererprogress.c:464
 #, c-format
 msgctxt "progress bar label"
 msgid "%d %%"
 msgstr "%d %%"
 
-#: gtk/gtkcolorbutton.c:176 gtk/gtkcolorbutton.c:445
+#: ../gtk/gtkcolorbutton.c:187 ../gtk/gtkcolorbutton.c:483
 msgid "Pick a Color"
 msgstr "Izaberite boju"
 
-#: gtk/gtkcolorbutton.c:336
-msgid "Received invalid color data\n"
-msgstr "Primio je neispravne podatke o bojama\n"
-
-#: gtk/gtkcolorsel.c:384
+#: ../gtk/gtkcolorsel.c:416
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -606,7 +854,7 @@ msgstr ""
 "Izaberite boju koju želite iz spoljnog prstena. Izaberite osvetljenost ili "
 "zatamnjenost te boje pomoću unutrašnjeg prstena."
 
-#: gtk/gtkcolorsel.c:408
+#: ../gtk/gtkcolorsel.c:442
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -614,85 +862,87 @@ msgstr ""
 "Kliknite na kapalo, a zatim kliknite na boju bilo gde na vašem ekranu da je "
 "izaberete."
 
-#: gtk/gtkcolorsel.c:417
+#: ../gtk/gtkcolorsel.c:452
 msgid "_Hue:"
 msgstr "_Nijansa:"
 
-#: gtk/gtkcolorsel.c:418
+#: ../gtk/gtkcolorsel.c:453
 msgid "Position on the color wheel."
 msgstr "Položaj na to�ku boja."
 
-#: gtk/gtkcolorsel.c:420
-msgid "_Saturation:"
+#: ../gtk/gtkcolorsel.c:455
+#, fuzzy
+#| msgid "_Saturation:"
+msgid "S_aturation:"
 msgstr "_Zasićenost:"
 
-#: gtk/gtkcolorsel.c:421
+#: ../gtk/gtkcolorsel.c:456
 msgid "Intensity of the color."
 msgstr "Zasićenost boje."
 
-#: gtk/gtkcolorsel.c:422
+#: ../gtk/gtkcolorsel.c:457
 msgid "_Value:"
 msgstr "_Vrednost:"
 
 # Mozda "vedrina boje"?
-#: gtk/gtkcolorsel.c:423
+#: ../gtk/gtkcolorsel.c:458
 msgid "Brightness of the color."
 msgstr "Osvetljenost boje."
 
-#: gtk/gtkcolorsel.c:424
+#: ../gtk/gtkcolorsel.c:459
 msgid "_Red:"
 msgstr "_Crvena:"
 
-#: gtk/gtkcolorsel.c:425
+#: ../gtk/gtkcolorsel.c:460
 msgid "Amount of red light in the color."
 msgstr "Koli�ina crvene svetlosti u boji."
 
-#: gtk/gtkcolorsel.c:426
+#: ../gtk/gtkcolorsel.c:461
 msgid "_Green:"
 msgstr "_Zelena:"
 
-#: gtk/gtkcolorsel.c:427
+#: ../gtk/gtkcolorsel.c:462
 msgid "Amount of green light in the color."
 msgstr "Koli�ina zelene svetlosti u boji."
 
-#: gtk/gtkcolorsel.c:428
+#: ../gtk/gtkcolorsel.c:463
 msgid "_Blue:"
 msgstr "_Plava:"
 
-#: gtk/gtkcolorsel.c:429
+#: ../gtk/gtkcolorsel.c:464
 msgid "Amount of blue light in the color."
 msgstr "Koli�ina plave svetlosti u boji."
 
 # Ovo zna�i „neprovidnost“, ali istovremeno se određuje i providnost, pa nema zabune.
-#: gtk/gtkcolorsel.c:432
+#: ../gtk/gtkcolorsel.c:467
 msgid "Op_acity:"
 msgstr "_Providnost:"
 
-#: gtk/gtkcolorsel.c:439 gtk/gtkcolorsel.c:449
+#: ../gtk/gtkcolorsel.c:475 ../gtk/gtkcolorsel.c:485
 msgid "Transparency of the color."
 msgstr "Providnost boje."
 
-#: gtk/gtkcolorsel.c:456
+#: ../gtk/gtkcolorsel.c:492
 msgid "Color _name:"
 msgstr "_Ime boje:"
 
-#: gtk/gtkcolorsel.c:470
+#: ../gtk/gtkcolorsel.c:507
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
 msgstr ""
-"Ovde možete uneti boju na HTML na�in kao heksadekadnu vrednost, ili "
-"jednostavno englesko ime boje kao što je „orange“."
+"Ovde možete uneti heksadecimalnu vrednost boje u HTML stilu, ili jednostavno "
+"englesko ime boje kao što je „orange“."
 
-#: gtk/gtkcolorsel.c:500
+#: ../gtk/gtkcolorsel.c:539
 msgid "_Palette:"
 msgstr "_Paleta"
 
-#: gtk/gtkcolorsel.c:529
+#: ../gtk/gtkcolorsel.c:569
 msgid "Color Wheel"
 msgstr "To�ak boja"
 
-#: gtk/gtkcolorsel.c:988
+#: ../gtk/gtkcolorsel.c:1042
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -702,7 +952,7 @@ msgstr ""
 "možete odvući na stavku palete, ili izabrati ovu boju kao tekuću odvla�eći "
 "je na pregled trenutno izabrane boje."
 
-#: gtk/gtkcolorsel.c:991
+#: ../gtk/gtkcolorsel.c:1048
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -710,21 +960,21 @@ msgstr ""
 "Boja koju ste izabrali. Možete odvući ovu boju na stavku palete kako bi je "
 "sa�uvali za naknadnu upotrebu."
 
-#: gtk/gtkcolorsel.c:996
+#: ../gtk/gtkcolorsel.c:1054
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now."
 msgstr "Već izabrana boja, za poređenje sa bojom koju ste sada izabrali."
 
-#: gtk/gtkcolorsel.c:999
+#: ../gtk/gtkcolorsel.c:1058
 msgid "The color you've chosen."
 msgstr "Izabrana boja."
 
-#: gtk/gtkcolorsel.c:1396
+#: ../gtk/gtkcolorsel.c:1460
 msgid "_Save color here"
 msgstr "Ovde _sa�uvaj boju"
 
-#: gtk/gtkcolorsel.c:1601
+#: ../gtk/gtkcolorsel.c:1665
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -733,7 +983,7 @@ msgstr ""
 "ovu stavku, dovucite ovde boju ili kliknite desnim tasterom miša i izaberite "
 "„Ovde sa�uvaj boju“."
 
-#: gtk/gtkcolorseldialog.c:189
+#: ../gtk/gtkcolorseldialog.c:217
 msgid "Color Selection"
 msgstr "Izbor boje"
 
@@ -743,136 +993,192 @@ msgstr "Izbor boje"
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
-#: gtk/gtkcustompaperunixdialog.c:116
+#: ../gtk/gtkcustompaperunixdialog.c:116
 msgid "default:mm"
 msgstr "default:mm"
 
 #. And show the custom paper dialog
-#: gtk/gtkcustompaperunixdialog.c:374 gtk/gtkprintunixdialog.c:3233
+#: ../gtk/gtkcustompaperunixdialog.c:372 ../gtk/gtkprintunixdialog.c:3325
 msgid "Manage Custom Sizes"
-msgstr "Odredi posebne veli�ine"
+msgstr "Odredi proizvoljne veli�ine"
 
-#: gtk/gtkcustompaperunixdialog.c:534 gtk/gtkpagesetupunixdialog.c:790
+#: ../gtk/gtkcustompaperunixdialog.c:533 ../gtk/gtkpagesetupunixdialog.c:783
 msgid "inch"
 msgstr "in�"
 
-#: gtk/gtkcustompaperunixdialog.c:536 gtk/gtkpagesetupunixdialog.c:788
+#: ../gtk/gtkcustompaperunixdialog.c:535 ../gtk/gtkpagesetupunixdialog.c:781
 msgid "mm"
 msgstr "mm"
 
-#: gtk/gtkcustompaperunixdialog.c:581
+#: ../gtk/gtkcustompaperunixdialog.c:580
 msgid "Margins from Printer..."
 msgstr "Margine kao u štampa�u..."
 
-#: gtk/gtkcustompaperunixdialog.c:747
+#: ../gtk/gtkcustompaperunixdialog.c:746
 #, c-format
 msgid "Custom Size %d"
 msgstr "Posebna veli�ina  %d"
 
-#: gtk/gtkcustompaperunixdialog.c:1059
+#: ../gtk/gtkcustompaperunixdialog.c:1084
 msgid "_Width:"
 msgstr "_Å irina:"
 
-#: gtk/gtkcustompaperunixdialog.c:1071
+#: ../gtk/gtkcustompaperunixdialog.c:1097
 msgid "_Height:"
 msgstr "_Visina:"
 
-#: gtk/gtkcustompaperunixdialog.c:1083
+#: ../gtk/gtkcustompaperunixdialog.c:1110
 msgid "Paper Size"
 msgstr "Veli�ina papira"
 
-#: gtk/gtkcustompaperunixdialog.c:1092
+#: ../gtk/gtkcustompaperunixdialog.c:1119
 msgid "_Top:"
 msgstr "_Gore:"
 
-#: gtk/gtkcustompaperunixdialog.c:1104
+#: ../gtk/gtkcustompaperunixdialog.c:1132
 msgid "_Bottom:"
 msgstr "_Dole:"
 
-#: gtk/gtkcustompaperunixdialog.c:1116
+#: ../gtk/gtkcustompaperunixdialog.c:1145
 msgid "_Left:"
 msgstr "_Levo:"
 
-#: gtk/gtkcustompaperunixdialog.c:1128
+#: ../gtk/gtkcustompaperunixdialog.c:1158
 msgid "_Right:"
 msgstr "D_esno:"
 
-#: gtk/gtkcustompaperunixdialog.c:1169
+#: ../gtk/gtkcustompaperunixdialog.c:1200
 msgid "Paper Margins"
 msgstr "Margine"
 
-#: gtk/gtkentry.c:8601 gtk/gtktextview.c:8248
+#: ../gtk/gtkentry.c:8956 ../gtk/gtktextview.c:8277
 msgid "Input _Methods"
 msgstr "_Na�ini unosa"
 
-#: gtk/gtkentry.c:8615 gtk/gtktextview.c:8262
+#: ../gtk/gtkentry.c:8970 ../gtk/gtktextview.c:8291
 msgid "_Insert Unicode Control Character"
 msgstr "_Ubaci kontrolni Unikod znak"
 
-#: gtk/gtkentry.c:10015
+#: ../gtk/gtkentry.c:10441
 msgid "Caps Lock and Num Lock are on"
 msgstr "Numeri�ki i taster za velika slova su uklju�eni"
 
-#: gtk/gtkentry.c:10017
+#: ../gtk/gtkentry.c:10443
 msgid "Num Lock is on"
 msgstr "Numeri�ki taster je uklju�en"
 
-#: gtk/gtkentry.c:10019
+#: ../gtk/gtkentry.c:10445
 msgid "Caps Lock is on"
 msgstr "Taster za velika slova je uklju�en"
 
+#. *
+#. * SECTION:gtkfilechooserbutton
+#. * @Short_description: A button to launch a file selection dialog
+#. * @Title: GtkFileChooserButton
+#. * @See_also:#GtkFileChooserDialog
+#. *
+#. * The #GtkFileChooserButton is a widget that lets the user select a
+#. * file.  It implements the #GtkFileChooser interface.  Visually, it is a
+#. * file name with a button to bring up a #GtkFileChooserDialog.
+#. * The user can then use that dialog to change the file associated with
+#. * that button.  This widget does not support setting the
+#. * #GtkFileChooser:select-multiple property to %TRUE.
+#. *
+#. * <example>
+#. * <title>Create a button to let the user select a file in /etc</title>
+#. * <programlisting>
+#. * {
+#. *   GtkWidget *button;
+#. *
+#. *   button = gtk_file_chooser_button_new (_("Select a file"),
+#. *                                         GTK_FILE_CHOOSER_ACTION_OPEN);
+#. *   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (button),
+#. *                                        "/etc");
+#. * }
+#. * </programlisting>
+#. * </example>
+#. *
+#. * The #GtkFileChooserButton supports the #GtkFileChooserAction<!-- -->s
+#. * %GTK_FILE_CHOOSER_ACTION_OPEN and %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER.
+#. *
+#. * <important>
+#. * The #GtkFileChooserButton will ellipsize the label,
+#. * and thus will thus request little horizontal space.  To give the button
+#. * more space, you should call gtk_widget_get_preferred_size(),
+#. * gtk_file_chooser_button_set_width_chars(), or pack the button in
+#. * such a way that other interface elements give space to the widget.
+#. * </important>
+#.
 #. **************** *
 #. *  Private Macros  *
 #. * ****************
-#: gtk/gtkfilechooserbutton.c:61
-msgid "Select A File"
+#: ../gtk/gtkfilechooserbutton.c:105
+msgid "Select a File"
 msgstr "Izaberi datoteku"
 
-#: gtk/gtkfilechooserbutton.c:62 gtk/gtkfilechooserdefault.c:1812
+#: ../gtk/gtkfilechooserbutton.c:106 ../gtk/gtkfilechooserdefault.c:1812
 msgid "Desktop"
 msgstr "Radna površ"
 
-#: gtk/gtkfilechooserbutton.c:63
+#: ../gtk/gtkfilechooserbutton.c:107
 msgid "(None)"
 msgstr "(ništa)"
 
-#: gtk/gtkfilechooserbutton.c:2005
+#: ../gtk/gtkfilechooserbutton.c:2046
 msgid "Other..."
 msgstr "Neka druga..."
 
-#: gtk/gtkfilechooserdefault.c:148
+#: ../gtk/gtkfilechooserdefault.c:148
 msgid "Type name of new folder"
 msgstr "Unesite ime nove fascikle"
 
-#: gtk/gtkfilechooserdefault.c:938
+#: ../gtk/gtkfilechooserdefault.c:963
 msgid "Could not retrieve information about the file"
 msgstr "Ne mogu da saznam podatke o datoteci"
 
-#: gtk/gtkfilechooserdefault.c:949
+#: ../gtk/gtkfilechooserdefault.c:974
 msgid "Could not add a bookmark"
 msgstr "Ne mogu da dodam obeleživa�"
 
-#: gtk/gtkfilechooserdefault.c:960
+#: ../gtk/gtkfilechooserdefault.c:985
 msgid "Could not remove bookmark"
 msgstr "Ne mogu da uklonim obeleživa�"
 
-#: gtk/gtkfilechooserdefault.c:971
+#: ../gtk/gtkfilechooserdefault.c:996
 msgid "The folder could not be created"
 msgstr "Ne mogu da napravim fasciklu"
 
-#: gtk/gtkfilechooserdefault.c:984
+#: ../gtk/gtkfilechooserdefault.c:1009
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
 msgstr ""
-"Fascikla se ne može napraviti, pošto već postoji datoteka istog imena.  "
-"Koristite drugo ime za fasciklu, ili prvo preimenujte datoteku."
+"Fascikla ne može biti napravljena, pošto već postoji datoteka sa istim "
+"imenom.  Koristite neko drugo ime za fasciklu, ili kao prvo preimenujte "
+"datoteku."
+
+#: ../gtk/gtkfilechooserdefault.c:1023
+msgid "You need to choose a valid filename."
+msgstr "Morate da izaberete ispravno ime datoteke."
+
+#: ../gtk/gtkfilechooserdefault.c:1026
+#, c-format
+msgid "Cannot create a file under %s as it is not a folder"
+msgstr "Ne mogu da napravim datoteku pod „%s“ zato što to nije fascikla"
+
+#: ../gtk/gtkfilechooserdefault.c:1038
+msgid ""
+"You may only select folders.  The item that you selected is not a folder; "
+"try using a different item."
+msgstr ""
+"Možete jedino da izaberete fascikle. Stavka koju ste izabrali nije fascikla; "
+"pokušajte da koristite neku drugu stavku."
 
-#: gtk/gtkfilechooserdefault.c:995
+#: ../gtk/gtkfilechooserdefault.c:1048
 msgid "Invalid file name"
 msgstr "Neispravno ime datoteke"
 
-#: gtk/gtkfilechooserdefault.c:1005
+#: ../gtk/gtkfilechooserdefault.c:1058
 msgid "The folder contents could not be displayed"
 msgstr "Ne mogu da prikažem sadržaj fascikle"
 
@@ -880,186 +1186,190 @@ msgstr "Ne mogu da prikažem sadržaj fascikle"
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: gtk/gtkfilechooserdefault.c:1555
+#: ../gtk/gtkfilechooserdefault.c:1584
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
-#: gtk/gtkfilechooserdefault.c:1731
+#: ../gtk/gtkfilechooserdefault.c:1733
 msgid "Search"
 msgstr "Traži"
 
-#: gtk/gtkfilechooserdefault.c:1755 gtk/gtkfilechooserdefault.c:9289
+#: ../gtk/gtkfilechooserdefault.c:1757 ../gtk/gtkfilechooserdefault.c:4835
 msgid "Recently Used"
 msgstr "Skoro korišćeno"
 
-#: gtk/gtkfilechooserdefault.c:2409
+#: ../gtk/gtkfilechooserdefault.c:2356
 msgid "Select which types of files are shown"
 msgstr "Izaberi koje vrste datoteka se prikazuju"
 
-#: gtk/gtkfilechooserdefault.c:2768
+#: ../gtk/gtkfilechooserdefault.c:2715
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Dodaj fasciklu „%s“ u obeleživa�e"
 
-#: gtk/gtkfilechooserdefault.c:2812
+#: ../gtk/gtkfilechooserdefault.c:2759
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Dodaj tekuću fasciklu među obeleživa�e"
 
-#: gtk/gtkfilechooserdefault.c:2814
+#: ../gtk/gtkfilechooserdefault.c:2761
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Dodaj izabrane fascikle među obeleživa�e"
 
-#: gtk/gtkfilechooserdefault.c:2852
+#: ../gtk/gtkfilechooserdefault.c:2799
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Ukloni obeleživa� „%s“"
 
-#: gtk/gtkfilechooserdefault.c:2854
+#: ../gtk/gtkfilechooserdefault.c:2801
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "Ne mogu da uklonim obeleživa� „%s“"
 
-#: gtk/gtkfilechooserdefault.c:2861 gtk/gtkfilechooserdefault.c:3725
+#: ../gtk/gtkfilechooserdefault.c:2808 ../gtk/gtkfilechooserdefault.c:3693
 msgid "Remove the selected bookmark"
 msgstr "Ukloni izabrani obeleživa�"
 
-#: gtk/gtkfilechooserdefault.c:3421
+#: ../gtk/gtkfilechooserdefault.c:3372
 msgid "Remove"
 msgstr "Ukloni"
 
-#: gtk/gtkfilechooserdefault.c:3430
+#: ../gtk/gtkfilechooserdefault.c:3381
 msgid "Rename..."
 msgstr "Preimenuj..."
 
 #. Accessible object name for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3593
+#: ../gtk/gtkfilechooserdefault.c:3545
 msgid "Places"
 msgstr "Mesta"
 
 #. Column header for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3650
+#: ../gtk/gtkfilechooserdefault.c:3602
 msgid "_Places"
 msgstr "_Mesta"
 
-#: gtk/gtkfilechooserdefault.c:3706
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: gtk/gtkfilechooserdefault.c:3713
+#: ../gtk/gtkfilechooserdefault.c:3681
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Dodaj izabranu fasciklu u obeleživa�e"
 
-#: gtk/gtkfilechooserdefault.c:3718
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: gtk/gtkfilechooserdefault.c:3860
+#: ../gtk/gtkfilechooserdefault.c:3828
 msgid "Could not select file"
 msgstr "Ne mogu da izaberem datoteku"
 
-#: gtk/gtkfilechooserdefault.c:4035
+#: ../gtk/gtkfilechooserdefault.c:4001
 msgid "_Add to Bookmarks"
 msgstr "_Dodaj među obeleživa�e"
 
-#: gtk/gtkfilechooserdefault.c:4048
+#: ../gtk/gtkfilechooserdefault.c:4014
 msgid "Show _Hidden Files"
 msgstr "Prikaži sa_krivene datoteke"
 
-#: gtk/gtkfilechooserdefault.c:4055
+#: ../gtk/gtkfilechooserdefault.c:4021
 msgid "Show _Size Column"
-msgstr "Prikaži kolone sa _veli�inom"
+msgstr "Prikaži kolonu _veli�ina"
 
-#: gtk/gtkfilechooserdefault.c:4281
+#: ../gtk/gtkfilechooserdefault.c:4248
 msgid "Files"
 msgstr "Datoteke"
 
-#: gtk/gtkfilechooserdefault.c:4332
+#: ../gtk/gtkfilechooserdefault.c:4299
 msgid "Name"
 msgstr "Ime:"
 
-#: gtk/gtkfilechooserdefault.c:4355
+#: ../gtk/gtkfilechooserdefault.c:4322
 msgid "Size"
 msgstr "Veli�ina"
 
-#: gtk/gtkfilechooserdefault.c:4369
+#: ../gtk/gtkfilechooserdefault.c:4336
 msgid "Modified"
 msgstr "Izmenjena"
 
 #. Label
-#: gtk/gtkfilechooserdefault.c:4624 gtk/gtkprinteroptionwidget.c:801
+#: ../gtk/gtkfilechooserdefault.c:4431 ../gtk/gtkprinteroptionwidget.c:799
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: gtk/gtkfilechooserdefault.c:4667
-msgid "_Browse for other folders"
-msgstr "_Razgledaj ostale fascikle"
-
-#: gtk/gtkfilechooserdefault.c:4937
+#: ../gtk/gtkfilechooserdefault.c:4673
 msgid "Type a file name"
-msgstr "Unesi ime datoteke"
+msgstr "Upiši ime datoteke"
+
+#: ../gtk/gtkfilechooserdefault.c:4720 ../gtk/gtkfilechooserdefault.c:4731
+#, fuzzy
+#| msgid "Select a folder"
+msgid "Please select a folder below"
+msgstr "Izaberite fasciklu"
+
+#: ../gtk/gtkfilechooserdefault.c:4726
+#, fuzzy
+#| msgid "Type a file name"
+msgid "Please type a file name"
+msgstr "Upiši ime datoteke"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:4980
+#: ../gtk/gtkfilechooserdefault.c:4797
 msgid "Create Fo_lder"
 msgstr "Napravi _fasciklu"
 
-#: gtk/gtkfilechooserdefault.c:4990
+#: ../gtk/gtkfilechooserdefault.c:4845
+msgid "Search:"
+msgstr "Traži:"
+
+#: ../gtk/gtkfilechooserdefault.c:4896
 msgid "_Location:"
 msgstr "_Putanja:"
 
-#: gtk/gtkfilechooserdefault.c:5194
+#: ../gtk/gtkfilechooserdefault.c:5349
 msgid "Save in _folder:"
 msgstr "Sa�uvaj u _fascikli:"
 
-#: gtk/gtkfilechooserdefault.c:5196
+#: ../gtk/gtkfilechooserdefault.c:5351
 msgid "Create in _folder:"
 msgstr "Napravi u _fascikli:"
 
-#: gtk/gtkfilechooserdefault.c:6248
+#: ../gtk/gtkfilechooserdefault.c:6445
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "Ne mogu da pro�itam sadržaj %s"
 
-#: gtk/gtkfilechooserdefault.c:6252
+#: ../gtk/gtkfilechooserdefault.c:6449
 msgid "Could not read the contents of the folder"
 msgstr "Ne mogu da pro�itam sadržaj fascikle"
 
-#: gtk/gtkfilechooserdefault.c:6345 gtk/gtkfilechooserdefault.c:6413
-#: gtk/gtkfilechooserdefault.c:6558
+#: ../gtk/gtkfilechooserdefault.c:6542 ../gtk/gtkfilechooserdefault.c:6610
+#: ../gtk/gtkfilechooserdefault.c:6762
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: gtk/gtkfilechooserdefault.c:6360
+#: ../gtk/gtkfilechooserdefault.c:6557
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: gtk/gtkfilechooserdefault.c:6362
+#: ../gtk/gtkfilechooserdefault.c:6559
 msgid "Yesterday at %H:%M"
 msgstr "Ju�e u %H:%M"
 
-#: gtk/gtkfilechooserdefault.c:7028
+#: ../gtk/gtkfilechooserdefault.c:7234
 msgid "Cannot change to folder because it is not local"
 msgstr "Ne mogu da uđem u fasciklu zato što nije lokalna"
 
-#: gtk/gtkfilechooserdefault.c:7625 gtk/gtkfilechooserdefault.c:7646
+#: ../gtk/gtkfilechooserdefault.c:7834 ../gtk/gtkfilechooserdefault.c:7855
 #, c-format
 msgid "Shortcut %s already exists"
-msgstr "Pre�ica %s već postoji"
+msgstr "Pre�ica „%s“ već postoji"
 
-#: gtk/gtkfilechooserdefault.c:7736
+#: ../gtk/gtkfilechooserdefault.c:7945
 #, c-format
 msgid "Shortcut %s does not exist"
-msgstr "Pre�ica %s ne postoji"
+msgstr "Pre�ica „%s“ ne postoji"
 
-#: gtk/gtkfilechooserdefault.c:7997 gtk/gtkprintunixdialog.c:480
+#: ../gtk/gtkfilechooserdefault.c:8191 ../gtk/gtkprintunixdialog.c:550
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "Datoteka „%s“ već postoji. Da li da prepišem preko?"
+msgstr "Datoteka „%s“ već postoji. Da li želite da je zamenite?"
 
-#: gtk/gtkfilechooserdefault.c:8000 gtk/gtkprintunixdialog.c:484
+#: ../gtk/gtkfilechooserdefault.c:8194 ../gtk/gtkprintunixdialog.c:554
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
@@ -1067,52 +1377,50 @@ msgstr ""
 "Ova datoteka već postoji u „%s“. Ako je zamenite sa novom, sadržaj će biti "
 "prepisan."
 
-#: gtk/gtkfilechooserdefault.c:8005 gtk/gtkprintunixdialog.c:491
+#: ../gtk/gtkfilechooserdefault.c:8199 ../gtk/gtkprintunixdialog.c:561
 msgid "_Replace"
 msgstr "_Zameni"
 
-#: gtk/gtkfilechooserdefault.c:8658
+#: ../gtk/gtkfilechooserdefault.c:9005
 msgid "Could not start the search process"
 msgstr "Ne mogu da zapo�nem pretraživanje"
 
-#: gtk/gtkfilechooserdefault.c:8659
+#: ../gtk/gtkfilechooserdefault.c:9006
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
 msgstr ""
-"Program ne može da uspostavi vezu sa servisom indeksiranja. Uveri se da je "
-"on pokrenut."
+"Program ne može da uspostavi vezu sa servisom indeksiranja. Uverite se da je "
+"pokrenut."
 
-#: gtk/gtkfilechooserdefault.c:8673
+#: ../gtk/gtkfilechooserdefault.c:9020
 msgid "Could not send the search request"
 msgstr "Ne mogu da pošaljem zahtev pretrage"
 
-#: gtk/gtkfilechooserdefault.c:8861
-msgid "Search:"
-msgstr "Traži:"
-
-#: gtk/gtkfilechooserdefault.c:9466
+#: ../gtk/gtkfilechooserdefault.c:9646
 #, c-format
 msgid "Could not mount %s"
-msgstr "Ne mogu da priklju�im %s"
+msgstr "Ne mogu da priklju�im „%s“"
 
 #. Translators: this is shown in the feedback for Tab-completion in a file
 #. * chooser's text entry, when the user enters an invalid path.
-#: gtk/gtkfilechooserentry.c:702 gtk/gtkfilechooserentry.c:1169
+#: ../gtk/gtkfilechooserentry.c:702 ../gtk/gtkfilechooserentry.c:1174
+#: ../gtk/gtkfilesystem.c:721
+#, c-format
 msgid "Invalid path"
 msgstr "Neispravna putanja"
 
 #. translators: this text is shown when there are no completions
 #. * for something the user typed in a file chooser entry
 #.
-#: gtk/gtkfilechooserentry.c:1101
+#: ../gtk/gtkfilechooserentry.c:1106
 msgid "No match"
 msgstr "Bez poklapanja"
 
 #. translators: this text is shown when there is exactly one completion
 #. * for something the user typed in a file chooser entry
 #.
-#: gtk/gtkfilechooserentry.c:1112
+#: ../gtk/gtkfilechooserentry.c:1117
 msgid "Sole completion"
 msgstr "Jedan mogući nastavak"
 
@@ -1120,13 +1428,13 @@ msgstr "Jedan mogući nastavak"
 #. * entry is a complete filename, but could be continued to find
 #. * a longer match
 #.
-#: gtk/gtkfilechooserentry.c:1128
+#: ../gtk/gtkfilechooserentry.c:1133
 msgid "Complete, but not unique"
 msgstr "Poklapanje, ali ima i drugih"
 
 #. Translators: this text is shown while the system is searching
 #. * for possible completions for filenames in a file chooser entry.
-#: gtk/gtkfilechooserentry.c:1160
+#: ../gtk/gtkfilechooserentry.c:1165
 msgid "Completing..."
 msgstr "Nastavljam..."
 
@@ -1134,7 +1442,7 @@ msgstr "Nastavljam..."
 #. Translators: this is shown in the feedback for Tab-completion in a
 #. * file chooser's text entry when the user enters something like
 #. * "sftp://blahblah" in an app that only supports local filenames.
-#: gtk/gtkfilechooserentry.c:1182 gtk/gtkfilechooserentry.c:1207
+#: ../gtk/gtkfilechooserentry.c:1187 ../gtk/gtkfilechooserentry.c:1212
 msgid "Only local files may be selected"
 msgstr "Možete izabrati samo lokalne datoteke"
 
@@ -1142,162 +1450,168 @@ msgstr "Možete izabrati samo lokalne datoteke"
 #. Translators: this is shown in the feedback for Tab-completion in a
 #. * file chooser's text entry when the user hasn't entered the first '/'
 #. * after a hostname and yet hits Tab (such as "sftp://blahblah[Tab]")
-#: gtk/gtkfilechooserentry.c:1191
+#: ../gtk/gtkfilechooserentry.c:1196
 msgid "Incomplete hostname; end it with '/'"
-msgstr "Polovi�no ime domaćina; završite ga sa „/“"
+msgstr "Nepotpuno ime domaćina; završite ga sa „/“"
 
 #. Translators: this is shown in the feedback for Tab-completion in a file
 #. * chooser's text entry when the user enters a path that does not exist
 #. * and then hits Tab
-#: gtk/gtkfilechooserentry.c:1202
+#: ../gtk/gtkfilechooserentry.c:1207
 msgid "Path does not exist"
 msgstr "Putanja ne postoji"
 
-#: gtk/gtkfilechoosersettings.c:486
-#, c-format
-msgid "Error creating folder '%s': %s"
-msgstr "Greška pri pravljenju fascikle „%s“: %s"
-
 #. The pointers we return for a GtkFileSystemVolume are opaque tokens; they are
 #. * really pointers to GDrive, GVolume or GMount objects.  We need an extra
 #. * token for the fake "File System" volume.  So, we'll return a pointer to
 #. * this particular string.
 #.
-#: gtk/gtkfilesystem.c:48
+#: ../gtk/gtkfilesystem.c:48
 msgid "File System"
 msgstr "Sistem datoteka"
 
-#: gtk/gtkfontbutton.c:142 gtk/gtkfontbutton.c:266
+#: ../gtk/gtkfontbutton.c:152 ../gtk/gtkfontbutton.c:276
 msgid "Pick a Font"
 msgstr "Izaberite font"
 
 #. Initialize fields
-#: gtk/gtkfontbutton.c:260
+#: ../gtk/gtkfontbutton.c:270
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: gtk/gtkfontbutton.c:785
+#: ../gtk/gtkfontbutton.c:787
 msgid "Font"
 msgstr "Font"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: gtk/gtkfontsel.c:103
+#: ../gtk/gtkfontsel.c:125
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abvgdđšž�ćljnjdž ABVGD�ŠŽČĆLJNJDŽ abc�ćdđ ABCČĆD�"
 
-#: gtk/gtkfontsel.c:370
+#: ../gtk/gtkfontsel.c:394
 msgid "_Family:"
 msgstr "_Porodica:"
 
-#: gtk/gtkfontsel.c:376
+#: ../gtk/gtkfontsel.c:401
 msgid "_Style:"
 msgstr "_Stil:"
 
-#: gtk/gtkfontsel.c:382
+#: ../gtk/gtkfontsel.c:408
 msgid "Si_ze:"
 msgstr "_Veli�ina:"
 
 #. create the text entry widget
-#: gtk/gtkfontsel.c:559
+#: ../gtk/gtkfontsel.c:585
 msgid "_Preview:"
 msgstr "Pre_gled:"
 
-#: gtk/gtkfontsel.c:1659
+#: ../gtk/gtkfontsel.c:1738
 msgid "Font Selection"
 msgstr "Izbor fonta"
 
-#. Remove this icon source so we don't keep trying to
-#. * load it.
-#.
-#: gtk/gtkiconfactory.c:1356
-#, c-format
-msgid "Error loading icon: %s"
-msgstr "Greška pri u�itavanju ikone: %s"
-
-#: gtk/gtkicontheme.c:1354
-#, c-format
-msgid ""
-"Could not find the icon '%s'. The '%s' theme\n"
-"was not found either, perhaps you need to install it.\n"
-"You can get a copy from:\n"
-"\t%s"
-msgstr ""
-"Ne mogu da nađem ikonu „%s“. Ni tema „%s“ nije \n"
-"nađena, možda treba da je instalirate.\n"
-"Možete nabaviti primerak sa:\n"
-"\t%s"
-
-#: gtk/gtkicontheme.c:1535
+#: ../gtk/gtkicontheme.c:1605
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikona „%s“ nije prisutna u temi"
 
-#: gtk/gtkicontheme.c:3048
+#: ../gtk/gtkicontheme.c:3115
 msgid "Failed to load icon"
 msgstr "Neuspelo u�itavanje ikonice"
 
-#: gtk/gtkimmodule.c:526
+#: ../gtk/gtkimmodule.c:525
 msgid "Simple"
 msgstr "Jednostavna"
 
-#: gtk/gtkimmulticontext.c:588
+#: ../gtk/gtkimmulticontext.c:588
 msgctxt "input method menu"
 msgid "System"
 msgstr "Sistem"
 
-#: gtk/gtkimmulticontext.c:598
+#: ../gtk/gtkimmulticontext.c:598
 msgctxt "input method menu"
 msgid "None"
 msgstr "Ništa"
 
-#: gtk/gtkimmulticontext.c:681
+#: ../gtk/gtkimmulticontext.c:681
 #, c-format
 msgctxt "input method menu"
 msgid "System (%s)"
 msgstr "Sistem (%s)"
 
 #. Open Link
-#: gtk/gtklabel.c:6202
+#: ../gtk/gtklabel.c:6293
 msgid "_Open Link"
 msgstr "Otvori _vezu"
 
 #. Copy Link Address
-#: gtk/gtklabel.c:6214
+#: ../gtk/gtklabel.c:6305
 msgid "Copy _Link Address"
 msgstr "Umnoži _adresu veze"
 
-#: gtk/gtklinkbutton.c:449
+#: ../gtk/gtklinkbutton.c:484
 msgid "Copy URL"
 msgstr "Umnoži URL"
 
-#: gtk/gtklinkbutton.c:601
+#: ../gtk/gtklinkbutton.c:647
 msgid "Invalid URI"
 msgstr "Neispravan URL"
 
+#: ../gtk/gtklockbutton.c:288
+msgid "Lock"
+msgstr "Zaklju�aj"
+
+#: ../gtk/gtklockbutton.c:297
+msgid "Unlock"
+msgstr "Otklju�aj"
+
+#: ../gtk/gtklockbutton.c:306
+msgid ""
+"Dialog is unlocked.\n"
+"Click to prevent further changes"
+msgstr ""
+"Prozor�e je otklju�ano.\n"
+"Kliknite da spre�ite dalje izmene."
+
+#: ../gtk/gtklockbutton.c:315
+msgid ""
+"Dialog is locked.\n"
+"Click to make changes"
+msgstr ""
+"Prozor�e je zaklju�ano.\n"
+"Kliknite da unesete izmene."
+
+#: ../gtk/gtklockbutton.c:324
+msgid ""
+"System policy prevents changes.\n"
+"Contact your system administrator"
+msgstr ""
+"Sigurnost sistema spre�ava izmene.\n"
+"Obratite se administratoru sistema."
+
 # dopunski dodaci? „dobar fazon“... crni Danilo
 #. Description of --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:526
+#: ../gtk/gtkmain.c:562
 msgid "Load additional GTK+ modules"
-msgstr "U�itaj dopunske Gtk+ dodatke"
+msgstr "U�itava dopunske Gtk+ dodatke"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:527
+#: ../gtk/gtkmain.c:563
 msgid "MODULES"
 msgstr "DODACI"
 
 #. Description of --g-fatal-warnings in --help output
-#: gtk/gtkmain.c:529
+#: ../gtk/gtkmain.c:565
 msgid "Make all warnings fatal"
-msgstr "U�ini sva upozorenja kobnim"
+msgstr "ÄŒini sva upozorenja kobnim"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: gtk/gtkmain.c:532
+#: ../gtk/gtkmain.c:568
 msgid "GTK+ debugging flags to set"
 msgstr "Koje Gtk+ opcije za nalaženje grešaka uklju�iti"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: gtk/gtkmain.c:535
+#: ../gtk/gtkmain.c:571
 msgid "GTK+ debugging flags to unset"
 msgstr "Koje Gtk+ opcije za nalaženje grešaka isklju�iti"
 
@@ -1306,123 +1620,131 @@ msgstr "Koje Gtk+ opcije za nalaženje grešaka isklju�iti"
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
-#: gtk/gtkmain.c:798
+#: ../gtk/gtkmain.c:848
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: gtk/gtkmain.c:863
+#: ../gtk/gtkmain.c:914
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "Ne mogu da pristupim ekranu: %s"
 
-#: gtk/gtkmain.c:922
+#: ../gtk/gtkmain.c:980
 msgid "GTK+ Options"
 msgstr "Gtk+ opcije"
 
-#: gtk/gtkmain.c:922
+#: ../gtk/gtkmain.c:980
 msgid "Show GTK+ Options"
 msgstr "Prikaži Gtk+ opcije"
 
-#: gtk/gtkmountoperation.c:491
+#: ../gtk/gtkmountoperation.c:489
 msgid "Co_nnect"
 msgstr "Poveži _se"
 
-#: gtk/gtkmountoperation.c:558
+#: ../gtk/gtkmountoperation.c:559
 msgid "Connect _anonymously"
 msgstr "Poveži se _anonimno"
 
-#: gtk/gtkmountoperation.c:567
+#: ../gtk/gtkmountoperation.c:568
 msgid "Connect as u_ser:"
 msgstr "Poveži se kao _korisnik:"
 
-#: gtk/gtkmountoperation.c:605
+#: ../gtk/gtkmountoperation.c:602
 msgid "_Username:"
 msgstr "_Korisni�ko ime:"
 
-#: gtk/gtkmountoperation.c:610
+#: ../gtk/gtkmountoperation.c:607
 msgid "_Domain:"
 msgstr "_Domen:"
 
-#: gtk/gtkmountoperation.c:616
+#: ../gtk/gtkmountoperation.c:613
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: gtk/gtkmountoperation.c:634
+#: ../gtk/gtkmountoperation.c:631
 msgid "Forget password _immediately"
 msgstr "_Odmah zaboravi lozinku"
 
-#: gtk/gtkmountoperation.c:644
+#: ../gtk/gtkmountoperation.c:641
 msgid "Remember password until you _logout"
 msgstr "Zapamti lozinku _do odjavljivanja"
 
-#: gtk/gtkmountoperation.c:654
+#: ../gtk/gtkmountoperation.c:651
 msgid "Remember _forever"
 msgstr "Zapamti _zauvek"
 
-#: gtk/gtkmountoperation.c:883
-#, fuzzy, c-format
+#: ../gtk/gtkmountoperation.c:880
+#, c-format
 msgid "Unknown Application (PID %d)"
 msgstr "Nepoznat program (pod brojem %d)"
 
-#: gtk/gtkmountoperation.c:1066
-#, c-format
+#: ../gtk/gtkmountoperation.c:1063
 msgid "Unable to end process"
 msgstr "Ne mogu da okon�am proces"
 
-#: gtk/gtkmountoperation.c:1103
+#: ../gtk/gtkmountoperation.c:1100
 msgid "_End Process"
 msgstr "_Okon�aj proces"
 
-#: gtk/gtkmountoperation-stub.c:64
-#, fuzzy, c-format
+#: ../gtk/gtkmountoperation-stub.c:64
+#, c-format
 msgid "Cannot kill process with PID %d. Operation is not implemented."
-msgstr ""
-"Ne komu da okon�am proces pod brojem %d. Radnja još uvek nije podržana."
+msgstr "Ne mogu da okon�am proces pod brojem %d. Radnja još uvek nije podržana."
 
 #. translators: this string is a name for the 'less' command
-#: gtk/gtkmountoperation-x11.c:862
+#: ../gtk/gtkmountoperation-x11.c:959
 msgid "Terminal Pager"
 msgstr "Naredba „less“"
 
-#: gtk/gtkmountoperation-x11.c:863
+#: ../gtk/gtkmountoperation-x11.c:960
 msgid "Top Command"
 msgstr "Naredba „top“"
 
-#: gtk/gtkmountoperation-x11.c:864
+#: ../gtk/gtkmountoperation-x11.c:961
 msgid "Bourne Again Shell"
 msgstr "Nova Bornova ljuska"
 
-#: gtk/gtkmountoperation-x11.c:865
+#: ../gtk/gtkmountoperation-x11.c:962
 msgid "Bourne Shell"
 msgstr "Bornova ljuska"
 
-#: gtk/gtkmountoperation-x11.c:866
+#: ../gtk/gtkmountoperation-x11.c:963
 msgid "Z Shell"
 msgstr "Z ljuska"
 
-#: gtk/gtkmountoperation-x11.c:963
-#, fuzzy, c-format
+#: ../gtk/gtkmountoperation-x11.c:1060
+#, c-format
 msgid "Cannot end process with PID %d: %s"
 msgstr "Ne mogu da okon�am proces pod brojem %d: %s"
 
-#: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170
+#: ../gtk/gtknotebook.c:4902 ../gtk/gtknotebook.c:7587
 #, c-format
 msgid "Page %u"
 msgstr "List %u"
 
-#: gtk/gtkpagesetup.c:596 gtk/gtkpapersize.c:838 gtk/gtkpapersize.c:880
+#. Translators: the format here is used to build the string that will be rendered
+#. * in the number emblem.
+#.
+#: ../gtk/gtknumerableicon.c:482
+#, c-format
+msgctxt "Number format"
+msgid "%d"
+msgstr "%Id"
+
+#: ../gtk/gtkpagesetup.c:648 ../gtk/gtkpapersize.c:849
+#: ../gtk/gtkpapersize.c:889
 msgid "Not a valid page setup file"
 msgstr "Datoteka sa postavkom stranice nije ispravna"
 
-#: gtk/gtkpagesetupunixdialog.c:179
+#: ../gtk/gtkpagesetupunixdialog.c:172
 msgid "Any Printer"
 msgstr "Bilo koji štampa�"
 
-#: gtk/gtkpagesetupunixdialog.c:179
+#: ../gtk/gtkpagesetupunixdialog.c:172
 msgid "For portable documents"
 msgstr "Za prenosive dokumente"
 
-#: gtk/gtkpagesetupunixdialog.c:809
+#: ../gtk/gtkpagesetupunixdialog.c:802
 #, c-format
 msgid ""
 "Margins:\n"
@@ -1437,51 +1759,51 @@ msgstr ""
 " Gore: %s %s\n"
 " Dole: %s %s"
 
-#: gtk/gtkpagesetupunixdialog.c:858 gtk/gtkprintunixdialog.c:3284
+#: ../gtk/gtkpagesetupunixdialog.c:851 ../gtk/gtkprintunixdialog.c:3376
 msgid "Manage Custom Sizes..."
-msgstr "Odredi posebne veli�ine..."
+msgstr "Odredi proizvoljne veli�ine..."
 
-#: gtk/gtkpagesetupunixdialog.c:909
+#: ../gtk/gtkpagesetupunixdialog.c:902
 msgid "_Format for:"
 msgstr "_Format za:"
 
-#: gtk/gtkpagesetupunixdialog.c:931 gtk/gtkprintunixdialog.c:3456
+#: ../gtk/gtkpagesetupunixdialog.c:925 ../gtk/gtkprintunixdialog.c:3556
 msgid "_Paper size:"
 msgstr "Veli�ina _papira:"
 
-#: gtk/gtkpagesetupunixdialog.c:962
+#: ../gtk/gtkpagesetupunixdialog.c:958
 msgid "_Orientation:"
 msgstr "_Usmerenje:"
 
-#: gtk/gtkpagesetupunixdialog.c:1026 gtk/gtkprintunixdialog.c:3518
+#: ../gtk/gtkpagesetupunixdialog.c:1023 ../gtk/gtkprintunixdialog.c:3620
 msgid "Page Setup"
 msgstr "Podešavanje strane"
 
-#: gtk/gtkpathbar.c:154
+#: ../gtk/gtkpathbar.c:156
 msgid "Up Path"
 msgstr "Uz putanju"
 
-#: gtk/gtkpathbar.c:156
+#: ../gtk/gtkpathbar.c:158
 msgid "Down Path"
 msgstr "Niz putanju"
 
-#: gtk/gtkpathbar.c:1497
+#: ../gtk/gtkpathbar.c:1516
 msgid "File System Root"
 msgstr "Koren sistema datoteka"
 
-#: gtk/gtkprintbackend.c:749
+#: ../gtk/gtkprintbackend.c:749
 msgid "Authentication"
-msgstr "Prijava"
+msgstr "Potvrđivanje identiteta"
 
-#: gtk/gtkprinteroptionwidget.c:694
+#: ../gtk/gtkprinteroptionwidget.c:692
 msgid "Not available"
 msgstr "Nije dostupno"
 
-#: gtk/gtkprinteroptionwidget.c:794
+#: ../gtk/gtkprinteroptionwidget.c:792
 msgid "Select a folder"
 msgstr "Izaberite fasciklu"
 
-#: gtk/gtkprinteroptionwidget.c:813
+#: ../gtk/gtkprinteroptionwidget.c:812
 msgid "_Save in folder:"
 msgstr "_Sa�uvaj u fascikli:"
 
@@ -1489,216 +1811,213 @@ msgstr "_Sa�uvaj u fascikli:"
 #. * jobs. %s gets replaced by the application name, %d gets replaced
 #. * by the job number.
 #.
-#: gtk/gtkprintoperation.c:190
+#: ../gtk/gtkprintoperation.c:263
 #, c-format
 msgid "%s job #%d"
 msgstr "%s — posao #%d"
 
-#: gtk/gtkprintoperation.c:1695
+#: ../gtk/gtkprintoperation.c:1768
 msgctxt "print operation status"
 msgid "Initial state"
 msgstr "Pokretanje"
 
-#: gtk/gtkprintoperation.c:1696
+#: ../gtk/gtkprintoperation.c:1769
 msgctxt "print operation status"
 msgid "Preparing to print"
 msgstr "Pripremam za Å¡tampu"
 
-#: gtk/gtkprintoperation.c:1697
+#: ../gtk/gtkprintoperation.c:1770
 msgctxt "print operation status"
 msgid "Generating data"
 msgstr "Obrazujem podatke"
 
-#: gtk/gtkprintoperation.c:1698
+#: ../gtk/gtkprintoperation.c:1771
 msgctxt "print operation status"
 msgid "Sending data"
 msgstr "Å aljem podatke"
 
-#: gtk/gtkprintoperation.c:1699
+#: ../gtk/gtkprintoperation.c:1772
 msgctxt "print operation status"
 msgid "Waiting"
 msgstr "ÄŒekam"
 
-#: gtk/gtkprintoperation.c:1700
+#: ../gtk/gtkprintoperation.c:1773
 msgctxt "print operation status"
 msgid "Blocking on issue"
 msgstr "Zaustavljeno zbog problema"
 
-#: gtk/gtkprintoperation.c:1701
+#: ../gtk/gtkprintoperation.c:1774
 msgctxt "print operation status"
 msgid "Printing"
 msgstr "Å tampam"
 
-#: gtk/gtkprintoperation.c:1702
+#: ../gtk/gtkprintoperation.c:1775
 msgctxt "print operation status"
 msgid "Finished"
 msgstr "Završeno"
 
-#: gtk/gtkprintoperation.c:1703
+#: ../gtk/gtkprintoperation.c:1776
 msgctxt "print operation status"
 msgid "Finished with error"
 msgstr "Završeno uz grešku"
 
-#: gtk/gtkprintoperation.c:2270
+#: ../gtk/gtkprintoperation.c:2343
 #, c-format
 msgid "Preparing %d"
-msgstr "Pripremam %d"
+msgstr "Pripremam „%d“"
 
-#: gtk/gtkprintoperation.c:2272 gtk/gtkprintoperation.c:2902
-#, c-format
+#: ../gtk/gtkprintoperation.c:2345 ../gtk/gtkprintoperation.c:2975
 msgid "Preparing"
 msgstr "Pripremam"
 
-#: gtk/gtkprintoperation.c:2275
+#: ../gtk/gtkprintoperation.c:2348
 #, c-format
 msgid "Printing %d"
-msgstr "Å tampam %d"
+msgstr "Štampam „%d“"
 
-#: gtk/gtkprintoperation.c:2932
-#, c-format
+#: ../gtk/gtkprintoperation.c:3005
 msgid "Error creating print preview"
 msgstr "Greška pri izradi pregleda"
 
-#: gtk/gtkprintoperation.c:2935
-#, c-format
+#: ../gtk/gtkprintoperation.c:3008
 msgid "The most probable reason is that a temporary file could not be created."
 msgstr "Naj�ešći razlog je da nije moguće napraviti privremenu datoteku."
 
-#: gtk/gtkprintoperation-unix.c:297
+#: ../gtk/gtkprintoperation-unix.c:304
 msgid "Error launching preview"
 msgstr "Greška pri pokretanju pregleda"
 
-#: gtk/gtkprintoperation-unix.c:470 gtk/gtkprintoperation-win32.c:1447
+#: ../gtk/gtkprintoperation-unix.c:477 ../gtk/gtkprintoperation-win32.c:1447
 msgid "Application"
 msgstr "Program"
 
-#: gtk/gtkprintoperation-win32.c:611
+#: ../gtk/gtkprintoperation-win32.c:611
 msgid "Printer offline"
 msgstr "Štampa� je isklju�en"
 
-#: gtk/gtkprintoperation-win32.c:613
+#: ../gtk/gtkprintoperation-win32.c:613
 msgid "Out of paper"
 msgstr "Nema papira"
 
 #. Translators: this is a printer status.
-#: gtk/gtkprintoperation-win32.c:615
-#: modules/printbackends/cups/gtkprintbackendcups.c:1998
+#: ../gtk/gtkprintoperation-win32.c:615
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2036
 msgid "Paused"
 msgstr "Zaustavljeno"
 
-#: gtk/gtkprintoperation-win32.c:617
+#: ../gtk/gtkprintoperation-win32.c:617
 msgid "Need user intervention"
-msgstr "Potrebna intervencija korisnika"
+msgstr "Potrebna je intervencija korisnika"
 
-#: gtk/gtkprintoperation-win32.c:717
+#: ../gtk/gtkprintoperation-win32.c:717
 msgid "Custom size"
-msgstr "Posebna veli�ina"
+msgstr "Proizvoljna veli�ina"
 
-#: gtk/gtkprintoperation-win32.c:1539
+#: ../gtk/gtkprintoperation-win32.c:1539
 msgid "No printer found"
 msgstr "Štampa� nije pronađen"
 
-#: gtk/gtkprintoperation-win32.c:1566
+#: ../gtk/gtkprintoperation-win32.c:1566
 msgid "Invalid argument to CreateDC"
-msgstr "Neispravan argument za CreateDC"
+msgstr "Neispravan argument za „CreateDC“"
 
-#: gtk/gtkprintoperation-win32.c:1602 gtk/gtkprintoperation-win32.c:1829
+#: ../gtk/gtkprintoperation-win32.c:1602 ../gtk/gtkprintoperation-win32.c:1829
 msgid "Error from StartDoc"
-msgstr "Greška u StartDoc"
+msgstr "Greška u „StartDoc“"
 
-#: gtk/gtkprintoperation-win32.c:1684 gtk/gtkprintoperation-win32.c:1707
-#: gtk/gtkprintoperation-win32.c:1755
+#: ../gtk/gtkprintoperation-win32.c:1684 ../gtk/gtkprintoperation-win32.c:1707
+#: ../gtk/gtkprintoperation-win32.c:1755
 msgid "Not enough free memory"
 msgstr "Nema dovoljno slobodne memorije"
 
-#: gtk/gtkprintoperation-win32.c:1760
+#: ../gtk/gtkprintoperation-win32.c:1760
 msgid "Invalid argument to PrintDlgEx"
-msgstr "Neispravan argument sa PrintDlgEx"
+msgstr "Neispravan argument sa „PrintDlgEx“"
 
-#: gtk/gtkprintoperation-win32.c:1765
+#: ../gtk/gtkprintoperation-win32.c:1765
 msgid "Invalid pointer to PrintDlgEx"
-msgstr "Neispravan pokaziva� na PrintDlgEx"
+msgstr "Neispravan pokaziva� na „PrintDlgEx“"
 
-#: gtk/gtkprintoperation-win32.c:1770
+#: ../gtk/gtkprintoperation-win32.c:1770
 msgid "Invalid handle to PrintDlgEx"
-msgstr "Neispravna zaka�ka ka PrintDlgEx"
+msgstr "Neispravna zaka�ka ka „PrintDlgEx“"
 
-#: gtk/gtkprintoperation-win32.c:1775
+#: ../gtk/gtkprintoperation-win32.c:1775
 msgid "Unspecified error"
 msgstr "Nepoznata greška"
 
-#: gtk/gtkprintunixdialog.c:618
+#: ../gtk/gtkprintunixdialog.c:688
 msgid "Getting printer information failed"
 msgstr "Ne mogu da prikupim podatke o štampa�u"
 
-#: gtk/gtkprintunixdialog.c:1873
+#: ../gtk/gtkprintunixdialog.c:1942
 msgid "Getting printer information..."
 msgstr "Prikupljam podatke o štampa�u..."
 
-#: gtk/gtkprintunixdialog.c:2139
+#: ../gtk/gtkprintunixdialog.c:2216
 msgid "Printer"
 msgstr "Štampa�"
 
 #. Translators: this is the header for the location column in the print dialog
-#: gtk/gtkprintunixdialog.c:2149
+#: ../gtk/gtkprintunixdialog.c:2226
 msgid "Location"
 msgstr "Putanja"
 
 #. Translators: this is the header for the printer status column in the print dialog
-#: gtk/gtkprintunixdialog.c:2160
+#: ../gtk/gtkprintunixdialog.c:2237
 msgid "Status"
 msgstr "Stanje"
 
-#: gtk/gtkprintunixdialog.c:2186
+#: ../gtk/gtkprintunixdialog.c:2263
 msgid "Range"
 msgstr "Opseg"
 
-#: gtk/gtkprintunixdialog.c:2190
+#: ../gtk/gtkprintunixdialog.c:2267
 msgid "_All Pages"
 msgstr "_Sve listove"
 
-#: gtk/gtkprintunixdialog.c:2197
+#: ../gtk/gtkprintunixdialog.c:2274
 msgid "C_urrent Page"
 msgstr "_Trenutnu"
 
-#: gtk/gtkprintunixdialog.c:2207
+#: ../gtk/gtkprintunixdialog.c:2284
 msgid "Se_lection"
 msgstr "_Izbor"
 
-#: gtk/gtkprintunixdialog.c:2216
+#: ../gtk/gtkprintunixdialog.c:2293
 msgid "Pag_es:"
 msgstr "Stranic_e:"
 
-#: gtk/gtkprintunixdialog.c:2217
+#: ../gtk/gtkprintunixdialog.c:2294
 msgid ""
 "Specify one or more page ranges,\n"
 " e.g. 1-3,7,11"
 msgstr ""
-"Navedi jedan ili više opsega stranica,\n"
+"Navedite jedan ili više opsega stranica,\n"
 " npr. 1-3,7,11"
 
-#: gtk/gtkprintunixdialog.c:2227
+#: ../gtk/gtkprintunixdialog.c:2304
 msgid "Pages"
 msgstr "Strane"
 
-#: gtk/gtkprintunixdialog.c:2240
+#: ../gtk/gtkprintunixdialog.c:2317
 msgid "Copies"
 msgstr "Primeraka"
 
 #. FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns
-#: gtk/gtkprintunixdialog.c:2245
+#: ../gtk/gtkprintunixdialog.c:2322
 msgid "Copie_s:"
 msgstr "Primera_ka:"
 
-#: gtk/gtkprintunixdialog.c:2263
+#: ../gtk/gtkprintunixdialog.c:2341
 msgid "C_ollate"
 msgstr "_Složi"
 
-#: gtk/gtkprintunixdialog.c:2271
+#: ../gtk/gtkprintunixdialog.c:2349
 msgid "_Reverse"
 msgstr "_Obrni"
 
-#: gtk/gtkprintunixdialog.c:2291
+#: ../gtk/gtkprintunixdialog.c:2369
 msgid "General"
 msgstr "Opšte"
 
@@ -1708,169 +2027,169 @@ msgstr "Opšte"
 #. Translators: These strings name the possible arrangements of
 #. * multiple pages on a sheet when printing
 #.
-#: gtk/gtkprintunixdialog.c:3017
-#: modules/printbackends/cups/gtkprintbackendcups.c:3508
+#: ../gtk/gtkprintunixdialog.c:3109
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3586
 msgid "Left to right, top to bottom"
 msgstr "S leva na desno, odozgo na dole"
 
-#: gtk/gtkprintunixdialog.c:3017
-#: modules/printbackends/cups/gtkprintbackendcups.c:3508
+#: ../gtk/gtkprintunixdialog.c:3109
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3586
 msgid "Left to right, bottom to top"
 msgstr "S leva na desno, odozdo na gore"
 
-#: gtk/gtkprintunixdialog.c:3018
-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
+#: ../gtk/gtkprintunixdialog.c:3110
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3587
 msgid "Right to left, top to bottom"
 msgstr "S desna na levo, odozgo na dole"
 
-#: gtk/gtkprintunixdialog.c:3018
-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
+#: ../gtk/gtkprintunixdialog.c:3110
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3587
 msgid "Right to left, bottom to top"
 msgstr "S desna na levo, odozdo na gore"
 
-#: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
+#: ../gtk/gtkprintunixdialog.c:3111
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3588
 msgid "Top to bottom, left to right"
 msgstr "Odozgo na dole, s leva na desno"
 
-#: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
+#: ../gtk/gtkprintunixdialog.c:3111
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3588
 msgid "Top to bottom, right to left"
 msgstr "Odozgo na dole, s desna na levo"
 
-#: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
+#: ../gtk/gtkprintunixdialog.c:3112
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3589
 msgid "Bottom to top, left to right"
 msgstr "Odozdo na gore, s leva na desno"
 
-#: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
+#: ../gtk/gtkprintunixdialog.c:3112
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3589
 msgid "Bottom to top, right to left"
 msgstr "Odozdo na gore, s desna na levo"
 
 #. Translators, this string is used to label the option in the print
 #. * dialog that controls in what order multiple pages are arranged
 #.
-#: gtk/gtkprintunixdialog.c:3024 gtk/gtkprintunixdialog.c:3037
-#: modules/printbackends/cups/gtkprintbackendcups.c:3543
+#: ../gtk/gtkprintunixdialog.c:3116 ../gtk/gtkprintunixdialog.c:3129
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3623
 msgid "Page Ordering"
 msgstr "Slaganje strana"
 
-#: gtk/gtkprintunixdialog.c:3053
+#: ../gtk/gtkprintunixdialog.c:3145
 msgid "Left to right"
 msgstr "Sa leva na desno"
 
-#: gtk/gtkprintunixdialog.c:3054
+#: ../gtk/gtkprintunixdialog.c:3146
 msgid "Right to left"
 msgstr "Sa desna na levo"
 
-#: gtk/gtkprintunixdialog.c:3066
+#: ../gtk/gtkprintunixdialog.c:3158
 msgid "Top to bottom"
 msgstr "Odozgo na dole"
 
-#: gtk/gtkprintunixdialog.c:3067
+#: ../gtk/gtkprintunixdialog.c:3159
 msgid "Bottom to top"
 msgstr "Odozdo na gore"
 
-#: gtk/gtkprintunixdialog.c:3307
+#: ../gtk/gtkprintunixdialog.c:3399
 msgid "Layout"
 msgstr "Raspored"
 
-#: gtk/gtkprintunixdialog.c:3311
+#: ../gtk/gtkprintunixdialog.c:3403
 msgid "T_wo-sided:"
 msgstr "D_vostrano:"
 
-#: gtk/gtkprintunixdialog.c:3326
+#: ../gtk/gtkprintunixdialog.c:3419
 msgid "Pages per _side:"
 msgstr "_Strana na listu:"
 
-#: gtk/gtkprintunixdialog.c:3343
+#: ../gtk/gtkprintunixdialog.c:3437
 msgid "Page or_dering:"
 msgstr "Re_dosled strana:"
 
-#: gtk/gtkprintunixdialog.c:3359
+#: ../gtk/gtkprintunixdialog.c:3454
 msgid "_Only print:"
 msgstr "Å tampaj sam_o:"
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:3374
+#: ../gtk/gtkprintunixdialog.c:3470
 msgid "All sheets"
 msgstr "Sve listove"
 
-#: gtk/gtkprintunixdialog.c:3375
+#: ../gtk/gtkprintunixdialog.c:3471
 msgid "Even sheets"
 msgstr "Parne listove"
 
-#: gtk/gtkprintunixdialog.c:3376
+#: ../gtk/gtkprintunixdialog.c:3472
 msgid "Odd sheets"
 msgstr "Neparne listove"
 
-#: gtk/gtkprintunixdialog.c:3379
+#: ../gtk/gtkprintunixdialog.c:3475
 msgid "Sc_ale:"
 msgstr "R_azmera:"
 
-#: gtk/gtkprintunixdialog.c:3406
+#: ../gtk/gtkprintunixdialog.c:3503
 msgid "Paper"
 msgstr "Papir"
 
-#: gtk/gtkprintunixdialog.c:3410
+#: ../gtk/gtkprintunixdialog.c:3507
 msgid "Paper _type:"
 msgstr "_Tip papira:"
 
-#: gtk/gtkprintunixdialog.c:3425
+#: ../gtk/gtkprintunixdialog.c:3523
 msgid "Paper _source:"
 msgstr "_Fioka za papir:"
 
-#: gtk/gtkprintunixdialog.c:3440
+#: ../gtk/gtkprintunixdialog.c:3539
 msgid "Output t_ray:"
 msgstr "Izlazna t_raka:"
 
-#: gtk/gtkprintunixdialog.c:3480
+#: ../gtk/gtkprintunixdialog.c:3581
 msgid "Or_ientation:"
 msgstr "_Usmerenje:"
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:3495
+#: ../gtk/gtkprintunixdialog.c:3597
 msgid "Portrait"
 msgstr "Uspravno"
 
-#: gtk/gtkprintunixdialog.c:3496
+#: ../gtk/gtkprintunixdialog.c:3598
 msgid "Landscape"
 msgstr "Položeno"
 
-#: gtk/gtkprintunixdialog.c:3497
+#: ../gtk/gtkprintunixdialog.c:3599
 msgid "Reverse portrait"
 msgstr "Obrnuto, uspravno"
 
-#: gtk/gtkprintunixdialog.c:3498
+#: ../gtk/gtkprintunixdialog.c:3600
 msgid "Reverse landscape"
 msgstr "Obrnuto, položeno"
 
-#: gtk/gtkprintunixdialog.c:3543
+#: ../gtk/gtkprintunixdialog.c:3645
 msgid "Job Details"
 msgstr "Podaci o poslu"
 
-#: gtk/gtkprintunixdialog.c:3549
+#: ../gtk/gtkprintunixdialog.c:3651
 msgid "Pri_ority:"
 msgstr "Važn_ost:"
 
 # bug(goran): ???
-#: gtk/gtkprintunixdialog.c:3564
+#: ../gtk/gtkprintunixdialog.c:3667
 msgid "_Billing info:"
 msgstr "Podaci za _fakturisanje:"
 
-#: gtk/gtkprintunixdialog.c:3582
+#: ../gtk/gtkprintunixdialog.c:3686
 msgid "Print Document"
 msgstr "Å tampaj dokument"
 
 #. Translators: this is one of the choices for the print at option
 #. * in the print dialog
 #.
-#: gtk/gtkprintunixdialog.c:3591
+#: ../gtk/gtkprintunixdialog.c:3695
 msgid "_Now"
 msgstr "_Sad"
 
-#: gtk/gtkprintunixdialog.c:3602
+#: ../gtk/gtkprintunixdialog.c:3706
 msgid "A_t:"
 msgstr "_U:"
 
@@ -1878,7 +2197,7 @@ msgstr "_U:"
 #. * You can remove the am/pm values below for your locale if they are not
 #. * supported.
 #.
-#: gtk/gtkprintunixdialog.c:3608
+#: ../gtk/gtkprintunixdialog.c:3712
 msgid ""
 "Specify the time of print,\n"
 " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
@@ -1886,121 +2205,105 @@ msgstr ""
 "Odredite vreme za pošetak štampe,\n"
 "Na primer: 18, 15:30, 14:15:20"
 
-#: gtk/gtkprintunixdialog.c:3618
+#: ../gtk/gtkprintunixdialog.c:3722
 msgid "Time of print"
 msgstr "Vreme Å¡tampanja"
 
-#: gtk/gtkprintunixdialog.c:3634
+#: ../gtk/gtkprintunixdialog.c:3738
 msgid "On _hold"
 msgstr "Na _�ekanju"
 
-#: gtk/gtkprintunixdialog.c:3635
+#: ../gtk/gtkprintunixdialog.c:3739
 msgid "Hold the job until it is explicitly released"
 msgstr "Zadrži posao dok se izri�ito ne zatraži štampa"
 
-#: gtk/gtkprintunixdialog.c:3655
+#: ../gtk/gtkprintunixdialog.c:3759
 msgid "Add Cover Page"
 msgstr "Dodaj naslovnu stranu"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: gtk/gtkprintunixdialog.c:3664
+#: ../gtk/gtkprintunixdialog.c:3768
 msgid "Be_fore:"
 msgstr "P_re:"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: gtk/gtkprintunixdialog.c:3682
+#: ../gtk/gtkprintunixdialog.c:3787
 msgid "_After:"
 msgstr "P_osle:"
 
 #. Translators: this is the tab label for the notebook tab containing
 #. * job-specific options in the print dialog
 #.
-#: gtk/gtkprintunixdialog.c:3700
+#: ../gtk/gtkprintunixdialog.c:3806
 msgid "Job"
 msgstr "Posao"
 
-#: gtk/gtkprintunixdialog.c:3766
+#: ../gtk/gtkprintunixdialog.c:3872
 msgid "Advanced"
 msgstr "Napredno"
 
 #. Translators: this will appear as tab label in print dialog.
-#: gtk/gtkprintunixdialog.c:3804
+#: ../gtk/gtkprintunixdialog.c:3910
 msgid "Image Quality"
 msgstr "Kvalitet slike"
 
 #. Translators: this will appear as tab label in print dialog.
-#: gtk/gtkprintunixdialog.c:3808
+#: ../gtk/gtkprintunixdialog.c:3914
 msgid "Color"
 msgstr "Boja"
 
 #. Translators: this will appear as tab label in print dialog.
 #. It's a typographical term, as in "Binding and finishing"
-#: gtk/gtkprintunixdialog.c:3813
+#: ../gtk/gtkprintunixdialog.c:3919
 msgid "Finishing"
 msgstr "Završavam"
 
-#: gtk/gtkprintunixdialog.c:3823
+#: ../gtk/gtkprintunixdialog.c:3929
 msgid "Some of the settings in the dialog conflict"
-msgstr "Neka podešavanja u prozor�etu se sudaraju"
+msgstr "Neka podešavanja u prozor�etu se sukobljavaju"
 
-#: gtk/gtkprintunixdialog.c:3846
+#: ../gtk/gtkprintunixdialog.c:3952
 msgid "Print"
 msgstr "Å tampaj"
 
-#: gtk/gtkrc.c:2834
-#, c-format
-msgid "Unable to find include file: \"%s\""
-msgstr "Ne mogu pronaći datoteku za uklju�ivanje: „%s“"
-
-#: gtk/gtkrc.c:3470 gtk/gtkrc.c:3473
-#, c-format
-msgid "Unable to locate image file in pixmap_path: \"%s\""
-msgstr "Ne mogu pronaći datoteku sa slikom u pixmap_path: „%s“"
-
-#: gtk/gtkrecentaction.c:165 gtk/gtkrecentaction.c:173
-#: gtk/gtkrecentchoosermenu.c:615 gtk/gtkrecentchoosermenu.c:623
-#, c-format
-msgid "This function is not implemented for widgets of class '%s'"
-msgstr "Ova funkcija nije implementirana za kontrole u klasi „%s“"
-
-#: gtk/gtkrecentchooserdefault.c:482
+#: ../gtk/gtkrecentchooserdefault.c:485
 msgid "Select which type of documents are shown"
-msgstr "Izaberi koje vrste dokumenata se prikazuju"
+msgstr "Izaberite koje vrste dokumenata se prikazuju"
 
-#: gtk/gtkrecentchooserdefault.c:1138 gtk/gtkrecentchooserdefault.c:1175
+#: ../gtk/gtkrecentchooserdefault.c:1142 ../gtk/gtkrecentchooserdefault.c:1179
 #, c-format
 msgid "No item for URI '%s' found"
-msgstr "Nije pronađena stavka za URI „%s“"
+msgstr "Nisam pronašao stavku za adresu „%s“"
 
-#: gtk/gtkrecentchooserdefault.c:1302
+#: ../gtk/gtkrecentchooserdefault.c:1306
 msgid "Untitled filter"
 msgstr "Neimenovani filter"
 
-#: gtk/gtkrecentchooserdefault.c:1655
+#: ../gtk/gtkrecentchooserdefault.c:1659
 msgid "Could not remove item"
-msgstr "Ne mogu da izaberem stavku"
+msgstr "Ne mogu da uklonim stavku"
 
-#: gtk/gtkrecentchooserdefault.c:1699
+#: ../gtk/gtkrecentchooserdefault.c:1703
 msgid "Could not clear list"
-msgstr "Ne mogu da o�istim listu"
+msgstr "Ne mogu da o�istim spisak"
 
-#: gtk/gtkrecentchooserdefault.c:1783
+#: ../gtk/gtkrecentchooserdefault.c:1787
 msgid "Copy _Location"
 msgstr "Umnoži _putanju"
 
-#: gtk/gtkrecentchooserdefault.c:1796
+#: ../gtk/gtkrecentchooserdefault.c:1800
 msgid "_Remove From List"
-msgstr "U_kloni iz liste"
+msgstr "U_kloni sa spiska"
 
-#: gtk/gtkrecentchooserdefault.c:1805
+#: ../gtk/gtkrecentchooserdefault.c:1809
 msgid "_Clear List"
-msgstr "_O�isti listu"
+msgstr "_O�isti spisak"
 
-#: gtk/gtkrecentchooserdefault.c:1819
+#: ../gtk/gtkrecentchooserdefault.c:1823
 msgid "Show _Private Resources"
 msgstr "Prikaži _privatne resurse"
 
@@ -2014,21 +2317,21 @@ msgstr "Prikaži _privatne resurse"
 #. * user appended or prepended custom menu items to the
 #. * recent chooser menu widget.
 #.
-#: gtk/gtkrecentchoosermenu.c:369
+#: ../gtk/gtkrecentchoosermenu.c:362
 msgid "No items found"
-msgstr "Ni jedna stavka nije pronađena"
+msgstr "Nisam pronašao nijednu stavku"
 
-#: gtk/gtkrecentchoosermenu.c:535 gtk/gtkrecentchoosermenu.c:591
+#: ../gtk/gtkrecentchoosermenu.c:528 ../gtk/gtkrecentchoosermenu.c:584
 #, c-format
 msgid "No recently used resource found with URI `%s'"
-msgstr "Nije pronađen skoro korišćen resurs sa URI adresom „%s“"
+msgstr "Nisam pronašao skorašnje korišćen resurs sa adresom „%s“"
 
-#: gtk/gtkrecentchoosermenu.c:802
+#: ../gtk/gtkrecentchoosermenu.c:794
 #, c-format
 msgid "Open '%s'"
 msgstr "Otvori „%s“"
 
-#: gtk/gtkrecentchoosermenu.c:832
+#: ../gtk/gtkrecentchoosermenu.c:824
 msgid "Unknown item"
 msgstr "Nepoznata stavka"
 
@@ -2037,7 +2340,7 @@ msgstr "Nepoznata stavka"
 #. * the %s is the name of the item. Please keep the _ in front
 #. * of the number to give these menu items a mnemonic.
 #.
-#: gtk/gtkrecentchoosermenu.c:843
+#: ../gtk/gtkrecentchoosermenu.c:835
 #, c-format
 msgctxt "recent menu label"
 msgid "_%d. %s"
@@ -2046,46 +2349,43 @@ msgstr "_%d. %s"
 #. This is the format that is used for items in a recent files menu.
 #. * The %d is the number of the item, the %s is the name of the item.
 #.
-#: gtk/gtkrecentchoosermenu.c:848
+#: ../gtk/gtkrecentchoosermenu.c:840
 #, c-format
 msgctxt "recent menu label"
 msgid "%d. %s"
 msgstr "%d. %s"
 
-#: gtk/gtkrecentmanager.c:980 gtk/gtkrecentmanager.c:993
-#: gtk/gtkrecentmanager.c:1131 gtk/gtkrecentmanager.c:1141
-#: gtk/gtkrecentmanager.c:1194 gtk/gtkrecentmanager.c:1203
-#: gtk/gtkrecentmanager.c:1218
+#: ../gtk/gtkrecentmanager.c:1006 ../gtk/gtkrecentmanager.c:1019
+#: ../gtk/gtkrecentmanager.c:1156 ../gtk/gtkrecentmanager.c:1166
+#: ../gtk/gtkrecentmanager.c:1218 ../gtk/gtkrecentmanager.c:1227
+#: ../gtk/gtkrecentmanager.c:1242
 #, c-format
 msgid "Unable to find an item with URI '%s'"
-msgstr "Ne mogu pronaći stavka sa URI adresom „%s“"
-
-#: gtk/gtkspinner.c:456
-msgctxt "throbbing progress animation widget"
-msgid "Spinner"
-msgstr "Vrteška"
+msgstr "Ne mogu da pronađem stavku sa adresom „%s“"
 
-#: gtk/gtkspinner.c:457
-msgid "Provides visual indication of progress"
-msgstr "Jednostavno prikazuje napredak neke radnje"
+#: ../gtk/gtkrecentmanager.c:2442
+#, c-format
+msgid "No registered application with name '%s' for item with URI '%s' found"
+msgstr ""
+"Nisam pronašao registrovan program pod nazivom „%s“ za stavku sa adresom „%s“"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: gtk/gtkstock.c:313
+#: ../gtk/gtkstock.c:313
 msgctxt "Stock label"
 msgid "Information"
 msgstr "Obaveštenje"
 
-#: gtk/gtkstock.c:314
+#: ../gtk/gtkstock.c:314
 msgctxt "Stock label"
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: gtk/gtkstock.c:315
+#: ../gtk/gtkstock.c:315
 msgctxt "Stock label"
 msgid "Error"
 msgstr "Greška"
 
-#: gtk/gtkstock.c:316
+#: ../gtk/gtkstock.c:316
 msgctxt "Stock label"
 msgid "Question"
 msgstr "Pitanje"
@@ -2093,1947 +2393,1956 @@ msgstr "Pitanje"
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: gtk/gtkstock.c:321
+#: ../gtk/gtkstock.c:321
 msgctxt "Stock label"
 msgid "_About"
 msgstr "_O programu"
 
-#: gtk/gtkstock.c:322
+#: ../gtk/gtkstock.c:322
 msgctxt "Stock label"
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: gtk/gtkstock.c:323
+#: ../gtk/gtkstock.c:323
 msgctxt "Stock label"
 msgid "_Apply"
 msgstr "_Primeni"
 
-#: gtk/gtkstock.c:324
+#: ../gtk/gtkstock.c:324
 msgctxt "Stock label"
 msgid "_Bold"
-msgstr "Za_crnjeno"
+msgstr "_Podebljano"
 
-#: gtk/gtkstock.c:325
+#: ../gtk/gtkstock.c:325
 msgctxt "Stock label"
 msgid "_Cancel"
 msgstr "O_dustani"
 
-#: gtk/gtkstock.c:326
-#, fuzzy
+#: ../gtk/gtkstock.c:326
 msgctxt "Stock label"
 msgid "_CD-ROM"
 msgstr "_CD uređaj"
 
-#: gtk/gtkstock.c:327
+#: ../gtk/gtkstock.c:327
 msgctxt "Stock label"
 msgid "_Clear"
 msgstr "_O�isti"
 
-#: gtk/gtkstock.c:328
+#: ../gtk/gtkstock.c:328
 msgctxt "Stock label"
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: gtk/gtkstock.c:329
+#: ../gtk/gtkstock.c:329
 msgctxt "Stock label"
 msgid "C_onnect"
 msgstr "Uspostavi ve_zu"
 
-#: gtk/gtkstock.c:330
+#: ../gtk/gtkstock.c:330
 msgctxt "Stock label"
 msgid "_Convert"
 msgstr "_Pretvori"
 
-#: gtk/gtkstock.c:331
+#: ../gtk/gtkstock.c:331
 msgctxt "Stock label"
 msgid "_Copy"
 msgstr "_Umnoži"
 
-#: gtk/gtkstock.c:332
+#: ../gtk/gtkstock.c:332
 msgctxt "Stock label"
 msgid "Cu_t"
 msgstr "_Iseci"
 
-#: gtk/gtkstock.c:333
+#: ../gtk/gtkstock.c:333
 msgctxt "Stock label"
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: gtk/gtkstock.c:334
+#: ../gtk/gtkstock.c:334
 msgctxt "Stock label"
 msgid "_Discard"
 msgstr "_Odbaci"
 
-#: gtk/gtkstock.c:335
+#: ../gtk/gtkstock.c:335
 msgctxt "Stock label"
 msgid "_Disconnect"
 msgstr "P_rekini vezu"
 
-#: gtk/gtkstock.c:336
+#: ../gtk/gtkstock.c:336
 msgctxt "Stock label"
 msgid "_Execute"
 msgstr "_Izvrši"
 
-#: gtk/gtkstock.c:337
+#: ../gtk/gtkstock.c:337
 msgctxt "Stock label"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: gtk/gtkstock.c:338
+#: ../gtk/gtkstock.c:338
 msgctxt "Stock label"
 msgid "_File"
 msgstr "_Datoteka"
 
-#: gtk/gtkstock.c:339
+#: ../gtk/gtkstock.c:339
 msgctxt "Stock label"
 msgid "_Find"
 msgstr "_Nađi"
 
-#: gtk/gtkstock.c:340
+#: ../gtk/gtkstock.c:340
 msgctxt "Stock label"
 msgid "Find and _Replace"
 msgstr "Nađi i _zameni"
 
-#: gtk/gtkstock.c:341
+#: ../gtk/gtkstock.c:341
 msgctxt "Stock label"
 msgid "_Floppy"
 msgstr "Dis_keta"
 
-#: gtk/gtkstock.c:342
+#: ../gtk/gtkstock.c:342
 msgctxt "Stock label"
 msgid "_Fullscreen"
 msgstr "_Ceo ekran"
 
-#: gtk/gtkstock.c:343
+#: ../gtk/gtkstock.c:343
 msgctxt "Stock label"
 msgid "_Leave Fullscreen"
 msgstr "Napusti _ceo ekran"
 
 #. This is a navigation label as in "go to the bottom of the page"
-#: gtk/gtkstock.c:345
+#: ../gtk/gtkstock.c:345
 msgctxt "Stock label, navigation"
 msgid "_Bottom"
-msgstr "_Dole:"
+msgstr "_Dole"
 
 #. This is a navigation label as in "go to the first page"
-#: gtk/gtkstock.c:347
+#: ../gtk/gtkstock.c:347
 msgctxt "Stock label, navigation"
 msgid "_First"
-msgstr "P_rvi"
+msgstr "P_rvo"
 
 #. This is a navigation label as in "go to the last page"
-#: gtk/gtkstock.c:349
+#: ../gtk/gtkstock.c:349
 msgctxt "Stock label, navigation"
 msgid "_Last"
-msgstr "Posled_nji"
+msgstr "Posled_nje"
 
 #. This is a navigation label as in "go to the top of the page"
-#: gtk/gtkstock.c:351
+#: ../gtk/gtkstock.c:351
 msgctxt "Stock label, navigation"
 msgid "_Top"
 msgstr "_Gore:"
 
 #. This is a navigation label as in "go back"
-#: gtk/gtkstock.c:353
+#: ../gtk/gtkstock.c:353
 msgctxt "Stock label, navigation"
 msgid "_Back"
 msgstr "_Nazad"
 
 #. This is a navigation label as in "go down"
-#: gtk/gtkstock.c:355
+#: ../gtk/gtkstock.c:355
 msgctxt "Stock label, navigation"
 msgid "_Down"
 msgstr "_Dole"
 
 #. This is a navigation label as in "go forward"
-#: gtk/gtkstock.c:357
+#: ../gtk/gtkstock.c:357
 msgctxt "Stock label, navigation"
 msgid "_Forward"
 msgstr "Na_pred"
 
 #. This is a navigation label as in "go up"
-#: gtk/gtkstock.c:359
+#: ../gtk/gtkstock.c:359
 msgctxt "Stock label, navigation"
 msgid "_Up"
 msgstr "_Gore"
 
 # Ili „hard disk“
-#: gtk/gtkstock.c:360
-#, fuzzy
+#: ../gtk/gtkstock.c:360
 msgctxt "Stock label"
 msgid "_Hard Disk"
 msgstr "_Tvrdi disk"
 
-#: gtk/gtkstock.c:361
+#: ../gtk/gtkstock.c:361
 msgctxt "Stock label"
 msgid "_Help"
 msgstr "_Pomoć"
 
 # ako je za "home directory", onda bi bilo dobro "licni direktorijum", ako je za "home page", onda za "licna stranica"
-#: gtk/gtkstock.c:362
+#: ../gtk/gtkstock.c:362
 msgctxt "Stock label"
 msgid "_Home"
 msgstr "_Po�etak"
 
-#: gtk/gtkstock.c:363
+#: ../gtk/gtkstock.c:363
 msgctxt "Stock label"
 msgid "Increase Indent"
 msgstr "Povećaj uvla�enje"
 
-#: gtk/gtkstock.c:364
+#: ../gtk/gtkstock.c:364
 msgctxt "Stock label"
 msgid "Decrease Indent"
 msgstr "Umanji uvla�enje"
 
-#: gtk/gtkstock.c:365
+#: ../gtk/gtkstock.c:365
 msgctxt "Stock label"
 msgid "_Index"
 msgstr "_Indeks"
 
-#: gtk/gtkstock.c:366
+#: ../gtk/gtkstock.c:366
 msgctxt "Stock label"
 msgid "_Information"
 msgstr "Po_daci"
 
-#: gtk/gtkstock.c:367
+#: ../gtk/gtkstock.c:367
 msgctxt "Stock label"
 msgid "_Italic"
 msgstr "_Kurziv"
 
-#: gtk/gtkstock.c:368
+#: ../gtk/gtkstock.c:368
 msgctxt "Stock label"
 msgid "_Jump to"
 msgstr "_Idi na"
 
 #. This is about text justification, "centered text"
-#: gtk/gtkstock.c:370
+#: ../gtk/gtkstock.c:370
 msgctxt "Stock label"
 msgid "_Center"
-msgstr "_Pretvori"
+msgstr "_Centriraj"
 
 #. This is about text justification
-#: gtk/gtkstock.c:372
+#: ../gtk/gtkstock.c:372
 msgctxt "Stock label"
 msgid "_Fill"
-msgstr "Dato_teke"
+msgstr "_Popuni"
 
 #. This is about text justification, "left-justified text"
-#: gtk/gtkstock.c:374
+#: ../gtk/gtkstock.c:374
 msgctxt "Stock label"
 msgid "_Left"
-msgstr "_Levo:"
+msgstr "_Levo"
 
 #. This is about text justification, "right-justified text"
-#: gtk/gtkstock.c:376
+#: ../gtk/gtkstock.c:376
 msgctxt "Stock label"
 msgid "_Right"
-msgstr "D_esno:"
+msgstr "D_esno"
 
 #. Media label, as in "fast forward"
-#: gtk/gtkstock.c:379
+#: ../gtk/gtkstock.c:379
 msgctxt "Stock label, media"
 msgid "_Forward"
 msgstr "Na_pred"
 
 #. Media label, as in "next song"
-#: gtk/gtkstock.c:381
+#: ../gtk/gtkstock.c:381
 msgctxt "Stock label, media"
 msgid "_Next"
-msgstr "_Novo"
+msgstr "_Sledeće"
 
 #. Media label, as in "pause music"
-#: gtk/gtkstock.c:383
+#: ../gtk/gtkstock.c:383
 msgctxt "Stock label, media"
 msgid "P_ause"
-msgstr "Zaustavljeno"
+msgstr "Pa_uziraj"
 
 #. Media label, as in "play music"
-#: gtk/gtkstock.c:385
+#: ../gtk/gtkstock.c:385
 msgctxt "Stock label, media"
 msgid "_Play"
-msgstr "_Mesta"
+msgstr "_Pusti"
 
 #. Media label, as in  "previous song"
-#: gtk/gtkstock.c:387
+#: ../gtk/gtkstock.c:387
 msgctxt "Stock label, media"
 msgid "Pre_vious"
-msgstr "Pre_thodna"
+msgstr "Pre_thodno"
 
 #. Media label
-#: gtk/gtkstock.c:389
+#: ../gtk/gtkstock.c:389
 msgctxt "Stock label, media"
 msgid "_Record"
 msgstr "S_nimi"
 
 # hm, hm?
 #. Media label
-#: gtk/gtkstock.c:391
+#: ../gtk/gtkstock.c:391
 msgctxt "Stock label, media"
 msgid "R_ewind"
 msgstr "Pre_motaj"
 
 #. Media label
-#: gtk/gtkstock.c:393
+#: ../gtk/gtkstock.c:393
 msgctxt "Stock label, media"
 msgid "_Stop"
 msgstr "_Zaustavi"
 
-#: gtk/gtkstock.c:394
+#: ../gtk/gtkstock.c:394
 msgctxt "Stock label"
 msgid "_Network"
 msgstr "_Mreža"
 
-#: gtk/gtkstock.c:395
+#: ../gtk/gtkstock.c:395
 msgctxt "Stock label"
 msgid "_New"
 msgstr "_Novo"
 
-#: gtk/gtkstock.c:396
+#: ../gtk/gtkstock.c:396
 msgctxt "Stock label"
 msgid "_No"
 msgstr "_Ne"
 
-#: gtk/gtkstock.c:397
+#: ../gtk/gtkstock.c:397
 msgctxt "Stock label"
 msgid "_OK"
 msgstr "U _redu"
 
-#: gtk/gtkstock.c:398
+#: ../gtk/gtkstock.c:398
 msgctxt "Stock label"
 msgid "_Open"
 msgstr "_Otvori"
 
 #. Page orientation
-#: gtk/gtkstock.c:400
+#: ../gtk/gtkstock.c:400
 msgctxt "Stock label"
 msgid "Landscape"
 msgstr "Položeno"
 
 #. Page orientation
-#: gtk/gtkstock.c:402
+#: ../gtk/gtkstock.c:402
 msgctxt "Stock label"
 msgid "Portrait"
-msgstr "Obrnuto"
+msgstr "Uspravno"
 
 #. Page orientation
-#: gtk/gtkstock.c:404
+#: ../gtk/gtkstock.c:404
 msgctxt "Stock label"
 msgid "Reverse landscape"
 msgstr "Obrnuto, položeno"
 
 #. Page orientation
-#: gtk/gtkstock.c:406
+#: ../gtk/gtkstock.c:406
 msgctxt "Stock label"
 msgid "Reverse portrait"
 msgstr "Obrnuto, uspravno"
 
-#: gtk/gtkstock.c:407
+#: ../gtk/gtkstock.c:407
 msgctxt "Stock label"
 msgid "Page Set_up"
 msgstr "Pode_Å¡avanje strane"
 
-#: gtk/gtkstock.c:408
+#: ../gtk/gtkstock.c:408
 msgctxt "Stock label"
 msgid "_Paste"
 msgstr "U_baci"
 
-#: gtk/gtkstock.c:409
+#: ../gtk/gtkstock.c:409
 msgctxt "Stock label"
 msgid "_Preferences"
 msgstr "Pos_tavke"
 
-#: gtk/gtkstock.c:410
+#: ../gtk/gtkstock.c:410
 msgctxt "Stock label"
 msgid "_Print"
 msgstr "_Å tampaj"
 
-#: gtk/gtkstock.c:411
+#: ../gtk/gtkstock.c:411
 msgctxt "Stock label"
 msgid "Print Pre_view"
 msgstr "Pre_gled pred Å¡tampu"
 
-#: gtk/gtkstock.c:412
+#: ../gtk/gtkstock.c:412
 msgctxt "Stock label"
 msgid "_Properties"
 msgstr "_Osobine"
 
-#: gtk/gtkstock.c:413
+#: ../gtk/gtkstock.c:413
 msgctxt "Stock label"
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: gtk/gtkstock.c:414
+#: ../gtk/gtkstock.c:414
 msgctxt "Stock label"
 msgid "_Redo"
 msgstr "_Ponovi"
 
-#: gtk/gtkstock.c:415
+#: ../gtk/gtkstock.c:415
 msgctxt "Stock label"
 msgid "_Refresh"
 msgstr "_Osveži"
 
-#: gtk/gtkstock.c:416
+#: ../gtk/gtkstock.c:416
 msgctxt "Stock label"
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: gtk/gtkstock.c:417
+#: ../gtk/gtkstock.c:417
 msgctxt "Stock label"
 msgid "_Revert"
 msgstr "_Vrati"
 
-#: gtk/gtkstock.c:418
+#: ../gtk/gtkstock.c:418
 msgctxt "Stock label"
 msgid "_Save"
 msgstr "_Sa�uvaj"
 
-#: gtk/gtkstock.c:419
+#: ../gtk/gtkstock.c:419
 msgctxt "Stock label"
 msgid "Save _As"
 msgstr "Sa�uvaj _kao"
 
-#: gtk/gtkstock.c:420
+#: ../gtk/gtkstock.c:420
 msgctxt "Stock label"
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
-#: gtk/gtkstock.c:421
+#: ../gtk/gtkstock.c:421
 msgctxt "Stock label"
 msgid "_Color"
 msgstr "_Boja"
 
-#: gtk/gtkstock.c:422
+#: ../gtk/gtkstock.c:422
 msgctxt "Stock label"
 msgid "_Font"
 msgstr "_Font"
 
 #. Sorting direction
-#: gtk/gtkstock.c:424
+#: ../gtk/gtkstock.c:424
 msgctxt "Stock label"
 msgid "_Ascending"
 msgstr "_Rastući"
 
 #. Sorting direction
-#: gtk/gtkstock.c:426
+#: ../gtk/gtkstock.c:426
 msgctxt "Stock label"
 msgid "_Descending"
 msgstr "_Opadajući"
 
-#: gtk/gtkstock.c:427
+#: ../gtk/gtkstock.c:427
 msgctxt "Stock label"
 msgid "_Spell Check"
 msgstr "_Provera pisanja"
 
-#: gtk/gtkstock.c:428
+#: ../gtk/gtkstock.c:428
 msgctxt "Stock label"
 msgid "_Stop"
 msgstr "_Zaustavi"
 
 #. Font variant
-#: gtk/gtkstock.c:430
+#: ../gtk/gtkstock.c:430
 msgctxt "Stock label"
 msgid "_Strikethrough"
 msgstr "_Precrtaj"
 
-#: gtk/gtkstock.c:431
+#: ../gtk/gtkstock.c:431
 msgctxt "Stock label"
 msgid "_Undelete"
 msgstr "_Povrati"
 
 #. Font variant
-#: gtk/gtkstock.c:433
+#: ../gtk/gtkstock.c:433
 msgctxt "Stock label"
 msgid "_Underline"
 msgstr "_Podvuci"
 
-#: gtk/gtkstock.c:434
+#: ../gtk/gtkstock.c:434
 msgctxt "Stock label"
 msgid "_Undo"
 msgstr "_Opozovi"
 
-#: gtk/gtkstock.c:435
+#: ../gtk/gtkstock.c:435
 msgctxt "Stock label"
 msgid "_Yes"
 msgstr "_Da"
 
 #. Zoom
-#: gtk/gtkstock.c:437
+#: ../gtk/gtkstock.c:437
 msgctxt "Stock label"
 msgid "_Normal Size"
 msgstr "_Obi�na veli�ina"
 
 #. Zoom
-#: gtk/gtkstock.c:439
+#: ../gtk/gtkstock.c:439
 msgctxt "Stock label"
 msgid "Best _Fit"
 msgstr "_Najbolje slaganje"
 
-#: gtk/gtkstock.c:440
+#: ../gtk/gtkstock.c:440
 msgctxt "Stock label"
 msgid "Zoom _In"
 msgstr "U_većaj"
 
-#: gtk/gtkstock.c:441
+#: ../gtk/gtkstock.c:441
 msgctxt "Stock label"
 msgid "Zoom _Out"
 msgstr "U_manji"
 
-#: gtk/gtktextbufferrichtext.c:650
+#. Translators: if the "on" state label requires more than three
+#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
+#. * the state
+#.
+#: ../gtk/gtkswitch.c:335 ../gtk/gtkswitch.c:395 ../gtk/gtkswitch.c:602
+msgctxt "switch"
+msgid "ON"
+msgstr "UKLJ"
+
+#. Translators: if the "off" state label requires more than three
+#. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
+#.
+#: ../gtk/gtkswitch.c:343 ../gtk/gtkswitch.c:396 ../gtk/gtkswitch.c:631
+msgctxt "switch"
+msgid "OFF"
+msgstr "ISK"
+
+#: ../gtk/gtktextbufferrichtext.c:651
 #, c-format
 msgid "Unknown error when trying to deserialize %s"
-msgstr "Nepoznata greška pri raspakivanju iz niske za %s"
+msgstr "Nepoznata greška pri raspakivanju „%s“"
 
-#: gtk/gtktextbufferrichtext.c:709
+#: ../gtk/gtktextbufferrichtext.c:710
 #, c-format
 msgid "No deserialize function found for format %s"
-msgstr "Nije pronađena funkcija za raspakivanje formata %s iz niske"
+msgstr "Nisam pronašao funkciju za raspakivanje formata „%s“"
 
-#: gtk/gtktextbufferserialize.c:795 gtk/gtktextbufferserialize.c:821
+#: ../gtk/gtktextbufferserialize.c:800 ../gtk/gtktextbufferserialize.c:826
 #, c-format
 msgid "Both \"id\" and \"name\" were found on the <%s> element"
-msgstr "I „id“ i „name“ su pronađeni u elementu <%s>"
+msgstr "Pronašao sam i „id“ i „name“ u elementu <%s>"
 
-#: gtk/gtktextbufferserialize.c:805 gtk/gtktextbufferserialize.c:831
+#: ../gtk/gtktextbufferserialize.c:810 ../gtk/gtktextbufferserialize.c:836
 #, c-format
 msgid "The attribute \"%s\" was found twice on the <%s> element"
-msgstr "Atribut „%s“ je pronađen dva puta u elementu <%s>"
+msgstr "Atribut „%s“ sam pronašao dva puta u elementu <%s>"
 
-#: gtk/gtktextbufferserialize.c:845
-#, fuzzy, c-format
+#: ../gtk/gtktextbufferserialize.c:852
+#, c-format
 msgid "<%s> element has invalid ID \"%s\""
-msgstr "Element <%s> ima neispravnu ID oznaku „%s“"
+msgstr "Element <%s> ima neispravan ID „%s“"
 
-#: gtk/gtktextbufferserialize.c:855
+#: ../gtk/gtktextbufferserialize.c:862
 #, c-format
 msgid "<%s> element has neither a \"name\" nor an \"id\" attribute"
 msgstr "Element <%s> nema ni atribut „id“ niti „name“"
 
-#: gtk/gtktextbufferserialize.c:942
+#: ../gtk/gtktextbufferserialize.c:949
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
-msgstr "Atribut „%s“ je ponovljen dva puta u istom elementu <%s>"
+msgstr "Atribut „%s“ je ponovljen dva puta u istom <%s> elementu"
 
-#: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985
+#: ../gtk/gtktextbufferserialize.c:967 ../gtk/gtktextbufferserialize.c:992
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Atribut „%s“ ne može biti na ovaj na�in unutar elementa <%s>"
 
-#: gtk/gtktextbufferserialize.c:1024
+#: ../gtk/gtktextbufferserialize.c:1031
 #, c-format
 msgid "Tag \"%s\" has not been defined."
 msgstr "Oznaka „%s“ nije definisana."
 
-#: gtk/gtktextbufferserialize.c:1036
+#: ../gtk/gtktextbufferserialize.c:1043
 msgid "Anonymous tag found and tags can not be created."
 msgstr "Bezimena oznaka je pronađena pa oznake ne mogu biti napravljene."
 
-#: gtk/gtktextbufferserialize.c:1047
+#: ../gtk/gtktextbufferserialize.c:1054
 #, c-format
 msgid "Tag \"%s\" does not exist in buffer and tags can not be created."
 msgstr "Oznaka „%s“ ne postoji u baferu pa oznake ne mogu biti napravljene."
 
-#: gtk/gtktextbufferserialize.c:1146 gtk/gtktextbufferserialize.c:1221
-#: gtk/gtktextbufferserialize.c:1324 gtk/gtktextbufferserialize.c:1398
+#: ../gtk/gtktextbufferserialize.c:1153 ../gtk/gtktextbufferserialize.c:1228
+#: ../gtk/gtktextbufferserialize.c:1333 ../gtk/gtktextbufferserialize.c:1407
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
-msgstr "Element <%s> ne može biti ispod <%s>"
+msgstr "Element <%s> ne može da stoji ispod <%s>"
 
-#: gtk/gtktextbufferserialize.c:1177
+#: ../gtk/gtktextbufferserialize.c:1184
 #, c-format
 msgid "\"%s\" is not a valid attribute type"
 msgstr "„%s“ nije ispravan tip atributa"
 
-#: gtk/gtktextbufferserialize.c:1185
+#: ../gtk/gtktextbufferserialize.c:1192
 #, c-format
 msgid "\"%s\" is not a valid attribute name"
 msgstr "„%s“ nije ispravno ime atributa"
 
-#: gtk/gtktextbufferserialize.c:1195
+#: ../gtk/gtktextbufferserialize.c:1202
 #, c-format
 msgid ""
 "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
 msgstr "Nije moguće pretvoriti „%s“ u vrednost tipa „%s“ za atribut „%s“"
 
-#: gtk/gtktextbufferserialize.c:1204
+#: ../gtk/gtktextbufferserialize.c:1211
 #, c-format
 msgid "\"%s\" is not a valid value for attribute \"%s\""
 msgstr "„%s“ nije isprana vrednost atributa „%s“"
 
-#: gtk/gtktextbufferserialize.c:1289
+#: ../gtk/gtktextbufferserialize.c:1296
 #, c-format
 msgid "Tag \"%s\" already defined"
 msgstr "Oznaka „%s“ je već definisana"
 
-#: gtk/gtktextbufferserialize.c:1300
+#: ../gtk/gtktextbufferserialize.c:1309
 #, c-format
 msgid "Tag \"%s\" has invalid priority \"%s\""
 msgstr "Oznaka „%s“ ima neispravan prioritet „%s“"
 
-#: gtk/gtktextbufferserialize.c:1353
+#: ../gtk/gtktextbufferserialize.c:1362
 #, c-format
 msgid "Outermost element in text must be <text_view_markup> not <%s>"
-msgstr ""
-"Prvi spoljašnji element u tekstu mora biti <text_view_markup> a ne <%s>"
+msgstr "Prvi spoljašnji element u tekstu mora biti <text_view_markup> a ne <%s>"
 
-#: gtk/gtktextbufferserialize.c:1362 gtk/gtktextbufferserialize.c:1378
+#: ../gtk/gtktextbufferserialize.c:1371 ../gtk/gtktextbufferserialize.c:1387
 #, c-format
 msgid "A <%s> element has already been specified"
 msgstr "Element <%s> je već naveden"
 
-#: gtk/gtktextbufferserialize.c:1384
+#: ../gtk/gtktextbufferserialize.c:1393
 msgid "A <text> element can't occur before a <tags> element"
 msgstr "Element <text> se ne može pojaviti pre elementa <tags>"
 
-#: gtk/gtktextbufferserialize.c:1784
+#: ../gtk/gtktextbufferserialize.c:1793
 msgid "Serialized data is malformed"
 msgstr "Podaci nisu lepo zapakovani u nisku"
 
-#: gtk/gtktextbufferserialize.c:1862
+#: ../gtk/gtktextbufferserialize.c:1871
 msgid ""
 "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
 msgstr ""
-"Podaci nisu lepo zapakovani u nisku. Prva oblast nije "
-"GTKTEXTBUFFERCONTENTS-0001"
+"Podaci nisu lepo zapakovani u nisku. Prva oblast nije „GTKTEXTBUFFERCONTENTS-"
+"0001“"
 
-#: gtk/gtktextutil.c:60
+#: ../gtk/gtktextutil.c:60
 msgid "LRM _Left-to-right mark"
-msgstr "LRM Obeleživa� za s_leva-na-desno"
+msgstr "LRM — Obeleživa� za s_leva-na-desno"
 
-#: gtk/gtktextutil.c:61
+#: ../gtk/gtktextutil.c:61
 msgid "RLM _Right-to-left mark"
-msgstr "RLM Obeleživa� za s_desna-na-levo"
+msgstr "RLM — Obeleživa� za s_desna-na-levo"
 
-#: gtk/gtktextutil.c:62
+#: ../gtk/gtktextutil.c:62
 msgid "LRE Left-to-right _embedding"
-msgstr "LRE _ubacivanje sleva-na-desno"
+msgstr "LRE — _ubacivanje sleva-na-desno"
 
-#: gtk/gtktextutil.c:63
+#: ../gtk/gtktextutil.c:63
 msgid "RLE Right-to-left e_mbedding"
-msgstr "RLE u_bacivanje sdesna-na-levo"
+msgstr "RLE — u_bacivanje sdesna-na-levo"
 
-#: gtk/gtktextutil.c:64
+#: ../gtk/gtktextutil.c:64
 msgid "LRO Left-to-right _override"
-msgstr "LRO pr_imoravanje sleva-na-desno"
+msgstr "LRO — pr_imoravanje sleva-na-desno"
 
-#: gtk/gtktextutil.c:65
+#: ../gtk/gtktextutil.c:65
 msgid "RLO Right-to-left o_verride"
-msgstr "RLO primorava_nje sdesna-na-levo"
+msgstr "RLO — primorava_nje sdesna-na-levo"
 
-#: gtk/gtktextutil.c:66
+#: ../gtk/gtktextutil.c:66
 msgid "PDF _Pop directional formatting"
-msgstr "PDF _Po�ni usmeren zapis"
+msgstr "PDF — _Po�ni usmeren zapis"
 
-#: gtk/gtktextutil.c:67
+#: ../gtk/gtktextutil.c:67
 msgid "ZWS _Zero width space"
-msgstr "ZWS _razmak bez Å¡irine"
+msgstr "ZWS — _razmak bez širine"
 
-#: gtk/gtktextutil.c:68
+#: ../gtk/gtktextutil.c:68
 msgid "ZWJ Zero width _joiner"
-msgstr "ZWJ _spojnica bez Å¡irine"
+msgstr "ZWJ — _spojnica bez širine"
 
-#: gtk/gtktextutil.c:69
+#: ../gtk/gtktextutil.c:69
 msgid "ZWNJ Zero width _non-joiner"
-msgstr "ZWNJ _nespojnica bez Å¡irine"
-
-#: gtk/gtkthemes.c:72
-#, c-format
-msgid "Unable to locate theme engine in module_path: \"%s\","
-msgstr "Ne mogu da pronađem motor teme u putanji za module: „%s“,"
+msgstr "ZWNJ — _nespojnica bez širine"
 
-#: gtk/gtkuimanager.c:1505
+#: ../gtk/gtkuimanager.c:1760
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
-msgstr "Neo�ekivana po�etna oznaka „%s“ u %d. redu, %d. znak"
+msgstr "Neo�ekivana po�etna oznaka „%s“ u %d° redu, znak %d"
 
-#: gtk/gtkuimanager.c:1595
+#: ../gtk/gtkuimanager.c:1850
 #, c-format
 msgid "Unexpected character data on line %d char %d"
-msgstr "Neo�ekivani znakovni podaci u %d. redu, %d. znak"
+msgstr "Neo�ekivani znakovni podaci u %d° redu, znak %d"
 
-#: gtk/gtkuimanager.c:2427
+#: ../gtk/gtkuimanager.c:2682
 msgid "Empty"
 msgstr "Prazno"
 
-#: gtk/gtkvolumebutton.c:83
+#: ../gtk/gtkvolumebutton.c:170
 msgid "Volume"
-msgstr "Ja�ina"
+msgstr "Ja�ina zvuka"
 
-#: gtk/gtkvolumebutton.c:85
+#: ../gtk/gtkvolumebutton.c:172
 msgid "Turns volume down or up"
-msgstr "Menja ja�inu na dole ili gore"
+msgstr "Poja�ava ili smanjuje ja�inu zvuka"
 
-#: gtk/gtkvolumebutton.c:88
+#: ../gtk/gtkvolumebutton.c:175
 msgid "Adjusts the volume"
-msgstr "Podešava ja�inu"
+msgstr "Podešava ja�inu zvuka"
 
-#: gtk/gtkvolumebutton.c:94 gtk/gtkvolumebutton.c:97
+#: ../gtk/gtkvolumebutton.c:181 ../gtk/gtkvolumebutton.c:184
 msgid "Volume Down"
-msgstr "Potišaj"
+msgstr "Utišaj"
 
-#: gtk/gtkvolumebutton.c:96
+#: ../gtk/gtkvolumebutton.c:183
 msgid "Decreases the volume"
-msgstr "Potišaj zvuk"
+msgstr "Smanjuje ja�inu zvuka"
 
-#: gtk/gtkvolumebutton.c:100 gtk/gtkvolumebutton.c:103
+#: ../gtk/gtkvolumebutton.c:187 ../gtk/gtkvolumebutton.c:190
 msgid "Volume Up"
 msgstr "Poja�aj"
 
-#: gtk/gtkvolumebutton.c:102
+#: ../gtk/gtkvolumebutton.c:189
 msgid "Increases the volume"
-msgstr "Poja�aj zvuk"
+msgstr "Poja�ava ja�inu zvuka"
 
-#: gtk/gtkvolumebutton.c:160
+#: ../gtk/gtkvolumebutton.c:247
 msgid "Muted"
 msgstr "Utišano"
 
-#: gtk/gtkvolumebutton.c:164
+#: ../gtk/gtkvolumebutton.c:251
 msgid "Full Volume"
-msgstr "Puna ja�ina"
+msgstr "Puna ja�ina zvuka"
 
 #. Translators: this is the percentage of the current volume,
 #. * as used in the tooltip, eg. "49 %".
 #. * Translate the "%d" to "%Id" if you want to use localised digits,
 #. * or otherwise translate the "%d" to "%d".
 #.
-#: gtk/gtkvolumebutton.c:177
+#: ../gtk/gtkvolumebutton.c:264
 #, c-format
 msgctxt "volume percentage"
 msgid "%d %%"
 msgstr "%d %%"
 
-#: gtk/paper_names_offsets.c:4
+#: ../gtk/paper_names_offsets.c:4
 msgctxt "paper size"
 msgid "asme_f"
 msgstr "asme_f"
 
-#: gtk/paper_names_offsets.c:5
+#: ../gtk/paper_names_offsets.c:5
 msgctxt "paper size"
 msgid "A0x2"
 msgstr "A0x2"
 
-#: gtk/paper_names_offsets.c:6
+#: ../gtk/paper_names_offsets.c:6
 msgctxt "paper size"
 msgid "A0"
 msgstr "A0"
 
-#: gtk/paper_names_offsets.c:7
+#: ../gtk/paper_names_offsets.c:7
 msgctxt "paper size"
 msgid "A0x3"
 msgstr "A0x3"
 
-#: gtk/paper_names_offsets.c:8
+#: ../gtk/paper_names_offsets.c:8
 msgctxt "paper size"
 msgid "A1"
 msgstr "A1"
 
-#: gtk/paper_names_offsets.c:9
+#: ../gtk/paper_names_offsets.c:9
 msgctxt "paper size"
 msgid "A10"
 msgstr "A10"
 
-#: gtk/paper_names_offsets.c:10
+#: ../gtk/paper_names_offsets.c:10
 msgctxt "paper size"
 msgid "A1x3"
 msgstr "A1x3"
 
-#: gtk/paper_names_offsets.c:11
+#: ../gtk/paper_names_offsets.c:11
 msgctxt "paper size"
 msgid "A1x4"
 msgstr "A1x4"
 
-#: gtk/paper_names_offsets.c:12
+#: ../gtk/paper_names_offsets.c:12
 msgctxt "paper size"
 msgid "A2"
 msgstr "A2"
 
-#: gtk/paper_names_offsets.c:13
+#: ../gtk/paper_names_offsets.c:13
 msgctxt "paper size"
 msgid "A2x3"
 msgstr "A2x3"
 
-#: gtk/paper_names_offsets.c:14
+#: ../gtk/paper_names_offsets.c:14
 msgctxt "paper size"
 msgid "A2x4"
 msgstr "A2x4"
 
-#: gtk/paper_names_offsets.c:15
+#: ../gtk/paper_names_offsets.c:15
 msgctxt "paper size"
 msgid "A2x5"
 msgstr "A2x5"
 
-#: gtk/paper_names_offsets.c:16
+#: ../gtk/paper_names_offsets.c:16
 msgctxt "paper size"
 msgid "A3"
 msgstr "A3"
 
-#: gtk/paper_names_offsets.c:17
+#: ../gtk/paper_names_offsets.c:17
 msgctxt "paper size"
 msgid "A3 Extra"
-msgstr "A3 Extra"
+msgstr "A3 ekstra"
 
-#: gtk/paper_names_offsets.c:18
+#: ../gtk/paper_names_offsets.c:18
 msgctxt "paper size"
 msgid "A3x3"
 msgstr "A3x3"
 
-#: gtk/paper_names_offsets.c:19
+#: ../gtk/paper_names_offsets.c:19
 msgctxt "paper size"
 msgid "A3x4"
 msgstr "A3x4"
 
-#: gtk/paper_names_offsets.c:20
+#: ../gtk/paper_names_offsets.c:20
 msgctxt "paper size"
 msgid "A3x5"
 msgstr "A3x5"
 
-#: gtk/paper_names_offsets.c:21
+#: ../gtk/paper_names_offsets.c:21
 msgctxt "paper size"
 msgid "A3x6"
 msgstr "A3x6"
 
-#: gtk/paper_names_offsets.c:22
+#: ../gtk/paper_names_offsets.c:22
 msgctxt "paper size"
 msgid "A3x7"
 msgstr "A3x7"
 
-#: gtk/paper_names_offsets.c:23
+#: ../gtk/paper_names_offsets.c:23
 msgctxt "paper size"
 msgid "A4"
 msgstr "A4"
 
-#: gtk/paper_names_offsets.c:24
+#: ../gtk/paper_names_offsets.c:24
 msgctxt "paper size"
 msgid "A4 Extra"
-msgstr "Ekstra A4"
+msgstr "A4 ekstra"
 
-#: gtk/paper_names_offsets.c:25
+#: ../gtk/paper_names_offsets.c:25
 msgctxt "paper size"
 msgid "A4 Tab"
 msgstr "A4 rolna"
 
-#: gtk/paper_names_offsets.c:26
+#: ../gtk/paper_names_offsets.c:26
 msgctxt "paper size"
 msgid "A4x3"
 msgstr "A4x3"
 
-#: gtk/paper_names_offsets.c:27
+#: ../gtk/paper_names_offsets.c:27
 msgctxt "paper size"
 msgid "A4x4"
 msgstr "A4x4"
 
-#: gtk/paper_names_offsets.c:28
+#: ../gtk/paper_names_offsets.c:28
 msgctxt "paper size"
 msgid "A4x5"
 msgstr "A4x5"
 
-#: gtk/paper_names_offsets.c:29
+#: ../gtk/paper_names_offsets.c:29
 msgctxt "paper size"
 msgid "A4x6"
 msgstr "A4x6"
 
-#: gtk/paper_names_offsets.c:30
+#: ../gtk/paper_names_offsets.c:30
 msgctxt "paper size"
 msgid "A4x7"
 msgstr "A4x7"
 
-#: gtk/paper_names_offsets.c:31
+#: ../gtk/paper_names_offsets.c:31
 msgctxt "paper size"
 msgid "A4x8"
 msgstr "A4x8"
 
-#: gtk/paper_names_offsets.c:32
+#: ../gtk/paper_names_offsets.c:32
 msgctxt "paper size"
 msgid "A4x9"
 msgstr "A4x9"
 
-#: gtk/paper_names_offsets.c:33
+#: ../gtk/paper_names_offsets.c:33
 msgctxt "paper size"
 msgid "A5"
 msgstr "A5"
 
-#: gtk/paper_names_offsets.c:34
+#: ../gtk/paper_names_offsets.c:34
 msgctxt "paper size"
 msgid "A5 Extra"
-msgstr "Ekstra A5"
+msgstr "A5 ekstra"
 
-#: gtk/paper_names_offsets.c:35
+#: ../gtk/paper_names_offsets.c:35
 msgctxt "paper size"
 msgid "A6"
 msgstr "A6"
 
-#: gtk/paper_names_offsets.c:36
+#: ../gtk/paper_names_offsets.c:36
 msgctxt "paper size"
 msgid "A7"
 msgstr "A7"
 
-#: gtk/paper_names_offsets.c:37
+#: ../gtk/paper_names_offsets.c:37
 msgctxt "paper size"
 msgid "A8"
 msgstr "A8"
 
-#: gtk/paper_names_offsets.c:38
+#: ../gtk/paper_names_offsets.c:38
 msgctxt "paper size"
 msgid "A9"
 msgstr "A9"
 
-#: gtk/paper_names_offsets.c:39
+#: ../gtk/paper_names_offsets.c:39
 msgctxt "paper size"
 msgid "B0"
 msgstr "B0"
 
-#: gtk/paper_names_offsets.c:40
+#: ../gtk/paper_names_offsets.c:40
 msgctxt "paper size"
 msgid "B1"
 msgstr "B1"
 
-#: gtk/paper_names_offsets.c:41
+#: ../gtk/paper_names_offsets.c:41
 msgctxt "paper size"
 msgid "B10"
 msgstr "B10"
 
-#: gtk/paper_names_offsets.c:42
+#: ../gtk/paper_names_offsets.c:42
 msgctxt "paper size"
 msgid "B2"
 msgstr "B2"
 
-#: gtk/paper_names_offsets.c:43
+#: ../gtk/paper_names_offsets.c:43
 msgctxt "paper size"
 msgid "B3"
 msgstr "B3"
 
-#: gtk/paper_names_offsets.c:44
+#: ../gtk/paper_names_offsets.c:44
 msgctxt "paper size"
 msgid "B4"
 msgstr "B4"
 
-#: gtk/paper_names_offsets.c:45
+#: ../gtk/paper_names_offsets.c:45
 msgctxt "paper size"
 msgid "B5"
 msgstr "B5"
 
-#: gtk/paper_names_offsets.c:46
+#: ../gtk/paper_names_offsets.c:46
 msgctxt "paper size"
 msgid "B5 Extra"
-msgstr "Ekstra B5"
+msgstr "B5 ekstra"
 
-#: gtk/paper_names_offsets.c:47
+#: ../gtk/paper_names_offsets.c:47
 msgctxt "paper size"
 msgid "B6"
 msgstr "B6"
 
-#: gtk/paper_names_offsets.c:48
+#: ../gtk/paper_names_offsets.c:48
 msgctxt "paper size"
 msgid "B6/C4"
 msgstr "B6/C4"
 
-#: gtk/paper_names_offsets.c:49
+#: ../gtk/paper_names_offsets.c:49
 msgctxt "paper size"
 msgid "B7"
 msgstr "B7"
 
-#: gtk/paper_names_offsets.c:50
+#: ../gtk/paper_names_offsets.c:50
 msgctxt "paper size"
 msgid "B8"
 msgstr "B8"
 
-#: gtk/paper_names_offsets.c:51
+#: ../gtk/paper_names_offsets.c:51
 msgctxt "paper size"
 msgid "B9"
 msgstr "B9"
 
-#: gtk/paper_names_offsets.c:52
+#: ../gtk/paper_names_offsets.c:52
 msgctxt "paper size"
 msgid "C0"
 msgstr "C0"
 
-#: gtk/paper_names_offsets.c:53
+#: ../gtk/paper_names_offsets.c:53
 msgctxt "paper size"
 msgid "C1"
 msgstr "C1"
 
-#: gtk/paper_names_offsets.c:54
+#: ../gtk/paper_names_offsets.c:54
 msgctxt "paper size"
 msgid "C10"
 msgstr "C10"
 
-#: gtk/paper_names_offsets.c:55
+#: ../gtk/paper_names_offsets.c:55
 msgctxt "paper size"
 msgid "C2"
 msgstr "C2"
 
-#: gtk/paper_names_offsets.c:56
+#: ../gtk/paper_names_offsets.c:56
 msgctxt "paper size"
 msgid "C3"
 msgstr "C3"
 
-#: gtk/paper_names_offsets.c:57
+#: ../gtk/paper_names_offsets.c:57
 msgctxt "paper size"
 msgid "C4"
 msgstr "C4"
 
-#: gtk/paper_names_offsets.c:58
+#: ../gtk/paper_names_offsets.c:58
 msgctxt "paper size"
 msgid "C5"
 msgstr "C5"
 
-#: gtk/paper_names_offsets.c:59
+#: ../gtk/paper_names_offsets.c:59
 msgctxt "paper size"
 msgid "C6"
 msgstr "C6"
 
-#: gtk/paper_names_offsets.c:60
+#: ../gtk/paper_names_offsets.c:60
 msgctxt "paper size"
 msgid "C6/C5"
 msgstr "C6/C5"
 
-#: gtk/paper_names_offsets.c:61
+#: ../gtk/paper_names_offsets.c:61
 msgctxt "paper size"
 msgid "C7"
 msgstr "C7"
 
-#: gtk/paper_names_offsets.c:62
+#: ../gtk/paper_names_offsets.c:62
 msgctxt "paper size"
 msgid "C7/C6"
 msgstr "C7/C6"
 
-#: gtk/paper_names_offsets.c:63
+#: ../gtk/paper_names_offsets.c:63
 msgctxt "paper size"
 msgid "C8"
 msgstr "C8"
 
-#: gtk/paper_names_offsets.c:64
+#: ../gtk/paper_names_offsets.c:64
 msgctxt "paper size"
 msgid "C9"
 msgstr "C9"
 
-#: gtk/paper_names_offsets.c:65
+#: ../gtk/paper_names_offsets.c:65
 msgctxt "paper size"
 msgid "DL Envelope"
 msgstr "DL koverta"
 
-#: gtk/paper_names_offsets.c:66
+#: ../gtk/paper_names_offsets.c:66
 msgctxt "paper size"
 msgid "RA0"
 msgstr "RA0"
 
-#: gtk/paper_names_offsets.c:67
+#: ../gtk/paper_names_offsets.c:67
 msgctxt "paper size"
 msgid "RA1"
 msgstr "RA1"
 
-#: gtk/paper_names_offsets.c:68
+#: ../gtk/paper_names_offsets.c:68
 msgctxt "paper size"
 msgid "RA2"
 msgstr "RA2"
 
-#: gtk/paper_names_offsets.c:69
+#: ../gtk/paper_names_offsets.c:69
 msgctxt "paper size"
 msgid "SRA0"
 msgstr "SRA0"
 
-#: gtk/paper_names_offsets.c:70
+#: ../gtk/paper_names_offsets.c:70
 msgctxt "paper size"
 msgid "SRA1"
 msgstr "SRA1"
 
-#: gtk/paper_names_offsets.c:71
+#: ../gtk/paper_names_offsets.c:71
 msgctxt "paper size"
 msgid "SRA2"
 msgstr "SRA2"
 
-#: gtk/paper_names_offsets.c:72
+#: ../gtk/paper_names_offsets.c:72
 msgctxt "paper size"
 msgid "JB0"
 msgstr "JB0"
 
-#: gtk/paper_names_offsets.c:73
+#: ../gtk/paper_names_offsets.c:73
 msgctxt "paper size"
 msgid "JB1"
 msgstr "JB1"
 
-#: gtk/paper_names_offsets.c:74
+#: ../gtk/paper_names_offsets.c:74
 msgctxt "paper size"
 msgid "JB10"
 msgstr "JB10"
 
-#: gtk/paper_names_offsets.c:75
+#: ../gtk/paper_names_offsets.c:75
 msgctxt "paper size"
 msgid "JB2"
 msgstr "JB2"
 
-#: gtk/paper_names_offsets.c:76
+#: ../gtk/paper_names_offsets.c:76
 msgctxt "paper size"
 msgid "JB3"
 msgstr "JB3"
 
-#: gtk/paper_names_offsets.c:77
+#: ../gtk/paper_names_offsets.c:77
 msgctxt "paper size"
 msgid "JB4"
 msgstr "JB4"
 
-#: gtk/paper_names_offsets.c:78
+#: ../gtk/paper_names_offsets.c:78
 msgctxt "paper size"
 msgid "JB5"
 msgstr "JB5"
 
-#: gtk/paper_names_offsets.c:79
+#: ../gtk/paper_names_offsets.c:79
 msgctxt "paper size"
 msgid "JB6"
 msgstr "JB6"
 
-#: gtk/paper_names_offsets.c:80
+#: ../gtk/paper_names_offsets.c:80
 msgctxt "paper size"
 msgid "JB7"
 msgstr "JB7"
 
-#: gtk/paper_names_offsets.c:81
+#: ../gtk/paper_names_offsets.c:81
 msgctxt "paper size"
 msgid "JB8"
 msgstr "JB8"
 
-#: gtk/paper_names_offsets.c:82
+#: ../gtk/paper_names_offsets.c:82
 msgctxt "paper size"
 msgid "JB9"
 msgstr "JB9"
 
-#: gtk/paper_names_offsets.c:83
+#: ../gtk/paper_names_offsets.c:83
 msgctxt "paper size"
 msgid "jis exec"
-msgstr "jis exec"
+msgstr "jis eksek"
 
-#: gtk/paper_names_offsets.c:84
+#: ../gtk/paper_names_offsets.c:84
 msgctxt "paper size"
 msgid "Choukei 2 Envelope"
 msgstr "�ukei 2 koverta"
 
-#: gtk/paper_names_offsets.c:85
+#: ../gtk/paper_names_offsets.c:85
 msgctxt "paper size"
 msgid "Choukei 3 Envelope"
 msgstr "�ukei 3 koverta"
 
-#: gtk/paper_names_offsets.c:86
+#: ../gtk/paper_names_offsets.c:86
 msgctxt "paper size"
 msgid "Choukei 4 Envelope"
 msgstr "�ukei 4 koverta"
 
-#: gtk/paper_names_offsets.c:87
+#: ../gtk/paper_names_offsets.c:87
 msgctxt "paper size"
 msgid "hagaki (postcard)"
 msgstr "hangai (razglednica)"
 
-#: gtk/paper_names_offsets.c:88
+#: ../gtk/paper_names_offsets.c:88
 msgctxt "paper size"
 msgid "kahu Envelope"
 msgstr "kahu koverta"
 
-#: gtk/paper_names_offsets.c:89
+#: ../gtk/paper_names_offsets.c:89
 msgctxt "paper size"
 msgid "kaku2 Envelope"
 msgstr "kahu2 koverta"
 
-#: gtk/paper_names_offsets.c:90
+#: ../gtk/paper_names_offsets.c:90
 msgctxt "paper size"
 msgid "oufuku (reply postcard)"
 msgstr "oufuku (odzdravna razglednica)"
 
-#: gtk/paper_names_offsets.c:91
+#: ../gtk/paper_names_offsets.c:91
 msgctxt "paper size"
 msgid "you4 Envelope"
 msgstr "ju4 koverta"
 
-#: gtk/paper_names_offsets.c:92
+#: ../gtk/paper_names_offsets.c:92
 msgctxt "paper size"
 msgid "10x11"
 msgstr "10x11"
 
-#: gtk/paper_names_offsets.c:93
+#: ../gtk/paper_names_offsets.c:93
 msgctxt "paper size"
 msgid "10x13"
 msgstr "10x13"
 
-#: gtk/paper_names_offsets.c:94
+#: ../gtk/paper_names_offsets.c:94
 msgctxt "paper size"
 msgid "10x14"
 msgstr "10x14"
 
-#: gtk/paper_names_offsets.c:95 gtk/paper_names_offsets.c:96
+#: ../gtk/paper_names_offsets.c:95 ../gtk/paper_names_offsets.c:96
 msgctxt "paper size"
 msgid "10x15"
 msgstr "10x15"
 
-#: gtk/paper_names_offsets.c:97
+#: ../gtk/paper_names_offsets.c:97
 msgctxt "paper size"
 msgid "11x12"
 msgstr "11x12"
 
-#: gtk/paper_names_offsets.c:98
+#: ../gtk/paper_names_offsets.c:98
 msgctxt "paper size"
 msgid "11x15"
 msgstr "11x15"
 
-#: gtk/paper_names_offsets.c:99
+#: ../gtk/paper_names_offsets.c:99
 msgctxt "paper size"
 msgid "12x19"
 msgstr "12x19"
 
-#: gtk/paper_names_offsets.c:100
+#: ../gtk/paper_names_offsets.c:100
 msgctxt "paper size"
 msgid "5x7"
 msgstr "5x7"
 
-#: gtk/paper_names_offsets.c:101
+#: ../gtk/paper_names_offsets.c:101
 msgctxt "paper size"
 msgid "6x9 Envelope"
 msgstr "6x9 koverta"
 
-#: gtk/paper_names_offsets.c:102
+#: ../gtk/paper_names_offsets.c:102
 msgctxt "paper size"
 msgid "7x9 Envelope"
 msgstr "7x9 koverta"
 
-#: gtk/paper_names_offsets.c:103
+#: ../gtk/paper_names_offsets.c:103
 msgctxt "paper size"
 msgid "9x11 Envelope"
 msgstr "9x11 koverta"
 
-#: gtk/paper_names_offsets.c:104
+#: ../gtk/paper_names_offsets.c:104
 msgctxt "paper size"
 msgid "a2 Envelope"
 msgstr "a2 koverta"
 
-#: gtk/paper_names_offsets.c:105
+#: ../gtk/paper_names_offsets.c:105
 msgctxt "paper size"
 msgid "Arch A"
-msgstr "Ar� A"
+msgstr "ar� A"
 
-#: gtk/paper_names_offsets.c:106
+#: ../gtk/paper_names_offsets.c:106
 msgctxt "paper size"
 msgid "Arch B"
-msgstr "Ar� B"
+msgstr "ar� B"
 
-#: gtk/paper_names_offsets.c:107
+#: ../gtk/paper_names_offsets.c:107
 msgctxt "paper size"
 msgid "Arch C"
-msgstr "Ar� C"
+msgstr "ar� C"
 
-#: gtk/paper_names_offsets.c:108
+#: ../gtk/paper_names_offsets.c:108
 msgctxt "paper size"
 msgid "Arch D"
-msgstr "Ar� D"
+msgstr "ar� D"
 
-#: gtk/paper_names_offsets.c:109
+#: ../gtk/paper_names_offsets.c:109
 msgctxt "paper size"
 msgid "Arch E"
-msgstr "Ar� E"
+msgstr "ar� E"
 
-#: gtk/paper_names_offsets.c:110
+#: ../gtk/paper_names_offsets.c:110
 msgctxt "paper size"
 msgid "b-plus"
 msgstr "b-plus"
 
-#: gtk/paper_names_offsets.c:111
+#: ../gtk/paper_names_offsets.c:111
 msgctxt "paper size"
 msgid "c"
 msgstr "c"
 
-#: gtk/paper_names_offsets.c:112
+#: ../gtk/paper_names_offsets.c:112
 msgctxt "paper size"
 msgid "c5 Envelope"
 msgstr "c5 koverta"
 
-#: gtk/paper_names_offsets.c:113
+#: ../gtk/paper_names_offsets.c:113
 msgctxt "paper size"
 msgid "d"
 msgstr "d"
 
-#: gtk/paper_names_offsets.c:114
+#: ../gtk/paper_names_offsets.c:114
 msgctxt "paper size"
 msgid "e"
 msgstr "e"
 
-#: gtk/paper_names_offsets.c:115
+#: ../gtk/paper_names_offsets.c:115
 msgctxt "paper size"
 msgid "edp"
 msgstr "edp"
 
-#: gtk/paper_names_offsets.c:116
+#: ../gtk/paper_names_offsets.c:116
 msgctxt "paper size"
 msgid "European edp"
 msgstr "evropski edp"
 
-#: gtk/paper_names_offsets.c:117
+#: ../gtk/paper_names_offsets.c:117
 msgctxt "paper size"
 msgid "Executive"
 msgstr "izvršna koverta"
 
-#: gtk/paper_names_offsets.c:118
+#: ../gtk/paper_names_offsets.c:118
 msgctxt "paper size"
 msgid "f"
 msgstr "f"
 
-#: gtk/paper_names_offsets.c:119
+#: ../gtk/paper_names_offsets.c:119
 msgctxt "paper size"
 msgid "FanFold European"
 msgstr "evropski fan-fold"
 
-#: gtk/paper_names_offsets.c:120
+#: ../gtk/paper_names_offsets.c:120
 msgctxt "paper size"
 msgid "FanFold US"
 msgstr "ameri�ki fan-fold"
 
-#: gtk/paper_names_offsets.c:121
+#: ../gtk/paper_names_offsets.c:121
 msgctxt "paper size"
 msgid "FanFold German Legal"
 msgstr "nema�ki pravni�ki fan-fold"
 
-#: gtk/paper_names_offsets.c:122
+#: ../gtk/paper_names_offsets.c:122
 msgctxt "paper size"
 msgid "Government Legal"
 msgstr "ameri�ki zvani�ni"
 
-#: gtk/paper_names_offsets.c:123
+#: ../gtk/paper_names_offsets.c:123
 msgctxt "paper size"
 msgid "Government Letter"
 msgstr "ameri�ko zvani�no pismo"
 
-#: gtk/paper_names_offsets.c:124
+#: ../gtk/paper_names_offsets.c:124
 msgctxt "paper size"
 msgid "Index 3x5"
-msgstr "Indeks 3x5"
+msgstr "indeks 3x5"
 
-#: gtk/paper_names_offsets.c:125
+#: ../gtk/paper_names_offsets.c:125
 msgctxt "paper size"
 msgid "Index 4x6 (postcard)"
-msgstr "Indeks 4x6 (razglednica)"
+msgstr "indeks 4x6 (razglednica)"
 
-#: gtk/paper_names_offsets.c:126
+#: ../gtk/paper_names_offsets.c:126
 msgctxt "paper size"
 msgid "Index 4x6 ext"
-msgstr "Indeks 4x6 prošireni"
+msgstr "indeks 4x6 prošireni"
 
-#: gtk/paper_names_offsets.c:127
+#: ../gtk/paper_names_offsets.c:127
 msgctxt "paper size"
 msgid "Index 5x8"
-msgstr "Indeks 5x8"
+msgstr "indeks 5x8"
 
-#: gtk/paper_names_offsets.c:128
+#: ../gtk/paper_names_offsets.c:128
 msgctxt "paper size"
 msgid "Invoice"
-msgstr "Ra�un"
+msgstr "ra�un"
 
-#: gtk/paper_names_offsets.c:129
+#: ../gtk/paper_names_offsets.c:129
 msgctxt "paper size"
 msgid "Tabloid"
-msgstr "Tabloid"
+msgstr "tabloid"
 
-#: gtk/paper_names_offsets.c:130
+#: ../gtk/paper_names_offsets.c:130
 msgctxt "paper size"
 msgid "US Legal"
 msgstr "ameri�ki pravni�ki"
 
-#: gtk/paper_names_offsets.c:131
+#: ../gtk/paper_names_offsets.c:131
 msgctxt "paper size"
 msgid "US Legal Extra"
 msgstr "prošireni ameri�ki pravni�ki"
 
-#: gtk/paper_names_offsets.c:132
+#: ../gtk/paper_names_offsets.c:132
 msgctxt "paper size"
 msgid "US Letter"
 msgstr "ameri�ko pismo"
 
-#: gtk/paper_names_offsets.c:133
+#: ../gtk/paper_names_offsets.c:133
 msgctxt "paper size"
 msgid "US Letter Extra"
 msgstr "prošireno ameri�ko pismo"
 
-#: gtk/paper_names_offsets.c:134
+#: ../gtk/paper_names_offsets.c:134
 msgctxt "paper size"
 msgid "US Letter Plus"
 msgstr "ameri�ko pismo plus"
 
-#: gtk/paper_names_offsets.c:135
+#: ../gtk/paper_names_offsets.c:135
 msgctxt "paper size"
 msgid "Monarch Envelope"
-msgstr "Monarh koverta"
+msgstr "monarh koverta"
 
-#: gtk/paper_names_offsets.c:136
+#: ../gtk/paper_names_offsets.c:136
 msgctxt "paper size"
 msgid "#10 Envelope"
 msgstr "koverta #10"
 
-#: gtk/paper_names_offsets.c:137
+#: ../gtk/paper_names_offsets.c:137
 msgctxt "paper size"
 msgid "#11 Envelope"
 msgstr "koverta #11"
 
-#: gtk/paper_names_offsets.c:138
+#: ../gtk/paper_names_offsets.c:138
 msgctxt "paper size"
 msgid "#12 Envelope"
 msgstr "koverta #12"
 
-#: gtk/paper_names_offsets.c:139
+#: ../gtk/paper_names_offsets.c:139
 msgctxt "paper size"
 msgid "#14 Envelope"
 msgstr "koverta #14"
 
-#: gtk/paper_names_offsets.c:140
+#: ../gtk/paper_names_offsets.c:140
 msgctxt "paper size"
 msgid "#9 Envelope"
 msgstr "koverta #9"
 
-#: gtk/paper_names_offsets.c:141
+#: ../gtk/paper_names_offsets.c:141
 msgctxt "paper size"
 msgid "Personal Envelope"
 msgstr "li�na koverta"
 
-#: gtk/paper_names_offsets.c:142
+#: ../gtk/paper_names_offsets.c:142
 msgctxt "paper size"
 msgid "Quarto"
-msgstr "ÄŒetvrtina"
+msgstr "�etvrt"
 
-#: gtk/paper_names_offsets.c:143
+#: ../gtk/paper_names_offsets.c:143
 msgctxt "paper size"
 msgid "Super A"
-msgstr "Super A"
+msgstr "super A"
 
-#: gtk/paper_names_offsets.c:144
+#: ../gtk/paper_names_offsets.c:144
 msgctxt "paper size"
 msgid "Super B"
-msgstr "Super B"
+msgstr "super B"
 
-#: gtk/paper_names_offsets.c:145
+#: ../gtk/paper_names_offsets.c:145
 msgctxt "paper size"
 msgid "Wide Format"
-msgstr "Å iroki format"
+msgstr "Å¡iroki format"
 
-#: gtk/paper_names_offsets.c:146
+#: ../gtk/paper_names_offsets.c:146
 msgctxt "paper size"
 msgid "Dai-pa-kai"
-msgstr "Dai-pa-kai"
+msgstr "dai-pa-kai"
 
-#: gtk/paper_names_offsets.c:147
+#: ../gtk/paper_names_offsets.c:147
 msgctxt "paper size"
 msgid "Folio"
-msgstr "Folio"
+msgstr "folio"
 
-#: gtk/paper_names_offsets.c:148
+#: ../gtk/paper_names_offsets.c:148
 msgctxt "paper size"
 msgid "Folio sp"
-msgstr "Folio sp"
+msgstr "folio sp"
 
-#: gtk/paper_names_offsets.c:149
+#: ../gtk/paper_names_offsets.c:149
 msgctxt "paper size"
 msgid "Invite Envelope"
 msgstr "koverta za pozivnice"
 
-#: gtk/paper_names_offsets.c:150
+#: ../gtk/paper_names_offsets.c:150
 msgctxt "paper size"
 msgid "Italian Envelope"
 msgstr "italijanska koverta"
 
-#: gtk/paper_names_offsets.c:151
+#: ../gtk/paper_names_offsets.c:151
 msgctxt "paper size"
 msgid "juuro-ku-kai"
 msgstr "juro-ku-kai"
 
-#: gtk/paper_names_offsets.c:152
+#: ../gtk/paper_names_offsets.c:152
 msgctxt "paper size"
 msgid "pa-kai"
 msgstr "pa-kai"
 
-#: gtk/paper_names_offsets.c:153
+#: ../gtk/paper_names_offsets.c:153
 msgctxt "paper size"
 msgid "Postfix Envelope"
-msgstr "Poštanska koverta"
+msgstr "poštanska koverta"
 
-#: gtk/paper_names_offsets.c:154
+#: ../gtk/paper_names_offsets.c:154
 msgctxt "paper size"
 msgid "Small Photo"
-msgstr "Mala fotografija"
+msgstr "mala fotografija"
 
-#: gtk/paper_names_offsets.c:155
+#: ../gtk/paper_names_offsets.c:155
 msgctxt "paper size"
 msgid "prc1 Envelope"
 msgstr "prc1 koverta"
 
-#: gtk/paper_names_offsets.c:156
+#: ../gtk/paper_names_offsets.c:156
 msgctxt "paper size"
 msgid "prc10 Envelope"
 msgstr "prc10 koverta"
 
-#: gtk/paper_names_offsets.c:157
+#: ../gtk/paper_names_offsets.c:157
 msgctxt "paper size"
 msgid "prc 16k"
 msgstr "prc 16k"
 
-#: gtk/paper_names_offsets.c:158
+#: ../gtk/paper_names_offsets.c:158
 msgctxt "paper size"
 msgid "prc2 Envelope"
 msgstr "prc2 koverta"
 
-#: gtk/paper_names_offsets.c:159
+#: ../gtk/paper_names_offsets.c:159
 msgctxt "paper size"
 msgid "prc3 Envelope"
 msgstr "prc3 koverta"
 
-#: gtk/paper_names_offsets.c:160
+#: ../gtk/paper_names_offsets.c:160
 msgctxt "paper size"
 msgid "prc 32k"
 msgstr "prc 32k"
 
-#: gtk/paper_names_offsets.c:161
+#: ../gtk/paper_names_offsets.c:161
 msgctxt "paper size"
 msgid "prc4 Envelope"
 msgstr "prc4 koverta"
 
-#: gtk/paper_names_offsets.c:162
+#: ../gtk/paper_names_offsets.c:162
 msgctxt "paper size"
 msgid "prc5 Envelope"
 msgstr "prc5 koverta"
 
-#: gtk/paper_names_offsets.c:163
+#: ../gtk/paper_names_offsets.c:163
 msgctxt "paper size"
 msgid "prc6 Envelope"
 msgstr "prc6 koverta"
 
-#: gtk/paper_names_offsets.c:164
+#: ../gtk/paper_names_offsets.c:164
 msgctxt "paper size"
 msgid "prc7 Envelope"
 msgstr "prc7 koverta"
 
-#: gtk/paper_names_offsets.c:165
+#: ../gtk/paper_names_offsets.c:165
 msgctxt "paper size"
 msgid "prc8 Envelope"
 msgstr "prc8 koverta"
 
-#: gtk/paper_names_offsets.c:166
+#: ../gtk/paper_names_offsets.c:166
 msgctxt "paper size"
 msgid "prc9 Envelope"
 msgstr "prc9 koverta"
 
-#: gtk/paper_names_offsets.c:167
+#: ../gtk/paper_names_offsets.c:167
 msgctxt "paper size"
 msgid "ROC 16k"
 msgstr "ROK 16k"
 
-#: gtk/paper_names_offsets.c:168
+#: ../gtk/paper_names_offsets.c:168
 msgctxt "paper size"
 msgid "ROC 8k"
 msgstr "ROK 8k"
 
-#: gtk/updateiconcache.c:492 gtk/updateiconcache.c:552
-#, c-format
-msgid "different idatas found for symlinked '%s' and '%s'\n"
-msgstr ""
-"razli�ite idatas strukture su pronađene za simboli�ki vezane „%s“ i „%s“\n"
-
-#: gtk/updateiconcache.c:1374
+#: ../gtk/updateiconcache.c:1370
 #, c-format
 msgid "Failed to write header\n"
-msgstr "Neuspelo pisanje zaglavlja\n"
+msgstr "Nisam uspeo da zapišem zaglavlje\n"
 
-#: gtk/updateiconcache.c:1380
+#: ../gtk/updateiconcache.c:1376
 #, c-format
 msgid "Failed to write hash table\n"
-msgstr "Neuspelo pisanja heš tabele\n"
+msgstr "Nisam uspeo da zapišem heš tabelu\n"
 
-#: gtk/updateiconcache.c:1386
+#: ../gtk/updateiconcache.c:1382
 #, c-format
 msgid "Failed to write folder index\n"
-msgstr "Neuspelo pisanje indeksa fascikle\n"
+msgstr "Nisam uspeo da zapišem indeks fascikle\n"
 
-#: gtk/updateiconcache.c:1394
+#: ../gtk/updateiconcache.c:1390
 #, c-format
 msgid "Failed to rewrite header\n"
-msgstr "Neuspelo prepisivanje zaglavlja\n"
+msgstr "Nisam uspeo da prepišem zaglavlje\n"
 
-#: gtk/updateiconcache.c:1463
+#: ../gtk/updateiconcache.c:1484
 #, c-format
 msgid "Failed to open file %s : %s\n"
-msgstr "Ne mogu da otvorim datoteku „%s“: %s\n"
+msgstr "Nisam uspeo da otvorim datoteku „%s“: %s\n"
 
-#: gtk/updateiconcache.c:1471
+#: ../gtk/updateiconcache.c:1492 ../gtk/updateiconcache.c:1522
 #, c-format
 msgid "Failed to write cache file: %s\n"
-msgstr "Neuspeo upis datoteke u ostavi: %s\n"
+msgstr "Nisam uspeo da zapišem datoteku iz ostave: %s\n"
 
-#: gtk/updateiconcache.c:1507
+#: ../gtk/updateiconcache.c:1533
 #, c-format
 msgid "The generated cache was invalid.\n"
-msgstr "Kreirana ostava nije ispravna.\n"
+msgstr "Stvorena ostava nije ispravna.\n"
 
-#: gtk/updateiconcache.c:1521
+#: ../gtk/updateiconcache.c:1547
 #, c-format
 msgid "Could not rename %s to %s: %s, removing %s then.\n"
-msgstr "Neuspelo premeštanje %s u %s: %s, i zato uklanjam %s.\n"
+msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s, i zato uklanjam „%s“.\n"
 
-#: gtk/updateiconcache.c:1535
+#: ../gtk/updateiconcache.c:1561
 #, c-format
 msgid "Could not rename %s to %s: %s\n"
-msgstr "Neuspelo premeštanje %s u %s: %s\n"
+msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s\n"
 
-#: gtk/updateiconcache.c:1545
+#: ../gtk/updateiconcache.c:1571
 #, c-format
 msgid "Could not rename %s back to %s: %s.\n"
-msgstr "Neuspelo premeštanje %s nazad u %s: %s.\n"
+msgstr "Ne mogu da preimenujem „%s“ nazad u „%s“: %s.\n"
 
-#: gtk/updateiconcache.c:1572
+#: ../gtk/updateiconcache.c:1598
 #, c-format
 msgid "Cache file created successfully.\n"
 msgstr "Datoteka u ostavi je uspešno napravljena.\n"
 
-#: gtk/updateiconcache.c:1611
+#: ../gtk/updateiconcache.c:1637
 msgid "Overwrite an existing cache, even if up to date"
-msgstr "Prepisivanje postojeće ostave, �ak i ako je ažurna"
+msgstr "Prepiši postojeću ostavu, �ak i ako je ažurna"
 
-#: gtk/updateiconcache.c:1612
+#: ../gtk/updateiconcache.c:1638
 msgid "Don't check for the existence of index.theme"
-msgstr "Ne provervaj prisustvo index.theme datoteke"
+msgstr "Ne provervaj prisustvo datoteke „index.theme“"
 
-#: gtk/updateiconcache.c:1613
+#: ../gtk/updateiconcache.c:1639
 msgid "Don't include image data in the cache"
 msgstr "Ne uklju�uj podatke slike u ostavu"
 
-#: gtk/updateiconcache.c:1614
+#: ../gtk/updateiconcache.c:1640
 msgid "Output a C header file"
 msgstr "Ispiši datoteku C zaglavlja"
 
-#: gtk/updateiconcache.c:1615
+#: ../gtk/updateiconcache.c:1641
 msgid "Turn off verbose output"
 msgstr "Isklju�i opširnost ispisa"
 
-#: gtk/updateiconcache.c:1616
+#: ../gtk/updateiconcache.c:1642
 msgid "Validate existing icon cache"
 msgstr "Proveri ispravnost postojeće ostave ikonica"
 
-#: gtk/updateiconcache.c:1683
+#: ../gtk/updateiconcache.c:1709
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Datoteka nije pronađena: %s\n"
 
-#: gtk/updateiconcache.c:1689
+#: ../gtk/updateiconcache.c:1715
 #, c-format
 msgid "Not a valid icon cache: %s\n"
 msgstr "Neispravna ostava za ikonice: %s\n"
 
-#: gtk/updateiconcache.c:1702
+#: ../gtk/updateiconcache.c:1728
 #, c-format
 msgid "No theme index file.\n"
 msgstr "Nije nađena indeks datoteka za temu.\n"
 
-#: gtk/updateiconcache.c:1706
+#: ../gtk/updateiconcache.c:1732
 #, c-format
 msgid ""
 "No theme index file in '%s'.\n"
 "If you really want to create an icon cache here, use --ignore-theme-index.\n"
 msgstr ""
 "Nije pronađena indeks datoteka teme u „%s“.\n"
-"Ako zaista želite da napravite ostavu za ikonice ovde, navedite --ignore-"
-"theme-index.\n"
+"Ako zaista želite da napravite ostavu za ikonice ovde, navedite „--ignore-"
+"theme-index“.\n"
 
 #. ID
-#: modules/input/imam-et.c:454
+#: ../modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Amharski (EZ+)"
 
 #. ID
-#: modules/input/imcedilla.c:92
+#: ../modules/input/imcedilla.c:92
 msgid "Cedilla"
 msgstr "Sedilja"
 
 #. ID
-#: modules/input/imcyrillic-translit.c:217
+#: ../modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Ćirili�no (transliterovano)"
 
 #. ID
-#: modules/input/iminuktitut.c:127
+#: ../modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inuktitut (transliterovano)"
 
 #. ID
-#: modules/input/imipa.c:145
+#: ../modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA (Međunarodna fonetska azbuka)"
 
 #. ID
-#: modules/input/immultipress.c:31
+#: ../modules/input/immultipress.c:31
 msgid "Multipress"
 msgstr "Višestruki pristisci"
 
 #. ID
-#: modules/input/imthai.c:35
+#: ../modules/input/imthai.c:35
 msgid "Thai-Lao"
 msgstr "Tai-Lao"
 
 #. ID
-#: modules/input/imti-er.c:453
+#: ../modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Tigrigna-Eritrejski (EZ+)"
 
 #. ID
-#: modules/input/imti-et.c:453
+#: ../modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Tigrigna-Etiopijski (EZ+)"
 
 #. ID
-#: modules/input/imviqr.c:244
+#: ../modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Vijetnamski (VIQR)"
 
 #. ID
-#: modules/input/imxim.c:28
+#: ../modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "Iksov na�in unosa (XIM)"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:811
-#: modules/printbackends/cups/gtkprintbackendcups.c:1020
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:829
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1048
 msgid "Username:"
 msgstr "Korisni�ko ime:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:812
-#: modules/printbackends/cups/gtkprintbackendcups.c:1029
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:830
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1057
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:850
-#, c-format
-msgid "Authentication is required to get a file from %s"
-msgstr "Potrebna je prijava za prikupljanje datoteke sa %s"
-
-#: modules/printbackends/cups/gtkprintbackendcups.c:854
-#: modules/printbackends/cups/gtkprintbackendcups.c:1042
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:869
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1070
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
-msgstr "Potrebna je prijava za štampanje dokumenta „%s“ na štampa�u %s"
+msgstr ""
+"Potrebno je potvrđivanje identiteta za štampanje dokumenta „%s“ na štampa�u „%"
+"s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:856
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:871
 #, c-format
 msgid "Authentication is required to print a document on %s"
-msgstr "Potrebna je prijava za Å¡tampanje dokumenta na %s"
+msgstr "Potrebno je potvrđivanje identiteta za štampanje dokumenta na „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:860
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:875
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
-msgstr "Potrebna je prijava za prikupljanje podataka o zaduženju „%s“"
+msgstr ""
+"Potrebno je potvrđivanje identiteta za prikupljanje podataka o zaduženju „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:862
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:877
 msgid "Authentication is required to get attributes of a job"
-msgstr "Potrebna je prijava za prikupljanje podataka o zaduženju"
+msgstr "Potrebno je potvrđivanje identiteta za prikupljanje podataka o zaduženju"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:866
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:881
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
-msgstr "Potrebna je prijava za prikupljanje podataka od štampa�a %s"
+msgstr ""
+"Potrebno je potvrđivanje identiteta za prikupljanje podataka štampa�a „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:868
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:883
 msgid "Authentication is required to get attributes of a printer"
-msgstr "Potrebna je prijava za prikupljanje podataka od štampa�a"
+msgstr "Potrebno je potvrđivanje identiteta za prikupljanje podataka štampa�a"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:871
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:886
 #, c-format
 msgid "Authentication is required to get default printer of %s"
-msgstr "Potrebna je prijava za podrazumevani štampa� od %s"
+msgstr "Potrebno je potvrđivanje identiteta za podrazumevani štampa� od „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:874
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:889
 #, c-format
 msgid "Authentication is required to get printers from %s"
-msgstr "Potrebna je prijava za štampa�e iz %s"
+msgstr "Potrebno je potvrđivanje identiteta za štampa�e iz „%s“"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:894
+#, c-format
+msgid "Authentication is required to get a file from %s"
+msgstr "Potrebno je potvrđivanje identiteta za preuzimanje datoteke sa „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:877
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:896
 #, c-format
 msgid "Authentication is required on %s"
-msgstr "Potrebna je prijava za %s"
+msgstr "Potrebno je potvrđivanje identiteta za „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1014
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1042
 msgid "Domain:"
 msgstr "Domen:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1044
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1072
 #, c-format
 msgid "Authentication is required to print document '%s'"
-msgstr "Potrebna je prijava za štampanje dokumenta „%s“"
+msgstr "Potrebno je potvrđivanje identiteta za štampanje dokumenta „%s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1049
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1077
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
-msgstr "Potrebna je prijava za štampanje ovog dokumenta na štampa�u %s"
+msgstr ""
+"Potrebno je potvrđivanje identiteta za štampanje ovog dokumenta na štampa�u „%"
+"s“"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1051
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1079
 msgid "Authentication is required to print this document"
-msgstr "Potrebna je prijava za Å¡tampanje ovog dokumenta"
+msgstr "Potrebno je potvrđivanje identiteta za štampanje ovog dokumenta"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1672
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1704
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "Štampa�u „%s“ ponestaje toner."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1673
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1705
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "Štampa� „%s“ je ostao bez tonera."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1675
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1707
 #, c-format
 msgid "Printer '%s' is low on developer."
 msgstr "Štampa�u „%s“ slabi razvija�."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1677
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1709
 #, c-format
 msgid "Printer '%s' is out of developer."
 msgstr "Štampa� „%s“ je ostao bez razvija�a."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1679
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1711
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
-msgstr "Štampa�u „%s“ ponestaje najmanje jedne boje."
+msgstr "Štampa�u „%s“ ponestaje najmanje jedna boja."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1681
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1713
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
 msgstr "Štampa� „%s“ je ostao bez najmanje jedne boje."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1682
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1714
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "Poklopac je otvoren na štampa�u „%s“."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1683
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1715
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "Vratanca su otvorena na štampa�u „%s“."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1684
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1716
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "Štampa� „%s“ ostaje bez papira."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1685
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1717
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "Štampa� „%s“ je ostao bez papira."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1686
-#, fuzzy, c-format
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1718
+#, c-format
 msgid "Printer '%s' is currently offline."
-msgstr "Štampa� „%s“ je isklju�en."
+msgstr "Štampa� „%s“ trenutno nije priklju�en."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1687
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1719
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "Problem na štampa�u „%s“."
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:1995
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2033
 msgid "Paused ; Rejecting Jobs"
 msgstr "Zaustavljen ; Odbija poslove"
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2001
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2039
 msgid "Rejecting Jobs"
 msgstr "Odbija poslove"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2777
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2812
 msgid "Two Sided"
 msgstr "Dvostrano"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2778
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2813
 msgid "Paper Type"
 msgstr "Tip papira"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2779
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2814
 msgid "Paper Source"
 msgstr "Izvor papira"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2780
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2815
 msgid "Output Tray"
 msgstr "Izlazna traka"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2781
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2816
 msgid "Resolution"
 msgstr "Rezolucija"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2782
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2817
 msgid "GhostScript pre-filtering"
-msgstr "GhostScript predfilter"
+msgstr "Gost skript predfilter"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2791
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2826
 msgid "One Sided"
 msgstr "Jednostrano"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2793
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2828
 msgid "Long Edge (Standard)"
 msgstr "Po dužoj strani (standardno)"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2795
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2830
 msgid "Short Edge (Flip)"
 msgstr "Po kraćoj strani (okrenuto)"
 
 #. Translators: this is an option of "Paper Source"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2797
-#: modules/printbackends/cups/gtkprintbackendcups.c:2799
-#: modules/printbackends/cups/gtkprintbackendcups.c:2807
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2832
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2834
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2842
 msgid "Auto Select"
 msgstr "Sam odredi"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2801
-#: modules/printbackends/cups/gtkprintbackendcups.c:2803
-#: modules/printbackends/cups/gtkprintbackendcups.c:2805
-#: modules/printbackends/cups/gtkprintbackendcups.c:2809
-#: modules/printbackends/cups/gtkprintbackendcups.c:3295
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2836
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2838
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2840
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2844
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3340
 msgid "Printer Default"
 msgstr "Podrazumevano"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2811
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2846
 msgid "Embed GhostScript fonts only"
-msgstr "Samo ugnježdeni GhostScript fontovi"
+msgstr "Samo ugnježdeni Gost skript fontovi"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2813
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2848
 msgid "Convert to PS level 1"
-msgstr "Prevedi u 1. nivo postskripta"
+msgstr "Prevedi u 1° nivo postskripta"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2815
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2850
 msgid "Convert to PS level 2"
-msgstr "Prevedi u 2. nivo postskripta"
+msgstr "Prevedi u 2° nivo postskripta"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2817
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2852
 msgid "No pre-filtering"
 msgstr "Bez predfiltriranja"
 
 #. 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:2826
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2861
 msgid "Miscellaneous"
 msgstr "Dodatna podešavanja"
 
 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Urgent"
 msgstr "Hitno"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "High"
 msgstr "Važno"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Medium"
 msgstr "Srednje"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Low"
 msgstr "Nebitno"
 
@@ -4041,14 +4350,14 @@ msgstr "Nebitno"
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3527
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3607
 msgid "Pages per Sheet"
 msgstr "Strana na listu"
 
 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3564
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3644
 msgid "Job Priority"
 msgstr "Važnost"
 
@@ -4056,52 +4365,52 @@ msgstr "Važnost"
 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3575
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3655
 msgid "Billing Info"
 msgstr "Fakturisanje"
 
 #. Translators, these strings are names for various 'standard' cover
 #. * pages that the printing system may support.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "None"
-msgstr "Nema"
+msgstr "Ništa"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Classified"
 msgstr "Kategorisano"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Confidential"
 msgstr "Poverljivo"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Secret"
-msgstr "Tajna"
+msgstr "Tajno"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Standard"
 msgstr "Obi�no"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Top Secret"
-msgstr "Velika tajna"
+msgstr "Strogo poverljivo"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Unclassified"
 msgstr "Nekategorisano"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3625
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3705
 msgid "Before"
 msgstr "Pre"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3640
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3720
 msgid "After"
 msgstr "Posle"
 
@@ -4109,14 +4418,14 @@ msgstr "Posle"
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3660
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3740
 msgid "Print at"
 msgstr "Zakaži štampu"
 
 #. 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:3671
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3751
 msgid "Print at time"
 msgstr "Å tampaj u"
 
@@ -4124,110 +4433,203 @@ msgstr "Å tampaj u"
 #. * size. The two placeholders are replaced with the width and height
 #. * in points. E.g: "Custom 230.4x142.9"
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3706
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3786
 #, c-format
 msgid "Custom %sx%s"
-msgstr "Posebno %sx%s"
+msgstr "Proizvoljno %sx%s"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3867
+#, fuzzy
+#| msgid "Printer offline"
+msgid "Printer Profile"
+msgstr "Štampa� je isklju�en"
+
+#. TRANSLATORS: this is when color profile information is unavailable
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3874
+#, fuzzy
+#| msgid "Not available"
+msgid "Unavailable"
+msgstr "Nije dostupno"
+
+#. TRANSLATORS: when we're running an old CUPS, and
+#. * it hasn't registered the device with colord
+#: ../modules/printbackends/cups/gtkprintercups.c:222
+msgid "Color management unavailable"
+msgstr ""
+
+#. TRANSLATORS: when there is no color profile available
+#: ../modules/printbackends/cups/gtkprintercups.c:234
+#, fuzzy
+#| msgid "Not available"
+msgid "No profile available"
+msgstr "Nije dostupno"
+
+#. TRANSLATORS: when the color profile has no title
+#: ../modules/printbackends/cups/gtkprintercups.c:245
+#, fuzzy
+#| msgid "Unspecified error"
+msgid "Unspecified profile"
+msgstr "Nepoznata greška"
 
 #. default filename used for print-to-file
-#: modules/printbackends/file/gtkprintbackendfile.c:250
+#: ../modules/printbackends/file/gtkprintbackendfile.c:250
 #, c-format
 msgid "output.%s"
 msgstr "izlaz.%s"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:493
+#: ../modules/printbackends/file/gtkprintbackendfile.c:501
 msgid "Print to File"
 msgstr "Å tampaj u datoteku"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:627
 msgid "PDF"
 msgstr "PDF"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:627
 msgid "Postscript"
 msgstr "Postskript"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:627
 msgid "SVG"
 msgstr "SVG"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:582
-#: modules/printbackends/test/gtkprintbackendtest.c:503
+#: ../modules/printbackends/file/gtkprintbackendfile.c:640
+#: ../modules/printbackends/test/gtkprintbackendtest.c:503
 msgid "Pages per _sheet:"
 msgstr "_Stranica na listu:"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:641
+#: ../modules/printbackends/file/gtkprintbackendfile.c:699
 msgid "File"
 msgstr "Datoteka"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:651
+#: ../modules/printbackends/file/gtkprintbackendfile.c:709
 msgid "_Output format"
 msgstr "F_ormat izlaza"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:395
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:395
 msgid "Print to LPR"
 msgstr "Å tampaj preko LPR"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:421
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:421
 msgid "Pages Per Sheet"
 msgstr "Strana na listu"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:428
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:428
 msgid "Command Line"
 msgstr "Komandna linija"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:811
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:811
 msgid "printer offline"
 msgstr "štampa� je isklju�en"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:829
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:829
 msgid "ready to print"
 msgstr "spreman za Å¡tampu"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:832
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:832
 msgid "processing job"
-msgstr "obrađuje zaduženje"
+msgstr "obrađujem zaduženje"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:836
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:836
 msgid "paused"
 msgstr "pauziran"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:839
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:839
 msgid "unknown"
 msgstr "nepoznato"
 
 #. default filename used for print-to-test
-#: modules/printbackends/test/gtkprintbackendtest.c:234
+#: ../modules/printbackends/test/gtkprintbackendtest.c:234
 #, c-format
 msgid "test-output.%s"
 msgstr "test-izlaz.%s"
 
-#: modules/printbackends/test/gtkprintbackendtest.c:467
+#: ../modules/printbackends/test/gtkprintbackendtest.c:467
 msgid "Print to Test Printer"
-msgstr "Testiraj Å¡tampu"
+msgstr "Štampaj na probnom štampa�u"
 
-#: tests/testfilechooser.c:207
+#: ../tests/testfilechooser.c:207
 #, c-format
 msgid "Could not get information for file '%s': %s"
-msgstr "Ne mogu da saznam podatke o datoteci „%s“: %s"
+msgstr "Ne mogu da nabavim podatke o datoteci „%s“: %s"
 
-#: tests/testfilechooser.c:222
+#: ../tests/testfilechooser.c:222
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Ne mogu da otvorim datoteku „%s“: %s"
+msgstr "Nisam uspeo da otvorim datoteku „%s“: %s"
 
 # ovo ima najviše smisla
-#: tests/testfilechooser.c:267
+#: ../tests/testfilechooser.c:267
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"Ne mogu da u�itam sliku „%s“: razlog nepoznat, verovatno neispravan zapis"
+"Nisam uspeo da u�itam sliku „%s“: razlog nepoznat, verovatno neispravan zapis"
+
+#~ msgid "Received invalid color data\n"
+#~ msgstr "Primio sam neispravne podatke o bojama\n"
+
+#~ msgid "_Browse for other folders"
+#~ msgstr "_Razgledaj ostale fascikle"
+
+#~ msgid "X screen to use"
+#~ msgstr "Iks ekran koji da koristi"
+
+#~ msgid "SCREEN"
+#~ msgstr "EKRAN"
+
+#~ msgid "Make X calls synchronous"
+#~ msgstr "U�ini Iks pozive sinhronim"
+
+#~ msgid "Credits"
+#~ msgstr "Zasluge"
+
+#~ msgid "Written by"
+#~ msgstr "Autori"
+
+#~ msgid "_Add"
+#~ msgstr "_Dodaj"
+
+#~ msgid "_Remove"
+#~ msgstr "_Ukloni"
+
+#~ msgid "Error creating folder '%s': %s"
+#~ msgstr "Greška pri pravljenju fascikle „%s“: %s"
+
+#~ msgid "Error loading icon: %s"
+#~ msgstr "Greška pri u�itavanju ikone: %s"
+
+#~ msgid ""
+#~ "Could not find the icon '%s'. The '%s' theme\n"
+#~ "was not found either, perhaps you need to install it.\n"
+#~ "You can get a copy from:\n"
+#~ "\t%s"
+#~ msgstr ""
+#~ "Ne mogu da nađem ikonu „%s“. Ni tema „%s“ nije \n"
+#~ "nađena, možda treba da je instalirate.\n"
+#~ "Možete nabaviti primerak sa:\n"
+#~ "\t%s"
+
+#~ msgid "Unable to find include file: \"%s\""
+#~ msgstr "Ne mogu pronaći datoteku za uklju�ivanje: „%s“"
+
+#~ msgid "Unable to locate image file in pixmap_path: \"%s\""
+#~ msgstr "Ne mogu pronaći datoteku sa slikom u pixmap_path: „%s“"
+
+#~ msgid "This function is not implemented for widgets of class '%s'"
+#~ msgstr "Ova funkcija nije implementirana za kontrole u klasi „%s“"
+
+#~ msgid "Unable to locate theme engine in module_path: \"%s\","
+#~ msgstr "Ne mogu da pronađem motor teme u putanji za module: „%s“,"
+
+#~ msgid "different idatas found for symlinked '%s' and '%s'\n"
+#~ msgstr ""
+#~ "razli�ite idatas strukture su pronađene za simboli�ki vezane „%s“ i „%s“\n"
 
 #~ msgid "Gdk debugging flags to set"
 #~ msgstr "Koje Gdk opcije za nalaženje grešaka uklju�iti"
@@ -4948,9 +5350,6 @@ msgstr ""
 #~ msgid "_Folder name:"
 #~ msgstr "_Ime fascikle:"
 
-#~ msgid "C_reate"
-#~ msgstr "N_apravi"
-
 #~ msgid ""
 #~ "The filename \"%s\" contains symbols that are not allowed in filenames"
 #~ msgstr ""
@@ -4983,9 +5382,6 @@ msgstr ""
 #~ msgid "_Rename"
 #~ msgstr "_Preimenuj"
 
-#~ msgid "_Selection: "
-#~ msgstr "_Izbor: "
-
 #~ msgid ""
 #~ "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
 #~ "environment variable G_FILENAME_ENCODING): %s"
@@ -5864,9 +6260,6 @@ msgstr ""
 #~ msgid "This file system does not support icons for everything"
 #~ msgstr "Ovaj sistem datoteka ne podržava ikone za sve"
 
-#~ msgid "Could not find the path"
-#~ msgstr "Ne mogu da nađem putanju"
-
 #~ msgid "Input Methods"
 #~ msgstr "Na�ini unosa"
 
diff --git a/po/sv.po b/po/sv.po
index 5b8e7bb4dc..45bfd114a7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-02 00:44+0200\n"
-"PO-Revision-Date: 2011-08-02 00:46+0100\n"
+"POT-Creation-Date: 2011-08-24 09:19+0200\n"
+"PO-Revision-Date: 2011-08-24 09:22+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -598,7 +598,7 @@ msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Omvänt snedstreck"
 
-#: ../gtk/gtkappchooserbutton.c:268
+#: ../gtk/gtkappchooserbutton.c:270
 msgid "Other application..."
 msgstr "Annat program..."
 
@@ -654,11 +654,13 @@ msgstr "Klicka på \"Visa övriga program\" för fler alternativ eller \"Sök ef
 msgid "Forget association"
 msgstr "Glöm associeringen"
 
-#: ../gtk/gtkappchooserdialog.c:515
+#: ../gtk/gtkappchooserdialog.c:514
 msgid "Show other applications"
 msgstr "Visa övriga program"
 
-#: ../gtk/gtkappchooserdialog.c:533
+#: ../gtk/gtkappchooserdialog.c:530
+#: ../gtk/gtkcolorseldialog.c:199
+#: ../gtk/gtkfontchooserdialog.c:138
 msgid "_Select"
 msgstr "_Välj "
 
@@ -848,7 +850,7 @@ msgid "Position on the color wheel."
 msgstr "Position på färghjulet."
 
 #: ../gtk/gtkcolorsel.c:455
-msgid "_Saturation:"
+msgid "S_aturation:"
 msgstr "_Mättnad:"
 
 #: ../gtk/gtkcolorsel.c:456
@@ -857,11 +859,11 @@ msgstr "Intensiteten för färgen."
 
 #: ../gtk/gtkcolorsel.c:457
 msgid "_Value:"
-msgstr "_Värde:"
+msgstr "_Intensitet:"
 
 #: ../gtk/gtkcolorsel.c:458
 msgid "Brightness of the color."
-msgstr "Ljushet på färgen."
+msgstr "Ljushet för färgen."
 
 #: ../gtk/gtkcolorsel.c:459
 msgid "_Red:"
@@ -1007,25 +1009,25 @@ msgstr "_Höger:"
 msgid "Paper Margins"
 msgstr "Pappersmarginaler"
 
-#: ../gtk/gtkentry.c:8949
+#: ../gtk/gtkentry.c:8956
 #: ../gtk/gtktextview.c:8277
 msgid "Input _Methods"
 msgstr "Inmatnings_metoder"
 
-#: ../gtk/gtkentry.c:8963
+#: ../gtk/gtkentry.c:8970
 #: ../gtk/gtktextview.c:8291
 msgid "_Insert Unicode Control Character"
 msgstr "_Infoga Unicode-styrtecken"
 
-#: ../gtk/gtkentry.c:10434
+#: ../gtk/gtkentry.c:10441
 msgid "Caps Lock and Num Lock are on"
 msgstr "Caps Lock och Num Lock är aktiverade"
 
-#: ../gtk/gtkentry.c:10436
+#: ../gtk/gtkentry.c:10443
 msgid "Num Lock is on"
 msgstr "Num Lock är aktiverad"
 
-#: ../gtk/gtkentry.c:10438
+#: ../gtk/gtkentry.c:10445
 msgid "Caps Lock is on"
 msgstr "Caps Lock är aktiverad"
 
@@ -1075,7 +1077,7 @@ msgid "Select a File"
 msgstr "Välj en fil"
 
 #: ../gtk/gtkfilechooserbutton.c:106
-#: ../gtk/gtkfilechooserdefault.c:1812
+#: ../gtk/gtkfilechooserdefault.c:1817
 msgid "Desktop"
 msgstr "Skrivbord"
 
@@ -1087,48 +1089,48 @@ msgstr "(Ingen)"
 msgid "Other..."
 msgstr "Annan..."
 
-#: ../gtk/gtkfilechooserdefault.c:148
+#: ../gtk/gtkfilechooserdefault.c:153
 msgid "Type name of new folder"
 msgstr "Ange namnet på den nya mappen"
 
-#: ../gtk/gtkfilechooserdefault.c:963
+#: ../gtk/gtkfilechooserdefault.c:968
 msgid "Could not retrieve information about the file"
 msgstr "Kunde inte hämta information om filen"
 
-#: ../gtk/gtkfilechooserdefault.c:974
+#: ../gtk/gtkfilechooserdefault.c:979
 msgid "Could not add a bookmark"
 msgstr "Kunde inte lägga till ett bokmärke"
 
-#: ../gtk/gtkfilechooserdefault.c:985
+#: ../gtk/gtkfilechooserdefault.c:990
 msgid "Could not remove bookmark"
 msgstr "Kunde inte ta bort bokmärke"
 
-#: ../gtk/gtkfilechooserdefault.c:996
+#: ../gtk/gtkfilechooserdefault.c:1001
 msgid "The folder could not be created"
 msgstr "Mappen kunde inte skapas"
 
-#: ../gtk/gtkfilechooserdefault.c:1009
+#: ../gtk/gtkfilechooserdefault.c:1014
 msgid "The folder could not be created, as a file with the same name already exists.  Try using a different name for the folder, or rename the file first."
 msgstr "Mappen kunde inte skapas eftersom det redan finns en fil med samma namn. Prova att använda ett annat namn på mappen, eller byt namn på filen först."
 
-#: ../gtk/gtkfilechooserdefault.c:1023
+#: ../gtk/gtkfilechooserdefault.c:1028
 msgid "You need to choose a valid filename."
 msgstr "Du måste välja ett giltigt filnamn."
 
-#: ../gtk/gtkfilechooserdefault.c:1026
+#: ../gtk/gtkfilechooserdefault.c:1031
 #, c-format
 msgid "Cannot create a file under %s as it is not a folder"
 msgstr "Kan inte skapa en fil under %s eftersom det inte är en mapp"
 
-#: ../gtk/gtkfilechooserdefault.c:1038
+#: ../gtk/gtkfilechooserdefault.c:1043
 msgid "You may only select folders.  The item that you selected is not a folder; try using a different item."
 msgstr "Du får endast välja mappar.  Objektet som du valde är inte en mapp. Försök att använda ett annat objekt."
 
-#: ../gtk/gtkfilechooserdefault.c:1048
+#: ../gtk/gtkfilechooserdefault.c:1053
 msgid "Invalid file name"
 msgstr "Ogiltigt filnamn"
 
-#: ../gtk/gtkfilechooserdefault.c:1058
+#: ../gtk/gtkfilechooserdefault.c:1063
 msgid "The folder contents could not be displayed"
 msgstr "Mappinnehållet kunde inte visas"
 
@@ -1136,216 +1138,220 @@ msgstr "Mappinnehållet kunde inte visas"
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: ../gtk/gtkfilechooserdefault.c:1584
+#: ../gtk/gtkfilechooserdefault.c:1589
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
-#: ../gtk/gtkfilechooserdefault.c:1733
+#: ../gtk/gtkfilechooserdefault.c:1738
 msgid "Search"
 msgstr "Sök"
 
-#: ../gtk/gtkfilechooserdefault.c:1757
-#: ../gtk/gtkfilechooserdefault.c:4835
+#: ../gtk/gtkfilechooserdefault.c:1762
+#: ../gtk/gtkfilechooserdefault.c:4960
 msgid "Recently Used"
 msgstr "Tidigare använda"
 
-#: ../gtk/gtkfilechooserdefault.c:2356
+#: ../gtk/gtkfilechooserdefault.c:2361
 msgid "Select which types of files are shown"
 msgstr "Välj vilka typer av filer som visas"
 
-#: ../gtk/gtkfilechooserdefault.c:2715
+#: ../gtk/gtkfilechooserdefault.c:2720
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Lägg till mappen \"%s\" till bokmärkena"
 
-#: ../gtk/gtkfilechooserdefault.c:2759
+#: ../gtk/gtkfilechooserdefault.c:2764
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Lägg till den aktuella mappen till dina bokmärken"
 
-#: ../gtk/gtkfilechooserdefault.c:2761
+#: ../gtk/gtkfilechooserdefault.c:2766
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Lägg till de valda mapparna till bokmärkena"
 
-#: ../gtk/gtkfilechooserdefault.c:2799
+#: ../gtk/gtkfilechooserdefault.c:2804
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Ta bort bokmärket \"%s\""
 
-#: ../gtk/gtkfilechooserdefault.c:2801
+#: ../gtk/gtkfilechooserdefault.c:2806
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "Bokmärket \"%s\" kan inte tas bort"
 
-#: ../gtk/gtkfilechooserdefault.c:2808
-#: ../gtk/gtkfilechooserdefault.c:3693
+#: ../gtk/gtkfilechooserdefault.c:2813
+#: ../gtk/gtkfilechooserdefault.c:3698
 msgid "Remove the selected bookmark"
 msgstr "Ta bort markerat bokmärke"
 
-#: ../gtk/gtkfilechooserdefault.c:3372
+#: ../gtk/gtkfilechooserdefault.c:3377
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ../gtk/gtkfilechooserdefault.c:3381
+#: ../gtk/gtkfilechooserdefault.c:3386
 msgid "Rename..."
 msgstr "Byt namn..."
 
 #. Accessible object name for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3545
+#: ../gtk/gtkfilechooserdefault.c:3550
 msgid "Places"
 msgstr "Platser"
 
 #. Column header for the file chooser's shortcuts pane
-#: ../gtk/gtkfilechooserdefault.c:3602
+#: ../gtk/gtkfilechooserdefault.c:3607
 msgid "_Places"
 msgstr "_Platser"
 
-#: ../gtk/gtkfilechooserdefault.c:3681
+#: ../gtk/gtkfilechooserdefault.c:3686
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Lägg till den valda mappen i bokmärkena"
 
-#: ../gtk/gtkfilechooserdefault.c:3828
+#: ../gtk/gtkfilechooserdefault.c:3925
 msgid "Could not select file"
 msgstr "Kunde inte välja fil"
 
-#: ../gtk/gtkfilechooserdefault.c:4001
+#: ../gtk/gtkfilechooserdefault.c:4116
+msgid "_Copy file's location"
+msgstr "_Kopiera filens plats"
+
+#: ../gtk/gtkfilechooserdefault.c:4125
 msgid "_Add to Bookmarks"
 msgstr "_Lägg till i bokmärkena"
 
-#: ../gtk/gtkfilechooserdefault.c:4014
+#: ../gtk/gtkfilechooserdefault.c:4138
 msgid "Show _Hidden Files"
 msgstr "Visa _dolda filer"
 
-#: ../gtk/gtkfilechooserdefault.c:4021
+#: ../gtk/gtkfilechooserdefault.c:4145
 msgid "Show _Size Column"
 msgstr "Visa kolumnen _Storlek"
 
-#: ../gtk/gtkfilechooserdefault.c:4248
+#: ../gtk/gtkfilechooserdefault.c:4373
 msgid "Files"
 msgstr "Filer"
 
-#: ../gtk/gtkfilechooserdefault.c:4299
+#: ../gtk/gtkfilechooserdefault.c:4424
 msgid "Name"
 msgstr "Namn"
 
-#: ../gtk/gtkfilechooserdefault.c:4322
+#: ../gtk/gtkfilechooserdefault.c:4447
 msgid "Size"
 msgstr "Storlek"
 
-#: ../gtk/gtkfilechooserdefault.c:4336
+#: ../gtk/gtkfilechooserdefault.c:4461
 msgid "Modified"
 msgstr "Ändrad"
 
 #. Label
-#: ../gtk/gtkfilechooserdefault.c:4431
+#: ../gtk/gtkfilechooserdefault.c:4556
 #: ../gtk/gtkprinteroptionwidget.c:799
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: ../gtk/gtkfilechooserdefault.c:4673
+#: ../gtk/gtkfilechooserdefault.c:4798
 msgid "Type a file name"
 msgstr "Ange ett filnamn"
 
-#: ../gtk/gtkfilechooserdefault.c:4720
-#: ../gtk/gtkfilechooserdefault.c:4731
+#: ../gtk/gtkfilechooserdefault.c:4845
+#: ../gtk/gtkfilechooserdefault.c:4856
 msgid "Please select a folder below"
 msgstr "Välj en mapp nedan"
 
-#: ../gtk/gtkfilechooserdefault.c:4726
+#: ../gtk/gtkfilechooserdefault.c:4851
 msgid "Please type a file name"
 msgstr "Ange ett filnamn"
 
 #. Create Folder
-#: ../gtk/gtkfilechooserdefault.c:4797
+#: ../gtk/gtkfilechooserdefault.c:4922
 msgid "Create Fo_lder"
 msgstr "Skapa ma_pp"
 
-#: ../gtk/gtkfilechooserdefault.c:4845
+#: ../gtk/gtkfilechooserdefault.c:4970
 msgid "Search:"
 msgstr "Sök:"
 
-#: ../gtk/gtkfilechooserdefault.c:4896
+#: ../gtk/gtkfilechooserdefault.c:5021
 msgid "_Location:"
 msgstr "_Plats:"
 
-#: ../gtk/gtkfilechooserdefault.c:5349
+#: ../gtk/gtkfilechooserdefault.c:5474
 msgid "Save in _folder:"
 msgstr "Spara i _mappen:"
 
-#: ../gtk/gtkfilechooserdefault.c:5351
+#: ../gtk/gtkfilechooserdefault.c:5476
 msgid "Create in _folder:"
 msgstr "Skapa i _mappen:"
 
-#: ../gtk/gtkfilechooserdefault.c:6445
+#: ../gtk/gtkfilechooserdefault.c:6570
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "Kunde inte läsa innehållet i %s"
 
-#: ../gtk/gtkfilechooserdefault.c:6449
+#: ../gtk/gtkfilechooserdefault.c:6574
 msgid "Could not read the contents of the folder"
 msgstr "Kunde inte läsa innehållet i mappen"
 
-#: ../gtk/gtkfilechooserdefault.c:6542
-#: ../gtk/gtkfilechooserdefault.c:6610
-#: ../gtk/gtkfilechooserdefault.c:6762
+#: ../gtk/gtkfilechooserdefault.c:6667
+#: ../gtk/gtkfilechooserdefault.c:6735
+#: ../gtk/gtkfilechooserdefault.c:6887
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../gtk/gtkfilechooserdefault.c:6557
+#: ../gtk/gtkfilechooserdefault.c:6682
 msgid "%H:%M"
 msgstr "%H.%M"
 
-#: ../gtk/gtkfilechooserdefault.c:6559
+#: ../gtk/gtkfilechooserdefault.c:6684
 msgid "Yesterday at %H:%M"
 msgstr "Igår klockan %H.%M"
 
-#: ../gtk/gtkfilechooserdefault.c:7234
+#: ../gtk/gtkfilechooserdefault.c:7359
 msgid "Cannot change to folder because it is not local"
 msgstr "Kan inte byta till mappen eftersom den inte är lokal"
 
-#: ../gtk/gtkfilechooserdefault.c:7834
-#: ../gtk/gtkfilechooserdefault.c:7855
+#: ../gtk/gtkfilechooserdefault.c:7959
+#: ../gtk/gtkfilechooserdefault.c:7980
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "Genvägen %s finns redan"
 
-#: ../gtk/gtkfilechooserdefault.c:7945
+#: ../gtk/gtkfilechooserdefault.c:8070
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Genvägen %s finns inte"
 
-#: ../gtk/gtkfilechooserdefault.c:8191
+#: ../gtk/gtkfilechooserdefault.c:8316
 #: ../gtk/gtkprintunixdialog.c:550
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "En fil med namnet \"%s\" finns redan. Vill du ersätta den?"
 
-#: ../gtk/gtkfilechooserdefault.c:8194
+#: ../gtk/gtkfilechooserdefault.c:8319
 #: ../gtk/gtkprintunixdialog.c:554
 #, c-format
 msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "Filen finns redan i \"%s\". Att ersätta den kommer att skriva över dess innehåll."
 
-#: ../gtk/gtkfilechooserdefault.c:8199
+#: ../gtk/gtkfilechooserdefault.c:8324
 #: ../gtk/gtkprintunixdialog.c:561
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: ../gtk/gtkfilechooserdefault.c:9005
+#: ../gtk/gtkfilechooserdefault.c:9130
 msgid "Could not start the search process"
 msgstr "Kunde inte starta sökprocessen"
 
-#: ../gtk/gtkfilechooserdefault.c:9006
+#: ../gtk/gtkfilechooserdefault.c:9131
 msgid "The program was not able to create a connection to the indexer daemon.  Please make sure it is running."
 msgstr "Programmet kunde inte skapa en anslutning till indexeringsdemonen. Försäkra dig om att den kör."
 
-#: ../gtk/gtkfilechooserdefault.c:9020
+#: ../gtk/gtkfilechooserdefault.c:9145
 msgid "Could not send the search request"
 msgstr "Kunde inte skicka sökbegäran"
 
-#: ../gtk/gtkfilechooserdefault.c:9646
+#: ../gtk/gtkfilechooserdefault.c:9771
 #, c-format
 msgid "Could not mount %s"
 msgstr "Kunde inte montera %s"
@@ -1420,47 +1426,52 @@ msgstr "Sökvägen finns inte"
 msgid "File System"
 msgstr "Filsystem"
 
-#: ../gtk/gtkfontbutton.c:153
-#: ../gtk/gtkfontbutton.c:277
+#: ../gtk/gtkfontbutton.c:152
+#: ../gtk/gtkfontbutton.c:276
 msgid "Pick a Font"
 msgstr "Välj ett typsnitt"
 
 #. Initialize fields
-#: ../gtk/gtkfontbutton.c:271
+#: ../gtk/gtkfontbutton.c:270
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: ../gtk/gtkfontbutton.c:796
+#: ../gtk/gtkfontbutton.c:787
 msgid "Font"
 msgstr "Typsnitt"
 
+#: ../gtk/gtkfontchooser.c:670
+msgid "Search font name"
+msgstr "Sök efter typsnittsnamn"
+
+#: ../gtk/gtkfontchooserdialog.c:147
+#: ../gtk/gtkfontsel.c:1738
+msgid "Font Selection"
+msgstr "Typsnittsval"
+
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
-#: ../gtk/gtkfontsel.c:119
+#: ../gtk/gtkfontsel.c:125
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdefghijk ABCDEFGHIJK"
 
-#: ../gtk/gtkfontsel.c:388
+#: ../gtk/gtkfontsel.c:394
 msgid "_Family:"
 msgstr "_Familj:"
 
-#: ../gtk/gtkfontsel.c:395
+#: ../gtk/gtkfontsel.c:401
 msgid "_Style:"
 msgstr "_Stil:"
 
-#: ../gtk/gtkfontsel.c:402
+#: ../gtk/gtkfontsel.c:408
 msgid "Si_ze:"
 msgstr "S_torlek:"
 
 #. create the text entry widget
-#: ../gtk/gtkfontsel.c:579
+#: ../gtk/gtkfontsel.c:585
 msgid "_Preview:"
 msgstr "_Förhandsvisning:"
 
-#: ../gtk/gtkfontsel.c:1705
-msgid "Font Selection"
-msgstr "Typsnittsval"
-
 #: ../gtk/gtkicontheme.c:1605
 #, c-format
 msgid "Icon '%s' not present in theme"
@@ -1491,12 +1502,12 @@ msgid "System (%s)"
 msgstr "System (%s)"
 
 #. Open Link
-#: ../gtk/gtklabel.c:6309
+#: ../gtk/gtklabel.c:6293
 msgid "_Open Link"
 msgstr "_Öppna länk"
 
 #. Copy Link Address
-#: ../gtk/gtklabel.c:6321
+#: ../gtk/gtklabel.c:6305
 msgid "Copy _Link Address"
 msgstr "Kopiera _länkadress"
 
@@ -1667,8 +1678,8 @@ msgstr "Z Shell"
 msgid "Cannot end process with PID %d: %s"
 msgstr "Kan inte avsluta processen med PID %d: %s"
 
-#: ../gtk/gtknotebook.c:4904
-#: ../gtk/gtknotebook.c:7589
+#: ../gtk/gtknotebook.c:4902
+#: ../gtk/gtknotebook.c:7587
 #, c-format
 msgid "Page %u"
 msgstr "Sida %u"
@@ -1858,7 +1869,7 @@ msgstr "Slut på papper"
 
 #. Translators: this is a printer status.
 #: ../gtk/gtkprintoperation-win32.c:615
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2022
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2036
 msgid "Paused"
 msgstr "Pausad"
 
@@ -1987,42 +1998,42 @@ msgstr "Allmänt"
 #. * multiple pages on a sheet when printing
 #.
 #: ../gtk/gtkprintunixdialog.c:3109
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3572
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3586
 msgid "Left to right, top to bottom"
 msgstr "Vänster till höger, topp till botten"
 
 #: ../gtk/gtkprintunixdialog.c:3109
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3572
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3586
 msgid "Left to right, bottom to top"
 msgstr "Vänster till höger, botten till topp"
 
 #: ../gtk/gtkprintunixdialog.c:3110
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3573
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3587
 msgid "Right to left, top to bottom"
 msgstr "Höger till vänster, topp till botten"
 
 #: ../gtk/gtkprintunixdialog.c:3110
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3573
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3587
 msgid "Right to left, bottom to top"
 msgstr "Höger till vänster, botten till topp"
 
 #: ../gtk/gtkprintunixdialog.c:3111
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3574
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3588
 msgid "Top to bottom, left to right"
 msgstr "Topp till botten, vänster till höger"
 
 #: ../gtk/gtkprintunixdialog.c:3111
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3574
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3588
 msgid "Top to bottom, right to left"
 msgstr "Topp till botten, höger till vänster"
 
 #: ../gtk/gtkprintunixdialog.c:3112
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3575
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3589
 msgid "Bottom to top, left to right"
 msgstr "Botten till topp, vänster till höger"
 
 #: ../gtk/gtkprintunixdialog.c:3112
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3575
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3589
 msgid "Bottom to top, right to left"
 msgstr "Botten till topp, höger till vänster"
 
@@ -2031,7 +2042,7 @@ msgstr "Botten till topp, höger till vänster"
 #.
 #: ../gtk/gtkprintunixdialog.c:3116
 #: ../gtk/gtkprintunixdialog.c:3129
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3609
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3623
 msgid "Page Ordering"
 msgstr "Sidordning"
 
@@ -4060,255 +4071,255 @@ msgstr "Vietnamesisk (VIQR)"
 msgid "X Input Method"
 msgstr "X-inmatningsmetod"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:828
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1038
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:829
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1048
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:829
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1047
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:830
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1057
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:868
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1060
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:869
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1070
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
 msgstr "Autentisering krävs för att skriva ut dokumentet \"%s\" på skrivaren %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:870
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:871
 #, c-format
 msgid "Authentication is required to print a document on %s"
 msgstr "Autentisering krävs för att skriva ut ett dokument på %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:874
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:875
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
 msgstr "Autentisering krävs för att hämta attributen för jobbet \"%s\""
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:876
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:877
 msgid "Authentication is required to get attributes of a job"
 msgstr "Autentisering krävs för att hämta attributen för ett jobb"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:880
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:881
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
 msgstr "Autentisering krävs för att hämta attributen för skrivaren %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:882
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:883
 msgid "Authentication is required to get attributes of a printer"
 msgstr "Autentisering krävs för att hämta attributen för en skrivare"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:885
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:886
 #, c-format
 msgid "Authentication is required to get default printer of %s"
 msgstr "Autentisering krävs för att hämta standardskrivaren för %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:888
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:889
 #, c-format
 msgid "Authentication is required to get printers from %s"
 msgstr "Autentisering krävs för att hämta skrivare från %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:893
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:894
 #, c-format
 msgid "Authentication is required to get a file from %s"
 msgstr "Autentisering krävs för att hämta en fil från %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:895
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:896
 #, c-format
 msgid "Authentication is required on %s"
 msgstr "Autentisering krävs på %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1032
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1042
 msgid "Domain:"
 msgstr "Domän:"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1062
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1072
 #, c-format
 msgid "Authentication is required to print document '%s'"
 msgstr "Autentisering krävs för att skriva ut dokumentet \"%s\""
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1067
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1077
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
 msgstr "Autentisering krävs för att skriva ut detta dokument på skrivaren %s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1069
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1079
 msgid "Authentication is required to print this document"
 msgstr "Autentisering krävs för att skriva ut detta dokument"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1690
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1704
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "Skrivaren \"%s\" har snart slut på toner."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1691
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1705
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "Skrivaren \"%s\" har slut på toner."
 
 # FIXME: Kolla denna. Hittar inget bättre ord
 #. Translators: "Developer" like on photo development context
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1693
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1707
 #, c-format
 msgid "Printer '%s' is low on developer."
 msgstr "Skrivaren \"%s\" har snart slut på framkallningsmaterial."
 
 #. Translators: "Developer" like on photo development context
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1695
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1709
 #, c-format
 msgid "Printer '%s' is out of developer."
 msgstr "Skrivaren \"%s\" har slut på framkallningsmaterial."
 
 #. Translators: "marker" is one color bin of the printer
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1697
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1711
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
 msgstr "Skrivaren \"%s\" har snart slut på minst en färgpenna."
 
 #. Translators: "marker" is one color bin of the printer
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1699
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1713
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
 msgstr "Skrivaren \"%s\" har slut på minst en färgpenna."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1700
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1714
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "Luckan är öppen på skrivaren \"%s\"."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1701
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1715
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "Dörren är öppen på skrivaren \"%s\"."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1702
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1716
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "Skrivaren \"%s\" har snart slut på papper."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1703
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1717
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "Skrivaren \"%s\" har slut på papper."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1704
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1718
 #, c-format
 msgid "Printer '%s' is currently offline."
 msgstr "Skrivaren \"%s\" är för närvarande frånkopplad."
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:1705
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1719
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "Det har uppstått ett problem med skrivaren \"%s\"."
 
 #. Translators: this is a printer status.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2019
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2033
 msgid "Paused ; Rejecting Jobs"
 msgstr "Pausad ; Avvisar jobb"
 
 #. Translators: this is a printer status.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2025
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2039
 msgid "Rejecting Jobs"
 msgstr "Avvisar jobb"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2798
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2812
 msgid "Two Sided"
 msgstr "Tvåsidig"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2799
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2813
 msgid "Paper Type"
 msgstr "Papperstyp"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2800
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2814
 msgid "Paper Source"
 msgstr "Papperskälla"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2801
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2815
 msgid "Output Tray"
 msgstr "Utskriftsfack"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2802
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2816
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2803
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2817
 msgid "GhostScript pre-filtering"
 msgstr "GhostScript-förfiltrering"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2812
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2826
 msgid "One Sided"
 msgstr "Ensidigt"
 
 #. Translators: this is an option of "Two Sided"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2814
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2828
 msgid "Long Edge (Standard)"
 msgstr "LÃ¥ng kant (Standard)"
 
 #. Translators: this is an option of "Two Sided"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2816
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2830
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (Vänd)"
 
 #. Translators: this is an option of "Paper Source"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2818
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2820
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2828
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2832
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2834
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2842
 msgid "Auto Select"
 msgstr "Välj automatiskt"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2822
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2824
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2826
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2830
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3326
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2836
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2838
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2840
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2844
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3340
 msgid "Printer Default"
 msgstr "Skrivarens standard"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2832
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2846
 msgid "Embed GhostScript fonts only"
 msgstr "Endast inbäddade GhostScript-typsnitt"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2834
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2848
 msgid "Convert to PS level 1"
 msgstr "Konvertera till PS nivå 1"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2836
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2850
 msgid "Convert to PS level 2"
 msgstr "Konvertera till PS nivå 2"
 
 #. Translators: this is an option of "GhostScript"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:2838
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2852
 msgid "No pre-filtering"
 msgstr "Ingen förfiltrering"
 
 #. 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:2847
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2861
 msgid "Miscellaneous"
 msgstr "Diverse"
 
 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Urgent"
 msgstr "Viktigt"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "High"
 msgstr "Hög"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Medium"
 msgstr "Medel"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3567
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3581
 msgid "Low"
 msgstr "LÃ¥g"
 
@@ -4316,68 +4327,68 @@ msgstr "LÃ¥g"
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3593
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3607
 msgid "Pages per Sheet"
 msgstr "Sidor per blad"
 
 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3630
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3644
 msgid "Job Priority"
 msgstr "Jobbprioritet"
 
 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3641
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3655
 msgid "Billing Info"
 msgstr "Faktureringsinformation"
 
 #. Translators, these strings are names for various 'standard' cover
 #. * pages that the printing system may support.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "None"
 msgstr "Ingen"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Classified"
 msgstr "Klassificerat"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Confidential"
 msgstr "Konfidentiellt"
 
 # Se http://bugzilla.gnome.org/show_bug.cgi?id=148437 -- detta ska vara
 # "skärm"
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Secret"
 msgstr "Hemlig"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Standard"
 msgstr "Standard"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Top Secret"
 msgstr "Topphemligt"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3656
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3670
 msgid "Unclassified"
 msgstr "Inte klassificerat"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3691
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3705
 msgid "Before"
 msgstr "Före"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3706
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3720
 msgid "After"
 msgstr "Efter"
 
@@ -4385,14 +4396,14 @@ msgstr "Efter"
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3726
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3740
 msgid "Print at"
 msgstr "Skriv ut den"
 
 #. 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:3737
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3751
 msgid "Print at time"
 msgstr "Skriv ut klockan"
 
@@ -4400,17 +4411,17 @@ msgstr "Skriv ut klockan"
 #. * size. The two placeholders are replaced with the width and height
 #. * in points. E.g: "Custom 230.4x142.9"
 #.
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3772
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3786
 #, c-format
 msgid "Custom %sx%s"
 msgstr "Anpassad %sx%s"
 
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3853
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3867
 msgid "Printer Profile"
 msgstr "Skrivarprofil"
 
 #. TRANSLATORS: this is when color profile information is unavailable
-#: ../modules/printbackends/cups/gtkprintbackendcups.c:3860
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3874
 msgid "Unavailable"
 msgstr "Inte tillgänglig"
 
@@ -4512,30 +4523,21 @@ msgstr "testutdata.%s"
 msgid "Print to Test Printer"
 msgstr "Skriv ut till testskrivare"
 
-#: ../tests/testfilechooser.c:207
-#, c-format
-msgid "Could not get information for file '%s': %s"
-msgstr "Kunde inte hämta information för filen \"%s\": %s"
-
-#: ../tests/testfilechooser.c:222
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Misslyckades med att öppna filen \"%s\": %s"
-
-#: ../tests/testfilechooser.c:267
-#, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "Misslyckades med att läsa in bilden \"%s\": anledningen är okänd, troligtvis en trasig bildfil"
-
+#~ msgid "Could not get information for file '%s': %s"
+#~ msgstr "Kunde inte hämta information för filen \"%s\": %s"
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Misslyckades med att öppna filen \"%s\": %s"
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "Misslyckades med att läsa in bilden \"%s\": anledningen är okänd, "
+#~ "troligtvis en trasig bildfil"
 #~ msgid "Received invalid color data\n"
 #~ msgstr "Mottog ogiltig färgdata\n"
-
 #~ msgid "_Browse for other folders"
 #~ msgstr "_Bläddra efter andra mappar"
-
 #~ msgid "Error loading icon: %s"
 #~ msgstr "Fel vid inläsning av ikonen: %s"
-
 #~ msgid ""
 #~ "Could not find the icon '%s'. The '%s' theme\n"
 #~ "was not found either, perhaps you need to install it.\n"
@@ -4546,55 +4548,38 @@ msgstr "Misslyckades med att läsa in bilden \"%s\": anledningen är okänd, tro
 #~ "kunde inte heller hittas. Du kanske måste installera det.\n"
 #~ "Du kan få tag i en kopia från:\n"
 #~ "\t%s"
-
 #~ msgid "Unable to locate image file in pixmap_path: \"%s\""
 #~ msgstr "Kan inte hitta bildfil i \"pixmap_path\": \"%s\""
-
 #~ msgid "This function is not implemented for widgets of class '%s'"
 #~ msgstr "Denna funktion är inte implementerad för widgetar av klassen \"%s\""
-
 #~ msgid "different idatas found for symlinked '%s' and '%s'\n"
 #~ msgstr "olika idata hittades för symboliska länkade \"%s\" och \"%s\"\n"
-
 #~ msgid "Select A File"
 #~ msgstr "Välj en fil"
-
 #~ msgid "_Add"
 #~ msgstr "_Lägg till"
-
 #~ msgid "_Remove"
 #~ msgstr "_Ta bort"
-
 #~ msgid "_Open"
 #~ msgstr "_Öppna"
-
 #~ msgid "X screen to use"
 #~ msgstr "X-skärm att använda"
-
 #~ msgid "SCREEN"
 #~ msgstr "SKÄRM"
-
 #~ msgid "Make X calls synchronous"
 #~ msgstr "Gör X-anrop synkrona"
-
 #~ msgid "Credits"
 #~ msgstr "Tack"
-
 #~ msgid "Written by"
 #~ msgstr "Skrivet av"
-
 #~ msgid "Error creating folder '%s': %s"
 #~ msgstr "Fel vid skapande av mappen \"%s\": %s"
-
 #~ msgid "Unable to find include file: \"%s\""
 #~ msgstr "Kan inte hitta inkluderingsfil: \"%s\""
-
 #~ msgid "Unable to locate theme engine in module_path: \"%s\","
 #~ msgstr "Kan inte hitta temamotorn i \"module_path\": \"%s\","
-
 #~ msgid "Gdk debugging flags to set"
 #~ msgstr "Gdk-felsökningsflaggor att ställa in"
-
 #~ msgid "Gdk debugging flags to unset"
 #~ msgstr "Gdk-felsökningsflaggor att inte ställa in"
 
@@ -5290,717 +5275,495 @@ msgstr "Misslyckades med att läsa in bilden \"%s\": anledningen är okänd, tro
 #, fuzzy
 #~ msgid "Icon not present in theme"
 #~ msgstr "Ikonen \"%s\" finns inte i temat"
-
 #~ msgid "progress bar label|%d %%"
 #~ msgstr "%d %%"
-
 #~ msgid "input method menu|System"
 #~ msgstr "System"
 
 #, fuzzy
 #~ msgid "input method menu|System (%s)"
 #~ msgstr "System"
-
 #~ msgid "print operation status|Initial state"
 #~ msgstr "Initialt tillstånd"
-
 #~ msgid "print operation status|Preparing to print"
 #~ msgstr "Förbereder för utskrift"
-
 #~ msgid "print operation status|Generating data"
 #~ msgstr "Genererar data"
-
 #~ msgid "print operation status|Sending data"
 #~ msgstr "Skickar data"
-
 #~ msgid "print operation status|Waiting"
 #~ msgstr "Väntar"
-
 #~ msgid "print operation status|Blocking on issue"
 #~ msgstr "Blockerar vid problem"
-
 #~ msgid "print operation status|Printing"
 #~ msgstr "Skriver ut"
-
 #~ msgid "print operation status|Finished"
 #~ msgstr "Färdig"
-
 #~ msgid "recent menu label|_%d. %s"
 #~ msgstr "_%d. %s"
-
 #~ msgid "recent menu label|%d. %s"
 #~ msgstr "%d. %s"
-
 #~ msgid "Navigation|_Bottom"
 #~ msgstr "_Nederst"
-
 #~ msgid "Navigation|_First"
 #~ msgstr "_Första"
-
 #~ msgid "Navigation|_Last"
 #~ msgstr "_Sista"
-
 #~ msgid "Navigation|_Top"
 #~ msgstr "_Överst"
-
 #~ msgid "Navigation|_Back"
 #~ msgstr "_Bakåt"
-
 #~ msgid "Navigation|_Down"
 #~ msgstr "N_ed"
-
 #~ msgid "Navigation|_Forward"
 #~ msgstr "_Framåt"
-
 #~ msgid "Navigation|_Up"
 #~ msgstr "_Upp"
-
 #~ msgid "Justify|_Center"
 #~ msgstr "_Centrera"
-
 #~ msgid "Justify|_Fill"
 #~ msgstr "_Fyll"
-
 #~ msgid "Justify|_Left"
 #~ msgstr "_Vänster"
-
 #~ msgid "Justify|_Right"
 #~ msgstr "_Höger"
-
 #~ msgid "Media|_Next"
 #~ msgstr "_Nästa"
-
 #~ msgid "Media|P_ause"
 #~ msgstr "Gör _paus"
-
 #~ msgid "Media|_Play"
 #~ msgstr "_Spela upp"
-
 #~ msgid "Media|Pre_vious"
 #~ msgstr "Före_gående"
-
 #~ msgid "Media|_Record"
 #~ msgstr "Spela _in"
-
 #~ msgid "Media|R_ewind"
 #~ msgstr "Spola _bakåt"
-
 #~ msgid "Media|_Stop"
 #~ msgstr "_Stopp"
-
 #~ msgid "volume percentage|%d %%"
 #~ msgstr "%d %%"
-
 #~ msgid "paper size|asme_f"
 #~ msgstr "asme_f"
-
 #~ msgid "paper size|A0x2"
 #~ msgstr "A0x2"
-
 #~ msgid "paper size|A0"
 #~ msgstr "A0"
-
 #~ msgid "paper size|A0x3"
 #~ msgstr "A0x3"
-
 #~ msgid "paper size|A1"
 #~ msgstr "A1"
-
 #~ msgid "paper size|A10"
 #~ msgstr "A10"
-
 #~ msgid "paper size|A1x3"
 #~ msgstr "A1x3"
-
 #~ msgid "paper size|A1x4"
 #~ msgstr "A1x4"
-
 #~ msgid "paper size|A2"
 #~ msgstr "A2"
-
 #~ msgid "paper size|A2x3"
 #~ msgstr "A2x3"
-
 #~ msgid "paper size|A2x4"
 #~ msgstr "A2x4"
-
 #~ msgid "paper size|A2x5"
 #~ msgstr "A2x5"
-
 #~ msgid "paper size|A3"
 #~ msgstr "A3"
-
 #~ msgid "paper size|A3 Extra"
 #~ msgstr "A3 Extra"
-
 #~ msgid "paper size|A3x3"
 #~ msgstr "A3x3"
-
 #~ msgid "paper size|A3x4"
 #~ msgstr "A3x4"
-
 #~ msgid "paper size|A3x5"
 #~ msgstr "A3x5"
-
 #~ msgid "paper size|A3x6"
 #~ msgstr "A3x6"
-
 #~ msgid "paper size|A3x7"
 #~ msgstr "A3x7"
-
 #~ msgid "paper size|A4"
 #~ msgstr "A4"
-
 #~ msgid "paper size|A4 Extra"
 #~ msgstr "A4 Extra"
-
 #~ msgid "paper size|A4 Tab"
 #~ msgstr "A4 Tab"
-
 #~ msgid "paper size|A4x3"
 #~ msgstr "A4x3"
-
 #~ msgid "paper size|A4x4"
 #~ msgstr "A4x4"
-
 #~ msgid "paper size|A4x5"
 #~ msgstr "A4x5"
-
 #~ msgid "paper size|A4x6"
 #~ msgstr "A4x6"
-
 #~ msgid "paper size|A4x7"
 #~ msgstr "A4x7"
-
 #~ msgid "paper size|A4x8"
 #~ msgstr "A4x8"
-
 #~ msgid "paper size|A4x9"
 #~ msgstr "A4x9"
-
 #~ msgid "paper size|A5"
 #~ msgstr "A5"
-
 #~ msgid "paper size|A5 Extra"
 #~ msgstr "A5 Extra"
-
 #~ msgid "paper size|A6"
 #~ msgstr "A6"
-
 #~ msgid "paper size|A7"
 #~ msgstr "A7"
-
 #~ msgid "paper size|A8"
 #~ msgstr "A8"
-
 #~ msgid "paper size|A9"
 #~ msgstr "A9"
-
 #~ msgid "paper size|B0"
 #~ msgstr "B0"
-
 #~ msgid "paper size|B1"
 #~ msgstr "B1"
-
 #~ msgid "paper size|B10"
 #~ msgstr "B10"
-
 #~ msgid "paper size|B2"
 #~ msgstr "B2"
-
 #~ msgid "paper size|B3"
 #~ msgstr "B3"
-
 #~ msgid "paper size|B4"
 #~ msgstr "B4"
-
 #~ msgid "paper size|B5"
 #~ msgstr "B5"
-
 #~ msgid "paper size|B5 Extra"
 #~ msgstr "B5 Extra"
-
 #~ msgid "paper size|B6"
 #~ msgstr "B6"
-
 #~ msgid "paper size|B6/C4"
 #~ msgstr "B6/C4"
-
 #~ msgid "paper size|B7"
 #~ msgstr "B7"
-
 #~ msgid "paper size|B8"
 #~ msgstr "B8"
-
 #~ msgid "paper size|B9"
 #~ msgstr "B9"
-
 #~ msgid "paper size|C0"
 #~ msgstr "C0"
-
 #~ msgid "paper size|C1"
 #~ msgstr "C1"
-
 #~ msgid "paper size|C10"
 #~ msgstr "C10"
-
 #~ msgid "paper size|C2"
 #~ msgstr "C2"
-
 #~ msgid "paper size|C3"
 #~ msgstr "C3"
-
 #~ msgid "paper size|C4"
 #~ msgstr "C4"
-
 #~ msgid "paper size|C5"
 #~ msgstr "C5"
-
 #~ msgid "paper size|C6"
 #~ msgstr "C6"
-
 #~ msgid "paper size|C6/C5"
 #~ msgstr "C6/C5"
-
 #~ msgid "paper size|C7"
 #~ msgstr "C7"
-
 #~ msgid "paper size|C7/C6"
 #~ msgstr "C7/C6"
-
 #~ msgid "paper size|C8"
 #~ msgstr "C8"
-
 #~ msgid "paper size|C9"
 #~ msgstr "C9"
-
 #~ msgid "paper size|RA0"
 #~ msgstr "RA0"
-
 #~ msgid "paper size|RA1"
 #~ msgstr "RA1"
-
 #~ msgid "paper size|RA2"
 #~ msgstr "RA2"
-
 #~ msgid "paper size|SRA0"
 #~ msgstr "SRA0"
-
 #~ msgid "paper size|SRA1"
 #~ msgstr "SRA1"
-
 #~ msgid "paper size|SRA2"
 #~ msgstr "SRA2"
-
 #~ msgid "paper size|JB0"
 #~ msgstr "JB0"
-
 #~ msgid "paper size|JB1"
 #~ msgstr "JB1"
-
 #~ msgid "paper size|JB10"
 #~ msgstr "JB10"
-
 #~ msgid "paper size|JB2"
 #~ msgstr "JB2"
-
 #~ msgid "paper size|JB3"
 #~ msgstr "JB3"
-
 #~ msgid "paper size|JB4"
 #~ msgstr "JB4"
-
 #~ msgid "paper size|JB5"
 #~ msgstr "JB5"
-
 #~ msgid "paper size|JB6"
 #~ msgstr "JB6"
-
 #~ msgid "paper size|JB7"
 #~ msgstr "JB7"
-
 #~ msgid "paper size|JB8"
 #~ msgstr "JB8"
-
 #~ msgid "paper size|JB9"
 #~ msgstr "JB9"
-
 #~ msgid "paper size|jis exec"
 #~ msgstr "jis exec"
-
 #~ msgid "paper size|10x11"
 #~ msgstr "10x11"
-
 #~ msgid "paper size|10x13"
 #~ msgstr "10x13"
-
 #~ msgid "paper size|10x14"
 #~ msgstr "10x14"
-
 #~ msgid "paper size|10x15"
 #~ msgstr "10x15"
-
 #~ msgid "paper size|11x12"
 #~ msgstr "11x12"
-
 #~ msgid "paper size|11x15"
 #~ msgstr "11x15"
-
 #~ msgid "paper size|12x19"
 #~ msgstr "12x19"
-
 #~ msgid "paper size|5x7"
 #~ msgstr "5x7"
-
 #~ msgid "paper size|Arch A"
 #~ msgstr "Arch A"
-
 #~ msgid "paper size|Arch B"
 #~ msgstr "Arch B"
-
 #~ msgid "paper size|Arch C"
 #~ msgstr "Arch C"
-
 #~ msgid "paper size|Arch D"
 #~ msgstr "Arch D"
-
 #~ msgid "paper size|Arch E"
 #~ msgstr "Arch E"
-
 #~ msgid "paper size|b-plus"
 #~ msgstr "b-plus"
-
 #~ msgid "paper size|c"
 #~ msgstr "c"
-
 #~ msgid "paper size|d"
 #~ msgstr "d"
-
 #~ msgid "paper size|e"
 #~ msgstr "e"
-
 #~ msgid "paper size|edp"
 #~ msgstr "edp"
-
 #~ msgid "paper size|Executive"
 #~ msgstr "Executive"
-
 #~ msgid "paper size|f"
 #~ msgstr "f"
-
 #~ msgid "paper size|Index 3x5"
 #~ msgstr "Index 3x5"
-
 #~ msgid "paper size|Index 5x8"
 #~ msgstr "Index 5x8"
-
 #~ msgid "paper size|Invoice"
 #~ msgstr "Faktura"
-
 #~ msgid "paper size|Tabloid"
 #~ msgstr "Tabloid"
-
 #~ msgid "paper size|US Legal"
 #~ msgstr "US Legal"
-
 #~ msgid "paper size|Quarto"
 #~ msgstr "Quarto"
-
 #~ msgid "paper size|Super A"
 #~ msgstr "Super A"
-
 #~ msgid "paper size|Super B"
 #~ msgstr "Super B"
-
 #~ msgid "paper size|Folio"
 #~ msgstr "Folio"
-
 #~ msgid "paper size|Folio sp"
 #~ msgstr "Folio sp"
-
 #~ msgid "paper size|pa-kai"
 #~ msgstr "pa-kai"
-
 #~ msgid "paper size|prc 16k"
 #~ msgstr "prc 16k"
-
 #~ msgid "paper size|prc 32k"
 #~ msgstr "prc 32k"
-
 #~ msgid "paper size|prc5 Envelope"
 #~ msgstr "prc5-kuvert"
-
 #~ msgid "paper size|ROC 16k"
 #~ msgstr "ROC 16k"
-
 #~ msgid "paper size|ROC 8k"
 #~ msgstr "ROC 8k"
-
 #~ msgid "Couldn't create pixbuf"
 #~ msgstr "Kunde inte skapa pixbuf"
-
 #~ msgid "%.1f KB"
 #~ msgstr "%.1f KB"
-
 #~ msgid "%.1f MB"
 #~ msgstr "%.1f MB"
-
 #~ msgid "%.1f GB"
 #~ msgstr "%.1f GB"
-
 #~ msgid "Arrow spacing"
 #~ msgstr "Pilmellanrum"
-
 #~ msgid "Scroll arrow spacing"
 #~ msgstr "Rullpilsmellanrum"
-
 #~ msgid "Group"
 #~ msgstr "Grupp"
-
 #~ msgid "The radio tool button whose group this button belongs to."
 #~ msgstr "Den radioverktygsknapp vars grupp denna knapp tillhör."
-
 #~ msgid "URI"
 #~ msgstr "URI"
-
 #~ msgid "The URI bound to this button"
 #~ msgstr "URI bundet till denna knapp"
-
 #~ msgid "Invalid filename: %s"
 #~ msgstr "Ogiltigt filnamn: %s"
-
 #~ msgid ""
 #~ "Could not add a bookmark for '%s' because it is an invalid path name."
 #~ msgstr ""
 #~ "Kunde inte lägga till ett bokmärke för \"%s\" eftersom det är ett "
 #~ "ogiltigt namn på en sökväg."
-
 #~ msgid "Could not select file '%s' because it is an invalid path name."
 #~ msgstr ""
 #~ "Kunde inte välja filen \"%s\" eftersom det är ett ogiltigt namn på en "
 #~ "sökväg."
-
 #~ msgid "%d byte"
-
 #~ msgid_plural "%d bytes"
 #~ msgstr[0] "%d byte"
 #~ msgstr[1] "%d byte"
-
 #~ msgid "Could not get a stock icon for %s\n"
 #~ msgstr "Kunde inte hämta en standardikon för %s\n"
-
 #~ msgid "Error getting information for '%s': %s"
 #~ msgstr "Fel vid hämtning av information för \"%s\": %s"
-
 #~ msgid "This file system does not support mounting"
 #~ msgstr "Detta filsystem stöder inte montering"
-
 #~ msgid ""
 #~ "The name \"%s\" is not valid because it contains the character \"%s\". "
 #~ "Please use a different name."
 #~ msgstr ""
 #~ "Namnet \"%s\" är inte giltigt eftersom det innehåller tecknet \"%s\". "
 #~ "Använd ett annat namn."
-
 #~ msgid "Bookmark saving failed: %s"
 #~ msgstr "Bokmärkessparande misslyckades: %s"
-
 #~ msgid "'%s' already exists in the bookmarks list"
 #~ msgstr "\"%s\" finns redan i bokmärkeslistan"
-
 #~ msgid "'%s' does not exist in the bookmarks list"
 #~ msgstr "\"%s\" finns inte i bokmärkeslistan"
-
 #~ msgid "Path is not a folder: '%s'"
 #~ msgstr "Sökvägen är inte en mapp: \"%s\""
-
 #~ msgid "Network Drive (%s)"
 #~ msgstr "Nätverksenhet (%s)"
-
 #~ msgid "Unknown attribute '%s' on line %d char %d"
 #~ msgstr "Okänt attribut \"%s\" på rad %d tecken %d"
-
 #~ msgid "Today at %H:%M"
 #~ msgstr "Idag klockan %H.%M"
-
 #~ msgid "Default"
 #~ msgstr "Standard"
-
 #~ msgid "_All"
 #~ msgstr "_Alla"
-
 #~ msgid "Today"
 #~ msgstr "Idag"
-
 #~ msgid "Location:"
 #~ msgstr "Plats:"
-
 #~ msgid "PNM image format is invalid"
 #~ msgstr "PNM-bildformatet är ogiltigt"
-
 #~ msgid "Line %d, column %d: missing attribute \"%s\""
 #~ msgstr "Rad %d, kolumn %d: saknar attributet \"%s\""
-
 #~ msgid "Line %d, column %d: unexpected element \"%s\""
 #~ msgstr "Rad %d, kolumn %d: oväntat element \"%s\""
-
 #~ msgid ""
 #~ "Line %d, column %d: expected end of element \"%s\", but got element for "
 #~ "\"%s\" instead"
 #~ msgstr ""
 #~ "Rad %d, kolumn %d: förväntade slut på elementet \"%s\", men fick element "
 #~ "för \"%s\" istället"
-
 #~ msgid ""
 #~ "Line %d, column %d: expected \"%s\" at the toplevel, but found \"%s\" "
 #~ "instead"
 #~ msgstr ""
 #~ "Rad %d, kolumn %d: förväntade \"%s\" på toppnivån, men hittade \"%s\" "
 #~ "istället"
-
 #~ msgid ""
 #~ "Line %d, column %d: expected \"%s\" or \"%s\", but found \"%s\" instead"
 #~ msgstr ""
 #~ "Rad %d, kolumn %d: förväntade \"%s\" eller \"%s\", men hittade \"%s\" "
 #~ "istället"
-
 #~ msgid "Error creating directory '%s': %s"
 #~ msgstr "Fel vid skapande av katalogen \"%s\": %s"
-
 #~ msgid "Thai (Broken)"
 #~ msgstr "Thailändsk (Trasig)"
-
 #~ msgid ""
 #~ "Error creating folder \"%s\": %s\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Fel vid skapande av mappen \"%s\": %s\n"
 #~ "%s"
-
 #~ msgid "You probably used symbols not allowed in filenames."
 #~ msgstr "Du använde troligen tecken som inte är tillåtna i filnamn."
-
 #~ msgid ""
 #~ "Error deleting file \"%s\": %s\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Fel vid borttagning av filen \"%s\": %s\n"
 #~ "%s"
-
 #~ msgid "It probably contains symbols not allowed in filenames."
 #~ msgstr "Det innehåller troligen tecken som inte är tillåtna i filnamn."
-
 #~ msgid ""
 #~ "The file name \"%s\" contains symbols that are not allowed in filenames"
 #~ msgstr "Filnamnet \"%s\" innehåller tecken som inte är tillåtna i filnamn"
-
 #~ msgid "Error getting information for '/': %s"
 #~ msgstr "Fel vid hämtning av information för \"/\": %s"
-
 #~ msgid "Select All"
 #~ msgstr "Markera allt"
 
 #, fuzzy
 #~ msgid "shortcut %s already exists"
 #~ msgstr "Genvägen %s finns inte"
-
 #~ msgid "Cannot handle PNM files with maximum color values greater than 255"
 #~ msgstr "Kan inte hantera PNM-filer med maximala färgvärden större än 255"
-
 #~ msgid "Could not get information about '%s': %s"
 #~ msgstr "Kunde inte hämta information om \"%s\": %s"
-
 #~ msgid "Shortcuts"
 #~ msgstr "Genvägar"
-
 #~ msgid "Folder"
 #~ msgstr "Mapp"
-
 #~ msgid "Cannot change folder"
 #~ msgstr "Kan inte byta mapp"
-
 #~ msgid "The folder you specified is an invalid path."
 #~ msgstr "Mappen du angav är en ogiltig sökväg."
-
 #~ msgid "Could not build file name from '%s' and '%s'"
 #~ msgstr "Kunde inte bygga filnamnet från \"%s\" och \"%s\""
-
 #~ msgid "Save in Location"
 #~ msgstr "Spara på plats"
-
 #~ msgid "X"
 #~ msgstr "X"
-
 #~ msgid "clear"
 #~ msgstr "töm"
-
 #~ msgid "Pixmap path element: \"%s\" must be absolute, %s, line %d"
 #~ msgstr "Sökvägselement till bild: \"%s\" måste vara absolut, %s, rad %d"
-
 #~ msgid "_Rename..."
 #~ msgstr "_Byt namn..."
-
 #~ msgid "Rename"
 #~ msgstr "Byt namn"
-
 #~ msgid "_Replace..."
 #~ msgstr "_Ersätt..."
-
 #~ msgid "Replace..."
 #~ msgstr "Ersätt..."
-
 #~ msgid "File system"
 #~ msgstr "Filsystem"
 
 #, fuzzy
 #~ msgid "Writing %s failed: %s"
 #~ msgstr "Bokmärkessparande misslyckades: %s"
-
 #~ msgid "Network Drive"
 #~ msgstr "Nätverksenhet"
-
 #~ msgid "_Credits"
 #~ msgstr "_Tack"
-
 #~ msgid "Error getting information for '%s'"
 #~ msgstr "Fel vid hämtning av information för \"%s\""
-
 #~ msgid "error getting information for '%s': %s"
 #~ msgstr "fel vid hämtning av information för \"%s\": %s"
-
 #~ msgid "error creating directory '%s': %s"
 #~ msgstr "fel vid skapande av katalogen \"%s\": %s"
-
 #~ msgid "Bookmark saving failed (%s)"
 #~ msgstr "Bokmärkessparande misslyckades (%s)"
-
 #~ msgid "This file system does not support icons for everything"
 #~ msgstr "Detta filsystem stöder inte ikoner till allt"
-
 #~ msgid ""
 #~ "Could not change the current folder to %s:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Kunde inte byta aktuell mapp till %s:\n"
 #~ "%s"
-
 #~ msgid "Could not add bookmark for %s because it is not a folder."
 #~ msgstr "Kunde inte lägga till bokmärke för %s eftersom det inte är en mapp."
-
 #~ msgid "Input Methods"
 #~ msgstr "Inmatningsmetoder"
-
 #~ msgid "Unsupported TIFF variant"
 #~ msgstr "TIFF-varianten stöds inte"
-
 #~ msgid "Colors"
 #~ msgstr "Färger"
-
 #~ msgid "Show Hidden Files"
 #~ msgstr "Visa dolda filer"
-
 #~ msgid "Create Folder"
 #~ msgstr "Skapa _mapp"
-
 #~ msgid "Create _Folder"
 #~ msgstr "Skapa _mapp"
+
diff --git a/tests/a11y/appchooser.txt b/tests/a11y/appchooser.txt
index 1a68ab35ca..7ee2fcc41c 100644
--- a/tests/a11y/appchooser.txt
+++ b/tests/a11y/appchooser.txt
@@ -378,7 +378,7 @@ Click "Show other applications", for more options, or "Find applications online"
         parent: unnamed-GtkBoxAccessible-12
         index: 0
         name: Select
-        state: enabled focusable sensitive showing visible default
+        state: focusable showing visible default
         toolkit: gtk
         <AtkComponent>
         layer: widget
diff --git a/tests/a11y/colorchooser.txt b/tests/a11y/colorchooser.txt
index cdd5ffb36e..88f75c9338 100644
--- a/tests/a11y/colorchooser.txt
+++ b/tests/a11y/colorchooser.txt
@@ -130,7 +130,7 @@ window1
             "panel"
             parent: unnamed-GtkBoxAccessible-11
             index: 0
-            state: enabled sensitive showing visible
+            state: enabled horizontal sensitive showing visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
@@ -726,7 +726,7 @@ window1
                                   wrap-mode: word
               <AtkAction>
               action 0 name: activate
-              action 0 keybinding: <Alt>s
+              action 0 keybinding: <Alt>a
               <AtkValue>
               minimum value: 0.000000
               maximum value: 100.000000
@@ -914,7 +914,7 @@ window1
               "panel"
               parent: unnamed-GtkBoxAccessible-15
               index: 1
-              state: enabled sensitive visible
+              state: enabled horizontal sensitive visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
@@ -1329,18 +1329,18 @@ window1
         "push button"
         parent: unnamed-GtkBoxAccessible-57
         index: 1
-        name: OK
+        name: Select
         state: enabled focusable sensitive showing visible default
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
         <AtkImage>
-        image size: 20 x 20
+        image size: -1 x -1
         image description: (null)
         <AtkAction>
         action 0 name: click
-        action 0 keybinding: <Alt>o
+        action 0 keybinding: <Alt>s
       unnamed-GtkButtonAccessible-60
         "push button"
         parent: unnamed-GtkBoxAccessible-57
diff --git a/tests/css/Makefile.am b/tests/css/Makefile.am
index aeada80b30..f14e7b59b2 100644
--- a/tests/css/Makefile.am
+++ b/tests/css/Makefile.am
@@ -1 +1,22 @@
+include $(top_srcdir)/Makefile.decl
+
 SUBDIRS = parser
+
+check_PROGRAMS = $(TEST_PROGS)
+
+AM_CPPFLAGS =				\
+	-I$(top_srcdir)                 \
+	-I$(top_builddir)/gdk           \
+	-I$(top_srcdir)/gdk             \
+	-DGDK_DISABLE_DEPRECATED        \
+	-DGTK_DISABLE_DEPRECATED        \
+	-DGTK_VERSION=\"$(GTK_VERSION)\"\
+	$(GTK_DEBUG_FLAGS)              \
+	$(GTK_DEP_CFLAGS)
+
+LDADD = \
+	$(top_builddir)/gdk/libgdk-3.la \
+	$(top_builddir)/gtk/libgtk-3.la \
+	$(GTK_DEP_LIBS)
+
+TEST_PROGS += api 
diff --git a/tests/css/api.c b/tests/css/api.c
new file mode 100644
index 0000000000..a7c93dc4b2
--- /dev/null
+++ b/tests/css/api.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2011 Canonical Inc.
+ *
+ * Author:
+ *      Michael Terry <michael.terry@canonical.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <gtk/gtk.h>
+
+static void
+gtk_css_provider_load_data_not_null_terminated (void)
+{
+  GtkCssProvider *p;
+  const gchar data[3] = {'*', '{', '}'};
+
+  p = gtk_css_provider_new();
+
+  gtk_css_provider_load_from_data(p, data, sizeof (data), NULL);
+
+  g_object_unref (p);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  gtk_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/gtk_css_provider_load_data/not_null_terminated",
+      gtk_css_provider_load_data_not_null_terminated);
+
+  return g_test_run ();
+}
+
diff --git a/tests/css/parser/test-css-parser.c b/tests/css/parser/test-css-parser.c
index 6329a20c39..60f77ded27 100644
--- a/tests/css/parser/test-css-parser.c
+++ b/tests/css/parser/test-css-parser.c
@@ -134,21 +134,16 @@ append_error_value (GString *string,
 
 static void
 parsing_error_cb (GtkCssProvider *provider,
-                  const gchar     *path,
-                  guint            line,
-                  guint            position,
-                  const GError *   error,
-                  GString *        errors)
+                  GtkCssSection  *section,
+                  const GError   *error,
+                  GString        *errors)
 {
   char *basename;
 
-  g_assert (path);
-  g_assert (line > 0);
-
-  basename = g_path_get_basename (path);
+  basename = g_file_get_basename (gtk_css_section_get_file (section));
   g_string_append_printf (errors,
                           "%s:%u: error: ",
-                          basename, line);
+                          basename, gtk_css_section_get_end_line (section) + 1);
   g_free (basename);
                           
   if (error->domain == GTK_CSS_PROVIDER_ERROR)
diff --git a/tests/prop-editor.c b/tests/prop-editor.c
index df983dc52e..a12b77cf08 100644
--- a/tests/prop-editor.c
+++ b/tests/prop-editor.c
@@ -35,13 +35,13 @@ static void
 disconnect_func (gpointer data)
 {
   DisconnectData *dd = data;
-  
+
   g_signal_handler_disconnect (dd->instance, dd->id);
 }
 
 static void
 signal_removed (gpointer  data,
-		GClosure *closure)
+                GClosure *closure)
 {
   DisconnectData *dd = data;
 
@@ -58,13 +58,13 @@ is_child_property (GParamSpec *pspec)
 static void
 mark_child_property (GParamSpec *pspec)
 {
-  g_param_spec_set_qdata (pspec, g_quark_from_string ("is-child-prop"), 
-			  GINT_TO_POINTER (TRUE));
+  g_param_spec_set_qdata (pspec, g_quark_from_string ("is-child-prop"),
+                          GINT_TO_POINTER (TRUE));
 }
 
 static void
 g_object_connect_property (GObject     *object,
-			   GParamSpec  *spec,
+                           GParamSpec  *spec,
                            GCallback    func,
                            gpointer     data,
                            GObject     *alive_object)
@@ -85,20 +85,20 @@ g_object_connect_property (GObject     *object,
   g_closure_add_invalidate_notifier (closure, dd, signal_removed);
 
   dd->id = g_signal_connect_closure (object, with_detail,
-				     closure, FALSE);
+                                     closure, FALSE);
 
   dd->instance = object;
   dd->alive_object = alive_object;
-  
+
   g_object_set_data_full (G_OBJECT (alive_object),
                           "alive-object-data",
                           dd,
                           disconnect_func);
-  
+
   g_free (with_detail);
 }
 
-typedef struct 
+typedef struct
 {
   GObject *obj;
   GParamSpec *spec;
@@ -115,7 +115,7 @@ static void
 connect_controller (GObject     *controller,
                     const gchar *signal,
                     GObject     *model,
-		    GParamSpec  *spec,
+                    GParamSpec  *spec,
                     GCallback    func)
 {
   ObjectProperty *p;
@@ -125,8 +125,8 @@ connect_controller (GObject     *controller,
   p->spec = spec;
 
   p->modified_id = g_signal_connect_data (controller, signal, func, p,
-					  (GClosureNotify)free_object_property,
-					  0);
+                                          (GClosureNotify)free_object_property,
+                                          0);
   g_object_set_data (controller, "object-property", p);
 }
 
@@ -158,8 +158,8 @@ int_modified (GtkAdjustment *adj, gpointer data)
       GtkWidget *widget = GTK_WIDGET (p->obj);
       GtkWidget *parent = gtk_widget_get_parent (widget);
 
-      gtk_container_child_set (GTK_CONTAINER (parent), 
-			       widget, p->spec->name, (int) gtk_adjustment_get_value (adj), NULL);
+      gtk_container_child_set (GTK_CONTAINER (parent),
+                               widget, p->spec->name, (int) gtk_adjustment_get_value (adj), NULL);
     }
   else
     g_object_set (p->obj, p->spec->name, (int) gtk_adjustment_get_value (adj), NULL);
@@ -174,7 +174,7 @@ get_property_value (GObject *object, GParamSpec *pspec, GValue *value)
       GtkWidget *parent = gtk_widget_get_parent (widget);
 
       gtk_container_child_get_property (GTK_CONTAINER (parent),
-					widget, pspec->name, value);
+                                        widget, pspec->name, value);
     }
   else
     g_object_get_property (object, pspec->name, value);
@@ -184,7 +184,7 @@ static void
 int_changed (GObject *object, GParamSpec *pspec, gpointer data)
 {
   GtkAdjustment *adj = GTK_ADJUSTMENT (data);
-  GValue val = { 0, };  
+  GValue val = { 0, };
 
   g_value_init (&val, G_TYPE_INT);
 
@@ -210,8 +210,8 @@ uint_modified (GtkAdjustment *adj, gpointer data)
       GtkWidget *widget = GTK_WIDGET (p->obj);
       GtkWidget *parent = gtk_widget_get_parent (widget);
 
-      gtk_container_child_set (GTK_CONTAINER (parent), 
-			       widget, p->spec->name, (guint) gtk_adjustment_get_value (adj), NULL);
+      gtk_container_child_set (GTK_CONTAINER (parent),
+                               widget, p->spec->name, (guint) gtk_adjustment_get_value (adj), NULL);
     }
   else
     g_object_set (p->obj, p->spec->name, (guint) gtk_adjustment_get_value (adj), NULL);
@@ -221,7 +221,7 @@ static void
 uint_changed (GObject *object, GParamSpec *pspec, gpointer data)
 {
   GtkAdjustment *adj = GTK_ADJUSTMENT (data);
-  GValue val = { 0, };  
+  GValue val = { 0, };
 
   g_value_init (&val, G_TYPE_UINT);
   get_property_value (object, pspec, &val);
@@ -246,8 +246,8 @@ float_modified (GtkAdjustment *adj, gpointer data)
       GtkWidget *widget = GTK_WIDGET (p->obj);
       GtkWidget *parent = gtk_widget_get_parent (widget);
 
-      gtk_container_child_set (GTK_CONTAINER (parent), 
-			       widget, p->spec->name, (float) gtk_adjustment_get_value (adj), NULL);
+      gtk_container_child_set (GTK_CONTAINER (parent),
+                               widget, p->spec->name, (float) gtk_adjustment_get_value (adj), NULL);
     }
   else
     g_object_set (p->obj, p->spec->name, (float) gtk_adjustment_get_value (adj), NULL);
@@ -257,7 +257,7 @@ static void
 float_changed (GObject *object, GParamSpec *pspec, gpointer data)
 {
   GtkAdjustment *adj = GTK_ADJUSTMENT (data);
-  GValue val = { 0, };  
+  GValue val = { 0, };
 
   g_value_init (&val, G_TYPE_FLOAT);
   get_property_value (object, pspec, &val);
@@ -282,8 +282,8 @@ double_modified (GtkAdjustment *adj, gpointer data)
       GtkWidget *widget = GTK_WIDGET (p->obj);
       GtkWidget *parent = gtk_widget_get_parent (widget);
 
-      gtk_container_child_set (GTK_CONTAINER (parent), 
-			       widget, p->spec->name, (double) gtk_adjustment_get_value (adj), NULL);
+      gtk_container_child_set (GTK_CONTAINER (parent),
+                               widget, p->spec->name, (double) gtk_adjustment_get_value (adj), NULL);
     }
   else
     g_object_set (p->obj, p->spec->name, (double) gtk_adjustment_get_value (adj), NULL);
@@ -293,7 +293,7 @@ static void
 double_changed (GObject *object, GParamSpec *pspec, gpointer data)
 {
   GtkAdjustment *adj = GTK_ADJUSTMENT (data);
-  GValue val = { 0, };  
+  GValue val = { 0, };
 
   g_value_init (&val, G_TYPE_DOUBLE);
   get_property_value (object, pspec, &val);
@@ -321,8 +321,8 @@ string_modified (GtkEntry *entry, gpointer data)
       GtkWidget *widget = GTK_WIDGET (p->obj);
       GtkWidget *parent = gtk_widget_get_parent (widget);
 
-      gtk_container_child_set (GTK_CONTAINER (parent), 
-			       widget, p->spec->name, text, NULL);
+      gtk_container_child_set (GTK_CONTAINER (parent),
+                               widget, p->spec->name, text, NULL);
     }
   else
     g_object_set (p->obj, p->spec->name, text, NULL);
@@ -332,10 +332,10 @@ static void
 string_changed (GObject *object, GParamSpec *pspec, gpointer data)
 {
   GtkEntry *entry = GTK_ENTRY (data);
-  GValue val = { 0, };  
+  GValue val = { 0, };
   const gchar *str;
   const gchar *text;
-  
+
   g_value_init (&val, G_TYPE_STRING);
   get_property_value (object, pspec, &val);
 
@@ -350,7 +350,7 @@ string_changed (GObject *object, GParamSpec *pspec, gpointer data)
       gtk_entry_set_text (entry, str);
       unblock_controller (G_OBJECT (entry));
     }
-  
+
   g_value_unset (&val);
 }
 
@@ -377,8 +377,8 @@ bool_changed (GObject *object, GParamSpec *pspec, gpointer data)
 {
   GtkToggleButton *tb = GTK_TOGGLE_BUTTON (data);
   GtkWidget *child;
-  GValue val = { 0, };  
-  
+  GValue val = { 0, };
+
   g_value_init (&val, G_TYPE_BOOLEAN);
   get_property_value (object, pspec, &val);
 
@@ -392,7 +392,7 @@ bool_changed (GObject *object, GParamSpec *pspec, gpointer data)
   child = gtk_bin_get_child (GTK_BIN (tb));
   gtk_label_set_text (GTK_LABEL (child),
                       g_value_get_boolean (&val) ? "TRUE" : "FALSE");
-  
+
   g_value_unset (&val);
 }
 
@@ -403,7 +403,7 @@ enum_modified (GtkComboBox *cb, gpointer data)
   ObjectProperty *p = data;
   gint i;
   GEnumClass *eclass;
-  
+
   eclass = G_ENUM_CLASS (g_type_class_peek (p->spec->value_type));
 
   i = gtk_combo_box_get_active (cb);
@@ -414,8 +414,8 @@ enum_modified (GtkComboBox *cb, gpointer data)
       GtkWidget *widget = GTK_WIDGET (p->obj);
       GtkWidget *parent = gtk_widget_get_parent (widget);
 
-      gtk_container_child_set (GTK_CONTAINER (parent), 
-			       widget, p->spec->name, eclass->values[i].value, NULL);
+      gtk_container_child_set (GTK_CONTAINER (parent),
+                               widget, p->spec->name, eclass->values[i].value, NULL);
     }
   else
     g_object_set (p->obj, p->spec->name, eclass->values[i].value, NULL);
@@ -425,12 +425,12 @@ static void
 enum_changed (GObject *object, GParamSpec *pspec, gpointer data)
 {
   GtkComboBox *cb = GTK_COMBO_BOX (data);
-  GValue val = { 0, };  
+  GValue val = { 0, };
   GEnumClass *eclass;
   gint i;
 
   eclass = G_ENUM_CLASS (g_type_class_peek (pspec->value_type));
-  
+
   g_value_init (&val, pspec->value_type);
   get_property_value (object, pspec, &val);
 
@@ -441,14 +441,14 @@ enum_changed (GObject *object, GParamSpec *pspec, gpointer data)
         break;
       ++i;
     }
-  
+
   if (gtk_combo_box_get_active (cb) != i)
     {
       block_controller (G_OBJECT (cb));
       gtk_combo_box_set_active (cb, i);
       unblock_controller (G_OBJECT (cb));
     }
-  
+
   g_value_unset (&val);
 
 }
@@ -461,9 +461,9 @@ flags_modified (GtkCheckButton *button, gpointer data)
   GFlagsClass *fclass;
   guint flags;
   gint i;
-  
+
   fclass = G_FLAGS_CLASS (g_type_class_peek (p->spec->value_type));
-  
+
   active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
   i = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "index"));
 
@@ -472,15 +472,15 @@ flags_modified (GtkCheckButton *button, gpointer data)
       GtkWidget *widget = GTK_WIDGET (p->obj);
       GtkWidget *parent = gtk_widget_get_parent (widget);
 
-      gtk_container_child_get (GTK_CONTAINER (parent), 
-			       widget, p->spec->name, &flags, NULL);
+      gtk_container_child_get (GTK_CONTAINER (parent),
+                               widget, p->spec->name, &flags, NULL);
       if (active)
         flags |= fclass->values[i].value;
       else
         flags &= ~fclass->values[i].value;
 
-      gtk_container_child_set (GTK_CONTAINER (parent), 
-			       widget, p->spec->name, flags, NULL);
+      gtk_container_child_set (GTK_CONTAINER (parent),
+                               widget, p->spec->name, flags, NULL);
     }
   else
     {
@@ -499,13 +499,13 @@ static void
 flags_changed (GObject *object, GParamSpec *pspec, gpointer data)
 {
   GList *children, *c;
-  GValue val = { 0, };  
+  GValue val = { 0, };
   GFlagsClass *fclass;
   guint flags;
   gint i;
 
   fclass = G_FLAGS_CLASS (g_type_class_peek (pspec->value_type));
-  
+
   g_value_init (&val, pspec->value_type);
   get_property_value (object, pspec, &val);
   flags = g_value_get_flags (&val);
@@ -528,7 +528,7 @@ static gunichar
 unichar_get_value (GtkEntry *entry)
 {
   const gchar *text = gtk_entry_get_text (entry);
-  
+
   if (text[0])
     return g_utf8_get_char (text);
   else
@@ -546,8 +546,8 @@ unichar_modified (GtkEntry *entry, gpointer data)
       GtkWidget *widget = GTK_WIDGET (p->obj);
       GtkWidget *parent = gtk_widget_get_parent (widget);
 
-      gtk_container_child_set (GTK_CONTAINER (parent), 
-			       widget, p->spec->name, val, NULL);
+      gtk_container_child_set (GTK_CONTAINER (parent),
+                               widget, p->spec->name, val, NULL);
     }
   else
     g_object_set (p->obj, p->spec->name, val, NULL);
@@ -562,7 +562,7 @@ unichar_changed (GObject *object, GParamSpec *pspec, gpointer data)
   GValue val = { 0, };
   gchar buf[7];
   gint len;
-  
+
   g_value_init (&val, pspec->value_type);
   get_property_value (object, pspec, &val);
   new_val = (gunichar)g_value_get_uint (&val);
@@ -570,12 +570,12 @@ unichar_changed (GObject *object, GParamSpec *pspec, gpointer data)
   if (new_val != old_val)
     {
       if (!new_val)
-	len = 0;
+        len = 0;
       else
-	len = g_unichar_to_utf8 (new_val, buf);
-      
+        len = g_unichar_to_utf8 (new_val, buf);
+
       buf[len] = '\0';
-      
+
       block_controller (G_OBJECT (entry));
       gtk_entry_set_text (entry, buf);
       unblock_controller (G_OBJECT (entry));
@@ -588,7 +588,7 @@ pointer_changed (GObject *object, GParamSpec *pspec, gpointer data)
   GtkLabel *label = GTK_LABEL (data);
   gchar *str;
   gpointer ptr;
-  
+
   g_object_get (object, pspec->name, &ptr, NULL);
 
   str = g_strdup_printf ("Pointer: %p", ptr);
@@ -616,15 +616,15 @@ object_changed (GObject *object, GParamSpec *pspec, gpointer data)
   GtkWidget *label, *button;
   gchar *str;
   GObject *obj;
-  
-  GList *children = gtk_container_get_children (GTK_CONTAINER (data)); 
+
+  GList *children = gtk_container_get_children (GTK_CONTAINER (data));
   label = GTK_WIDGET (children->data);
   button = GTK_WIDGET (children->next->data);
   g_object_get (object, pspec->name, &obj, NULL);
   g_list_free (children);
 
   str = object_label (obj, pspec);
-  
+
   gtk_label_set_text (GTK_LABEL (label), str);
   gtk_widget_set_sensitive (button, G_IS_OBJECT (obj));
 
@@ -648,18 +648,18 @@ window_destroy (gpointer data)
 }
 
 static void
-object_properties (GtkWidget *button, 
-		   GObject   *object)
+object_properties (GtkWidget *button,
+                   GObject   *object)
 {
   gchar *name;
   GObject *obj;
 
   name = (gchar *) g_object_get_data (G_OBJECT (button), "property-name");
   g_object_get (object, name, &obj, NULL);
-  if (G_IS_OBJECT (obj)) 
+  if (G_IS_OBJECT (obj))
     create_prop_editor (obj, 0);
 }
- 
+
 static void
 color_modified (GtkColorButton *cb, gpointer data)
 {
@@ -674,7 +674,7 @@ color_modified (GtkColorButton *cb, gpointer data)
       GtkWidget *parent = gtk_widget_get_parent (widget);
 
       gtk_container_child_set (GTK_CONTAINER (parent),
-			       widget, p->spec->name, &rgba, NULL);
+                               widget, p->spec->name, &rgba, NULL);
     }
   else
     g_object_set (p->obj, p->spec->name, &rgba, NULL);
@@ -705,9 +705,9 @@ color_changed (GObject *object, GParamSpec *pspec, gpointer data)
 }
 
 static GtkWidget *
-property_widget (GObject    *object, 
-		 GParamSpec *spec, 
-		 gboolean    can_modify)
+property_widget (GObject    *object,
+                 GParamSpec *spec,
+                 gboolean    can_modify)
 {
   GtkWidget *prop_edit;
   GtkAdjustment *adj;
@@ -724,14 +724,14 @@ property_widget (GObject    *object,
                                 0.0);
 
       prop_edit = gtk_spin_button_new (adj, 1.0, 0);
-      
-      g_object_connect_property (object, spec, 
-				 G_CALLBACK (int_changed), 
-				 adj, G_OBJECT (adj));
-      
+
+      g_object_connect_property (object, spec,
+                                 G_CALLBACK (int_changed),
+                                 adj, G_OBJECT (adj));
+
       if (can_modify)
-	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec, G_CALLBACK (int_modified));
+        connect_controller (G_OBJECT (adj), "value_changed",
+                            object, spec, G_CALLBACK (int_modified));
     }
   else if (type == G_TYPE_PARAM_UINT)
     {
@@ -743,14 +743,14 @@ property_widget (GObject    *object,
                                 0.0);
 
       prop_edit = gtk_spin_button_new (adj, 1.0, 0);
-      
-      g_object_connect_property (object, spec, 
-				 G_CALLBACK (uint_changed), 
-				 adj, G_OBJECT (adj));
-      
+
+      g_object_connect_property (object, spec,
+                                 G_CALLBACK (uint_changed),
+                                 adj, G_OBJECT (adj));
+
       if (can_modify)
-	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec, G_CALLBACK (uint_modified));
+        connect_controller (G_OBJECT (adj), "value_changed",
+                            object, spec, G_CALLBACK (uint_modified));
     }
   else if (type == G_TYPE_PARAM_FLOAT)
     {
@@ -762,14 +762,14 @@ property_widget (GObject    *object,
                                 0.0);
 
       prop_edit = gtk_spin_button_new (adj, 0.1, 2);
-      
-      g_object_connect_property (object, spec, 
-				 G_CALLBACK (float_changed), 
-				 adj, G_OBJECT (adj));
-      
+
+      g_object_connect_property (object, spec,
+                                 G_CALLBACK (float_changed),
+                                 adj, G_OBJECT (adj));
+
       if (can_modify)
-	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec, G_CALLBACK (float_modified));
+        connect_controller (G_OBJECT (adj), "value_changed",
+                            object, spec, G_CALLBACK (float_modified));
     }
   else if (type == G_TYPE_PARAM_DOUBLE)
     {
@@ -781,118 +781,118 @@ property_widget (GObject    *object,
                                 0.0);
 
       prop_edit = gtk_spin_button_new (adj, 0.1, 2);
-      
-      g_object_connect_property (object, spec, 
-				 G_CALLBACK (double_changed), 
-				 adj, G_OBJECT (adj));
-      
+
+      g_object_connect_property (object, spec,
+                                 G_CALLBACK (double_changed),
+                                 adj, G_OBJECT (adj));
+
       if (can_modify)
-	connect_controller (G_OBJECT (adj), "value_changed",
-			    object, spec, G_CALLBACK (double_modified));
+        connect_controller (G_OBJECT (adj), "value_changed",
+                            object, spec, G_CALLBACK (double_modified));
     }
   else if (type == G_TYPE_PARAM_STRING)
     {
       prop_edit = gtk_entry_new ();
-      
-      g_object_connect_property (object, spec, 
-				 G_CALLBACK (string_changed),
-				 prop_edit, G_OBJECT (prop_edit));
-      
+
+      g_object_connect_property (object, spec,
+                                 G_CALLBACK (string_changed),
+                                 prop_edit, G_OBJECT (prop_edit));
+
       if (can_modify)
-	connect_controller (G_OBJECT (prop_edit), "changed",
-			    object, spec, G_CALLBACK (string_modified));
+        connect_controller (G_OBJECT (prop_edit), "changed",
+                            object, spec, G_CALLBACK (string_modified));
     }
   else if (type == G_TYPE_PARAM_BOOLEAN)
     {
       prop_edit = gtk_toggle_button_new_with_label ("");
-      
-      g_object_connect_property (object, spec, 
-				 G_CALLBACK (bool_changed),
-				 prop_edit, G_OBJECT (prop_edit));
-      
+
+      g_object_connect_property (object, spec,
+                                 G_CALLBACK (bool_changed),
+                                 prop_edit, G_OBJECT (prop_edit));
+
       if (can_modify)
-	connect_controller (G_OBJECT (prop_edit), "toggled",
-			    object, spec, G_CALLBACK (bool_modified));
+        connect_controller (G_OBJECT (prop_edit), "toggled",
+                            object, spec, G_CALLBACK (bool_modified));
     }
   else if (type == G_TYPE_PARAM_ENUM)
     {
       {
-	GEnumClass *eclass;
-	gint j;
-	
-	prop_edit = gtk_combo_box_text_new ();
-	
-	eclass = G_ENUM_CLASS (g_type_class_ref (spec->value_type));
-	
-	j = 0;
-	while (j < eclass->n_values)
-	  {
-	    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prop_edit),
-	                                    eclass->values[j].value_name);
-	    ++j;
-	  }
-	
-	g_type_class_unref (eclass);
-	
-	g_object_connect_property (object, spec,
-				   G_CALLBACK (enum_changed),
-				   prop_edit, G_OBJECT (prop_edit));
-	
-	if (can_modify)
-	  connect_controller (G_OBJECT (prop_edit), "changed",
-			      object, spec, G_CALLBACK (enum_modified));
+        GEnumClass *eclass;
+        gint j;
+
+        prop_edit = gtk_combo_box_text_new ();
+
+        eclass = G_ENUM_CLASS (g_type_class_ref (spec->value_type));
+
+        j = 0;
+        while (j < eclass->n_values)
+          {
+            gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (prop_edit),
+                                            eclass->values[j].value_name);
+            ++j;
+          }
+
+        g_type_class_unref (eclass);
+
+        g_object_connect_property (object, spec,
+                                   G_CALLBACK (enum_changed),
+                                   prop_edit, G_OBJECT (prop_edit));
+
+        if (can_modify)
+          connect_controller (G_OBJECT (prop_edit), "changed",
+                              object, spec, G_CALLBACK (enum_modified));
       }
     }
   else if (type == G_TYPE_PARAM_FLAGS)
     {
       {
-	GFlagsClass *fclass;
-	gint j;
-	
-	prop_edit = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-	
-	fclass = G_FLAGS_CLASS (g_type_class_ref (spec->value_type));
-	
-	for (j = 0; j < fclass->n_values; j++)
-	  {
-	    GtkWidget *b;
-	    
-	    b = gtk_check_button_new_with_label (fclass->values[j].value_name);
+        GFlagsClass *fclass;
+        gint j;
+
+        prop_edit = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+
+        fclass = G_FLAGS_CLASS (g_type_class_ref (spec->value_type));
+
+        for (j = 0; j < fclass->n_values; j++)
+          {
+            GtkWidget *b;
+
+            b = gtk_check_button_new_with_label (fclass->values[j].value_name);
             g_object_set_data (G_OBJECT (b), "index", GINT_TO_POINTER (j));
-	    gtk_widget_show (b);
-	    gtk_box_pack_start (GTK_BOX (prop_edit), b, FALSE, FALSE, 0);
-	    if (can_modify) 
-	      connect_controller (G_OBJECT (b), "toggled",
-	     	                  object, spec, G_CALLBACK (flags_modified));
-	  }
-	
-	g_type_class_unref (fclass);
-	
-	g_object_connect_property (object, spec,
-				   G_CALLBACK (flags_changed),
-				   prop_edit, G_OBJECT (prop_edit));
+            gtk_widget_show (b);
+            gtk_box_pack_start (GTK_BOX (prop_edit), b, FALSE, FALSE, 0);
+            if (can_modify)
+              connect_controller (G_OBJECT (b), "toggled",
+                                  object, spec, G_CALLBACK (flags_modified));
+          }
+
+        g_type_class_unref (fclass);
+
+        g_object_connect_property (object, spec,
+                                   G_CALLBACK (flags_changed),
+                                   prop_edit, G_OBJECT (prop_edit));
       }
     }
   else if (type == G_TYPE_PARAM_UNICHAR)
     {
       prop_edit = gtk_entry_new ();
       gtk_entry_set_max_length (GTK_ENTRY (prop_edit), 1);
-      
+
       g_object_connect_property (object, spec,
-				 G_CALLBACK (unichar_changed),
-				 prop_edit, G_OBJECT (prop_edit));
-      
+                                 G_CALLBACK (unichar_changed),
+                                 prop_edit, G_OBJECT (prop_edit));
+
       if (can_modify)
-	connect_controller (G_OBJECT (prop_edit), "changed",
-			    object, spec, G_CALLBACK (unichar_modified));
+        connect_controller (G_OBJECT (prop_edit), "changed",
+                            object, spec, G_CALLBACK (unichar_modified));
     }
   else if (type == G_TYPE_PARAM_POINTER)
     {
       prop_edit = gtk_label_new ("");
-      
-      g_object_connect_property (object, spec, 
-				 G_CALLBACK (pointer_changed),
-				 prop_edit, G_OBJECT (prop_edit));
+
+      g_object_connect_property (object, spec,
+                                 G_CALLBACK (pointer_changed),
+                                 prop_edit, G_OBJECT (prop_edit));
     }
   else if (type == G_TYPE_PARAM_OBJECT)
     {
@@ -902,17 +902,17 @@ property_widget (GObject    *object,
 
       label = gtk_label_new ("");
       button = gtk_button_new_with_label ("Properties");
-      g_object_set_data (G_OBJECT (button), "property-name", spec->name);
-      g_signal_connect (button, "clicked", 
-			G_CALLBACK (object_properties), 
-			object);
+      g_object_set_data (G_OBJECT (button), "property-name", (gpointer) spec->name);
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (object_properties),
+                        object);
 
       gtk_container_add (GTK_CONTAINER (prop_edit), label);
       gtk_container_add (GTK_CONTAINER (prop_edit), button);
 
       g_object_connect_property (object, spec,
-				 G_CALLBACK (object_changed),
-				 prop_edit, G_OBJECT (label));
+                                 G_CALLBACK (object_changed),
+                                 prop_edit, G_OBJECT (label));
 
       /* The Properties button is not really modifying, anyway */
       can_modify = TRUE;
@@ -923,22 +923,23 @@ property_widget (GObject    *object,
       prop_edit = gtk_color_button_new ();
 
       g_object_connect_property (object, spec,
-				 G_CALLBACK (color_changed),
-				 prop_edit, G_OBJECT (prop_edit));
+                                 G_CALLBACK (color_changed),
+                                 prop_edit, G_OBJECT (prop_edit));
 
       if (can_modify)
-	connect_controller (G_OBJECT (prop_edit), "color-set",
-			    object, spec, G_CALLBACK (color_modified));
+        connect_controller (G_OBJECT (prop_edit), "color-set",
+                            object, spec, G_CALLBACK (color_modified));
     }
   else
-    {  
+    {
       msg = g_strdup_printf ("uneditable property type: %s",
-			     g_type_name (G_PARAM_SPEC_TYPE (spec)));
-      prop_edit = gtk_label_new (msg);            
+                             g_type_name (G_PARAM_SPEC_TYPE (spec)));
+      prop_edit = gtk_label_new (msg);
       g_free (msg);
-      gtk_misc_set_alignment (GTK_MISC (prop_edit), 0.0, 0.5);
+      gtk_widget_set_halign (prop_edit, GTK_ALIGN_START);
+      gtk_widget_set_valign (prop_edit, GTK_ALIGN_CENTER);
     }
-  
+
   if (!can_modify)
     gtk_widget_set_sensitive (prop_edit, FALSE);
 
@@ -950,7 +951,7 @@ property_widget (GObject    *object,
 
 static GtkWidget *
 properties_from_type (GObject *object,
-		      GType    type)
+                      GType    type)
 {
   GtkWidget *prop_edit;
   GtkWidget *label;
@@ -971,12 +972,12 @@ properties_from_type (GObject *object,
       GObjectClass *class = G_OBJECT_CLASS (g_type_class_peek (type));
       specs = g_object_class_list_properties (class, &n_specs);
     }
-        
+
   if (n_specs == 0) {
     g_free (specs);
     return NULL;
   }
-  
+
   table = gtk_table_new (n_specs, 2, FALSE);
   gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
   gtk_table_set_row_spacings (GTK_TABLE (table), 3);
@@ -986,30 +987,31 @@ properties_from_type (GObject *object,
     {
       GParamSpec *spec = specs[i];
       gboolean can_modify;
-      
+
       prop_edit = NULL;
 
       can_modify = ((spec->flags & G_PARAM_WRITABLE) != 0 &&
                     (spec->flags & G_PARAM_CONSTRUCT_ONLY) == 0);
-      
+
       if ((spec->flags & G_PARAM_READABLE) == 0)
         {
           /* can't display unreadable properties */
           ++i;
           continue;
         }
-      
+
       if (spec->owner_type != type)
-	{
-	  /* we're only interested in params of type */
-	  ++i;
-	  continue;
-	}
+        {
+          /* we're only interested in params of type */
+          ++i;
+          continue;
+        }
 
       label = gtk_label_new (g_param_spec_get_nick (spec));
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, i, i + 1);
-      
+
       prop_edit = property_widget (object, spec, can_modify);
       gtk_table_attach_defaults (GTK_TABLE (table), prop_edit, 1, 2, i, i + 1);
 
@@ -1026,7 +1028,7 @@ properties_from_type (GObject *object,
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  
+
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), vbox);
 
   g_free (specs);
@@ -1066,23 +1068,24 @@ child_properties_from_object (GObject *object)
     {
       GParamSpec *spec = specs[i];
       gboolean can_modify;
-      
+
       prop_edit = NULL;
 
       can_modify = ((spec->flags & G_PARAM_WRITABLE) != 0 &&
                     (spec->flags & G_PARAM_CONSTRUCT_ONLY) == 0);
-      
+
       if ((spec->flags & G_PARAM_READABLE) == 0)
         {
           /* can't display unreadable properties */
           ++i;
           continue;
         }
-      
+
       label = gtk_label_new (g_param_spec_get_nick (spec));
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, i, i + 1);
-      
+
       mark_child_property (spec);
       prop_edit = property_widget (object, spec, can_modify);
       gtk_table_attach_defaults (GTK_TABLE (table), prop_edit, 1, 2, i, i + 1);
@@ -1099,7 +1102,7 @@ child_properties_from_object (GObject *object)
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  
+
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), vbox);
 
   g_free (specs);
@@ -1108,8 +1111,8 @@ child_properties_from_object (GObject *object)
 }
 
 static void
-child_properties (GtkWidget *button, 
-		  GObject   *object)
+child_properties (GtkWidget *button,
+                  GObject   *object)
 {
   create_prop_editor (object, 0);
 }
@@ -1130,13 +1133,14 @@ children_from_object (GObject *object)
   table = gtk_table_new (g_list_length (children), 2, FALSE);
   gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
   gtk_table_set_row_spacings (GTK_TABLE (table), 3);
- 
+
   for (c = children, i = 0; c; c = c->next, i++)
     {
       object = c->data;
 
       label = gtk_label_new ("Child");
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, i, i + 1);
 
       prop_edit = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
@@ -1161,7 +1165,7 @@ children_from_object (GObject *object)
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  
+
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), vbox);
 
   g_list_free (children);
@@ -1185,13 +1189,14 @@ cells_from_object (GObject *object)
   table = gtk_table_new (g_list_length (cells), 2, FALSE);
   gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
   gtk_table_set_row_spacings (GTK_TABLE (table), 3);
- 
+
   for (c = cells, i = 0; c; c = c->next, i++)
     {
       object = c->data;
 
       label = gtk_label_new ("Cell");
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, i, i + 1);
 
       prop_edit = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
@@ -1216,7 +1221,7 @@ cells_from_object (GObject *object)
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-  
+
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), vbox);
 
   g_list_free (cells);
@@ -1227,7 +1232,7 @@ cells_from_object (GObject *object)
 /* Pass zero for type if you want all properties */
 GtkWidget*
 create_prop_editor (GObject   *object,
-		    GType      type)
+                    GType      type)
 {
   GtkWidget *win;
   GtkWidget *notebook;
@@ -1236,7 +1241,7 @@ create_prop_editor (GObject   *object,
   gchar *title;
   GType *ifaces;
   guint n_ifaces;
-  
+
   if ((win = g_object_get_data (G_OBJECT (object), "prop-editor-win")))
     {
       gtk_window_present (GTK_WINDOW (win));
@@ -1246,7 +1251,7 @@ create_prop_editor (GObject   *object,
   win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   if (GTK_IS_WIDGET (object))
     gtk_window_set_screen (GTK_WINDOW (win),
-			   gtk_widget_get_screen (GTK_WIDGET (object)));
+                           gtk_widget_get_screen (GTK_WIDGET (object)));
 
   /* hold a weak ref to the object we're editing */
   g_object_set_data_full (G_OBJECT (object), "prop-editor-win", win, model_destroy);
@@ -1256,65 +1261,65 @@ create_prop_editor (GObject   *object,
     {
       notebook = gtk_notebook_new ();
       gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_LEFT);
-      
+
       gtk_container_add (GTK_CONTAINER (win), notebook);
-      
+
       type = G_TYPE_FROM_INSTANCE (object);
 
       title = g_strdup_printf ("Properties of %s widget", g_type_name (type));
       gtk_window_set_title (GTK_WINDOW (win), title);
       g_free (title);
-      
+
       while (type)
-	{
-	  properties = properties_from_type (object, type);
-	  if (properties)
-	    {
-	      label = gtk_label_new (g_type_name (type));
-	      gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-					properties, label);
-	    }
-	  
-	  type = g_type_parent (type);
-	}
+        {
+          properties = properties_from_type (object, type);
+          if (properties)
+            {
+              label = gtk_label_new (g_type_name (type));
+              gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                                        properties, label);
+            }
+
+          type = g_type_parent (type);
+        }
 
       ifaces = g_type_interfaces (G_TYPE_FROM_INSTANCE (object), &n_ifaces);
       while (n_ifaces--)
-	{
-	  properties = properties_from_type (object, ifaces[n_ifaces]);
-	  if (properties)
-	    {
-	      label = gtk_label_new (g_type_name (ifaces[n_ifaces]));
-	      gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-					properties, label);
-	    }
-	}
+        {
+          properties = properties_from_type (object, ifaces[n_ifaces]);
+          if (properties)
+            {
+              label = gtk_label_new (g_type_name (ifaces[n_ifaces]));
+              gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                                        properties, label);
+            }
+        }
 
       g_free (ifaces);
 
       properties = child_properties_from_object (object);
       if (properties)
-	{
-	  label = gtk_label_new ("Child properties");
-	  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-				    properties, label);
-	}
+        {
+          label = gtk_label_new ("Child properties");
+          gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                                    properties, label);
+        }
 
       properties = children_from_object (object);
       if (properties)
-	{
-	  label = gtk_label_new ("Children");
-	  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-				    properties, label);
-	}
+        {
+          label = gtk_label_new ("Children");
+          gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                                    properties, label);
+        }
 
       properties = cells_from_object (object);
       if (properties)
-	{
-	  label = gtk_label_new ("Cell renderers");
-	  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-				    properties, label);
-	}
+        {
+          label = gtk_label_new ("Cell renderers");
+          gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                                    properties, label);
+        }
     }
   else
     {
@@ -1324,9 +1329,9 @@ create_prop_editor (GObject   *object,
       gtk_window_set_title (GTK_WINDOW (win), title);
       g_free (title);
     }
-  
+
   gtk_window_set_default_size (GTK_WINDOW (win), -1, 400);
-  
+
   gtk_widget_show_all (win);
 
   return win;
diff --git a/tests/reftests/Makefile.am b/tests/reftests/Makefile.am
index 8364dde4f1..1b790b6d6f 100644
--- a/tests/reftests/Makefile.am
+++ b/tests/reftests/Makefile.am
@@ -132,6 +132,8 @@ EXTRA_DIST += \
 	no-colors.ui \
 	nonresizable-size.ref.ui \
 	nonresizable-size.ui \
+	notebook-childproperties.ui \
+	notebook-childproperties.ref.ui \
 	paned-undersized.css \
 	paned-undersized.ref.ui \
 	paned-undersized.ui \
diff --git a/tests/reftests/notebook-childproperties.ref.ui b/tests/reftests/notebook-childproperties.ref.ui
new file mode 100644
index 0000000000..d9bcb0da5e
--- /dev/null
+++ b/tests/reftests/notebook-childproperties.ref.ui
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <child>
+      <object class="GtkNotebook" id="notebook1">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <child>
+          <object class="GtkLabel" id="label4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 1</property>
+          </object>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 2</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 2</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label6">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 3</property>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 3</property>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/tests/reftests/notebook-childproperties.ui b/tests/reftests/notebook-childproperties.ui
new file mode 100644
index 0000000000..db68cd1fdc
--- /dev/null
+++ b/tests/reftests/notebook-childproperties.ui
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <child>
+      <object class="GtkNotebook" id="notebook1">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <child>
+          <object class="GtkLabel" id="label4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 1</property>
+          </object>
+          <packing>
+            <property name="tab_expand">True</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 1</property>
+          </object>
+          <packing>
+            <property name="tab_expand">True</property>
+            <property name="tab_fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 2</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 2</property>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label6">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 3</property>
+          </object>
+          <packing>
+            <property name="position">2</property>
+            <property name="tab_expand">True</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">page 3</property>
+          </object>
+          <packing>
+            <property name="position">2</property>
+            <property name="tab_expand">True</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/tests/testappchooser.c b/tests/testappchooser.c
index 6bf121a685..dd40ed6b87 100644
--- a/tests/testappchooser.c
+++ b/tests/testappchooser.c
@@ -41,10 +41,14 @@ dialog_response (GtkDialog *d,
   if (response_id == GTK_RESPONSE_OK)
     {
       app_info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (d));
-      name = g_app_info_get_name (app_info);
-      g_print ("Application selected: %s\n", name);
-
-      g_object_unref (app_info);
+      if (app_info)
+        {
+          name = g_app_info_get_name (app_info);
+          g_print ("Application selected: %s\n", name);
+          g_object_unref (app_info);
+        }
+      else
+        g_print ("No application selected\n");
     }
 
   gtk_widget_destroy (GTK_WIDGET (d));
diff --git a/tests/testboxcss.c b/tests/testboxcss.c
index 2ae081b577..17d576e10c 100644
--- a/tests/testboxcss.c
+++ b/tests/testboxcss.c
@@ -49,20 +49,21 @@
 
 static void
 show_parsing_error (GtkCssProvider *provider,
-                    const gchar    *path,
-                    guint           line,
-                    guint           position,
+                    GtkCssSection  *section,
                     const GError   *error,
                     GtkTextBuffer  *buffer)
 {
   GtkTextIter start, end;
   const char *tag_name;
 
-  gtk_text_buffer_get_iter_at_line (buffer, &start, line - 1);
-  if (gtk_text_buffer_get_line_count (buffer) <= line)
-    gtk_text_buffer_get_end_iter (buffer, &end);
-  else
-    gtk_text_buffer_get_iter_at_line (buffer, &end, line);
+  gtk_text_buffer_get_iter_at_line_index (buffer,
+                                          &start,
+                                          gtk_css_section_get_start_line (section),
+                                          gtk_css_section_get_start_position (section));
+  gtk_text_buffer_get_iter_at_line_index (buffer,
+                                          &end,
+                                          gtk_css_section_get_end_line (section),
+                                          gtk_css_section_get_end_position (section));
 
   if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
     tag_name = "warning";
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 2b0d162f34..bce73e258b 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -488,7 +488,8 @@ create_calendar(void)
 
   label = gtk_label_new_with_mnemonic ("_Font:");
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
+  gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_size_group_add_widget (size, label);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
@@ -508,7 +509,8 @@ create_calendar(void)
 
   label = gtk_label_new_with_mnemonic ("Details W_idth:");
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
+  gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_size_group_add_widget (size, label);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
@@ -528,7 +530,8 @@ create_calendar(void)
 
   label = gtk_label_new_with_mnemonic ("Details H_eight:");
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), button);
-  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
+  gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_size_group_add_widget (size, label);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
diff --git a/tests/testfontselectiondialog.c b/tests/testfontselectiondialog.c
index bcc1c80528..96f8652c73 100644
--- a/tests/testfontselectiondialog.c
+++ b/tests/testfontselectiondialog.c
@@ -27,7 +27,7 @@ int
 main (int argc, char *argv[])
 {
   GtkWidget *dialog;
-  GtkWidget *ok;
+  GtkWidget *ok G_GNUC_UNUSED;
 
   gtk_init (&argc, &argv);
 
diff --git a/tests/testgrid.c b/tests/testgrid.c
index cb79b359f7..c756158f92 100644
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -40,7 +40,7 @@ simple_grid (void)
 {
   GtkWidget *window;
   GtkWidget *grid;
-  GtkWidget *child;
+  GtkWidget *test1, *test2, *test3, *test4, *test5, *test6;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Orientation");
@@ -50,17 +50,28 @@ simple_grid (void)
 
   gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
   gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
-  gtk_container_add (GTK_CONTAINER (grid), test_widget ("1", "red"));
-  gtk_container_add (GTK_CONTAINER (grid), test_widget ("2", "green"));
-  gtk_container_add (GTK_CONTAINER (grid), test_widget ("3", "blue"));
-  child = test_widget ("4", "green");
-  gtk_grid_attach (GTK_GRID (grid), child, 0, 1, 1, 1);
-  gtk_widget_set_vexpand (child, TRUE);
-  gtk_grid_attach_next_to (GTK_GRID (grid), test_widget ("5", "blue"), child, GTK_POS_RIGHT, 2, 1);
-  child = test_widget ("6", "yellow");
-  gtk_grid_attach (GTK_GRID (grid), child, -1, 0, 1, 2);
-  gtk_widget_set_hexpand (child, TRUE);
-
+  test1 = test_widget ("1", "red");
+  gtk_container_add (GTK_CONTAINER (grid), test1);
+  test2 = test_widget ("2", "green");
+  gtk_container_add (GTK_CONTAINER (grid), test2);
+  test3 = test_widget ("3", "blue");
+  gtk_container_add (GTK_CONTAINER (grid), test3);
+  test4 = test_widget ("4", "green");
+  gtk_grid_attach (GTK_GRID (grid), test4, 0, 1, 1, 1);
+  gtk_widget_set_vexpand (test4, TRUE);
+  test5 = test_widget ("5", "blue");
+  gtk_grid_attach_next_to (GTK_GRID (grid), test5, test4, GTK_POS_RIGHT, 2, 1);
+  test6 = test_widget ("6", "yellow");
+  gtk_grid_attach (GTK_GRID (grid), test6, -1, 0, 1, 2);
+  gtk_widget_set_hexpand (test6, TRUE);
+
+  g_assert (gtk_grid_get_child_at (GTK_GRID (grid), 0, -1) == NULL);
+  g_assert (gtk_grid_get_child_at (GTK_GRID (grid), 0, 0) == test1);
+  g_assert (gtk_grid_get_child_at (GTK_GRID (grid), 1, 0) == test2);
+  g_assert (gtk_grid_get_child_at (GTK_GRID (grid), 0, 1) == test4);
+  g_assert (gtk_grid_get_child_at (GTK_GRID (grid), -1, 0) == test6);
+  g_assert (gtk_grid_get_child_at (GTK_GRID (grid), -1, 1) == test6);
+  g_assert (gtk_grid_get_child_at (GTK_GRID (grid), -1, 2) == NULL);
   gtk_widget_show_all (window);
 }
 
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 2a962c599a..1380a79805 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2655,7 +2655,8 @@ create_saved_position (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
       label = gtk_label_new ("X Origin : ");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
 
       x_label = gtk_label_new ("");
@@ -2667,7 +2668,8 @@ create_saved_position (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
       label = gtk_label_new ("Y Origin : ");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
 
       y_label = gtk_label_new ("");
@@ -4654,7 +4656,8 @@ create_spins (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
       
       label = gtk_label_new ("Time :");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
 
       adjustment = gtk_adjustment_new (0, 0, 1410, 30, 60, 0);
@@ -4672,7 +4675,8 @@ create_spins (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
       
       label = gtk_label_new ("Month :");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
 
       adjustment = gtk_adjustment_new (1.0, 1.0, 12.0, 1.0,
@@ -4696,7 +4700,8 @@ create_spins (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
       label = gtk_label_new ("Hex :");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
 
       adjustment = gtk_adjustment_new (0, 0, 255, 1, 16, 0);
@@ -4728,7 +4733,8 @@ create_spins (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);
       
       label = gtk_label_new ("Value :");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
 
       adjustment = gtk_adjustment_new (0.0, -10000.0, 10000.0,
@@ -4741,7 +4747,8 @@ create_spins (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);
 
       label = gtk_label_new ("Digits :");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
 
       adjustment = gtk_adjustment_new (2, 1, 15, 1, 1, 0);
@@ -4979,7 +4986,8 @@ create_cursors (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
       label = gtk_label_new ("Cursor Theme : ");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
 
       entry = gtk_entry_new ();
@@ -5001,7 +5009,8 @@ create_cursors (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
 
       label = gtk_label_new ("Cursor Value : ");
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
 
       adjustment = gtk_adjustment_new (0,
@@ -8411,7 +8420,8 @@ create_progress_bar (GtkWidget *widget)
       gtk_table_attach (GTK_TABLE (tab), label, 0, 1, 0, 1,
 			GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
 			5, 5);
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
 
       pdata->omenu1 = build_option_menu (items1, 4, 0,
 					 progressbar_toggle_orientation,
@@ -8458,7 +8468,8 @@ create_progress_bar (GtkWidget *widget)
       gtk_table_attach (GTK_TABLE (tab), label, 0, 1, 10, 11,
 			GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
 			5, 5);
-      gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       pdata->elmenu = build_option_menu (ellipsize_items,
                                          sizeof (ellipsize_items) / sizeof (ellipsize_items[0]),
                                          2, // PANGO_ELLIPSIZE_MIDDLE
@@ -9860,7 +9871,8 @@ create_styles (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE, 0);
       
       label = gtk_label_new ("Font:");
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       font_desc = pango_font_description_from_string ("Helvetica,Sans Oblique 18");
@@ -9870,7 +9882,8 @@ create_styles (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
       label = gtk_label_new ("Foreground:");
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       button = gtk_button_new_with_label ("Some Text");
@@ -9878,7 +9891,8 @@ create_styles (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
       label = gtk_label_new ("Background:");
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       button = gtk_button_new_with_label ("Some Text");
@@ -9886,7 +9900,8 @@ create_styles (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
       label = gtk_label_new ("Text:");
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       entry = gtk_entry_new ();
@@ -9895,7 +9910,8 @@ create_styles (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
 
       label = gtk_label_new ("Base:");
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       entry = gtk_entry_new ();
@@ -9904,7 +9920,8 @@ create_styles (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
 
       label = gtk_label_new ("Cursor:");
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       entry = gtk_entry_new ();
@@ -9913,7 +9930,8 @@ create_styles (GtkWidget *widget)
       gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
 
       label = gtk_label_new ("Multiple:");
-      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       button = gtk_button_new_with_label ("Some Text");
diff --git a/tests/widget-factory.ui b/tests/widget-factory.ui
index f78007d9da..d40e97efcf 100644
--- a/tests/widget-factory.ui
+++ b/tests/widget-factory.ui
@@ -242,6 +242,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
           <object class="GtkToolbar" id="toolbar1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <style>
+              <class name="primary-toolbar"/>
+            </style>
             <child>
               <object class="GtkToolButton" id="toolbutton2">
                 <property name="visible">True</property>