Merge branch 'master' into treeview-refactor

Conflicts:
	tests/Makefile.am

69 files changed, 12503 insertions, 6837 deletions

diff --git a/NEWS b/NEWS
index 3f6a51874d..9fe44fb3ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,50 @@
+Overview of Changes from GTK+ 2.91.4 to 2.91.5
+==============================================
+
+* GtkSwitch: a new widget that provides switch-like on/off functionality
+
+* Deprecations and cleanups:
+ - GtkCallbackMarshal and GtkFunction have been deprecated
+ - gtk_init_add has been removed
+ - The ::size-request signal has been removed
+ - GtkRuler has been removed
+
+* The default value for the GtkBox::fill property has been changed
+  back to TRUE
+
+* Bugs fixed:
+ 613942 Deprecate GtkRuler, GtkVruler and GtkHRuler
+ 629955 Deprecate / remove gtk_main and gtk_init_add / remove* API
+ 633324 Stop invoking size-request completely
+ 633896 Printing: Use XDG_DOCUMENTS_DIR as the default location...
+ 634474 infinite loop in gtk_icon_view_accessible_set_adjustment
+ 634558 Selecting "Search" should focus text box for keyboard entry
+ 634592 GtkNotebook doesn't expand (in a typical GtkDialog)
+ 634697 gdk: Add XSetting for "gtk-cursor-blink-timeout"
+ 634821 Fix a BadMatch when create an icon pixmap for an ARGB visual
+ 634987 add a switch widget
+ 635175 Leak in gtk_plug_realize
+ 635253 GtkRadioButton constructors don't mark group as "allow-none"
+ 635307 iconcache: Ensure we don't lose data on power loss
+ 635380 gdk_event_apply_filters is unsafe against changes in filter list
+ 635588 clicking URL to be opened freezes the application for 3-5 seconds
+ 635693 Bad pointer grab bug with GtkMenu/GtkComboBox
+ 635879 Change the gdk_rgba_parse() function to be usable from bindings
+
+* Updated translations:
+ Arabic
+ British English
+ Catalan
+ Czech
+ German
+ Hungarian
+ Indonesian
+ Norwegian bokmål
+ Romanian
+ Thai
+ Uyghur
+
+
 Overview of Changes from GTK+ 2.91.3 to 2.91.4
 ==============================================
 
diff --git a/configure.ac b/configure.ac
index 3ac0bec577..d5ef2b7bb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [91])
-m4_define([gtk_micro_version], [5])
+m4_define([gtk_micro_version], [6])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -61,8 +61,8 @@ cflags_set=${CFLAGS+set}
 AM_INIT_AUTOMAKE([1.10 no-define -Wno-portability dist-bzip2])
 AM_MAINTAINER_MODE([enable])
 
-# Support silent build rules, requires at least automake-1.11. Enable
-# by either passing --enable-silent-rules to configure or passing V=0
+# Support silent build rules, requires at least automake-1.11. Disable
+# by either passing --disable-silent-rules to configure or passing V=1
 # to make
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -1489,6 +1489,25 @@ GLIB_GSETTINGS
 GOBJECT_INTROSPECTION_CHECK([0.9.3])
 
 ##################################################
+# Packagekit module
+#################################################
+
+AC_ARG_ENABLE(packagekit,
+	      AC_HELP_STRING([--disable-packagekit],
+			     [build packagekit open with module]))
+
+ENABLE_PACKAGEKIT=
+if test "os_win32" != "yes"; then
+   	if test "x$enable_packagekit" != "xno"; then
+	   	ENABLE_PACKAGEKIT=1
+      	   	AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit])
+	fi
+fi
+
+AC_SUBST(ENABLE_PACKAGEKIT)
+AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$ENABLE_PACKAGEKIT" = "x1")
+
+##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c
index b0f45d310d..308242b109 100644
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -437,7 +437,26 @@ do_combobox (GtkWidget *do_widget)
      
     gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
     gtk_container_add (GTK_CONTAINER (combo), entry);
-  
+
+    /* A combobox with string IDs */
+    frame = gtk_frame_new ("String IDs");
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
+    gtk_container_add (GTK_CONTAINER (frame), box);
+
+    combo = gtk_combo_box_text_new ();
+    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible");
+    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "when-active", "Visible when active");
+    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "always", "Always visible");
+    gtk_container_add (GTK_CONTAINER (box), combo);
+
+    entry = gtk_entry_new ();
+    g_object_bind_property (combo, "active-id",
+                            entry, "text",
+                            G_BINDING_BIDIRECTIONAL);
+    gtk_container_add (GTK_CONTAINER (box), entry);
   }
 
   if (!gtk_widget_get_visible (window))
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 9b065dd5ac..1de3259a6d 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -322,7 +322,8 @@ HTML_IMAGES = \
 	$(srcdir)/images/layout-tblr.png				\
 	$(srcdir)/images/layout-tbrl.png				\
 	$(srcdir)/images/window-default.png				\
-	$(srcdir)/images/hello-world.png
+	$(srcdir)/images/hello-world.png				\
+	$(srcdir)/images/switch.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 38e057fe8a..5963787271 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -97,6 +97,7 @@
       <xi:include href="xml/gtklinkbutton.xml" />
       <xi:include href="xml/gtkscalebutton.xml" />
       <xi:include href="xml/gtkvolumebutton.xml" />
+      <xi:include href="xml/gtkswitch.xml" />
     </chapter>
 
     <chapter id="NumericEntry">
@@ -286,13 +287,6 @@
       <xi:include href="xml/gtksocket.xml" />
     </chapter>
 
-    <chapter id="SpecialObjects">
-      <title>Special-purpose features</title>
-      <xi:include href="xml/gtkruler.xml" />
-      <xi:include href="xml/gtkhruler.xml" />
-      <xi:include href="xml/gtkvruler.xml" />
-    </chapter>
-
     <chapter id="RecentDocuments">
       <title>Recently Used Documents</title>
       <xi:include href="xml/gtkrecentmanager.xml" />
@@ -303,6 +297,14 @@
       <xi:include href="xml/gtkrecentfilter.xml" />
     </chapter>
 
+    <chapter id="ApplicationChoosing">
+      <title>Choosing from installed applications</title>
+      <xi:include href="xml/gtkappchooser.xml" />
+      <xi:include href="xml/gtkappchooserbutton.xml" />
+      <xi:include href="xml/gtkappchooserdialog.xml" />
+      <xi:include href="xml/gtkappchooserwidget.xml" />
+    </chapter>
+
     <chapter id="Builder">
       <title>Interface builder</title>
       <xi:include href="xml/gtkbuildable.xml" />
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index cd11a88160..2ec9ae874e 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -801,6 +801,10 @@ gtk_combo_box_get_active
 gtk_combo_box_set_active
 gtk_combo_box_get_active_iter
 gtk_combo_box_set_active_iter
+gtk_combo_box_get_id_column
+gtk_combo_box_set_id_column
+gtk_combo_box_get_active_id
+gtk_combo_box_set_active_id
 gtk_combo_box_get_model
 gtk_combo_box_set_model
 gtk_combo_box_popup_for_device
@@ -840,9 +844,12 @@ gtk_combo_box_get_type
 GtkComboBoxText
 gtk_combo_box_text_new
 gtk_combo_box_text_new_with_entry
+gtk_combo_box_text_append
+gtk_combo_box_text_prepend
+gtk_combo_box_text_insert
 gtk_combo_box_text_append_text
-gtk_combo_box_text_insert_text
 gtk_combo_box_text_prepend_text
+gtk_combo_box_text_insert_text
 gtk_combo_box_text_remove
 gtk_combo_box_text_remove_all
 gtk_combo_box_text_get_active_text
@@ -6382,3 +6389,120 @@ GTK_GRID_GET_CLASS
 GtkGridPrivate
 gtk_grid_get_type
 </SECTION>
+
+<SECTION>
+<FILE>gtkswitch</FILE>
+GtkSwitch
+gtk_switch_new
+gtk_switch_set_active
+gtk_switch_get_active
+
+<SUBSECTION Standard>
+GtkSwitchClass
+GTK_TYPE_SWITCH
+GTK_SWITCH
+GTK_SWITCH_CLASS
+GTK_IS_SWITCH
+GTK_IS_SWITCH_CLASS
+GTK_SWITCH_GET_CLASS
+
+<SUBSECTION Private>
+GtkSwitchPrivate
+gtk_switch_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkappchooser</FILE>
+<TITLE>GtkAppChooser</TITLE>
+GtkAppChooser
+gtk_app_chooser_get_app_info
+gtk_app_chooser_get_content_type
+gtk_app_chooser_refresh
+
+<SUBSECTION Standard>
+GTK_TYPE_APP_CHOOSER
+GTK_APP_CHOOSER
+GTK_IS_APP_CHOOSER
+
+<SUBSECTION Private>
+gtk_app_chooser_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkappchooserbutton</FILE>
+<TITLE>GtkAppChooserButton</TITLE>
+GtkAppChooserButton
+gtk_app_chooser_button_new
+gtk_app_chooser_button_append_custom_item
+gtk_app_chooser_button_append_separator
+gtk_app_chooser_button_set_active_custom_item
+gtk_app_chooser_button_get_show_dialog_item
+gtk_app_chooser_button_set_show_dialog_item
+
+<SUBSECTION Standard>
+GtkAppChooserButtonClass
+GTK_TYPE_APP_CHOOSER_BUTTON
+GTK_APP_CHOOSER_BUTTON
+GTK_APP_CHOOSER_BUTTON_CLASS
+GTK_IS_APP_CHOOSER_BUTTON
+GTK_IS_APP_CHOOSER_BUTTON_CLASS
+GTK_APP_CHOOSER_BUTTON_GET_CLASS
+
+<SUBSECTION Private>
+GtkAppChooserButtonPrivate
+gtk_app_chooser_button_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkappchooserdialog</FILE>
+<TITLE>GtkAppChooserDialog</TITLE>
+GtkAppChooserDialog
+gtk_app_chooser_dialog_new
+gtk_app_chooser_dialog_new_for_content_type
+gtk_app_chooser_dialog_get_widget
+
+<SUBSECTION Standard>
+GtkAppChooserDialogClass
+GTK_TYPE_APP_CHOOSER_DIALOG
+GTK_APP_CHOOSER_DIALOG
+GTK_APP_CHOOSER_DIALOG_CLASS
+GTK_IS_APP_CHOOSER_DIALOG
+GTK_IS_APP_CHOOSER_DIALOG_CLASS
+GTK_APP_CHOOSER_DIALOG_GET_CLASS
+
+<SUBSECTION Private>
+GtkAppChooserDialogPrivate
+gtk_app_chooser_dialog_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkappchooserwidget</FILE>
+<TITLE>GtkAppChooserWidget</TITLE>
+GtkAppChooserWidget
+gtk_app_chooser_widget_new
+gtk_app_chooser_widget_set_show_default
+gtk_app_chooser_widget_get_show_default
+gtk_app_chooser_widget_set_show_recommended
+gtk_app_chooser_widget_get_show_recommended
+gtk_app_chooser_widget_set_show_fallback
+gtk_app_chooser_widget_get_show_fallback
+gtk_app_chooser_widget_set_show_other
+gtk_app_chooser_widget_get_show_other
+gtk_app_chooser_widget_set_show_all
+gtk_app_chooser_widget_get_show_all
+gtk_app_chooser_widget_set_default_text
+gtk_app_chooser_widget_get_default_text
+
+<SUBSECTION Standard>
+GtkAppChooserWidgetClass
+GTK_TYPE_APP_CHOOSER_WIDGET
+GTK_APP_CHOOSER_WIDGET
+GTK_APP_CHOOSER_WIDGET_CLASS
+GTK_IS_APP_CHOOSER_WIDGET
+GTK_IS_APP_CHOOSER_WIDGET_CLASS
+GTK_APP_CHOOSER_WIDGET_GET_CLASS
+
+<SUBSECTION Private>
+GtkAppChooserWidgetPrivate
+gtk_app_chooser_widget_get_type
+</SECTION>
diff --git a/docs/reference/gtk/gtk3.types b/docs/reference/gtk/gtk3.types
index 5c02fbe40b..6b43eccf7f 100644
--- a/docs/reference/gtk/gtk3.types
+++ b/docs/reference/gtk/gtk3.types
@@ -11,6 +11,10 @@ gtk_action_group_get_type
 gtk_activatable_get_type
 gtk_adjustment_get_type
 gtk_alignment_get_type
+gtk_app_chooser_get_type
+gtk_app_chooser_button_get_type
+gtk_app_chooser_dialog_get_type
+gtk_app_chooser_widget_get_type
 gtk_application_get_type
 gtk_arrow_get_type
 gtk_aspect_frame_get_type
@@ -66,7 +70,6 @@ gtk_handle_box_get_type
 gtk_hbox_get_type
 gtk_hbutton_box_get_type
 gtk_hpaned_get_type
-gtk_hruler_get_type
 gtk_hscale_get_type
 gtk_hscrollbar_get_type
 gtk_hseparator_get_type
@@ -121,7 +124,6 @@ gtk_recent_chooser_dialog_get_type
 gtk_recent_chooser_menu_get_type
 gtk_recent_chooser_widget_get_type
 gtk_recent_manager_get_type
-gtk_ruler_get_type
 gtk_scale_button_get_type
 gtk_scale_get_type
 gtk_scrollable_get_type
@@ -137,6 +139,7 @@ gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_statusbar_get_type
 gtk_status_icon_get_type
+gtk_switch_get_type
 gtk_style_get_type
 gtk_table_get_type
 gtk_tearoff_menu_item_get_type
@@ -171,7 +174,6 @@ gtk_vbutton_box_get_type
 gtk_viewport_get_type
 gtk_volume_button_get_type
 gtk_vpaned_get_type
-gtk_vruler_get_type
 gtk_vscale_get_type
 gtk_vscrollbar_get_type
 gtk_vseparator_get_type
diff --git a/docs/reference/gtk/images/switch.png b/docs/reference/gtk/images/switch.png
new file mode 100644
index 0000000000..2fba3ebb2f
--- /dev/null
+++ b/docs/reference/gtk/images/switch.png
diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
index 51ddf14584..5c93084197 100644
--- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
@@ -30,20 +30,8 @@ toggles the value.
 
 <!-- ##### STRUCT GtkCheckMenuItem ##### -->
 <para>
-The #GtkCheckMenuItem-struct struct contains the following fields.
-(These fields should be considered read-only. They should never be set by
-an application.)
-
-<informaltable pgwide="1" frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-
-<row>
-<entry>#guint active;</entry>
-<entry>TRUE if the check box is active.</entry>
-</row>
-
-</tbody></tgroup></informaltable>
+The #GtkCheckMenuItem-struct struct contains only private fields that
+should not be directly accessed.
 </para>
 
 
@@ -53,8 +41,8 @@ This signal is emitted when the state of the check box is changed.
 </para>
 
 <para>
-A signal handler can examine the <structfield>active</structfield> 
-field of the #GtkCheckMenuItem-struct struct to discover the new state.
+A signal handler can use gtk_check_menu_item_get_active()
+to discover the new state.
 </para>
 
 @checkmenuitem: the object which received the signal.
diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index 4bdc5464c4..7a11071cef 100644
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -123,4 +123,7 @@
   <link linkend="GtkFileChooserDialog">
     <inlinegraphic fileref="filechooser.png" format="PNG"></inlinegraphic>
   </link>
+  <link linkend="GtkSwitch">
+    <inlinegraphic fileref="switch.png" format="PNG"></inlinegraphic>
+  </link>
 </para>
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 312d064f0c..73081038e6 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -115,6 +115,7 @@ new_widget_info (const char *name,
   else
     {
       info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_has_resize_grip (GTK_WINDOW (info->window), FALSE);
       info->include_decorations = FALSE;
       gtk_widget_show_all (widget);
       gtk_container_add (GTK_CONTAINER (info->window), widget);
@@ -160,6 +161,26 @@ create_button (void)
 }
 
 static WidgetInfo *
+create_switch (void)
+{
+  GtkWidget *widget;
+  GtkWidget *align;
+  GtkWidget *sw;
+
+  widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
+  sw = gtk_switch_new ();
+  gtk_switch_set_active (GTK_SWITCH (sw), TRUE);
+  gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE, 0);
+  sw = gtk_switch_new ();
+  gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE, 0);
+
+  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_container_add (GTK_CONTAINER (align), widget);
+
+  return new_widget_info ("switch", align, SMALL);
+}
+
+static WidgetInfo *
 create_toggle_button (void)
 {
   GtkWidget *widget;
@@ -1095,6 +1116,7 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_page_setup_dialog ());
   retval = g_list_prepend (retval, create_print_dialog ());
   retval = g_list_prepend (retval, create_volume_button ());
+  retval = g_list_prepend (retval, create_switch ());
 
   return retval;
 }
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 4795e62da3..557e7aebf0 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -60,6 +60,7 @@ gdk_device_get_key
 gdk_device_get_mode
 gdk_device_get_name
 gdk_device_get_n_axes
+gdk_device_get_n_keys
 gdk_device_get_source
 gdk_device_get_state
 gdk_device_get_type G_GNUC_CONST
@@ -372,6 +373,7 @@ gdk_visual_get_system
 gdk_visual_get_type G_GNUC_CONST
 gdk_visual_get_visual_type
 gdk_visual_type_get_type G_GNUC_CONST
+#ifdef GDK_WINDOWING_WIN32
 gdk_win32_drawable_get_handle
 gdk_win32_handle_table_lookup
 gdk_win32_icon_to_pixbuf_libgtk_only
@@ -379,6 +381,7 @@ gdk_win32_pixbuf_to_hicon_libgtk_only
 gdk_win32_selection_add_targets
 gdk_win32_set_modal_dialog_libgtk_only
 gdk_win32_window_is_win32
+#endif
 gdk_window_add_filter
 gdk_window_at_pointer
 gdk_window_attributes_type_get_type G_GNUC_CONST
diff --git a/gdk/gdkrgba.c b/gdk/gdkrgba.c
index 732cf99190..c2cf2fca31 100644
--- a/gdk/gdkrgba.c
+++ b/gdk/gdkrgba.c
@@ -115,8 +115,8 @@ parse_rgb_value (const char  *str,
 
 /**
  * gdk_rgba_parse:
- * @spec: the string specifying the color
  * @rgba: the #GdkRGBA struct to fill in
+ * @spec: the string specifying the color
  *
  * Parses a textual representation of a color, filling in
  * the <structfield>red</structfield>, <structfield>green</structfield>,
@@ -150,8 +150,8 @@ parse_rgb_value (const char  *str,
  * Since: 3.0
  **/
 gboolean
-gdk_rgba_parse (const gchar *spec,
-                GdkRGBA     *rgba)
+gdk_rgba_parse (GdkRGBA     *rgba,
+                const gchar *spec)
 {
   gboolean has_alpha;
   gdouble r, g, b, a;
diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h
index 9875d105c5..2b7670477a 100644
--- a/gdk/gdkrgba.h
+++ b/gdk/gdkrgba.h
@@ -48,8 +48,8 @@ struct _GdkRGBA
 GdkRGBA * gdk_rgba_copy (GdkRGBA *rgba);
 void      gdk_rgba_free (GdkRGBA *rgba);
 
-gboolean  gdk_rgba_parse (const gchar *spec,
-                          GdkRGBA     *rgba);
+gboolean  gdk_rgba_parse (GdkRGBA     *rgba,
+                          const gchar *spec);
 
 guint     gdk_rgba_hash  (gconstpointer p);
 gboolean  gdk_rgba_equal (gconstpointer p1,
diff --git a/gdk/tests/gdk-color.c b/gdk/tests/gdk-color.c
index 2dbe2ad248..008f425e28 100644
--- a/gdk/tests/gdk-color.c
+++ b/gdk/tests/gdk-color.c
@@ -8,17 +8,17 @@ test_color_parse (void)
   GdkRGBA expected;
   gboolean res;
 
-  res = gdk_rgba_parse ("foo", &color);
+  res = gdk_rgba_parse (&color, "foo");
   g_assert (!res);
 
-  res = gdk_rgba_parse ("", &color);
+  res = gdk_rgba_parse (&color, "");
   g_assert (!res);
 
   expected.red = 100/255.;
   expected.green = 90/255.;
   expected.blue = 80/255.;
   expected.alpha = 0.1;
-  res = gdk_rgba_parse ("rgba(100,90,80,0.1)", &color);
+  res = gdk_rgba_parse (&color, "rgba(100,90,80,0.1)");
   g_assert (res);
   g_assert (gdk_rgba_equal (&color, &expected));
 
@@ -26,11 +26,11 @@ test_color_parse (void)
   expected.green = 0.3;
   expected.blue = 0.2;
   expected.alpha = 0.1;
-  res = gdk_rgba_parse ("rgba(40%,30%,20%,0.1)", &color);
+  res = gdk_rgba_parse (&color, "rgba(40%,30%,20%,0.1)");
   g_assert (res);
   g_assert (gdk_rgba_equal (&color, &expected));
 
-  res = gdk_rgba_parse ("rgba(  40 % ,  30 %  ,   20 % ,  0.1    )", &color);
+  res = gdk_rgba_parse (&color, "rgba(  40 % ,  30 %  ,   20 % ,  0.1    )");
   g_assert (res);
   g_assert (gdk_rgba_equal (&color, &expected));
 
@@ -38,7 +38,7 @@ test_color_parse (void)
   expected.green = 0.0;
   expected.blue = 0.0;
   expected.alpha = 1.0;
-  res = gdk_rgba_parse ("red", &color);
+  res = gdk_rgba_parse (&color, "red");
   g_assert (res);
   g_assert (gdk_rgba_equal (&color, &expected));
 
@@ -46,7 +46,7 @@ test_color_parse (void)
   expected.green = 0x8080 / 65535.;
   expected.blue = 1.0;
   expected.alpha = 1.0;
-  res = gdk_rgba_parse ("#0080ff", &color);
+  res = gdk_rgba_parse (&color, "#0080ff");
   g_assert (res);
   g_assert (gdk_rgba_equal (&color, &expected));
 }
@@ -71,7 +71,7 @@ test_color_to_string (void)
 
   orig = g_strdup (setlocale (LC_ALL, NULL));
   res = gdk_rgba_to_string (&rgba);
-  gdk_rgba_parse (res, &out);
+  gdk_rgba_parse (&out, res);
   g_assert (gdk_rgba_equal (&rgba, &out));
 
   setlocale (LC_ALL, "de_DE.utf-8");
diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index df3781edbb..5aea31d12a 100644
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -36,54 +36,43 @@
 #include <unistd.h>
 
 static char *
-get_display_name (GFile *file)
+get_display_name (GFile     *file,
+                  GFileInfo *info)
 {
-  GFileInfo *info;
   char *name, *tmp;
 
-  /* This does sync I/O, which isn't ideal.
-   * It should probably use the NautilusFile machinery
-   */
-
   name = NULL;
-  info = g_file_query_info (file,
-			    G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, 0, NULL, NULL);
   if (info)
-    {
-      name = g_strdup (g_file_info_get_display_name (info));
-      g_object_unref (info);
-    }
+    name = g_strdup (g_file_info_get_display_name (info));
 
   if (name == NULL)
     {
       name = g_file_get_basename (file);
       if (!g_utf8_validate (name, -1, NULL))
-	{
-	  tmp = name;
-	  name =
-	    g_uri_escape_string (name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH,
-				 TRUE);
-	  g_free (tmp);
-	}
+        {
+          tmp = name;
+          name =
+            g_uri_escape_string (name, G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, TRUE);
+          g_free (tmp);
+        }
     }
 
   return name;
 }
 
 static GIcon *
-get_icon (GFile *file)
+get_icon (GFile     *file,
+          GFileInfo *info)
 {
-  GFileInfo *info;
   GIcon *icon;
 
   icon = NULL;
-  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_ICON, 0, NULL, NULL);
+
   if (info)
     {
       icon = g_file_info_get_icon (info);
       if (icon)
-	g_object_ref (icon);
-      g_object_unref (info);
+        g_object_ref (icon);
     }
 
   return icon;
@@ -99,13 +88,13 @@ gicon_to_string (GIcon *icon)
     {
       file = g_file_icon_get_file (G_FILE_ICON (icon));
       if (file)
-	return g_file_get_path (file);
+        return g_file_get_path (file);
     }
   else if (G_IS_THEMED_ICON (icon))
     {
       names = g_themed_icon_get_names (G_THEMED_ICON (icon));
       if (names)
-	return g_strdup (names[0]);
+        return g_strdup (names[0]);
     }
   else if (G_IS_EMBLEMED_ICON (icon))
     {
@@ -121,11 +110,11 @@ gicon_to_string (GIcon *icon)
 
 static void
 end_startup_notification (GdkDisplay *display,
-			  const char *startup_id)
+                          const char *startup_id)
 {
   gdk_x11_display_broadcast_startup_message (display, "remove",
-					     "ID", startup_id,
-					     NULL);
+                                             "ID", startup_id,
+                                             NULL);
 }
 
 
@@ -210,19 +199,19 @@ startup_timeout (void *data)
       next = tmp->next;
 
       elapsed =
-	((((double) now.tv_sec - sn_data->time.tv_sec) * G_USEC_PER_SEC +
-	  (now.tv_usec - sn_data->time.tv_usec))) / 1000.0;
+        ((((double) now.tv_sec - sn_data->time.tv_sec) * G_USEC_PER_SEC +
+          (now.tv_usec - sn_data->time.tv_usec))) / 1000.0;
 
       if (elapsed >= STARTUP_TIMEOUT_LENGTH)
-	{
-	  std->contexts = g_slist_remove (std->contexts, sn_data);
-	  end_startup_notification (sn_data->display, sn_data->startup_id);
-	  free_startup_notification_data (sn_data);
-	}
+        {
+          std->contexts = g_slist_remove (std->contexts, sn_data);
+          end_startup_notification (sn_data->display, sn_data->startup_id);
+          free_startup_notification_data (sn_data);
+        }
       else
-	{
-	  min_timeout = MIN (min_timeout, (STARTUP_TIMEOUT_LENGTH - elapsed));
-	}
+        {
+          min_timeout = MIN (min_timeout, (STARTUP_TIMEOUT_LENGTH - elapsed));
+        }
 
       tmp = next;
     }
@@ -239,7 +228,7 @@ startup_timeout (void *data)
 
 static void
 add_startup_timeout (GdkScreen  *screen,
-		     const char *startup_id)
+                     const char *startup_id)
 {
   StartupTimeoutData *data;
   StartupNotificationData *sn_data;
@@ -253,7 +242,7 @@ add_startup_timeout (GdkScreen  *screen,
       data->timeout_id = 0;
 
       g_object_set_data_full (G_OBJECT (screen), "appinfo-startup-data",
-			      data, free_startup_timeout);
+                              data, free_startup_timeout);
     }
 
   sn_data = g_new (StartupNotificationData, 1);
@@ -265,14 +254,14 @@ add_startup_timeout (GdkScreen  *screen,
 
   if (data->timeout_id == 0)
     data->timeout_id = g_timeout_add_seconds (STARTUP_TIMEOUT_LENGTH_SECONDS,
-					      startup_timeout, data);
+                                              startup_timeout, data);
 }
 
 
 char *
 _gdk_windowing_get_startup_notify_id (GAppLaunchContext *context,
-				      GAppInfo          *info, 
-				      GList             *files)
+                                      GAppInfo          *info,
+                                      GList             *files)
 {
   static int sequence = 0;
   GdkAppLaunchContextPrivate *priv;
@@ -288,6 +277,7 @@ _gdk_windowing_get_startup_notify_id (GAppLaunchContext *context,
   GIcon *icon;
   guint32 timestamp;
   char *startup_id;
+  GFileInfo *fileinfo;
 
   priv = GDK_APP_LAUNCH_CONTEXT (context)->priv;
 
@@ -307,20 +297,32 @@ _gdk_windowing_get_startup_notify_id (GAppLaunchContext *context,
       screen = gdk_display_get_default_screen (display);
     }
 
+  fileinfo = NULL;
+
   files_count = g_list_length (files);
   if (files_count == 0)
-    description = g_strdup_printf (_("Starting %s"), g_app_info_get_name (info));
+    {
+      description = g_strdup_printf (_("Starting %s"), g_app_info_get_name (info));
+    }
   else if (files_count == 1)
     {
-      gchar *display_name = get_display_name (files->data);
+      gchar *display_name;
+
+      if (g_file_is_native (files->data))
+        fileinfo = g_file_query_info (files->data,
+                                      G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME ","
+                                      G_FILE_ATTRIBUTE_STANDARD_ICON,
+                                      0, NULL, NULL);
+
+      display_name = get_display_name (files->data, fileinfo);
       description = g_strdup_printf (_("Opening %s"), display_name);
       g_free (display_name);
     }
   else
     description = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE,
-						"Opening %d Item",
-						"Opening %d Items",
-						files_count), files_count);
+                                                "Opening %d Item",
+                                                "Opening %d Items",
+                                                files_count), files_count);
 
   icon_name = NULL;
   if (priv->icon_name)
@@ -330,18 +332,18 @@ _gdk_windowing_get_startup_notify_id (GAppLaunchContext *context,
       icon = NULL;
 
       if (priv->icon != NULL)
-	icon = g_object_ref (priv->icon);
+        icon = g_object_ref (priv->icon);
       else if (files_count == 1)
-	icon = get_icon (files->data);
+        icon = get_icon (files->data, fileinfo);
 
       if (icon == NULL)
-	{
-	  icon = g_app_info_get_icon (info);
-	  g_object_ref (icon);
-	}
+        {
+          icon = g_app_info_get_icon (info);
+          g_object_ref (icon);
+        }
 
       if (icon)
-	icon_name = gicon_to_string (icon);
+        icon_name = gicon_to_string (icon);
 
       g_object_unref (icon);
     }
@@ -353,7 +355,7 @@ _gdk_windowing_get_startup_notify_id (GAppLaunchContext *context,
     timestamp = gdk_x11_display_get_user_time (display);
 
   screen_str = g_strdup_printf ("%d", gdk_screen_get_number (screen));
-  if (priv->workspace > -1) 
+  if (priv->workspace > -1)
     workspace_str = g_strdup_printf ("%d", priv->workspace);
   else
     workspace_str = NULL;
@@ -364,30 +366,31 @@ _gdk_windowing_get_startup_notify_id (GAppLaunchContext *context,
     application_id = NULL;
 
   startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu",
-				g_get_prgname (),
-				(unsigned long)getpid (),
-				g_get_host_name (),
-				binary_name,
-				sequence++,
-				(unsigned long)timestamp);
-
-  
+                                g_get_prgname (),
+                                (unsigned long)getpid (),
+                                g_get_host_name (),
+                                binary_name,
+                                sequence++,
+                                (unsigned long)timestamp);
+
   gdk_x11_display_broadcast_startup_message (display, "new",
-					     "ID", startup_id,
-					     "NAME", g_app_info_get_name (info),
-					     "SCREEN", screen_str,
-					     "BIN", binary_name,
-					     "ICON", icon_name,
-					     "DESKTOP", workspace_str,
-					     "DESCRIPTION", description,
-					     "WMCLASS", NULL, /* FIXME */
-					     "APPLICATION_ID", application_id,
-					     NULL);
+                                             "ID", startup_id,
+                                             "NAME", g_app_info_get_name (info),
+                                             "SCREEN", screen_str,
+                                             "BIN", binary_name,
+                                             "ICON", icon_name,
+                                             "DESKTOP", workspace_str,
+                                             "DESCRIPTION", description,
+                                             "WMCLASS", NULL, /* FIXME */
+                                             "APPLICATION_ID", application_id,
+                                             NULL);
 
   g_free (description);
   g_free (screen_str);
   g_free (workspace_str);
   g_free (icon_name);
+  if (fileinfo)
+    g_object_unref (fileinfo);
 
   add_startup_timeout (screen, startup_id);
 
@@ -396,8 +399,8 @@ _gdk_windowing_get_startup_notify_id (GAppLaunchContext *context,
 
 
 void
-_gdk_windowing_launch_failed (GAppLaunchContext *context, 
-			      const char        *startup_notify_id)
+_gdk_windowing_launch_failed (GAppLaunchContext *context,
+                              const char        *startup_notify_id)
 {
   GdkAppLaunchContextPrivate *priv;
   GdkScreen *screen;
@@ -419,22 +422,22 @@ _gdk_windowing_launch_failed (GAppLaunchContext *context,
   if (data)
     {
       for (l = data->contexts; l != NULL; l = l->next)
-	{
-	  sn_data = l->data;
-	  if (strcmp (startup_notify_id, sn_data->startup_id) == 0)
-	    {
-	      data->contexts = g_slist_remove (data->contexts, sn_data);
-	      end_startup_notification (sn_data->display, sn_data->startup_id);
-	      free_startup_notification_data (sn_data);
-					      
-	      break;
-	    }
-	}
+        {
+          sn_data = l->data;
+          if (strcmp (startup_notify_id, sn_data->startup_id) == 0)
+            {
+              data->contexts = g_slist_remove (data->contexts, sn_data);
+              end_startup_notification (sn_data->display, sn_data->startup_id);
+              free_startup_notification_data (sn_data);
+
+              break;
+            }
+        }
 
       if (data->contexts == NULL)
-	{
-	  g_source_remove (data->timeout_id);
-	  data->timeout_id = 0;
-	}
+        {
+          g_source_remove (data->timeout_id);
+          data->timeout_id = 0;
+        }
     }
 }
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 6d3edd8a7a..b3d6e61198 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -156,7 +156,11 @@ gtk_public_h_sources =          \
 	gtkactivatable.h	\
 	gtkadjustment.h		\
 	gtkalignment.h		\
-	gtkapplication.h    \
+	gtkappchooser.h		\
+	gtkappchooserdialog.h	\
+	gtkappchooserbutton.h   \
+	gtkappchooserwidget.h	\
+	gtkapplication.h    	\
 	gtkarrow.h		\
 	gtkaspectframe.h	\
 	gtkassistant.h		\
@@ -292,6 +296,7 @@ gtk_public_h_sources =          \
 	gtkstatusicon.h		\
 	gtkstock.h		\
 	gtkstyle.h		\
+	gtkswitch.h		\
 	gtktable.h		\
 	gtktearoffmenuitem.h    \
 	gtktestutils.h		\
@@ -350,6 +355,18 @@ endif
 gtk_semi_private_h_sources =    \
 	gtktextlayout.h
 
+if ENABLE_PACKAGEKIT
+gtk_appchooser_impl_h_sources = \
+	gtkappchooseronlinepk.h \
+	$(NULL)
+endif
+
+if ENABLE_PACKAGEKIT
+gtk_appchooser_impl_c_sources = \
+	gtkappchooseronlinepk.c \
+	$(NULL)
+endif
+
 # GTK+ header files that don't get installed
 gtk_private_h_sources =		\
 	gtkbuttonprivate.h	\
@@ -374,6 +391,9 @@ gtk_private_h_sources =		\
 	gtkmenuprivate.h	\
 	gtkmnemonichash.h	\
 	gtkmountoperationprivate.h \
+	gtkappchooserprivate.h	\
+	gtkappchoosermodule.h 	\
+	gtkappchooseronline.h	\
 	gtkpango.h		\
 	gtkpathbar.h		\
 	gtkplugprivate.h	\
@@ -401,7 +421,8 @@ gtk_private_h_sources =		\
 	gtktreeprivate.h	\
 	gtkwindow-decorate.h	\
 	gtkwidgetprivate.h	\
-	$(gtk_clipboard_dnd_h_sources)
+	$(gtk_clipboard_dnd_h_sources) \
+	$(gtk_appchooser_impl_h_sources)
 
 # GTK+ C sources to build the library from
 gtk_base_c_sources =            \
@@ -419,7 +440,13 @@ gtk_base_c_sources =            \
 	gtkactivatable.c	\
 	gtkadjustment.c		\
 	gtkalignment.c		\
-	gtkapplication.c \
+	gtkappchooser.c		\
+	gtkappchooserwidget.c	\
+	gtkappchooserbutton.c   \
+	gtkappchooserdialog.c	\
+	gtkappchoosermodule.c	\
+	gtkappchooseronline.c	\
+	gtkapplication.c 	\
 	gtkarrow.c		\
 	gtkaspectframe.c	\
 	gtkassistant.c		\
@@ -569,6 +596,7 @@ gtk_base_c_sources =            \
 	gtkstatusicon.c		\
 	gtkstock.c		\
 	gtkstyle.c		\
+	gtkswitch.c		\
 	gtktable.c		\
 	gtktearoffmenuitem.c    \
 	gtktestutils.c		\
@@ -622,7 +650,8 @@ gtk_base_c_sources =            \
 	gtkwidget.c		\
 	gtkwindow-decorate.c    \
 	gtkwindow.c		\
-	$(gtk_clipboard_dnd_c_sources)
+	$(gtk_clipboard_dnd_c_sources) \
+	$(gtk_appchooser_impl_c_sources)
 
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)
diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh
index a48597c178..e818a64fe4 100755
--- a/gtk/abicheck.sh
+++ b/gtk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
+cpp -P -DG_OS_UNIX -DGDK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
 nm -D -g --defined-only .libs/libgtk-x11-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
 diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 4646fa5deb..38889aef1b 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -40,6 +40,10 @@
 #include <gtk/gtkactivatable.h>
 #include <gtk/gtkadjustment.h>
 #include <gtk/gtkalignment.h>
+#include <gtk/gtkappchooser.h>
+#include <gtk/gtkappchooserdialog.h>
+#include <gtk/gtkappchooserwidget.h>
+#include <gtk/gtkappchooserbutton.h>
 #include <gtk/gtkapplication.h>
 #include <gtk/gtkarrow.h>
 #include <gtk/gtkaspectframe.h>
@@ -174,6 +178,7 @@
 #include <gtk/gtkstatusicon.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkstyle.h>
+#include <gtk/gtkswitch.h>
 #include <gtk/gtktable.h>
 #include <gtk/gtktearoffmenuitem.h>
 #include <gtk/gtktextbuffer.h>
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 8188e30e02..7762a0e0a3 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -178,6 +178,35 @@ gtk_alignment_new
 gtk_alignment_set
 gtk_alignment_set_padding
 gtk_alternative_dialog_button_order
+gtk_app_chooser_get_app_info
+gtk_app_chooser_get_content_type
+gtk_app_chooser_get_type G_GNUC_CONST
+gtk_app_chooser_refresh
+gtk_app_chooser_button_append_custom_item
+gtk_app_chooser_button_append_separator
+gtk_app_chooser_button_get_show_dialog_item
+gtk_app_chooser_button_get_type G_GNUC_CONST;
+gtk_app_chooser_button_new
+gtk_app_chooser_button_set_active_custom_item
+gtk_app_chooser_button_set_show_dialog_item
+gtk_app_chooser_dialog_new
+gtk_app_chooser_dialog_new_for_content_type
+gtk_app_chooser_dialog_get_type G_GNUC_CONST
+gtk_app_chooser_dialog_get_widget
+gtk_app_chooser_widget_new
+gtk_app_chooser_widget_get_show_all
+gtk_app_chooser_widget_get_default_text
+gtk_app_chooser_widget_get_show_default
+gtk_app_chooser_widget_get_show_fallback
+gtk_app_chooser_widget_get_show_other
+gtk_app_chooser_widget_get_show_recommended
+gtk_app_chooser_widget_get_type G_GNUC_CONST
+gtk_app_chooser_widget_set_default_text
+gtk_app_chooser_widget_set_show_all
+gtk_app_chooser_widget_set_show_default
+gtk_app_chooser_widget_set_show_fallback
+gtk_app_chooser_widget_set_show_other
+gtk_app_chooser_widget_set_show_recommended
 gtk_application_add_window
 gtk_application_get_type G_GNUC_CONST
 gtk_application_get_windows
@@ -490,6 +519,7 @@ gtk_color_selection_set_previous_alpha
 gtk_color_selection_set_previous_color
 gtk_color_selection_set_previous_rgba
 gtk_combo_box_get_active
+gtk_combo_box_get_active_id
 gtk_combo_box_get_active_iter
 gtk_combo_box_get_add_tearoffs
 gtk_combo_box_get_button_sensitivity
@@ -497,6 +527,7 @@ gtk_combo_box_get_column_span_column
 gtk_combo_box_get_entry_text_column
 gtk_combo_box_get_focus_on_click
 gtk_combo_box_get_has_entry
+gtk_combo_box_get_id_column
 gtk_combo_box_get_model
 gtk_combo_box_get_popup_accessible
 gtk_combo_box_get_popup_fixed_width
@@ -513,24 +544,29 @@ gtk_combo_box_popdown
 gtk_combo_box_popup
 gtk_combo_box_popup_for_device
 gtk_combo_box_set_active
+gtk_combo_box_set_active_id
 gtk_combo_box_set_active_iter
 gtk_combo_box_set_add_tearoffs
 gtk_combo_box_set_button_sensitivity
 gtk_combo_box_set_column_span_column
 gtk_combo_box_set_entry_text_column
 gtk_combo_box_set_focus_on_click
+gtk_combo_box_set_id_column
 gtk_combo_box_set_model
 gtk_combo_box_set_popup_fixed_width
 gtk_combo_box_set_row_separator_func
 gtk_combo_box_set_row_span_column
 gtk_combo_box_set_title
 gtk_combo_box_set_wrap_width
+gtk_combo_box_text_append
 gtk_combo_box_text_append_text
 gtk_combo_box_text_get_active_text
 gtk_combo_box_text_get_type G_GNUC_CONST
+gtk_combo_box_text_insert
 gtk_combo_box_text_insert_text
 gtk_combo_box_text_new
 gtk_combo_box_text_new_with_entry
+gtk_combo_box_text_prepend
 gtk_combo_box_text_prepend_text
 gtk_combo_box_text_remove
 gtk_combo_box_text_remove_all
@@ -1200,9 +1236,11 @@ gtk_info_bar_set_default_response
 gtk_info_bar_set_message_type
 gtk_info_bar_set_response_sensitive
 gtk_init
-gtk_init_abi_check
 gtk_init_check
+#ifdef GDK_WINDOWING_WIN32
+gtk_init_abi_check
 gtk_init_check_abi_check
+#endif
 gtk_init_with_args
 gtk_invisible_get_screen
 gtk_invisible_get_type G_GNUC_CONST
@@ -1386,7 +1424,6 @@ gtk_message_dialog_new_with_markup G_GNUC_PRINTF(5,6)
 gtk_message_dialog_set_image
 gtk_message_dialog_set_markup
 gtk_message_type_get_type G_GNUC_CONST
-gtk_metric_type_get_type G_GNUC_CONST
 gtk_misc_get_alignment
 gtk_misc_get_padding
 gtk_misc_get_type G_GNUC_CONST
@@ -1699,8 +1736,6 @@ gtk_print_operation_set_use_full_page
 gtk_print_pages_get_type G_GNUC_CONST
 gtk_print_quality_get_type G_GNUC_CONST
 gtk_print_run_page_setup_dialog
-gtk_print_run_page_setup_dialog
-gtk_print_run_page_setup_dialog_async
 gtk_print_run_page_setup_dialog_async
 gtk_print_settings_copy
 gtk_print_settings_foreach
@@ -1797,10 +1832,12 @@ gtk_print_unix_dialog_set_manual_capabilities
 gtk_print_unix_dialog_set_page_setup
 gtk_print_unix_dialog_set_settings
 gtk_print_unix_dialog_set_support_selection
+#ifdef GDK_WINDOWING_WIN32
 gtk_print_win32_devnames_free
 gtk_print_win32_devnames_from_printer_name
 gtk_print_win32_devnames_from_win32
 gtk_print_win32_devnames_to_win32
+#endif
 gtk_progress_bar_get_ellipsize
 gtk_progress_bar_get_fraction
 gtk_progress_bar_get_inverted
@@ -2236,6 +2273,10 @@ gtk_stock_item_free
 gtk_stock_list_ids
 gtk_stock_lookup
 gtk_stock_set_translate_func
+gtk_switch_get_active
+gtk_switch_get_type G_GNUC_CONST
+gtk_switch_new
+gtk_switch_set_active
 gtk_style_apply_default_background
 gtk_style_attach
 gtk_style_copy
@@ -3313,7 +3354,9 @@ gtk_widget_trigger_tooltip_query
 gtk_widget_unmap
 gtk_widget_unparent
 gtk_widget_unrealize
+#ifdef GDK_WINDOWING_WIN32
 gtk_win32_embed_widget_get_type G_GNUC_CONST
+#endif
 gtk_window_activate_default
 gtk_window_activate_focus
 gtk_window_activate_key
diff --git a/gtk/gtkappchooser.c b/gtk/gtkappchooser.c
new file mode 100644
index 0000000000..cb630c332b
--- /dev/null
+++ b/gtk/gtkappchooser.c
@@ -0,0 +1,109 @@
+/*
+ * gtkappchooser.c: app-chooser interface
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#include "config.h"
+
+#include "gtkappchooser.h"
+
+#include "gtkintl.h"
+#include "gtkappchooserprivate.h"
+#include "gtkwidget.h"
+
+#include <glib.h>
+
+G_DEFINE_INTERFACE (GtkAppChooser, gtk_app_chooser, GTK_TYPE_WIDGET);
+
+static void
+gtk_app_chooser_default_init (GtkAppChooserIface *iface)
+{
+  GParamSpec *pspec;
+
+  /**
+   * GtkAppChooser:content-type:
+   *
+   * The content type of the #GtkAppChooser object.
+   */
+  pspec = g_param_spec_string ("content-type",
+                               P_("Content type"),
+                               P_("The content type used by the open with object"),
+                               NULL,
+                               G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
+                               G_PARAM_STATIC_STRINGS);
+  g_object_interface_install_property (iface, pspec);
+}
+
+
+/**
+ * gtk_app_chooser_get_content_type:
+ * @self: a #GtkAppChooser
+ *
+ * Returns the current value of the #GtkAppChooser:content-type property.
+ *
+ * Returns: the content type of @self. Free with g_free()
+ *
+ * Since: 3.0
+ */
+gchar *
+gtk_app_chooser_get_content_type (GtkAppChooser *self)
+{
+  gchar *retval = NULL;
+
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER (self), NULL);
+
+  g_object_get (self,
+                "content-type", &retval,
+                NULL);
+
+  return retval;
+}
+
+/**
+ * gtk_app_chooser_get_app_info:
+ * @self: a #GtkAppChooser
+ *
+ * Returns the currently selected application.
+ *
+ * Returns: (transfer full): a #GAppInfo for the currently selected
+ *     application, or %NULL if none is selected. Free with g_object_unref()
+ *
+ * Since: 3.0
+ */
+GAppInfo *
+gtk_app_chooser_get_app_info (GtkAppChooser *self)
+{
+  return GTK_APP_CHOOSER_GET_IFACE (self)->get_app_info (self);
+}
+
+/**
+ * gtk_app_chooser_refresh:
+ * @self: a #GtkAppChooser
+ *
+ * Reloads the list of applications.
+ *
+ * Since: 3.0
+ */
+void
+gtk_app_chooser_refresh (GtkAppChooser *self)
+{
+  GTK_APP_CHOOSER_GET_IFACE (self)->refresh (self);
+}
diff --git a/gtk/gtkappchooser.h b/gtk/gtkappchooser.h
new file mode 100644
index 0000000000..35de8770c2
--- /dev/null
+++ b/gtk/gtkappchooser.h
@@ -0,0 +1,51 @@
+/*
+ * gtkappchooser.h: app-chooser interface
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_APP_CHOOSER_H__
+#define __GTK_APP_CHOOSER_H__
+
+#include <glib.h>
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_APP_CHOOSER    (gtk_app_chooser_get_type ())
+#define GTK_APP_CHOOSER(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER, GtkAppChooser))
+#define GTK_IS_APP_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER))
+
+typedef struct _GtkAppChooser GtkAppChooser;
+
+GType      gtk_app_chooser_get_type         (void) G_GNUC_CONST;
+
+GAppInfo * gtk_app_chooser_get_app_info     (GtkAppChooser *self);
+gchar *    gtk_app_chooser_get_content_type (GtkAppChooser *self);
+void       gtk_app_chooser_refresh          (GtkAppChooser *self);
+
+G_END_DECLS
+
+#endif /* __GTK_APP_CHOOSER_H__ */
+
diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c
new file mode 100644
index 0000000000..a956a7953c
--- /dev/null
+++ b/gtk/gtkappchooserbutton.c
@@ -0,0 +1,784 @@
+/*
+ * gtkappchooserbutton.h: an app-chooser combobox
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#include "config.h"
+
+#include "gtkappchooserbutton.h"
+
+#include "gtkappchooser.h"
+#include "gtkappchooserdialog.h"
+#include "gtkappchooserprivate.h"
+#include "gtkcelllayout.h"
+#include "gtkcellrendererpixbuf.h"
+#include "gtkcellrenderertext.h"
+#include "gtkcombobox.h"
+#include "gtkdialog.h"
+#include "gtkintl.h"
+#include "gtkmarshalers.h"
+
+enum {
+  PROP_CONTENT_TYPE = 1,
+  PROP_SHOW_DIALOG_ITEM,
+};
+
+enum {
+  SIGNAL_CUSTOM_ITEM_ACTIVATED,
+  NUM_SIGNALS
+};
+
+enum {
+  COLUMN_APP_INFO,
+  COLUMN_NAME,
+  COLUMN_LABEL,
+  COLUMN_ICON,
+  COLUMN_CUSTOM,
+  COLUMN_SEPARATOR,
+  NUM_COLUMNS,
+};
+
+#define CUSTOM_ITEM_OTHER_APP "gtk-internal-item-other-app"
+
+static void app_chooser_iface_init (GtkAppChooserIface *iface);
+
+static void real_insert_custom_item (GtkAppChooserButton *self,
+                                     const gchar *name,
+                                     const gchar *label,
+                                     GIcon *icon,
+                                     gboolean custom,
+                                     GtkTreeIter *iter);
+
+static void real_insert_separator (GtkAppChooserButton *self,
+                                   gboolean custom,
+                                   GtkTreeIter *iter);
+
+static guint signals[NUM_SIGNALS] = { 0, };
+
+G_DEFINE_TYPE_WITH_CODE (GtkAppChooserButton, gtk_app_chooser_button, GTK_TYPE_COMBO_BOX,
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER,
+                                                app_chooser_iface_init));
+
+struct _GtkAppChooserButtonPrivate {
+  GtkListStore *store;
+
+  gchar *content_type;
+  gboolean show_dialog_item;
+
+  GHashTable *custom_item_names;
+};
+
+static gboolean
+row_separator_func (GtkTreeModel *model,
+                    GtkTreeIter  *iter,
+                    gpointer      user_data)
+{
+  gboolean separator;
+
+  gtk_tree_model_get (model, iter,
+                      COLUMN_SEPARATOR, &separator,
+                      -1);
+
+  return separator;
+}
+
+static void
+get_first_iter (GtkListStore *store,
+                GtkTreeIter  *iter)
+{
+  GtkTreeIter iter2;
+
+  if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), iter))
+    {
+      /* the model is empty, append */
+      gtk_list_store_append (store, iter);
+    }
+  else
+    {
+      gtk_list_store_insert_before (store, &iter2, iter);
+      *iter = iter2;
+    }
+}
+
+typedef struct {
+  GtkAppChooserButton *self;
+  GAppInfo *info;
+  gint active_index;
+} SelectAppData;
+
+static void
+select_app_data_free (SelectAppData *data)
+{
+  g_clear_object (&data->self);
+  g_clear_object (&data->info);
+
+  g_slice_free (SelectAppData, data);
+}
+
+static gboolean
+select_application_func_cb (GtkTreeModel *model,
+                            GtkTreePath *path,
+                            GtkTreeIter *iter,
+                            gpointer user_data)
+{
+  SelectAppData *data = user_data;
+  GAppInfo *app_to_match = data->info, *app = NULL;
+  gboolean custom;
+
+  gtk_tree_model_get (model, iter,
+                      COLUMN_APP_INFO, &app,
+                      COLUMN_CUSTOM, &custom,
+                      -1);
+
+  /* cutsom items are always after GAppInfos, so iterating further here
+   * is just useless.
+   */
+  if (custom)
+    return TRUE;
+
+  if (g_app_info_equal (app, app_to_match))
+    {
+      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (data->self), iter);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gtk_app_chooser_button_select_application (GtkAppChooserButton *self,
+                                           GAppInfo *info)
+{
+  SelectAppData *data;
+
+  data = g_slice_new0 (SelectAppData);
+  data->self = g_object_ref (self);
+  data->info = g_object_ref (info);
+
+  gtk_tree_model_foreach (GTK_TREE_MODEL (self->priv->store),
+                          select_application_func_cb, data);
+
+  select_app_data_free (data);
+}
+
+static void
+other_application_dialog_response_cb (GtkDialog *dialog,
+                                      gint response_id,
+                                      gpointer user_data)
+{
+  GtkAppChooserButton *self = user_data;
+  GAppInfo *info;
+
+  if (response_id != GTK_RESPONSE_OK)
+    {
+      /* reset the active item, otherwise we are stuck on
+       * 'Other application...'
+       */
+      gtk_combo_box_set_active (GTK_COMBO_BOX (self), 0);
+      gtk_widget_destroy (GTK_WIDGET (dialog));
+      return;
+    }
+
+  info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (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);
+
+  g_object_unref (info);
+}
+
+static void
+other_application_item_activated_cb (GtkAppChooserButton *self)
+{
+  GtkWidget *dialog, *widget;
+  GtkWindow *toplevel;
+
+  toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self)));
+  dialog = gtk_app_chooser_dialog_new_for_content_type (toplevel, GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                        self->priv->content_type);
+  widget = gtk_app_chooser_dialog_get_widget (GTK_APP_CHOOSER_DIALOG (dialog));
+  g_object_set (widget,
+                "show-fallback", TRUE,
+                "show-other", TRUE,
+                NULL);
+  gtk_widget_show (dialog);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (other_application_dialog_response_cb), self);
+}
+
+static void
+gtk_app_chooser_button_ensure_dialog_item (GtkAppChooserButton *self,
+                                           GtkTreeIter *prev_iter)
+{
+  GIcon *icon;
+  GtkTreeIter iter, iter2;
+
+  if (!self->priv->show_dialog_item)
+    return;
+
+  icon = g_themed_icon_new ("application-x-executable");
+
+  if (prev_iter == NULL)
+    gtk_list_store_append (self->priv->store, &iter);
+  else
+    gtk_list_store_insert_after (self->priv->store, &iter, prev_iter);
+
+  real_insert_separator (self, FALSE, &iter);
+  iter2 = iter;
+
+  gtk_list_store_insert_after (self->priv->store, &iter, &iter2);
+  real_insert_custom_item (self, CUSTOM_ITEM_OTHER_APP,
+                           _("Other application..."), icon,
+                           FALSE, &iter);
+
+  g_object_unref (icon);
+}
+
+static void
+gtk_app_chooser_button_populate (GtkAppChooserButton *self)
+{
+  GList *recommended_apps = NULL, *l;
+  GAppInfo *app;
+  GtkTreeIter iter, iter2;
+  GIcon *icon;
+  gboolean cycled_recommended;
+
+  recommended_apps = g_app_info_get_recommended_for_type (self->priv->content_type);
+  cycled_recommended = FALSE;
+
+  for (l = recommended_apps; l != NULL; l = l->next)
+    {
+      app = l->data;
+
+      icon = g_app_info_get_icon (app);
+
+      if (icon == NULL)
+        icon = g_themed_icon_new ("application-x-executable");
+      else
+        g_object_ref (icon);
+
+      if (cycled_recommended)
+        {
+          gtk_list_store_insert_after (self->priv->store, &iter2, &iter);
+          iter = iter2;
+        }
+      else
+        {
+          get_first_iter (self->priv->store, &iter);
+          cycled_recommended = TRUE;
+        }
+
+      gtk_list_store_set (self->priv->store, &iter,
+                          COLUMN_APP_INFO, app,
+                          COLUMN_LABEL, g_app_info_get_display_name (app),
+                          COLUMN_ICON, icon,
+                          COLUMN_CUSTOM, FALSE,
+                          -1);
+
+      g_object_unref (icon);
+    }
+
+  if (!cycled_recommended)
+    gtk_app_chooser_button_ensure_dialog_item (self, NULL);
+  else
+    gtk_app_chooser_button_ensure_dialog_item (self, &iter);
+
+  gtk_combo_box_set_active (GTK_COMBO_BOX (self), 0);
+}
+
+static void
+gtk_app_chooser_button_build_ui (GtkAppChooserButton *self)
+{
+  GtkCellRenderer *cell;
+
+  self->priv->store = gtk_list_store_new (NUM_COLUMNS,
+                                          G_TYPE_APP_INFO,
+                                          G_TYPE_STRING, /* name */
+                                          G_TYPE_STRING, /* label */
+                                          G_TYPE_ICON,
+                                          G_TYPE_BOOLEAN, /* separator */
+                                          G_TYPE_BOOLEAN); /* custom */
+
+  gtk_combo_box_set_model (GTK_COMBO_BOX (self),
+                           GTK_TREE_MODEL (self->priv->store));
+
+  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (self),
+                                        row_separator_func, NULL, NULL);
+
+  cell = gtk_cell_renderer_pixbuf_new ();
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, FALSE);
+  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (self), cell,
+                                  "gicon", COLUMN_ICON,
+                                  NULL);
+
+  cell = gtk_cell_renderer_text_new ();
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, TRUE);
+  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (self), cell,
+                                  "text", COLUMN_LABEL,
+                                  NULL);
+  g_object_set (cell,
+                "xpad", 6,
+                NULL);
+
+  gtk_app_chooser_button_populate (self);
+}
+
+static void
+gtk_app_chooser_button_remove_non_custom (GtkAppChooserButton *self)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  gboolean custom, res;
+
+  model = GTK_TREE_MODEL (self->priv->store);
+
+  if (!gtk_tree_model_get_iter_first (model, &iter))
+    return;
+
+  do {
+    gtk_tree_model_get (model, &iter,
+                        COLUMN_CUSTOM, &custom,
+                        -1);
+    if (custom)
+      res = gtk_tree_model_iter_next (model, &iter);
+    else
+      res = gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+  } while (res);
+}
+
+static void
+gtk_app_chooser_button_changed (GtkComboBox *object)
+{
+  GtkAppChooserButton *self = GTK_APP_CHOOSER_BUTTON (object);
+  GtkTreeIter iter;
+  gchar *name = NULL;
+  gboolean custom;
+  GQuark name_quark;
+
+  if (!gtk_combo_box_get_active_iter (object, &iter))
+    return;
+
+  gtk_tree_model_get (GTK_TREE_MODEL (self->priv->store), &iter,
+                      COLUMN_NAME, &name,
+                      COLUMN_CUSTOM, &custom,
+                      -1);
+
+  if (name != NULL)
+    {
+      if (custom)
+        {
+          name_quark = g_quark_from_string (name);
+          g_signal_emit (self, signals[SIGNAL_CUSTOM_ITEM_ACTIVATED], name_quark, name);
+        }
+      else
+        {
+          /* trigger the dialog internally */
+          other_application_item_activated_cb (self);
+        }
+
+      g_free (name);
+    }
+}
+
+static void
+gtk_app_chooser_button_refresh (GtkAppChooser *object)
+{
+  GtkAppChooserButton *self = GTK_APP_CHOOSER_BUTTON (object);
+
+  gtk_app_chooser_button_remove_non_custom (self);
+  gtk_app_chooser_button_populate (self);
+}
+
+static GAppInfo *
+gtk_app_chooser_button_get_app_info (GtkAppChooser *object)
+{
+  GtkAppChooserButton *self = GTK_APP_CHOOSER_BUTTON (object);
+  GtkTreeIter iter;
+  GAppInfo *info;
+
+  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (self), &iter))
+    return NULL;
+
+  gtk_tree_model_get (GTK_TREE_MODEL (self->priv->store), &iter,
+                      COLUMN_APP_INFO, &info,
+                      -1);
+
+  return info;
+}
+
+static void
+gtk_app_chooser_button_constructed (GObject *obj)
+{
+  GtkAppChooserButton *self = GTK_APP_CHOOSER_BUTTON (obj);
+
+  if (G_OBJECT_CLASS (gtk_app_chooser_button_parent_class)->constructed != NULL)
+    G_OBJECT_CLASS (gtk_app_chooser_button_parent_class)->constructed (obj);
+
+  g_assert (self->priv->content_type != NULL);
+
+  gtk_app_chooser_button_build_ui (self);
+}
+
+static void
+gtk_app_chooser_button_set_property (GObject      *obj,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GtkAppChooserButton *self = GTK_APP_CHOOSER_BUTTON (obj);
+
+  switch (property_id)
+    {
+    case PROP_CONTENT_TYPE:
+      self->priv->content_type = g_value_dup_string (value);
+      break;
+    case PROP_SHOW_DIALOG_ITEM:
+      gtk_app_chooser_button_set_show_dialog_item (self, g_value_get_boolean (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_app_chooser_button_get_property (GObject    *obj,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GtkAppChooserButton *self = GTK_APP_CHOOSER_BUTTON (obj);
+
+  switch (property_id)
+    {
+    case PROP_CONTENT_TYPE:
+      g_value_set_string (value, self->priv->content_type);
+      break;
+    case PROP_SHOW_DIALOG_ITEM:
+      g_value_set_boolean (value, self->priv->show_dialog_item);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_app_chooser_button_finalize (GObject *obj)
+{
+  GtkAppChooserButton *self = GTK_APP_CHOOSER_BUTTON (obj);
+
+  g_hash_table_destroy (self->priv->custom_item_names);
+  g_free (self->priv->content_type);
+
+  G_OBJECT_CLASS (gtk_app_chooser_button_parent_class)->finalize (obj);
+}
+
+static void
+app_chooser_iface_init (GtkAppChooserIface *iface)
+{
+  iface->get_app_info = gtk_app_chooser_button_get_app_info;
+  iface->refresh = gtk_app_chooser_button_refresh;
+}
+
+static void
+gtk_app_chooser_button_class_init (GtkAppChooserButtonClass *klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+  GtkComboBoxClass *combo_class = GTK_COMBO_BOX_CLASS (klass);
+  GParamSpec *pspec;
+
+  oclass->set_property = gtk_app_chooser_button_set_property;
+  oclass->get_property = gtk_app_chooser_button_get_property;
+  oclass->finalize = gtk_app_chooser_button_finalize;
+  oclass->constructed = gtk_app_chooser_button_constructed;
+
+  combo_class->changed = gtk_app_chooser_button_changed;
+
+  g_object_class_override_property (oclass, PROP_CONTENT_TYPE, "content-type");
+
+  /**
+   * GtkAppChooserButton:show-dialog-item:
+   *
+   * The #GtkAppChooserButton:show-dialog-item property determines whether the dropdown menu
+   * should show an item that triggers a #GtkAppChooserDialog when clicked.
+   */
+  pspec =
+    g_param_spec_boolean ("show-dialog-item",
+                          P_("Include an 'Other...' item"),
+                          P_("Whether the combobox should include an item that triggers a GtkAppChooserDialog"),
+                          FALSE,
+                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (oclass, PROP_SHOW_DIALOG_ITEM, pspec);
+
+  /**
+   * GtkAppChooserButton::custom-item-activated:
+   * @self: the object which received the signal
+   * @item_name: the name of the activated item
+   *
+   * Emitted when a custom item, previously added with
+   * gtk_app_chooser_button_append_custom_item(), is activated from the
+   * dropdown menu.
+   */
+  signals[SIGNAL_CUSTOM_ITEM_ACTIVATED] =
+    g_signal_new ("custom-item-activated",
+                  GTK_TYPE_APP_CHOOSER_BUTTON,
+                  G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED,
+                  G_STRUCT_OFFSET (GtkAppChooserButtonClass, custom_item_activated),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__STRING,
+                  G_TYPE_NONE,
+                  1, G_TYPE_STRING);
+
+  g_type_class_add_private (klass, sizeof (GtkAppChooserButtonPrivate));
+}
+
+static void
+gtk_app_chooser_button_init (GtkAppChooserButton *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_APP_CHOOSER_BUTTON,
+                                            GtkAppChooserButtonPrivate);
+  self->priv->custom_item_names =
+    g_hash_table_new_full (g_str_hash, g_str_equal,
+                           g_free, NULL);
+}
+
+static gboolean
+app_chooser_button_iter_from_custom_name (GtkAppChooserButton *self,
+                                          const gchar *name,
+                                          GtkTreeIter *set_me)
+{
+  GtkTreeIter iter;
+  gchar *custom_name = NULL;
+
+  if (!gtk_tree_model_get_iter_first
+      (GTK_TREE_MODEL (self->priv->store), &iter))
+    return FALSE;
+
+  do {
+    gtk_tree_model_get (GTK_TREE_MODEL (self->priv->store), &iter,
+                        COLUMN_NAME, &custom_name,
+                        -1);
+
+    if (g_strcmp0 (custom_name, name) == 0)
+      {
+        g_free (custom_name);
+        *set_me = iter;
+
+        return TRUE;
+      }
+
+    g_free (custom_name);
+  } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (self->priv->store), &iter));
+
+  return FALSE;
+}
+
+static void
+real_insert_custom_item (GtkAppChooserButton *self,
+                         const gchar *name,
+			 const gchar *label,
+			 GIcon *icon,
+			 gboolean custom,
+			 GtkTreeIter *iter)
+{
+  if (custom)
+    {
+      if (g_hash_table_lookup (self->priv->custom_item_names,
+                               name) != NULL)
+        {
+          g_warning ("Attempting to add custom item %s to GtkAppChooserButton, "
+                     "when there's already an item with the same name", name);
+          return;
+        }
+
+      g_hash_table_insert (self->priv->custom_item_names,
+                           g_strdup (name), GINT_TO_POINTER (1));
+    }
+
+  gtk_list_store_set (self->priv->store, iter,
+                      COLUMN_NAME, name,
+                      COLUMN_LABEL, label,
+                      COLUMN_ICON, icon,
+                      COLUMN_CUSTOM, custom,
+                      COLUMN_SEPARATOR, FALSE,
+                      -1);
+}
+
+static void
+real_insert_separator (GtkAppChooserButton *self,
+		       gboolean custom,
+		       GtkTreeIter *iter)
+{
+  gtk_list_store_set (self->priv->store, iter,
+		      COLUMN_CUSTOM, custom,
+		      COLUMN_SEPARATOR, TRUE,
+		      -1);
+}
+
+/**
+ * gtk_app_chooser_button_new:
+ * @content_type: the content type to show applications for
+ *
+ * Creates a new #GtkAppChooserButton for applications
+ * that can handle content of the given type.
+ *
+ * Returns: a newly created #GtkAppChooserButton
+ *
+ * Since: 3.0
+ */
+GtkWidget *
+gtk_app_chooser_button_new (const gchar *content_type)
+{
+  g_return_val_if_fail (content_type != NULL, NULL);
+
+  return g_object_new (GTK_TYPE_APP_CHOOSER_BUTTON,
+                       "content-type", content_type,
+                       NULL);
+}
+
+/**
+ * gtk_app_chooser_button_append_separator:
+ * @self: a #GtkAppChooserButton
+ *
+ * Appends a separator to the list of applications that is shown
+ * in the popup.
+ *
+ * Since: 3.0
+ */
+void
+gtk_app_chooser_button_append_separator (GtkAppChooserButton *self)
+{
+  GtkTreeIter iter;
+
+  g_return_if_fail (GTK_IS_APP_CHOOSER_BUTTON (self));
+
+  gtk_list_store_append (self->priv->store, &iter);
+  real_insert_separator (self, TRUE, &iter);
+}
+
+/**
+ * gtk_app_chooser_button_append_custom_item:
+ * @self: a #GtkAppChooserButton
+ * @name: the name of the custom item
+ * @label: the label for the custom item
+ * @icon: the icon for the custom item
+ *
+ * Appends a custom item to the list of applications that is shown
+ * in the popup; the item name must be unique per-widget.
+ * Clients can use the provided name as a detail for the ::custom-item-activated
+ * signal, to add a callback for the activation of a particular
+ * custom item in the list.
+ * See also gtk_app_chooser_button_append_separator().
+ *
+ * Since: 3.0
+ */
+void
+gtk_app_chooser_button_append_custom_item (GtkAppChooserButton *self,
+                                           const gchar         *name,
+                                           const gchar         *label,
+                                           GIcon               *icon)
+{
+  GtkTreeIter iter;
+
+  g_return_if_fail (GTK_IS_APP_CHOOSER_BUTTON (self));
+  g_return_if_fail (name != NULL);
+
+  gtk_list_store_append (self->priv->store, &iter);
+  real_insert_custom_item (self, name, label, icon, TRUE, &iter);
+}
+
+/**
+ * gtk_app_chooser_button_select_custom_item:
+ * @self: a #GtkAppChooserButton
+ * @name: the name of the custom item
+ *
+ * Selects a custom item previously added with
+ * gtk_app_chooser_button_append_custom_item().
+ * Use gtk_app_chooser_refresh() to bring the selection to its initial
+ * state.
+ *
+ * Since: 3.0
+ */
+void
+gtk_app_chooser_button_set_active_custom_item (GtkAppChooserButton *self,
+                                               const gchar         *name)
+{
+  GtkTreeIter iter;
+
+  g_return_if_fail (GTK_IS_APP_CHOOSER_BUTTON (self));
+  g_return_if_fail (name != NULL);
+
+  if (g_hash_table_lookup (self->priv->custom_item_names, name) == NULL ||
+      !app_chooser_button_iter_from_custom_name (self, name, &iter))
+    {
+      g_warning ("Can't find the item named %s in the app chooser.",
+                 name);
+      return;
+    }
+
+  gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self), &iter);
+}
+
+/**
+ * gtk_app_chooser_button_get_show_dialog_item:
+ * @self: a #GtkAppChooserButton
+ *
+ * Returns the current value of the #GtkAppChooserButton:show-dialog-item
+ * property.
+ *
+ * Returns: the value of #GtkAppChooserButton:show-dialog-item
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_app_chooser_button_get_show_dialog_item (GtkAppChooserButton *self)
+{
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER_BUTTON (self), FALSE);
+
+  return self->priv->show_dialog_item;
+}
+
+/**
+ * gtk_app_chooser_button_set_show_dialog_item:
+ * @self: a #GtkAppChooserButton
+ * @setting: the new value for #GtkAppChooserButton:show-dialog-item
+ *
+ * Sets whether the dropdown menu of this button should show an
+ * entry to trigger a #GtkAppChooserDialog.
+ *
+ * Since: 3.0
+ */
+void
+gtk_app_chooser_button_set_show_dialog_item (GtkAppChooserButton *self,
+                                             gboolean setting)
+{
+  if (self->priv->show_dialog_item != setting)
+    {
+      self->priv->show_dialog_item = setting;
+
+      g_object_notify (G_OBJECT (self), "show-dialog-item");
+
+      gtk_app_chooser_refresh (GTK_APP_CHOOSER (self));
+    }
+}
diff --git a/gtk/gtkappchooserbutton.h b/gtk/gtkappchooserbutton.h
new file mode 100644
index 0000000000..67fc5de5d5
--- /dev/null
+++ b/gtk/gtkappchooserbutton.h
@@ -0,0 +1,78 @@
+/*
+ * gtkappchooserbutton.h: an app-chooser combobox
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_APP_CHOOSER_BUTTON_H__
+#define __GTK_APP_CHOOSER_BUTTON_H__
+
+#include <gtk/gtkcombobox.h>
+#include <gio/gio.h>
+
+#define GTK_TYPE_APP_CHOOSER_BUTTON            (gtk_app_chooser_button_get_type ())
+#define GTK_APP_CHOOSER_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_BUTTON, GtkAppChooserButton))
+#define GTK_APP_CHOOSER_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_BUTTON, GtkAppChooserButtonClass))
+#define GTK_IS_APP_CHOOSER_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_BUTTON))
+#define GTK_IS_APP_CHOOSER_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_BUTTON))
+#define GTK_APP_CHOOSER_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_BUTTON, GtkAppChooserButtonClass))
+
+typedef struct _GtkAppChooserButton        GtkAppChooserButton;
+typedef struct _GtkAppChooserButtonClass   GtkAppChooserButtonClass;
+typedef struct _GtkAppChooserButtonPrivate GtkAppChooserButtonPrivate;
+
+struct _GtkAppChooserButton {
+  GtkComboBox parent;
+
+  /*< private >*/
+  GtkAppChooserButtonPrivate *priv;
+};
+
+struct _GtkAppChooserButtonClass {
+  GtkComboBoxClass parent_class;
+
+  void (* custom_item_activated) (GtkAppChooserButton *self,
+                                  const gchar *item_name);
+
+  /* padding for future class expansion */
+  gpointer padding[16];
+};
+
+GType       gtk_app_chooser_button_get_type           (void) G_GNUC_CONST;
+
+GtkWidget * gtk_app_chooser_button_new                (const gchar         *content_type);
+
+void        gtk_app_chooser_button_append_separator   (GtkAppChooserButton *self);
+void        gtk_app_chooser_button_append_custom_item (GtkAppChooserButton *self,
+                                                       const gchar         *name,
+                                                       const gchar         *label,
+                                                       GIcon               *icon);
+void     gtk_app_chooser_button_set_active_custom_item (GtkAppChooserButton *self,
+                                                        const gchar         *name);
+
+void     gtk_app_chooser_button_set_show_dialog_item  (GtkAppChooserButton *self,
+                                                       gboolean             setting);
+gboolean gtk_app_chooser_button_get_show_dialog_item  (GtkAppChooserButton *self);
+
+#endif /* __GTK_APP_CHOOSER_BUTTON_H__ */
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
new file mode 100644
index 0000000000..83cf7e00e4
--- /dev/null
+++ b/gtk/gtkappchooserdialog.c
@@ -0,0 +1,787 @@
+/*
+ * gtkappchooserdialog.c: an app-chooser dialog
+ *
+ * Copyright (C) 2004 Novell, Inc.
+ * Copyright (C) 2007, 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Dave Camp <dave@novell.com>
+ *          Alexander Larsson <alexl@redhat.com>
+ *          Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#include "config.h"
+
+#include "gtkappchooserdialog.h"
+
+#include "gtkintl.h"
+#include "gtkappchooser.h"
+#include "gtkappchooseronline.h"
+#include "gtkappchooserprivate.h"
+#include "gtkappchooserprivate.h"
+
+#include "gtkmessagedialog.h"
+#include "gtklabel.h"
+#include "gtkbbox.h"
+#include "gtkbutton.h"
+#include "gtkmenuitem.h"
+#include "gtkstock.h"
+
+#include <string.h>
+#include <glib/gi18n-lib.h>
+#include <gio/gio.h>
+
+#define sure_string(s) ((const char *) ((s) != NULL ? (s) : ""))
+
+struct _GtkAppChooserDialogPrivate {
+  char *content_type;
+  GFile *gfile;
+
+  GtkWidget *label;
+  GtkWidget *button;
+  GtkWidget *online_button;
+
+  GtkWidget *open_label;
+
+  GtkWidget *app_chooser_widget;
+  GtkWidget *show_more_button;
+
+  GtkAppChooserOnline *online;
+
+  gboolean show_more_clicked;
+};
+
+enum {
+  PROP_GFILE = 1,
+  PROP_CONTENT_TYPE,
+  N_PROPERTIES
+};
+
+static void gtk_app_chooser_dialog_iface_init (GtkAppChooserIface *iface);
+G_DEFINE_TYPE_WITH_CODE (GtkAppChooserDialog, gtk_app_chooser_dialog, GTK_TYPE_DIALOG,
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER,
+                                                gtk_app_chooser_dialog_iface_init));
+
+static void
+show_error_dialog (const gchar *primary,
+                   const gchar *secondary,
+                   GtkWindow   *parent)
+{
+  GtkWidget *message_dialog;
+
+  message_dialog = gtk_message_dialog_new (parent, 0,
+                                           GTK_MESSAGE_ERROR,
+                                           GTK_BUTTONS_OK,
+                                           NULL);
+  g_object_set (message_dialog,
+                "text", primary,
+                "secondary-text", secondary,
+                NULL);
+  gtk_dialog_set_default_response (GTK_DIALOG (message_dialog), GTK_RESPONSE_OK);
+
+  gtk_widget_show (message_dialog);
+
+  g_signal_connect (message_dialog, "response",
+                    G_CALLBACK (gtk_widget_destroy), NULL);
+}
+
+static void
+search_for_mimetype_ready_cb (GObject      *source,
+                              GAsyncResult *res,
+                              gpointer      user_data)
+{
+  GtkAppChooserOnline *online = GTK_APP_CHOOSER_ONLINE (source);
+  GtkAppChooserDialog *self = user_data;
+  GError *error = NULL;
+
+  gtk_app_chooser_online_search_for_mimetype_finish (online, res, &error);
+
+  if (error != NULL)
+    {
+      show_error_dialog (_("Failed to look for applications online"),
+                         error->message, GTK_WINDOW (self));
+      g_error_free (error);
+    }
+  else
+    {
+      gtk_app_chooser_refresh (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
+    }
+}
+
+static void
+online_button_clicked_cb (GtkButton *b,
+                          gpointer   user_data)
+{
+  GtkAppChooserDialog *self = user_data;
+
+  gtk_app_chooser_online_search_for_mimetype_async (self->priv->online,
+                                                    self->priv->content_type,
+                                                    GTK_WINDOW (self),
+                                                    search_for_mimetype_ready_cb,
+                                                    self);
+}
+
+static void
+app_chooser_online_get_default_ready_cb (GObject *source,
+                                         GAsyncResult *res,
+                                         gpointer user_data)
+{
+  GtkAppChooserDialog *self = user_data;
+
+  self->priv->online = gtk_app_chooser_online_get_default_finish (source, res);
+
+  if (self->priv->online != NULL)
+    {
+      GtkWidget *action_area;
+
+      action_area = gtk_dialog_get_action_area (GTK_DIALOG (self));
+      self->priv->online_button = gtk_button_new_with_label (_("Find applications online"));
+      gtk_box_pack_start (GTK_BOX (action_area), self->priv->online_button,
+                          FALSE, FALSE, 0);
+      gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area), self->priv->online_button,
+                                          TRUE);
+      g_signal_connect (self->priv->online_button, "clicked",
+                        G_CALLBACK (online_button_clicked_cb), self);
+
+      gtk_widget_show (self->priv->online_button);
+    }
+}
+
+static void
+ensure_online_button (GtkAppChooserDialog *self)
+{
+  gtk_app_chooser_online_get_default_async (app_chooser_online_get_default_ready_cb, self);
+}
+
+/* An application is valid if:
+ *
+ * 1) The file exists
+ * 2) The user has permissions to run the file
+ */
+static gboolean
+check_application (GtkAppChooserDialog  *self,
+                   GAppInfo            **app_out)
+{
+  const char *command;
+  char *path = NULL;
+  char **argv = NULL;
+  int argc;
+  GError *error = NULL;
+  gint retval = TRUE;
+  GAppInfo *info;
+
+  command = NULL;
+
+  info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
+  command = g_app_info_get_executable (info);
+
+  g_shell_parse_argv (command, &argc, &argv, &error);
+
+  if (error)
+    {
+      show_error_dialog (_("Could not run application"),
+                         error->message,
+                         GTK_WINDOW (self));
+      g_error_free (error);
+      retval = FALSE;
+      goto cleanup;
+    }
+
+  path = g_find_program_in_path (argv[0]);
+  if (!path)
+    {
+      char *error_message;
+
+      error_message = g_strdup_printf (_("Could not find '%s'"),
+                                       argv[0]);
+
+      show_error_dialog (_("Could not find application"),
+                         error_message,
+                         GTK_WINDOW (self));
+      g_free (error_message);
+      retval = FALSE;
+      goto cleanup;
+    }
+
+  *app_out = info;
+
+ cleanup:
+  g_strfreev (argv);
+  g_free (path);
+
+  return retval;
+}
+
+static void
+add_or_find_application (GtkAppChooserDialog *self)
+{
+  GAppInfo *app;
+
+  app = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self));
+
+  /* we don't care about reporting errors here */
+  g_app_info_add_supports_type (app,
+                                self->priv->content_type,
+                                NULL);
+
+  g_object_unref (app);
+}
+
+static void
+gtk_app_chooser_dialog_response (GtkDialog *dialog,
+                                 gint       response_id,
+                                 gpointer   user_data)
+{
+  GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (dialog);
+
+  switch (response_id)
+    {
+    case GTK_RESPONSE_OK:
+      add_or_find_application (self);
+      break;
+    default :
+      break;
+    }
+}
+
+static void
+widget_application_selected_cb (GtkAppChooserWidget *widget,
+                                GAppInfo            *app_info,
+                                gpointer             user_data)
+{
+  GtkAppChooserDialog *self = user_data;
+
+  gtk_widget_set_sensitive (self->priv->button, TRUE);
+}
+
+static void
+widget_application_activated_cb (GtkAppChooserWidget *widget,
+                                 GAppInfo            *app_info,
+                                 gpointer             user_data)
+{
+  GtkAppChooserDialog *self = user_data;
+
+  gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
+}
+
+static char *
+get_extension (const char *basename)
+{
+  char *p;
+
+  p = strrchr (basename, '.');
+
+  if (p && *(p + 1) != '\0')
+    return g_strdup (p + 1);
+
+  return NULL;
+}
+
+static void
+set_dialog_properties (GtkAppChooserDialog *self)
+{
+  gchar *label;
+  gchar *name;
+  gchar *extension;
+  gchar *description;
+  gchar *default_text;
+  gchar *string;
+  PangoFontDescription *font_desc;
+
+  name = NULL;
+  extension = NULL;
+  label = NULL;
+  description = NULL;
+
+  if (self->priv->gfile != NULL)
+    {
+      name = g_file_get_basename (self->priv->gfile);
+      extension = get_extension (name);
+    }
+
+  description = g_content_type_get_description (self->priv->content_type);
+  gtk_window_set_title (GTK_WINDOW (self), "");
+
+  if (name != NULL)
+    {
+      /* Translators: %s is a filename */
+      label = g_strdup_printf (_("Select an application to open \"%s\""), name);
+      string = g_strdup_printf (_("No applications available to open \"%s\""),
+                                name);
+    }
+  else
+    {
+      /* Translators: %s is a file type description */
+      label = g_strdup_printf (_("Select an application for \"%s\" files"),
+                               g_content_type_is_unknown (self->priv->content_type) ?
+                               self->priv->content_type : description);
+      string = g_strdup_printf (_("No applications available to open \"%s\" files"),
+                               g_content_type_is_unknown (self->priv->content_type) ?
+                               self->priv->content_type : description);
+    }
+
+  font_desc = pango_font_description_new ();
+  pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD);
+  gtk_widget_modify_font (self->priv->label, font_desc);
+  pango_font_description_free (font_desc);
+
+  gtk_label_set_markup (GTK_LABEL (self->priv->label), label);
+
+  default_text = g_strdup_printf ("<big><b>%s</b></big>\n%s",
+                                  string,
+                                  _("Click \"Show other applications\", for more options, or "
+                                    "\"Find applications online\" to install a new application"));
+
+  gtk_app_chooser_widget_set_default_text (GTK_APP_CHOOSER_WIDGET (self->priv->app_chooser_widget),
+                                           default_text);
+
+  g_free (label);
+  g_free (name);
+  g_free (extension);
+  g_free (description);
+  g_free (string);
+  g_free (default_text);
+}
+
+static void
+show_more_button_clicked_cb (GtkButton *button,
+                             gpointer   user_data)
+{
+  GtkAppChooserDialog *self = user_data;
+
+  g_object_set (self->priv->app_chooser_widget,
+                "show-recommended", TRUE,
+                "show-fallback", TRUE,
+                "show-other", TRUE,
+                NULL);
+
+  gtk_widget_hide (self->priv->show_more_button);
+  self->priv->show_more_clicked = TRUE;
+}
+
+static void
+widget_notify_for_button_cb (GObject    *source,
+                             GParamSpec *pspec,
+                             gpointer    user_data)
+{
+  GtkAppChooserDialog *self = user_data;
+  GtkAppChooserWidget *widget = GTK_APP_CHOOSER_WIDGET (source);
+  gboolean should_hide;
+
+  should_hide = gtk_app_chooser_widget_get_show_all (widget) ||
+    self->priv->show_more_clicked;
+
+  if (should_hide)
+    gtk_widget_hide (self->priv->show_more_button);
+}
+
+static void
+forget_menu_item_activate_cb (GtkMenuItem *item,
+                              gpointer     user_data)
+{
+  GtkAppChooserDialog *self = user_data;
+  GAppInfo *info;
+
+  info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self));
+
+  if (info != NULL)
+    {
+      g_app_info_remove_supports_type (info, self->priv->content_type, NULL);
+
+      gtk_app_chooser_refresh (GTK_APP_CHOOSER (self));
+
+      g_object_unref (info);
+    }
+}
+
+static GtkWidget *
+build_forget_menu_item (GtkAppChooserDialog *self)
+{
+  GtkWidget *retval;
+
+  retval = gtk_menu_item_new_with_label (_("Forget association"));
+  gtk_widget_show (retval);
+
+  g_signal_connect (retval, "activate",
+                    G_CALLBACK (forget_menu_item_activate_cb), self);
+
+  return retval;
+}
+
+static void
+widget_populate_popup_cb (GtkAppChooserWidget *widget,
+                          GtkMenu             *menu,
+                          GAppInfo            *info,
+                          gpointer             user_data)
+{
+  GtkAppChooserDialog *self = user_data;
+  GtkWidget *menu_item;
+
+  if (g_app_info_can_remove_supports_type (info))
+    {
+      menu_item = build_forget_menu_item (self);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    }
+}
+
+static void
+build_dialog_ui (GtkAppChooserDialog *self)
+{
+  GtkWidget *vbox;
+  GtkWidget *vbox2;
+  GtkWidget *label;
+  GtkWidget *button, *w;
+
+  gtk_container_set_border_width (GTK_CONTAINER (self), 5);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), vbox2, TRUE, TRUE, 0);
+  gtk_widget_show (vbox2);
+
+  self->priv->label = gtk_label_new ("");
+  gtk_misc_set_alignment (GTK_MISC (self->priv->label), 0, 0.5);
+  gtk_label_set_line_wrap (GTK_LABEL (self->priv->label), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox2), self->priv->label,
+                      FALSE, FALSE, 0);
+  gtk_widget_show (self->priv->label);
+
+  self->priv->app_chooser_widget =
+    gtk_app_chooser_widget_new (self->priv->content_type);
+  gtk_box_pack_start (GTK_BOX (vbox2), self->priv->app_chooser_widget, TRUE, TRUE, 0);
+  gtk_widget_show (self->priv->app_chooser_widget);
+
+  g_signal_connect (self->priv->app_chooser_widget, "application-selected",
+                    G_CALLBACK (widget_application_selected_cb), self);
+  g_signal_connect (self->priv->app_chooser_widget, "application-activated",
+                    G_CALLBACK (widget_application_activated_cb), self);
+  g_signal_connect (self->priv->app_chooser_widget, "notify::show-all",
+                    G_CALLBACK (widget_notify_for_button_cb), self);
+  g_signal_connect (self->priv->app_chooser_widget, "populate-popup",
+                    G_CALLBACK (widget_populate_popup_cb), self);
+
+  button = gtk_button_new_with_label (_("Show other applications"));
+  self->priv->show_more_button = button;
+  w = gtk_image_new_from_stock (GTK_STOCK_ADD,
+                                GTK_ICON_SIZE_BUTTON);
+  gtk_button_set_image (GTK_BUTTON (button), w);
+  gtk_box_pack_start (GTK_BOX (self->priv->app_chooser_widget), button, FALSE, FALSE, 6);
+  gtk_widget_show_all (button);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (show_more_button_clicked_cb), self);
+
+  gtk_dialog_add_button (GTK_DIALOG (self),
+                         GTK_STOCK_CANCEL,
+                         GTK_RESPONSE_CANCEL);
+
+  /* Create a custom stock icon */
+  self->priv->button = gtk_button_new ();
+
+  label = gtk_label_new_with_mnemonic (_("_Open"));
+  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;
+
+  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);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (self),
+                                   GTK_RESPONSE_OK);
+}
+
+static void
+set_gfile_and_content_type (GtkAppChooserDialog *self,
+                            GFile *file)
+{
+  GFileInfo *info;
+
+  if (file == NULL)
+    return;
+
+  self->priv->gfile = g_object_ref (file);
+
+  info = g_file_query_info (self->priv->gfile,
+                            G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+                            0, NULL, NULL);
+  self->priv->content_type = g_strdup (g_file_info_get_content_type (info));
+
+  g_object_unref (info);
+}
+
+static GAppInfo *
+gtk_app_chooser_dialog_get_app_info (GtkAppChooser *object)
+{
+  GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
+  GAppInfo *app = NULL;
+
+  if (!check_application (self, &app))
+    return NULL;
+
+  return app;
+}
+
+static void
+gtk_app_chooser_dialog_refresh (GtkAppChooser *object)
+{
+  GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
+
+  gtk_app_chooser_refresh (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
+}
+
+static void
+gtk_app_chooser_dialog_constructed (GObject *object)
+{
+  GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
+
+  g_assert (self->priv->content_type != NULL ||
+            self->priv->gfile != NULL);
+
+  if (G_OBJECT_CLASS (gtk_app_chooser_dialog_parent_class)->constructed != NULL)
+    G_OBJECT_CLASS (gtk_app_chooser_dialog_parent_class)->constructed (object);
+
+  build_dialog_ui (self);
+  set_dialog_properties (self);
+  ensure_online_button (self);
+}
+
+static void
+gtk_app_chooser_dialog_dispose (GObject *object)
+{
+  GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
+  
+  g_clear_object (&self->priv->gfile);
+  g_clear_object (&self->priv->online);
+
+  G_OBJECT_CLASS (gtk_app_chooser_dialog_parent_class)->dispose (object);
+}
+
+static void
+gtk_app_chooser_dialog_finalize (GObject *object)
+{
+  GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
+
+  g_free (self->priv->content_type);
+
+  G_OBJECT_CLASS (gtk_app_chooser_dialog_parent_class)->finalize (object);
+}
+
+static void
+gtk_app_chooser_dialog_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
+
+  switch (property_id)
+    {
+    case PROP_GFILE:
+      set_gfile_and_content_type (self, g_value_get_object (value));
+      break;
+    case PROP_CONTENT_TYPE:
+      /* don't try to override a value previously set with the GFile */
+      if (self->priv->content_type == NULL)
+        self->priv->content_type = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_app_chooser_dialog_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (object);
+
+  switch (property_id)
+    {
+    case PROP_GFILE:
+      if (self->priv->gfile != NULL)
+        g_value_set_object (value, self->priv->gfile);
+      break;
+    case PROP_CONTENT_TYPE:
+      g_value_set_string (value, self->priv->content_type);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_app_chooser_dialog_iface_init (GtkAppChooserIface *iface)
+{
+  iface->get_app_info = gtk_app_chooser_dialog_get_app_info;
+  iface->refresh = gtk_app_chooser_dialog_refresh;
+}
+
+static void
+gtk_app_chooser_dialog_class_init (GtkAppChooserDialogClass *klass)
+{
+  GObjectClass *gobject_class;
+  GParamSpec *pspec;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->dispose = gtk_app_chooser_dialog_dispose;
+  gobject_class->finalize = gtk_app_chooser_dialog_finalize;
+  gobject_class->set_property = gtk_app_chooser_dialog_set_property;
+  gobject_class->get_property = gtk_app_chooser_dialog_get_property;
+  gobject_class->constructed = gtk_app_chooser_dialog_constructed;
+
+  g_object_class_override_property (gobject_class, PROP_CONTENT_TYPE, "content-type");
+
+  /**
+   * GtkAppChooserDialog:gfile:
+   *
+   * The GFile used by the #GtkAppChooserDialog.
+   * The dialog's #GtkAppChooserWidget content type will be guessed from the
+   * file, if present.
+   */
+  pspec = g_param_spec_object ("gfile",
+                               P_("GFile"),
+                               P_("The GFile used by the app chooser dialog"),
+                               G_TYPE_FILE,
+                               G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
+                               G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (gobject_class, PROP_GFILE, pspec);
+
+  g_type_class_add_private (klass, sizeof (GtkAppChooserDialogPrivate));
+}
+
+static void
+gtk_app_chooser_dialog_init (GtkAppChooserDialog *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_APP_CHOOSER_DIALOG,
+                                            GtkAppChooserDialogPrivate);
+
+  /* we can't override the class signal handler here, as it's a RUN_LAST;
+   * we want our signal handler instead to be executed before any user code.
+   */
+  g_signal_connect (self, "response",
+                    G_CALLBACK (gtk_app_chooser_dialog_response), NULL);
+}
+
+static void
+set_parent_and_flags (GtkWidget      *dialog,
+                      GtkWindow      *parent,
+                      GtkDialogFlags  flags)
+{
+  if (parent != NULL)
+    gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+
+  if (flags & GTK_DIALOG_MODAL)
+    gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+  if (flags & GTK_DIALOG_DESTROY_WITH_PARENT)
+    gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+}
+
+/**
+ * gtk_app_chooser_dialog_new:
+ * @parent: (allow-none): a #GtkWindow, or %NULL
+ * @flags: flags for this dialog
+ * @file: a #GFile
+ *
+ * Creates a new #GtkAppChooserDialog for the provided #GFile,
+ * to allow the user to select an application for it.
+ *
+ * Returns: a newly created #GtkAppChooserDialog
+ *
+ * Since: 3.0
+ **/
+GtkWidget *
+gtk_app_chooser_dialog_new (GtkWindow      *parent,
+                            GtkDialogFlags  flags,
+                            GFile          *file)
+{
+  GtkWidget *retval;
+
+  g_return_val_if_fail (G_IS_FILE (file), NULL);
+
+  retval = g_object_new (GTK_TYPE_APP_CHOOSER_DIALOG,
+                         "gfile", file,
+                         NULL);
+
+  set_parent_and_flags (retval, parent, flags);
+
+  return retval;
+}
+
+/**
+ * gtk_app_chooser_dialog_new_for_content_type:
+ * @parent: (allow-none): a #GtkWindow, or %NULL
+ * @flags: flags for this dialog
+ * @content_type: a content type string
+ *
+ * Creates a new #GtkAppChooserDialog for the provided content type,
+ * to allow the user to select an application for it.
+ *
+ * Returns: a newly created #GtkAppChooserDialog
+ *
+ * Since: 3.0
+ **/
+GtkWidget *
+gtk_app_chooser_dialog_new_for_content_type (GtkWindow      *parent,
+                                             GtkDialogFlags  flags,
+                                             const gchar    *content_type)
+{
+  GtkWidget *retval;
+
+  g_return_val_if_fail (content_type != NULL, NULL);
+
+  retval = g_object_new (GTK_TYPE_APP_CHOOSER_DIALOG,
+                         "content-type", content_type,
+                         NULL);
+
+  set_parent_and_flags (retval, parent, flags);
+
+  return retval;
+}
+
+/**
+ * gtk_app_chooser_dialog_get_widget:
+ * @self: a #GtkAppChooserDialog
+ *
+ * Returns the #GtkAppChooserWidget of this dialog.
+ *
+ * Returns: (transfer none): the #GtkAppChooserWidget of @self
+ *
+ * Since: 3.0
+ */
+GtkWidget *
+gtk_app_chooser_dialog_get_widget (GtkAppChooserDialog *self)
+{
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER_DIALOG (self), NULL);
+
+  return self->priv->app_chooser_widget;
+}
diff --git a/gtk/gtkappchooserdialog.h b/gtk/gtkappchooserdialog.h
new file mode 100644
index 0000000000..bcb3dd97d4
--- /dev/null
+++ b/gtk/gtkappchooserdialog.h
@@ -0,0 +1,73 @@
+/*
+ * gtkappchooserdialog.h: an app-chooser dialog
+ *
+ * Copyright (C) 2004 Novell, Inc.
+ * Copyright (C) 2007, 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Dave Camp <dave@novell.com>
+ *          Alexander Larsson <alexl@redhat.com>
+ *          Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_APP_CHOOSER_DIALOG_H__
+#define __GTK_APP_CHOOSER_DIALOG_H__
+
+#include <gtk/gtkdialog.h>
+#include <gio/gio.h>
+
+#define GTK_TYPE_APP_CHOOSER_DIALOG            (gtk_app_chooser_dialog_get_type ())
+#define GTK_APP_CHOOSER_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialog))
+#define GTK_APP_CHOOSER_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialogClass))
+#define GTK_IS_APP_CHOOSER_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_DIALOG))
+#define GTK_IS_APP_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_DIALOG))
+#define GTK_APP_CHOOSER_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_DIALOG, GtkAppChooserDialogClass))
+
+typedef struct _GtkAppChooserDialog        GtkAppChooserDialog;
+typedef struct _GtkAppChooserDialogClass   GtkAppChooserDialogClass;
+typedef struct _GtkAppChooserDialogPrivate GtkAppChooserDialogPrivate;
+
+struct _GtkAppChooserDialog {
+  GtkDialog parent;
+
+  /*< private >*/
+  GtkAppChooserDialogPrivate *priv;
+};
+
+struct _GtkAppChooserDialogClass {
+  GtkDialogClass parent_class;
+
+  /* padding for future class expansion */
+  gpointer padding[16];
+};
+
+GType       gtk_app_chooser_dialog_get_type             (void) G_GNUC_CONST;
+
+GtkWidget * gtk_app_chooser_dialog_new                  (GtkWindow      *parent,
+                                                         GtkDialogFlags  flags,
+                                                         GFile          *file);
+GtkWidget * gtk_app_chooser_dialog_new_for_content_type (GtkWindow      *parent,
+                                                         GtkDialogFlags  flags,
+                                                         const gchar    *content_type);
+
+GtkWidget * gtk_app_chooser_dialog_get_widget           (GtkAppChooserDialog *self);
+
+#endif /* __GTK_APP_CHOOSER_DIALOG_H__ */
diff --git a/gtk/gtkappchoosermodule.c b/gtk/gtkappchoosermodule.c
new file mode 100644
index 0000000000..afcf3de966
--- /dev/null
+++ b/gtk/gtkappchoosermodule.c
@@ -0,0 +1,59 @@
+/*
+ * gtkappchoosermodule.c: an extension point for online integration
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#include "config.h"
+
+#include "gtkappchoosermodule.h"
+
+#include <gio/gio.h>
+
+#include "gtkappchooseronline.h"
+
+#ifdef ENABLE_PACKAGEKIT
+#include "gtkappchooseronlinepk.h"
+#endif
+
+G_LOCK_DEFINE_STATIC (registered_ep);
+
+void
+_gtk_app_chooser_module_ensure (void)
+{
+  static gboolean registered_ep = FALSE;
+  GIOExtensionPoint *ep;
+
+  G_LOCK (registered_ep);
+
+  if (!registered_ep)
+    {
+      registered_ep = TRUE;
+
+      ep = g_io_extension_point_register ("gtkappchooser-online");
+      g_io_extension_point_set_required_type (ep, GTK_TYPE_APP_CHOOSER_ONLINE);
+
+#ifdef ENABLE_PACKAGEKIT
+      _gtk_app_chooser_online_pk_get_type ();
+#endif
+    }
+
+  G_UNLOCK (registered_ep);
+}
diff --git a/gtk/gtkappchoosermodule.h b/gtk/gtkappchoosermodule.h
new file mode 100644
index 0000000000..cb66c95ff4
--- /dev/null
+++ b/gtk/gtkappchoosermodule.h
@@ -0,0 +1,35 @@
+/*
+ * gtkappchoosermodule.h: an extension point for online integration
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#ifndef __GTK_APP_CHOOSER_MODULE_H__
+#define __GTK_APP_CHOOSER_MODULE_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+void _gtk_app_chooser_module_ensure (void);
+
+G_END_DECLS
+
+#endif /* __GTK_APP_CHOOSER_MODULE_H__ */
diff --git a/gtk/gtkappchooseronline.c b/gtk/gtkappchooseronline.c
new file mode 100644
index 0000000000..71267ca7f5
--- /dev/null
+++ b/gtk/gtkappchooseronline.c
@@ -0,0 +1,106 @@
+/*
+ * gtkappchooseronline.h: an extension point for online integration
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#include "config.h"
+
+#include "gtkappchooseronline.h"
+
+#include "gtkappchoosermodule.h"
+#include "gtkintl.h"
+
+#include <gio/gio.h>
+
+#define gtk_app_chooser_online_get_type _gtk_app_chooser_online_get_type
+static void gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface);
+G_DEFINE_INTERFACE_WITH_CODE (GtkAppChooserOnline, gtk_app_chooser_online, G_TYPE_OBJECT,
+                              g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_ASYNC_INITABLE);)
+
+static void
+gtk_app_chooser_online_default_init (GtkAppChooserOnlineInterface *iface)
+{
+  /* do nothing */
+}
+
+GtkAppChooserOnline *
+gtk_app_chooser_online_get_default_finish (GObject *source,
+                                           GAsyncResult *result)
+{
+  GtkAppChooserOnline *retval;
+
+  retval = GTK_APP_CHOOSER_ONLINE (g_async_initable_new_finish (G_ASYNC_INITABLE (source),
+                                                                result, NULL));
+
+  return retval;
+}  
+
+void
+gtk_app_chooser_online_get_default_async (GAsyncReadyCallback callback,
+                                          gpointer user_data)
+{
+  GIOExtensionPoint *ep;
+  GIOExtension *extension;
+  GList *extensions;
+
+  _gtk_app_chooser_module_ensure ();
+
+  ep = g_io_extension_point_lookup ("gtkappchooser-online");
+  extensions = g_io_extension_point_get_extensions (ep);
+
+  if (extensions != NULL)
+    {
+      /* pick the first */
+      extension = extensions->data;
+      g_async_initable_new_async (g_io_extension_get_type (extension), G_PRIORITY_DEFAULT,
+                                  NULL, callback, user_data, NULL);
+    }
+}
+
+void
+gtk_app_chooser_online_search_for_mimetype_async (GtkAppChooserOnline *self,
+                                                  const gchar         *content_type,
+                                                  GtkWindow           *parent,
+                                                  GAsyncReadyCallback  callback,
+                                                  gpointer             user_data)
+{
+  GtkAppChooserOnlineInterface *iface;
+
+  g_return_if_fail (GTK_IS_APP_CHOOSER_ONLINE (self));
+
+  iface = GTK_APP_CHOOSER_ONLINE_GET_IFACE (self);
+
+  (* iface->search_for_mimetype_async) (self, content_type, parent, callback, user_data);
+}
+
+gboolean
+gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline  *self,
+                                                   GAsyncResult         *res,
+                                                   GError              **error)
+{
+  GtkAppChooserOnlineInterface *iface;
+
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER_ONLINE (self), FALSE);
+
+  iface = GTK_APP_CHOOSER_ONLINE_GET_IFACE (self);
+
+  return ((* iface->search_for_mimetype_finish) (self, res, error));
+}
diff --git a/gtk/gtkappchooseronline.h b/gtk/gtkappchooseronline.h
new file mode 100644
index 0000000000..d0eca3b9e0
--- /dev/null
+++ b/gtk/gtkappchooseronline.h
@@ -0,0 +1,73 @@
+/*
+ * gtkappchooseronline.h: an extension point for online integration
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#ifndef __GTK_APP_CHOOSER_ONLINE_H__
+#define __GTK_APP_CHOOSER_ONLINE_H__
+
+#include <glib.h>
+
+#include <gtk/gtkwindow.h>
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_APP_CHOOSER_ONLINE           (_gtk_app_chooser_online_get_type ())
+#define GTK_APP_CHOOSER_ONLINE(o)             (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_APP_CHOOSER_ONLINE, GtkAppChooserOnline))
+#define GTK_IS_APP_CHOOSER_ONLINE(o)          (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_APP_CHOOSER_ONLINE))
+#define GTK_APP_CHOOSER_ONLINE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_APP_CHOOSER_ONLINE, GtkAppChooserOnlineInterface))
+
+typedef struct _GtkAppChooserOnline GtkAppChooserOnline;
+typedef struct _GtkAppChooserOnlineInterface GtkAppChooserOnlineInterface;
+
+struct _GtkAppChooserOnlineInterface {
+  GTypeInterface g_iface;
+
+  /* Methods */
+  void (*search_for_mimetype_async)      (GtkAppChooserOnline  *self,
+                                          const gchar          *content_type,
+                                          GtkWindow            *parent,
+                                          GAsyncReadyCallback   callback,
+                                          gpointer              user_data);
+
+  gboolean (*search_for_mimetype_finish) (GtkAppChooserOnline  *self,
+                                          GAsyncResult         *res,
+                                          GError              **error);
+};
+
+GType                 _gtk_app_chooser_online_get_type                  (void) G_GNUC_CONST;
+
+void                  gtk_app_chooser_online_get_default_async          (GAsyncReadyCallback   callback,
+                                                                         gpointer              user_data);
+GtkAppChooserOnline * gtk_app_chooser_online_get_default_finish          (GObject             *source,
+                                                                          GAsyncResult        *result);
+
+void                  gtk_app_chooser_online_search_for_mimetype_async  (GtkAppChooserOnline  *self,
+                                                                         const gchar          *content_type,
+                                                                         GtkWindow            *parent,
+                                                                         GAsyncReadyCallback   callback,
+                                                                         gpointer              user_data);
+gboolean              gtk_app_chooser_online_search_for_mimetype_finish (GtkAppChooserOnline  *self,
+                                                                         GAsyncResult         *res,
+                                                                         GError              **error);
+
+#endif /* __GTK_APP_CHOOSER_ONLINE_H__ */
diff --git a/gtk/gtkappchooseronlinepk.c b/gtk/gtkappchooseronlinepk.c
new file mode 100644
index 0000000000..c498546890
--- /dev/null
+++ b/gtk/gtkappchooseronlinepk.c
@@ -0,0 +1,263 @@
+/*
+ * gtkappchooseronlinepk.c: packagekit module for app-chooser
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#include "config.h"
+
+#include "gtkappchooseronlinepk.h"
+
+#include "gtkappchooseronline.h"
+#ifdef GDK_WINDOWING_X11
+#include "x11/gdkx.h"
+#endif
+
+#include <gio/gio.h>
+
+#define gtk_app_chooser_online_pk_get_type _gtk_app_chooser_online_pk_get_type
+static void app_chooser_online_iface_init (GtkAppChooserOnlineInterface *iface);
+static void app_chooser_online_pk_async_initable_init (GAsyncInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GtkAppChooserOnlinePk, gtk_app_chooser_online_pk,
+                         G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE,
+                                                app_chooser_online_pk_async_initable_init)
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER_ONLINE,
+                                                app_chooser_online_iface_init)
+                         g_io_extension_point_implement ("gtkappchooser-online",
+                                                         g_define_type_id,
+                                                         "packagekit", 10));
+
+struct _GtkAppChooserOnlinePkPrivate {
+  GSimpleAsyncResult *init_result;
+  guint watch_id;
+
+  GDBusProxy *proxy;
+  GSimpleAsyncResult *result;
+  GtkWindow *parent;
+};
+
+static void
+gtk_app_chooser_online_pk_dispose (GObject *obj)
+{
+  GtkAppChooserOnlinePk *self = GTK_APP_CHOOSER_ONLINE_PK (obj);
+
+  g_clear_object (&self->priv->result);
+  g_clear_object (&self->priv->proxy);
+
+  G_OBJECT_CLASS (gtk_app_chooser_online_pk_parent_class)->dispose (obj);
+}
+
+static void
+gtk_app_chooser_online_pk_class_init (GtkAppChooserOnlinePkClass *klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->dispose = gtk_app_chooser_online_pk_dispose;
+
+  g_type_class_add_private (klass, sizeof (GtkAppChooserOnlinePkPrivate));
+}
+
+static void
+gtk_app_chooser_online_pk_init (GtkAppChooserOnlinePk *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_APP_CHOOSER_ONLINE_PK,
+                                            GtkAppChooserOnlinePkPrivate);
+}
+
+static gboolean
+pk_search_mime_finish (GtkAppChooserOnline *obj,
+                       GAsyncResult *res,
+                       GError **error)
+{
+  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
+
+  return !g_simple_async_result_propagate_error (simple, error);
+}
+
+static void
+install_mime_types_ready_cb (GObject      *source,
+                             GAsyncResult *res,
+                             gpointer      user_data)
+{
+  GtkAppChooserOnlinePk *self = user_data;
+  GDBusProxy *proxy = G_DBUS_PROXY (source);
+  GError *error = NULL;
+  GVariant *variant;
+
+  variant = g_dbus_proxy_call_finish (proxy, res, &error);
+
+  if (variant == NULL)
+    {
+      /* don't show errors if the user cancelled the installation explicitely
+       * or if PK wasn't able to find any apps
+       */
+      if (g_strcmp0 (g_dbus_error_get_remote_error (error), "org.freedesktop.PackageKit.Modify.Cancelled") != 0 &&
+          g_strcmp0 (g_dbus_error_get_remote_error (error), "org.freedesktop.PackageKit.Modify.NoPackagesFound") != 0)
+        g_simple_async_result_set_from_error (self->priv->result, error);
+
+      g_error_free (error);
+    }
+
+  g_simple_async_result_complete (self->priv->result);
+}
+
+static void
+pk_search_mime_async (GtkAppChooserOnline *obj,
+                      const gchar         *content_type,
+                      GtkWindow           *parent,
+                      GAsyncReadyCallback  callback,
+                      gpointer             user_data)
+{
+  GtkAppChooserOnlinePk *self = GTK_APP_CHOOSER_ONLINE_PK (obj);
+  guint xid = 0;
+  GdkWindow *window;
+  const gchar *mime_types[2];
+
+  self->priv->result = g_simple_async_result_new (G_OBJECT (self),
+                                                  callback, user_data,
+                                                  gtk_app_chooser_online_search_for_mimetype_async);
+
+#ifdef GDK_WINDOWING_X11
+  window = gtk_widget_get_window (GTK_WIDGET (parent));
+  xid = GDK_WINDOW_XID (window);
+#endif
+
+  mime_types[0] = content_type;
+  mime_types[1] = NULL;
+
+  g_dbus_proxy_call (self->priv->proxy,
+                     "InstallMimeTypes",
+                     g_variant_new ("(u^ass)",
+                                    xid,
+                                    mime_types,
+                                    "hide-confirm-search"),
+                     G_DBUS_CALL_FLAGS_NONE,
+                     G_MAXINT, /* no timeout */
+                     NULL,
+                     install_mime_types_ready_cb,
+                     self);
+}
+
+static void
+app_chooser_online_iface_init (GtkAppChooserOnlineInterface *iface)
+{
+  iface->search_for_mimetype_async = pk_search_mime_async;
+  iface->search_for_mimetype_finish = pk_search_mime_finish;
+}
+
+static void
+pk_proxy_created_cb (GObject *source,
+                     GAsyncResult *result,
+                     gpointer user_data)
+{
+  GtkAppChooserOnlinePk *self = user_data;
+  GDBusProxy *proxy;
+
+  proxy = g_dbus_proxy_new_finish (result, NULL);
+
+  if (proxy == NULL)
+    {
+      g_simple_async_result_set_op_res_gboolean (self->priv->init_result, FALSE);
+    }
+  else
+    {
+      g_simple_async_result_set_op_res_gboolean (self->priv->init_result, TRUE);
+      self->priv->proxy = proxy;
+    }
+
+  g_simple_async_result_complete (self->priv->init_result);
+  g_clear_object (&self->priv->init_result);
+}
+
+static void
+pk_appeared_cb (GDBusConnection *conn,
+                const gchar *name,
+                const gchar *owner,
+                gpointer user_data)
+{
+  GtkAppChooserOnlinePk *self = user_data;
+
+  /* create the proxy */
+  g_dbus_proxy_new (conn, 0, NULL,
+                    "org.freedesktop.PackageKit",
+                    "/org/freedesktop/PackageKit",
+                    "org.freedesktop.PackageKit.Modify",
+                    NULL,
+                    pk_proxy_created_cb,
+                    self);
+
+  g_bus_unwatch_name (self->priv->watch_id);
+}
+
+static void
+pk_vanished_cb (GDBusConnection *conn,
+                const gchar *name,
+                gpointer user_data)
+{
+  GtkAppChooserOnlinePk *self = user_data;
+
+  /* just return */
+  g_simple_async_result_set_op_res_gboolean (self->priv->init_result, FALSE);
+  g_simple_async_result_complete (self->priv->init_result);
+
+  g_bus_unwatch_name (self->priv->watch_id);
+
+  g_clear_object (&self->priv->init_result);
+}
+
+static gboolean
+app_chooser_online_pk_init_finish (GAsyncInitable *init,
+                                   GAsyncResult *res,
+                                   GError **error)
+{
+  return g_simple_async_result_get_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (res));
+}
+
+static void
+app_chooser_online_pk_init_async (GAsyncInitable *init,
+                                  int io_priority,
+                                  GCancellable *cancellable,
+                                  GAsyncReadyCallback callback,
+                                  gpointer user_data)
+{
+  GtkAppChooserOnlinePk *self = GTK_APP_CHOOSER_ONLINE_PK (init);
+
+  self->priv->init_result = g_simple_async_result_new (G_OBJECT (self),
+                                                       callback, user_data,
+                                                       gtk_app_chooser_online_get_default_async);
+
+  self->priv->watch_id =
+    g_bus_watch_name (G_BUS_TYPE_SESSION,
+                      "org.freedesktop.PackageKit",
+                      G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
+                      pk_appeared_cb,
+                      pk_vanished_cb,
+                      self,
+                      NULL);
+}
+
+static void
+app_chooser_online_pk_async_initable_init (GAsyncInitableIface *iface)
+{
+  iface->init_async = app_chooser_online_pk_init_async;
+  iface->init_finish = app_chooser_online_pk_init_finish;
+}
diff --git a/gtk/gtkappchooseronlinepk.h b/gtk/gtkappchooseronlinepk.h
new file mode 100644
index 0000000000..7d4264234f
--- /dev/null
+++ b/gtk/gtkappchooseronlinepk.h
@@ -0,0 +1,53 @@
+/*
+ * gtkappchooseronlinepk.h: an extension point for online integration
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#ifndef __GTK_APP_CHOOSER_ONLINE_PK_H__
+#define __GTK_APP_CHOOSER_ONLINE_PK_H__
+
+#include <gtk/gtkappchooseronline.h>
+#include <glib.h>
+
+#define GTK_TYPE_APP_CHOOSER_ONLINE_PK            (_gtk_app_chooser_online_pk_get_type ())
+#define GTK_APP_CHOOSER_ONLINE_PK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_PK, GtkAppChooserOnlinePk))
+#define GTK_APP_CHOOSER_ONLINE_PK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_ONLINE_PK, GtkAppChooserOnlinePkClass))
+#define GTK_IS_APP_CHOOSER_ONLINE_PK(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_PK))
+#define GTK_IS_APP_CHOOSER_ONLINE_PK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_ONLINE_PK))
+#define GTK_APP_CHOOSER_ONLINE_PK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_ONLINE_PK, GtkAppChooserOnlinePkClass))
+
+typedef struct _GtkAppChooserOnlinePk        GtkAppChooserOnlinePk;
+typedef struct _GtkAppChooserOnlinePkClass   GtkAppChooserOnlinePkClass;
+typedef struct _GtkAppChooserOnlinePkPrivate GtkAppChooserOnlinePkPrivate;
+
+struct _GtkAppChooserOnlinePk {
+  GObject parent;
+
+  GtkAppChooserOnlinePkPrivate *priv;
+};
+
+struct _GtkAppChooserOnlinePkClass {
+  GObjectClass parent_class;
+};
+
+GType _gtk_app_chooser_online_pk_get_type (void);
+
+#endif /* __GTK_APP_CHOOSER_ONLINE_PK_H__ */
diff --git a/gtk/gtkappchooserprivate.h b/gtk/gtkappchooserprivate.h
new file mode 100644
index 0000000000..67e0a7c1dd
--- /dev/null
+++ b/gtk/gtkappchooserprivate.h
@@ -0,0 +1,45 @@
+/*
+ * gtkappchooserprivate.h: app-chooser interface
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#ifndef __GTK_APP_CHOOSER_PRIVATE_H__
+#define __GTK_APP_CHOOSER_PRIVATE_H__
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include "gtkappchooser.h"
+#include "gtkappchooserwidget.h"
+
+typedef struct _GtkAppChooserIface GtkAppChooserIface;
+typedef GtkAppChooserIface GtkAppChooserInterface;
+
+#define GTK_APP_CHOOSER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_APP_CHOOSER, GtkAppChooserIface))
+
+struct _GtkAppChooserIface {
+  GTypeInterface base_iface;
+
+  GAppInfo * (* get_app_info) (GtkAppChooser *object);
+  void       (* refresh)      (GtkAppChooser *object);
+};
+
+#endif /* __GTK_APP_CHOOSER_PRIVATE_H__ */
diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c
new file mode 100644
index 0000000000..95510e9a35
--- /dev/null
+++ b/gtk/gtkappchooserwidget.c
@@ -0,0 +1,1503 @@
+/*
+ * gtkappchooserwidget.c: an app-chooser widget
+ *
+ * Copyright (C) 2004 Novell, Inc.
+ * Copyright (C) 2007, 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Dave Camp <dave@novell.com>
+ *          Alexander Larsson <alexl@redhat.com>
+ *          Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#include "config.h"
+
+#include "gtkappchooserwidget.h"
+
+#include "gtkintl.h"
+#include "gtkmarshalers.h"
+#include "gtkappchooserwidget.h"
+#include "gtkappchooserprivate.h"
+#include "gtkliststore.h"
+#include "gtkcellrenderertext.h"
+#include "gtkcellrendererpixbuf.h"
+#include "gtktreeview.h"
+#include "gtktreeselection.h"
+#include "gtktreemodelsort.h"
+#include "gtkorientable.h"
+#include "gtkscrolledwindow.h"
+
+#include <string.h>
+#include <glib/gi18n-lib.h>
+#include <gio/gio.h>
+
+struct _GtkAppChooserWidgetPrivate {
+  GAppInfo *selected_app_info;
+
+  gchar *content_type;
+  gchar *default_text;
+  gboolean show_default;
+  gboolean show_recommended;
+  gboolean show_fallback;
+  gboolean show_other;
+  gboolean show_all;
+
+  GtkWidget *program_list;
+  GtkListStore *program_list_store;
+
+  GtkCellRenderer *padding_renderer;
+};
+
+enum {
+  COLUMN_APP_INFO,
+  COLUMN_GICON,
+  COLUMN_NAME,
+  COLUMN_DESC,
+  COLUMN_EXEC,
+  COLUMN_DEFAULT,
+  COLUMN_HEADING,
+  COLUMN_HEADING_TEXT,
+  COLUMN_RECOMMENDED,
+  COLUMN_FALLBACK,
+  NUM_COLUMNS
+};
+
+
+enum {
+  PROP_CONTENT_TYPE = 1,
+  PROP_GFILE,
+  PROP_SHOW_DEFAULT,
+  PROP_SHOW_RECOMMENDED,
+  PROP_SHOW_FALLBACK,
+  PROP_SHOW_OTHER,
+  PROP_SHOW_ALL,
+  PROP_DEFAULT_TEXT,
+  N_PROPERTIES
+};
+
+enum {
+  SIGNAL_APPLICATION_SELECTED,
+  SIGNAL_APPLICATION_ACTIVATED,
+  SIGNAL_POPULATE_POPUP,
+  N_SIGNALS
+};
+
+static guint signals[N_SIGNALS] = { 0, };
+
+static void gtk_app_chooser_widget_iface_init (GtkAppChooserIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GtkAppChooserWidget, gtk_app_chooser_widget, GTK_TYPE_BOX,
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_APP_CHOOSER,
+                                                gtk_app_chooser_widget_iface_init));
+
+static void
+refresh_and_emit_app_selected (GtkAppChooserWidget *self,
+                               GtkTreeSelection    *selection)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  GAppInfo *info = NULL;
+  gboolean should_emit = FALSE;
+
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    gtk_tree_model_get (model, &iter, COLUMN_APP_INFO, &info, -1);
+
+  if (info == NULL)
+    return;
+
+  if (self->priv->selected_app_info)
+    {
+      if (!g_app_info_equal (self->priv->selected_app_info, info))
+        {
+          should_emit = TRUE;
+          g_object_unref (self->priv->selected_app_info);
+
+          self->priv->selected_app_info = info;
+        }
+    }
+  else
+    {
+      should_emit = TRUE;
+      self->priv->selected_app_info = info;
+    }
+
+  if (should_emit)
+    g_signal_emit (self, signals[SIGNAL_APPLICATION_SELECTED], 0,
+                   self->priv->selected_app_info);
+}
+
+static GAppInfo *
+get_app_info_for_event (GtkAppChooserWidget *self,
+                        GdkEventButton      *event)
+{
+  GtkTreePath *path = NULL;
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  GAppInfo *info;
+  gboolean recommended;
+
+  if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (self->priv->program_list),
+                                      event->x, event->y,
+                                      &path,
+                                      NULL, NULL, NULL))
+    return NULL;
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->program_list));
+
+  if (!gtk_tree_model_get_iter (model, &iter, path))
+    {
+      gtk_tree_path_free (path);
+      return NULL;
+    }
+
+  /* we only allow interaction with recommended applications */
+  gtk_tree_model_get (model, &iter,
+                      COLUMN_APP_INFO, &info,
+                      COLUMN_RECOMMENDED, &recommended,
+                      -1);
+
+  if (!recommended)
+    g_clear_object (&info);
+
+  return info;
+}
+
+static gboolean
+widget_button_press_event_cb (GtkWidget      *widget,
+                              GdkEventButton *event,
+                              gpointer        user_data)
+{
+  GtkAppChooserWidget *self = user_data;
+
+  if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+    {
+      GAppInfo *info;
+      GtkWidget *menu;
+      GList *children;
+      gint n_children;
+
+      info = get_app_info_for_event (self, event);
+
+      if (info == NULL)
+        return FALSE;
+
+      menu = gtk_menu_new ();
+
+      g_signal_emit (self, signals[SIGNAL_POPULATE_POPUP], 0,
+                     menu, info);
+
+      g_object_unref (info);
+
+      /* see if clients added menu items to this container */
+      children = gtk_container_get_children (GTK_CONTAINER (menu));
+      n_children = g_list_length (children);
+
+      if (n_children > 0)
+        {
+          /* actually popup the menu */
+          gtk_menu_attach_to_widget (GTK_MENU (menu), self->priv->program_list, NULL);
+          gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+                          event->button, event->time);
+        }
+
+      g_list_free (children);
+    }
+
+  return FALSE;
+}
+
+static gboolean
+path_is_heading (GtkTreeView *view,
+                 GtkTreePath *path)
+{
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  gboolean res;
+
+  model = gtk_tree_view_get_model (view);
+  gtk_tree_model_get_iter (model, &iter, path);
+  gtk_tree_model_get (model, &iter,
+                      COLUMN_HEADING, &res,
+                      -1);
+
+  return res;
+}
+
+static void
+program_list_selection_activated (GtkTreeView       *view,
+                                  GtkTreePath       *path,
+                                  GtkTreeViewColumn *column,
+                                  gpointer           user_data)
+{
+  GtkAppChooserWidget *self = user_data;
+  GtkTreeSelection *selection;
+
+  if (path_is_heading (view, path))
+    return;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->program_list));
+
+  refresh_and_emit_app_selected (self, selection);
+
+  g_signal_emit (self, signals[SIGNAL_APPLICATION_ACTIVATED], 0,
+                 self->priv->selected_app_info);
+}
+
+static gboolean
+gtk_app_chooser_search_equal_func (GtkTreeModel *model,
+                                   gint          column,
+                                   const gchar  *key,
+                                   GtkTreeIter  *iter,
+                                   gpointer      user_data)
+{
+  gchar *normalized_key;
+  gchar *name, *normalized_name;
+  gchar *path, *normalized_path;
+  gchar *basename, *normalized_basename;
+  gboolean ret;
+
+  if (key != NULL)
+    {
+      normalized_key = g_utf8_casefold (key, -1);
+      g_assert (normalized_key != NULL);
+
+      ret = TRUE;
+
+      gtk_tree_model_get (model, iter,
+                          COLUMN_NAME, &name,
+                          COLUMN_EXEC, &path,
+                          -1);
+
+      if (name != NULL)
+        {
+          normalized_name = g_utf8_casefold (name, -1);
+          g_assert (normalized_name != NULL);
+
+          if (strncmp (normalized_name, normalized_key, strlen (normalized_key)) == 0)
+            ret = FALSE;
+
+          g_free (normalized_name);
+        }
+
+      if (ret && path != NULL)
+        {
+          normalized_path = g_utf8_casefold (path, -1);
+          g_assert (normalized_path != NULL);
+
+          basename = g_path_get_basename (path);
+          g_assert (basename != NULL);
+
+          normalized_basename = g_utf8_casefold (basename, -1);
+          g_assert (normalized_basename != NULL);
+
+          if (strncmp (normalized_path, normalized_key, strlen (normalized_key)) == 0 ||
+              strncmp (normalized_basename, normalized_key, strlen (normalized_key)) == 0)
+            ret = FALSE;
+
+          g_free (basename);
+          g_free (normalized_basename);
+          g_free (normalized_path);
+        }
+
+      g_free (name);
+      g_free (path);
+      g_free (normalized_key);
+
+      return ret;
+    }
+  else
+    {
+      return TRUE;
+    }
+}
+
+static gint
+gtk_app_chooser_sort_func (GtkTreeModel *model,
+                           GtkTreeIter  *a,
+                           GtkTreeIter  *b,
+                           gpointer      user_data)
+{
+  gboolean a_recommended, b_recommended;
+  gboolean a_fallback, b_fallback;
+  gboolean a_heading, b_heading;
+  gboolean a_default, b_default;
+  gchar *a_name, *b_name, *a_casefold, *b_casefold;
+  gint retval = 0;
+
+  /* this returns:
+   * - <0 if a should show before b
+   * - =0 if a is the same as b
+   * - >0 if a should show after b
+   */
+
+  gtk_tree_model_get (model, a,
+                      COLUMN_NAME, &a_name,
+                      COLUMN_RECOMMENDED, &a_recommended,
+                      COLUMN_FALLBACK, &a_fallback,
+                      COLUMN_HEADING, &a_heading,
+                      COLUMN_DEFAULT, &a_default,
+                      -1);
+
+  gtk_tree_model_get (model, b,
+                      COLUMN_NAME, &b_name,
+                      COLUMN_RECOMMENDED, &b_recommended,
+                      COLUMN_FALLBACK, &b_fallback,
+                      COLUMN_HEADING, &b_heading,
+                      COLUMN_DEFAULT, &b_default,
+                      -1);
+
+  /* the default one always wins */
+  if (a_default && !b_default)
+    {
+      retval = -1;
+      goto out;
+    }
+
+  if (b_default && !a_default)
+    {
+      retval = 1;
+      goto out;
+    }
+  
+  /* the recommended one always wins */
+  if (a_recommended && !b_recommended)
+    {
+      retval = -1;
+      goto out;
+    }
+
+  if (b_recommended && !a_recommended)
+    {
+      retval = 1;
+      goto out;
+    }
+
+  /* the recommended one always wins */
+  if (a_fallback && !b_fallback)
+    {
+      retval = -1;
+      goto out;
+    }
+
+  if (b_fallback && !a_fallback)
+    {
+      retval = 1;
+      goto out;
+    }
+
+  /* they're both recommended/falback or not, so if one is a heading, wins */
+  if (a_heading)
+    {
+      return -1;
+      goto out;
+    }
+
+  if (b_heading)
+    {
+      return 1;
+      goto out;
+    }
+
+  /* don't order by name recommended applications, but use GLib's ordering */
+  if (!a_recommended)
+    {
+      a_casefold = a_name != NULL ?
+        g_utf8_casefold (a_name, -1) : NULL;
+      b_casefold = b_name != NULL ?
+        g_utf8_casefold (b_name, -1) : NULL;
+
+      retval = g_strcmp0 (a_casefold, b_casefold);
+
+      g_free (a_casefold);
+      g_free (b_casefold);
+    }
+
+ out:
+  g_free (a_name);
+  g_free (b_name);
+
+  return retval;
+}
+
+static void
+padding_cell_renderer_func (GtkTreeViewColumn *column,
+                            GtkCellRenderer   *cell,
+                            GtkTreeModel      *model,
+                            GtkTreeIter       *iter,
+                            gpointer           user_data)
+{
+  gboolean heading;
+
+  gtk_tree_model_get (model, iter,
+                      COLUMN_HEADING, &heading,
+                      -1);
+  if (heading)
+    g_object_set (cell,
+                  "visible", FALSE,
+                  "xpad", 0,
+                  "ypad", 0,
+                  NULL);
+  else
+    g_object_set (cell,
+                  "visible", TRUE,
+                  "xpad", 3,
+                  "ypad", 3,
+                  NULL);
+}
+
+static gboolean
+gtk_app_chooser_selection_func (GtkTreeSelection *selection,
+                                GtkTreeModel     *model,
+                                GtkTreePath      *path,
+                                gboolean          path_currently_selected,
+                                gpointer          user_data)
+{
+  GtkTreeIter iter;
+  gboolean heading;
+
+  gtk_tree_model_get_iter (model, &iter, path);
+  gtk_tree_model_get (model, &iter,
+                      COLUMN_HEADING, &heading,
+                      -1);
+
+  return !heading;
+}
+
+static gint
+compare_apps_func (gconstpointer a,
+                   gconstpointer b)
+{
+  return !g_app_info_equal (G_APP_INFO (a), G_APP_INFO (b));
+}
+
+static gboolean
+gtk_app_chooser_widget_add_section (GtkAppChooserWidget *self,
+                                    const gchar         *heading_title,
+                                    gboolean             show_headings,
+                                    gboolean             recommended,
+                                    gboolean             fallback,
+                                    GList               *applications,
+                                    GList               *exclude_apps)
+{
+  gboolean heading_added, unref_icon;
+  GtkTreeIter iter;
+  GAppInfo *app;
+  gchar *app_string, *bold_string;
+  GIcon *icon;
+  GList *l;
+  gboolean retval;
+
+  retval = FALSE;
+  heading_added = FALSE;
+  bold_string = g_strdup_printf ("<b>%s</b>", heading_title);
+  
+  for (l = applications; l != NULL; l = l->next)
+    {
+      app = l->data;
+
+      if (!g_app_info_supports_uris (app) &&
+          !g_app_info_supports_files (app))
+        continue;
+
+      if (g_list_find_custom (exclude_apps, app,
+                              (GCompareFunc) compare_apps_func))
+        continue;
+
+      if (!heading_added && show_headings)
+        {
+          gtk_list_store_append (self->priv->program_list_store, &iter);
+          gtk_list_store_set (self->priv->program_list_store, &iter,
+                              COLUMN_HEADING_TEXT, bold_string,
+                              COLUMN_HEADING, TRUE,
+                              COLUMN_RECOMMENDED, recommended,
+                              COLUMN_FALLBACK, fallback,
+                              -1);
+
+          heading_added = TRUE;
+        }
+
+      app_string = g_markup_printf_escaped ("<b>%s</b>\n%s",
+                                            g_app_info_get_display_name (app) != NULL ?
+                                            g_app_info_get_display_name (app) : "",
+                                            g_app_info_get_description (app) != NULL ?
+                                            g_app_info_get_description (app) : "");
+
+      icon = g_app_info_get_icon (app);
+      unref_icon = FALSE;
+      if (icon == NULL)
+        {
+          icon = g_themed_icon_new ("application-x-executable");
+          unref_icon = TRUE;
+        }
+
+      gtk_list_store_append (self->priv->program_list_store, &iter);
+      gtk_list_store_set (self->priv->program_list_store, &iter,
+                          COLUMN_APP_INFO, app,
+                          COLUMN_GICON, icon,
+                          COLUMN_NAME, g_app_info_get_display_name (app),
+                          COLUMN_DESC, app_string,
+                          COLUMN_EXEC, g_app_info_get_executable (app),
+                          COLUMN_HEADING, FALSE,
+                          COLUMN_RECOMMENDED, recommended,
+                          COLUMN_FALLBACK, fallback,
+                          -1);
+
+      retval = TRUE;
+
+      g_free (app_string);
+      if (unref_icon)
+        g_object_unref (icon);
+    }
+
+  g_free (bold_string);
+
+  return retval;
+}
+
+
+static void
+gtk_app_chooser_add_default (GtkAppChooserWidget *self,
+                             GAppInfo            *app)
+{
+  GtkTreeIter iter;
+  GIcon *icon;
+  gchar *string;
+  gboolean unref_icon;
+
+  unref_icon = FALSE;
+  string = g_strdup_printf ("<b>%s</b>", _("Default Application"));
+
+  gtk_list_store_append (self->priv->program_list_store, &iter);
+  gtk_list_store_set (self->priv->program_list_store, &iter,
+                      COLUMN_HEADING_TEXT, string,
+                      COLUMN_HEADING, TRUE,
+                      COLUMN_DEFAULT, TRUE,
+                      -1);
+
+  g_free (string);
+
+  string = g_markup_printf_escaped ("<b>%s</b>\n%s",
+                                    g_app_info_get_display_name (app) != NULL ?
+                                    g_app_info_get_display_name (app) : "",
+                                    g_app_info_get_description (app) != NULL ?
+                                    g_app_info_get_description (app) : "");
+
+  icon = g_app_info_get_icon (app);
+  if (icon == NULL)
+    {
+      icon = g_themed_icon_new ("application-x-executable");
+      unref_icon = TRUE;
+    }
+
+  gtk_list_store_append (self->priv->program_list_store, &iter);
+  gtk_list_store_set (self->priv->program_list_store, &iter,
+                      COLUMN_APP_INFO, app,
+                      COLUMN_GICON, icon,
+                      COLUMN_NAME, g_app_info_get_display_name (app),
+                      COLUMN_DESC, string,
+                      COLUMN_EXEC, g_app_info_get_executable (app),
+                      COLUMN_HEADING, FALSE,
+                      COLUMN_DEFAULT, TRUE,
+                      -1);
+
+  g_free (string);
+
+  if (unref_icon)
+    g_object_unref (icon);
+}
+
+static void
+add_no_applications_label (GtkAppChooserWidget *self)
+{
+  gchar *text = NULL, *desc;
+  const gchar *string;
+  GtkTreeIter iter;
+
+  if (self->priv->default_text == NULL)
+    {
+      desc = g_content_type_get_description (self->priv->content_type);
+      string = text = g_strdup_printf (_("No applications available to open \"%s\""),
+                                       desc);
+      g_free (desc);
+    }
+  else
+    {
+      string = self->priv->default_text;
+    }
+
+  gtk_list_store_append (self->priv->program_list_store, &iter);
+  gtk_list_store_set (self->priv->program_list_store, &iter,
+                      COLUMN_HEADING_TEXT, string,
+                      COLUMN_HEADING, TRUE,
+                      -1);
+
+  g_free (text);
+}
+
+static void
+gtk_app_chooser_widget_select_first (GtkAppChooserWidget *self)
+{
+  GtkTreeIter iter;
+  GAppInfo *info = NULL;
+  GtkTreeModel *model;
+
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->program_list));
+  gtk_tree_model_get_iter_first (model, &iter);
+
+  while (info == NULL)
+    {
+      gtk_tree_model_get (model, &iter,
+                          COLUMN_APP_INFO, &info,
+                          -1);
+
+      if (info != NULL)
+        break;
+
+      if (!gtk_tree_model_iter_next (model, &iter))
+        break;
+    }
+
+  if (info != NULL)
+    {
+      GtkTreeSelection *selection;
+
+      selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->program_list));
+      gtk_tree_selection_select_iter (selection, &iter);
+
+      g_object_unref (info);
+    }
+}
+
+static void
+gtk_app_chooser_widget_real_add_items (GtkAppChooserWidget *self)
+{
+  GList *all_applications = NULL;
+  GList *recommended_apps = NULL;
+  GList *fallback_apps = NULL;
+  GList *exclude_apps = NULL;
+  GAppInfo *default_app = NULL;
+  gboolean show_headings;
+  gboolean apps_added;
+
+  show_headings = TRUE;
+  apps_added = FALSE;
+
+  if (self->priv->show_all)
+    show_headings = FALSE;
+
+  if (self->priv->show_default)
+    {
+      default_app = g_app_info_get_default_for_type (self->priv->content_type, FALSE);
+
+      if (default_app != NULL)
+        {
+          gtk_app_chooser_add_default (self, default_app);
+          apps_added = TRUE;
+          exclude_apps = g_list_prepend (exclude_apps, default_app);
+        }
+    }
+
+  if (self->priv->show_recommended || self->priv->show_all)
+    {
+      recommended_apps = g_app_info_get_recommended_for_type (self->priv->content_type);
+
+      apps_added |= gtk_app_chooser_widget_add_section (self, _("Recommended Applications"),
+                                                        show_headings,
+                                                        !self->priv->show_all, /* mark as recommended */
+                                                        FALSE, /* mark as fallback */
+                                                        recommended_apps, exclude_apps);
+
+      exclude_apps = g_list_concat (exclude_apps,
+                                    g_list_copy (recommended_apps));
+    }
+
+  if (self->priv->show_fallback || self->priv->show_all)
+    {
+      fallback_apps = g_app_info_get_fallback_for_type (self->priv->content_type);
+
+      apps_added |= gtk_app_chooser_widget_add_section (self, _("Related Applications"),
+                                                        show_headings,
+                                                        FALSE, /* mark as recommended */
+                                                        !self->priv->show_all, /* mark as fallback */
+                                                        fallback_apps, exclude_apps);
+      exclude_apps = g_list_concat (exclude_apps,
+                                    g_list_copy (fallback_apps));
+    }
+
+  if (self->priv->show_other || self->priv->show_all)
+    {
+      all_applications = g_app_info_get_all ();
+
+      apps_added |= gtk_app_chooser_widget_add_section (self, _("Other Applications"),
+                                                        show_headings,
+                                                        FALSE,
+                                                        FALSE,
+                                                        all_applications, exclude_apps);
+    }
+
+  if (!apps_added)
+    add_no_applications_label (self);
+
+  gtk_app_chooser_widget_select_first (self);
+
+  if (default_app != NULL)
+    g_object_unref (default_app);
+
+  if (all_applications != NULL)
+    g_list_free_full (all_applications, g_object_unref);
+
+  if (recommended_apps != NULL)
+    g_list_free_full (recommended_apps, g_object_unref);
+
+  if (fallback_apps != NULL)
+    g_list_free_full (fallback_apps, g_object_unref);
+
+  if (exclude_apps != NULL)
+    g_list_free (exclude_apps);
+}
+
+static void
+gtk_app_chooser_widget_add_items (GtkAppChooserWidget *self)
+{
+  GtkCellRenderer *renderer;
+  GtkTreeViewColumn *column;
+  GtkTreeModel *sort;
+
+  /* create list store */
+  self->priv->program_list_store = gtk_list_store_new (NUM_COLUMNS,
+                                                       G_TYPE_APP_INFO,
+                                                       G_TYPE_ICON,
+                                                       G_TYPE_STRING,
+                                                       G_TYPE_STRING,
+                                                       G_TYPE_STRING,
+                                                       G_TYPE_BOOLEAN,
+                                                       G_TYPE_BOOLEAN,
+                                                       G_TYPE_STRING,
+                                                       G_TYPE_BOOLEAN,
+                                                       G_TYPE_BOOLEAN);
+  sort = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (self->priv->program_list_store));
+
+  gtk_tree_view_set_model (GTK_TREE_VIEW (self->priv->program_list),
+                           GTK_TREE_MODEL (sort));
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort),
+                                        COLUMN_NAME,
+                                        GTK_SORT_ASCENDING);
+  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sort),
+                                   COLUMN_NAME,
+                                   gtk_app_chooser_sort_func,
+                                   self, NULL);
+  gtk_tree_view_set_search_column (GTK_TREE_VIEW (self->priv->program_list),
+                                   COLUMN_NAME);
+  gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (self->priv->program_list),
+                                       gtk_app_chooser_search_equal_func,
+                                       NULL, NULL);
+
+  column = gtk_tree_view_column_new ();
+
+  /* initial padding */
+  renderer = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, renderer, FALSE);
+  g_object_set (renderer,
+                "xpad", self->priv->show_all ? 0 : 6,
+                NULL);
+  self->priv->padding_renderer = renderer;
+
+  /* heading text renderer */
+  renderer = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, renderer, FALSE);
+  gtk_tree_view_column_set_attributes (column, renderer,
+                                       "markup", COLUMN_HEADING_TEXT,
+                                       "visible", COLUMN_HEADING,
+                                       NULL);
+  g_object_set (renderer,
+                "ypad", 6,
+                "xpad", 0,
+                "wrap-width", 350,
+                "wrap-mode", PANGO_WRAP_WORD,
+                NULL);
+
+  /* padding renderer for non-heading cells */
+  renderer = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, renderer, FALSE);
+  gtk_tree_view_column_set_cell_data_func (column, renderer,
+                                           padding_cell_renderer_func,
+                                           NULL, NULL);
+
+  /* app icon renderer */
+  renderer = gtk_cell_renderer_pixbuf_new ();
+  gtk_tree_view_column_pack_start (column, renderer, FALSE);
+  gtk_tree_view_column_set_attributes (column, renderer,
+                                       "gicon", COLUMN_GICON,
+                                       NULL);
+  g_object_set (renderer,
+                "stock-size", GTK_ICON_SIZE_DIALOG,
+                NULL);
+
+  /* app name renderer */
+  renderer = gtk_cell_renderer_text_new ();
+  gtk_tree_view_column_pack_start (column, renderer, TRUE);
+  gtk_tree_view_column_set_attributes (column, renderer,
+                                       "markup", COLUMN_DESC,
+                                       NULL);
+  g_object_set (renderer,
+                "ellipsize", PANGO_ELLIPSIZE_END,
+                "ellipsize-set", TRUE,
+                NULL);
+  
+  gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (self->priv->program_list), column);
+
+  /* populate the widget */
+  gtk_app_chooser_widget_real_add_items (self);
+}
+
+static void
+gtk_app_chooser_widget_set_property (GObject      *object,
+                                     guint         property_id,
+                                     const GValue *value,
+                                     GParamSpec   *pspec)
+{
+  GtkAppChooserWidget *self = GTK_APP_CHOOSER_WIDGET (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTENT_TYPE:
+      self->priv->content_type = g_value_dup_string (value);
+      break;
+    case PROP_SHOW_DEFAULT:
+      gtk_app_chooser_widget_set_show_default (self, g_value_get_boolean (value));
+      break;
+    case PROP_SHOW_RECOMMENDED:
+      gtk_app_chooser_widget_set_show_recommended (self, g_value_get_boolean (value));
+      break;
+    case PROP_SHOW_FALLBACK:
+      gtk_app_chooser_widget_set_show_fallback (self, g_value_get_boolean (value));
+      break;
+    case PROP_SHOW_OTHER:
+      gtk_app_chooser_widget_set_show_other (self, g_value_get_boolean (value));
+      break;
+    case PROP_SHOW_ALL:
+      gtk_app_chooser_widget_set_show_all (self, g_value_get_boolean (value));
+      break;
+    case PROP_DEFAULT_TEXT:
+      gtk_app_chooser_widget_set_default_text (self, g_value_get_string (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_app_chooser_widget_get_property (GObject    *object,
+                                     guint       property_id,
+                                     GValue     *value,
+                                     GParamSpec *pspec)
+{
+  GtkAppChooserWidget *self = GTK_APP_CHOOSER_WIDGET (object);
+
+  switch (property_id)
+    {
+    case PROP_CONTENT_TYPE:
+      g_value_set_string (value, self->priv->content_type);
+      break;
+    case PROP_SHOW_DEFAULT:
+      g_value_set_boolean (value, self->priv->show_default);
+      break;
+    case PROP_SHOW_RECOMMENDED:
+      g_value_set_boolean (value, self->priv->show_recommended);
+      break;
+    case PROP_SHOW_FALLBACK:
+      g_value_set_boolean (value, self->priv->show_fallback);
+      break;
+    case PROP_SHOW_OTHER:
+      g_value_set_boolean (value, self->priv->show_other);
+      break;
+    case PROP_SHOW_ALL:
+      g_value_set_boolean (value, self->priv->show_all);
+      break;
+    case PROP_DEFAULT_TEXT:
+      g_value_set_string (value, self->priv->default_text);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_app_chooser_widget_constructed (GObject *object)
+{
+  GtkAppChooserWidget *self = GTK_APP_CHOOSER_WIDGET (object);
+
+  g_assert (self->priv->content_type != NULL);
+
+  if (G_OBJECT_CLASS (gtk_app_chooser_widget_parent_class)->constructed != NULL)
+    G_OBJECT_CLASS (gtk_app_chooser_widget_parent_class)->constructed (object);
+
+  gtk_app_chooser_widget_add_items (self);
+}
+
+static void
+gtk_app_chooser_widget_finalize (GObject *object)
+{
+  GtkAppChooserWidget *self = GTK_APP_CHOOSER_WIDGET (object);
+
+  g_free (self->priv->content_type);
+  g_free (self->priv->default_text);
+
+  G_OBJECT_CLASS (gtk_app_chooser_widget_parent_class)->finalize (object);
+}
+
+static void
+gtk_app_chooser_widget_dispose (GObject *object)
+{
+  GtkAppChooserWidget *self = GTK_APP_CHOOSER_WIDGET (object);
+
+  if (self->priv->selected_app_info != NULL)
+    {
+      g_object_unref (self->priv->selected_app_info);
+      self->priv->selected_app_info = NULL;
+    }
+
+  G_OBJECT_CLASS (gtk_app_chooser_widget_parent_class)->dispose (object);
+}
+
+static void
+gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
+{
+  GObjectClass *gobject_class;
+  GParamSpec *pspec;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->dispose = gtk_app_chooser_widget_dispose;
+  gobject_class->finalize = gtk_app_chooser_widget_finalize;
+  gobject_class->set_property = gtk_app_chooser_widget_set_property;
+  gobject_class->get_property = gtk_app_chooser_widget_get_property;
+  gobject_class->constructed = gtk_app_chooser_widget_constructed;
+
+  g_object_class_override_property (gobject_class, PROP_CONTENT_TYPE, "content-type");
+
+  /**
+   * GtkAppChooserWidget:show-default:
+   *
+   * The ::show-default property determines whether the app chooser
+   * should show the default handler for the content type in a
+   * separate section. If %FALSE, the default handler is listed
+   * among the recommended applications.
+   */
+  pspec = g_param_spec_boolean ("show-default",
+                                P_("Show default app"),
+                                P_("Whether the widget should show the default application"),
+                                FALSE,
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (gobject_class, PROP_SHOW_DEFAULT, pspec);
+
+  /**
+   * GtkAppChooserWidget:show-recommended:
+   *
+   * The #GtkAppChooserWidget:show-recommended property determines whether the app chooser
+   * should show a section for recommended applications. If %FALSE, the
+   * recommended applications are listed among the other applications.
+   */
+  pspec = g_param_spec_boolean ("show-recommended",
+                                P_("Show recommended apps"),
+                                P_("Whether the widget should show recommended applications"),
+                                TRUE,
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (gobject_class, PROP_SHOW_RECOMMENDED, pspec);
+
+  /**
+   * GtkAppChooserWidget:show-fallback:
+   *
+   * The #GtkAppChooserWidget:show-fallback property determines whether the app chooser
+   * should show a section for related applications. If %FALSE, the
+   * related applications are listed among the other applications.
+   */
+  pspec = g_param_spec_boolean ("show-fallback",
+                                P_("Show fallback apps"),
+                                P_("Whether the widget should show fallback applications"),
+                                FALSE,
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (gobject_class, PROP_SHOW_FALLBACK, pspec);
+
+  /**
+   * GtkAppChooserWidget:show-other:
+   *
+   * The #GtkAppChooserWidget:show-other property determines whether the app chooser
+   * should show a section for other applications.
+   */
+  pspec = g_param_spec_boolean ("show-other",
+                                P_("Show other apps"),
+                                P_("Whether the widget should show other applications"),
+                                FALSE,
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (gobject_class, PROP_SHOW_OTHER, pspec);
+
+  /**
+   * GtkAppChooserWidget:show-all:
+   *
+   * If the #GtkAppChooserWidget:show-all property is %TRUE, the app chooser presents
+   * all applications in a single list, without subsections for
+   * default, recommended or related applications.
+   */
+  pspec = g_param_spec_boolean ("show-all",
+                                P_("Show all apps"),
+                                P_("Whether the widget should show all applications"),
+                                FALSE,
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (gobject_class, PROP_SHOW_ALL, pspec);
+
+  /**
+   * GtkAppChooserWidget:default-text:
+   *
+   * The #GtkAppChooserWidget:default-text property determines the text that appears
+   * in the widget when there are no applications for the given content type.
+   * See also gtk_app_chooser_widget_set_default_text().
+   */
+  pspec = g_param_spec_string ("default-text",
+                               P_("Widget's default text"),
+                               P_("The default text appearing when there are no applications"),
+                               NULL,
+                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (gobject_class, PROP_DEFAULT_TEXT, pspec);
+
+  /**
+   * GtkAppChooserWidget::application-selected:
+   * @self: the object which received the signal
+   * @application: the selected #GAppInfo
+   *
+   * Emitted when an application item is selected from the widget's list.
+   */
+  signals[SIGNAL_APPLICATION_SELECTED] =
+    g_signal_new ("application-selected",
+                  GTK_TYPE_APP_CHOOSER_WIDGET,
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkAppChooserWidgetClass, application_selected),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1, G_TYPE_APP_INFO);
+
+  /**
+   * GtkAppChooserWidget::application-activated:
+   * @self: the object which received the signal
+   * @application: the activated #GAppInfo
+   *
+   * Emitted when an application item 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_APPLICATION_ACTIVATED] =
+    g_signal_new ("application-activated",
+                  GTK_TYPE_APP_CHOOSER_WIDGET,
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkAppChooserWidgetClass, application_activated),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1, G_TYPE_APP_INFO);
+
+  /**
+   * GtkAppChooserWidget::populate-popup:
+   * @self: the object which received the signal
+   * @menu: the #GtkMenu to populate
+   * @application: the current #GAppInfo
+   *
+   * Emitted when a context menu is about to popup over an application item.
+   * Clients can insert menu items into the provided #GtkMenu object in the
+   * callback of this signal; the context menu will be shown over the item if
+   * at least one item has been added to the menu.
+   */
+  signals[SIGNAL_POPULATE_POPUP] =
+    g_signal_new ("populate-popup",
+                  GTK_TYPE_APP_CHOOSER_WIDGET,
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkAppChooserWidgetClass, populate_popup),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__OBJECT_OBJECT,
+                  G_TYPE_NONE,
+                  2, GTK_TYPE_MENU, G_TYPE_APP_INFO);
+
+  g_type_class_add_private (klass, sizeof (GtkAppChooserWidgetPrivate));
+}
+
+static void
+gtk_app_chooser_widget_init (GtkAppChooserWidget *self)
+{
+  GtkWidget *scrolled_window;
+  GtkTreeSelection *selection;
+
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_APP_CHOOSER_WIDGET,
+                                            GtkAppChooserWidgetPrivate);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL);
+
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_size_request (scrolled_window, 400, 300);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+                                       GTK_SHADOW_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_NEVER,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_widget_show (scrolled_window);
+
+  self->priv->program_list = gtk_tree_view_new ();
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (self->priv->program_list),
+                                     FALSE);
+  gtk_container_add (GTK_CONTAINER (scrolled_window), self->priv->program_list);
+  gtk_box_pack_start (GTK_BOX (self), scrolled_window, TRUE, TRUE, 0);
+  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_select_function (selection, gtk_app_chooser_selection_func,
+                                          self, NULL);
+  g_signal_connect_swapped (selection, "changed",
+                            G_CALLBACK (refresh_and_emit_app_selected),
+                            self);
+  g_signal_connect (self->priv->program_list, "row-activated",
+                    G_CALLBACK (program_list_selection_activated),
+                    self);
+  g_signal_connect (self->priv->program_list, "button-press-event",
+                    G_CALLBACK (widget_button_press_event_cb),
+                    self);
+}
+
+static GAppInfo *
+gtk_app_chooser_widget_get_app_info (GtkAppChooser *object)
+{
+  GtkAppChooserWidget *self = GTK_APP_CHOOSER_WIDGET (object);
+
+  if (self->priv->selected_app_info == NULL)
+    return NULL;
+
+  return g_object_ref (self->priv->selected_app_info);
+}
+
+static void
+gtk_app_chooser_widget_refresh (GtkAppChooser *object)
+{
+  GtkAppChooserWidget *self = GTK_APP_CHOOSER_WIDGET (object);
+
+  if (self->priv->program_list_store != NULL)
+    {
+      gtk_list_store_clear (self->priv->program_list_store);
+
+      /* don't add additional xpad if we don't have headings */
+      g_object_set (self->priv->padding_renderer,
+                    "visible", !self->priv->show_all,
+                    NULL);
+
+      gtk_app_chooser_widget_real_add_items (self);
+    }
+}
+
+static void
+gtk_app_chooser_widget_iface_init (GtkAppChooserIface *iface)
+{
+  iface->get_app_info = gtk_app_chooser_widget_get_app_info;
+  iface->refresh = gtk_app_chooser_widget_refresh;
+}
+
+/**
+ * gtk_app_chooser_widget_new:
+ * @content_type: the content type to show applications for
+ *
+ * Creates a new #GtkAppChooserWidget for applications
+ * that can handle content of the given type.
+ *
+ * Returns: a newly created #GtkAppChooserWidget
+ *
+ * Since: 3.0
+ */
+GtkWidget *
+gtk_app_chooser_widget_new (const gchar *content_type)
+{
+  return g_object_new (GTK_TYPE_APP_CHOOSER_WIDGET,
+                       "content-type", content_type,
+                       NULL);
+}
+
+/**
+ * gtk_app_chooser_widget_set_show_default:
+ * @self: a #GtkAppChooserWidget
+ * @setting: the new value for #GtkAppChooserWidget:show-default
+ *
+ * Sets whether the app chooser should show the default handler
+ * for the content type in a separate section.
+ *
+ * Since: 3.0
+ */
+void
+gtk_app_chooser_widget_set_show_default (GtkAppChooserWidget *self,
+                                         gboolean             setting)
+{
+  g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self));
+
+  if (self->priv->show_default != setting)
+    {
+      self->priv->show_default = setting;
+
+      g_object_notify (G_OBJECT (self), "show-default");
+
+      gtk_app_chooser_refresh (GTK_APP_CHOOSER (self));
+    }
+}
+
+/**
+ * gtk_app_chooser_widget_get_show_default:
+ * @self: a #GtkAppChooserWidget
+ *
+ * Returns the current value of the #GtkAppChooserWidget:show-default
+ * property.
+ *
+ * Returns: the value of #GtkAppChooserWidget:show-default
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_app_chooser_widget_get_show_default (GtkAppChooserWidget *self)
+{
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self), FALSE);
+
+  return self->priv->show_default;
+}
+
+/**
+ * gtk_app_chooser_widget_set_show_recommended:
+ * @self: a #GtkAppChooserWidget
+ * @setting: the new value for #GtkAppChooserWidget:show-recommended
+ *
+ * Sets whether the app chooser should show recommended applications
+ * for the content type in a separate section.
+ *
+ * Since: 3.0
+ */
+void
+gtk_app_chooser_widget_set_show_recommended (GtkAppChooserWidget *self,
+                                             gboolean             setting)
+{
+  g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self));
+
+  if (self->priv->show_recommended != setting)
+    {
+      self->priv->show_recommended = setting;
+
+      g_object_notify (G_OBJECT (self), "show-recommended");
+
+      gtk_app_chooser_refresh (GTK_APP_CHOOSER (self));
+    }
+}
+
+/**
+ * gtk_app_chooser_widget_get_show_recommended:
+ * @self: a #GtkAppChooserWidget
+ *
+ * Returns the current value of the #GtkAppChooserWidget:show-recommended
+ * property.
+ *
+ * Returns: the value of #GtkAppChooserWidget:show-recommended
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_app_chooser_widget_get_show_recommended (GtkAppChooserWidget *self)
+{
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self), FALSE);
+
+  return self->priv->show_recommended;
+}
+
+/**
+ * gtk_app_chooser_widget_set_show_fallback:
+ * @self: a #GtkAppChooserWidget
+ * @setting: the new value for #GtkAppChooserWidget:show-fallback
+ *
+ * Sets whether the app chooser should show related applications
+ * for the content type in a separate section.
+ *
+ * Since: 3.0
+ */
+void
+gtk_app_chooser_widget_set_show_fallback (GtkAppChooserWidget *self,
+                                          gboolean             setting)
+{
+  g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self));
+
+  if (self->priv->show_fallback != setting)
+    {
+      self->priv->show_fallback = setting;
+
+      g_object_notify (G_OBJECT (self), "show-fallback");
+
+      gtk_app_chooser_refresh (GTK_APP_CHOOSER (self));
+    }
+}
+
+/**
+ * gtk_app_chooser_widget_get_show_fallback:
+ * @self: a #GtkAppChooserWidget
+ *
+ * Returns the current value of the #GtkAppChooserWidget:show-fallback
+ * property.
+ *
+ * Returns: the value of #GtkAppChooserWidget:show-fallback
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_app_chooser_widget_get_show_fallback (GtkAppChooserWidget *self)
+{
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self), FALSE);
+
+  return self->priv->show_fallback;
+}
+
+/**
+ * gtk_app_chooser_widget_set_show_other:
+ * @self: a #GtkAppChooserWidget
+ * @setting: the new value for #GtkAppChooserWidget:show-other
+ *
+ * Sets whether the app chooser should show applications
+ * which are unrelated to the content type.
+ *
+ * Since: 3.0
+ */
+void
+gtk_app_chooser_widget_set_show_other (GtkAppChooserWidget *self,
+                                       gboolean             setting)
+{
+  g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self));
+
+  if (self->priv->show_other != setting)
+    {
+      self->priv->show_other = setting;
+
+      g_object_notify (G_OBJECT (self), "show-other");
+
+      gtk_app_chooser_refresh (GTK_APP_CHOOSER (self));
+    }
+}
+
+/**
+ * gtk_app_chooser_widget_get_show_other:
+ * @self: a #GtkAppChooserWidget
+ *
+ * Returns the current value of the #GtkAppChooserWidget:show-other
+ * property.
+ *
+ * Returns: the value of #GtkAppChooserWidget:show-other
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_app_chooser_widget_get_show_other (GtkAppChooserWidget *self)
+{
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self), FALSE);
+
+  return self->priv->show_other;
+}
+
+/**
+ * gtk_app_chooser_widget_set_show_all:
+ * @self: a #GtkAppChooserWidget
+ * @setting: the new value for #GtkAppChooserWidget:show-all
+ *
+ * Sets whether the app chooser should show all applications
+ * in a flat list.
+ *
+ * Since: 3.0
+ */
+void
+gtk_app_chooser_widget_set_show_all (GtkAppChooserWidget *self,
+                                     gboolean             setting)
+{
+  g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self));
+
+  if (self->priv->show_all != setting)
+    {
+      self->priv->show_all = setting;
+
+      g_object_notify (G_OBJECT (self), "show-all");
+
+      gtk_app_chooser_refresh (GTK_APP_CHOOSER (self));
+    }
+}
+
+/**
+ * gtk_app_chooser_widget_get_show_all:
+ * @self: a #GtkAppChooserWidget
+ *
+ * Returns the current value of the #GtkAppChooserWidget:show-all
+ * property.
+ *
+ * Returns: the value of #GtkAppChooserWidget:show-all
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_app_chooser_widget_get_show_all (GtkAppChooserWidget *self)
+{
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self), FALSE);
+
+  return self->priv->show_all;
+}
+
+/**
+ * gtk_app_chooser_widget_set_default_text:
+ * @self: a #GtkAppChooserWidget
+ * @text: the new value for #GtkAppChooserWidget:default-text
+ *
+ * Sets the text that is shown if there are not applications
+ * that can handle the content type.
+ */
+void
+gtk_app_chooser_widget_set_default_text (GtkAppChooserWidget *self,
+                                         const gchar         *text)
+{
+  g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self));
+
+  if (g_strcmp0 (text, self->priv->default_text) != 0)
+    {
+      g_free (self->priv->default_text);
+      self->priv->default_text = g_strdup (text);
+
+      g_object_notify (G_OBJECT (self), "default-text");
+
+      gtk_app_chooser_refresh (GTK_APP_CHOOSER (self));
+    }
+}
+
+/**
+ * gtk_app_chooser_widget_get_default_text:
+ * @self: a #GtkAppChooserWidget
+ *
+ * Returns the text that is shown if there are not applications
+ * that can handle the content type.
+ *
+ * Returns: the value of #GtkAppChooserWidget:default-text
+ *
+ * Since: 3.0
+ */
+const gchar *
+gtk_app_chooser_widget_get_default_text (GtkAppChooserWidget *self)
+{
+  g_return_val_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self), NULL);
+
+  return self->priv->default_text;
+}
diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h
new file mode 100644
index 0000000000..e12541762c
--- /dev/null
+++ b/gtk/gtkappchooserwidget.h
@@ -0,0 +1,101 @@
+/*
+ * gtkappchooserwidget.h: an app-chooser widget
+ *
+ * Copyright (C) 2004 Novell, Inc.
+ * Copyright (C) 2007, 2010 Red Hat, Inc.
+ *
+ * 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 the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Dave Camp <dave@novell.com>
+ *          Alexander Larsson <alexl@redhat.com>
+ *          Cosimo Cecchi <ccecchi@redhat.com>
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_APP_CHOOSER_WIDGET_H__
+#define __GTK_APP_CHOOSER_WIDGET_H__
+
+#include <gtk/gtkbox.h>
+#include <gtk/gtkmenu.h>
+#include <gio/gio.h>
+
+#define GTK_TYPE_APP_CHOOSER_WIDGET            (gtk_app_chooser_widget_get_type ())
+#define GTK_APP_CHOOSER_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidget))
+#define GTK_APP_CHOOSER_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidgetClass))
+#define GTK_IS_APP_CHOOSER_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_WIDGET))
+#define GTK_IS_APP_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_WIDGET))
+#define GTK_APP_CHOOSER_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidgetClass))
+
+typedef struct _GtkAppChooserWidget        GtkAppChooserWidget;
+typedef struct _GtkAppChooserWidgetClass   GtkAppChooserWidgetClass;
+typedef struct _GtkAppChooserWidgetPrivate GtkAppChooserWidgetPrivate;
+
+struct _GtkAppChooserWidget {
+  GtkBox parent;
+
+  /*< private >*/
+  GtkAppChooserWidgetPrivate *priv;
+};
+
+struct _GtkAppChooserWidgetClass {
+  GtkBoxClass parent_class;
+
+  void (* application_selected)  (GtkAppChooserWidget *self,
+                                  GAppInfo            *app_info);
+
+  void (* application_activated) (GtkAppChooserWidget *self,
+                                  GAppInfo            *app_info);
+
+  void (* populate_popup)        (GtkAppChooserWidget *self,
+                                  GtkMenu             *menu,
+                                  GAppInfo            *app_info);
+
+  /* padding for future class expansion */
+  gpointer padding[16];
+};
+
+GType         gtk_app_chooser_widget_get_type             (void) G_GNUC_CONST;
+
+GtkWidget *   gtk_app_chooser_widget_new                  (const gchar         *content_type);
+
+void          gtk_app_chooser_widget_set_show_default     (GtkAppChooserWidget *self,
+                                                           gboolean             setting);
+gboolean      gtk_app_chooser_widget_get_show_default     (GtkAppChooserWidget *self);
+
+void          gtk_app_chooser_widget_set_show_recommended (GtkAppChooserWidget *self,
+                                                           gboolean             setting);
+gboolean      gtk_app_chooser_widget_get_show_recommended (GtkAppChooserWidget *self);
+
+void          gtk_app_chooser_widget_set_show_fallback    (GtkAppChooserWidget *self,
+                                                           gboolean             setting);
+gboolean      gtk_app_chooser_widget_get_show_fallback    (GtkAppChooserWidget *self);
+
+void          gtk_app_chooser_widget_set_show_other       (GtkAppChooserWidget *self,
+                                                           gboolean             setting);
+gboolean      gtk_app_chooser_widget_get_show_other       (GtkAppChooserWidget *self);
+
+void          gtk_app_chooser_widget_set_show_all         (GtkAppChooserWidget *self,
+                                                           gboolean             setting);
+gboolean      gtk_app_chooser_widget_get_show_all         (GtkAppChooserWidget *self);
+
+void          gtk_app_chooser_widget_set_default_text     (GtkAppChooserWidget *self,
+                                                           const gchar         *text);
+const gchar * gtk_app_chooser_widget_get_default_text     (GtkAppChooserWidget *self);
+
+#endif /* __GTK_APP_CHOOSER_WIDGET_H__ */
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index ba3164296a..c3baf9cf16 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -164,6 +164,7 @@ static void     gtk_assistant_get_child_property (GtkContainer      *container,
 						  GParamSpec        *pspec);
 
 static AtkObject *gtk_assistant_get_accessible   (GtkWidget         *widget);
+static GType      gtk_assistant_accessible_factory_get_type  (void);
 
 static void       gtk_assistant_buildable_interface_init     (GtkBuildableIface *iface);
 static GObject   *gtk_assistant_buildable_get_internal_child (GtkBuildable  *buildable,
@@ -2438,27 +2439,59 @@ gtk_assistant_commit (GtkAssistant *assistant)
   set_assistant_buttons_state (assistant);
 }
 
+static AtkObject *
+gtk_assistant_get_accessible (GtkWidget *widget)
+{
+  static gboolean first_time = TRUE;
+
+  if (first_time)
+    {
+      AtkObjectFactory *factory;
+      AtkRegistry *registry;
+      GType derived_type;
+      GType derived_atk_type;
+
+      /*
+       * Figure out whether accessibility is enabled by looking at the
+       * type of the accessible object which would be created for
+       * the parent type of GtkAssistant.
+       */
+      derived_type = g_type_parent (GTK_TYPE_ASSISTANT);
+
+      registry = atk_get_default_registry ();
+      factory = atk_registry_get_factory (registry, derived_type);
+      derived_atk_type = atk_object_factory_get_accessible_type (factory);
+      if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE))
+        atk_registry_set_factory_type (registry,
+                                       GTK_TYPE_ASSISTANT,
+                                       gtk_assistant_accessible_factory_get_type ());
+
+      first_time = FALSE;
+    }
 
+  return GTK_WIDGET_CLASS (gtk_assistant_parent_class)->get_accessible (widget);
+}
 
 /* accessible implementation */
 
+/* dummy typedefs */
+typedef struct _GtkAssistantAccessible          GtkAssistantAccessible;
+typedef struct _GtkAssistantAccessibleClass     GtkAssistantAccessibleClass;
+
+ATK_DEFINE_TYPE (GtkAssistantAccessible, gtk_assistant_accessible, GTK_TYPE_ASSISTANT);
+
 static gint
 gtk_assistant_accessible_get_n_children (AtkObject *accessible)
 {
-  GtkAssistant *assistant;
   GtkWidget *widget;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
-
-  if (!widget)
+  if (widget == NULL)
     return 0;
 
-  assistant = GTK_ASSISTANT (widget);
-   
-  return g_list_length (assistant->priv->pages) + 1;
+  return g_list_length (GTK_ASSISTANT (accessible)->priv->pages) + 1;
 }
 
-
 static AtkObject *
 gtk_assistant_accessible_ref_child (AtkObject *accessible,
 				    gint       index)
@@ -2471,7 +2504,7 @@ gtk_assistant_accessible_ref_child (AtkObject *accessible,
   const gchar *title;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
-  if (!widget)
+  if (widget == NULL)
     return NULL;
 
   assistant = GTK_ASSISTANT (widget);
@@ -2504,57 +2537,26 @@ gtk_assistant_accessible_ref_child (AtkObject *accessible,
 }
 
 static void
-gtk_assistant_accessible_class_init (AtkObjectClass *class)
+gtk_assistant_accessible_class_init (GtkAssistantAccessibleClass *klass)
 {
-  class->get_n_children = gtk_assistant_accessible_get_n_children;
-  class->ref_child = gtk_assistant_accessible_ref_child;
-}
+  AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
-static GType
-gtk_assistant_accessible_get_type (void)
-{
-  static GType type = 0;
-  
-  if (!type)
-    {
-      /*
-       * Figure out the size of the class and instance
-       * we are deriving from
-       */
-      AtkObjectFactory *factory;
-      GType derived_type;
-      GTypeQuery query;
-      GType derived_atk_type;
-
-      derived_type = g_type_parent (GTK_TYPE_ASSISTANT);
-      factory = atk_registry_get_factory (atk_get_default_registry (),
-					  derived_type);
-      derived_atk_type = atk_object_factory_get_accessible_type (factory);
-      g_type_query (derived_atk_type, &query);
-
-      type = g_type_register_static_simple (derived_atk_type,
-					    I_("GtkAssistantAccessible"),
-					    query.class_size,
-					    (GClassInitFunc) gtk_assistant_accessible_class_init,
-					    query.instance_size,
-					    NULL, 0);
-    }
-
-  return type;
+  atk_class->get_n_children = gtk_assistant_accessible_get_n_children;
+  atk_class->ref_child = gtk_assistant_accessible_ref_child;
 }
 
-static AtkObject *
-gtk_assistant_accessible_new (GObject *obj)
+static void
+gtk_assistant_accessible_init (GtkAssistantAccessible *self)
 {
-  AtkObject *accessible;
+}
 
-  g_return_val_if_fail (GTK_IS_ASSISTANT (obj), NULL);
+/* factory */
+typedef AtkObjectFactory        GtkAssistantAccessibleFactory;
+typedef AtkObjectFactoryClass   GtkAssistantAccessibleFactoryClass;
 
-  accessible = g_object_new (gtk_assistant_accessible_get_type (), NULL);
-  atk_object_initialize (accessible, obj);
-
-  return accessible;
-}
+G_DEFINE_TYPE (GtkAssistantAccessibleFactory,
+               gtk_assistant_accessible_factory,
+               ATK_TYPE_OBJECT_FACTORY);
 
 static GType
 gtk_assistant_accessible_factory_get_accessible_type (void)
@@ -2565,7 +2567,12 @@ gtk_assistant_accessible_factory_get_accessible_type (void)
 static AtkObject*
 gtk_assistant_accessible_factory_create_accessible (GObject *obj)
 {
-  return gtk_assistant_accessible_new (obj);
+  AtkObject *accessible;
+
+  accessible = g_object_new (gtk_assistant_accessible_get_type (), NULL);
+  atk_object_initialize (accessible, obj);
+
+  return accessible;
 }
 
 static void
@@ -2575,59 +2582,12 @@ gtk_assistant_accessible_factory_class_init (AtkObjectFactoryClass *class)
   class->get_accessible_type = gtk_assistant_accessible_factory_get_accessible_type;
 }
 
-static GType
-gtk_assistant_accessible_factory_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type)
-    {
-      type = g_type_register_static_simple (ATK_TYPE_OBJECT_FACTORY,
-					    I_("GtkAssistantAccessibleFactory"),
-					    sizeof (AtkObjectFactoryClass),
-					    (GClassInitFunc) gtk_assistant_accessible_factory_class_init,
-					    sizeof (AtkObjectFactory),
-					    NULL, 0);
-    }
-
-  return type;
-}
-
-static AtkObject *
-gtk_assistant_get_accessible (GtkWidget *widget)
+static void
+gtk_assistant_accessible_factory_init (AtkObjectFactory *factory)
 {
-  static gboolean first_time = TRUE;
-
-  if (first_time)
-    {
-      AtkObjectFactory *factory;
-      AtkRegistry *registry;
-      GType derived_type;
-      GType derived_atk_type;
-
-      /*
-       * Figure out whether accessibility is enabled by looking at the
-       * type of the accessible object which would be created for
-       * the parent type of GtkAssistant.
-       */
-      derived_type = g_type_parent (GTK_TYPE_ASSISTANT);
-
-      registry = atk_get_default_registry ();
-      factory = atk_registry_get_factory (registry,
-					  derived_type);
-      derived_atk_type = atk_object_factory_get_accessible_type (factory);
-      if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE))
-	{
-	  atk_registry_set_factory_type (registry,
-					 GTK_TYPE_ASSISTANT,
-					 gtk_assistant_accessible_factory_get_type ());
-	}
-      first_time = FALSE;
-    }
-
-  return GTK_WIDGET_CLASS (gtk_assistant_parent_class)->get_accessible (widget);
 }
 
+/* buildable implementation */
 
 static GtkBuildableIface *parent_buildable_iface;
 
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 7ed026c0a7..97b0053da3 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1563,7 +1563,7 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
         {
           GdkRGBA rgba = { 0 };
 
-          if (gdk_rgba_parse (string, &rgba))
+          if (gdk_rgba_parse (&rgba, string))
             g_value_set_boxed (value, &rgba);
           else
             {
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index dcbb668948..96465a84dc 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -539,7 +539,7 @@ gtk_cell_renderer_set_property (GObject      *object,
 
         if (!g_value_get_string (value))
           set_cell_bg_color (cell, NULL);
-        else if (gdk_rgba_parse (g_value_get_string (value), &rgba))
+        else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
           set_cell_bg_color (cell, &rgba);
         else
           g_warning ("Don't know color `%s'", g_value_get_string (value));
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 120100a52e..31ddd304c7 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1201,7 +1201,7 @@ gtk_cell_renderer_text_set_property (GObject      *object,
 
         if (!g_value_get_string (value))
           set_bg_color (celltext, NULL);       /* reset to background_set to FALSE */
-        else if (gdk_rgba_parse (g_value_get_string (value), &rgba))
+        else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
           set_bg_color (celltext, &rgba);
         else
           g_warning ("Don't know color `%s'", g_value_get_string (value));
@@ -1216,7 +1216,7 @@ gtk_cell_renderer_text_set_property (GObject      *object,
 
         if (!g_value_get_string (value))
           set_fg_color (celltext, NULL);       /* reset to foreground_set to FALSE */
-        else if (gdk_rgba_parse (g_value_get_string (value), &rgba))
+        else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
           set_fg_color (celltext, &rgba);
         else
           g_warning ("Don't know color `%s'", g_value_get_string (value));
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 0a922fa023..ebdd7f5e1d 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -143,6 +143,8 @@ struct _GtkComboBoxPrivate
   gint  text_column;
   GtkCellRenderer *text_renderer;
 
+  gint id_column;
+
   GSList *cells;
 
   guint popup_in_progress : 1;
@@ -245,7 +247,9 @@ enum {
   PROP_EDITING_CANCELED,
   PROP_HAS_ENTRY,
   PROP_ENTRY_TEXT_COLUMN,
-  PROP_POPUP_FIXED_WIDTH
+  PROP_POPUP_FIXED_WIDTH,
+  PROP_ID_COLUMN,
+  PROP_ACTIVE_ID
 };
 
 static guint combo_box_signals[LAST_SIGNAL] = {0,};
@@ -949,6 +953,38 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
 						      GTK_PARAM_READWRITE));
 
    /**
+    * GtkComboBox:id-column:
+    *
+    * The column in the combo box's model that provides string
+    * IDs for the values in the model, if != -1.
+    *
+    * Since: 3.0
+    */
+   g_object_class_install_property (object_class,
+                                    PROP_ID_COLUMN,
+                                    g_param_spec_int ("id-column",
+                                                      P_("ID Column"),
+                                                      P_("The column in the combo box's model that provides "
+                                                      "string IDs for the values in the model"),
+                                                      -1, G_MAXINT, -1,
+                                                      GTK_PARAM_READWRITE));
+
+   /**
+    * GtkComboBox:active-id:
+    *
+    * The value of the ID column of the active row.
+    *
+    * Since: 3.0
+    */
+   g_object_class_install_property (object_class,
+                                    PROP_ACTIVE_ID,
+                                    g_param_spec_string ("active-id",
+                                                         P_("Active id"),
+                                                         P_("The value of the id column "
+                                                         "for the active row"),
+                                                         NULL, GTK_PARAM_READWRITE));
+
+   /**
     * GtkComboBox:popup-fixed-width:
     *
     * Whether the popup's width should be a fixed width matching the
@@ -1077,6 +1113,7 @@ gtk_combo_box_init (GtkComboBox *combo_box)
 
   priv->text_column = -1;
   priv->text_renderer = NULL;
+  priv->id_column = -1;
 
   gtk_combo_box_check_appearance (combo_box);
 }
@@ -1168,6 +1205,14 @@ gtk_combo_box_set_property (GObject      *object,
       gtk_combo_box_set_entry_text_column (combo_box, g_value_get_int (value));
       break;
 
+    case PROP_ID_COLUMN:
+      gtk_combo_box_set_id_column (combo_box, g_value_get_int (value));
+      break;
+
+    case PROP_ACTIVE_ID:
+      gtk_combo_box_set_active_id (combo_box, g_value_get_string (value));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1245,6 +1290,14 @@ gtk_combo_box_get_property (GObject    *object,
 	g_value_set_int (value, priv->text_column);
 	break;
 
+      case PROP_ID_COLUMN:
+        g_value_set_int (value, priv->id_column);
+        break;
+
+      case PROP_ACTIVE_ID:
+        g_value_set_string (value, gtk_combo_box_get_active_id (combo_box));
+        break;
+
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -4879,6 +4932,7 @@ gtk_combo_box_new_with_model (GtkTreeModel *model)
 
 /**
  * gtk_combo_box_new_with_model_and_entry:
+ * @model: A #GtkTreeModel
  *
  * Creates a new empty #GtkComboBox with an entry
  * and with the model initialized to @model.
@@ -5199,6 +5253,8 @@ gtk_combo_box_set_active_internal (GtkComboBox *combo_box,
 
   g_signal_emit (combo_box, combo_box_signals[CHANGED], 0);
   g_object_notify (G_OBJECT (combo_box), "active");
+  if (combo_box->priv->id_column >= 0)
+    g_object_notify (G_OBJECT (combo_box), "active-id");
 }
 
 
@@ -6587,3 +6643,157 @@ gtk_combo_box_get_preferred_height_for_width (GtkWidget *widget,
   if (natural_size)
     *natural_size = nat_height;
 }
+
+/**
+ * gtk_combo_box_set_id_column:
+ * @combo_box: A #GtkComboBox
+ * @id_column: A column in @model to get string IDs for values from
+ *
+ * Sets the model column which @combo_box should use to get string IDs
+ * for values from. The column @id_column in the model of @combo_box
+ * must be of type %G_TYPE_STRING.
+ *
+ * Since: 3.0
+ */
+void
+gtk_combo_box_set_id_column (GtkComboBox *combo_box,
+                             gint         id_column)
+{
+  GtkComboBoxPrivate *priv = combo_box->priv;
+  GtkTreeModel *model;
+
+  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
+
+  if (id_column != priv->id_column)
+    {
+      model = gtk_combo_box_get_model (combo_box);
+
+      g_return_if_fail (id_column >= 0);
+      g_return_if_fail (model == NULL ||
+                        id_column < gtk_tree_model_get_n_columns (model));
+
+      priv->id_column = id_column;
+
+      g_object_notify (G_OBJECT (combo_box), "id-column");
+      g_object_notify (G_OBJECT (combo_box), "active-id");
+    }
+}
+
+/**
+ * gtk_combo_box_get_id_column:
+ * @combo_box: A #GtkComboBox
+ *
+ * Returns the column which @combo_box is using to get string IDs
+ * for values from.
+ *
+ * Return value: A column in the data source model of @combo_box.
+ *
+ * Since: 3.0
+ */
+gint
+gtk_combo_box_get_id_column (GtkComboBox *combo_box)
+{
+  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), 0);
+
+  return combo_box->priv->id_column;
+}
+
+/**
+ * gtk_combo_box_get_active_id:
+ * @combo_box: a #GtkComboBox
+ *
+ * Returns the ID of the active row of @combo_box.  This value is taken
+ * from the active row and the column specified by the 'id-column'
+ * property of @combo_box (see gtk_combo_box_set_id_column()).
+ *
+ * The returned value is an interned string which means that you can
+ * compare the pointer by value to other interned strings and that you
+ * must not free it.
+ *
+ * If the 'id-column' property of @combo_box is not set or if no row is
+ * selected then %NULL is returned.
+ *
+ * Return value: the ID of the active row, or %NULL
+ *
+ * Since: 3.0
+ **/
+const gchar *
+gtk_combo_box_get_active_id (GtkComboBox *combo_box)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  gint column;
+
+  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), 0);
+
+  column = combo_box->priv->id_column;
+
+  if (column < 0)
+    return NULL;
+
+  model = gtk_combo_box_get_model (combo_box);
+  g_return_val_if_fail (gtk_tree_model_get_column_type (model, column) ==
+                        G_TYPE_STRING, NULL);
+
+  if (gtk_combo_box_get_active_iter (combo_box, &iter))
+    {
+      const gchar *interned;
+      gchar *id;
+
+      gtk_tree_model_get (model, &iter, column, &id, -1);
+      interned = g_intern_string (id);
+      g_free (id);
+
+      return interned;
+    }
+
+  return NULL;
+}
+
+/**
+ * gtk_combo_box_set_active_id:
+ * @combo_box: a #GtkComboBox
+ * @active_id: the ID of the row to select
+ *
+ * Changes the active row of @combo_box to the one that has an ID equal to @id.
+ *
+ * If the 'id-column' property of @combo_box is unset or if no row has
+ * the given ID then nothing happens.
+ *
+ * Since: 3.0
+ **/
+void
+gtk_combo_box_set_active_id (GtkComboBox *combo_box,
+                             const gchar *active_id)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  gint column;
+
+  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
+
+  column = combo_box->priv->id_column;
+
+  if (column < 0)
+    return;
+
+  model = gtk_combo_box_get_model (combo_box);
+  g_return_if_fail (gtk_tree_model_get_column_type (model, column) ==
+                    G_TYPE_STRING);
+
+  if (gtk_tree_model_get_iter_first (model, &iter))
+    do {
+      gboolean match;
+      gchar *id;
+
+      gtk_tree_model_get (model, &iter, column, &id, -1);
+      match = strcmp (id, active_id) == 0;
+      g_free (id);
+
+      if (match)
+        {
+          gtk_combo_box_set_active_iter (combo_box, &iter);
+          break;
+        }
+    } while (gtk_tree_model_iter_next (model, &iter));
+}
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index c8931eb3b3..1c674b9c06 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -134,6 +134,12 @@ void          gtk_combo_box_popup_for_device (GtkComboBox     *combo_box,
 void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);
 AtkObject*    gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box);
 
+gint          gtk_combo_box_get_id_column        (GtkComboBox *combo_box);
+void          gtk_combo_box_set_id_column        (GtkComboBox *combo_box,
+                                                  gint         id_column);
+const gchar * gtk_combo_box_get_active_id        (GtkComboBox *combo_box);
+void          gtk_combo_box_set_active_id        (GtkComboBox *combo_box,
+                                                  const gchar *active_id);
 
 G_END_DECLS
 
diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c
index d36d6dc25e..c7b82d1063 100644
--- a/gtk/gtkcomboboxtext.c
+++ b/gtk/gtkcomboboxtext.c
@@ -72,7 +72,7 @@ gtk_combo_box_text_init (GtkComboBoxText *combo_box)
 {
   GtkListStore *store;
 
-  store = gtk_list_store_new (1, G_TYPE_STRING);
+  store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
   gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
   g_object_unref (store);
 }
@@ -102,6 +102,7 @@ gtk_combo_box_text_new (void)
 {
   return g_object_new (GTK_TYPE_COMBO_BOX_TEXT,
                        "entry-text-column", 0,
+                       "id-column", 1,
                        NULL);
 }
 
@@ -121,6 +122,7 @@ gtk_combo_box_text_new_with_entry (void)
   return g_object_new (GTK_TYPE_COMBO_BOX_TEXT,
                        "has-entry", TRUE,
                        "entry-text-column", 0,
+                       "id-column", 1,
                        NULL);
 }
 
@@ -131,13 +133,16 @@ gtk_combo_box_text_new_with_entry (void)
  *
  * Appends @text to the list of strings stored in @combo_box.
  *
+ * This is the same as calling gtk_combo_box_text_insert_text() with a
+ * position of -1.
+ *
  * Since: 2.24
  */
 void
 gtk_combo_box_text_append_text (GtkComboBoxText *combo_box,
                                 const gchar     *text)
 {
-  gtk_combo_box_text_insert_text (combo_box, G_MAXINT, text);
+  gtk_combo_box_text_insert (combo_box, -1, NULL, text);
 }
 
 /**
@@ -147,13 +152,16 @@ gtk_combo_box_text_append_text (GtkComboBoxText *combo_box,
  *
  * Prepends @text to the list of strings stored in @combo_box.
  *
+ * This is the same as calling gtk_combo_box_text_insert_text() with a
+ * position of 0.
+ *
  * Since: 2.24
  */
 void
 gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box,
                                  const gchar     *text)
 {
-  gtk_combo_box_text_insert_text (combo_box, 0, text);
+  gtk_combo_box_text_insert (combo_box, 0, NULL, text);
 }
 
 /**
@@ -164,6 +172,11 @@ gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box,
  *
  * Inserts @text at @position in the list of strings stored in @combo_box.
  *
+ * If @position is negative then @text is appended.
+ *
+ * This is the same as calling gtk_combo_box_text_insert() with a %NULL
+ * ID string.
+ *
  * Since: 2.24
  */
 void
@@ -171,15 +184,84 @@ gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box,
                                 gint             position,
                                 const gchar     *text)
 {
+  gtk_combo_box_text_insert (combo_box, position, NULL, text);
+}
+
+/**
+ * gtk_combo_box_text_append:
+ * @combo_box: A #GtkComboBoxText
+ * @text: A string
+ *
+ * Appends @text to the list of strings stored in @combo_box.  If @id is
+ * non-%NULL then it is used as the ID of the row.
+ *
+ * This is the same as calling gtk_combo_box_text_insert() with a
+ * position of -1.
+ *
+ * Since: 2.24
+ */
+void
+gtk_combo_box_text_append (GtkComboBoxText *combo_box,
+                           const gchar     *id,
+                           const gchar     *text)
+{
+  gtk_combo_box_text_insert (combo_box, -1, id, text);
+}
+
+/**
+ * gtk_combo_box_text_prepend:
+ * @combo_box: A #GtkComboBox
+ * @text: A string
+ *
+ * Prepends @text to the list of strings stored in @combo_box.  If @id
+ * is non-%NULL then it is used as the ID of the row.
+ *
+ * This is the same as calling gtk_combo_box_text_insert() with a
+ * position of 0.
+ *
+ * Since: 2.24
+ */
+void
+gtk_combo_box_text_prepend (GtkComboBoxText *combo_box,
+                            const gchar     *id,
+                            const gchar     *text)
+{
+  gtk_combo_box_text_insert (combo_box, 0, id, text);
+}
+
+
+/**
+ * gtk_combo_box_text_insert:
+ * @combo_box: A #GtkComboBoxText
+ * @position: An index to insert @text
+ * @id: a string ID for this value, or %NULL
+ * @text: A string to display
+ *
+ * Inserts @text at @position in the list of strings stored in @combo_box.
+ * If @id is non-%NULL then it is used as the ID of the row.  See
+ * #GtkComboBox::id-column.
+ *
+ * If @position is negative then @text is appended.
+ *
+ * Since: 3.0
+ */
+void
+gtk_combo_box_text_insert (GtkComboBoxText *combo_box,
+                           gint             position,
+                           const gchar     *id,
+                           const gchar     *text)
+{
   GtkListStore *store;
   GtkTreeIter iter;
   gint text_column;
   gint column_type;
 
   g_return_if_fail (GTK_IS_COMBO_BOX_TEXT (combo_box));
-  g_return_if_fail (position >= 0);
   g_return_if_fail (text != NULL);
 
+  if (position < 0)
+    position = G_MAXINT;
+
   store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)));
   g_return_if_fail (GTK_IS_LIST_STORE (store));
   text_column = gtk_combo_box_get_entry_text_column (GTK_COMBO_BOX (combo_box));
@@ -188,6 +270,17 @@ gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box,
 
   gtk_list_store_insert (store, &iter, position);
   gtk_list_store_set (store, &iter, text_column, text, -1);
+
+  if (id != NULL)
+    {
+      gint id_column;
+
+      id_column = gtk_combo_box_get_id_column (GTK_COMBO_BOX (combo_box));
+      column_type = gtk_tree_model_get_column_type (GTK_TREE_MODEL (store), id_column);
+      g_return_if_fail (column_type == G_TYPE_STRING);
+
+      gtk_list_store_set (store, &iter, id_column, id, -1);
+    }
 }
 
 /**
diff --git a/gtk/gtkcomboboxtext.h b/gtk/gtkcomboboxtext.h
index ae08d2d40e..d1c362f30c 100644
--- a/gtk/gtkcomboboxtext.h
+++ b/gtk/gtkcomboboxtext.h
@@ -72,6 +72,16 @@ void          gtk_combo_box_text_remove          (GtkComboBoxText     *combo_box
 void          gtk_combo_box_text_remove_all      (GtkComboBoxText     *combo_box);
 gchar        *gtk_combo_box_text_get_active_text (GtkComboBoxText     *combo_box);
 
+void          gtk_combo_box_text_insert          (GtkComboBoxText     *combo_box,
+                                                  gint                 position,
+                                                  const gchar         *id,
+                                                  const gchar         *text);
+void          gtk_combo_box_text_append          (GtkComboBoxText     *combo_box,
+                                                  const gchar         *id,
+                                                  const gchar         *text);
+void          gtk_combo_box_text_prepend         (GtkComboBoxText     *combo_box,
+                                                  const gchar         *id,
+                                                  const gchar         *text);
 
 G_END_DECLS
 
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 9dbab6dff1..e7dd7f56c9 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -557,7 +557,6 @@ typedef enum
   GTK_SCROLL_NATURAL
 } GtkScrollablePolicy;
 
-
 G_END_DECLS
 
 
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index c080bba048..8a3defdb80 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -317,7 +317,7 @@ static void                 gtk_icon_view_set_hadjustment                (GtkIco
                                                                           GtkAdjustment          *adjustment);
 static void                 gtk_icon_view_set_vadjustment                (GtkIconView            *icon_view,
                                                                           GtkAdjustment          *adjustment);
-static void                 gtk_icon_view_accessible_set_adjustment      (GtkIconView            *icon_view,
+static void                 gtk_icon_view_accessible_set_adjustment      (AtkObject              *accessible,
                                                                           GtkOrientation          orientation,
                                                                           GtkAdjustment          *adjustment);
 static void                 gtk_icon_view_adjustment_changed             (GtkAdjustment          *adjustment,
@@ -2707,6 +2707,7 @@ gtk_icon_view_set_hadjustment (GtkIconView   *icon_view,
                                GtkAdjustment *adjustment)
 {
   GtkIconViewPrivate *priv = icon_view->priv;
+  AtkObject *atk_obj;
 
   if (adjustment && priv->hadjustment == adjustment)
     return;
@@ -2728,9 +2729,10 @@ gtk_icon_view_set_hadjustment (GtkIconView   *icon_view,
   priv->hadjustment = g_object_ref_sink (adjustment);
   gtk_icon_view_set_hadjustment_values (icon_view);
 
-  gtk_icon_view_accessible_set_adjustment (icon_view,
+  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
+  gtk_icon_view_accessible_set_adjustment (atk_obj,
                                            GTK_ORIENTATION_HORIZONTAL,
-                                           priv->hadjustment);
+                                           adjustment);
 
   g_object_notify (G_OBJECT (icon_view), "hadjustment");
 }
@@ -2740,6 +2742,7 @@ gtk_icon_view_set_vadjustment (GtkIconView   *icon_view,
                                GtkAdjustment *adjustment)
 {
   GtkIconViewPrivate *priv = icon_view->priv;
+  AtkObject *atk_obj;
 
   if (adjustment && priv->vadjustment == adjustment)
     return;
@@ -2761,9 +2764,10 @@ gtk_icon_view_set_vadjustment (GtkIconView   *icon_view,
   priv->vadjustment = g_object_ref_sink (adjustment);
   gtk_icon_view_set_vadjustment_values (icon_view);
 
-  gtk_icon_view_accessible_set_adjustment (icon_view,
+  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
+  gtk_icon_view_accessible_set_adjustment (atk_obj,
                                            GTK_ORIENTATION_VERTICAL,
-                                           priv->vadjustment);
+                                           adjustment);
 
   g_object_notify (G_OBJECT (icon_view), "vadjustment");
 }
@@ -9207,32 +9211,21 @@ gtk_icon_view_accessible_traverse_items (GtkIconViewAccessible *view,
 }
 
 static void
-gtk_icon_view_accessible_adjustment_changed (GtkAdjustment *adjustment,
-                                             GtkIconView   *icon_view)
+gtk_icon_view_accessible_adjustment_changed (GtkAdjustment         *adjustment,
+                                             GtkIconViewAccessible *view)
 {
-  AtkObject *obj;
-  GtkIconViewAccessible *view;
-
-  /*
-   * The scrollbars have changed
-   */
-  obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
-  view = GTK_ICON_VIEW_ACCESSIBLE (obj);
-
   gtk_icon_view_accessible_traverse_items (view, NULL);
 }
 
 static void
-gtk_icon_view_accessible_set_adjustment (GtkIconView    *icon_view,
+gtk_icon_view_accessible_set_adjustment (AtkObject      *accessible,
                                          GtkOrientation  orientation,
                                          GtkAdjustment  *adjustment)
 {
-  AtkObject *atk_obj;
   GtkIconViewAccessiblePrivate *priv;
   GtkAdjustment **old_adj_ptr;
 
-  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
-  priv = gtk_icon_view_accessible_get_priv (atk_obj);
+  priv = gtk_icon_view_accessible_get_priv (accessible);
 
   /* Adjustments are set for the first time in constructor and priv is not
    * initialized at that time, so skip this first setting. */
@@ -9261,7 +9254,7 @@ gtk_icon_view_accessible_set_adjustment (GtkIconView    *icon_view,
                                     (gpointer *)&priv->old_hadj);
       g_signal_handlers_disconnect_by_func (*old_adj_ptr,
                                             gtk_icon_view_accessible_adjustment_changed,
-                                            icon_view);
+                                            accessible);
     }
 
   /* Connect signal */
@@ -9269,7 +9262,7 @@ gtk_icon_view_accessible_set_adjustment (GtkIconView    *icon_view,
   g_object_add_weak_pointer (G_OBJECT (adjustment), (gpointer *)old_adj_ptr);
   g_signal_connect (adjustment, "value-changed",
                     G_CALLBACK (gtk_icon_view_accessible_adjustment_changed),
-                    icon_view);
+                    accessible);
 }
 
 static void
@@ -9572,11 +9565,11 @@ gtk_icon_view_accessible_initialize (AtkObject *accessible,
 
   icon_view = GTK_ICON_VIEW (data);
   if (icon_view->priv->hadjustment)
-    gtk_icon_view_accessible_set_adjustment (icon_view,
+    gtk_icon_view_accessible_set_adjustment (accessible,
 					     GTK_ORIENTATION_HORIZONTAL,
 					     icon_view->priv->hadjustment);
   if (icon_view->priv->vadjustment)
-    gtk_icon_view_accessible_set_adjustment (icon_view,
+    gtk_icon_view_accessible_set_adjustment (accessible,
 					     GTK_ORIENTATION_VERTICAL,
 					     icon_view->priv->vadjustment);
   g_signal_connect (data,
@@ -9623,7 +9616,7 @@ gtk_icon_view_accessible_destroyed (GtkWidget *widget,
           
       g_signal_handlers_disconnect_by_func (priv->old_hadj,
                                             (gpointer) gtk_icon_view_accessible_adjustment_changed,
-                                            widget);
+                                            accessible);
       priv->old_hadj = NULL;
     }
   if (priv->old_vadj)
@@ -9633,7 +9626,7 @@ gtk_icon_view_accessible_destroyed (GtkWidget *widget,
           
       g_signal_handlers_disconnect_by_func (priv->old_vadj,
                                             (gpointer) gtk_icon_view_accessible_adjustment_changed,
-                                            widget);
+                                            accessible);
       priv->old_vadj = NULL;
     }
 }
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 6cbbdd64c7..27e8a7424e 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1280,7 +1280,7 @@ gtk_range_set_range (GtkRange *range,
   gdouble value;
   
   g_return_if_fail (GTK_IS_RANGE (range));
-  g_return_if_fail (min < max);
+  g_return_if_fail (min <= max);
 
   priv = range->priv;
 
@@ -2016,11 +2016,16 @@ gtk_range_draw (GtkWidget      *widget,
   gint focus_line_width = 0;
   gint focus_padding = 0;
   gboolean touchscreen;
+  gboolean draw_trough = TRUE;
 
   g_object_get (gtk_widget_get_settings (widget),
                 "gtk-touchscreen-mode", &touchscreen,
                 NULL);
 
+  if (GTK_IS_SCALE (widget) &&
+      priv->adjustment->upper == priv->adjustment->lower)
+    draw_trough = FALSE;
+
   style = gtk_widget_get_style (widget);
   if (gtk_widget_get_can_focus (GTK_WIDGET (range)))
     gtk_widget_style_get (GTK_WIDGET (range),
@@ -2112,6 +2117,7 @@ gtk_range_draw (GtkWidget      *widget,
             }
 	}
 
+      if (draw_trough)
         {
 	  gint trough_change_pos_x = width;
 	  gint trough_change_pos_y = height;
@@ -2147,6 +2153,17 @@ gtk_range_draw (GtkWidget      *widget,
                          width - trough_change_pos_x,
                          height - trough_change_pos_y);
         }
+      else
+        {
+          gtk_paint_box (style, cr,
+                         sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
+                         GTK_SHADOW_IN,
+                         GTK_WIDGET (range),
+                         "trough-upper",
+                         x, y,
+                         width,
+                         height);
+        }
 
       if (priv->show_fill_level &&
           priv->adjustment->upper - priv->adjustment->page_size -
@@ -2236,6 +2253,7 @@ gtk_range_draw (GtkWidget      *widget,
   gdk_cairo_rectangle (cr, &priv->slider);
   cairo_clip (cr);
 
+  if (draw_trough)
     {
       gtk_paint_slider (style,
                         cr,
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 51a4111e3f..cd00b2ea2e 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -55,6 +55,11 @@
  * To detect changes to the value, you would normally use the
  * #GtkRange::value-changed signal.
  *
+ * Note that using the same upper and lower bounds for the #GtkScale (through
+ * the #GtkRange methods) will hide the slider itself. This is useful for
+ * applications that want to show an undeterminate value on the scale, without
+ * changing the layout of the application (such as movie or music players).
+ *
  * <refsect2 id="GtkScale-BUILDER-UI"><title>GtkScale as GtkBuildable</title>
  * GtkScale supports a custom &lt;marks&gt; element, which
  * can contain multiple &lt;mark&gt; elements. The "value" and "position"
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index 4fa30a37d9..eddab0f4ad 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -68,9 +68,9 @@ struct _GtkSelectionData
 
 struct _GtkTargetEntry
 {
-  const gchar *target;
-  guint        flags;
-  guint        info;
+  gchar *target;
+  guint  flags;
+  guint  info;
 };
 
 /* These structures not public, and are here only for the convenience of
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index af96fe9d50..2af87b061f 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -293,6 +293,7 @@ gtk_spinner_add_timeout (GtkSpinner *spinner)
 
   priv = spinner->priv;
 
+  g_assert (priv->timeout == 0);
   priv->timeout = gdk_threads_add_timeout ((guint) priv->cycle_duration / priv->num_steps, gtk_spinner_timeout, spinner);
 }
 
@@ -315,7 +316,7 @@ gtk_spinner_map (GtkWidget *widget)
 
   GTK_WIDGET_CLASS (gtk_spinner_parent_class)->map (widget);
 
-  if (priv->active)
+  if (priv->active && priv->timeout == 0)
     gtk_spinner_add_timeout (spinner);
 }
 
@@ -364,20 +365,22 @@ gtk_spinner_dispose (GObject *gobject)
 }
 
 static void
-gtk_spinner_set_active (GtkSpinner *spinner, gboolean active)
+gtk_spinner_set_active (GtkSpinner *spinner,
+                        gboolean    active)
 {
-  GtkSpinnerPrivate *priv;
-
-  active = active != FALSE;
+  GtkSpinnerPrivate *priv = spinner->priv;
 
-  priv = GTK_SPINNER (spinner)->priv;
+  active = !!active;
 
   if (priv->active != active)
     {
       priv->active = active;
+
       g_object_notify (G_OBJECT (spinner), "active");
 
-      if (active && gtk_widget_get_realized (GTK_WIDGET (spinner)) && priv->timeout == 0)
+      if (active &&
+          gtk_widget_get_realized (GTK_WIDGET (spinner)) &&
+          priv->timeout == 0)
         {
           gtk_spinner_add_timeout (spinner);
         }
@@ -388,84 +391,7 @@ gtk_spinner_set_active (GtkSpinner *spinner, gboolean active)
     }
 }
 
-static GType
-gtk_spinner_accessible_factory_get_accessible_type (void)
-{
-  return gtk_spinner_accessible_get_type ();
-}
-
-static AtkObject *
-gtk_spinner_accessible_new (GObject *obj)
-{
-  AtkObject *accessible;
-
-  g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL);
-
-  accessible = g_object_new (gtk_spinner_accessible_get_type (), NULL);
-  atk_object_initialize (accessible, obj);
-
-  return accessible;
-}
-
-static AtkObject*
-gtk_spinner_accessible_factory_create_accessible (GObject *obj)
-{
-  return gtk_spinner_accessible_new (obj);
-}
-
-static void
-gtk_spinner_accessible_factory_class_init (AtkObjectFactoryClass *klass)
-{
-  klass->create_accessible = gtk_spinner_accessible_factory_create_accessible;
-  klass->get_accessible_type = gtk_spinner_accessible_factory_get_accessible_type;
-}
-
-static GType
-gtk_spinner_accessible_factory_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type)
-    {
-      const GTypeInfo tinfo =
-      {
-        sizeof (AtkObjectFactoryClass),
-        NULL,           /* base_init */
-        NULL,           /* base_finalize */
-        (GClassInitFunc) gtk_spinner_accessible_factory_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (AtkObjectFactory),
-        0,             /* n_preallocs */
-        NULL, NULL
-      };
-
-      type = g_type_register_static (ATK_TYPE_OBJECT_FACTORY,
-                                    I_("GtkSpinnerAccessibleFactory"),
-                                    &tinfo, 0);
-    }
-  return type;
-}
-
-static AtkObjectClass *a11y_parent_class = NULL;
-
-static void
-gtk_spinner_accessible_initialize (AtkObject *accessible,
-                                   gpointer   widget)
-{
-  atk_object_set_name (accessible, C_("throbbing progress animation widget", "Spinner"));
-  atk_object_set_description (accessible, _("Provides visual indication of progress"));
-
-  a11y_parent_class->initialize (accessible, widget);
-}
-
-static void
-gtk_spinner_accessible_class_init (AtkObjectClass *klass)
-{
-  a11y_parent_class = g_type_class_peek_parent (klass);
-
-  klass->initialize = gtk_spinner_accessible_initialize;
-}
+/* accessible implementation */
 
 static void
 gtk_spinner_accessible_image_get_size (AtkImage *image,
@@ -476,7 +402,7 @@ gtk_spinner_accessible_image_get_size (AtkImage *image,
   GtkWidget *widget;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (image));
-  if (!widget)
+  if (widget == NULL)
     {
       *width = *height = 0;
     }
@@ -489,62 +415,79 @@ gtk_spinner_accessible_image_get_size (AtkImage *image,
 }
 
 static void
-gtk_spinner_accessible_image_interface_init (AtkImageIface *iface)
+gtk_spinner_accessible_image_iface_init (AtkImageIface *iface)
 {
   iface->get_image_size = gtk_spinner_accessible_image_get_size;
 }
 
-static GType
-gtk_spinner_accessible_get_type (void)
+/* dummy typedef */
+typedef struct _GtkSpinnerAccessible            GtkSpinnerAccessible;
+typedef struct _GtkSpinnerAccessibleClass       GtkSpinnerAccessibleClass;
+
+ATK_DEFINE_TYPE_WITH_CODE (GtkSpinnerAccessible,
+                           gtk_spinner_accessible,
+                           GTK_TYPE_IMAGE,
+                           G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE,
+                                                  gtk_spinner_accessible_image_iface_init));
+
+static void
+gtk_spinner_accessible_initialize (AtkObject *accessible,
+                                   gpointer   widget)
 {
-  static GType type = 0;
+  ATK_OBJECT_CLASS (gtk_spinner_accessible_parent_class)->initialize (accessible, widget);
 
-  /* Action interface
-     Name etc. ... */
-  if (G_UNLIKELY (type == 0))
-    {
-      const GInterfaceInfo atk_image_info = {
-              (GInterfaceInitFunc) gtk_spinner_accessible_image_interface_init,
-              (GInterfaceFinalizeFunc) NULL,
-              NULL
-      };
-      GType parent_atk_type;
-      GTypeInfo tinfo = { 0 };
-      GTypeQuery query;
-      AtkObjectFactory *factory;
+  atk_object_set_name (accessible, C_("throbbing progress animation widget", "Spinner"));
+  atk_object_set_description (accessible, _("Provides visual indication of progress"));
+}
 
-      if ((type = g_type_from_name ("GtkSpinnerAccessible")))
-        return type;
+static void
+gtk_spinner_accessible_class_init (GtkSpinnerAccessibleClass *klass)
+{
+  AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
 
-      factory = atk_registry_get_factory (atk_get_default_registry (),
-                                          GTK_TYPE_IMAGE);
-      if (!factory)
-        return G_TYPE_INVALID;
+  atk_class->initialize = gtk_spinner_accessible_initialize;
+}
 
-      parent_atk_type = atk_object_factory_get_accessible_type (factory);
-      if (!parent_atk_type)
-        return G_TYPE_INVALID;
+static void
+gtk_spinner_accessible_init (GtkSpinnerAccessible *self)
+{
+}
 
-      /*
-       * Figure out the size of the class and instance
-       * we are deriving from
-       */
-      g_type_query (parent_atk_type, &query);
+/* factory */
+typedef AtkObjectFactory        GtkSpinnerAccessibleFactory;
+typedef AtkObjectFactoryClass   GtkSpinnerAccessibleFactoryClass;
 
-      tinfo.class_init = (GClassInitFunc) gtk_spinner_accessible_class_init;
-      tinfo.class_size    = query.class_size;
-      tinfo.instance_size = query.instance_size;
+G_DEFINE_TYPE (GtkSpinnerAccessibleFactory,
+               gtk_spinner_accessible_factory,
+               ATK_TYPE_OBJECT_FACTORY);
 
-      /* Register the type */
-      type = g_type_register_static (parent_atk_type,
-                                     "GtkSpinnerAccessible",
-                                     &tinfo, 0);
+static GType
+gtk_spinner_accessible_factory_get_accessible_type (void)
+{
+  return gtk_spinner_accessible_get_type ();
+}
 
-      g_type_add_interface_static (type, ATK_TYPE_IMAGE,
-                                   &atk_image_info);
-    }
+static AtkObject *
+gtk_spinner_accessible_factory_create_accessible (GObject *obj)
+{
+  AtkObject *accessible;
+
+  accessible = g_object_new (gtk_spinner_accessible_get_type (), NULL);
+  atk_object_initialize (accessible, obj);
+
+  return accessible;
+}
+
+static void
+gtk_spinner_accessible_factory_class_init (AtkObjectFactoryClass *klass)
+{
+  klass->create_accessible = gtk_spinner_accessible_factory_create_accessible;
+  klass->get_accessible_type = gtk_spinner_accessible_factory_get_accessible_type;
+}
 
-  return type;
+static void
+gtk_spinner_accessible_factory_init (AtkObjectFactory *factory)
+{
 }
 
 static AtkObject *
@@ -567,8 +510,7 @@ gtk_spinner_get_accessible (GtkWidget *widget)
       derived_type = g_type_parent (GTK_TYPE_SPINNER);
 
       registry = atk_get_default_registry ();
-      factory = atk_registry_get_factory (registry,
-                                          derived_type);
+      factory = atk_registry_get_factory (registry, derived_type);
       derived_atk_type = atk_object_factory_get_accessible_type (factory);
       if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE))
         atk_registry_set_factory_type (registry,
@@ -576,6 +518,7 @@ gtk_spinner_get_accessible (GtkWidget *widget)
                                        gtk_spinner_accessible_factory_get_type ());
       first_time = FALSE;
     }
+
   return GTK_WIDGET_CLASS (gtk_spinner_parent_class)->get_accessible (widget);
 }
 
diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
new file mode 100644
index 0000000000..93549ef17e
--- /dev/null
+++ b/gtk/gtkswitch.c
@@ -0,0 +1,997 @@
+/* GTK - The GIMP Toolkit
+ *
+ * Copyright (C) 2010  Intel Corporation
+ * Copyright (C) 2010  RedHat, 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.
+ *
+ * Author:
+ *      Emmanuele Bassi <ebassi@linux.intel.com>
+ *      Matthias Clasen <mclasen@redhat.com>
+ *
+ * Based on similar code from Mx.
+ */
+
+/**
+ * SECTION:gtkswitch
+ * @Short_Description: A "light switch" style toggle
+ * @Title: GtkSwitch
+ * @See_Also: #GtkToggleButton
+ *
+ * #GtkSwitch is a widget that has two states: on or off. The user can control
+ * which state should be active by clicking the empty area, or by dragging the
+ * handle.
+ */
+
+#include "config.h"
+
+#include "gtkswitch.h"
+
+#include <gdk/gdkkeysyms.h>
+
+#include "gtkaccessible.h"
+#include "gtkactivatable.h"
+#include "gtkintl.h"
+#include "gtkstyle.h"
+#include "gtkprivate.h"
+#include "gtktoggleaction.h"
+#include "gtkwidget.h"
+
+#define DEFAULT_SLIDER_WIDTH    (36)
+#define DEFAULT_SLIDER_HEIGHT   (22)
+
+struct _GtkSwitchPrivate
+{
+  GdkWindow *event_window;
+  GtkAction *action;
+
+  gint handle_x;
+  gint offset;
+  gint drag_start;
+  gint drag_threshold;
+
+  guint is_active             : 1;
+  guint is_dragging           : 1;
+  guint in_press              : 1;
+  guint in_switch             : 1;
+  guint use_action_appearance : 1;
+};
+
+enum
+{
+  PROP_0,
+  PROP_ACTIVE,
+  PROP_RELATED_ACTION,
+  PROP_USE_ACTION_APPEARANCE,
+  LAST_PROP
+};
+
+static GParamSpec *switch_props[LAST_PROP] = { NULL, };
+
+static GType gtk_switch_accessible_factory_get_type (void);
+
+static void gtk_switch_activatable_interface_init (GtkActivatableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GtkSwitch, gtk_switch, GTK_TYPE_WIDGET,
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
+                                                gtk_switch_activatable_interface_init));
+
+static gboolean
+gtk_switch_button_press (GtkWidget      *widget,
+                         GdkEventButton *event)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+  GtkAllocation allocation;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  if (priv->is_active)
+    {
+      /* if the event occurred in the "off" area, then this
+       * is a direct toggle
+       */
+      if (event->x <= allocation.width / 2)
+        {
+          priv->in_press = TRUE;
+          return FALSE;
+        }
+
+      priv->offset = event->x - allocation.width / 2;
+    }
+  else
+    {
+      /* if the event occurred in the "on" area, then this
+       * is a direct toggle
+       */
+      if (event->x >= allocation.width / 2)
+        {
+          priv->in_press = TRUE;
+          return FALSE;
+        }
+
+      priv->offset = event->x;
+    }
+
+  priv->drag_start = event->x;
+
+  g_object_get (gtk_widget_get_settings (widget),
+                "gtk-dnd-drag-threshold", &priv->drag_threshold,
+                NULL);
+
+  return FALSE;
+}
+
+static gboolean
+gtk_switch_motion (GtkWidget      *widget,
+                   GdkEventMotion *event)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+
+  /* if this is a direct toggle we don't handle motion */
+  if (priv->in_press)
+    return FALSE;
+
+  if (ABS (event->x - priv->drag_start) < priv->drag_threshold)
+    return TRUE;
+
+  if (event->state & GDK_BUTTON1_MASK)
+    {
+      gint position = event->x - priv->offset;
+      GtkAllocation allocation;
+      GtkStyle *style;
+
+      style = gtk_widget_get_style (widget);
+      gtk_widget_get_allocation (widget, &allocation);
+
+      /* constrain the handle within the trough width */
+      if (position > (allocation.width / 2 - style->xthickness))
+        priv->handle_x = allocation.width / 2 - style->xthickness;
+      else if (position < style->xthickness)
+        priv->handle_x = style->xthickness;
+      else
+        priv->handle_x = position;
+
+      priv->is_dragging = TRUE;
+
+      /* we need to redraw the handle */
+      gtk_widget_queue_draw (widget);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gtk_switch_button_release (GtkWidget      *widget,
+                           GdkEventButton *event)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+  GtkAllocation allocation;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  /* dragged toggles have a "soft" grab, so we don't care whether we
+   * are in the switch or not when the button is released; we do care
+   * for direct toggles, instead
+   */
+  if (!priv->is_dragging && !priv->in_switch)
+    return FALSE;
+
+  /* direct toggle */
+  if (priv->in_press)
+    {
+      priv->in_press = FALSE;
+      gtk_switch_set_active (GTK_SWITCH (widget), !priv->is_active);
+
+      return TRUE;
+    }
+
+  /* dragged toggle */
+  if (priv->is_dragging)
+    {
+      priv->is_dragging = FALSE;
+
+      /* if half the handle passed the middle of the switch, then we
+       * consider it to be on
+       */
+      if ((priv->handle_x + (allocation.width / 4)) >= (allocation.width / 2))
+        {
+          gtk_switch_set_active (GTK_SWITCH (widget), TRUE);
+          priv->handle_x = allocation.width / 2;
+        }
+      else
+        {
+          gtk_switch_set_active (GTK_SWITCH (widget), FALSE);
+          priv->handle_x = 0;
+        }
+
+      gtk_widget_queue_draw (widget);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gtk_switch_enter (GtkWidget        *widget,
+                  GdkEventCrossing *event)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+
+  if (event->window == priv->event_window)
+    priv->in_switch = TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+gtk_switch_leave (GtkWidget        *widget,
+                  GdkEventCrossing *event)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+
+  if (event->window == priv->event_window)
+    priv->in_switch = FALSE;
+
+  return FALSE;
+}
+
+static gboolean
+gtk_switch_key_release (GtkWidget   *widget,
+                        GdkEventKey *event)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+
+  if (event->keyval == GDK_KEY_Return ||
+      event->keyval == GDK_KEY_KP_Enter ||
+      event->keyval == GDK_KEY_ISO_Enter ||
+      event->keyval == GDK_KEY_space ||
+      event->keyval == GDK_KEY_KP_Space)
+    {
+      gtk_switch_set_active (GTK_SWITCH (widget), !priv->is_active);
+    }
+
+  return FALSE;
+}
+
+static void
+gtk_switch_get_preferred_width (GtkWidget *widget,
+                                gint      *minimum,
+                                gint      *natural)
+{
+  GtkStyle *style = gtk_widget_get_style (widget);
+  gint width, slider_width, focus_width, focus_pad;
+  PangoLayout *layout;
+  PangoRectangle logical_rect;
+
+  width = style->xthickness * 2;
+
+  gtk_widget_style_get (widget,
+                        "slider-width", &slider_width,
+                        "focus-line-width", &focus_width,
+                        "focus-padding", &focus_pad,
+                        NULL);
+
+  width += 2 * (focus_width + focus_pad);
+
+  /* Translators: if the "on" state label requires more than three
+   * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
+   * the state
+   */
+  layout = gtk_widget_create_pango_layout (widget, C_("switch", "ON"));
+  pango_layout_get_extents (layout, NULL, &logical_rect);
+  pango_extents_to_pixels (&logical_rect, NULL);
+  width += MAX (logical_rect.width, slider_width);
+
+  /* Translators: if the "off" state label requires more than three
+   * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
+   */
+  pango_layout_set_text (layout, C_("switch", "OFF"), -1);
+  pango_layout_get_extents (layout, NULL, &logical_rect);
+  pango_extents_to_pixels (&logical_rect, NULL);
+  width += MAX (logical_rect.width, slider_width);
+
+  g_object_unref (layout);
+
+  if (minimum)
+    *minimum = width;
+
+  if (natural)
+    *natural = width;
+}
+
+static void
+gtk_switch_get_preferred_height (GtkWidget *widget,
+                                 gint      *minimum,
+                                 gint      *natural)
+{
+  GtkStyle *style = gtk_widget_get_style (widget);
+  gint height, focus_width, focus_pad;
+  PangoLayout *layout;
+  PangoRectangle logical_rect;
+  gchar *str;
+
+  height = style->ythickness * 2;
+
+  gtk_widget_style_get (widget,
+                        "focus-line-width", &focus_width,
+                        "focus-padding", &focus_pad,
+                        NULL);
+
+  height += 2 * (focus_width + focus_pad);
+
+  str = g_strdup_printf ("%s%s",
+                         C_("switch", "ON"),
+                         C_("switch", "OFF"));
+
+  layout = gtk_widget_create_pango_layout (widget, str);
+  pango_layout_get_extents (layout, NULL, &logical_rect);
+  pango_extents_to_pixels (&logical_rect, NULL);
+  height += MAX (DEFAULT_SLIDER_HEIGHT, logical_rect.height);
+
+  g_object_unref (layout);
+  g_free (str);
+
+  if (minimum)
+    *minimum = height;
+
+  if (natural)
+    *natural = height;
+}
+
+static void
+gtk_switch_size_allocate (GtkWidget     *widget,
+                          GtkAllocation *allocation)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+
+  gtk_widget_set_allocation (widget, allocation);
+
+  if (gtk_widget_get_realized (widget))
+    gdk_window_move_resize (priv->event_window,
+                            allocation->x,
+                            allocation->y,
+                            allocation->width,
+                            allocation->height);
+}
+
+static void
+gtk_switch_realize (GtkWidget *widget)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+  GdkWindow *parent_window;
+  GdkWindowAttr attributes;
+  gint attributes_mask;
+  GtkAllocation allocation;
+
+  gtk_widget_set_realized (widget, TRUE);
+  parent_window = gtk_widget_get_parent_window (widget);
+  gtk_widget_set_window (widget, parent_window);
+  g_object_ref (parent_window);
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.wclass = GDK_INPUT_ONLY;
+  attributes.x = allocation.x;
+  attributes.y = allocation.y;
+  attributes.width = allocation.width;
+  attributes.height = allocation.height;
+  attributes.event_mask = gtk_widget_get_events (widget);
+  attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
+                            GDK_BUTTON_RELEASE_MASK |
+                            GDK_BUTTON1_MOTION_MASK |
+                            GDK_POINTER_MOTION_HINT_MASK |
+                            GDK_POINTER_MOTION_MASK |
+                            GDK_ENTER_NOTIFY_MASK |
+                            GDK_LEAVE_NOTIFY_MASK);
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+  priv->event_window = gdk_window_new (parent_window,
+                                       &attributes,
+                                       attributes_mask);
+  gdk_window_set_user_data (priv->event_window, widget);
+
+  gtk_widget_style_attach (widget);
+}
+
+static void
+gtk_switch_unrealize (GtkWidget *widget)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+
+  if (priv->event_window != NULL)
+    {
+      gdk_window_set_user_data (priv->event_window, NULL);
+      gdk_window_destroy (priv->event_window);
+      priv->event_window = NULL;
+    }
+
+  GTK_WIDGET_CLASS (gtk_switch_parent_class)->unrealize (widget);
+}
+
+static void
+gtk_switch_map (GtkWidget *widget)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+
+  GTK_WIDGET_CLASS (gtk_switch_parent_class)->map (widget);
+
+  if (priv->event_window)
+    gdk_window_show (priv->event_window);
+}
+
+static void
+gtk_switch_unmap (GtkWidget *widget)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+
+  if (priv->event_window)
+    gdk_window_hide (priv->event_window);
+
+  GTK_WIDGET_CLASS (gtk_switch_parent_class)->unmap (widget);
+}
+
+static inline void
+gtk_switch_paint_handle (GtkWidget    *widget,
+                         cairo_t      *cr,
+                         GdkRectangle *box)
+{
+  GtkStyle *style = gtk_widget_get_style (widget);
+
+  gtk_paint_slider (style, cr,
+                    gtk_widget_get_state (widget),
+                    GTK_SHADOW_OUT,
+                    GTK_WIDGET (widget), "switch-slider",
+                    box->x,
+                    box->y,
+                    box->width,
+                    box->height,
+                    GTK_ORIENTATION_HORIZONTAL);
+}
+
+static gboolean
+gtk_switch_draw (GtkWidget *widget,
+                 cairo_t   *cr)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
+  GtkStyle *style;
+  GdkRectangle handle;
+  PangoLayout *layout;
+  PangoRectangle rect;
+  gint label_x, label_y;
+  GtkStateType state;
+  gint focus_width, focus_pad;
+  gint x, y, width, height;
+
+  gtk_widget_style_get (widget,
+                        "focus-line-width", &focus_width,
+                        "focus-padding", &focus_pad,
+                        NULL);
+
+  style = gtk_widget_get_style (widget);
+
+  x = 0;
+  y = 0;
+  width = gtk_widget_get_allocated_width (widget);
+  height = gtk_widget_get_allocated_height (widget);
+
+  if (gtk_widget_has_focus (widget))
+    gtk_paint_focus (style, cr,
+                     gtk_widget_get_state (widget),
+                     widget, "button",
+                     x, y, width, height);
+
+  x += focus_width + focus_pad;
+  y += focus_width + focus_pad;
+  width -= 2 * (focus_width + focus_pad);
+  height -= 2 * (focus_width + focus_pad);
+
+  state = priv->is_active ? GTK_STATE_SELECTED : gtk_widget_get_state (widget);
+
+  /* background - XXX should this be a flat box instead? we're missing
+   * the border given by the shadow with that, which would require
+   * fixing all theme engines to add a subtle border for this widget
+   */
+  gtk_paint_box (style, cr,
+                 state,
+                 GTK_SHADOW_IN,
+                 widget, "switch-background",
+                 x, y, width, height);
+
+  if (!gtk_widget_is_sensitive (widget))
+    state = GTK_STATE_INSENSITIVE;
+
+  /* XXX the +1/-1 it's pixel wriggling after checking with the default
+   * theme and xmag
+   */
+  handle.y = y + style->ythickness + 1;
+  handle.width = (width - style->xthickness * 2) / 2;
+  handle.height = (height - style->ythickness * 2) - 1;
+
+  /* Translators: if the "on" state label requires more than three
+   * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
+   * the state
+   */
+  layout = gtk_widget_create_pango_layout (widget, C_("switch", "ON"));
+  pango_layout_get_extents (layout, NULL, &rect);
+  pango_extents_to_pixels (&rect, NULL);
+
+  label_x = x + style->xthickness
+          + ((width / 2) - rect.width - (style->xthickness * 2)) / 2;
+  label_y = y + style->ythickness
+          + (height - rect.height - (style->ythickness * 2)) / 2;
+
+  gtk_paint_layout (style, cr,
+                    state,
+                    FALSE,
+                    widget, "switch-on-label",
+                    label_x, label_y,
+                    layout);
+
+  g_object_unref (layout);
+
+  /* Translators: if the "off" state label requires more than three
+   * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
+   */
+  layout = gtk_widget_create_pango_layout (widget, C_("switch", "OFF"));
+  pango_layout_get_extents (layout, NULL, &rect);
+  pango_extents_to_pixels (&rect, NULL);
+
+  label_x = x + style->xthickness
+          + (width / 2)
+          + ((width / 2) - rect.width - (style->xthickness * 2)) / 2;
+  label_y = y + style->ythickness
+          + (height - rect.height - (style->ythickness * 2)) / 2;
+
+  gtk_paint_layout (style, cr,
+                    state,
+                    FALSE,
+                    widget, "switch-off-label",
+                    label_x, label_y,
+                    layout);
+
+  g_object_unref (layout);
+
+  if (priv->is_dragging)
+    handle.x = x + priv->handle_x;
+  else if (priv->is_active)
+    handle.x = x + width - handle.width - style->xthickness;
+  else
+    handle.x = x + style->xthickness;
+
+  gtk_switch_paint_handle (widget, cr, &handle);
+
+  return FALSE;
+}
+
+static AtkObject *
+gtk_switch_get_accessible (GtkWidget *widget)
+{
+  static gboolean first_time = TRUE;
+
+  if (G_UNLIKELY (first_time))
+    {
+      AtkObjectFactory *factory;
+      AtkRegistry *registry;
+      GType derived_type;
+      GType derived_atk_type;
+
+      /* Figure out whether accessibility is enabled by looking at the
+       * type of the accessible object which would be created for the
+       * parent type of GtkSwitch
+       */
+      derived_type = g_type_parent (GTK_TYPE_SWITCH);
+
+      registry = atk_get_default_registry ();
+      factory = atk_registry_get_factory (registry, derived_type);
+      derived_atk_type = atk_object_factory_get_accessible_type (factory);
+      if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE))
+        atk_registry_set_factory_type (registry,
+                                       GTK_TYPE_SWITCH,
+                                       gtk_switch_accessible_factory_get_type ());
+
+      first_time = FALSE;
+    }
+
+  return GTK_WIDGET_CLASS (gtk_switch_parent_class)->get_accessible (widget);
+}
+
+static void
+gtk_switch_set_related_action (GtkSwitch *sw,
+                               GtkAction *action)
+{
+  GtkSwitchPrivate *priv = sw->priv;
+
+  if (priv->action == action)
+    return;
+
+  gtk_activatable_do_set_related_action (GTK_ACTIVATABLE (sw), action);
+
+  priv->action = action;
+}
+
+static void
+gtk_switch_set_use_action_appearance (GtkSwitch *sw,
+                                      gboolean   use_appearance)
+{
+  GtkSwitchPrivate *priv = sw->priv;
+
+  if (priv->use_action_appearance != use_appearance)
+    {
+      priv->use_action_appearance = use_appearance;
+
+      gtk_activatable_sync_action_properties (GTK_ACTIVATABLE (sw), priv->action);
+    }
+}
+
+static void
+gtk_switch_set_property (GObject      *gobject,
+                         guint         prop_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  GtkSwitch *sw = GTK_SWITCH (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_ACTIVE:
+      gtk_switch_set_active (sw, g_value_get_boolean (value));
+      break;
+
+    case PROP_RELATED_ACTION:
+      gtk_switch_set_related_action (sw, g_value_get_object (value));
+      break;
+
+    case PROP_USE_ACTION_APPEARANCE:
+      gtk_switch_set_use_action_appearance (sw, g_value_get_boolean (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+    }
+}
+
+static void
+gtk_switch_get_property (GObject    *gobject,
+                         guint       prop_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (gobject)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_ACTIVE:
+      g_value_set_boolean (value, priv->is_active);
+      break;
+
+    case PROP_RELATED_ACTION:
+      g_value_set_object (value, priv->action);
+      break;
+
+    case PROP_USE_ACTION_APPEARANCE:
+      g_value_set_boolean (value, priv->use_action_appearance);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+    }
+}
+
+static void
+gtk_switch_dispose (GObject *object)
+{
+  GtkSwitchPrivate *priv = GTK_SWITCH (object)->priv;
+
+  if (priv->action)
+    {
+      gtk_activatable_do_set_related_action (GTK_ACTIVATABLE (object), NULL);
+      priv->action = NULL;
+    }
+
+  G_OBJECT_CLASS (gtk_switch_parent_class)->dispose (object);
+}
+
+static void
+gtk_switch_class_init (GtkSwitchClass *klass)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  gpointer activatable_iface;
+
+  g_type_class_add_private (klass, sizeof (GtkSwitchPrivate));
+
+  activatable_iface = g_type_default_interface_peek (GTK_TYPE_ACTIVATABLE);
+  switch_props[PROP_RELATED_ACTION] =
+    g_param_spec_override ("related-action",
+                           g_object_interface_find_property (activatable_iface,
+                                                             "related-action"));
+
+  switch_props[PROP_USE_ACTION_APPEARANCE] =
+    g_param_spec_override ("use-action-appearance",
+                           g_object_interface_find_property (activatable_iface,
+                                                             "use-action-appearance"));
+
+  /**
+   * GtkSwitch:active:
+   *
+   * Whether the #GtkSwitch widget is in its on or off state.
+   */
+  switch_props[PROP_ACTIVE] =
+    g_param_spec_boolean ("active",
+                          P_("Active"),
+                          P_("Whether the switch is on or off"),
+                          FALSE,
+                          GTK_PARAM_READWRITE);
+
+  gobject_class->set_property = gtk_switch_set_property;
+  gobject_class->get_property = gtk_switch_get_property;
+  gobject_class->dispose = gtk_switch_dispose;
+
+  g_object_class_install_properties (gobject_class, LAST_PROP, switch_props);
+
+  widget_class->get_preferred_width = gtk_switch_get_preferred_width;
+  widget_class->get_preferred_height = gtk_switch_get_preferred_height;
+  widget_class->size_allocate = gtk_switch_size_allocate;
+  widget_class->realize = gtk_switch_realize;
+  widget_class->unrealize = gtk_switch_unrealize;
+  widget_class->map = gtk_switch_map;
+  widget_class->unmap = gtk_switch_unmap;
+  widget_class->draw = gtk_switch_draw;
+  widget_class->button_press_event = gtk_switch_button_press;
+  widget_class->button_release_event = gtk_switch_button_release;
+  widget_class->motion_notify_event = gtk_switch_motion;
+  widget_class->enter_notify_event = gtk_switch_enter;
+  widget_class->leave_notify_event = gtk_switch_leave;
+  widget_class->key_release_event = gtk_switch_key_release;
+  widget_class->get_accessible = gtk_switch_get_accessible;
+
+  /**
+   * GtkSwitch:slider-width:
+   *
+   * The minimum width of the #GtkSwitch handle, in pixels.
+   */
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_int ("slider-width",
+                                                             P_("Slider Width"),
+                                                             P_("The minimum width of the handle"),
+                                                             DEFAULT_SLIDER_WIDTH, G_MAXINT,
+                                                             DEFAULT_SLIDER_WIDTH,
+                                                             GTK_PARAM_READABLE));
+}
+
+static void
+gtk_switch_init (GtkSwitch *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_SWITCH, GtkSwitchPrivate);
+  self->priv->use_action_appearance = TRUE;
+  gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
+  gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE);
+}
+
+/**
+ * gtk_switch_new:
+ *
+ * Creates a new #GtkSwitch widget.
+ *
+ * Return value: the newly created #GtkSwitch instance
+ *
+ * Since: 3.0
+ */
+GtkWidget *
+gtk_switch_new (void)
+{
+  return g_object_new (GTK_TYPE_SWITCH, NULL);
+}
+
+/**
+ * gtk_switch_set_active:
+ * @sw: a #GtkSwitch
+ * @is_active: %TRUE if @sw should be active, and %FALSE otherwise
+ *
+ * Changes the state of @sw to the desired one.
+ *
+ * Since: 3.0
+ */
+void
+gtk_switch_set_active (GtkSwitch *sw,
+                       gboolean   is_active)
+{
+  GtkSwitchPrivate *priv;
+
+  g_return_if_fail (GTK_IS_SWITCH (sw));
+
+  is_active = !!is_active;
+
+  priv = sw->priv;
+
+  if (priv->is_active != is_active)
+    {
+      AtkObject *accessible;
+
+      priv->is_active = is_active;
+
+      g_object_notify_by_pspec (G_OBJECT (sw), switch_props[PROP_ACTIVE]);
+
+      if (priv->action)
+        gtk_action_activate (priv->action);
+
+      accessible = gtk_widget_get_accessible (GTK_WIDGET (sw));
+      atk_object_notify_state_change (accessible, ATK_STATE_CHECKED, priv->is_active);
+
+      gtk_widget_queue_draw (GTK_WIDGET (sw));
+    }
+}
+
+/**
+ * gtk_switch_get_active:
+ * @sw: a #GtkSwitch
+ *
+ * Gets whether the #GtkSwitch is in its "on" or "off" state.
+ *
+ * Return value: %TRUE if the #GtkSwitch is active, and %FALSE otherwise
+ *
+ * Since: 3.0
+ */
+gboolean
+gtk_switch_get_active (GtkSwitch *sw)
+{
+  g_return_val_if_fail (GTK_IS_SWITCH (sw), FALSE);
+
+  return sw->priv->is_active;
+}
+
+static void
+gtk_switch_update (GtkActivatable *activatable,
+                   GtkAction      *action,
+                   const gchar    *property_name)
+{
+  if (strcmp (property_name, "visible") == 0)
+    {
+      if (gtk_action_is_visible (action))
+        gtk_widget_show (GTK_WIDGET (activatable));
+      else
+        gtk_widget_hide (GTK_WIDGET (activatable));
+    }
+  else if (strcmp (property_name, "sensitive") == 0)
+    {
+      gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
+    }
+  else if (strcmp (property_name, "active") == 0)
+    {
+      gtk_action_block_activate (action);
+      gtk_switch_set_active (GTK_SWITCH (activatable), gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+      gtk_action_unblock_activate (action);
+    }
+}
+
+static void
+gtk_switch_sync_action_properties (GtkActivatable *activatable,
+                                   GtkAction      *action)
+{
+  if (!action)
+    return;
+
+  if (gtk_action_is_visible (action))
+    gtk_widget_show (GTK_WIDGET (activatable));
+  else
+    gtk_widget_hide (GTK_WIDGET (activatable));
+
+  gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
+
+  gtk_action_block_activate (action);
+  gtk_switch_set_active (GTK_SWITCH (activatable), gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
+  gtk_action_unblock_activate (action);
+}
+
+static void
+gtk_switch_activatable_interface_init (GtkActivatableIface *iface)
+{
+  iface->update = gtk_switch_update;
+  iface->sync_action_properties = gtk_switch_sync_action_properties;
+}
+
+/* accessibility: object */
+
+/* dummy typedefs */
+typedef struct _GtkSwitchAccessible             GtkSwitchAccessible;
+typedef struct _GtkSwitchAccessibleClass        GtkSwitchAccessibleClass;
+
+ATK_DEFINE_TYPE (GtkSwitchAccessible, _gtk_switch_accessible, GTK_TYPE_WIDGET);
+
+static AtkStateSet *
+gtk_switch_accessible_ref_state_set (AtkObject *accessible)
+{
+  AtkStateSet *state_set;
+  GtkWidget *widget;
+
+  state_set = ATK_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->ref_state_set (accessible);
+
+  widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
+  if (widget == NULL)
+    return state_set;
+
+  if (gtk_switch_get_active (GTK_SWITCH (widget)))
+    atk_state_set_add_state (state_set, ATK_STATE_CHECKED);
+
+  return state_set;
+}
+
+static void
+_gtk_switch_accessible_initialize (AtkObject *accessible,
+                                   gpointer   widget)
+{
+  ATK_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->initialize (accessible, widget);
+
+  atk_object_set_role (accessible, ATK_ROLE_TOGGLE_BUTTON);
+  atk_object_set_name (accessible, C_("light switch widget", "Switch"));
+  atk_object_set_description (accessible, _("Switches between on and off states"));
+}
+
+static void
+_gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass)
+{
+  AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
+
+  atk_class->initialize = _gtk_switch_accessible_initialize;
+  atk_class->ref_state_set = gtk_switch_accessible_ref_state_set;
+}
+
+static void
+_gtk_switch_accessible_init (GtkSwitchAccessible *self)
+{
+}
+
+/* accessibility: factory */
+
+typedef AtkObjectFactoryClass   GtkSwitchAccessibleFactoryClass;
+typedef AtkObjectFactory        GtkSwitchAccessibleFactory;
+
+G_DEFINE_TYPE (GtkSwitchAccessibleFactory,
+               gtk_switch_accessible_factory,
+               ATK_TYPE_OBJECT_FACTORY);
+
+static GType
+gtk_switch_accessible_factory_get_accessible_type (void)
+{
+  return _gtk_switch_accessible_get_type ();
+}
+
+static AtkObject *
+gtk_switch_accessible_factory_create_accessible (GObject *obj)
+{
+  AtkObject *accessible;
+
+  accessible = g_object_new (_gtk_switch_accessible_get_type (), NULL);
+  atk_object_initialize (accessible, obj);
+
+  return accessible;
+}
+
+static void
+gtk_switch_accessible_factory_class_init (AtkObjectFactoryClass *klass)
+{
+  klass->create_accessible = gtk_switch_accessible_factory_create_accessible;
+  klass->get_accessible_type = gtk_switch_accessible_factory_get_accessible_type;
+}
+
+static void
+gtk_switch_accessible_factory_init (AtkObjectFactory *factory)
+{
+}
diff --git a/gtk/gtkswitch.h b/gtk/gtkswitch.h
new file mode 100644
index 0000000000..3706f618b5
--- /dev/null
+++ b/gtk/gtkswitch.h
@@ -0,0 +1,94 @@
+/* GTK - The GIMP Toolkit
+ *
+ * Copyright (C) 2010  Intel Corporation
+ * Copyright (C) 2010  RedHat, 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.
+ *
+ * Author:
+ *      Emmanuele Bassi <ebassi@linux.intel.com>
+ *      Matthias Clasen <mclasen@redhat.com>
+ *
+ * Based on similar code from Mx.
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_SWITCH_H__
+#define __GTK_SWITCH_H__
+
+#include <gtk/gtkwidget.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_SWITCH                 (gtk_switch_get_type ())
+#define GTK_SWITCH(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SWITCH, GtkSwitch))
+#define GTK_IS_SWITCH(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SWITCH))
+#define GTK_SWITCH_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SWITCH, GtkSwitchClass))
+#define GTK_IS_SWITCH_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SWITCH))
+#define GTK_SWITCH_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SWITCH, GtkSwitchClass))
+
+typedef struct _GtkSwitch               GtkSwitch;
+typedef struct _GtkSwitchPrivate        GtkSwitchPrivate;
+typedef struct _GtkSwitchClass          GtkSwitchClass;
+
+/**
+ * GtkSwitch:
+ *
+ * The <structname>GtkSwitch</structname> structure contains private
+ * data and it should only be accessed using the provided API.
+ */
+struct _GtkSwitch
+{
+  /*< private >*/
+  GtkWidget parent_instance;
+
+  GtkSwitchPrivate *priv;
+};
+
+/**
+ * GtkSwitchClass:
+ *
+ * The <structname>GtkSwitchClass</structname> structure contains only
+ * private data.
+ */
+struct _GtkSwitchClass
+{
+  /*< private >*/
+  GtkWidgetClass parent_class;
+
+  void (* _switch_padding_1) (void);
+  void (* _switch_padding_2) (void);
+  void (* _switch_padding_3) (void);
+  void (* _switch_padding_4) (void);
+  void (* _switch_padding_5) (void);
+  void (* _switch_padding_6) (void);
+  void (* _switch_padding_7) (void);
+};
+
+GType gtk_switch_get_type (void) G_GNUC_CONST;
+
+GtkWidget *     gtk_switch_new          (void);
+
+void            gtk_switch_set_active   (GtkSwitch *sw,
+                                         gboolean   is_active);
+gboolean        gtk_switch_get_active   (GtkSwitch *sw);
+
+G_END_DECLS
+
+#endif /* __GTK_SWITCH_H__ */
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 007d039467..5d914fada4 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -3125,8 +3125,12 @@ gtk_toolbar_finalize (GObject *object)
   g_timer_destroy (priv->timer);
   
   if (priv->menu)
-    gtk_widget_destroy (GTK_WIDGET (priv->menu));
-  
+    {
+      g_signal_handlers_disconnect_by_func (priv->menu,
+                                            menu_deactivated, toolbar);
+      gtk_widget_destroy (GTK_WIDGET (priv->menu));
+    }
+
   if (priv->idle_id)
     g_source_remove (priv->idle_id);
 
diff --git a/po-properties/POTFILES.in b/po-properties/POTFILES.in
index e5cb227e0f..4ea635ed5e 100644
--- a/po-properties/POTFILES.in
+++ b/po-properties/POTFILES.in
@@ -86,7 +86,6 @@ gtk/gtkhandlebox.c
 gtk/gtkhbbox.c
 gtk/gtkhbox.c
 gtk/gtkhpaned.c
-gtk/gtkhruler.c
 gtk/gtkhscale.c
 gtk/gtkhscrollbar.c
 gtk/gtkhseparator.c
@@ -147,7 +146,6 @@ gtk/gtkrecentchooser.c
 gtk/gtkrecentchooserdefault.c
 gtk/gtkrecentchoosermenu.c
 gtk/gtkrecentmanager.c
-gtk/gtkruler.c
 gtk/gtkscalebutton.c
 gtk/gtkscale.c
 gtk/gtkscrollbar.c
@@ -164,6 +162,7 @@ gtk/gtkstatusbar.c
 gtk/gtkstatusicon.c
 gtk/gtkstock.c
 gtk/gtkstyle.c
+gtk/gtkswitch.c
 gtk/gtktable.c
 gtk/gtktearoffmenuitem.c
 gtk/gtktextbuffer.c
@@ -205,7 +204,6 @@ gtk/gtkvbox.c
 gtk/gtkviewport.c
 gtk/gtkvolumebutton.c
 gtk/gtkvpaned.c
-gtk/gtkvruler.c
 gtk/gtkvscale.c
 gtk/gtkvscrollbar.c
 gtk/gtkvseparator.c
diff --git a/po-properties/POTFILES.skip b/po-properties/POTFILES.skip
index 7a2162f645..bab2cdcd3b 100644
--- a/po-properties/POTFILES.skip
+++ b/po-properties/POTFILES.skip
@@ -1,10 +1 @@
 demos/gtk-demo/demo.ui
-gdk-pixbuf/io-gdip-bmp.c
-gdk-pixbuf/io-gdip-emf.c
-gdk-pixbuf/io-gdip-gif.c
-gdk-pixbuf/io-gdip-ico.c
-gdk-pixbuf/io-gdip-jpeg.c
-gdk-pixbuf/io-gdip-png.c
-gdk-pixbuf/io-gdip-utils.c
-gdk-pixbuf/io-gdip-wmf.c
-
diff --git a/po-properties/ro.po b/po-properties/ro.po
index c1a539c149..0755fe422f 100644
--- a/po-properties/ro.po
+++ b/po-properties/ro.po
@@ -4,153 +4,145 @@
 # Marius Andreiana <marius galuna.ro>, 2001, 2002.
 # Mișu Moldovan <dumol@gnome.ro>, 2003 - 2010.
 # Lucian Adrian Grijincu <lucian.grijincu@gmail.com>, 2009, 2010.
+# Eu93 <spoiala.marian@yahoo.com>, 2010.
+# Spoiala Marian <spoiala.marian@yahoo.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+-properties\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 15:54-0400\n"
-"PO-Revision-Date: 2010-08-04 17:22+0300\n"
-"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
-"Language-Team: Romanian Gnome Team <gnomero-list@lists.sourceforge.net>\n"
-"Language: ro\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%"
+"2b&component=general\n"
+"POT-Creation-Date: 2010-11-24 12:38+0000\n"
+"PO-Revision-Date: 2010-11-24 21:11+0300\n"
+"Last-Translator: Spoiala Marian <spoiala.marian@yahoo.com>\n"
+"Language-Team: Romania\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2);;\n"
 "X-Generator: Virtaal 0.6.1\n"
 
-#: gdk/gdkdevice.c:97
-#, fuzzy
+#: ../gdk/gdkdevice.c:105
 msgid "Device Display"
-msgstr "Display implicit"
+msgstr "Afișaj dispozitiv"
 
-#: gdk/gdkdevice.c:98
-#, fuzzy
+#: ../gdk/gdkdevice.c:106
 msgid "Display which the device belongs to"
-msgstr "Arată celula (majuscule semnificative)"
+msgstr "Afișajul căruia îi aparține dispozitivul"
 
-#: gdk/gdkdevice.c:112
-#, fuzzy
+#: ../gdk/gdkdevice.c:120
 msgid "Device manager"
-msgstr "Manager recent"
+msgstr "Manager dispozitive"
 
-#: gdk/gdkdevice.c:113
+#: ../gdk/gdkdevice.c:121
 msgid "Device manager which the device belongs to"
-msgstr ""
+msgstr "Managerul de dispozitive căruia îi aparține dispozitivul "
 
-#: gdk/gdkdevice.c:127 gdk/gdkdevice.c:128
-#, fuzzy
+#: ../gdk/gdkdevice.c:135 ../gdk/gdkdevice.c:136
 msgid "Device name"
-msgstr "Nume widget"
+msgstr "Nume dispozitiv"
 
-#: gdk/gdkdevice.c:142
-#, fuzzy
+#: ../gdk/gdkdevice.c:150
 msgid "Device type"
-msgstr "Tip curbă"
+msgstr "Tip dispozitiv"
 
-#: gdk/gdkdevice.c:143
+#: ../gdk/gdkdevice.c:151
 msgid "Device role in the device manager"
-msgstr ""
+msgstr "Rolul dispozitivului în managerul de dispozitive"
 
-#: gdk/gdkdevice.c:159
+#: ../gdk/gdkdevice.c:167
 msgid "Associated device"
-msgstr ""
+msgstr "Dispozitiv asociat"
 
-#: gdk/gdkdevice.c:160
+#: ../gdk/gdkdevice.c:168
 msgid "Associated pointer or keyboard with this device"
-msgstr ""
+msgstr "Indicator sau tastatură asociată cu dispozitivul"
 
-#: gdk/gdkdevice.c:173
+#: ../gdk/gdkdevice.c:181
 msgid "Input source"
-msgstr ""
+msgstr "Sursa de intrare"
 
-#: gdk/gdkdevice.c:174
-#, fuzzy
+#: ../gdk/gdkdevice.c:182
 msgid "Source type for the device"
-msgstr "Model pentru afișarea de tip arbore"
+msgstr "Tipul de sursă pentru dispozitiv"
 
-#: gdk/gdkdevice.c:189 gdk/gdkdevice.c:190
-#, fuzzy
+#: ../gdk/gdkdevice.c:197 ../gdk/gdkdevice.c:198
 msgid "Input mode for the device"
-msgstr "Model pentru afișarea de tip arbore"
+msgstr "Modul de intrare pentru dispozitiv"
 
-#: gdk/gdkdevice.c:205
-#, fuzzy
+#: ../gdk/gdkdevice.c:213
 msgid "Whether the device has a cursor"
-msgstr "Specifică dacă widgetul are focus la input"
+msgstr "Specifică dacă dispozitivul are cursor"
 
-#: gdk/gdkdevice.c:206
-#, fuzzy
+#: ../gdk/gdkdevice.c:214
 msgid "Whether there is a visible cursor following device motion"
-msgstr "Specifică dacă este setată utilizarea caracterelor invizibile"
+msgstr ""
+"Specifică dacă este un indicator vizibil care urmărește mișcarea "
+"dispozitivului"
 
-#: gdk/gdkdevice.c:220 gdk/gdkdevice.c:221
-#, fuzzy
+#: ../gdk/gdkdevice.c:228 ../gdk/gdkdevice.c:229
 msgid "Number of axes in the device"
-msgstr "Numărul de pagini în document."
+msgstr "Numărul axelor în dispozitiv"
 
-#: gdk/gdkdevicemanager.c:134
-#, fuzzy
+#: ../gdk/gdkdevicemanager.c:136
 msgid "Display"
-msgstr "Display implicit"
+msgstr "Afișaj"
 
-#: gdk/gdkdevicemanager.c:135
-#, fuzzy
+#: ../gdk/gdkdevicemanager.c:137
 msgid "Display for the device manager"
-msgstr "Arată celula"
+msgstr "Afișaj pentru managerul de dispozitive"
 
-#: gdk/gdkdisplaymanager.c:102
+#: ../gdk/gdkdisplaymanager.c:106
 msgid "Default Display"
-msgstr "Display implicit"
+msgstr "Afișaj implicit"
 
-#: gdk/gdkdisplaymanager.c:103
+#: ../gdk/gdkdisplaymanager.c:107
 msgid "The default display for GDK"
-msgstr "Display implicit pentru GDK"
+msgstr "Afișaj implicit pentru GDK"
 
-#: gdk/gdkscreen.c:72
+#: ../gdk/gdkscreen.c:90
 msgid "Font options"
-msgstr "Opțiuni fonturi"
+msgstr "Opțiuni font"
 
-#: gdk/gdkscreen.c:73
+#: ../gdk/gdkscreen.c:91
 msgid "The default font options for the screen"
-msgstr "Opțiunile implicite pentru ecran ale fonturilor"
+msgstr "Opțiunile implicite ale fonturilor pentru ecran"
 
-#: gdk/gdkscreen.c:80
+#: ../gdk/gdkscreen.c:98
 msgid "Font resolution"
-msgstr "Rezoluție fonturi"
+msgstr "Rezoluție font"
 
-#: gdk/gdkscreen.c:81
+#: ../gdk/gdkscreen.c:99
 msgid "The resolution for fonts on the screen"
 msgstr "Rezoluția fonturilor pentru ecran"
 
-#: gdk/gdkwindow.c:392 gdk/gdkwindow.c:393
+#: ../gdk/gdkwindow.c:410 ../gdk/gdkwindow.c:411
 msgid "Cursor"
 msgstr "Cursor"
 
-#: gdk/x11/gdkdevice-xi.c:132 gdk/x11/gdkdevice-xi.c:133
-#: gdk/x11/gdkdevice-xi2.c:111
+#: ../gdk/x11/gdkdevice-xi.c:133 ../gdk/x11/gdkdevice-xi.c:134
+#: ../gdk/x11/gdkdevice-xi2.c:112
 msgid "Device ID"
-msgstr ""
+msgstr "ID dispozitiv"
 
-#: gdk/x11/gdkdevice-xi2.c:112
+#: ../gdk/x11/gdkdevice-xi2.c:113
 msgid "Device identifier"
-msgstr ""
+msgstr "Indentificator dispozitiv"
 
-#: gdk/x11/gdkdevicemanager-xi.c:84
-#, fuzzy
+#: ../gdk/x11/gdkdevicemanager-xi.c:85
 msgid "Event base"
-msgstr "Evenimente"
+msgstr "Bază de evenimente"
 
-#: gdk/x11/gdkdevicemanager-xi.c:85
+#: ../gdk/x11/gdkdevicemanager-xi.c:86
 msgid "Event base for XInput events"
-msgstr ""
+msgstr "Bază de evenimente pentru evenimente XInput "
 
-#: gtk/gtkaboutdialog.c:269
+#: ../gtk/gtkaboutdialog.c:269
 msgid "Program name"
 msgstr "Nume aplicație"
 
-#: gtk/gtkaboutdialog.c:270
+#: ../gtk/gtkaboutdialog.c:270
 msgid ""
 "The name of the program. If this is not set, it defaults to "
 "g_get_application_name()"
@@ -158,53 +150,51 @@ msgstr ""
 "Numele aplicației. În cazul în care nu e setat, se utilizează "
 "g_get_application_name()"
 
-#: gtk/gtkaboutdialog.c:284
+#: ../gtk/gtkaboutdialog.c:284
 msgid "Program version"
 msgstr "Versiune aplicație"
 
-#: gtk/gtkaboutdialog.c:285
+#: ../gtk/gtkaboutdialog.c:285
 msgid "The version of the program"
 msgstr "Versiunea aplicației"
 
-#: gtk/gtkaboutdialog.c:299
+#: ../gtk/gtkaboutdialog.c:299
 msgid "Copyright string"
 msgstr "Drepturi de autor"
 
-#: gtk/gtkaboutdialog.c:300
+#: ../gtk/gtkaboutdialog.c:300
 msgid "Copyright information for the program"
 msgstr "Drepturile de autor pentru această aplicație"
 
-#: gtk/gtkaboutdialog.c:317
+#: ../gtk/gtkaboutdialog.c:317
 msgid "Comments string"
 msgstr "Alte informații"
 
-#: gtk/gtkaboutdialog.c:318
+#: ../gtk/gtkaboutdialog.c:318
 msgid "Comments about the program"
 msgstr "Informații despre aplicație"
 
-#: gtk/gtkaboutdialog.c:368
-#, fuzzy
+#: ../gtk/gtkaboutdialog.c:368
 msgid "License Type"
-msgstr "Tip mesaj"
+msgstr "Tip de licență"
 
-#: gtk/gtkaboutdialog.c:369
-#, fuzzy
+#: ../gtk/gtkaboutdialog.c:369
 msgid "The license type of the program"
-msgstr "Versiunea aplicației"
+msgstr "Tipul de licență al aplicației"
 
-#: gtk/gtkaboutdialog.c:385
+#: ../gtk/gtkaboutdialog.c:385
 msgid "Website URL"
 msgstr "Adresă website"
 
-#: gtk/gtkaboutdialog.c:386
+#: ../gtk/gtkaboutdialog.c:386
 msgid "The URL for the link to the website of the program"
 msgstr "Adresa website-ului aplicației"
 
-#: gtk/gtkaboutdialog.c:401
+#: ../gtk/gtkaboutdialog.c:401
 msgid "Website label"
 msgstr "Etichetă website"
 
-#: gtk/gtkaboutdialog.c:402
+#: ../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"
@@ -212,44 +202,44 @@ msgstr ""
 "Eticheta pentru adresa website-ului programului. Dacă nu e inițializată, se "
 "utilizează adresa"
 
-#: gtk/gtkaboutdialog.c:418
+#: ../gtk/gtkaboutdialog.c:418
 msgid "Authors"
 msgstr "Autori"
 
-#: gtk/gtkaboutdialog.c:419
+#: ../gtk/gtkaboutdialog.c:419
 msgid "List of authors of the program"
 msgstr "Lista autorilor programului"
 
-#: gtk/gtkaboutdialog.c:435
+#: ../gtk/gtkaboutdialog.c:435
 msgid "Documenters"
 msgstr "Documentariști"
 
-#: gtk/gtkaboutdialog.c:436
+#: ../gtk/gtkaboutdialog.c:436
 msgid "List of people documenting the program"
 msgstr "Lista persoanelor ce au documentat programul"
 
-#: gtk/gtkaboutdialog.c:452
+#: ../gtk/gtkaboutdialog.c:452
 msgid "Artists"
 msgstr "Artiști"
 
-#: gtk/gtkaboutdialog.c:453
+#: ../gtk/gtkaboutdialog.c:453
 msgid "List of people who have contributed artwork to the program"
 msgstr "Lista persoanelor cu contribuții artistice la program"
 
-#: gtk/gtkaboutdialog.c:470
+#: ../gtk/gtkaboutdialog.c:470
 msgid "Translator credits"
 msgstr "Traducători"
 
-#: gtk/gtkaboutdialog.c:471
+#: ../gtk/gtkaboutdialog.c:471
 msgid ""
 "Credits to the translators. This string should be marked as translatable"
 msgstr "Lista traducătorilor. Acest șir trebuie marcat ca traductibil"
 
-#: gtk/gtkaboutdialog.c:486
+#: ../gtk/gtkaboutdialog.c:486
 msgid "Logo"
 msgstr "Logo"
 
-#: gtk/gtkaboutdialog.c:487
+#: ../gtk/gtkaboutdialog.c:487
 msgid ""
 "A logo for the about box. If this is not set, it defaults to "
 "gtk_window_get_default_icon_list()"
@@ -257,107 +247,108 @@ msgstr ""
 "Un logo pentru fereastra „Despre”. Dacă nu există, se va utiliza "
 "gtk_window_get_default_icon_list()"
 
-#: gtk/gtkaboutdialog.c:502
+#: ../gtk/gtkaboutdialog.c:502
 msgid "Logo Icon Name"
 msgstr "Nume iconiță logo"
 
-#: gtk/gtkaboutdialog.c:503
+#: ../gtk/gtkaboutdialog.c:503
 msgid "A named icon to use as the logo for the about box."
 msgstr "O iconiță desemnată ca logo al programului."
 
-#: gtk/gtkaboutdialog.c:516
+#: ../gtk/gtkaboutdialog.c:516
 msgid "Wrap license"
 msgstr "Rupere rânduri licență"
 
-#: gtk/gtkaboutdialog.c:517
+#: ../gtk/gtkaboutdialog.c:517
 msgid "Whether to wrap the license text."
 msgstr "Specifică dacă textul licenței să aibă rândurile rupte."
 
-#: gtk/gtkaccellabel.c:189
+#: ../gtk/gtkaccellabel.c:189
 msgid "Accelerator Closure"
 msgstr "Închidere accelerator"
 
-#: gtk/gtkaccellabel.c:190
+#: ../gtk/gtkaccellabel.c:190
 msgid "The closure to be monitored for accelerator changes"
 msgstr "Închiderea de monitorizat pentru schimbări ale acceleratorului"
 
-#: gtk/gtkaccellabel.c:196
+#: ../gtk/gtkaccellabel.c:196
 msgid "Accelerator Widget"
 msgstr "Widget accelerator"
 
-#: gtk/gtkaccellabel.c:197
+#: ../gtk/gtkaccellabel.c:197
 msgid "The widget to be monitored for accelerator changes"
 msgstr "Widget de monitorizat pentru schimbări ale acceleratorului"
 
-#: 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:89
 msgid "Name"
 msgstr "Nume"
 
-#: gtk/gtkaction.c:223
+#: ../gtk/gtkaction.c:223
 msgid "A unique name for the action."
 msgstr "Un nume unic pentru acțiune."
 
-#: 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:226 ../gtk/gtkexpander.c:209
+#: ../gtk/gtkframe.c:130 ../gtk/gtklabel.c:567 ../gtk/gtkmenuitem.c:331
+#: ../gtk/gtktoolbutton.c:202 ../gtk/gtktoolitemgroup.c:1588
 msgid "Label"
 msgstr "Etichetă"
 
-#: gtk/gtkaction.c:242
+#: ../gtk/gtkaction.c:242
 msgid "The label used for menu items and buttons that activate this action."
 msgstr ""
 "Etichetă utilizată pentru elementele din meniu și butoanele ce activează "
 "această acțiune."
 
-#: gtk/gtkaction.c:258
+#: ../gtk/gtkaction.c:258
 msgid "Short label"
 msgstr "Etichetă scurtă"
 
-#: gtk/gtkaction.c:259
+#: ../gtk/gtkaction.c:259
 msgid "A shorter label that may be used on toolbar buttons."
 msgstr "O etichetă mai scurtă de utilizat pentru butoanele din bara cu unelte."
 
-#: gtk/gtkaction.c:267
+#: ../gtk/gtkaction.c:267
 msgid "Tooltip"
 msgstr "Indiciu"
 
-#: gtk/gtkaction.c:268
+#: ../gtk/gtkaction.c:268
 msgid "A tooltip for this action."
 msgstr "Un indiciu pentru această acțiune."
 
-#: gtk/gtkaction.c:283
+#: ../gtk/gtkaction.c:283
 msgid "Stock Icon"
 msgstr "Iconiță standard"
 
-#: gtk/gtkaction.c:284
+#: ../gtk/gtkaction.c:284
 msgid "The stock icon displayed in widgets representing this action."
 msgstr "Iconița standard de afișat într-un widget asociat acelei acțiuni."
 
-#: gtk/gtkaction.c:304 gtk/gtkstatusicon.c:252
+#: ../gtk/gtkaction.c:304 ../gtk/gtkstatusicon.c:252
 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:215
+#: ../gtk/gtkimage.c:326 ../gtk/gtkstatusicon.c:253
 msgid "The GIcon being displayed"
 msgstr "Elementul GIcon afișat"
 
-#: 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:180
+#: ../gtk/gtkimage.c:308 ../gtk/gtkprinter.c:174 ../gtk/gtkstatusicon.c:236
+#: ../gtk/gtkwindow.c:733
 msgid "Icon Name"
 msgstr "Nume iconiță"
 
-#: gtk/gtkaction.c:326 gtk/gtkcellrendererpixbuf.c:181 gtk/gtkimage.c:303
-#: gtk/gtkstatusicon.c:237
+#: ../gtk/gtkaction.c:326 ../gtk/gtkcellrendererpixbuf.c:181
+#: ../gtk/gtkimage.c:309 ../gtk/gtkstatusicon.c:237
 msgid "The name of the icon from the icon theme"
 msgstr "Numele iconiței din tema de iconițe"
 
-#: gtk/gtkaction.c:333 gtk/gtktoolitem.c:186
+#: ../gtk/gtkaction.c:333 ../gtk/gtktoolitem.c:195
 msgid "Visible when horizontal"
 msgstr "Vizibil pe orizontală"
 
-#: gtk/gtkaction.c:334 gtk/gtktoolitem.c:187
+#: ../gtk/gtkaction.c:334 ../gtk/gtktoolitem.c:196
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a horizontal "
 "orientation."
@@ -365,11 +356,11 @@ msgstr ""
 "Specifică dacă elementul din bara cu unelte va fi vizibil când bara cu "
 "unelte este orientată pe orizontală."
 
-#: gtk/gtkaction.c:349
+#: ../gtk/gtkaction.c:349
 msgid "Visible when overflown"
 msgstr "Vizibil întotdeauna"
 
-#: gtk/gtkaction.c:350
+#: ../gtk/gtkaction.c:350
 msgid ""
 "When TRUE, toolitem proxies for this action are represented in the toolbar "
 "overflow menu."
@@ -377,11 +368,11 @@ msgstr ""
 "La activare, elementele din bara de unelte pentru această acțiune vor fi "
 "afișate în meniul suplimentar când spațiul e insuficient."
 
-#: gtk/gtkaction.c:357 gtk/gtktoolitem.c:193
+#: ../gtk/gtkaction.c:357 ../gtk/gtktoolitem.c:202
 msgid "Visible when vertical"
 msgstr "Vizibil pe verticală"
 
-#: gtk/gtkaction.c:358 gtk/gtktoolitem.c:194
+#: ../gtk/gtkaction.c:358 ../gtk/gtktoolitem.c:203
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a vertical "
 "orientation."
@@ -389,11 +380,11 @@ msgstr ""
 "Specifică dacă elementul din bara cu unelte va fi vizibil când bara cu "
 "unelte este orientată pe verticală."
 
-#: gtk/gtkaction.c:365 gtk/gtktoolitem.c:200
+#: ../gtk/gtkaction.c:365 ../gtk/gtktoolitem.c:209
 msgid "Is important"
 msgstr "E important"
 
-#: 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."
@@ -401,138 +392,139 @@ msgstr ""
 "Specifică dacă acțiunea este considerată importantă. La activare, se va "
 "afișa un text lângă această iconiță în modul GTK_TOOLBAR_BOTH_HORIZ."
 
-#: gtk/gtkaction.c:374
+#: ../gtk/gtkaction.c:374
 msgid "Hide if empty"
 msgstr "Ascunde dacă e gol"
 
-#: gtk/gtkaction.c:375
+#: ../gtk/gtkaction.c:375
 msgid "When TRUE, empty menu proxies for this action are hidden."
 msgstr "La activare, se ascund intrările nule pentru această acțiune"
 
-#: 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:282 ../gtk/gtkwidget.c:916
 msgid "Sensitive"
 msgstr "Senzitivă"
 
-#: gtk/gtkaction.c:382
+#: ../gtk/gtkaction.c:382
 msgid "Whether the action is enabled."
 msgstr "Specifică dacă acțiunea este activată."
 
-#: 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:287 ../gtk/gtktreeviewcolumn.c:213
+#: ../gtk/gtkwidget.c:909
 msgid "Visible"
 msgstr "Vizibilă"
 
-#: gtk/gtkaction.c:389
+#: ../gtk/gtkaction.c:389
 msgid "Whether the action is visible."
 msgstr "Specifică dacă acțiunea este vizibilă"
 
-#: gtk/gtkaction.c:395
+#: ../gtk/gtkaction.c:395
 msgid "Action Group"
 msgstr "Grup de acțiuni"
 
-#: gtk/gtkaction.c:396
+#: ../gtk/gtkaction.c:396
 msgid ""
 "The GtkActionGroup this GtkAction is associated with, or NULL (for internal "
 "use)."
 msgstr ""
-"Elemntul GtkActionGroup cu care acest GtkAction este asociat, sau NULL "
+"Elementul GtkActionGroup cu care acest GtkAction este asociat, sau NULL "
 "(pentru uz intern)."
 
-#: gtk/gtkaction.c:414 gtk/gtkimagemenuitem.c:172
+#: ../gtk/gtkaction.c:414 ../gtk/gtkimagemenuitem.c:182
 msgid "Always show image"
 msgstr "Arată întotdeauna imaginea"
 
-#: gtk/gtkaction.c:415 gtk/gtkimagemenuitem.c:173
+#: ../gtk/gtkaction.c:415 ../gtk/gtkimagemenuitem.c:183
 msgid "Whether the image will always be shown"
 msgstr "Specifică dacă imaginea este întotdeauna afișată"
 
-#: gtk/gtkactiongroup.c:229
+#: ../gtk/gtkactiongroup.c:229
 msgid "A name for the action group."
 msgstr "Un nume pentru grupul de acțiuni"
 
-#: gtk/gtkactiongroup.c:236
+#: ../gtk/gtkactiongroup.c:236
 msgid "Whether the action group is enabled."
 msgstr "Specifică dacă grupul de acțiuni este activat."
 
-#: gtk/gtkactiongroup.c:243
+#: ../gtk/gtkactiongroup.c:243
 msgid "Whether the action group is visible."
 msgstr "Specifică dacă grupul de acțiuni este vizibil."
 
-#: gtk/gtkactivatable.c:290
+#: ../gtk/gtkactivatable.c:290
 msgid "Related Action"
 msgstr "Acțiune înrudită"
 
-#: gtk/gtkactivatable.c:291
+#: ../gtk/gtkactivatable.c:291
 msgid "The action this activatable will activate and receive updates from"
 msgstr ""
 "Acțiune pe care acest element activabil o va activa și pentru care va primi "
 "actualizări"
 
-#: gtk/gtkactivatable.c:313
+#: ../gtk/gtkactivatable.c:313
 msgid "Use Action Appearance"
 msgstr "Utilizează ilustrarea acțiunii"
 
-#: gtk/gtkactivatable.c:314
+#: ../gtk/gtkactivatable.c:314
 msgid "Whether to use the related actions appearance properties"
 msgstr ""
 "Specifică dacă se utilizează proprietățile ilustrărilor pentru acțiunile "
 "înrudite"
 
-#: gtk/gtkadjustment.c:93 gtk/gtkcellrendererprogress.c:126
-#: gtk/gtkscalebutton.c:220 gtk/gtkspinbutton.c:289
+#: ../gtk/gtkadjustment.c:114 ../gtk/gtkcellrendererprogress.c:126
+#: ../gtk/gtkscalebutton.c:220 ../gtk/gtkspinbutton.c:291
 msgid "Value"
 msgstr "Valoare"
 
-#: gtk/gtkadjustment.c:94
+#: ../gtk/gtkadjustment.c:115
 msgid "The value of the adjustment"
 msgstr "Valuarea ajustării"
 
-#: gtk/gtkadjustment.c:110
+#: ../gtk/gtkadjustment.c:131
 msgid "Minimum Value"
 msgstr "Valoare minimă"
 
-#: gtk/gtkadjustment.c:111
+#: ../gtk/gtkadjustment.c:132
 msgid "The minimum value of the adjustment"
 msgstr "Valoarea minimă a ajustării"
 
-#: gtk/gtkadjustment.c:130
+#: ../gtk/gtkadjustment.c:151
 msgid "Maximum Value"
 msgstr "Valoare maximă"
 
-#: gtk/gtkadjustment.c:131
+#: ../gtk/gtkadjustment.c:152
 msgid "The maximum value of the adjustment"
 msgstr "Valoarea maximă a ajustării"
 
-#: gtk/gtkadjustment.c:147
+#: ../gtk/gtkadjustment.c:168
 msgid "Step Increment"
 msgstr "Pas de incrementare"
 
-#: gtk/gtkadjustment.c:148
+#: ../gtk/gtkadjustment.c:169
 msgid "The step increment of the adjustment"
 msgstr "Pasul incrementării la ajustare"
 
-#: gtk/gtkadjustment.c:164
+#: ../gtk/gtkadjustment.c:185
 msgid "Page Increment"
 msgstr "Incrementare pagină"
 
-#: gtk/gtkadjustment.c:165
+#: ../gtk/gtkadjustment.c:186
 msgid "The page increment of the adjustment"
 msgstr "Incrementarea paginii la ajustare"
 
-#: gtk/gtkadjustment.c:184
+#: ../gtk/gtkadjustment.c:205
 msgid "Page Size"
 msgstr "Mărime pagină"
 
-#: gtk/gtkadjustment.c:185
+#: ../gtk/gtkadjustment.c:206
 msgid "The page size of the adjustment"
 msgstr "Mărimea paginii la ajustare"
 
-#: gtk/gtkalignment.c:123
+#: ../gtk/gtkalignment.c:127
 msgid "Horizontal alignment"
 msgstr "Aliniere orizontală"
 
-#: gtk/gtkalignment.c:124 gtk/gtkbutton.c:289
+#: ../gtk/gtkalignment.c:128 ../gtk/gtkbutton.c:277
 msgid ""
 "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
 "right aligned"
@@ -540,11 +532,11 @@ msgstr ""
 "Poziția orizontală a copilului în spațiul disponibil. 0.0 înseamnă aliniere "
 "la stânga, 1.0 înseamnă aliniere la dreapta"
 
-#: gtk/gtkalignment.c:133
+#: ../gtk/gtkalignment.c:137
 msgid "Vertical alignment"
 msgstr "Aliniere verticală"
 
-#: gtk/gtkalignment.c:134 gtk/gtkbutton.c:308
+#: ../gtk/gtkalignment.c:138 ../gtk/gtkbutton.c:296
 msgid ""
 "Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
 "bottom aligned"
@@ -552,11 +544,11 @@ msgstr ""
 "Poziția verticală a copilului în spațiul disponibil. 0.0 înseamnă aliniere "
 "sus, 1.0 înseamnă aliniere jos"
 
-#: gtk/gtkalignment.c:142
+#: ../gtk/gtkalignment.c:146
 msgid "Horizontal scale"
 msgstr "Scalare orizontală"
 
-#: gtk/gtkalignment.c:143
+#: ../gtk/gtkalignment.c:147
 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"
@@ -564,11 +556,11 @@ msgstr ""
 "Dacă spațiul disponibil orizontal este mai mare decât are nevoie copilul, "
 "cât să fie utilizat pentru copil. 0.0 înseamnă nimic, 1.0 înseamnă tot"
 
-#: gtk/gtkalignment.c:151
+#: ../gtk/gtkalignment.c:155
 msgid "Vertical scale"
 msgstr "Scalare verticală"
 
-#: gtk/gtkalignment.c:152
+#: ../gtk/gtkalignment.c:156
 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"
@@ -576,202 +568,201 @@ msgstr ""
 "Dacă spațiul disponibil vertical este mai mare decât copilul are nevoie, cât "
 "să fie utilizat pentru copil. 0.0 înseamnă nimic, 1.0 înseamnă tot"
 
-#: gtk/gtkalignment.c:169
+#: ../gtk/gtkalignment.c:173
 msgid "Top Padding"
 msgstr "Umplere deasupra"
 
-#: gtk/gtkalignment.c:170
+#: ../gtk/gtkalignment.c:174
 msgid "The padding to insert at the top of the widget."
 msgstr "Spațiul de umplutură de inserat deasupra unui widget."
 
-#: gtk/gtkalignment.c:186
+#: ../gtk/gtkalignment.c:190
 msgid "Bottom Padding"
 msgstr "Umplere dedesubt"
 
-#: gtk/gtkalignment.c:187
+#: ../gtk/gtkalignment.c:191
 msgid "The padding to insert at the bottom of the widget."
 msgstr "Spațiul de umplutură de inserat dedesubtul unui widget."
 
-#: gtk/gtkalignment.c:203
+#: ../gtk/gtkalignment.c:207
 msgid "Left Padding"
 msgstr "Umplere la stânga"
 
-#: gtk/gtkalignment.c:204
+#: ../gtk/gtkalignment.c:208
 msgid "The padding to insert at the left of the widget."
 msgstr "Spațiul de umplutură de inserat la stânga unui widget."
 
-#: gtk/gtkalignment.c:220
+#: ../gtk/gtkalignment.c:224
 msgid "Right Padding"
 msgstr "Umplere la dreapta"
 
-#: gtk/gtkalignment.c:221
+#: ../gtk/gtkalignment.c:225
 msgid "The padding to insert at the right of the widget."
 msgstr "Spațiul de umplutură de inserat la dreapta unui widget."
 
-#: gtk/gtkarrow.c:110
+#: ../gtk/gtkarrow.c:110
 msgid "Arrow direction"
 msgstr "Direcție săgeată"
 
-#: gtk/gtkarrow.c:111
+#: ../gtk/gtkarrow.c:111
 msgid "The direction the arrow should point"
 msgstr "Direcția pe care săgeata ar trebui să o indice"
 
-#: gtk/gtkarrow.c:119
+#: ../gtk/gtkarrow.c:119
 msgid "Arrow shadow"
 msgstr "Umbră săgeată"
 
-#: gtk/gtkarrow.c:120
+#: ../gtk/gtkarrow.c:120
 msgid "Appearance of the shadow surrounding the arrow"
 msgstr "Aspectul umbrei care înconjoară săgeata"
 
-#: gtk/gtkarrow.c:127 gtk/gtkmenu.c:735 gtk/gtkmenuitem.c:396
+#: ../gtk/gtkarrow.c:127 ../gtk/gtkmenu.c:731 ../gtk/gtkmenuitem.c:394
 msgid "Arrow Scaling"
 msgstr "Redimensionare săgeată"
 
-#: gtk/gtkarrow.c:128
+#: ../gtk/gtkarrow.c:128
 msgid "Amount of space used up by arrow"
 msgstr "Spațiu ocupat de săgeată"
 
-#: gtk/gtkaspectframe.c:109 gtk/gtkwidget.c:950
+#: ../gtk/gtkaspectframe.c:109 ../gtk/gtkwidget.c:1112
 msgid "Horizontal Alignment"
 msgstr "Aliniere orizontală"
 
-#: gtk/gtkaspectframe.c:110
+#: ../gtk/gtkaspectframe.c:110
 msgid "X alignment of the child"
 msgstr "Alinierea pe axa X a copilului"
 
-#: gtk/gtkaspectframe.c:116 gtk/gtkwidget.c:966
+#: ../gtk/gtkaspectframe.c:116 ../gtk/gtkwidget.c:1128
 msgid "Vertical Alignment"
 msgstr "Aliniere verticală"
 
-#: gtk/gtkaspectframe.c:117
+#: ../gtk/gtkaspectframe.c:117
 msgid "Y alignment of the child"
 msgstr "Alinierea pe axa Y a copilului"
 
-#: gtk/gtkaspectframe.c:123
+#: ../gtk/gtkaspectframe.c:123
 msgid "Ratio"
 msgstr "Proporție"
 
-#: gtk/gtkaspectframe.c:124
+#: ../gtk/gtkaspectframe.c:124
 msgid "Aspect ratio if obey_child is FALSE"
 msgstr "Proporția dacă „obey_child” este FALSE"
 
-#: gtk/gtkaspectframe.c:130
+#: ../gtk/gtkaspectframe.c:130
 msgid "Obey child"
 msgstr "Potrivește după copil"
 
-#: gtk/gtkaspectframe.c:131
+#: ../gtk/gtkaspectframe.c:131
 msgid "Force aspect ratio to match that of the frame's child"
 msgstr "Forțează proporția să se potrivească cu copilul cadrului"
 
-#: gtk/gtkassistant.c:310
+#: ../gtk/gtkassistant.c:326
 msgid "Header Padding"
 msgstr "Umplere antet"
 
-#: gtk/gtkassistant.c:311
+#: ../gtk/gtkassistant.c:327
 msgid "Number of pixels around the header."
 msgstr "Numărul pixelilor din jurul antetului."
 
-#: gtk/gtkassistant.c:318
+#: ../gtk/gtkassistant.c:334
 msgid "Content Padding"
 msgstr "Umplere conținut"
 
-#: gtk/gtkassistant.c:319
+#: ../gtk/gtkassistant.c:335
 msgid "Number of pixels around the content pages."
 msgstr "Numărul pixelilor din jurul conținutului."
 
-#: gtk/gtkassistant.c:335
+#: ../gtk/gtkassistant.c:351
 msgid "Page type"
 msgstr "Tip pagină"
 
-#: gtk/gtkassistant.c:336
+#: ../gtk/gtkassistant.c:352
 msgid "The type of the assistant page"
 msgstr "Tipul paginii asistentului"
 
-#: gtk/gtkassistant.c:353
+#: ../gtk/gtkassistant.c:369
 msgid "Page title"
 msgstr "Titlu pagină"
 
-#: gtk/gtkassistant.c:354
+#: ../gtk/gtkassistant.c:370
 msgid "The title of the assistant page"
 msgstr "Titlul paginii asistentului"
 
-#: gtk/gtkassistant.c:370
+#: ../gtk/gtkassistant.c:386
 msgid "Header image"
 msgstr "Imagine antet"
 
-#: gtk/gtkassistant.c:371
+#: ../gtk/gtkassistant.c:387
 msgid "Header image for the assistant page"
 msgstr "Imagine antet pentru pagina asistentului"
 
-#: gtk/gtkassistant.c:387
+#: ../gtk/gtkassistant.c:403
 msgid "Sidebar image"
 msgstr "Imagine laterală"
 
-#: gtk/gtkassistant.c:388
+#: ../gtk/gtkassistant.c:404
 msgid "Sidebar image for the assistant page"
 msgstr "Imagine laterală pentru pagina asistentului"
 
-#: gtk/gtkassistant.c:403
+#: ../gtk/gtkassistant.c:419
 msgid "Page complete"
 msgstr "Pagină completă"
 
-#: gtk/gtkassistant.c:404
+#: ../gtk/gtkassistant.c:420
 msgid "Whether all required fields on the page have been filled out"
 msgstr "Specifică dacă toate câmpurile din pagină au fost completate"
 
-#: gtk/gtkbbox.c:135
+#: ../gtk/gtkbbox.c:152
 msgid "Minimum child width"
 msgstr "Lățime minimă copil"
 
-#: gtk/gtkbbox.c:136
+#: ../gtk/gtkbbox.c:153
 msgid "Minimum width of buttons inside the box"
-msgstr "Lățimea minimă a butoanelor înăuntrul cutiei"
+msgstr "Lățimea minimă a butoanelor înăuntrul căsuței"
 
-#: gtk/gtkbbox.c:144
+#: ../gtk/gtkbbox.c:161
 msgid "Minimum child height"
 msgstr "Înălțime minimă copil"
 
-#: gtk/gtkbbox.c:145
+#: ../gtk/gtkbbox.c:162
 msgid "Minimum height of buttons inside the box"
-msgstr "Înălțimea minimă a butoanelor înăuntrul cutiei"
+msgstr "Înălțimea minimă a butoanelor înăuntrul căsuței"
 
-#: gtk/gtkbbox.c:153
+#: ../gtk/gtkbbox.c:170
 msgid "Child internal width padding"
 msgstr "Umplere lățime internă copil"
 
-#: gtk/gtkbbox.c:154
+#: ../gtk/gtkbbox.c:171
 msgid "Amount to increase child's size on either side"
 msgstr ""
 "Cantitatea cu care să fie mărită dimensiunea copilului pe fiecare parte"
 
-#: gtk/gtkbbox.c:162
+#: ../gtk/gtkbbox.c:179
 msgid "Child internal height padding"
 msgstr "Umplere înălțime internă a copilului"
 
-#: gtk/gtkbbox.c:163
+#: ../gtk/gtkbbox.c:180
 msgid "Amount to increase child's size on the top and bottom"
 msgstr ""
 "Cantitatea cu care să fie mărită dimensiunea copilului deasupra și dedesubt"
 
-#: gtk/gtkbbox.c:171
+#: ../gtk/gtkbbox.c:188
 msgid "Layout style"
 msgstr "Stilul aspectului"
 
-#: gtk/gtkbbox.c:172
-#, fuzzy
+#: ../gtk/gtkbbox.c:189
 msgid ""
 "How to lay out the buttons in the box. Possible values are: spread, edge, "
 "start and end"
 msgstr ""
-"Modul de aranjare a butoanelor în cutie. Valori posibile sunt „default”, "
+"Modul de aranjare a butoanelor în căsuță. Valori posibile sunt „default”, "
 "„spread”, „edge”, „start” și „end”."
 
-#: gtk/gtkbbox.c:180
+#: ../gtk/gtkbbox.c:197
 msgid "Secondary"
 msgstr "Secundar"
 
-#: gtk/gtkbbox.c:181
+#: ../gtk/gtkbbox.c:198
 msgid ""
 "If TRUE, the child appears in a secondary group of children, suitable for, e."
 "g., help buttons"
@@ -779,40 +770,40 @@ msgstr ""
 "La activare, copilul apare într-un grup secundar de copii, cum e cazul "
 "butoanelor de ajutor, de exemplu"
 
-#: gtk/gtkbox.c:227 gtk/gtkexpander.c:233 gtk/gtkiconview.c:666
-#: gtk/gtktreeviewcolumn.c:220
+#: ../gtk/gtkbox.c:241 ../gtk/gtkexpander.c:233 ../gtk/gtkiconview.c:696
+#: ../gtk/gtktreeviewcolumn.c:238
 msgid "Spacing"
 msgstr "Spațiere"
 
-#: gtk/gtkbox.c:228
+#: ../gtk/gtkbox.c:242
 msgid "The amount of space between children"
 msgstr "Cantitatea de spațiu între copii"
 
-#: gtk/gtkbox.c:237 gtk/gtktable.c:184 gtk/gtktoolbar.c:527
-#: gtk/gtktoolitemgroup.c:1624
+#: ../gtk/gtkbox.c:251 ../gtk/gtktable.c:193 ../gtk/gtktoolbar.c:553
+#: ../gtk/gtktoolitemgroup.c:1641
 msgid "Homogeneous"
 msgstr "Omogen"
 
-#: gtk/gtkbox.c:238
+#: ../gtk/gtkbox.c:252
 msgid "Whether the children should all be the same size"
 msgstr "Specifică dacă copiii ar trebui să fie toți de aceeași mărime"
 
-#: gtk/gtkbox.c:254 gtk/gtktoolbar.c:519 gtk/gtktoolitemgroup.c:1631
-#: gtk/gtktoolpalette.c:1065 gtk/gtktreeviewcolumn.c:276
+#: ../gtk/gtkbox.c:268 ../gtk/gtktoolbar.c:545 ../gtk/gtktoolitemgroup.c:1648
+#: ../gtk/gtktoolpalette.c:1092 ../gtk/gtktreeviewcolumn.c:294
 msgid "Expand"
 msgstr "Extinde"
 
-#: gtk/gtkbox.c:255
+#: ../gtk/gtkbox.c:269
 msgid "Whether the child should receive extra space when the parent grows"
 msgstr ""
 "Specifică dacă un copil ar trebui să primească spațiu în plus când părintele "
 "crește"
 
-#: gtk/gtkbox.c:271 gtk/gtktoolitemgroup.c:1638
+#: ../gtk/gtkbox.c:285 ../gtk/gtktoolitemgroup.c:1655
 msgid "Fill"
 msgstr "Umplere"
 
-#: gtk/gtkbox.c:272
+#: ../gtk/gtkbox.c:286
 msgid ""
 "Whether extra space given to the child should be allocated to the child or "
 "used as padding"
@@ -820,19 +811,19 @@ msgstr ""
 "Specifică dacă spațiul în plus dat copilului ar trebui alocat copilului sau "
 "utilizat ca umplere"
 
-#: gtk/gtkbox.c:279 gtk/gtktrayicon-x11.c:165
+#: ../gtk/gtkbox.c:293 ../gtk/gtktrayicon-x11.c:165
 msgid "Padding"
 msgstr "Umplere"
 
-#: gtk/gtkbox.c:280
+#: ../gtk/gtkbox.c:294
 msgid "Extra space to put between the child and its neighbors, in pixels"
 msgstr "Spațiu în plus pentru a fi pus între copil și vecinii săi, în pixeli"
 
-#: gtk/gtkbox.c:286
+#: ../gtk/gtkbox.c:300
 msgid "Pack type"
 msgstr "Tip împachetare"
 
-#: gtk/gtkbox.c:287 gtk/gtknotebook.c:692
+#: ../gtk/gtkbox.c:301 ../gtk/gtknotebook.c:793
 msgid ""
 "A GtkPackType indicating whether the child is packed with reference to the "
 "start or end of the parent"
@@ -840,24 +831,24 @@ msgstr ""
 "Un GtkPackType ce indică dacă un copil este împachetat cu referință la "
 "începutul sau sfârșitul părintelui"
 
-#: gtk/gtkbox.c:293 gtk/gtknotebook.c:670 gtk/gtkpaned.c:270
-#: gtk/gtkruler.c:158 gtk/gtktoolitemgroup.c:1652
+#: ../gtk/gtkbox.c:307 ../gtk/gtknotebook.c:764 ../gtk/gtkpaned.c:327
+#: ../gtk/gtkruler.c:163 ../gtk/gtktoolitemgroup.c:1669
 msgid "Position"
 msgstr "Poziție"
 
-#: gtk/gtkbox.c:294 gtk/gtknotebook.c:671
+#: ../gtk/gtkbox.c:308 ../gtk/gtknotebook.c:765
 msgid "The index of the child in the parent"
 msgstr "Indexul copilului în părinte"
 
-#: gtk/gtkbuilder.c:315
+#: ../gtk/gtkbuilder.c:314
 msgid "Translation Domain"
 msgstr "Domeniu de traducere"
 
-#: gtk/gtkbuilder.c:316
+#: ../gtk/gtkbuilder.c:315
 msgid "The translation domain used by gettext"
 msgstr "Domeniul de traducere utilizat de gettext"
 
-#: gtk/gtkbutton.c:239
+#: ../gtk/gtkbutton.c:227
 msgid ""
 "Text of the label widget inside the button, if the button contains a label "
 "widget"
@@ -865,13 +856,13 @@ msgstr ""
 "Textul unui widget etichetă dinăuntrul unui buton, în caz că butonul conține "
 "un widget etichetă"
 
-#: gtk/gtkbutton.c:246 gtk/gtkexpander.c:217 gtk/gtklabel.c:570
-#: gtk/gtkmenuitem.c:348 gtk/gtktoolbutton.c:209
+#: ../gtk/gtkbutton.c:234 ../gtk/gtkexpander.c:217 ../gtk/gtklabel.c:588
+#: ../gtk/gtkmenuitem.c:346 ../gtk/gtktoolbutton.c:209
 msgid "Use underline"
 msgstr "Utilizează sublinieri"
 
-#: gtk/gtkbutton.c:247 gtk/gtkexpander.c:218 gtk/gtklabel.c:571
-#: gtk/gtkmenuitem.c:349
+#: ../gtk/gtkbutton.c:235 ../gtk/gtkexpander.c:218 ../gtk/gtklabel.c:589
+#: ../gtk/gtkmenuitem.c:347
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -879,70 +870,71 @@ msgstr ""
 "La activare, o linie de subliniere în text indică faptul că următorul "
 "caracter ar trebui să fie utilizat ca tasta de accelerare"
 
-#: gtk/gtkbutton.c:254 gtk/gtkimagemenuitem.c:153
+#: ../gtk/gtkbutton.c:242 ../gtk/gtkimagemenuitem.c:163
 msgid "Use stock"
 msgstr "Implicit"
 
-#: gtk/gtkbutton.c:255
+#: ../gtk/gtkbutton.c:243
 msgid ""
 "If set, the label is used to pick a stock item instead of being displayed"
 msgstr ""
 "La activare, eticheta este utilizată pentru a alege un element standard în "
 "loc să fie afișată"
 
-#: gtk/gtkbutton.c:262 gtk/gtkcombobox.c:811 gtk/gtkfilechooserbutton.c:385
+#: ../gtk/gtkbutton.c:250 ../gtk/gtkcombobox.c:861
+#: ../gtk/gtkfilechooserbutton.c:383
 msgid "Focus on click"
 msgstr "Focus la clic"
 
-#: gtk/gtkbutton.c:263 gtk/gtkfilechooserbutton.c:386
+#: ../gtk/gtkbutton.c:251 ../gtk/gtkfilechooserbutton.c:384
 msgid "Whether the button grabs focus when it is clicked with the mouse"
 msgstr "Specifică dacă butonul primește focus la un clic de maus"
 
-#: gtk/gtkbutton.c:270
+#: ../gtk/gtkbutton.c:258
 msgid "Border relief"
 msgstr "Umbra chenarului"
 
-#: gtk/gtkbutton.c:271
+#: ../gtk/gtkbutton.c:259
 msgid "The border relief style"
 msgstr "Stilul de umbrire al chenarului"
 
-#: gtk/gtkbutton.c:288
+#: ../gtk/gtkbutton.c:276
 msgid "Horizontal alignment for child"
 msgstr "Aliniere orizontală pentru copil"
 
-#: gtk/gtkbutton.c:307
+#: ../gtk/gtkbutton.c:295
 msgid "Vertical alignment for child"
 msgstr "Aliniere verticală pentru copil"
 
-#: gtk/gtkbutton.c:324 gtk/gtkimagemenuitem.c:138
+#: ../gtk/gtkbutton.c:312 ../gtk/gtkimagemenuitem.c:148
 msgid "Image widget"
 msgstr "Widget imagine"
 
-#: gtk/gtkbutton.c:325
+#: ../gtk/gtkbutton.c:313
 msgid "Child widget to appear next to the button text"
 msgstr "Widget copil care să apară lângă textul butonului"
 
-#: gtk/gtkbutton.c:339
+#: ../gtk/gtkbutton.c:327
 msgid "Image position"
 msgstr "Poziție imagine"
 
-#: gtk/gtkbutton.c:340
+#: ../gtk/gtkbutton.c:328
 msgid "The position of the image relative to the text"
 msgstr "Poziția imaginii relativ la text"
 
-#: gtk/gtkbutton.c:460
+#: ../gtk/gtkbutton.c:448
 msgid "Default Spacing"
 msgstr "Spațiere implicită"
 
-#: gtk/gtkbutton.c:461
+#: ../gtk/gtkbutton.c:449
 msgid "Extra space to add for GTK_CAN_DEFAULT buttons"
 msgstr "Spațiere de adăugat în plus pentru butoanele GTK_CAN_DEFAULT"
 
-#: gtk/gtkbutton.c:475
+#: ../gtk/gtkbutton.c:463
 msgid "Default Outside Spacing"
 msgstr "Spațiere externă implicită"
 
-#: gtk/gtkbutton.c:476
+#: ../gtk/gtkbutton.c:464
 msgid ""
 "Extra space to add for GTK_CAN_DEFAULT buttons that is always drawn outside "
 "the border"
@@ -950,31 +942,31 @@ msgstr ""
 "Spațiu în plus de adăugat pentru butoanele GTK_CAN_DEFAULT desenat "
 "întotdeauna în afara chenarului"
 
-#: gtk/gtkbutton.c:481
+#: ../gtk/gtkbutton.c:469
 msgid "Child X Displacement"
 msgstr "Deplasare X copil"
 
-#: gtk/gtkbutton.c:482
+#: ../gtk/gtkbutton.c:470
 msgid ""
 "How far in the x direction to move the child when the button is depressed"
 msgstr ""
 "Cât de mult să fie mutat copilul în direcția X cand butonul este apăsat"
 
-#: gtk/gtkbutton.c:489
+#: ../gtk/gtkbutton.c:477
 msgid "Child Y Displacement"
 msgstr "Deplasare Y copil"
 
-#: gtk/gtkbutton.c:490
+#: ../gtk/gtkbutton.c:478
 msgid ""
 "How far in the y direction to move the child when the button is depressed"
 msgstr ""
 "Cât de mult să fie mutat copilul în direcția Y cand butonul este apăsat"
 
-#: gtk/gtkbutton.c:506
+#: ../gtk/gtkbutton.c:494
 msgid "Displace focus"
 msgstr "Deplasează focusul"
 
-#: gtk/gtkbutton.c:507
+#: ../gtk/gtkbutton.c:495
 msgid ""
 "Whether the child_displacement_x/_y properties should also affect the focus "
 "rectangle"
@@ -982,51 +974,43 @@ msgstr ""
 "Specifică dacă proprietățile child_displacement_x/_y ar trebui să afecteze "
 "și aria focusului"
 
-#: gtk/gtkbutton.c:520 gtk/gtkentry.c:696 gtk/gtkentry.c:1741
+#: ../gtk/gtkbutton.c:508 ../gtk/gtkentry.c:786 ../gtk/gtkentry.c:1831
 msgid "Inner Border"
 msgstr "Margine interioară"
 
-#: gtk/gtkbutton.c:521
+#: ../gtk/gtkbutton.c:509
 msgid "Border between button edges and child."
 msgstr "Spațiu între marginile butonului și copil."
 
-#: gtk/gtkbutton.c:534
+#: ../gtk/gtkbutton.c:522
 msgid "Image spacing"
 msgstr "Spațiere imagine"
 
-#: gtk/gtkbutton.c:535
+#: ../gtk/gtkbutton.c:523
 msgid "Spacing in pixels between the image and label"
 msgstr "Spațiere în pixeli între imagine și etichetă"
 
-#: gtk/gtkbutton.c:549
-msgid "Show button images"
-msgstr "Arată imaginea butonului"
-
-#: gtk/gtkbutton.c:550
-msgid "Whether images should be shown on buttons"
-msgstr "Specifică dacă ar trebui afișate imagini pe butoane"
-
-#: gtk/gtkcalendar.c:478
+#: ../gtk/gtkcalendar.c:475
 msgid "Year"
 msgstr "An"
 
-#: gtk/gtkcalendar.c:479
+#: ../gtk/gtkcalendar.c:476
 msgid "The selected year"
 msgstr "Anul selectat."
 
-#: gtk/gtkcalendar.c:492
+#: ../gtk/gtkcalendar.c:489
 msgid "Month"
 msgstr "Lună"
 
-#: gtk/gtkcalendar.c:493
+#: ../gtk/gtkcalendar.c:490
 msgid "The selected month (as a number between 0 and 11)"
 msgstr "Luna selectată (ca număr între 0 și 11)"
 
-#: gtk/gtkcalendar.c:507
+#: ../gtk/gtkcalendar.c:504
 msgid "Day"
 msgstr "Zi"
 
-#: gtk/gtkcalendar.c:508
+#: ../gtk/gtkcalendar.c:505
 msgid ""
 "The selected day (as a number between 1 and 31, or 0 to unselect the "
 "currently selected day)"
@@ -1034,348 +1018,359 @@ msgstr ""
 "Ziua selectată (ca număr între 1 și 31, ori 0 pentru a deselecta ziua "
 "selectată curent)."
 
-#: gtk/gtkcalendar.c:522
+#: ../gtk/gtkcalendar.c:519
 msgid "Show Heading"
 msgstr "Arată antetul"
 
-#: gtk/gtkcalendar.c:523
+#: ../gtk/gtkcalendar.c:520
 msgid "If TRUE, a heading is displayed"
 msgstr "La activare, e afișat un antet"
 
-#: gtk/gtkcalendar.c:537
+#: ../gtk/gtkcalendar.c:534
 msgid "Show Day Names"
 msgstr "Arată numele zilelor"
 
-#: gtk/gtkcalendar.c:538
+#: ../gtk/gtkcalendar.c:535
 msgid "If TRUE, day names are displayed"
 msgstr "La activare, sunt afișate numele zilelor"
 
-#: gtk/gtkcalendar.c:551
+#: ../gtk/gtkcalendar.c:548
 msgid "No Month Change"
 msgstr "Fără schimbarea lunii"
 
-#: gtk/gtkcalendar.c:552
+#: ../gtk/gtkcalendar.c:549
 msgid "If TRUE, the selected month cannot be changed"
 msgstr "La activare, luna selectată nu poate fi schimbată"
 
-#: gtk/gtkcalendar.c:566
+#: ../gtk/gtkcalendar.c:563
 msgid "Show Week Numbers"
 msgstr "Arată numerele săptămânilor"
 
-#: gtk/gtkcalendar.c:567
+#: ../gtk/gtkcalendar.c:564
 msgid "If TRUE, week numbers are displayed"
 msgstr "La activare, sunt afișare numerele săptămânilor"
 
-#: gtk/gtkcalendar.c:582
+#: ../gtk/gtkcalendar.c:579
 msgid "Details Width"
 msgstr "Lățime detalii"
 
-#: gtk/gtkcalendar.c:583
+#: ../gtk/gtkcalendar.c:580
 msgid "Details width in characters"
 msgstr "Lățimea detaliilor în caractere"
 
-#: gtk/gtkcalendar.c:598
+#: ../gtk/gtkcalendar.c:595
 msgid "Details Height"
 msgstr "Înălțime detalii"
 
-#: gtk/gtkcalendar.c:599
+#: ../gtk/gtkcalendar.c:596
 msgid "Details height in rows"
 msgstr "Înălțimea detaliilor în rânduri"
 
-#: gtk/gtkcalendar.c:615
+#: ../gtk/gtkcalendar.c:612
 msgid "Show Details"
 msgstr "Arată detalii"
 
-#: gtk/gtkcalendar.c:616
+#: ../gtk/gtkcalendar.c:613
 msgid "If TRUE, details are shown"
 msgstr "La activare, se arată detaliile"
 
-#: gtk/gtkcalendar.c:628
+#: ../gtk/gtkcalendar.c:625
 msgid "Inner border"
 msgstr "Margine interioară"
 
-#: gtk/gtkcalendar.c:629
+#: ../gtk/gtkcalendar.c:626
 msgid "Inner border space"
 msgstr "Spațiu margine interioară"
 
-#: gtk/gtkcalendar.c:640
+#: ../gtk/gtkcalendar.c:637
 msgid "Vertical separation"
 msgstr "Separare verticală"
 
-#: gtk/gtkcalendar.c:641
+#: ../gtk/gtkcalendar.c:638
 msgid "Space between day headers and main area"
 msgstr "Spațiere între antetul zilelor și zona principală"
 
-#: gtk/gtkcalendar.c:652
+#: ../gtk/gtkcalendar.c:649
 msgid "Horizontal separation"
 msgstr "Separare orizontală"
 
-#: gtk/gtkcalendar.c:653
+#: ../gtk/gtkcalendar.c:650
 msgid "Space between week headers and main area"
 msgstr "Spațiere între antetul săptămânilor și zona principală"
 
-#: gtk/gtkcelleditable.c:53
+#: ../gtk/gtkcelleditable.c:53
 msgid "Editing Canceled"
 msgstr "Editarea a fost anulată"
 
-#: gtk/gtkcelleditable.c:54
+#: ../gtk/gtkcelleditable.c:54
 msgid "Indicates that editing has been canceled"
 msgstr "Indică anularea editării"
 
-#: gtk/gtkcellrendereraccel.c:138
+#: ../gtk/gtkcellrendereraccel.c:138
 msgid "Accelerator key"
 msgstr "Cheie accelerator"
 
-#: gtk/gtkcellrendereraccel.c:139
+#: ../gtk/gtkcellrendereraccel.c:139
 msgid "The keyval of the accelerator"
 msgstr "Valuarea-cheie a acceleratorului"
 
-#: gtk/gtkcellrendereraccel.c:155
+#: ../gtk/gtkcellrendereraccel.c:155
 msgid "Accelerator modifiers"
 msgstr "Modificatori accelerator"
 
-#: gtk/gtkcellrendereraccel.c:156
+#: ../gtk/gtkcellrendereraccel.c:156
 msgid "The modifier mask of the accelerator"
 msgstr "Masca modificatorului acceleratorului"
 
-#: gtk/gtkcellrendereraccel.c:173
+#: ../gtk/gtkcellrendereraccel.c:173
 msgid "Accelerator keycode"
 msgstr "Cod-cheie accelerator"
 
-#: gtk/gtkcellrendereraccel.c:174
+#: ../gtk/gtkcellrendereraccel.c:174
 msgid "The hardware keycode of the accelerator"
 msgstr "Codul-cheie hardware al acceleratorului"
 
-#: gtk/gtkcellrendereraccel.c:193
+#: ../gtk/gtkcellrendereraccel.c:193
 msgid "Accelerator Mode"
 msgstr "Mod accelerator"
 
-#: gtk/gtkcellrendereraccel.c:194
+#: ../gtk/gtkcellrendereraccel.c:194
 msgid "The type of accelerators"
 msgstr "Tip de acceleratori"
 
-#: gtk/gtkcellrenderer.c:226
+#: ../gtk/gtkcellrenderer.c:266
 msgid "mode"
 msgstr "mod"
 
-#: gtk/gtkcellrenderer.c:227
+#: ../gtk/gtkcellrenderer.c:267
 msgid "Editable mode of the CellRenderer"
 msgstr "Mod editabil pentru CellRenderer"
 
-#: gtk/gtkcellrenderer.c:235
+#: ../gtk/gtkcellrenderer.c:275
 msgid "visible"
 msgstr "vizibil"
 
-#: gtk/gtkcellrenderer.c:236
+#: ../gtk/gtkcellrenderer.c:276
 msgid "Display the cell"
 msgstr "Arată celula"
 
-#: gtk/gtkcellrenderer.c:243
+#: ../gtk/gtkcellrenderer.c:283
 msgid "Display the cell sensitive"
 msgstr "Arată celula (majuscule semnificative)"
 
-#: gtk/gtkcellrenderer.c:250
+#: ../gtk/gtkcellrenderer.c:290
 msgid "xalign"
 msgstr "xaliniere"
 
-#: gtk/gtkcellrenderer.c:251
+#: ../gtk/gtkcellrenderer.c:291
 msgid "The x-align"
 msgstr "Alinierea X"
 
-#: gtk/gtkcellrenderer.c:260
+#: ../gtk/gtkcellrenderer.c:300
 msgid "yalign"
 msgstr "yaliniere"
 
-#: gtk/gtkcellrenderer.c:261
+#: ../gtk/gtkcellrenderer.c:301
 msgid "The y-align"
 msgstr "Alinierea Y"
 
-#: gtk/gtkcellrenderer.c:270
+#: ../gtk/gtkcellrenderer.c:310
 msgid "xpad"
 msgstr "xpad"
 
-#: gtk/gtkcellrenderer.c:271
+#: ../gtk/gtkcellrenderer.c:311
 msgid "The xpad"
 msgstr "xpad-ul"
 
-#: gtk/gtkcellrenderer.c:280
+#: ../gtk/gtkcellrenderer.c:320
 msgid "ypad"
 msgstr "ypad"
 
-#: gtk/gtkcellrenderer.c:281
+#: ../gtk/gtkcellrenderer.c:321
 msgid "The ypad"
 msgstr "ypad-ul"
 
-#: gtk/gtkcellrenderer.c:290
+#: ../gtk/gtkcellrenderer.c:330
 msgid "width"
 msgstr "lățime"
 
-#: gtk/gtkcellrenderer.c:291
+#: ../gtk/gtkcellrenderer.c:331
 msgid "The fixed width"
 msgstr "Lățimea fixă"
 
-#: gtk/gtkcellrenderer.c:300
+#: ../gtk/gtkcellrenderer.c:340
 msgid "height"
 msgstr "înălțime"
 
-#: gtk/gtkcellrenderer.c:301
+#: ../gtk/gtkcellrenderer.c:341
 msgid "The fixed height"
 msgstr "Înălțimea fixă"
 
-#: gtk/gtkcellrenderer.c:310
+#: ../gtk/gtkcellrenderer.c:350
 msgid "Is Expander"
 msgstr "Se poate desfășura"
 
-#: gtk/gtkcellrenderer.c:311
+#: ../gtk/gtkcellrenderer.c:351
 msgid "Row has children"
 msgstr "Rândul are copii"
 
-#: gtk/gtkcellrenderer.c:319
+#: ../gtk/gtkcellrenderer.c:359
 msgid "Is Expanded"
 msgstr "Este desfășurat"
 
-#: gtk/gtkcellrenderer.c:320
+#: ../gtk/gtkcellrenderer.c:360
 msgid "Row is an expander row, and is expanded"
 msgstr "Rândul se poate desfășura și a fost desfășurat"
 
-#: gtk/gtkcellrenderer.c:327
+#: ../gtk/gtkcellrenderer.c:367
 msgid "Cell background color name"
 msgstr "Numele culorii de fundal al celulei"
 
-#: gtk/gtkcellrenderer.c:328
+#: ../gtk/gtkcellrenderer.c:368
 msgid "Cell background color as a string"
 msgstr "Culoarea fundalului celulei ca șir de caractere"
 
-#: gtk/gtkcellrenderer.c:335
+#: ../gtk/gtkcellrenderer.c:375
 msgid "Cell background color"
 msgstr "Culoare fundal celulă"
 
-#: gtk/gtkcellrenderer.c:336
+#: ../gtk/gtkcellrenderer.c:376
 msgid "Cell background color as a GdkColor"
-msgstr "Culoare fundalului celulei ca GdkColor"
+msgstr "Culoarea fundalului celulei ca GdkColor"
+
+#: ../gtk/gtkcellrenderer.c:389
+msgid "Cell background RGBA color"
+msgstr "Culoare RGBA fundal celulă"
 
-#: gtk/gtkcellrenderer.c:343
+#: ../gtk/gtkcellrenderer.c:390
+msgid "Cell background color as a GdkRGBA"
+msgstr "Culoarea fundalului celulei ca GdkColor"
+
+#: ../gtk/gtkcellrenderer.c:397
 msgid "Editing"
 msgstr "În editare"
 
-#: gtk/gtkcellrenderer.c:344
+#: ../gtk/gtkcellrenderer.c:398
 msgid "Whether the cell renderer is currently in editing mode"
 msgstr "Specifică dacă afișarea celulei este în modul de editare"
 
-#: gtk/gtkcellrenderer.c:352
+#: ../gtk/gtkcellrenderer.c:406
 msgid "Cell background set"
 msgstr "Set fundal celulă"
 
-#: gtk/gtkcellrenderer.c:353
+#: ../gtk/gtkcellrenderer.c:407
 msgid "Whether this tag affects the cell background color"
 msgstr "Specifică dacă această etichetă afectează culoarea fundalului celulei"
 
-#: gtk/gtkcellrenderercombo.c:110
+#: ../gtk/gtkcellrenderercombo.c:109
 msgid "Model"
 msgstr "Model"
 
-#: gtk/gtkcellrenderercombo.c:111
+#: ../gtk/gtkcellrenderercombo.c:110
 msgid "The model containing the possible values for the combo box"
-msgstr "Model conținând valorile posibile pentru acest „combo box”"
+msgstr "Model conținând valorile posibile pentru această listă de selecție"
 
-#: gtk/gtkcellrenderercombo.c:133 gtk/gtkcomboboxentry.c:104
+#: ../gtk/gtkcellrenderercombo.c:132
 msgid "Text Column"
 msgstr "Coloană text"
 
-#: gtk/gtkcellrenderercombo.c:134 gtk/gtkcomboboxentry.c:105
+#: ../gtk/gtkcellrenderercombo.c:133
 msgid "A column in the data source model to get the strings from"
 msgstr "O coloană în modelul sursei de date din care se obțin datele"
 
-#: gtk/gtkcellrenderercombo.c:151
+#: ../gtk/gtkcellrenderercombo.c:150 ../gtk/gtkcombobox.c:928
 msgid "Has Entry"
 msgstr "Are intrare"
 
-#: gtk/gtkcellrenderercombo.c:152
+#: ../gtk/gtkcellrenderercombo.c:151
 msgid "If FALSE, don't allow to enter strings other than the chosen ones"
 msgstr "La activare, permite introducerea altor șiruri decât a celor precizate"
 
-#: gtk/gtkcellrendererpixbuf.c:120
+#: ../gtk/gtkcellrendererpixbuf.c:120
 msgid "Pixbuf Object"
 msgstr "Obiect pixbuf"
 
-#: gtk/gtkcellrendererpixbuf.c:121
+#: ../gtk/gtkcellrendererpixbuf.c:121
 msgid "The pixbuf to render"
 msgstr "Pixbuf de randat"
 
-#: gtk/gtkcellrendererpixbuf.c:128
+#: ../gtk/gtkcellrendererpixbuf.c:128
 msgid "Pixbuf Expander Open"
 msgstr "Desfășurător pixbuf deschis"
 
-#: gtk/gtkcellrendererpixbuf.c:129
+#: ../gtk/gtkcellrendererpixbuf.c:129
 msgid "Pixbuf for open expander"
 msgstr "Pixbuf pentru desfășurător deschis"
 
-#: gtk/gtkcellrendererpixbuf.c:136
+#: ../gtk/gtkcellrendererpixbuf.c:136
 msgid "Pixbuf Expander Closed"
 msgstr "Desfășurător pixbuf închis"
 
-#: gtk/gtkcellrendererpixbuf.c:137
+#: ../gtk/gtkcellrendererpixbuf.c:137
 msgid "Pixbuf for closed expander"
 msgstr "Pixbuf pentru desfășurător închis"
 
-#: gtk/gtkcellrendererpixbuf.c:144 gtk/gtkimage.c:244 gtk/gtkstatusicon.c:228
+#: ../gtk/gtkcellrendererpixbuf.c:144 ../gtk/gtkimage.c:250
+#: ../gtk/gtkstatusicon.c:228
 msgid "Stock ID"
 msgstr "ID standard"
 
-#: gtk/gtkcellrendererpixbuf.c:145
+#: ../gtk/gtkcellrendererpixbuf.c:145
 msgid "The stock ID of the stock icon to render"
 msgstr "ID-ul standard al iconiței implicite de afișat"
 
-#: gtk/gtkcellrendererpixbuf.c:152 gtk/gtkcellrendererspinner.c:153
-#: gtk/gtkrecentmanager.c:305 gtk/gtkstatusicon.c:269
+#: ../gtk/gtkcellrendererpixbuf.c:152 ../gtk/gtkcellrendererspinner.c:153
+#: ../gtk/gtkrecentmanager.c:309 ../gtk/gtkstatusicon.c:269
 msgid "Size"
 msgstr "Mărime"
 
-#: gtk/gtkcellrendererpixbuf.c:153
+#: ../gtk/gtkcellrendererpixbuf.c:153
 msgid "The GtkIconSize value that specifies the size of the rendered icon"
 msgstr "Valoarea GtkIconSize ce specifică mărimea iconiței afișate"
 
-#: gtk/gtkcellrendererpixbuf.c:162
+#: ../gtk/gtkcellrendererpixbuf.c:162
 msgid "Detail"
 msgstr "Detaliu"
 
-#: gtk/gtkcellrendererpixbuf.c:163
+#: ../gtk/gtkcellrendererpixbuf.c:163
 msgid "Render detail to pass to the theme engine"
 msgstr "Detaliu de afișare de transmis motorului de teme"
 
-#: gtk/gtkcellrendererpixbuf.c:196
+#: ../gtk/gtkcellrendererpixbuf.c:196
 msgid "Follow State"
 msgstr "Stare semnificativă"
 
-#: gtk/gtkcellrendererpixbuf.c:197
+#: ../gtk/gtkcellrendererpixbuf.c:197
 msgid "Whether the rendered pixbuf should be colorized according to the state"
 msgstr ""
 "Specifică dacă un „pixbuf” randat ar trebui să fie colorat în funcție de "
 "stare"
 
-#: gtk/gtkcellrendererpixbuf.c:214 gtk/gtkimage.c:319 gtk/gtkwindow.c:662
+#: ../gtk/gtkcellrendererpixbuf.c:214 ../gtk/gtkimage.c:325
+#: ../gtk/gtkwindow.c:710
 msgid "Icon"
 msgstr "Iconiță"
 
-#: gtk/gtkcellrendererprogress.c:127
+#: ../gtk/gtkcellrendererprogress.c:127
 msgid "Value of the progress bar"
 msgstr "Valoarea barei de progres"
 
-#: 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:144 ../gtk/gtkcellrenderertext.c:247
+#: ../gtk/gtkentry.c:829 ../gtk/gtkentrybuffer.c:352
+#: ../gtk/gtkmessagedialog.c:226 ../gtk/gtkprogressbar.c:177
+#: ../gtk/gtktextbuffer.c:209
 msgid "Text"
 msgstr "Text"
 
-#: gtk/gtkcellrendererprogress.c:145
+#: ../gtk/gtkcellrendererprogress.c:145
 msgid "Text on the progress bar"
 msgstr "Text în bara de progres"
 
-#: gtk/gtkcellrendererprogress.c:168 gtk/gtkcellrendererspinner.c:139
+#: ../gtk/gtkcellrendererprogress.c:168 ../gtk/gtkcellrendererspinner.c:139
 msgid "Pulse"
 msgstr "Puls"
 
-#: gtk/gtkcellrendererprogress.c:169
+#: ../gtk/gtkcellrendererprogress.c:169
 msgid ""
 "Set this to positive values to indicate that some progress is made, but you "
 "don't know how much."
@@ -1383,11 +1378,11 @@ msgstr ""
 "Se setează valori pozitive pentru a indica un anumit progres atunci când nu "
 "se știe în ce măsură se progresează"
 
-#: gtk/gtkcellrendererprogress.c:185
+#: ../gtk/gtkcellrendererprogress.c:185
 msgid "Text x alignment"
 msgstr "Aliniere X a textului"
 
-#: gtk/gtkcellrendererprogress.c:186
+#: ../gtk/gtkcellrendererprogress.c:186
 msgid ""
 "The horizontal text alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
@@ -1395,233 +1390,251 @@ msgstr ""
 "Alinierea orizontală a textului, de la 0 (stânga) la 1 (dreapta). Invers "
 "pentru aranjamente RTL."
 
-#: gtk/gtkcellrendererprogress.c:202
+#: ../gtk/gtkcellrendererprogress.c:202
 msgid "Text y alignment"
 msgstr "Aliniere Y a textului"
 
-#: gtk/gtkcellrendererprogress.c:203
+#: ../gtk/gtkcellrendererprogress.c:203
 msgid "The vertical text alignment, from 0 (top) to 1 (bottom)."
 msgstr "Alinierea verticală a textului, de la 0 (sus) la 1 (jos)"
 
-#: gtk/gtkcellrendererprogress.c:214 gtk/gtkprogressbar.c:126
-#: gtk/gtkrange.c:427
+#: ../gtk/gtkcellrendererprogress.c:214 ../gtk/gtkprogressbar.c:153
+#: ../gtk/gtkrange.c:440
 msgid "Inverted"
 msgstr "Inversat"
 
-#: gtk/gtkcellrendererprogress.c:215 gtk/gtkprogressbar.c:127
-#, fuzzy
+#: ../gtk/gtkcellrendererprogress.c:215 ../gtk/gtkprogressbar.c:154
 msgid "Invert the direction in which the progress bar grows"
-msgstr "Orientarea și direcția de creștere a barei de progres"
+msgstr "Inversează direcția în care bara de progres crește"
 
-#: gtk/gtkcellrendererspin.c:91 gtk/gtkrange.c:419 gtk/gtkscalebutton.c:239
-#: gtk/gtkspinbutton.c:228
+#: ../gtk/gtkcellrendererspin.c:91 ../gtk/gtkrange.c:432
+#: ../gtk/gtkscalebutton.c:239 ../gtk/gtkspinbutton.c:230
 msgid "Adjustment"
 msgstr "Ajustare"
 
-#: gtk/gtkcellrendererspin.c:92 gtk/gtkspinbutton.c:229
-#, fuzzy
+#: ../gtk/gtkcellrendererspin.c:92 ../gtk/gtkspinbutton.c:231
 msgid "The adjustment that holds the value of the spin button"
-msgstr "Ajustarea valorii butonului de incrementare”"
+msgstr "Ajustarea valorii butonului de incrementare"
 
-#: gtk/gtkcellrendererspin.c:107
+#: ../gtk/gtkcellrendererspin.c:107
 msgid "Climb rate"
 msgstr "Rată de creștere"
 
-#: gtk/gtkcellrendererspin.c:108 gtk/gtkspinbutton.c:237
+#: ../gtk/gtkcellrendererspin.c:108 ../gtk/gtkspinbutton.c:239
 msgid "The acceleration rate when you hold down a button"
 msgstr "Rata de accelerare la apăsarea prelungită a butonului"
 
-#: gtk/gtkcellrendererspin.c:121 gtk/gtkscale.c:244 gtk/gtkspinbutton.c:246
+#: ../gtk/gtkcellrendererspin.c:121 ../gtk/gtkscale.c:249
+#: ../gtk/gtkspinbutton.c:248
 msgid "Digits"
 msgstr "Cifre"
 
-#: gtk/gtkcellrendererspin.c:122 gtk/gtkspinbutton.c:247
+#: ../gtk/gtkcellrendererspin.c:122 ../gtk/gtkspinbutton.c:249
 msgid "The number of decimal places to display"
 msgstr "Numărul de zecimale de afișat"
 
-#: 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:105
+#: ../gtk/gtkmenu.c:521 ../gtk/gtkspinner.c:131 ../gtk/gtktoggleaction.c:133
+#: ../gtk/gtktogglebutton.c:125 ../gtk/gtktoggletoolbutton.c:112
 msgid "Active"
 msgstr "Activ"
 
-#: gtk/gtkcellrendererspinner.c:120
+#: ../gtk/gtkcellrendererspinner.c:120
 msgid "Whether the spinner is active (ie. shown) in the cell"
 msgstr "Specifică dacă spinnerul este activ (afișat) în celulă"
 
-#: gtk/gtkcellrendererspinner.c:140
+#: ../gtk/gtkcellrendererspinner.c:140
 msgid "Pulse of the spinner"
 msgstr "Pulsul spinnerului"
 
-#: gtk/gtkcellrendererspinner.c:154
+#: ../gtk/gtkcellrendererspinner.c:154
 msgid "The GtkIconSize value that specifies the size of the rendered spinner"
 msgstr "Valoarea GtkIconSize ce specifică mărimea spinnerului"
 
-#: gtk/gtkcellrenderertext.c:232
+#: ../gtk/gtkcellrenderertext.c:248
 msgid "Text to render"
 msgstr "Text de afișat"
 
-#: gtk/gtkcellrenderertext.c:239
+#: ../gtk/gtkcellrenderertext.c:255
 msgid "Markup"
 msgstr "Marcaj"
 
-#: gtk/gtkcellrenderertext.c:240
+#: ../gtk/gtkcellrenderertext.c:256
 msgid "Marked up text to render"
 msgstr "Text marcat de afișat"
 
-#: gtk/gtkcellrenderertext.c:247 gtk/gtklabel.c:556
+#: ../gtk/gtkcellrenderertext.c:263 ../gtk/gtklabel.c:574
 msgid "Attributes"
 msgstr "Atribute"
 
-#: gtk/gtkcellrenderertext.c:248
+#: ../gtk/gtkcellrenderertext.c:264
 msgid "A list of style attributes to apply to the text of the renderer"
 msgstr "O listă de atribute de stil pentru a fi aplicată textului afișării"
 
-#: gtk/gtkcellrenderertext.c:255
+#: ../gtk/gtkcellrenderertext.c:271
 msgid "Single Paragraph Mode"
 msgstr "Mod paragraf unic"
 
-#: gtk/gtkcellrenderertext.c:256
-#, fuzzy
+#: ../gtk/gtkcellrenderertext.c:272
 msgid "Whether to keep all text in a single paragraph"
 msgstr "Specifică dacă să se păstreze tot textul într-un singur paragraf"
 
-#: gtk/gtkcellrenderertext.c:264 gtk/gtkcellview.c:178 gtk/gtktexttag.c:178
+#: ../gtk/gtkcellrenderertext.c:280 ../gtk/gtkcellview.c:192
+#: ../gtk/gtktexttag.c:178
 msgid "Background color name"
 msgstr "Nume culoare fundal"
 
-#: gtk/gtkcellrenderertext.c:265 gtk/gtkcellview.c:179 gtk/gtktexttag.c:179
+#: ../gtk/gtkcellrenderertext.c:281 ../gtk/gtkcellview.c:193
+#: ../gtk/gtktexttag.c:179
 msgid "Background color as a string"
 msgstr "Culoare fundal ca șir de caractere"
 
-#: gtk/gtkcellrenderertext.c:272 gtk/gtkcellview.c:185 gtk/gtktexttag.c:186
+#: ../gtk/gtkcellrenderertext.c:288 ../gtk/gtkcellview.c:199
+#: ../gtk/gtktexttag.c:186
 msgid "Background color"
 msgstr "Culoare fundal"
 
-#: gtk/gtkcellrenderertext.c:273 gtk/gtkcellview.c:186
+#: ../gtk/gtkcellrenderertext.c:289 ../gtk/gtkcellview.c:200
 msgid "Background color as a GdkColor"
 msgstr "Culoare fundal ca GdkColor"
 
-#: gtk/gtkcellrenderertext.c:280 gtk/gtktexttag.c:202
+#: ../gtk/gtkcellrenderertext.c:303
+msgid "Background color as RGBA"
+msgstr "Culoare fundal ca RGBA"
+
+#: ../gtk/gtkcellrenderertext.c:304 ../gtk/gtkcellview.c:214
+msgid "Background color as a GdkRGBA"
+msgstr "Culoare fundal ca GdkRGBA"
+
+#: ../gtk/gtkcellrenderertext.c:310 ../gtk/gtktexttag.c:202
 msgid "Foreground color name"
 msgstr "Nume culoare prim-plan"
 
-#: gtk/gtkcellrenderertext.c:281 gtk/gtktexttag.c:203
+#: ../gtk/gtkcellrenderertext.c:311 ../gtk/gtktexttag.c:203
 msgid "Foreground color as a string"
 msgstr "Culoare prim-plan ca șir de caractere"
 
-#: gtk/gtkcellrenderertext.c:288 gtk/gtktexttag.c:210
-#: gtk/gtktrayicon-x11.c:133
+#: ../gtk/gtkcellrenderertext.c:318 ../gtk/gtktexttag.c:210
+#: ../gtk/gtktrayicon-x11.c:133
 msgid "Foreground color"
 msgstr "Culoare prim-plan"
 
-#: gtk/gtkcellrenderertext.c:289
+#: ../gtk/gtkcellrenderertext.c:319
 msgid "Foreground color as a GdkColor"
 msgstr "Culoare prim-plan ca GdkColor"
 
-#: gtk/gtkcellrenderertext.c:297 gtk/gtkentry.c:663 gtk/gtktexttag.c:227
-#: gtk/gtktextview.c:668
+#: ../gtk/gtkcellrenderertext.c:333
+msgid "Foreground color as RGBA"
+msgstr "Culoare prim-plan ca RGBA"
+
+#: ../gtk/gtkcellrenderertext.c:334
+msgid "Foreground color as a GdkRGBA"
+msgstr "Culoare prim-plan ca GdkRGBA"
+
+#: ../gtk/gtkcellrenderertext.c:342 ../gtk/gtkentry.c:753
+#: ../gtk/gtktexttag.c:227 ../gtk/gtktextview.c:686
 msgid "Editable"
 msgstr "Editabil"
 
-#: gtk/gtkcellrenderertext.c:298 gtk/gtktexttag.c:228 gtk/gtktextview.c:669
+#: ../gtk/gtkcellrenderertext.c:343 ../gtk/gtktexttag.c:228
+#: ../gtk/gtktextview.c:687
 msgid "Whether the text can be modified by the user"
 msgstr "Specifică dacă textul poate fi modificat de utilizator"
 
-#: gtk/gtkcellrenderertext.c:305 gtk/gtkcellrenderertext.c:313
-#: gtk/gtktexttag.c:243 gtk/gtktexttag.c:251
+#: ../gtk/gtkcellrenderertext.c:350 ../gtk/gtkcellrenderertext.c:358
+#: ../gtk/gtktexttag.c:243 ../gtk/gtktexttag.c:251
 msgid "Font"
 msgstr "Font"
 
-#: gtk/gtkcellrenderertext.c:306 gtk/gtktexttag.c:244
+#: ../gtk/gtkcellrenderertext.c:351 ../gtk/gtktexttag.c:244
 msgid "Font description as a string, e.g. \"Sans Italic 12\""
 msgstr "Descrierea fontului ca șir (de ex. „Sans Italic 12”)"
 
-#: gtk/gtkcellrenderertext.c:314 gtk/gtktexttag.c:252
+#: ../gtk/gtkcellrenderertext.c:359 ../gtk/gtktexttag.c:252
 msgid "Font description as a PangoFontDescription struct"
 msgstr "Descrierea fontului ca structură PangoFontDescription"
 
-#: gtk/gtkcellrenderertext.c:322 gtk/gtktexttag.c:259
+#: ../gtk/gtkcellrenderertext.c:367 ../gtk/gtktexttag.c:259
 msgid "Font family"
 msgstr "Familie font"
 
-#: gtk/gtkcellrenderertext.c:323 gtk/gtktexttag.c:260
+#: ../gtk/gtkcellrenderertext.c:368 ../gtk/gtktexttag.c:260
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "Numele familiei de fonturi (de ex. Sans, Helvetica, Times, Monospace)"
 
-#: gtk/gtkcellrenderertext.c:330 gtk/gtkcellrenderertext.c:331
-#: gtk/gtktexttag.c:267
+#: ../gtk/gtkcellrenderertext.c:375 ../gtk/gtkcellrenderertext.c:376
+#: ../gtk/gtktexttag.c:267
 msgid "Font style"
 msgstr "Stil font"
 
-#: gtk/gtkcellrenderertext.c:339 gtk/gtkcellrenderertext.c:340
-#: gtk/gtktexttag.c:276
+#: ../gtk/gtkcellrenderertext.c:384 ../gtk/gtkcellrenderertext.c:385
+#: ../gtk/gtktexttag.c:276
 msgid "Font variant"
 msgstr "Variantă font"
 
-#: gtk/gtkcellrenderertext.c:348 gtk/gtkcellrenderertext.c:349
-#: gtk/gtktexttag.c:285
+#: ../gtk/gtkcellrenderertext.c:393 ../gtk/gtkcellrenderertext.c:394
+#: ../gtk/gtktexttag.c:285
 msgid "Font weight"
 msgstr "Grosime font"
 
-#: gtk/gtkcellrenderertext.c:358 gtk/gtkcellrenderertext.c:359
-#: gtk/gtktexttag.c:296
+#: ../gtk/gtkcellrenderertext.c:403 ../gtk/gtkcellrenderertext.c:404
+#: ../gtk/gtktexttag.c:296
 msgid "Font stretch"
 msgstr "Întindere font"
 
-#: gtk/gtkcellrenderertext.c:367 gtk/gtkcellrenderertext.c:368
-#: gtk/gtktexttag.c:305
+#: ../gtk/gtkcellrenderertext.c:412 ../gtk/gtkcellrenderertext.c:413
+#: ../gtk/gtktexttag.c:305
 msgid "Font size"
 msgstr "Mărime font"
 
-#: gtk/gtkcellrenderertext.c:377 gtk/gtktexttag.c:325
+#: ../gtk/gtkcellrenderertext.c:422 ../gtk/gtktexttag.c:325
 msgid "Font points"
 msgstr "Puncte font"
 
-#: gtk/gtkcellrenderertext.c:378 gtk/gtktexttag.c:326
+#: ../gtk/gtkcellrenderertext.c:423 ../gtk/gtktexttag.c:326
 msgid "Font size in points"
 msgstr "Mărime font în puncte"
 
-#: gtk/gtkcellrenderertext.c:387 gtk/gtktexttag.c:315
+#: ../gtk/gtkcellrenderertext.c:432 ../gtk/gtktexttag.c:315
 msgid "Font scale"
 msgstr "Scară font"
 
-#: gtk/gtkcellrenderertext.c:388
+#: ../gtk/gtkcellrenderertext.c:433
 msgid "Font scaling factor"
 msgstr "Factor de scalare"
 
-#: gtk/gtkcellrenderertext.c:397 gtk/gtktexttag.c:394
+#: ../gtk/gtkcellrenderertext.c:442 ../gtk/gtktexttag.c:394
 msgid "Rise"
 msgstr "Elevație"
 
-#: gtk/gtkcellrenderertext.c:398
+#: ../gtk/gtkcellrenderertext.c:443
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative)"
 msgstr ""
 "Deplasare a textului deasupra liniei de bază (dedesubt dacă valoarea este "
 "negativă)"
 
-#: gtk/gtkcellrenderertext.c:409 gtk/gtktexttag.c:434
+#: ../gtk/gtkcellrenderertext.c:454 ../gtk/gtktexttag.c:434
 msgid "Strikethrough"
 msgstr "Tăiere"
 
-#: gtk/gtkcellrenderertext.c:410 gtk/gtktexttag.c:435
+#: ../gtk/gtkcellrenderertext.c:455 ../gtk/gtktexttag.c:435
 msgid "Whether to strike through the text"
 msgstr "Specifică dacă textul să fie tăiat"
 
-#: gtk/gtkcellrenderertext.c:417 gtk/gtktexttag.c:442
+#: ../gtk/gtkcellrenderertext.c:462 ../gtk/gtktexttag.c:442
 msgid "Underline"
 msgstr "Subliniere"
 
-#: gtk/gtkcellrenderertext.c:418 gtk/gtktexttag.c:443
+#: ../gtk/gtkcellrenderertext.c:463 ../gtk/gtktexttag.c:443
 msgid "Style of underline for this text"
 msgstr "Stil de subliniere"
 
-#: gtk/gtkcellrenderertext.c:426 gtk/gtktexttag.c:354
+#: ../gtk/gtkcellrenderertext.c:471 ../gtk/gtktexttag.c:354
 msgid "Language"
 msgstr "Limbă"
 
-#: gtk/gtkcellrenderertext.c:427
+#: ../gtk/gtkcellrenderertext.c:472
 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 +1644,12 @@ msgstr ""
 "sugestie la afișarea textului. Dacă nu înțelegeți acest parametru, înseamnă "
 "că probabil nu aveți nevoie de el"
 
-#: gtk/gtkcellrenderertext.c:447 gtk/gtklabel.c:681 gtk/gtkprogressbar.c:180
+#: ../gtk/gtkcellrenderertext.c:492 ../gtk/gtklabel.c:699
+#: ../gtk/gtkprogressbar.c:207
 msgid "Ellipsize"
 msgstr "Prescurtare"
 
-#: gtk/gtkcellrenderertext.c:448
+#: ../gtk/gtkcellrenderertext.c:493
 msgid ""
 "The preferred place to ellipsize the string, if the cell renderer does not "
 "have enough room to display the entire string"
@@ -1643,29 +1657,28 @@ msgstr ""
 "Felul preferat de a prescurta un șir de caractere, dacă nu există destul loc "
 "în celulă pentru a afișa întregul șir"
 
-#: gtk/gtkcellrenderertext.c:467 gtk/gtkfilechooserbutton.c:413
-#: gtk/gtklabel.c:702
+#: ../gtk/gtkcellrenderertext.c:512 ../gtk/gtkfilechooserbutton.c:411
+#: ../gtk/gtklabel.c:720
 msgid "Width In Characters"
 msgstr "Lățime în caractere"
 
-#: gtk/gtkcellrenderertext.c:468 gtk/gtklabel.c:703
+#: ../gtk/gtkcellrenderertext.c:513 ../gtk/gtklabel.c:721
 msgid "The desired width of the label, in characters"
 msgstr "Lățimea dorită a etichetei, în caractere"
 
-#: gtk/gtkcellrenderertext.c:492 gtk/gtklabel.c:763
+#: ../gtk/gtkcellrenderertext.c:537 ../gtk/gtklabel.c:781
 msgid "Maximum Width In Characters"
 msgstr "Lățime maximă în caractere"
 
-#: gtk/gtkcellrenderertext.c:493
-#, fuzzy
+#: ../gtk/gtkcellrenderertext.c:538
 msgid "The maximum width of the cell, in characters"
-msgstr "Lățimea maximă dorită pentru etichetă, în caractere"
+msgstr "Lățimea maximă dorită pentru celulă, în caractere"
 
-#: gtk/gtkcellrenderertext.c:511 gtk/gtktexttag.c:451
+#: ../gtk/gtkcellrenderertext.c:556 ../gtk/gtktexttag.c:451
 msgid "Wrap mode"
 msgstr "Mod formatare"
 
-#: gtk/gtkcellrenderertext.c:512
+#: ../gtk/gtkcellrenderertext.c:557
 msgid ""
 "How to break the string into multiple lines, if the cell renderer does not "
 "have enough room to display the entire string"
@@ -1673,400 +1686,412 @@ msgstr ""
 "Felul de a rupe un șir de caractere dacă nu există destul loc în celulă "
 "pentru a afișa întregul șir pe o singură linie"
 
-#: gtk/gtkcellrenderertext.c:531 gtk/gtkcombobox.c:700
+#: ../gtk/gtkcellrenderertext.c:576 ../gtk/gtkcombobox.c:750
 msgid "Wrap width"
 msgstr "Lățime maximă"
 
-#: gtk/gtkcellrenderertext.c:532
+#: ../gtk/gtkcellrenderertext.c:577
 msgid "The width at which the text is wrapped"
 msgstr "Lățimea la care se rup rândurile"
 
-#: gtk/gtkcellrenderertext.c:552 gtk/gtktreeviewcolumn.c:301
+#: ../gtk/gtkcellrenderertext.c:597 ../gtk/gtktreeviewcolumn.c:319
 msgid "Alignment"
 msgstr "Aliniere"
 
-#: gtk/gtkcellrenderertext.c:553
+#: ../gtk/gtkcellrenderertext.c:598
 msgid "How to align the lines"
 msgstr "Mod de aliniere a liniilor"
 
-#: gtk/gtkcellrenderertext.c:565 gtk/gtkcellview.c:208 gtk/gtktexttag.c:540
+#: ../gtk/gtkcellrenderertext.c:610 ../gtk/gtkcellview.c:236
+#: ../gtk/gtktexttag.c:540
 msgid "Background set"
 msgstr "Setare fundal"
 
-#: gtk/gtkcellrenderertext.c:566 gtk/gtkcellview.c:209 gtk/gtktexttag.c:541
+#: ../gtk/gtkcellrenderertext.c:611 ../gtk/gtkcellview.c:237
+#: ../gtk/gtktexttag.c:541
 msgid "Whether this tag affects the background color"
 msgstr "Specifică dacă această etichetă afectează culoarea fundalului"
 
-#: gtk/gtkcellrenderertext.c:569 gtk/gtktexttag.c:548
+#: ../gtk/gtkcellrenderertext.c:614 ../gtk/gtktexttag.c:548
 msgid "Foreground set"
 msgstr "Setare prim-plan"
 
-#: gtk/gtkcellrenderertext.c:570 gtk/gtktexttag.c:549
+#: ../gtk/gtkcellrenderertext.c:615 ../gtk/gtktexttag.c:549
 msgid "Whether this tag affects the foreground color"
 msgstr "Specifică dacă această etichetă afectează culoarea textului"
 
-#: gtk/gtkcellrenderertext.c:573 gtk/gtktexttag.c:552
+#: ../gtk/gtkcellrenderertext.c:618 ../gtk/gtktexttag.c:552
 msgid "Editability set"
 msgstr "Setare posibilitate de editare"
 
-#: gtk/gtkcellrenderertext.c:574 gtk/gtktexttag.c:553
+#: ../gtk/gtkcellrenderertext.c:619 ../gtk/gtktexttag.c:553
 msgid "Whether this tag affects text editability"
 msgstr ""
 "Specifică dacă această etichetă afectează posibilitatea editării textului"
 
-#: gtk/gtkcellrenderertext.c:577 gtk/gtktexttag.c:556
+#: ../gtk/gtkcellrenderertext.c:622 ../gtk/gtktexttag.c:556
 msgid "Font family set"
 msgstr "Setare familie font"
 
-#: gtk/gtkcellrenderertext.c:578 gtk/gtktexttag.c:557
+#: ../gtk/gtkcellrenderertext.c:623 ../gtk/gtktexttag.c:557
 msgid "Whether this tag affects the font family"
 msgstr "Specifică dacă această etichetă afectează familia fontului"
 
-#: gtk/gtkcellrenderertext.c:581 gtk/gtktexttag.c:560
+#: ../gtk/gtkcellrenderertext.c:626 ../gtk/gtktexttag.c:560
 msgid "Font style set"
 msgstr "Setare stil font"
 
-#: gtk/gtkcellrenderertext.c:582 gtk/gtktexttag.c:561
+#: ../gtk/gtkcellrenderertext.c:627 ../gtk/gtktexttag.c:561
 msgid "Whether this tag affects the font style"
 msgstr "Specifică dacă această etichetă afectează stilul fontului"
 
-#: gtk/gtkcellrenderertext.c:585 gtk/gtktexttag.c:564
+#: ../gtk/gtkcellrenderertext.c:630 ../gtk/gtktexttag.c:564
 msgid "Font variant set"
 msgstr "Setare variantă font"
 
-#: gtk/gtkcellrenderertext.c:586 gtk/gtktexttag.c:565
+#: ../gtk/gtkcellrenderertext.c:631 ../gtk/gtktexttag.c:565
 msgid "Whether this tag affects the font variant"
 msgstr "Specifică dacă această etichetă afectează varianta fontului"
 
-#: gtk/gtkcellrenderertext.c:589 gtk/gtktexttag.c:568
+#: ../gtk/gtkcellrenderertext.c:634 ../gtk/gtktexttag.c:568
 msgid "Font weight set"
 msgstr "Setare grosime font"
 
-#: gtk/gtkcellrenderertext.c:590 gtk/gtktexttag.c:569
+#: ../gtk/gtkcellrenderertext.c:635 ../gtk/gtktexttag.c:569
 msgid "Whether this tag affects the font weight"
 msgstr "Specifică dacă această etichetă afectează grosimea fontului"
 
-#: gtk/gtkcellrenderertext.c:593 gtk/gtktexttag.c:572
+#: ../gtk/gtkcellrenderertext.c:638 ../gtk/gtktexttag.c:572
 msgid "Font stretch set"
 msgstr "Setare întindere font"
 
-#: gtk/gtkcellrenderertext.c:594 gtk/gtktexttag.c:573
+#: ../gtk/gtkcellrenderertext.c:639 ../gtk/gtktexttag.c:573
 msgid "Whether this tag affects the font stretch"
 msgstr "Specifică dacă această etichetă afectează întinderea fontului"
 
-#: gtk/gtkcellrenderertext.c:597 gtk/gtktexttag.c:576
+#: ../gtk/gtkcellrenderertext.c:642 ../gtk/gtktexttag.c:576
 msgid "Font size set"
 msgstr "Setare mărime font"
 
-#: gtk/gtkcellrenderertext.c:598 gtk/gtktexttag.c:577
+#: ../gtk/gtkcellrenderertext.c:643 ../gtk/gtktexttag.c:577
 msgid "Whether this tag affects the font size"
 msgstr "Specifică dacă această etichetă afectează mărimea fontului"
 
-#: gtk/gtkcellrenderertext.c:601 gtk/gtktexttag.c:580
+#: ../gtk/gtkcellrenderertext.c:646 ../gtk/gtktexttag.c:580
 msgid "Font scale set"
 msgstr "Setare scalare font"
 
-#: gtk/gtkcellrenderertext.c:602 gtk/gtktexttag.c:581
+#: ../gtk/gtkcellrenderertext.c:647 ../gtk/gtktexttag.c:581
 msgid "Whether this tag scales the font size by a factor"
 msgstr ""
 "Specifică dacă această etichetă scalează mărimea fontului cu un anumit factor"
 
-#: gtk/gtkcellrenderertext.c:605 gtk/gtktexttag.c:600
+#: ../gtk/gtkcellrenderertext.c:650 ../gtk/gtktexttag.c:600
 msgid "Rise set"
 msgstr "Setare elevație"
 
-#: gtk/gtkcellrenderertext.c:606 gtk/gtktexttag.c:601
+#: ../gtk/gtkcellrenderertext.c:651 ../gtk/gtktexttag.c:601
 msgid "Whether this tag affects the rise"
 msgstr "Specifică dacă această etichetă afectează elevația"
 
-#: gtk/gtkcellrenderertext.c:609 gtk/gtktexttag.c:616
+#: ../gtk/gtkcellrenderertext.c:654 ../gtk/gtktexttag.c:616
 msgid "Strikethrough set"
 msgstr "Setare tăiere"
 
-#: gtk/gtkcellrenderertext.c:610 gtk/gtktexttag.c:617
+#: ../gtk/gtkcellrenderertext.c:655 ../gtk/gtktexttag.c:617
 msgid "Whether this tag affects strikethrough"
 msgstr "Specifică dacă această etichetă afectează tăierea"
 
-#: gtk/gtkcellrenderertext.c:613 gtk/gtktexttag.c:624
+#: ../gtk/gtkcellrenderertext.c:658 ../gtk/gtktexttag.c:624
 msgid "Underline set"
 msgstr "Setare subliniere"
 
-#: gtk/gtkcellrenderertext.c:614 gtk/gtktexttag.c:625
+#: ../gtk/gtkcellrenderertext.c:659 ../gtk/gtktexttag.c:625
 msgid "Whether this tag affects underlining"
 msgstr "Specifică dacă această etichetă afectează sublinierea"
 
-#: gtk/gtkcellrenderertext.c:617 gtk/gtktexttag.c:588
+#: ../gtk/gtkcellrenderertext.c:662 ../gtk/gtktexttag.c:588
 msgid "Language set"
 msgstr "Setare limbă"
 
-#: gtk/gtkcellrenderertext.c:618 gtk/gtktexttag.c:589
+#: ../gtk/gtkcellrenderertext.c:663 ../gtk/gtktexttag.c:589
 msgid "Whether this tag affects the language the text is rendered as"
 msgstr "Specifică dacă această opțiune afectează limba în care e afișat textul"
 
-#: gtk/gtkcellrenderertext.c:621
+#: ../gtk/gtkcellrenderertext.c:666
 msgid "Ellipsize set"
 msgstr "Setare prescurtări"
 
-#: gtk/gtkcellrenderertext.c:622
+#: ../gtk/gtkcellrenderertext.c:667
 msgid "Whether this tag affects the ellipsize mode"
 msgstr "Specifică dacă această etichetă afectează modul de prescurtare"
 
-#: gtk/gtkcellrenderertext.c:625
+#: ../gtk/gtkcellrenderertext.c:670
 msgid "Align set"
 msgstr "Setare aliniere"
 
-#: gtk/gtkcellrenderertext.c:626
+#: ../gtk/gtkcellrenderertext.c:671
 msgid "Whether this tag affects the alignment mode"
 msgstr "Specifică dacă această etichetă afectează modul de aliniere"
 
-#: gtk/gtkcellrenderertoggle.c:128
+#: ../gtk/gtkcellrenderertoggle.c:128
 msgid "Toggle state"
 msgstr "Stare comutare"
 
-#: gtk/gtkcellrenderertoggle.c:129
+#: ../gtk/gtkcellrenderertoggle.c:129
 msgid "The toggle state of the button"
 msgstr "Starea de comutare a butonului"
 
-#: gtk/gtkcellrenderertoggle.c:136
+#: ../gtk/gtkcellrenderertoggle.c:136
 msgid "Inconsistent state"
 msgstr "Stare inconsistență"
 
-#: gtk/gtkcellrenderertoggle.c:137
+#: ../gtk/gtkcellrenderertoggle.c:137
 msgid "The inconsistent state of the button"
 msgstr "Starea de inconsistență a butonului"
 
-#: gtk/gtkcellrenderertoggle.c:144
+#: ../gtk/gtkcellrenderertoggle.c:144
 msgid "Activatable"
 msgstr "Activabil"
 
-#: gtk/gtkcellrenderertoggle.c:145
+#: ../gtk/gtkcellrenderertoggle.c:145
 msgid "The toggle button can be activated"
 msgstr "Butonul de comutare poate fi activat"
 
-#: gtk/gtkcellrenderertoggle.c:152
+#: ../gtk/gtkcellrenderertoggle.c:152
 msgid "Radio state"
 msgstr "Stare radio"
 
-#: gtk/gtkcellrenderertoggle.c:153
+#: ../gtk/gtkcellrenderertoggle.c:153
 msgid "Draw the toggle button as a radio button"
 msgstr "Desenează butonul de comutare ca un buton radio"
 
-#: gtk/gtkcellrenderertoggle.c:160
+#: ../gtk/gtkcellrenderertoggle.c:160
 msgid "Indicator size"
 msgstr "Mărime indicator"
 
-#: gtk/gtkcellrenderertoggle.c:161 gtk/gtkcheckbutton.c:72
-#: gtk/gtkcheckmenuitem.c:129
+#: ../gtk/gtkcellrenderertoggle.c:161 ../gtk/gtkcheckbutton.c:78
+#: ../gtk/gtkcheckmenuitem.c:129
 msgid "Size of check or radio indicator"
 msgstr "Mărimea indicatorului radio sau de bifare"
 
-#: gtk/gtkcellview.c:200
+#: ../gtk/gtkcellview.c:213
+msgid "Background RGBA color"
+msgstr "Culoare RGBA fundal"
+
+#: ../gtk/gtkcellview.c:228
 msgid "CellView model"
 msgstr "Model CellView"
 
-#: gtk/gtkcellview.c:201
+#: ../gtk/gtkcellview.c:229
 msgid "The model for cell view"
 msgstr "Model pentru afișarea celulei"
 
-#: gtk/gtkcheckbutton.c:71 gtk/gtkcheckmenuitem.c:128
+#: ../gtk/gtkcheckbutton.c:77 ../gtk/gtkcheckmenuitem.c:128
 msgid "Indicator Size"
 msgstr "Mărime indicator"
 
-#: gtk/gtkcheckbutton.c:79 gtk/gtkexpander.c:267
+#: ../gtk/gtkcheckbutton.c:85 ../gtk/gtkexpander.c:267
 msgid "Indicator Spacing"
 msgstr "Spațiere indicator"
 
-#: gtk/gtkcheckbutton.c:80
+#: ../gtk/gtkcheckbutton.c:86
 msgid "Spacing around check or radio indicator"
 msgstr "Spațierea în jurul indicatorului radio sau de bifare"
 
-#: gtk/gtkcheckmenuitem.c:106
+#: ../gtk/gtkcheckmenuitem.c:106
 msgid "Whether the menu item is checked"
 msgstr "Specifică dacă elementul din meniu este bifat"
 
-#: gtk/gtkcheckmenuitem.c:113 gtk/gtktogglebutton.c:123
+#: ../gtk/gtkcheckmenuitem.c:113 ../gtk/gtktogglebutton.c:133
 msgid "Inconsistent"
 msgstr "Inconsistent"
 
-#: gtk/gtkcheckmenuitem.c:114
+#: ../gtk/gtkcheckmenuitem.c:114
 msgid "Whether to display an \"inconsistent\" state"
 msgstr "Specifică dacă se va afișa o stare de „inconsistență”"
 
-#: gtk/gtkcheckmenuitem.c:121
+#: ../gtk/gtkcheckmenuitem.c:121
 msgid "Draw as radio menu item"
 msgstr "Desenează ca un element radio de meniu"
 
-#: gtk/gtkcheckmenuitem.c:122
+#: ../gtk/gtkcheckmenuitem.c:122
 msgid "Whether the menu item looks like a radio menu item"
 msgstr "Specifică dacă elementul din meniu arată ca un element radio bifat"
 
-#: gtk/gtkcolorbutton.c:159
+#: ../gtk/gtkcolorbutton.c:171
 msgid "Use alpha"
 msgstr "Utilizează alpha"
 
-#: gtk/gtkcolorbutton.c:160
-#, fuzzy
+#: ../gtk/gtkcolorbutton.c:172
 msgid "Whether to give the color an alpha value"
 msgstr "Specifică dacă se va da culorii o valoare alpha"
 
-#: 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:186 ../gtk/gtkfilechooserbutton.c:397
+#: ../gtk/gtkfontbutton.c:140 ../gtk/gtkprintjob.c:115
+#: ../gtk/gtkstatusicon.c:415 ../gtk/gtktreeviewcolumn.c:286
 msgid "Title"
 msgstr "Titlu"
 
-#: gtk/gtkcolorbutton.c:175
+#: ../gtk/gtkcolorbutton.c:187
 msgid "The title of the color selection dialog"
 msgstr "Titlul dialogului de selectare a culorii"
 
-#: gtk/gtkcolorbutton.c:189 gtk/gtkcolorsel.c:323
+#: ../gtk/gtkcolorbutton.c:201 ../gtk/gtkcolorsel.c:339
 msgid "Current Color"
 msgstr "Culoare curentă"
 
-#: gtk/gtkcolorbutton.c:190
+#: ../gtk/gtkcolorbutton.c:202
 msgid "The selected color"
 msgstr "Culoarea selectată"
 
-#: gtk/gtkcolorbutton.c:204 gtk/gtkcolorsel.c:330
+#: ../gtk/gtkcolorbutton.c:216 ../gtk/gtkcolorsel.c:346
 msgid "Current Alpha"
 msgstr "Valoare alfa curentă"
 
-#: gtk/gtkcolorbutton.c:205
+#: ../gtk/gtkcolorbutton.c:217
 msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr ""
 "Valoarea selectată a opacității (0 - complet transparentă, 65535 - complet "
 "opacă)"
 
-#: gtk/gtkcolorsel.c:309
+#: ../gtk/gtkcolorbutton.c:231
+msgid "Current RGBA Color"
+msgstr "Culoare RGBA curentă"
+
+#: ../gtk/gtkcolorbutton.c:232
+msgid "The selected RGBA color"
+msgstr "Culoarea RGBA selectată"
+
+#: ../gtk/gtkcolorsel.c:325
 msgid "Has Opacity Control"
 msgstr "Are control de opacitate"
 
-#: gtk/gtkcolorsel.c:310
+#: ../gtk/gtkcolorsel.c:326
 msgid "Whether the color selector should allow setting opacity"
 msgstr ""
 "Specifică dacă acest selector de culoare ar trebui să permită schimbarea "
 "opacității"
 
-#: gtk/gtkcolorsel.c:316
+#: ../gtk/gtkcolorsel.c:332
 msgid "Has palette"
 msgstr "Are paletă"
 
-#: gtk/gtkcolorsel.c:317
+#: ../gtk/gtkcolorsel.c:333
 msgid "Whether a palette should be used"
 msgstr "Specifică dacă ar trebui utilizată o paletă"
 
-#: gtk/gtkcolorsel.c:324
+#: ../gtk/gtkcolorsel.c:340
 msgid "The current color"
 msgstr "Culoarea curentă"
 
-#: gtk/gtkcolorsel.c:331
+#: ../gtk/gtkcolorsel.c:347
 msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr ""
 "Valoarea curentă a opacității (0 - complet transparentă, 65535 - complet "
 "opacă)"
 
-#: gtk/gtkcolorsel.c:345
-msgid "Custom palette"
-msgstr "Paletă personalizată"
+#: ../gtk/gtkcolorsel.c:361
+msgid "Current RGBA"
+msgstr "RGBA curent"
 
-#: gtk/gtkcolorsel.c:346
-msgid "Palette to use in the color selector"
-msgstr "Paletă de utilizat în selectorul de culoare"
+#: ../gtk/gtkcolorsel.c:362
+msgid "The current RGBA color"
+msgstr "Culoarea RGBA curentă"
 
-#: gtk/gtkcolorseldialog.c:110
+#: ../gtk/gtkcolorseldialog.c:110
 msgid "Color Selection"
 msgstr "Selecție de culoare"
 
-#: gtk/gtkcolorseldialog.c:111
+#: ../gtk/gtkcolorseldialog.c:111
 msgid "The color selection embedded in the dialog."
 msgstr "Selecție de culoare înglobată în dialog."
 
-#: gtk/gtkcolorseldialog.c:117
+#: ../gtk/gtkcolorseldialog.c:117
 msgid "OK Button"
 msgstr "Buton OK"
 
-#: gtk/gtkcolorseldialog.c:118
+#: ../gtk/gtkcolorseldialog.c:118
 msgid "The OK button of the dialog."
 msgstr "Butonul OK al ferestrei."
 
-#: gtk/gtkcolorseldialog.c:124
+#: ../gtk/gtkcolorseldialog.c:124
 msgid "Cancel Button"
 msgstr "Butonul de renunțare"
 
-#: gtk/gtkcolorseldialog.c:125
+#: ../gtk/gtkcolorseldialog.c:125
 msgid "The cancel button of the dialog."
 msgstr "Butonul de renunțare al ferestrei."
 
-#: gtk/gtkcolorseldialog.c:131
+#: ../gtk/gtkcolorseldialog.c:131
 msgid "Help Button"
 msgstr "Buton de ajutor"
 
-#: gtk/gtkcolorseldialog.c:132
+#: ../gtk/gtkcolorseldialog.c:132
 msgid "The help button of the dialog."
 msgstr "Butonul de ajutor al dialogului."
 
-#: gtk/gtkcombobox.c:683
+#: ../gtk/gtkcombobox.c:733
 msgid "ComboBox model"
 msgstr "Model ComboBox"
 
-#: gtk/gtkcombobox.c:684
+#: ../gtk/gtkcombobox.c:734
 msgid "The model for the combo box"
-msgstr "Model pentru ComboBox"
+msgstr "Model pentru lista de selecție"
 
-#: gtk/gtkcombobox.c:701
+#: ../gtk/gtkcombobox.c:751
 msgid "Wrap width for laying out the items in a grid"
 msgstr "Rupe pe lățime la aranjarea elementelor într-o grilă"
 
-#: gtk/gtkcombobox.c:723
+#: ../gtk/gtkcombobox.c:773
 msgid "Row span column"
 msgstr "Coloană cu înălțimea rândurilor"
 
-#: gtk/gtkcombobox.c:724
+#: ../gtk/gtkcombobox.c:774
 msgid "TreeModel column containing the row span values"
 msgstr "Coloană TreeModel ce conține valorile înălțimii rândurilor"
 
-#: gtk/gtkcombobox.c:745
+#: ../gtk/gtkcombobox.c:795
 msgid "Column span column"
 msgstr "Coloană cu lățimea coloanelor"
 
-#: gtk/gtkcombobox.c:746
+#: ../gtk/gtkcombobox.c:796
 msgid "TreeModel column containing the column span values"
 msgstr "Coloană TreeModel ce conține valorile lățimii coloanelor"
 
-#: gtk/gtkcombobox.c:767
+#: ../gtk/gtkcombobox.c:817
 msgid "Active item"
 msgstr "Item activ"
 
-#: gtk/gtkcombobox.c:768
+#: ../gtk/gtkcombobox.c:818
 msgid "The item which is currently active"
 msgstr "Elementul activ curent."
 
-#: gtk/gtkcombobox.c:787 gtk/gtkuimanager.c:224
+#: ../gtk/gtkcombobox.c:837 ../gtk/gtkuimanager.c:224
 msgid "Add tearoffs to menus"
 msgstr "Face posibilă desprinderea meniurilor"
 
-#: gtk/gtkcombobox.c:788
+#: ../gtk/gtkcombobox.c:838
 msgid "Whether dropdowns should have a tearoff menu item"
 msgstr "Specifică dacă meniurile „dropdown” ar trebui să aibă „tearoff”"
 
-#: gtk/gtkcombobox.c:803 gtk/gtkentry.c:688
+#: ../gtk/gtkcombobox.c:853 ../gtk/gtkentry.c:778
 msgid "Has Frame"
 msgstr "Are cadru"
 
-#: gtk/gtkcombobox.c:804
+#: ../gtk/gtkcombobox.c:854
 msgid "Whether the combo box draws a frame around the child"
-msgstr ""
-"Specifică dacă acest „combo box” desenează un cadru în jurul unui copil"
+msgstr "Specifică dacă lista de selecție desenează un cadru în jurul copilului"
 
-#: gtk/gtkcombobox.c:812
+#: ../gtk/gtkcombobox.c:862
 msgid "Whether the combo box grabs focus when it is clicked with the mouse"
-msgstr "Specifică dacă acest „combo box” primește focus la un clic de maus"
+msgstr "Specifică dacă lista de selecție este focalizată la un clic de maus"
 
-#: gtk/gtkcombobox.c:827 gtk/gtkmenu.c:580
+#: ../gtk/gtkcombobox.c:877 ../gtk/gtkmenu.c:576
 msgid "Tearoff Title"
 msgstr "Titlu desprindere"
 
-#: gtk/gtkcombobox.c:828
+#: ../gtk/gtkcombobox.c:878
 msgid ""
 "A title that may be displayed by the window manager when the popup is torn-"
 "off"
@@ -2074,150 +2099,178 @@ msgstr ""
 "Un titlu ce poate fi afișat de către administratorul de ferestre când acest "
 "„popup” este desprins"
 
-#: gtk/gtkcombobox.c:845
+#: ../gtk/gtkcombobox.c:895
 msgid "Popup shown"
 msgstr "„Popup” afișat"
 
-#: gtk/gtkcombobox.c:846
+#: ../gtk/gtkcombobox.c:896
 msgid "Whether the combo's dropdown is shown"
 msgstr ""
 "Specifică dacă ar trebui arătat meniul dropdown al elementului de tip combo"
 
-#: gtk/gtkcombobox.c:862
+#: ../gtk/gtkcombobox.c:912
 msgid "Button Sensitivity"
 msgstr "Sensibilitatea butonului"
 
-#: gtk/gtkcombobox.c:863
+#: ../gtk/gtkcombobox.c:913
 msgid "Whether the dropdown button is sensitive when the model is empty"
 msgstr "Specifică dacă butonul dropdown este sensibil când modelul său e gol"
 
-#: gtk/gtkcombobox.c:870
+#: ../gtk/gtkcombobox.c:929
+msgid "Whether combo box has an entry"
+msgstr "Specifică dacă această listă de selecție are o intrare"
+
+#: ../gtk/gtkcombobox.c:944
+msgid "Entry Text Column"
+msgstr "Coloană intrare text"
+
+#: ../gtk/gtkcombobox.c:945
+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 ""
+"Coloana din modelul listei de selecție de asociat cu șiruri din intrarea "
+"text dacă lista de selecție a fost creată cu #GtkComboBox:has-entry = %TRUE"
+
+#: ../gtk/gtkcombobox.c:962
+msgid "Popup Fixed Width"
+msgstr "Lățime fixă fereastră popup"
+
+#: ../gtk/gtkcombobox.c:963
+msgid ""
+"Whether the popup's width should be a fixed width matching the allocated "
+"width of the combo box"
+msgstr ""
+"Specifică dacă fereastra popup ar trebui sa aibă o lățime fixă potrivindu-se "
+"cu lățimea alocată listei de selecție"
+
+#: ../gtk/gtkcombobox.c:971
 msgid "Appears as list"
 msgstr "Apare ca listă"
 
-#: gtk/gtkcombobox.c:871
+#: ../gtk/gtkcombobox.c:972
 msgid "Whether dropdowns should look like lists rather than menus"
 msgstr ""
-"Specifică dacă „combo box”-urile tip dropdown să arate ca liste și nu ca "
-"meniuri"
+"Specifică dacă listele de selecție de tip dropdown să arate ca liste și nu "
+"ca meniuri"
 
-#: gtk/gtkcombobox.c:887
+#: ../gtk/gtkcombobox.c:988
 msgid "Arrow Size"
 msgstr "Mărime săgeată"
 
-#: gtk/gtkcombobox.c:888
+#: ../gtk/gtkcombobox.c:989
 msgid "The minimum size of the arrow in the combo box"
-msgstr "Mărimea minimă pentru săgeata din „combo box”"
+msgstr "Mărimea minimă pentru săgeata din lista de selecție"
 
-#: 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:1004 ../gtk/gtkentry.c:878 ../gtk/gtkhandlebox.c:188
+#: ../gtk/gtkmenubar.c:196 ../gtk/gtkstatusbar.c:180 ../gtk/gtktoolbar.c:603
+#: ../gtk/gtkviewport.c:154
 msgid "Shadow type"
 msgstr "Tip umbră"
 
-#: gtk/gtkcombobox.c:904
+#: ../gtk/gtkcombobox.c:1005
 msgid "Which kind of shadow to draw around the combo box"
-msgstr "Tipul de umbră de desenat în jurul „combo box”-ului"
+msgstr "Tipul de umbră de desenat în jurul listelor de selecție"
 
-#: gtk/gtkcontainer.c:259
+#: ../gtk/gtkcontainer.c:472
 msgid "Resize mode"
 msgstr "Mod de redimensionare"
 
-#: gtk/gtkcontainer.c:260
+#: ../gtk/gtkcontainer.c:473
 msgid "Specify how resize events are handled"
 msgstr "Specifică cum sunt tratate evenimentele de redimensionare"
 
-#: gtk/gtkcontainer.c:267
+#: ../gtk/gtkcontainer.c:480
 msgid "Border width"
 msgstr "Lățime chenar"
 
-#: gtk/gtkcontainer.c:268
+#: ../gtk/gtkcontainer.c:481
 msgid "The width of the empty border outside the containers children"
 msgstr "Lățimea marginilor goale în afara containerelor copii"
 
-#: gtk/gtkcontainer.c:276
+#: ../gtk/gtkcontainer.c:489
 msgid "Child"
 msgstr "Copil"
 
-#: gtk/gtkcontainer.c:277
+#: ../gtk/gtkcontainer.c:490
 msgid "Can be used to add a new child to the container"
 msgstr "Poate fi utilizat pentru a adăuga un nou copil la container"
 
-#: gtk/gtkdialog.c:165 gtk/gtkinfobar.c:430
+#: ../gtk/gtkdialog.c:165 ../gtk/gtkinfobar.c:430
 msgid "Content area border"
 msgstr "Margine zonă conținut"
 
-#: gtk/gtkdialog.c:166
+#: ../gtk/gtkdialog.c:166
 msgid "Width of border around the main dialog area"
 msgstr "Lățimea marginii în jurul ariei principale a dialogului"
 
-#: gtk/gtkdialog.c:183 gtk/gtkinfobar.c:447
+#: ../gtk/gtkdialog.c:183 ../gtk/gtkinfobar.c:447
 msgid "Content area spacing"
 msgstr "Spațiere a ariei cu conținut"
 
-#: gtk/gtkdialog.c:184
+#: ../gtk/gtkdialog.c:184
 msgid "Spacing between elements of the main dialog area"
 msgstr "Spațiere între elementele din aria principală a dialogului"
 
-#: gtk/gtkdialog.c:191 gtk/gtkinfobar.c:463
+#: ../gtk/gtkdialog.c:191 ../gtk/gtkinfobar.c:463
 msgid "Button spacing"
 msgstr "Spațiere butoane"
 
-#: gtk/gtkdialog.c:192 gtk/gtkinfobar.c:464
+#: ../gtk/gtkdialog.c:192 ../gtk/gtkinfobar.c:464
 msgid "Spacing between buttons"
 msgstr "Spațiul dintre butoane"
 
-#: gtk/gtkdialog.c:200 gtk/gtkinfobar.c:479
+#: ../gtk/gtkdialog.c:200 ../gtk/gtkinfobar.c:479
 msgid "Action area border"
 msgstr "Margine zonă acțiune"
 
-#: gtk/gtkdialog.c:201
+#: ../gtk/gtkdialog.c:201
 msgid "Width of border around the button area at the bottom of the dialog"
 msgstr "Lățimea marginii în jurul ariei cu butoane de la baza dialogului"
 
-#: gtk/gtkentry.c:635
+#: ../gtk/gtkentry.c:725
 msgid "Text Buffer"
 msgstr "Buffer de text"
 
-#: gtk/gtkentry.c:636
+#: ../gtk/gtkentry.c:726
 msgid "Text buffer object which actually stores entry text"
 msgstr "Obiect de tip buffer ce stochează text introdus"
 
-#: gtk/gtkentry.c:643 gtk/gtklabel.c:644
+#: ../gtk/gtkentry.c:733 ../gtk/gtklabel.c:662
 msgid "Cursor Position"
 msgstr "Poziție cursor"
 
-#: gtk/gtkentry.c:644 gtk/gtklabel.c:645
+#: ../gtk/gtkentry.c:734 ../gtk/gtklabel.c:663
 msgid "The current position of the insertion cursor in chars"
 msgstr "Poziția curentă a cursorului de introducere (în caractere)"
 
-#: gtk/gtkentry.c:653 gtk/gtklabel.c:654
+#: ../gtk/gtkentry.c:743 ../gtk/gtklabel.c:672
 msgid "Selection Bound"
 msgstr "Capăt selecție"
 
-#: gtk/gtkentry.c:654 gtk/gtklabel.c:655
+#: ../gtk/gtkentry.c:744 ../gtk/gtklabel.c:673
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars"
 msgstr "Poziția capătului opus față de cursor al selecției (în caractere)"
 
-#: gtk/gtkentry.c:664
+#: ../gtk/gtkentry.c:754
 msgid "Whether the entry contents can be edited"
 msgstr "Specifică dacă se poate edita conținutul intrării"
 
-#: gtk/gtkentry.c:671 gtk/gtkentrybuffer.c:382
+#: ../gtk/gtkentry.c:761 ../gtk/gtkentrybuffer.c:382
 msgid "Maximum length"
 msgstr "Lungime maximă"
 
-#: gtk/gtkentry.c:672 gtk/gtkentrybuffer.c:383
+#: ../gtk/gtkentry.c:762 ../gtk/gtkentrybuffer.c:383
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 "Număr maxim de caractere pentru această intrare. Zero dacă nu are maxim"
 
-#: gtk/gtkentry.c:680
+#: ../gtk/gtkentry.c:770
 msgid "Visibility"
 msgstr "Vizibilitate"
 
-#: gtk/gtkentry.c:681
+#: ../gtk/gtkentry.c:771
 msgid ""
 "FALSE displays the \"invisible char\" instead of the actual text (password "
 "mode)"
@@ -2225,31 +2278,31 @@ msgstr ""
 "FALSE afișează „caractere invizibile” în loc de textul propriu-zis (modul de "
 "introducere a unei parole)"
 
-#: gtk/gtkentry.c:689
+#: ../gtk/gtkentry.c:779
 msgid "FALSE removes outside bevel from entry"
 msgstr "FALSE elimină cadrul exterior al intrării"
 
-#: gtk/gtkentry.c:697
+#: ../gtk/gtkentry.c:787
 msgid ""
 "Border between text and frame. Overrides the inner-border style property"
 msgstr ""
 "Spațiu între text și cadru. Suprascrie proprietatea de stil margine-"
 "interioară"
 
-#: gtk/gtkentry.c:704 gtk/gtkentry.c:1270
+#: ../gtk/gtkentry.c:794 ../gtk/gtkentry.c:1360
 msgid "Invisible character"
 msgstr "Caracter invizibil"
 
-#: gtk/gtkentry.c:705 gtk/gtkentry.c:1271
+#: ../gtk/gtkentry.c:795 ../gtk/gtkentry.c:1361
 msgid "The character to use when masking entry contents (in \"password mode\")"
 msgstr ""
 "Caracterul utilizat pentru a masca conținutul intrării (în „modul parolă”)"
 
-#: gtk/gtkentry.c:712
+#: ../gtk/gtkentry.c:802
 msgid "Activates default"
 msgstr "Activează implicit"
 
-#: gtk/gtkentry.c:713
+#: ../gtk/gtkentry.c:803
 msgid ""
 "Whether to activate the default widget (such as the default button in a "
 "dialog) when Enter is pressed"
@@ -2257,31 +2310,31 @@ msgstr ""
 "Specifică dacă widgetul implicit să fie activat (de ex. butonul implicit "
 "într-un dialog) când se apasă Enter"
 
-#: gtk/gtkentry.c:719
+#: ../gtk/gtkentry.c:809
 msgid "Width in chars"
 msgstr "Lățime în caractere"
 
-#: gtk/gtkentry.c:720
+#: ../gtk/gtkentry.c:810
 msgid "Number of characters to leave space for in the entry"
 msgstr "Numărul de caractere pentru care este alocat spațiu în intrare"
 
-#: gtk/gtkentry.c:729
+#: ../gtk/gtkentry.c:819
 msgid "Scroll offset"
 msgstr "Distanță derulată"
 
-#: gtk/gtkentry.c:730
+#: ../gtk/gtkentry.c:820
 msgid "Number of pixels of the entry scrolled off the screen to the left"
 msgstr "Număr de pixeli ai intrării derulați în afara ecranului la stânga"
 
-#: gtk/gtkentry.c:740
+#: ../gtk/gtkentry.c:830
 msgid "The contents of the entry"
 msgstr "Conținutul intrării"
 
-#: gtk/gtkentry.c:755 gtk/gtkmisc.c:81
+#: ../gtk/gtkentry.c:845 ../gtk/gtkmisc.c:81
 msgid "X align"
 msgstr "Aliniere X"
 
-#: gtk/gtkentry.c:756 gtk/gtkmisc.c:82
+#: ../gtk/gtkentry.c:846 ../gtk/gtkmisc.c:82
 msgid ""
 "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
 "layouts."
@@ -2289,68 +2342,66 @@ msgstr ""
 "Alinierea orizontală, de la 0 (stânga) la 1 (dreapta). Invers pentru "
 "aranjamente RTL"
 
-#: gtk/gtkentry.c:772
+#: ../gtk/gtkentry.c:862
 msgid "Truncate multiline"
 msgstr "Trunchiază liniile multiple"
 
-#: gtk/gtkentry.c:773
+#: ../gtk/gtkentry.c:863
 msgid "Whether to truncate multiline pastes to one line."
 msgstr ""
 "Specifică dacă se trunchiază la lipire liniile multiple într-una singură"
 
-#: gtk/gtkentry.c:789
+#: ../gtk/gtkentry.c:879
 msgid "Which kind of shadow to draw around the entry when has-frame is set"
 msgstr "Tip de umbră de desenat în jurul intrării când e setat „has-frame”"
 
-#: gtk/gtkentry.c:804 gtk/gtktextview.c:748
+#: ../gtk/gtkentry.c:894 ../gtk/gtktextview.c:766
 msgid "Overwrite mode"
 msgstr "Mod suprascriere"
 
-#: gtk/gtkentry.c:805
+#: ../gtk/gtkentry.c:895
 msgid "Whether new text overwrites existing text"
 msgstr "Specifică dacă textul nou suprascrie textul existent"
 
-#: gtk/gtkentry.c:819 gtk/gtkentrybuffer.c:367
+#: ../gtk/gtkentry.c:909 ../gtk/gtkentrybuffer.c:367
 msgid "Text length"
 msgstr "Lungime text"
 
-#: gtk/gtkentry.c:820
+#: ../gtk/gtkentry.c:910
 msgid "Length of the text currently in the entry"
 msgstr "Lungimea textului în intrarea curentă"
 
-#: gtk/gtkentry.c:835
-#, fuzzy
+#: ../gtk/gtkentry.c:925
 msgid "Invisible character set"
-msgstr "Caracter invizibil"
+msgstr "Set de caractere invizibil"
 
-#: gtk/gtkentry.c:836
-#, fuzzy
+#: ../gtk/gtkentry.c:926
 msgid "Whether the invisible character has been set"
 msgstr "Specifică dacă este setată utilizarea caracterelor invizibile"
 
-#: gtk/gtkentry.c:854
+#: ../gtk/gtkentry.c:944
 msgid "Caps Lock warning"
 msgstr "Avertizare Caps Lock"
 
-#: gtk/gtkentry.c:855
+#: ../gtk/gtkentry.c:945
 msgid "Whether password entries will show a warning when Caps Lock is on"
 msgstr ""
 "Specifică dacă la introducerea parolelor se va avertiza atunci când tasta "
 "Caps Lock este apăsată"
 
-#: gtk/gtkentry.c:869
+#: ../gtk/gtkentry.c:959
 msgid "Progress Fraction"
 msgstr "Porțiune progres"
 
-#: gtk/gtkentry.c:870
+#: ../gtk/gtkentry.c:960
 msgid "The current fraction of the task that's been completed"
 msgstr "Porțiunea terminată curent din sarcina de efectuat"
 
-#: gtk/gtkentry.c:887
+#: ../gtk/gtkentry.c:977
 msgid "Progress Pulse Step"
 msgstr "Pas puls progres"
 
-#: gtk/gtkentry.c:888
+#: ../gtk/gtkentry.c:978
 msgid ""
 "The fraction of total entry width to move the progress bouncing block for "
 "each call to gtk_entry_progress_pulse()"
@@ -2358,263 +2409,247 @@ msgstr ""
 "Proporția din lățimea totală a intrării cu care să se mute pulsul pentru "
 "fiecare apel către gtk_entry_progress_pulse()"
 
-#: gtk/gtkentry.c:904
+#: ../gtk/gtkentry.c:994
 msgid "Primary pixbuf"
 msgstr "Pixbuf primar"
 
-#: gtk/gtkentry.c:905
+#: ../gtk/gtkentry.c:995
 msgid "Primary pixbuf for the entry"
 msgstr "Pixbuf primar pentru intrare"
 
-#: gtk/gtkentry.c:919
+#: ../gtk/gtkentry.c:1009
 msgid "Secondary pixbuf"
 msgstr "Pixbuf secundar"
 
-#: gtk/gtkentry.c:920
+#: ../gtk/gtkentry.c:1010
 msgid "Secondary pixbuf for the entry"
 msgstr "Pixbuf secundar pentru intrare"
 
-#: gtk/gtkentry.c:934
+#: ../gtk/gtkentry.c:1024
 msgid "Primary stock ID"
 msgstr "ID primar implicit"
 
-#: gtk/gtkentry.c:935
+#: ../gtk/gtkentry.c:1025
 msgid "Stock ID for primary icon"
 msgstr "ID implicit pentru iconița primară"
 
-#: gtk/gtkentry.c:949
+#: ../gtk/gtkentry.c:1039
 msgid "Secondary stock ID"
 msgstr "ID secundar implicit"
 
-#: gtk/gtkentry.c:950
+#: ../gtk/gtkentry.c:1040
 msgid "Stock ID for secondary icon"
 msgstr "ID implicit pentru iconița secundară"
 
-#: gtk/gtkentry.c:964
+#: ../gtk/gtkentry.c:1054
 msgid "Primary icon name"
 msgstr "Nume iconiță primară"
 
-#: gtk/gtkentry.c:965
+#: ../gtk/gtkentry.c:1055
 msgid "Icon name for primary icon"
 msgstr "Numele iconiței pentru iconița primară"
 
-#: gtk/gtkentry.c:979
+#: ../gtk/gtkentry.c:1069
 msgid "Secondary icon name"
 msgstr "Nume iconiță secundară"
 
-#: gtk/gtkentry.c:980
+#: ../gtk/gtkentry.c:1070
 msgid "Icon name for secondary icon"
 msgstr "Numele iconiței pentru iconița secundară"
 
-#: gtk/gtkentry.c:994
+#: ../gtk/gtkentry.c:1084
 msgid "Primary GIcon"
 msgstr "GIcon primar"
 
-#: gtk/gtkentry.c:995
+#: ../gtk/gtkentry.c:1085
 msgid "GIcon for primary icon"
 msgstr "GIcon pentru iconița primară"
 
-#: gtk/gtkentry.c:1009
+#: ../gtk/gtkentry.c:1099
 msgid "Secondary GIcon"
 msgstr "GIcon secundar"
 
-#: gtk/gtkentry.c:1010
+#: ../gtk/gtkentry.c:1100
 msgid "GIcon for secondary icon"
 msgstr "GIcon pentru iconița secundară"
 
-#: gtk/gtkentry.c:1024
+#: ../gtk/gtkentry.c:1114
 msgid "Primary storage type"
 msgstr "Tip stocare primară"
 
-#: gtk/gtkentry.c:1025
+#: ../gtk/gtkentry.c:1115
 msgid "The representation being used for primary icon"
 msgstr "Reprezentarea utilizată pentru iconița primară"
 
-#: gtk/gtkentry.c:1040
+#: ../gtk/gtkentry.c:1130
 msgid "Secondary storage type"
 msgstr "Tip stocare secundară"
 
-#: gtk/gtkentry.c:1041
+#: ../gtk/gtkentry.c:1131
 msgid "The representation being used for secondary icon"
 msgstr "Reprezentarea utilizată pentru iconița secundară"
 
-#: gtk/gtkentry.c:1062
+#: ../gtk/gtkentry.c:1152
 msgid "Primary icon activatable"
 msgstr "Iconiță primară activabilă"
 
-#: gtk/gtkentry.c:1063
+#: ../gtk/gtkentry.c:1153
 msgid "Whether the primary icon is activatable"
 msgstr "Specifică dacă iconița primară este activabilă"
 
-#: gtk/gtkentry.c:1083
+#: ../gtk/gtkentry.c:1173
 msgid "Secondary icon activatable"
 msgstr "Iconiță secundară activabilă"
 
-#: gtk/gtkentry.c:1084
+#: ../gtk/gtkentry.c:1174
 msgid "Whether the secondary icon is activatable"
 msgstr "Specifică dacă iconița secundară este activabilă"
 
-#: gtk/gtkentry.c:1106
+#: ../gtk/gtkentry.c:1196
 msgid "Primary icon sensitive"
 msgstr "Iconiță primară sensibilă"
 
-#: gtk/gtkentry.c:1107
+#: ../gtk/gtkentry.c:1197
 msgid "Whether the primary icon is sensitive"
 msgstr "Specifică dacă iconița primară este sensibilă"
 
-#: gtk/gtkentry.c:1128
+#: ../gtk/gtkentry.c:1218
 msgid "Secondary icon sensitive"
 msgstr "Iconiță secundară sensibilă"
 
-#: gtk/gtkentry.c:1129
+#: ../gtk/gtkentry.c:1219
 msgid "Whether the secondary icon is sensitive"
 msgstr "Specifică dacă iconița secundară este sensibilă"
 
-#: gtk/gtkentry.c:1145
+#: ../gtk/gtkentry.c:1235
 msgid "Primary icon tooltip text"
 msgstr "Text indiciu iconiță primară"
 
-#: gtk/gtkentry.c:1146 gtk/gtkentry.c:1182
+#: ../gtk/gtkentry.c:1236 ../gtk/gtkentry.c:1272
 msgid "The contents of the tooltip on the primary icon"
 msgstr "Conținutul indiciului pentru iconița primară"
 
-#: gtk/gtkentry.c:1162
+#: ../gtk/gtkentry.c:1252
 msgid "Secondary icon tooltip text"
 msgstr "Text indiciu iconiță secundară"
 
-#: gtk/gtkentry.c:1163 gtk/gtkentry.c:1201
+#: ../gtk/gtkentry.c:1253 ../gtk/gtkentry.c:1291
 msgid "The contents of the tooltip on the secondary icon"
 msgstr "Conținutul indiciului pentru iconița secundară"
 
-#: gtk/gtkentry.c:1181
+#: ../gtk/gtkentry.c:1271
 msgid "Primary icon tooltip markup"
 msgstr "Evidențiere indiciu iconiță primară"
 
-#: gtk/gtkentry.c:1200
+#: ../gtk/gtkentry.c:1290
 msgid "Secondary icon tooltip markup"
 msgstr "Evidențiere indiciu iconiță secundară"
 
-#: gtk/gtkentry.c:1220 gtk/gtktextview.c:776
+#: ../gtk/gtkentry.c:1310 ../gtk/gtktextview.c:794
 msgid "IM module"
 msgstr "Modul IM"
 
-#: gtk/gtkentry.c:1221 gtk/gtktextview.c:777
+#: ../gtk/gtkentry.c:1311 ../gtk/gtktextview.c:795
 msgid "Which IM module should be used"
 msgstr "Specifică ce modul IM ar trebui utilizat"
 
-#: gtk/gtkentry.c:1235
+#: ../gtk/gtkentry.c:1325
 msgid "Icon Prelight"
 msgstr "Iluminare iconițe"
 
-#: gtk/gtkentry.c:1236
+#: ../gtk/gtkentry.c:1326
 msgid "Whether activatable icons should prelight when hovered"
 msgstr "Specifică dacă ar trebui iluminate iconițele activabile sub cursor"
 
-#: gtk/gtkentry.c:1249
+#: ../gtk/gtkentry.c:1339
 msgid "Progress Border"
 msgstr "Margine progres"
 
-#: gtk/gtkentry.c:1250
+#: ../gtk/gtkentry.c:1340
 msgid "Border around the progress bar"
 msgstr "Margine în jurul barei de progres"
 
-#: gtk/gtkentry.c:1742
+#: ../gtk/gtkentry.c:1832
 msgid "Border between text and frame."
 msgstr "Margine între text și cadru."
 
-#: gtk/gtkentry.c:1747 gtk/gtklabel.c:903
-msgid "Select on focus"
-msgstr "Selectează la focus"
-
-#: gtk/gtkentry.c:1748
-msgid "Whether to select the contents of an entry when it is focused"
-msgstr "Specifică dacă la focus să fie selectat conținutul intrării"
-
-#: gtk/gtkentry.c:1762
-msgid "Password Hint Timeout"
-msgstr "Time-out caractere parolă"
-
-#: gtk/gtkentry.c:1763
-msgid "How long to show the last input character in hidden entries"
-msgstr "Cât timp e afișat ultimul caracter introdus în intrări ascunse"
-
-#: gtk/gtkentrybuffer.c:353
+#: ../gtk/gtkentrybuffer.c:353
 msgid "The contents of the buffer"
 msgstr "Conținutul din buffer"
 
-#: gtk/gtkentrybuffer.c:368
+#: ../gtk/gtkentrybuffer.c:368
 msgid "Length of the text currently in the buffer"
 msgstr "Lungimea textului aflat curent în buffer"
 
-#: gtk/gtkentrycompletion.c:280
+#: ../gtk/gtkentrycompletion.c:280
 msgid "Completion Model"
 msgstr "Mod de completare"
 
-#: gtk/gtkentrycompletion.c:281
+#: ../gtk/gtkentrycompletion.c:281
 msgid "The model to find matches in"
 msgstr "Mod de găsire a potrivirilor"
 
-#: gtk/gtkentrycompletion.c:287
+#: ../gtk/gtkentrycompletion.c:287
 msgid "Minimum Key Length"
 msgstr "Lungime minimă cheie"
 
-#: gtk/gtkentrycompletion.c:288
+#: ../gtk/gtkentrycompletion.c:288
 msgid "Minimum length of the search key in order to look up matches"
 msgstr "Lungimea minimă a cheii de căutare pentru găsirea potrivirilor"
 
-#: gtk/gtkentrycompletion.c:304 gtk/gtkiconview.c:587
+#: ../gtk/gtkentrycompletion.c:304 ../gtk/gtkiconview.c:617
 msgid "Text column"
 msgstr "Coloană text"
 
-#: gtk/gtkentrycompletion.c:305
+#: ../gtk/gtkentrycompletion.c:305
 msgid "The column of the model containing the strings."
 msgstr "O coloană a modelului ce conține șirurile de caractere."
 
-#: gtk/gtkentrycompletion.c:324
+#: ../gtk/gtkentrycompletion.c:324
 msgid "Inline completion"
 msgstr "Completare „inline”"
 
-#: gtk/gtkentrycompletion.c:325
+#: ../gtk/gtkentrycompletion.c:325
 msgid "Whether the common prefix should be inserted automatically"
 msgstr "Specifică dacă prefixul comun ar trebui inserat automat"
 
-#: gtk/gtkentrycompletion.c:339
+#: ../gtk/gtkentrycompletion.c:339
 msgid "Popup completion"
 msgstr "Completare „popup”"
 
-#: gtk/gtkentrycompletion.c:340
+#: ../gtk/gtkentrycompletion.c:340
 msgid "Whether the completions should be shown in a popup window"
 msgstr "Specifică dacă ar trebui arătate completările într-o fereastră „popup”"
 
-#: gtk/gtkentrycompletion.c:355
+#: ../gtk/gtkentrycompletion.c:355
 msgid "Popup set width"
 msgstr "Lățime set „popup”"
 
-#: gtk/gtkentrycompletion.c:356
+#: ../gtk/gtkentrycompletion.c:356
 msgid "If TRUE, the popup window will have the same size as the entry"
 msgstr "La activare, fereastra „popup” va avea aceeași mărime cu intrarea"
 
-#: gtk/gtkentrycompletion.c:374
+#: ../gtk/gtkentrycompletion.c:374
 msgid "Popup single match"
 msgstr "„Popup” potrivire unică"
 
-#: gtk/gtkentrycompletion.c:375
+#: ../gtk/gtkentrycompletion.c:375
 msgid "If TRUE, the popup window will appear for a single match."
 msgstr "La activare, fereastra „popup” va apărea pentru o potrivire unică."
 
-#: gtk/gtkentrycompletion.c:389
+#: ../gtk/gtkentrycompletion.c:389
 msgid "Inline selection"
 msgstr "Selectare „inline”"
 
-#: gtk/gtkentrycompletion.c:390
+#: ../gtk/gtkentrycompletion.c:390
 msgid "Your description here"
 msgstr "Introduceți aici o descriere"
 
-#: gtk/gtkeventbox.c:93
+#: ../gtk/gtkeventbox.c:101
 msgid "Visible Window"
 msgstr "Fereastră vizibilă"
 
-#: gtk/gtkeventbox.c:94
+#: ../gtk/gtkeventbox.c:102
 msgid ""
 "Whether the event box is visible, as opposed to invisible and only used to "
 "trap events."
@@ -2622,11 +2657,11 @@ msgstr ""
 "Specifică dacă EventBox-ul este vizibil (adică nu ascuns) și utilizat doar "
 "pentru înregistrarea evenimentelor."
 
-#: gtk/gtkeventbox.c:100
+#: ../gtk/gtkeventbox.c:108
 msgid "Above child"
 msgstr "Deasupra copilului"
 
-#: gtk/gtkeventbox.c:101
+#: ../gtk/gtkeventbox.c:109
 msgid ""
 "Whether the event-trapping window of the eventbox is above the window of the "
 "child widget as opposed to below it."
@@ -2634,162 +2669,164 @@ msgstr ""
 "Specifică dacă fereastra „event-trapping” a unui EventBox este deasupra "
 "ferestrei widgetului copil"
 
-#: gtk/gtkexpander.c:201
+#: ../gtk/gtkexpander.c:201
 msgid "Expanded"
 msgstr "Desfășurat"
 
-#: gtk/gtkexpander.c:202
+#: ../gtk/gtkexpander.c:202
 msgid "Whether the expander has been opened to reveal the child widget"
 msgstr "Specifică dacă desfășurătorul e deschis și e vizibil un widget copil"
 
-#: gtk/gtkexpander.c:210
+#: ../gtk/gtkexpander.c:210
 msgid "Text of the expander's label"
 msgstr "Textul etichetei desfășurătorului"
 
-#: gtk/gtkexpander.c:225 gtk/gtklabel.c:563
+#: ../gtk/gtkexpander.c:225 ../gtk/gtklabel.c:581
 msgid "Use markup"
 msgstr "Utilizează marcare"
 
-#: gtk/gtkexpander.c:226 gtk/gtklabel.c:564
+#: ../gtk/gtkexpander.c:226 ../gtk/gtklabel.c:582
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "Textul etichetei include marcare XML. A se vedea pango_parse_markup()"
 
-#: gtk/gtkexpander.c:234
+#: ../gtk/gtkexpander.c:234
 msgid "Space to put between the label and the child"
 msgstr "Spațiu între etichetă și copil"
 
-#: gtk/gtkexpander.c:243 gtk/gtkframe.c:165 gtk/gtktoolbutton.c:216
-#: gtk/gtktoolitemgroup.c:1578
+#: ../gtk/gtkexpander.c:243 ../gtk/gtkframe.c:165 ../gtk/gtktoolbutton.c:216
+#: ../gtk/gtktoolitemgroup.c:1595
 msgid "Label widget"
 msgstr "Widget etichetă"
 
-#: gtk/gtkexpander.c:244
+#: ../gtk/gtkexpander.c:244
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Un widget pentru a fi afișat în locul etichetei obișnuite a desfășurătorului"
 
-#: gtk/gtkexpander.c:251
-#, fuzzy
+#: ../gtk/gtkexpander.c:251
 msgid "Label fill"
-msgstr "Umplere tab"
+msgstr "Umplere etichetă"
 
-#: gtk/gtkexpander.c:252
-#, fuzzy
+#: ../gtk/gtkexpander.c:252
 msgid "Whether the label widget should fill all available horizontal space"
-msgstr "Specifică dacă elementul ar trebui să umple spațiul disponibil"
+msgstr ""
+"Specifică dacă widget-ul etichetă ar trebui să umple tot spațiul orizontal "
+"disponibil"
 
-#: gtk/gtkexpander.c:258 gtk/gtktoolitemgroup.c:1606 gtk/gtktreeview.c:776
+#: ../gtk/gtkexpander.c:258 ../gtk/gtktoolitemgroup.c:1623
+#: ../gtk/gtktreeview.c:863
 msgid "Expander Size"
 msgstr "Mărime desfășurător"
 
-#: gtk/gtkexpander.c:259 gtk/gtktoolitemgroup.c:1607 gtk/gtktreeview.c:777
+#: ../gtk/gtkexpander.c:259 ../gtk/gtktoolitemgroup.c:1624
+#: ../gtk/gtktreeview.c:864
 msgid "Size of the expander arrow"
 msgstr "Mărimea săgeții de desfășurare"
 
-#: gtk/gtkexpander.c:268
+#: ../gtk/gtkexpander.c:268
 msgid "Spacing around expander arrow"
 msgstr "Spațiere în jurul săgeții desfășurătorului"
 
-#: gtk/gtkfilechooserbutton.c:368
+#: ../gtk/gtkfilechooserbutton.c:366
 msgid "Dialog"
 msgstr "Dialog"
 
-#: gtk/gtkfilechooserbutton.c:369
+#: ../gtk/gtkfilechooserbutton.c:367
 msgid "The file chooser dialog to use."
 msgstr "Dialogul de selectare fișiere de utilizat."
 
-#: gtk/gtkfilechooserbutton.c:400
+#: ../gtk/gtkfilechooserbutton.c:398
 msgid "The title of the file chooser dialog."
 msgstr "Titlul dialogului de selectare fișiere."
 
-#: gtk/gtkfilechooserbutton.c:414
+#: ../gtk/gtkfilechooserbutton.c:412
 msgid "The desired width of the button widget, in characters."
 msgstr "Lățimea dorită a widgetului buton, în caractere."
 
-#: gtk/gtkfilechooser.c:740
+#: ../gtk/gtkfilechooser.c:740
 msgid "Action"
 msgstr "Acțiune"
 
-#: gtk/gtkfilechooser.c:741
+#: ../gtk/gtkfilechooser.c:741
 msgid "The type of operation that the file selector is performing"
 msgstr "Tipul operației efectuate de selectorul de fișiere"
 
-#: gtk/gtkfilechooser.c:747 gtk/gtkrecentchooser.c:264
+#: ../gtk/gtkfilechooser.c:747 ../gtk/gtkrecentchooser.c:264
 msgid "Filter"
 msgstr "Filtru"
 
-#: gtk/gtkfilechooser.c:748
+#: ../gtk/gtkfilechooser.c:748
 msgid "The current filter for selecting which files are displayed"
 msgstr "Filtrul curent pentru selectarea fișierelor afișate"
 
-#: gtk/gtkfilechooser.c:753
+#: ../gtk/gtkfilechooser.c:753
 msgid "Local Only"
 msgstr "Doar local"
 
-#: gtk/gtkfilechooser.c:754
+#: ../gtk/gtkfilechooser.c:754
 msgid "Whether the selected file(s) should be limited to local file: URLs"
 msgstr ""
 "Specifică dacă fișierele selectate ar trebui limitate la fișierele locale: "
 "URL-uri"
 
-#: gtk/gtkfilechooser.c:759
+#: ../gtk/gtkfilechooser.c:759
 msgid "Preview widget"
 msgstr "Widget previzualizare"
 
-#: gtk/gtkfilechooser.c:760
+#: ../gtk/gtkfilechooser.c:760
 msgid "Application supplied widget for custom previews."
 msgstr "Widget furnizat de aplicație pentru previzualizări personalizate"
 
-#: gtk/gtkfilechooser.c:765
+#: ../gtk/gtkfilechooser.c:765
 msgid "Preview Widget Active"
 msgstr "Widget de previzualizare activ"
 
-#: gtk/gtkfilechooser.c:766
+#: ../gtk/gtkfilechooser.c:766
 msgid ""
 "Whether the application supplied widget for custom previews should be shown."
 msgstr ""
 "Specifică dacă widgetul furnizat de aplicație pentru previzualizări "
 "personalizate ar trebui să fie vizibil."
 
-#: gtk/gtkfilechooser.c:771
+#: ../gtk/gtkfilechooser.c:771
 msgid "Use Preview Label"
 msgstr "Utilizează o etichetă de previzualizare"
 
-#: gtk/gtkfilechooser.c:772
+#: ../gtk/gtkfilechooser.c:772
 msgid "Whether to display a stock label with the name of the previewed file."
 msgstr ""
 "Specifică dacă se va afișa o etichetă standard pentru numele fișierului "
 "previzualizat."
 
-#: gtk/gtkfilechooser.c:777
+#: ../gtk/gtkfilechooser.c:777
 msgid "Extra widget"
 msgstr "Widget extra"
 
-#: gtk/gtkfilechooser.c:778
+#: ../gtk/gtkfilechooser.c:778
 msgid "Application supplied widget for extra options."
 msgstr "Widget furnizat de aplicație pentru opțiuni extra."
 
-#: gtk/gtkfilechooser.c:783 gtk/gtkrecentchooser.c:203
+#: ../gtk/gtkfilechooser.c:783 ../gtk/gtkrecentchooser.c:203
 msgid "Select Multiple"
 msgstr "Selectare multiplă"
 
-#: gtk/gtkfilechooser.c:784
+#: ../gtk/gtkfilechooser.c:784
 msgid "Whether to allow multiple files to be selected"
 msgstr "Specifică dacă este permisă selectarea mai multor fișiere"
 
-#: gtk/gtkfilechooser.c:790
+#: ../gtk/gtkfilechooser.c:790
 msgid "Show Hidden"
 msgstr "Arată fișierele ascunse"
 
-#: gtk/gtkfilechooser.c:791
+#: ../gtk/gtkfilechooser.c:791
 msgid "Whether the hidden files and folders should be displayed"
 msgstr "Specifică dacă fișierele ascunse ar trebui să fie afișate"
 
-#: gtk/gtkfilechooser.c:806
+#: ../gtk/gtkfilechooser.c:806
 msgid "Do overwrite confirmation"
 msgstr "Confirmare suprascriere"
 
-#: gtk/gtkfilechooser.c:807
+#: ../gtk/gtkfilechooser.c:807
 msgid ""
 "Whether a file chooser in save mode will present an overwrite confirmation "
 "dialog if necessary."
@@ -2797,12 +2834,11 @@ msgstr ""
 "Specifică dacă un selector de fișiere în modul de salvare va prezenta un "
 "dialog de confirmare a suprascrierii."
 
-#: gtk/gtkfilechooser.c:823
-#, fuzzy
+#: ../gtk/gtkfilechooser.c:823
 msgid "Allow folder creation"
 msgstr "Permite crearea de dosare"
 
-#: gtk/gtkfilechooser.c:824
+#: ../gtk/gtkfilechooser.c:824
 msgid ""
 "Whether a file chooser not in open mode will offer the user to create new "
 "folders."
@@ -2810,133 +2846,133 @@ msgstr ""
 "Specifică dacă un selector de fișiere va permite utilizatorului crearea de "
 "noi dosare în alt mod decât în cel de deschidere."
 
-#: gtk/gtkfixed.c:98 gtk/gtklayout.c:605
+#: ../gtk/gtkfixed.c:103 ../gtk/gtklayout.c:633
 msgid "X position"
 msgstr "Poziție X"
 
-#: gtk/gtkfixed.c:99 gtk/gtklayout.c:606
+#: ../gtk/gtkfixed.c:104 ../gtk/gtklayout.c:634
 msgid "X position of child widget"
 msgstr "Poziția X a widgetului copil"
 
-#: gtk/gtkfixed.c:108 gtk/gtklayout.c:615
+#: ../gtk/gtkfixed.c:111 ../gtk/gtklayout.c:643
 msgid "Y position"
 msgstr "Poziție Y"
 
-#: gtk/gtkfixed.c:109 gtk/gtklayout.c:616
+#: ../gtk/gtkfixed.c:112 ../gtk/gtklayout.c:644
 msgid "Y position of child widget"
 msgstr "Poziția Y a widgetului copil"
 
-#: gtk/gtkfontbutton.c:141
+#: ../gtk/gtkfontbutton.c:141
 msgid "The title of the font selection dialog"
 msgstr "Titlul dialogului de selectare a fontului"
 
-#: gtk/gtkfontbutton.c:156 gtk/gtkfontsel.c:223
+#: ../gtk/gtkfontbutton.c:156 ../gtk/gtkfontsel.c:223
 msgid "Font name"
 msgstr "Nume font"
 
-#: gtk/gtkfontbutton.c:157
+#: ../gtk/gtkfontbutton.c:157
 msgid "The name of the selected font"
 msgstr "Numele fontului selectat"
 
-#: gtk/gtkfontbutton.c:158
+#: ../gtk/gtkfontbutton.c:158
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: gtk/gtkfontbutton.c:173
+#: ../gtk/gtkfontbutton.c:173
 msgid "Use font in label"
 msgstr "Utilizează fontul în etichetă"
 
-#: gtk/gtkfontbutton.c:174
+#: ../gtk/gtkfontbutton.c:174
 msgid "Whether the label is drawn in the selected font"
 msgstr "Specifică dacă eticheta utilizează fontul selectat"
 
-#: gtk/gtkfontbutton.c:189
+#: ../gtk/gtkfontbutton.c:189
 msgid "Use size in label"
 msgstr "Utilizează mărimea în etichetă"
 
-#: gtk/gtkfontbutton.c:190
+#: ../gtk/gtkfontbutton.c:190
 msgid "Whether the label is drawn with the selected font size"
 msgstr "Specifică dacă eticheta utilizează mărimea fontului selectat"
 
-#: gtk/gtkfontbutton.c:206
+#: ../gtk/gtkfontbutton.c:206
 msgid "Show style"
 msgstr "Arată stilul"
 
-#: gtk/gtkfontbutton.c:207
+#: ../gtk/gtkfontbutton.c:207
 msgid "Whether the selected font style is shown in the label"
 msgstr "Specifică dacă stilul fontului selectat apare în etichetă"
 
-#: gtk/gtkfontbutton.c:222
+#: ../gtk/gtkfontbutton.c:222
 msgid "Show size"
 msgstr "Arată mărimea"
 
-#: gtk/gtkfontbutton.c:223
+#: ../gtk/gtkfontbutton.c:223
 msgid "Whether selected font size is shown in the label"
 msgstr "Specifică dacă mărimea fontului selectat apare în etichetă"
 
-#: gtk/gtkfontsel.c:224
+#: ../gtk/gtkfontsel.c:224
 msgid "The string that represents this font"
 msgstr "Șirul ce reprezintă acest font"
 
-#: gtk/gtkfontsel.c:230
+#: ../gtk/gtkfontsel.c:230
 msgid "Preview text"
 msgstr "Previzualizare text"
 
-#: gtk/gtkfontsel.c:231
+#: ../gtk/gtkfontsel.c:231
 msgid "The text to display in order to demonstrate the selected font"
 msgstr "Textul de afișat pentru a exemplifica fontul selectat"
 
-#: gtk/gtkframe.c:131
+#: ../gtk/gtkframe.c:131
 msgid "Text of the frame's label"
 msgstr "Textul etichetei cadrului"
 
-#: gtk/gtkframe.c:138
+#: ../gtk/gtkframe.c:138
 msgid "Label xalign"
 msgstr "Aliniere X a etichetei"
 
-#: gtk/gtkframe.c:139
+#: ../gtk/gtkframe.c:139
 msgid "The horizontal alignment of the label"
 msgstr "Alinierea orizontală a etichetei"
 
-#: gtk/gtkframe.c:147
+#: ../gtk/gtkframe.c:147
 msgid "Label yalign"
 msgstr "Aliniere Y a etichetei"
 
-#: gtk/gtkframe.c:148
+#: ../gtk/gtkframe.c:148
 msgid "The vertical alignment of the label"
 msgstr "Alinierea verticală a etichetei"
 
-#: gtk/gtkframe.c:156
+#: ../gtk/gtkframe.c:156
 msgid "Frame shadow"
 msgstr "Umbră cadru"
 
-#: gtk/gtkframe.c:157
+#: ../gtk/gtkframe.c:157
 msgid "Appearance of the frame border"
 msgstr "Aspectul marginii cadrului"
 
-#: gtk/gtkframe.c:166
+#: ../gtk/gtkframe.c:166
 msgid "A widget to display in place of the usual frame label"
 msgstr "Un widget pentru a fi afișat în locul etichetei obișnuite a cadrului"
 
-#: gtk/gtkhandlebox.c:183
+#: ../gtk/gtkhandlebox.c:189
 msgid "Appearance of the shadow that surrounds the container"
 msgstr "Aspectul umbrei care înconjoară containerul"
 
-#: gtk/gtkhandlebox.c:191
+#: ../gtk/gtkhandlebox.c:197
 msgid "Handle position"
 msgstr "Poziție prindere"
 
 # Greu de tradus, a se vedea codul sursă pentru  mai multe informații. Mișu.
-#: gtk/gtkhandlebox.c:192
+#: ../gtk/gtkhandlebox.c:198
 msgid "Position of the handle relative to the child widget"
 msgstr "Poziția prinderii (handle position) relativ la widgetul copil"
 
-#: gtk/gtkhandlebox.c:200
+#: ../gtk/gtkhandlebox.c:206
 msgid "Snap edge"
 msgstr "Margine de prindere"
 
 # Aceeași observație ca mai înainte. Mișu
-#: gtk/gtkhandlebox.c:201
+#: ../gtk/gtkhandlebox.c:207
 msgid ""
 "Side of the handlebox that's lined up with the docking point to dock the "
 "handlebox"
@@ -2944,11 +2980,11 @@ msgstr ""
 "Marginea de prindere a cutiei mutate care se aliniază cu punctul de docare "
 "pentru a doca cutia prinsă și mutată."
 
-#: gtk/gtkhandlebox.c:209
+#: ../gtk/gtkhandlebox.c:215
 msgid "Snap edge set"
 msgstr "Setare margine prindere"
 
-#: gtk/gtkhandlebox.c:210
+#: ../gtk/gtkhandlebox.c:216
 msgid ""
 "Whether to use the value from the snap_edge property or a value derived from "
 "handle_position"
@@ -2956,11 +2992,11 @@ msgstr ""
 "Specifică dacă se utilizează valoarea proprietății „snap_edge” sau o valoare "
 "derivată din „handle_position”."
 
-#: gtk/gtkhandlebox.c:217
+#: ../gtk/gtkhandlebox.c:223
 msgid "Child Detached"
 msgstr "Copil desprins"
 
-#: gtk/gtkhandlebox.c:218
+#: ../gtk/gtkhandlebox.c:224
 msgid ""
 "A boolean value indicating whether the handlebox's child is attached or "
 "detached."
@@ -2968,269 +3004,262 @@ msgstr ""
 "O valoare booleană ce specifică dacă un copil al unui handlebox este atașat "
 "sau nu."
 
-#: gtk/gtkiconview.c:550
+#: ../gtk/gtkiconview.c:580
 msgid "Selection mode"
 msgstr "Mod selecție"
 
-#: gtk/gtkiconview.c:551
+#: ../gtk/gtkiconview.c:581
 msgid "The selection mode"
 msgstr "Modul selecție"
 
-#: gtk/gtkiconview.c:569
+#: ../gtk/gtkiconview.c:599
 msgid "Pixbuf column"
 msgstr "Coloană pixbuf"
 
-#: gtk/gtkiconview.c:570
+#: ../gtk/gtkiconview.c:600
 msgid "Model column used to retrieve the icon pixbuf from"
 msgstr "Coloană model din care se extrage iconița pixbuf"
 
-#: gtk/gtkiconview.c:588
+#: ../gtk/gtkiconview.c:618
 msgid "Model column used to retrieve the text from"
 msgstr "Coloană model din care se extrage textul"
 
-#: gtk/gtkiconview.c:607
+#: ../gtk/gtkiconview.c:637
 msgid "Markup column"
 msgstr "Coloană marcaj"
 
-#: gtk/gtkiconview.c:608
+#: ../gtk/gtkiconview.c:638
 msgid "Model column used to retrieve the text if using Pango markup"
 msgstr ""
 "Coloană model din care se extrage textul când se utilizează marcare Pango"
 
-#: gtk/gtkiconview.c:615
+#: ../gtk/gtkiconview.c:645
 msgid "Icon View Model"
 msgstr "Model afișare iconițe"
 
-#: gtk/gtkiconview.c:616
+#: ../gtk/gtkiconview.c:646
 msgid "The model for the icon view"
 msgstr "Model pentru afișarea iconițelor"
 
-#: gtk/gtkiconview.c:632
+#: ../gtk/gtkiconview.c:662
 msgid "Number of columns"
 msgstr "Număr de coloane"
 
-#: gtk/gtkiconview.c:633
+#: ../gtk/gtkiconview.c:663
 msgid "Number of columns to display"
 msgstr "Numărul de coloane de afișat"
 
-#: gtk/gtkiconview.c:650
+#: ../gtk/gtkiconview.c:680
 msgid "Width for each item"
 msgstr "Lățime pentru fiecare element"
 
-#: gtk/gtkiconview.c:651
+#: ../gtk/gtkiconview.c:681
 msgid "The width used for each item"
 msgstr "Lățimea utilizată pentru fiecare element"
 
-#: gtk/gtkiconview.c:667
+#: ../gtk/gtkiconview.c:697
 msgid "Space which is inserted between cells of an item"
 msgstr "Spațiu inserat între celule pentru fiecare element"
 
-#: gtk/gtkiconview.c:682
+#: ../gtk/gtkiconview.c:712
 msgid "Row Spacing"
 msgstr "Spațiere rânduri"
 
-#: gtk/gtkiconview.c:683
+#: ../gtk/gtkiconview.c:713
 msgid "Space which is inserted between grid rows"
 msgstr "Spațiu inserat între rândurile grilei"
 
-#: gtk/gtkiconview.c:698
+#: ../gtk/gtkiconview.c:728
 msgid "Column Spacing"
 msgstr "Spațiere coloane"
 
-#: gtk/gtkiconview.c:699
+#: ../gtk/gtkiconview.c:729
 msgid "Space which is inserted between grid columns"
 msgstr "Spațiu inserat între coloanele grilei"
 
-#: gtk/gtkiconview.c:714
+#: ../gtk/gtkiconview.c:744
 msgid "Margin"
 msgstr "Margine"
 
-#: gtk/gtkiconview.c:715
+#: ../gtk/gtkiconview.c:745
 msgid "Space which is inserted at the edges of the icon view"
 msgstr "Spațiu inserat la margini în vizualizările cu iconițe"
 
-#: gtk/gtkiconview.c:730
-#, fuzzy
+#: ../gtk/gtkiconview.c:760
 msgid "Item Orientation"
-msgstr "Orientare"
+msgstr "Orientare element"
 
-#: gtk/gtkiconview.c:731
+#: ../gtk/gtkiconview.c:761
 msgid ""
 "How the text and icon of each item are positioned relative to each other"
 msgstr ""
 "Cum ar trebui să fie poziționate relativ textul și iconița fiecărui element"
 
-#: gtk/gtkiconview.c:747 gtk/gtktreeview.c:611 gtk/gtktreeviewcolumn.c:311
+#: ../gtk/gtkiconview.c:777 ../gtk/gtktreeview.c:698
+#: ../gtk/gtktreeviewcolumn.c:329
 msgid "Reorderable"
 msgstr "Reordonabilă"
 
-#: gtk/gtkiconview.c:748 gtk/gtktreeview.c:612
+#: ../gtk/gtkiconview.c:778 ../gtk/gtktreeview.c:699
 msgid "View is reorderable"
 msgstr "Afișarea este reordonabilă"
 
-#: gtk/gtkiconview.c:755 gtk/gtktreeview.c:762
+#: ../gtk/gtkiconview.c:785 ../gtk/gtktreeview.c:849
 msgid "Tooltip Column"
 msgstr "Coloană indicii"
 
-#: gtk/gtkiconview.c:756
+#: ../gtk/gtkiconview.c:786
 msgid "The column in the model containing the tooltip texts for the items"
 msgstr "O coloană a modelului ce conține textele indiciilor pentru elemente"
 
-#: gtk/gtkiconview.c:773
+#: ../gtk/gtkiconview.c:803
 msgid "Item Padding"
 msgstr "Umplere element"
 
-#: gtk/gtkiconview.c:774
+#: ../gtk/gtkiconview.c:804
 msgid "Padding around icon view items"
 msgstr "Umplere în jurul elementelor vizualizării de tip iconiță"
 
-#: gtk/gtkiconview.c:783
+#: ../gtk/gtkiconview.c:817
 msgid "Selection Box Color"
 msgstr "Culoare căsuță de selectare"
 
-#: gtk/gtkiconview.c:784
+#: ../gtk/gtkiconview.c:818
 msgid "Color of the selection box"
 msgstr "Culoarea căsuței de selectare"
 
-#: gtk/gtkiconview.c:790
+#: ../gtk/gtkiconview.c:824
 msgid "Selection Box Alpha"
 msgstr "Opacitate căsuță de selectare"
 
-#: gtk/gtkiconview.c:791
+#: ../gtk/gtkiconview.c:825
 msgid "Opacity of the selection box"
 msgstr "Opacitatea căsuței de selectare"
 
-#: gtk/gtkimage.c:227 gtk/gtkstatusicon.c:212
+#: ../gtk/gtkimage.c:233 ../gtk/gtkstatusicon.c:212
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: gtk/gtkimage.c:228 gtk/gtkstatusicon.c:213
+#: ../gtk/gtkimage.c:234 ../gtk/gtkstatusicon.c:213
 msgid "A GdkPixbuf to display"
 msgstr "Un GdkPixbuf de afișat"
 
-#: gtk/gtkimage.c:235 gtk/gtkrecentmanager.c:290 gtk/gtkstatusicon.c:220
+#: ../gtk/gtkimage.c:241 ../gtk/gtkrecentmanager.c:294
+#: ../gtk/gtkstatusicon.c:220
 msgid "Filename"
 msgstr "Nume fișier"
 
-#: gtk/gtkimage.c:236 gtk/gtkstatusicon.c:221
+#: ../gtk/gtkimage.c:242 ../gtk/gtkstatusicon.c:221
 msgid "Filename to load and display"
 msgstr "Nume fișier pentru a fi încărcat și afișat"
 
-#: gtk/gtkimage.c:245 gtk/gtkstatusicon.c:229
+#: ../gtk/gtkimage.c:251 ../gtk/gtkstatusicon.c:229
 msgid "Stock ID for a stock image to display"
 msgstr "ID implicit pentru o imagine standard de afișat"
 
-#: gtk/gtkimage.c:252
+#: ../gtk/gtkimage.c:258
 msgid "Icon set"
 msgstr "Set iconițe"
 
-#: gtk/gtkimage.c:253
+#: ../gtk/gtkimage.c:259
 msgid "Icon set to display"
 msgstr "Set de iconițe pentru afișare"
 
-#: gtk/gtkimage.c:260 gtk/gtkscalebutton.c:230 gtk/gtktoolbar.c:494
-#: gtk/gtktoolpalette.c:1003
+#: ../gtk/gtkimage.c:266 ../gtk/gtkscalebutton.c:230 ../gtk/gtktoolbar.c:520
+#: ../gtk/gtktoolpalette.c:1030
 msgid "Icon size"
 msgstr "Mărime iconițe"
 
-#: gtk/gtkimage.c:261
+#: ../gtk/gtkimage.c:267
 msgid "Symbolic size to use for stock icon, icon set or named icon"
 msgstr ""
 "Mărimea simbolică a iconiței standard, a setului de iconițe sau a iconiței "
 "denumite"
 
-#: gtk/gtkimage.c:277
+#: ../gtk/gtkimage.c:283
 msgid "Pixel size"
 msgstr "Mărime pixeli"
 
-#: gtk/gtkimage.c:278
+#: ../gtk/gtkimage.c:284
 msgid "Pixel size to use for named icon"
 msgstr "Mărimea în pixeli pentru iconița denumită"
 
-#: gtk/gtkimage.c:286
+#: ../gtk/gtkimage.c:292
 msgid "Animation"
 msgstr "Animație"
 
-#: gtk/gtkimage.c:287
+#: ../gtk/gtkimage.c:293
 msgid "GdkPixbufAnimation to display"
 msgstr "GdkPixbufAnimation de afișat"
 
-#: gtk/gtkimage.c:327 gtk/gtkstatusicon.c:260
+#: ../gtk/gtkimage.c:333 ../gtk/gtkstatusicon.c:260
 msgid "Storage type"
 msgstr "Tip stocare"
 
-#: gtk/gtkimage.c:328 gtk/gtkstatusicon.c:261
+#: ../gtk/gtkimage.c:334 ../gtk/gtkstatusicon.c:261
 msgid "The representation being used for image data"
 msgstr "Reprezentarea utilizată pentru datele imaginii"
 
-#: gtk/gtkimagemenuitem.c:139
+#: ../gtk/gtkimagemenuitem.c:149
 msgid "Child widget to appear next to the menu text"
 msgstr "Widget copil de afișat lângă textul meniului"
 
-#: gtk/gtkimagemenuitem.c:154
+#: ../gtk/gtkimagemenuitem.c:164
 msgid "Whether to use the label text to create a stock menu item"
 msgstr ""
 "Specifică dacă se utilizează textul etichetei pentru a crea un element "
 "standard de meniu"
 
-#: gtk/gtkimagemenuitem.c:187 gtk/gtkmenu.c:540
+#: ../gtk/gtkimagemenuitem.c:197 ../gtk/gtkmenu.c:536
 msgid "Accel Group"
 msgstr "Grup de acceleratori"
 
-#: gtk/gtkimagemenuitem.c:188
+#: ../gtk/gtkimagemenuitem.c:198
 msgid "The Accel Group to use for stock accelerator keys"
 msgstr "Grupul de acceleratori de utilizat pentru acceleratorii standard"
 
-#: gtk/gtkimagemenuitem.c:193
-msgid "Show menu images"
-msgstr "Arată imagini în meniu"
-
-#: gtk/gtkimagemenuitem.c:194
-msgid "Whether images should be shown in menus"
-msgstr "Specifică dacă ar trebui afișate imaginile în meniu"
-
-#: gtk/gtkinfobar.c:375 gtk/gtkmessagedialog.c:201
+#: ../gtk/gtkinfobar.c:375 ../gtk/gtkmessagedialog.c:201
 msgid "Message Type"
 msgstr "Tip mesaj"
 
-#: gtk/gtkinfobar.c:376 gtk/gtkmessagedialog.c:202
+#: ../gtk/gtkinfobar.c:376 ../gtk/gtkmessagedialog.c:202
 msgid "The type of message"
 msgstr "Tipul mesajului"
 
-#: gtk/gtkinfobar.c:431
+#: ../gtk/gtkinfobar.c:431
 msgid "Width of border around the content area"
 msgstr "Lățimea marginii în jurul ariei conținutului"
 
-#: gtk/gtkinfobar.c:448
+#: ../gtk/gtkinfobar.c:448
 msgid "Spacing between elements of the area"
 msgstr "Spațiere între elementele ariei"
 
-#: gtk/gtkinfobar.c:480
+#: ../gtk/gtkinfobar.c:480
 msgid "Width of border around the action area"
 msgstr "Lățimea marginii în jurul ariei acțiunii"
 
-#: gtk/gtkinvisible.c:89 gtk/gtkmountoperation.c:175 gtk/gtkstatusicon.c:279
-#: gtk/gtkwindow.c:693
+#: ../gtk/gtkinvisible.c:90 ../gtk/gtkmountoperation.c:175
+#: ../gtk/gtkstatusicon.c:279 ../gtk/gtkwindow.c:741
 msgid "Screen"
 msgstr "Ecran"
 
-#: gtk/gtkinvisible.c:90 gtk/gtkwindow.c:694
+#: ../gtk/gtkinvisible.c:91 ../gtk/gtkwindow.c:742
 msgid "The screen where this window will be displayed"
 msgstr "Ecranul unde această fereastră va fi afișată"
 
-#: gtk/gtklabel.c:550
+#: ../gtk/gtklabel.c:568
 msgid "The text of the label"
 msgstr "Textul etichetei"
 
-#: gtk/gtklabel.c:557
+#: ../gtk/gtklabel.c:575
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "O listă de atribute pentru a fi aplicate textului etichetei"
 
-#: gtk/gtklabel.c:578 gtk/gtktexttag.c:335 gtk/gtktextview.c:685
+#: ../gtk/gtklabel.c:596 ../gtk/gtktexttag.c:335 ../gtk/gtktextview.c:703
 msgid "Justification"
 msgstr "Aliniere"
 
-#: gtk/gtklabel.c:579
+#: ../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 "
@@ -3239,57 +3268,57 @@ msgstr ""
 "Alinierea liniilor una față de alta în textul etichetei. Aceasta NU "
 "afectează alinierea etichetei ca un tot. A se vedea GtkMisc::xalign."
 
-#: gtk/gtklabel.c:587
+#: ../gtk/gtklabel.c:605
 msgid "Pattern"
 msgstr "Model"
 
-#: gtk/gtklabel.c:588
+#: ../gtk/gtklabel.c:606
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
 msgstr "Caracterele „_” într-un șir corespund caracterelor subliniate în text"
 
-#: gtk/gtklabel.c:595
+#: ../gtk/gtklabel.c:613
 msgid "Line wrap"
 msgstr "Formatare linii"
 
-#: gtk/gtklabel.c:596
+#: ../gtk/gtklabel.c:614
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "La activare, rupe liniile dacă textul este prea lung"
 
-#: gtk/gtklabel.c:611
+#: ../gtk/gtklabel.c:629
 msgid "Line wrap mode"
 msgstr "Mod de rupere a liniilor"
 
-#: gtk/gtklabel.c:612
+#: ../gtk/gtklabel.c:630
 msgid "If wrap is set, controls how linewrapping is done"
 msgstr "La setarea ruperii liniilor, controlează cum se rup liniile"
 
-#: gtk/gtklabel.c:619
+#: ../gtk/gtklabel.c:637
 msgid "Selectable"
 msgstr "Selectabil"
 
-#: gtk/gtklabel.c:620
+#: ../gtk/gtklabel.c:638
 msgid "Whether the label text can be selected with the mouse"
 msgstr "Specifică dacă textul etichetei poate fi selectat cu mausul"
 
-#: gtk/gtklabel.c:626
+#: ../gtk/gtklabel.c:644
 msgid "Mnemonic key"
 msgstr "Tastă mnemonică"
 
-#: gtk/gtklabel.c:627
+#: ../gtk/gtklabel.c:645
 msgid "The mnemonic accelerator key for this label"
 msgstr "Tasta mnemonică acceleratoare pentru această etichetă"
 
-#: gtk/gtklabel.c:635
+#: ../gtk/gtklabel.c:653
 msgid "Mnemonic widget"
 msgstr "Widget mnemonic"
 
-#: gtk/gtklabel.c:636
+#: ../gtk/gtklabel.c:654
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr "Widgetul de activat la apăsarea tastei mnemonice"
 
-#: gtk/gtklabel.c:682
+#: ../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"
@@ -3297,152 +3326,123 @@ msgstr ""
 "Felul preferat de a prescurta un șir de caractere, dacă nu există destul loc "
 "în etichetă pentru a afișa întregul șir"
 
-#: gtk/gtklabel.c:723
+#: ../gtk/gtklabel.c:741
 msgid "Single Line Mode"
 msgstr "Mod linie unică"
 
-#: gtk/gtklabel.c:724
+#: ../gtk/gtklabel.c:742
 msgid "Whether the label is in single line mode"
 msgstr "Specifică dacă eticheta este în modul „linie unică”"
 
-#: gtk/gtklabel.c:741
+#: ../gtk/gtklabel.c:759
 msgid "Angle"
 msgstr "Unghi"
 
-#: gtk/gtklabel.c:742
+#: ../gtk/gtklabel.c:760
 msgid "Angle at which the label is rotated"
 msgstr "Unghi de rotire a etichetei"
 
-#: gtk/gtklabel.c:764
+#: ../gtk/gtklabel.c:782
 msgid "The desired maximum width of the label, in characters"
 msgstr "Lățimea maximă dorită pentru etichetă, în caractere"
 
-#: gtk/gtklabel.c:782
+#: ../gtk/gtklabel.c:800
 msgid "Track visited links"
 msgstr "Diferențiază linkurile vizitate"
 
-#: gtk/gtklabel.c:783
+#: ../gtk/gtklabel.c:801
 msgid "Whether visited links should be tracked"
 msgstr "Specifică dacă linkurile vizitate ar trebui să fie diferențiate"
 
-#: gtk/gtklabel.c:904
-msgid "Whether to select the contents of a selectable label when it is focused"
-msgstr ""
-"Specifică dacă la focus să fie selectat conținutul unei etichete selectabile"
-
-#: gtk/gtklayout.c:625 gtk/gtkviewport.c:142
-msgid "Horizontal adjustment"
-msgstr "Ajustare orizontală"
-
-#: gtk/gtklayout.c:626 gtk/gtkscrolledwindow.c:244
-msgid "The GtkAdjustment for the horizontal position"
-msgstr "GtkAdjustment pentru poziția orizontală"
-
-#: gtk/gtklayout.c:633 gtk/gtkviewport.c:150
-msgid "Vertical adjustment"
-msgstr "Ajustare verticală"
-
-#: gtk/gtklayout.c:634 gtk/gtkscrolledwindow.c:251
-msgid "The GtkAdjustment for the vertical position"
-msgstr "GtkAdjustment pentru poziția verticală"
-
-#: gtk/gtklayout.c:641 gtk/gtktreeviewcolumn.c:211
+#: ../gtk/gtklayout.c:659 ../gtk/gtktreeviewcolumn.c:229
 msgid "Width"
 msgstr "Lățime"
 
-#: gtk/gtklayout.c:642
+#: ../gtk/gtklayout.c:660
 msgid "The width of the layout"
 msgstr "Lățimea machetei"
 
-#: gtk/gtklayout.c:650
+#: ../gtk/gtklayout.c:668
 msgid "Height"
 msgstr "Înălțime"
 
-#: gtk/gtklayout.c:651
+#: ../gtk/gtklayout.c:669
 msgid "The height of the layout"
 msgstr "Înălțimea machetei"
 
-#: gtk/gtklinkbutton.c:162
+#: ../gtk/gtklinkbutton.c:174
 msgid "URI"
 msgstr "URI"
 
-#: gtk/gtklinkbutton.c:163
+#: ../gtk/gtklinkbutton.c:175
 msgid "The URI bound to this button"
 msgstr "Adresa URI asociată acestui buton"
 
-#: gtk/gtklinkbutton.c:177
+#: ../gtk/gtklinkbutton.c:189
 msgid "Visited"
 msgstr "Vizitat"
 
-#: gtk/gtklinkbutton.c:178
+#: ../gtk/gtklinkbutton.c:190
 msgid "Whether this link has been visited."
 msgstr "Specifică dacă linkul a fost vizitat."
 
-#: gtk/gtkmenubar.c:163
+#: ../gtk/gtkmenubar.c:170
 msgid "Pack direction"
 msgstr "Direcție de grupare"
 
-#: gtk/gtkmenubar.c:164
+#: ../gtk/gtkmenubar.c:171
 msgid "The pack direction of the menubar"
 msgstr "Direcția de grupare a barei cu unelte"
 
-#: gtk/gtkmenubar.c:180
+#: ../gtk/gtkmenubar.c:187
 msgid "Child Pack direction"
 msgstr "Direcție de grupare a copiilor"
 
-#: gtk/gtkmenubar.c:181
+#: ../gtk/gtkmenubar.c:188
 msgid "The child pack direction of the menubar"
 msgstr "Direcție de grupare a copiilor în bara cu unelte"
 
-#: gtk/gtkmenubar.c:190
+#: ../gtk/gtkmenubar.c:197
 msgid "Style of bevel around the menubar"
 msgstr "Stilul cadrului din jurul barei de meniu"
 
-#: gtk/gtkmenubar.c:197 gtk/gtktoolbar.c:544
+#: ../gtk/gtkmenubar.c:204 ../gtk/gtktoolbar.c:570
 msgid "Internal padding"
 msgstr "Umplutură internă"
 
-#: gtk/gtkmenubar.c:198
+#: ../gtk/gtkmenubar.c:205
 msgid "Amount of border space between the menubar shadow and the menu items"
 msgstr ""
 "Cantitatea de spațiu în marginea dintre umbra barei de meniu și elementele "
 "de meniu"
 
-#: gtk/gtkmenubar.c:205
-msgid "Delay before drop down menus appear"
-msgstr "Întârziere la deschiderea unui meniu"
-
-#: gtk/gtkmenubar.c:206
-msgid "Delay before the submenus of a menu bar appear"
-msgstr "Întârziere la deschiderea sub-meniurilor barei de meniu"
-
-#: gtk/gtkmenu.c:526
+#: ../gtk/gtkmenu.c:522
 msgid "The currently selected menu item"
 msgstr "Elementul selectat curent în meniu."
 
-#: gtk/gtkmenu.c:541
+#: ../gtk/gtkmenu.c:537
 msgid "The accel group holding accelerators for the menu"
 msgstr "Grup de acceleratori pentru acest meniu"
 
-#: gtk/gtkmenu.c:555 gtk/gtkmenuitem.c:318
+#: ../gtk/gtkmenu.c:551 ../gtk/gtkmenuitem.c:316
 msgid "Accel Path"
 msgstr "Cale cu acceleratori"
 
-#: gtk/gtkmenu.c:556
+#: ../gtk/gtkmenu.c:552
 msgid "An accel path used to conveniently construct accel paths of child items"
 msgstr ""
 "O cale cu acceleratori este folosită pentru a construi o cale a "
 "acceleratorilor elementelor copil"
 
-#: gtk/gtkmenu.c:572
+#: ../gtk/gtkmenu.c:568
 msgid "Attach Widget"
 msgstr "Widget ataș"
 
-#: gtk/gtkmenu.c:573
+#: ../gtk/gtkmenu.c:569
 msgid "The widget the menu is attached to"
 msgstr "Widgetul de care se atașează meniul"
 
-#: gtk/gtkmenu.c:581
+#: ../gtk/gtkmenu.c:577
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
@@ -3450,35 +3450,35 @@ msgstr ""
 "Un titlu ce poate fi afișat de către administratorul de ferestre când acest "
 "meniu este desprins"
 
-#: gtk/gtkmenu.c:595
+#: ../gtk/gtkmenu.c:591
 msgid "Tearoff State"
 msgstr "Stare desprindere"
 
-#: gtk/gtkmenu.c:596
+#: ../gtk/gtkmenu.c:592
 msgid "A boolean that indicates whether the menu is torn-off"
 msgstr "Valoare booleană ce indică dacă un meniu este desprins"
 
-#: gtk/gtkmenu.c:610
+#: ../gtk/gtkmenu.c:606
 msgid "Monitor"
 msgstr "Monitor"
 
-#: gtk/gtkmenu.c:611
+#: ../gtk/gtkmenu.c:607
 msgid "The monitor the menu will be popped up on"
 msgstr "Monitorul pe care va fi afișat meniul"
 
-#: gtk/gtkmenu.c:617
+#: ../gtk/gtkmenu.c:613
 msgid "Vertical Padding"
 msgstr "Umplere verticală"
 
-#: gtk/gtkmenu.c:618
+#: ../gtk/gtkmenu.c:614
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Spațiu în plus de adăugat deasupra și dedesubtul meniului"
 
-#: gtk/gtkmenu.c:640
+#: ../gtk/gtkmenu.c:636
 msgid "Reserve Toggle Size"
 msgstr "Rezervă spațiu pentru comutatoare"
 
-#: gtk/gtkmenu.c:641
+#: ../gtk/gtkmenu.c:637
 msgid ""
 "A boolean that indicates whether the menu reserves space for toggles and "
 "icons"
@@ -3486,20 +3486,20 @@ msgstr ""
 "Valoare booleană ce indică dacă în meniu se rezervă spațiu pentru "
 "comutatoare și iconițe"
 
-#: gtk/gtkmenu.c:647
+#: ../gtk/gtkmenu.c:643
 msgid "Horizontal Padding"
 msgstr "Umplere orizontală"
 
-#: gtk/gtkmenu.c:648
+#: ../gtk/gtkmenu.c:644
 msgid "Extra space at the left and right edges of the menu"
 msgstr ""
 "Spațiu în plus de adăugat în marginile din stânga și din dreapta meniului"
 
-#: gtk/gtkmenu.c:656
+#: ../gtk/gtkmenu.c:652
 msgid "Vertical Offset"
 msgstr "Decalaj vertical"
 
-#: gtk/gtkmenu.c:657
+#: ../gtk/gtkmenu.c:653
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
@@ -3507,11 +3507,11 @@ msgstr ""
 "Când meniul este un sub-meniu, va fi poziționat deplasat vertical cu acest "
 "număr de pixeli"
 
-#: gtk/gtkmenu.c:665
+#: ../gtk/gtkmenu.c:661
 msgid "Horizontal Offset"
 msgstr "Decalaj orizontal"
 
-#: gtk/gtkmenu.c:666
+#: ../gtk/gtkmenu.c:662
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
@@ -3519,304 +3519,268 @@ msgstr ""
 "Când meniul este un sub-meniu, va fi poziționat deplasat orizontal cu acest "
 "număr de pixeli"
 
-#: gtk/gtkmenu.c:674
+#: ../gtk/gtkmenu.c:670
 msgid "Double Arrows"
 msgstr "Săgeți duble"
 
-#: gtk/gtkmenu.c:675
+#: ../gtk/gtkmenu.c:671
 msgid "When scrolling, always show both arrows."
 msgstr "La derulare, arată ambele săgeți."
 
-#: gtk/gtkmenu.c:688
+#: ../gtk/gtkmenu.c:684
 msgid "Arrow Placement"
 msgstr "Plasare a săgeții"
 
-#: gtk/gtkmenu.c:689
+#: ../gtk/gtkmenu.c:685
 msgid "Indicates where scroll arrows should be placed"
 msgstr "Indică unde se vor plasa săgețile de derulare"
 
-#: gtk/gtkmenu.c:697
+#: ../gtk/gtkmenu.c:693
 msgid "Left Attach"
 msgstr "Atașare la stânga"
 
-#: gtk/gtkmenu.c:698 gtk/gtktable.c:193
+#: ../gtk/gtkmenu.c:694 ../gtk/gtktable.c:202
 msgid "The column number to attach the left side of the child to"
 msgstr "Numărul coloanei de care se atașează marginea stângă a copilului"
 
-#: gtk/gtkmenu.c:705
+#: ../gtk/gtkmenu.c:701
 msgid "Right Attach"
 msgstr "Atașare la dreapta"
 
-#: gtk/gtkmenu.c:706
+#: ../gtk/gtkmenu.c:702
 msgid "The column number to attach the right side of the child to"
 msgstr "Numărul coloanei de care se atașează marginea stângă a copilului"
 
-#: gtk/gtkmenu.c:713
+#: ../gtk/gtkmenu.c:709
 msgid "Top Attach"
 msgstr "Atașare sus"
 
-#: gtk/gtkmenu.c:714
+#: ../gtk/gtkmenu.c:710
 msgid "The row number to attach the top of the child to"
 msgstr "Numărul rândului de care se atașează vârful unui widget copil"
 
-#: gtk/gtkmenu.c:721
+#: ../gtk/gtkmenu.c:717
 msgid "Bottom Attach"
 msgstr "Atașare jos"
 
-#: gtk/gtkmenu.c:722 gtk/gtktable.c:214
+#: ../gtk/gtkmenu.c:718 ../gtk/gtktable.c:223
 msgid "The row number to attach the bottom of the child to"
 msgstr "Numărul rândului de care se atașează baza unui widget copil"
 
-#: gtk/gtkmenu.c:736
+#: ../gtk/gtkmenu.c:732
 msgid "Arbitrary constant to scale down the size of the scroll arrow"
 msgstr ""
 "Constantă arbitrară pentru micșorarea proporțională a săgeții de derulare"
 
-#: gtk/gtkmenu.c:823
-msgid "Can change accelerators"
-msgstr "Acceleratorii pot fi schimbați"
-
-#: gtk/gtkmenu.c:824
-msgid ""
-"Whether menu accelerators can be changed by pressing a key over the menu item"
-msgstr ""
-"Specifică dacă acceleratorii meniului pot fi schimbați apăsând o tastă când "
-"elementul din meniu este selectat"
-
-#: gtk/gtkmenu.c:829
-msgid "Delay before submenus appear"
-msgstr "Întârziere la apariția sub-meniului"
-
-#: gtk/gtkmenu.c:830
-msgid ""
-"Minimum time the pointer must stay over a menu item before the submenu appear"
-msgstr ""
-"Timpul minim în care cursorul de maus trebuie să staționeze deasupra unui "
-"element din meniu pentru a se deschide sub-meniul"
-
-#: gtk/gtkmenu.c:837
-msgid "Delay before hiding a submenu"
-msgstr "Întârziere la închiderea sub-meniului"
-
-#: gtk/gtkmenu.c:838
-msgid ""
-"The time before hiding a submenu when the pointer is moving towards the "
-"submenu"
-msgstr ""
-"Timpul minim înainte de închiderea unui sub-meniu după ce cursorul de maus a "
-"părăsit sub-meniul"
-
-#: gtk/gtkmenuitem.c:285
+#: ../gtk/gtkmenuitem.c:283
 msgid "Right Justified"
 msgstr "Aliniat la dreapta"
 
-#: gtk/gtkmenuitem.c:286
+#: ../gtk/gtkmenuitem.c:284
 msgid ""
 "Sets whether the menu item appears justified at the right side of a menu bar"
 msgstr ""
 "Specifică dacă elementul din meniu este aliniat la marginea dreaptă a barei "
 "de meniu"
 
-#: gtk/gtkmenuitem.c:300
+#: ../gtk/gtkmenuitem.c:298
 msgid "Submenu"
 msgstr "Sub-meniu"
 
-#: gtk/gtkmenuitem.c:301
+#: ../gtk/gtkmenuitem.c:299
 msgid "The submenu attached to the menu item, or NULL if it has none"
 msgstr "Sub-meniul atașat elemetului meniu sau NULL dacă nu are vreunul"
 
-#: gtk/gtkmenuitem.c:319
+#: ../gtk/gtkmenuitem.c:317
 msgid "Sets the accelerator path of the menu item"
 msgstr "Precizează calea acceleratorului pentru elementul din meniu"
 
-#: gtk/gtkmenuitem.c:334
+#: ../gtk/gtkmenuitem.c:332
 msgid "The text for the child label"
 msgstr "Textul etichetei copilului"
 
-#: gtk/gtkmenuitem.c:397
+#: ../gtk/gtkmenuitem.c:395
 msgid "Amount of space used up by arrow, relative to the menu item's font size"
 msgstr ""
 "Spațiu ocupat de săgeată, relativ la mărimea fontului elementului din meniu"
 
-#: gtk/gtkmenuitem.c:410
+#: ../gtk/gtkmenuitem.c:408
 msgid "Width in Characters"
 msgstr "Lățime în caractere"
 
-#: gtk/gtkmenuitem.c:411
+#: ../gtk/gtkmenuitem.c:409
 msgid "The minimum desired width of the menu item in characters"
 msgstr "Lățimea minimă dorită a elementului de meniu, în caractere"
 
-#: gtk/gtkmenushell.c:379
+#: ../gtk/gtkmenushell.c:379
 msgid "Take Focus"
 msgstr "Preluare focus"
 
-#: gtk/gtkmenushell.c:380
+#: ../gtk/gtkmenushell.c:380
 msgid "A boolean that determines whether the menu grabs the keyboard focus"
 msgstr "Valoare booleană ce indică dacă meniul preia focusul tastaturii"
 
-#: gtk/gtkmenutoolbutton.c:246
+#: ../gtk/gtkmenutoolbutton.c:246
 msgid "Menu"
 msgstr "Meniu"
 
-#: gtk/gtkmenutoolbutton.c:247
+#: ../gtk/gtkmenutoolbutton.c:247
 msgid "The dropdown menu"
 msgstr "Meniu „dropdown”"
 
-#: gtk/gtkmessagedialog.c:184
+#: ../gtk/gtkmessagedialog.c:184
 msgid "Image/label border"
 msgstr "Margine imagine/etichetă"
 
-#: gtk/gtkmessagedialog.c:185
+#: ../gtk/gtkmessagedialog.c:185
 msgid "Width of border around the label and image in the message dialog"
 msgstr "Lățimea marginii din jurul etichetei și imaginii dintr-un mesaj dialog"
 
-#: gtk/gtkmessagedialog.c:209
+#: ../gtk/gtkmessagedialog.c:209
 msgid "Message Buttons"
 msgstr "Butoane mesaj"
 
-#: gtk/gtkmessagedialog.c:210
+#: ../gtk/gtkmessagedialog.c:210
 msgid "The buttons shown in the message dialog"
 msgstr "Butoanele vizibile într-un mesaj dialog"
 
-#: gtk/gtkmessagedialog.c:227
+#: ../gtk/gtkmessagedialog.c:227
 msgid "The primary text of the message dialog"
 msgstr "Textul principal al unui mesaj dialog"
 
-#: gtk/gtkmessagedialog.c:242
+#: ../gtk/gtkmessagedialog.c:242
 msgid "Use Markup"
 msgstr "Utilizează marcare"
 
-#: gtk/gtkmessagedialog.c:243
+#: ../gtk/gtkmessagedialog.c:243
 msgid "The primary text of the title includes Pango markup."
 msgstr "Textul principal al titlului include marcare Pango."
 
-#: gtk/gtkmessagedialog.c:257
+#: ../gtk/gtkmessagedialog.c:257
 msgid "Secondary Text"
 msgstr "Text secundar"
 
-#: gtk/gtkmessagedialog.c:258
+#: ../gtk/gtkmessagedialog.c:258
 msgid "The secondary text of the message dialog"
 msgstr "Textul secundar al unui mesaj dialog"
 
-#: gtk/gtkmessagedialog.c:273
+#: ../gtk/gtkmessagedialog.c:273
 msgid "Use Markup in secondary"
 msgstr "Utilizează marcare secundară"
 
-#: gtk/gtkmessagedialog.c:274
+#: ../gtk/gtkmessagedialog.c:274
 msgid "The secondary text includes Pango markup."
 msgstr "Textul secundar include marcare Pango."
 
-#: gtk/gtkmessagedialog.c:288
+#: ../gtk/gtkmessagedialog.c:288
 msgid "Image"
 msgstr "Imagine"
 
-#: gtk/gtkmessagedialog.c:289
+#: ../gtk/gtkmessagedialog.c:289
 msgid "The image"
 msgstr "Imaginea"
 
-#: gtk/gtkmessagedialog.c:305
+#: ../gtk/gtkmessagedialog.c:305
 msgid "Message area"
 msgstr "Zonă mesaj"
 
-#: gtk/gtkmessagedialog.c:306
+#: ../gtk/gtkmessagedialog.c:306
 msgid "GtkVBox that holds the dialog's primary and secondary labels"
 msgstr "GtkVBox care conține etichetele principale și secundare ale dialogului"
 
-#: gtk/gtkmisc.c:91
+#: ../gtk/gtkmisc.c:91
 msgid "Y align"
 msgstr "Aliniere Y"
 
-#: gtk/gtkmisc.c:92
+#: ../gtk/gtkmisc.c:92
 msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
 msgstr "Alinierea verticală, de la 0 (sus) la 1 (jos)"
 
-#: gtk/gtkmisc.c:101
+#: ../gtk/gtkmisc.c:101
 msgid "X pad"
 msgstr "Umplutură X"
 
-#: gtk/gtkmisc.c:102
+#: ../gtk/gtkmisc.c:102
 msgid ""
 "The amount of space to add on the left and right of the widget, in pixels"
 msgstr ""
 "Cantitatea de spațiu de adăugat la stânga și dreapta widgetului, în pixeli"
 
-#: gtk/gtkmisc.c:111
+#: ../gtk/gtkmisc.c:111
 msgid "Y pad"
 msgstr "Umplutură Y"
 
-#: gtk/gtkmisc.c:112
+#: ../gtk/gtkmisc.c:112
 msgid ""
 "The amount of space to add on the top and bottom of the widget, in pixels"
 msgstr ""
 "Cantitatea de spațiu de adăugat deasupra și dedesubtul widgetului, în pixeli"
 
-#: gtk/gtkmountoperation.c:159
+#: ../gtk/gtkmountoperation.c:159
 msgid "Parent"
 msgstr "Părinte"
 
-#: gtk/gtkmountoperation.c:160
+#: ../gtk/gtkmountoperation.c:160
 msgid "The parent window"
 msgstr "Fereastra părinte"
 
-#: gtk/gtkmountoperation.c:167
+#: ../gtk/gtkmountoperation.c:167
 msgid "Is Showing"
 msgstr "În afișare"
 
-#: gtk/gtkmountoperation.c:168
+#: ../gtk/gtkmountoperation.c:168
 msgid "Are we showing a dialog"
 msgstr "Se arată un dialog?"
 
-#: gtk/gtkmountoperation.c:176
+#: ../gtk/gtkmountoperation.c:176
 msgid "The screen where this window will be displayed."
 msgstr "Ecranul unde această fereastră va fi afișată."
 
-#: gtk/gtknotebook.c:595
+#: ../gtk/gtknotebook.c:689
 msgid "Page"
 msgstr "Pagină"
 
-#: gtk/gtknotebook.c:596
+#: ../gtk/gtknotebook.c:690
 msgid "The index of the current page"
 msgstr "Indexul paginii curente"
 
-#: gtk/gtknotebook.c:604
+#: ../gtk/gtknotebook.c:698
 msgid "Tab Position"
 msgstr "Poziție taburi"
 
-#: gtk/gtknotebook.c:605
+#: ../gtk/gtknotebook.c:699
 msgid "Which side of the notebook holds the tabs"
 msgstr "În care parte a ferestrelor „notebook” apar taburile"
 
-#: gtk/gtknotebook.c:612
+#: ../gtk/gtknotebook.c:706
 msgid "Show Tabs"
 msgstr "Arată taburi"
 
-#: gtk/gtknotebook.c:613
-#, fuzzy
+#: ../gtk/gtknotebook.c:707
 msgid "Whether tabs should be shown"
-msgstr "Specifică dacă ar trebui afișate taburile sau nu"
+msgstr "Specifică dacă ar trebui afișate taburile"
 
-#: gtk/gtknotebook.c:619
+#: ../gtk/gtknotebook.c:713
 msgid "Show Border"
 msgstr "Arată margini"
 
-#: gtk/gtknotebook.c:620
-#, fuzzy
+#: ../gtk/gtknotebook.c:714
 msgid "Whether the border should be shown"
-msgstr "Specifică dacă ar trebui arătate marginile sau nu"
+msgstr "Specifică dacă ar trebui arătate marginile"
 
-#: gtk/gtknotebook.c:626
+#: ../gtk/gtknotebook.c:720
 msgid "Scrollable"
 msgstr "Defilabil"
 
-#: gtk/gtknotebook.c:627
+#: ../gtk/gtknotebook.c:721
 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
 msgstr "La activare, se adaugă săgeți de defilare dacă sunt prea multe taburi"
 
-#: gtk/gtknotebook.c:633
+#: ../gtk/gtknotebook.c:727
 msgid "Enable Popup"
 msgstr "Activează „popup”"
 
-#: gtk/gtknotebook.c:634
+#: ../gtk/gtknotebook.c:728
 msgid ""
 "If TRUE, pressing the right mouse button on the notebook pops up a menu that "
 "you can use to go to a page"
@@ -3824,328 +3788,325 @@ msgstr ""
 "La activare, un clic dreapta de maus pe o fereastră „notebook” va deschide "
 "un meniu pentru comutarea între taburi"
 
-#: gtk/gtknotebook.c:648
-#, fuzzy
+#: ../gtk/gtknotebook.c:742
 msgid "Group Name"
-msgstr "ID grup"
+msgstr "Nume grup"
 
-#: gtk/gtknotebook.c:649
-#, fuzzy
+#: ../gtk/gtknotebook.c:743
 msgid "Group name for tab drag and drop"
-msgstr "Grup pentru tragerea taburilor"
+msgstr "Nume grup pentru tragerea şi plasarea taburilor"
 
-#: gtk/gtknotebook.c:656
+#: ../gtk/gtknotebook.c:750
 msgid "Tab label"
 msgstr "Etichetă tab"
 
-#: gtk/gtknotebook.c:657
+#: ../gtk/gtknotebook.c:751
 msgid "The string displayed on the child's tab label"
 msgstr "Șirul afișat în eticheta tabului copil"
 
-#: gtk/gtknotebook.c:663
+#: ../gtk/gtknotebook.c:757
 msgid "Menu label"
 msgstr "Etichetă meniu"
 
-#: gtk/gtknotebook.c:664
+#: ../gtk/gtknotebook.c:758
 msgid "The string displayed in the child's menu entry"
 msgstr "Șirul afișat în intrarea de meniu a copilului"
 
-#: gtk/gtknotebook.c:677
+#: ../gtk/gtknotebook.c:771
 msgid "Tab expand"
 msgstr "Desfășurare tab"
 
-#: gtk/gtknotebook.c:678
-#, fuzzy
+#: ../gtk/gtknotebook.c:772
 msgid "Whether to expand the child's tab"
-msgstr "Specifică dacă ar trebui desfășurate taburile copilului sau nu"
+msgstr "Specifică dacă ar trebui extins tabul copilului"
 
-#: gtk/gtknotebook.c:684
+#: ../gtk/gtknotebook.c:778
 msgid "Tab fill"
 msgstr "Umplere tab"
 
-#: gtk/gtknotebook.c:685
-#, fuzzy
+#: ../gtk/gtknotebook.c:779
 msgid "Whether the child's tab should fill the allocated area"
-msgstr "Daca taburile copilului ar trebui să umple zona alocată sau nu"
+msgstr "Specifică dacă tabul copilului ar trebui să umple zona alocată"
 
-#: gtk/gtknotebook.c:691
+#: ../gtk/gtknotebook.c:792
 msgid "Tab pack type"
 msgstr "Tipul împachetării taburilor"
 
-#: gtk/gtknotebook.c:698
+#: ../gtk/gtknotebook.c:799
 msgid "Tab reorderable"
 msgstr "Tab reordonabil"
 
-#: gtk/gtknotebook.c:699
-#, fuzzy
+#: ../gtk/gtknotebook.c:800
 msgid "Whether the tab is reorderable by user action"
-msgstr "Specifică dacă tabul este sau nu reordonabil de către utilizator"
+msgstr ""
+"Specifică dacă tabul este sau nu reordonabil de acțiuni ale utilizatorului"
 
-#: gtk/gtknotebook.c:705
+#: ../gtk/gtknotebook.c:806
 msgid "Tab detachable"
 msgstr "Tab detașabil"
 
-#: gtk/gtknotebook.c:706
+#: ../gtk/gtknotebook.c:807
 msgid "Whether the tab is detachable"
 msgstr "Specifică dacă tabul este detașabil"
 
-#: gtk/gtknotebook.c:721 gtk/gtkscrollbar.c:80
+#: ../gtk/gtknotebook.c:822 ../gtk/gtkscrollbar.c:105
 msgid "Secondary backward stepper"
 msgstr "Buton secundar de derulare înapoi"
 
-#: gtk/gtknotebook.c:722
+#: ../gtk/gtknotebook.c:823
 msgid ""
 "Display a second backward arrow button on the opposite end of the tab area"
 msgstr ""
 "Arată un buton secundar de derulare înapoi la capătul opus al zonei taburilor"
 
-#: gtk/gtknotebook.c:737 gtk/gtkscrollbar.c:87
+#: ../gtk/gtknotebook.c:838 ../gtk/gtkscrollbar.c:112
 msgid "Secondary forward stepper"
 msgstr "Buton secundar de derulare înainte"
 
-#: gtk/gtknotebook.c:738
+#: ../gtk/gtknotebook.c:839
 msgid ""
 "Display a second forward arrow button on the opposite end of the tab area"
 msgstr ""
 "Arată un buton secundar de derulare înainte la capătul opus al zonei "
 "taburilor"
 
-#: gtk/gtknotebook.c:752 gtk/gtkscrollbar.c:66
+#: ../gtk/gtknotebook.c:853 ../gtk/gtkscrollbar.c:91
 msgid "Backward stepper"
 msgstr "Buton de derulare înapoi"
 
-#: gtk/gtknotebook.c:753 gtk/gtkscrollbar.c:67
+#: ../gtk/gtknotebook.c:854 ../gtk/gtkscrollbar.c:92
 msgid "Display the standard backward arrow button"
 msgstr "Arată săgeata standard pentru butonul de derulare înapoi"
 
-#: gtk/gtknotebook.c:767 gtk/gtkscrollbar.c:73
+#: ../gtk/gtknotebook.c:868 ../gtk/gtkscrollbar.c:98
 msgid "Forward stepper"
 msgstr "Buton de derulare înainte"
 
-#: gtk/gtknotebook.c:768 gtk/gtkscrollbar.c:74
+#: ../gtk/gtknotebook.c:869 ../gtk/gtkscrollbar.c:99
 msgid "Display the standard forward arrow button"
 msgstr "Arată săgeata standard pentru butonul de derulare înainte"
 
-#: gtk/gtknotebook.c:782
+#: ../gtk/gtknotebook.c:883
 msgid "Tab overlap"
 msgstr "Suprapunere tab"
 
-#: gtk/gtknotebook.c:783
+#: ../gtk/gtknotebook.c:884
 msgid "Size of tab overlap area"
 msgstr "Mărimea ariei de suprapunere a taburilor"
 
-#: gtk/gtknotebook.c:798
+#: ../gtk/gtknotebook.c:899
 msgid "Tab curvature"
 msgstr "Curbură tab"
 
-#: gtk/gtknotebook.c:799
+#: ../gtk/gtknotebook.c:900
 msgid "Size of tab curvature"
 msgstr "Mărimea curbării tabului"
 
-#: gtk/gtknotebook.c:815
+#: ../gtk/gtknotebook.c:916
 msgid "Arrow spacing"
 msgstr "Spațiere săgeată"
 
-#: gtk/gtknotebook.c:816
+#: ../gtk/gtknotebook.c:917
 msgid "Scroll arrow spacing"
 msgstr "Spațiere săgeată de defilare"
 
-#: gtk/gtkorientable.c:63 gtk/gtkstatusicon.c:319 gtk/gtktrayicon-x11.c:124
+#: ../gtk/gtkorientable.c:63 ../gtk/gtkstatusicon.c:319
+#: ../gtk/gtktrayicon-x11.c:124
 msgid "Orientation"
 msgstr "Orientare"
 
-#: gtk/gtkorientable.c:64
+#: ../gtk/gtkorientable.c:64
 msgid "The orientation of the orientable"
 msgstr "Orientarea orientabilității"
 
-#: gtk/gtkpaned.c:271
+#: ../gtk/gtkpaned.c:328
 msgid ""
 "Position of paned separator in pixels (0 means all the way to the left/top)"
 msgstr ""
 "Poziția separatorului în pixeli (0 este poziția din colțul din stânga sus)"
 
-#: gtk/gtkpaned.c:280
+#: ../gtk/gtkpaned.c:337
 msgid "Position Set"
 msgstr "Setare poziție"
 
-#: gtk/gtkpaned.c:281
+#: ../gtk/gtkpaned.c:338
 msgid "TRUE if the Position property should be used"
 msgstr "La activare, proprietatea „Poziție” ar trebui utilizată"
 
-#: gtk/gtkpaned.c:287
+#: ../gtk/gtkpaned.c:344
 msgid "Handle Size"
 msgstr "Mărime prindere"
 
-#: gtk/gtkpaned.c:288
+#: ../gtk/gtkpaned.c:345
 msgid "Width of handle"
 msgstr "Lățime prindere"
 
-#: gtk/gtkpaned.c:304
+#: ../gtk/gtkpaned.c:361
 msgid "Minimal Position"
 msgstr "Poziție minimă"
 
-#: gtk/gtkpaned.c:305
+#: ../gtk/gtkpaned.c:362
 msgid "Smallest possible value for the \"position\" property"
 msgstr "Cea mai mică valoare posibilă pentru proprietatea „Poziție”"
 
-#: gtk/gtkpaned.c:322
+#: ../gtk/gtkpaned.c:379
 msgid "Maximal Position"
 msgstr "Poziție maximă"
 
-#: gtk/gtkpaned.c:323
+#: ../gtk/gtkpaned.c:380
 msgid "Largest possible value for the \"position\" property"
 msgstr "Cea mai mare valoare posibilă pentru proprietatea „Poziție”"
 
-#: gtk/gtkpaned.c:340
+#: ../gtk/gtkpaned.c:397
 msgid "Resize"
 msgstr "Redimensionabil"
 
-#: gtk/gtkpaned.c:341
+#: ../gtk/gtkpaned.c:398
 msgid "If TRUE, the child expands and shrinks along with the paned widget"
 msgstr "La activare, copilul se desfășoară și se strânge împreună cu widgetul"
 
-#: gtk/gtkpaned.c:356
+#: ../gtk/gtkpaned.c:413
 msgid "Shrink"
 msgstr "Permite micșorare"
 
-#: gtk/gtkpaned.c:357
+#: ../gtk/gtkpaned.c:414
 msgid "If TRUE, the child can be made smaller than its requisition"
 msgstr "La activare, copilul poate fi făcut mai mic decât se cere inițial"
 
-#: gtk/gtkplug.c:171 gtk/gtkstatusicon.c:303
+#: ../gtk/gtkplug.c:172 ../gtk/gtkstatusicon.c:303
 msgid "Embedded"
 msgstr "Încastrat"
 
-#: gtk/gtkplug.c:172
-#, fuzzy
+#: ../gtk/gtkplug.c:173
 msgid "Whether the plug is embedded"
-msgstr "Specifică dacă elementul este înglobat"
+msgstr "Specifică dacă obiectul „plug” este înglobat"
 
-#: gtk/gtkplug.c:186
+#: ../gtk/gtkplug.c:187
 msgid "Socket Window"
 msgstr "Fereastră socket"
 
-#: gtk/gtkplug.c:187
+#: ../gtk/gtkplug.c:188
 msgid "The window of the socket the plug is embedded in"
 msgstr "Fereastra socketului în care intră conectorul"
 
-#: gtk/gtkprinter.c:126
+#: ../gtk/gtkprinter.c:126
 msgid "Name of the printer"
 msgstr "Nume imprimantă"
 
-#: gtk/gtkprinter.c:132
+#: ../gtk/gtkprinter.c:132
 msgid "Backend"
 msgstr "Suport"
 
-#: gtk/gtkprinter.c:133
+#: ../gtk/gtkprinter.c:133
 msgid "Backend for the printer"
 msgstr "Suport pentru imprimantă"
 
-#: gtk/gtkprinter.c:139
+#: ../gtk/gtkprinter.c:139
 msgid "Is Virtual"
 msgstr "E virtuală"
 
-#: gtk/gtkprinter.c:140
+#: ../gtk/gtkprinter.c:140
 msgid "FALSE if this represents a real hardware printer"
 msgstr "FALSE dacă este vorba despre o imprimantă hardware"
 
-#: gtk/gtkprinter.c:146
+#: ../gtk/gtkprinter.c:146
 msgid "Accepts PDF"
 msgstr "Acceptă PDF"
 
-#: gtk/gtkprinter.c:147
+#: ../gtk/gtkprinter.c:147
 msgid "TRUE if this printer can accept PDF"
 msgstr "TRUE dacă această imprimantă acceptă formatul PDF"
 
-#: gtk/gtkprinter.c:153
+#: ../gtk/gtkprinter.c:153
 msgid "Accepts PostScript"
 msgstr "Acceptă PostScript"
 
-#: gtk/gtkprinter.c:154
+#: ../gtk/gtkprinter.c:154
 msgid "TRUE if this printer can accept PostScript"
 msgstr "TRUE dacă această imprimantă acceptă formatul PostScript"
 
-#: gtk/gtkprinter.c:160
+#: ../gtk/gtkprinter.c:160
 msgid "State Message"
 msgstr "Mesaj de stare"
 
-#: gtk/gtkprinter.c:161
+#: ../gtk/gtkprinter.c:161
 msgid "String giving the current state of the printer"
 msgstr "Șir de caractere ce specifică starea curentă a imprimantei"
 
-#: gtk/gtkprinter.c:167
+#: ../gtk/gtkprinter.c:167
 msgid "Location"
 msgstr "Locație"
 
-#: gtk/gtkprinter.c:168
+#: ../gtk/gtkprinter.c:168
 msgid "The location of the printer"
 msgstr "Locația imprimantei"
 
-#: gtk/gtkprinter.c:175
+#: ../gtk/gtkprinter.c:175
 msgid "The icon name to use for the printer"
 msgstr "Nume iconiță de utilizat pentru imprimantă"
 
-#: gtk/gtkprinter.c:181
+#: ../gtk/gtkprinter.c:181
 msgid "Job Count"
 msgstr "Contor sarcini"
 
-#: gtk/gtkprinter.c:182
+#: ../gtk/gtkprinter.c:182
 msgid "Number of jobs queued in the printer"
 msgstr "Număr de sarcini încolonate la tipărire"
 
-#: gtk/gtkprinter.c:200
+#: ../gtk/gtkprinter.c:200
 msgid "Paused Printer"
 msgstr "Imprimantă în pauză"
 
-#: gtk/gtkprinter.c:201
+#: ../gtk/gtkprinter.c:201
 msgid "TRUE if this printer is paused"
 msgstr "Activat dacă această imprimantă este într-o pauză"
 
-#: gtk/gtkprinter.c:214
+#: ../gtk/gtkprinter.c:214
 msgid "Accepting Jobs"
 msgstr "Acceptă sarcini"
 
-#: gtk/gtkprinter.c:215
+#: ../gtk/gtkprinter.c:215
 msgid "TRUE if this printer is accepting new jobs"
 msgstr "Activat dacă această imprimantă acceptă sarcini noi de tipărire"
 
-#: gtk/gtkprinteroptionwidget.c:122
+#: ../gtk/gtkprinteroptionwidget.c:121
 msgid "Source option"
 msgstr "Opțiune sursă"
 
-#: gtk/gtkprinteroptionwidget.c:123
+#: ../gtk/gtkprinteroptionwidget.c:122
 msgid "The PrinterOption backing this widget"
 msgstr "Opțiune PrinterOption ce suportă acest widget"
 
-#: gtk/gtkprintjob.c:116
+#: ../gtk/gtkprintjob.c:116
 msgid "Title of the print job"
 msgstr "Titlul ferestrei de tipărire"
 
-#: gtk/gtkprintjob.c:124
+#: ../gtk/gtkprintjob.c:124
 msgid "Printer"
 msgstr "Imprimantă"
 
-#: gtk/gtkprintjob.c:125
+#: ../gtk/gtkprintjob.c:125
 msgid "Printer to print the job to"
 msgstr "Imprimantă căreia i se va trimite sarcina"
 
-#: gtk/gtkprintjob.c:133
+#: ../gtk/gtkprintjob.c:133
 msgid "Settings"
 msgstr "Opțiuni"
 
-#: gtk/gtkprintjob.c:134
+#: ../gtk/gtkprintjob.c:134
 msgid "Printer settings"
 msgstr "Opțiuni imprimantă"
 
-#: gtk/gtkprintjob.c:142 gtk/gtkprintjob.c:143 gtk/gtkprintunixdialog.c:298
+#: ../gtk/gtkprintjob.c:142 ../gtk/gtkprintjob.c:143
+#: ../gtk/gtkprintunixdialog.c:298
 msgid "Page Setup"
 msgstr "Opțiuni pagină"
 
-#: gtk/gtkprintjob.c:151 gtk/gtkprintoperation.c:1133
+#: ../gtk/gtkprintjob.c:151 ../gtk/gtkprintoperation.c:1133
 msgid "Track Print Status"
 msgstr "Urmărește starea imprimantei"
 
-#: gtk/gtkprintjob.c:152
+#: ../gtk/gtkprintjob.c:152
 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."
@@ -4153,52 +4114,52 @@ msgstr ""
 "TRUE dacă sarcina de tipărire va continua să emită semnale de schimbare a "
 "stării după ce datele de tipărit au fost trimise imprimantei."
 
-#: gtk/gtkprintoperation.c:1005
+#: ../gtk/gtkprintoperation.c:1005
 msgid "Default Page Setup"
 msgstr "Opțiuni pagină implicită"
 
-#: gtk/gtkprintoperation.c:1006
+#: ../gtk/gtkprintoperation.c:1006
 msgid "The GtkPageSetup used by default"
 msgstr "GtkPageSetup de utilizat implicit"
 
-#: gtk/gtkprintoperation.c:1024 gtk/gtkprintunixdialog.c:316
+#: ../gtk/gtkprintoperation.c:1024 ../gtk/gtkprintunixdialog.c:316
 msgid "Print Settings"
 msgstr "Opțiuni tipărire"
 
-#: gtk/gtkprintoperation.c:1025 gtk/gtkprintunixdialog.c:317
+#: ../gtk/gtkprintoperation.c:1025 ../gtk/gtkprintunixdialog.c:317
 msgid "The GtkPrintSettings used for initializing the dialog"
 msgstr "GtkPrintSettings de utilizat pentru inițializarea dialogului"
 
-#: gtk/gtkprintoperation.c:1043
+#: ../gtk/gtkprintoperation.c:1043
 msgid "Job Name"
 msgstr "Nume sarcină"
 
-#: gtk/gtkprintoperation.c:1044
+#: ../gtk/gtkprintoperation.c:1044
 msgid "A string used for identifying the print job."
 msgstr ""
 "Un șir de caractere utilizat pentru identificarea sarcinii de tipărire."
 
-#: gtk/gtkprintoperation.c:1068
+#: ../gtk/gtkprintoperation.c:1068
 msgid "Number of Pages"
 msgstr "Număr de pagini"
 
-#: gtk/gtkprintoperation.c:1069
+#: ../gtk/gtkprintoperation.c:1069
 msgid "The number of pages in the document."
 msgstr "Numărul de pagini în document."
 
-#: gtk/gtkprintoperation.c:1090 gtk/gtkprintunixdialog.c:306
+#: ../gtk/gtkprintoperation.c:1090 ../gtk/gtkprintunixdialog.c:306
 msgid "Current Page"
 msgstr "Pagină curentă"
 
-#: gtk/gtkprintoperation.c:1091 gtk/gtkprintunixdialog.c:307
+#: ../gtk/gtkprintoperation.c:1091 ../gtk/gtkprintunixdialog.c:307
 msgid "The current page in the document"
 msgstr "Pagina curentă în document"
 
-#: gtk/gtkprintoperation.c:1112
+#: ../gtk/gtkprintoperation.c:1112
 msgid "Use full page"
 msgstr "Utilizează toată pagina"
 
-#: gtk/gtkprintoperation.c:1113
+#: ../gtk/gtkprintoperation.c:1113
 msgid ""
 "TRUE if the origin of the context should be at the corner of the page and "
 "not the corner of the imageable area"
@@ -4206,7 +4167,7 @@ msgstr ""
 "TRUE dacă originea contextului ar trebui sa fie în colțul paginii și nu în "
 "colțul ariei imaginabile"
 
-#: gtk/gtkprintoperation.c:1134
+#: ../gtk/gtkprintoperation.c:1134
 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."
@@ -4214,156 +4175,155 @@ msgstr ""
 "TRUE dacă operațiunea de tipărire va continua să raporteze starea sarcinii "
 "de tipărire după ce datele necesare au fost trimise imprimantei."
 
-#: gtk/gtkprintoperation.c:1151
+#: ../gtk/gtkprintoperation.c:1151
 msgid "Unit"
 msgstr "Unitate"
 
-#: gtk/gtkprintoperation.c:1152
+#: ../gtk/gtkprintoperation.c:1152
 msgid "The unit in which distances can be measured in the context"
 msgstr "Unitate de măsură de utilizat în acest context"
 
-#: gtk/gtkprintoperation.c:1169
+#: ../gtk/gtkprintoperation.c:1169
 msgid "Show Dialog"
 msgstr "Arată progresul"
 
-#: gtk/gtkprintoperation.c:1170
+#: ../gtk/gtkprintoperation.c:1170
 msgid "TRUE if a progress dialog is shown while printing."
 msgstr ""
 "TRUE dacă ar trebui să se arate un dialog de progres în timpul tipăririi."
 
-#: gtk/gtkprintoperation.c:1193
+#: ../gtk/gtkprintoperation.c:1193
 msgid "Allow Async"
 msgstr "Procesare asincronă"
 
-#: gtk/gtkprintoperation.c:1194
+#: ../gtk/gtkprintoperation.c:1194
 msgid "TRUE if print process may run asynchronous."
 msgstr "TRUE dacă procesul de tipărire se poate desfășura asincron."
 
-#: gtk/gtkprintoperation.c:1216 gtk/gtkprintoperation.c:1217
+#: ../gtk/gtkprintoperation.c:1216 ../gtk/gtkprintoperation.c:1217
 msgid "Export filename"
 msgstr "Exportă numele de fișier"
 
-#: gtk/gtkprintoperation.c:1231
+#: ../gtk/gtkprintoperation.c:1231
 msgid "Status"
 msgstr "Stare"
 
-#: gtk/gtkprintoperation.c:1232
+#: ../gtk/gtkprintoperation.c:1232
 msgid "The status of the print operation"
 msgstr "Starea operațiunii de tipărire"
 
-#: gtk/gtkprintoperation.c:1252
+#: ../gtk/gtkprintoperation.c:1252
 msgid "Status String"
 msgstr "Descriere stare"
 
-#: gtk/gtkprintoperation.c:1253
+#: ../gtk/gtkprintoperation.c:1253
 msgid "A human-readable description of the status"
 msgstr "O descriere ușor de înțeles a stării"
 
-#: gtk/gtkprintoperation.c:1271
+#: ../gtk/gtkprintoperation.c:1271
 msgid "Custom tab label"
 msgstr "Etichetă tab personalizată"
 
-#: gtk/gtkprintoperation.c:1272
+#: ../gtk/gtkprintoperation.c:1272
 msgid "Label for the tab containing custom widgets."
 msgstr "Etichetă pentru tabul ce conține widgeturi personalizate."
 
-#: gtk/gtkprintoperation.c:1287 gtk/gtkprintunixdialog.c:341
+#: ../gtk/gtkprintoperation.c:1287 ../gtk/gtkprintunixdialog.c:341
 msgid "Support Selection"
 msgstr "Implementează selecție"
 
-#: gtk/gtkprintoperation.c:1288
+#: ../gtk/gtkprintoperation.c:1288
 msgid "TRUE if the print operation will support print of selection."
 msgstr ""
 "TRUE dacă operațiunea de tipărire implementează tipărirea unei selecții."
 
-#: gtk/gtkprintoperation.c:1304 gtk/gtkprintunixdialog.c:349
+#: ../gtk/gtkprintoperation.c:1304 ../gtk/gtkprintunixdialog.c:349
 msgid "Has Selection"
 msgstr "Are selecție"
 
-#: gtk/gtkprintoperation.c:1305
+#: ../gtk/gtkprintoperation.c:1305
 msgid "TRUE if a selection exists."
 msgstr "TRUE dacă există o selecție."
 
-#: gtk/gtkprintoperation.c:1320 gtk/gtkprintunixdialog.c:357
+#: ../gtk/gtkprintoperation.c:1320 ../gtk/gtkprintunixdialog.c:357
 msgid "Embed Page Setup"
 msgstr "Opțiuni înglobate de pagină"
 
-#: gtk/gtkprintoperation.c:1321
+#: ../gtk/gtkprintoperation.c:1321
 msgid "TRUE if page setup combos are embedded in GtkPrintDialog"
 msgstr "TRUE dacă listele de opțiuni sunt înglobate în GtkPrintDialog"
 
-#: gtk/gtkprintoperation.c:1342
+#: ../gtk/gtkprintoperation.c:1342
 msgid "Number of Pages To Print"
 msgstr "Numărul paginilor de tipărit"
 
-#: gtk/gtkprintoperation.c:1343
+#: ../gtk/gtkprintoperation.c:1343
 msgid "The number of pages that will be printed."
 msgstr "Numărul paginilor ce vor fi tipărite."
 
-#: gtk/gtkprintunixdialog.c:299
+#: ../gtk/gtkprintunixdialog.c:299
 msgid "The GtkPageSetup to use"
 msgstr "GtkPageSetup de utilizat"
 
-#: gtk/gtkprintunixdialog.c:324
+#: ../gtk/gtkprintunixdialog.c:324
 msgid "Selected Printer"
 msgstr "Imprimantă selectată"
 
-#: gtk/gtkprintunixdialog.c:325
+#: ../gtk/gtkprintunixdialog.c:325
 msgid "The GtkPrinter which is selected"
 msgstr "GtkPrinter selectat."
 
-#: gtk/gtkprintunixdialog.c:332
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:332
 msgid "Manual Capabilities"
-msgstr "Facilități manuale"
+msgstr "Capabilitățile manuale"
 
-#: gtk/gtkprintunixdialog.c:333
+#: ../gtk/gtkprintunixdialog.c:333
 msgid "Capabilities the application can handle"
-msgstr "Facilități implementate în aplicație"
+msgstr "Capabilitățile implementate în aplicație"
 
-#: gtk/gtkprintunixdialog.c:342
+#: ../gtk/gtkprintunixdialog.c:342
 msgid "Whether the dialog supports selection"
 msgstr "Specifică dacă dialogul implementează selecția"
 
-#: gtk/gtkprintunixdialog.c:350
+#: ../gtk/gtkprintunixdialog.c:350
 msgid "Whether the application has a selection"
 msgstr "Specifică dacă aplicația are o selecție"
 
-#: gtk/gtkprintunixdialog.c:358
+#: ../gtk/gtkprintunixdialog.c:358
 msgid "TRUE if page setup combos are embedded in GtkPrintUnixDialog"
 msgstr ""
 "TRUE dacă listele cu opțiunile de pagină sunt înglobate în GtkPrintUnixDialog"
 
-#: gtk/gtkprogressbar.c:134
+#: ../gtk/gtkprogressbar.c:161
 msgid "Fraction"
 msgstr "Porțiune"
 
-#: gtk/gtkprogressbar.c:135
+#: ../gtk/gtkprogressbar.c:162
 msgid "The fraction of total work that has been completed"
 msgstr "Porțiunea terminată din sarcina de efectuat"
 
-#: gtk/gtkprogressbar.c:142
+#: ../gtk/gtkprogressbar.c:169
 msgid "Pulse Step"
 msgstr "Pas puls"
 
-#: gtk/gtkprogressbar.c:143
+#: ../gtk/gtkprogressbar.c:170
 msgid "The fraction of total progress to move the bouncing block when pulsed"
 msgstr ""
 "Porțiunea din progresul total cu care se mută blocul „bouncing” la puls"
 
-#: gtk/gtkprogressbar.c:151
+#: ../gtk/gtkprogressbar.c:178
 msgid "Text to be displayed in the progress bar"
 msgstr "Textul de afișat în bara de progres"
 
-#: gtk/gtkprogressbar.c:158
+#: ../gtk/gtkprogressbar.c:185
 msgid "Show text"
 msgstr "Arată text"
 
-#: gtk/gtkprogressbar.c:159
+#: ../gtk/gtkprogressbar.c:186
 msgid "Whether the progress is shown as text."
 msgstr "Specifică dacă progresul este afișat ca text."
 
-#: gtk/gtkprogressbar.c:181
+#: ../gtk/gtkprogressbar.c:208
 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."
@@ -4371,65 +4331,59 @@ msgstr ""
 "Felul preferat de a prescurta un șir de caractere, dacă nu există destul loc "
 "în bara de progres pentru a afișa întregul șir, doar parțial."
 
-#: gtk/gtkprogressbar.c:188
-#, fuzzy
+#: ../gtk/gtkprogressbar.c:215
 msgid "X spacing"
-msgstr "SpațiereX"
+msgstr "Spațiere X"
 
-#: gtk/gtkprogressbar.c:189
+#: ../gtk/gtkprogressbar.c:216
 msgid "Extra spacing applied to the width of a progress bar."
 msgstr "Spațiu extra adăugat lățimii unei bare de progres"
 
-#: gtk/gtkprogressbar.c:194
-#, fuzzy
+#: ../gtk/gtkprogressbar.c:221
 msgid "Y spacing"
-msgstr "SpațiereY"
+msgstr "Spațiere Y"
 
-#: gtk/gtkprogressbar.c:195
+#: ../gtk/gtkprogressbar.c:222
 msgid "Extra spacing applied to the height of a progress bar."
 msgstr "Spațiu extra adăugat înălțimii unei bare de progres."
 
-#: gtk/gtkprogressbar.c:208
-#, fuzzy
+#: ../gtk/gtkprogressbar.c:235
 msgid "Minimum horizontal bar width"
-msgstr "Lățime minimă bară orizontală"
+msgstr "Lățimea orizontală minimă a barei"
 
-#: gtk/gtkprogressbar.c:209
+#: ../gtk/gtkprogressbar.c:236
 msgid "The minimum horizontal width of the progress bar"
 msgstr "Lățime orizontală minimă pentru bara de progres"
 
-#: gtk/gtkprogressbar.c:221
-#, fuzzy
+#: ../gtk/gtkprogressbar.c:248
 msgid "Minimum horizontal bar height"
-msgstr "Înălțime minimă bară orizontală"
+msgstr "Înălțimea orizontală minimă a barei"
 
-#: gtk/gtkprogressbar.c:222
+#: ../gtk/gtkprogressbar.c:249
 msgid "Minimum horizontal height of the progress bar"
 msgstr "Înălțime orizontală minimă a barei de progres"
 
-#: gtk/gtkprogressbar.c:234
-#, fuzzy
+#: ../gtk/gtkprogressbar.c:261
 msgid "Minimum vertical bar width"
-msgstr "Lățime minimă bară verticală"
+msgstr "Lățimea verticală minimă a barei"
 
-#: gtk/gtkprogressbar.c:235
+#: ../gtk/gtkprogressbar.c:262
 msgid "The minimum vertical width of the progress bar"
 msgstr "Lățimea verticală minimă a barei de progres"
 
-#: gtk/gtkprogressbar.c:247
-#, fuzzy
+#: ../gtk/gtkprogressbar.c:274
 msgid "Minimum vertical bar height"
-msgstr "Înălțime minimă bară verticală"
+msgstr "Înălțimea verticală minimă a barei"
 
-#: gtk/gtkprogressbar.c:248
+#: ../gtk/gtkprogressbar.c:275
 msgid "The minimum vertical height of the progress bar"
 msgstr "Înălțime verticală minimă pentru bara de progres"
 
-#: gtk/gtkradioaction.c:118
+#: ../gtk/gtkradioaction.c:118
 msgid "The value"
 msgstr "Valoarea"
 
-#: 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."
@@ -4437,21 +4391,21 @@ msgstr ""
 "Valoarea returnată de gtk_radio_action_get_current_value() când această "
 "acțiune este acțiunea curentă a grupului."
 
-#: gtk/gtkradioaction.c:135 gtk/gtkradiobutton.c:160
-#: gtk/gtkradiomenuitem.c:373 gtk/gtkradiotoolbutton.c:65
+#: ../gtk/gtkradioaction.c:135 ../gtk/gtkradiobutton.c:163
+#: ../gtk/gtkradiomenuitem.c:373 ../gtk/gtkradiotoolbutton.c:65
 msgid "Group"
 msgstr "Grup"
 
-#: gtk/gtkradioaction.c:136
+#: ../gtk/gtkradioaction.c:136
 msgid "The radio action whose group this action belongs to."
 msgstr "Acțiunea butonului radio al grupului ce deține această acțiune."
 
-#: gtk/gtkradioaction.c:151
+#: ../gtk/gtkradioaction.c:151
 msgid "The current value"
 msgstr "Valoarea curentă"
 
 # Dizzy... Mișu
-#: 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."
@@ -4459,139 +4413,139 @@ msgstr ""
 "Proprietatea valorii membrului activ curent al grupului căruia îi aparține "
 "această acțiune."
 
-#: gtk/gtkradiobutton.c:161
+#: ../gtk/gtkradiobutton.c:164
 msgid "The radio button whose group this widget belongs to."
 msgstr "Butonul radio al grupului căruia îi aparține acest widget"
 
-#: gtk/gtkradiomenuitem.c:374
+#: ../gtk/gtkradiomenuitem.c:374
 msgid "The radio menu item whose group this widget belongs to."
 msgstr "Elementul radio din meniu al grupului căruia îi aparține acest widget."
 
-#: gtk/gtkradiotoolbutton.c:66
+#: ../gtk/gtkradiotoolbutton.c:66
 msgid "The radio tool button whose group this button belongs to."
 msgstr "Butonul radio al grupului căruia îi aparține acest buton."
 
-#: gtk/gtkrange.c:410
+#: ../gtk/gtkrange.c:423
 msgid "Update policy"
 msgstr "Politica de actualizare"
 
-#: gtk/gtkrange.c:411
+#: ../gtk/gtkrange.c:424
 msgid "How the range should be updated on the screen"
 msgstr "Cum ar trebui actualizată zona pe ecran"
 
-#: gtk/gtkrange.c:420
+#: ../gtk/gtkrange.c:433
 msgid "The GtkAdjustment that contains the current value of this range object"
 msgstr "GtkAdjustement ce conține valoarea curentă a acestui obiect zonal"
 
-#: gtk/gtkrange.c:428
+#: ../gtk/gtkrange.c:441
 msgid "Invert direction slider moves to increase range value"
 msgstr "Direcție inversată ce micșorează valoarea zonei la derulare"
 
-#: gtk/gtkrange.c:435
+#: ../gtk/gtkrange.c:448
 msgid "Lower stepper sensitivity"
 msgstr "Senzitivitate buton descreștere"
 
-#: gtk/gtkrange.c:436
+#: ../gtk/gtkrange.c:449
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's lower "
 "side"
 msgstr "Mărimea ajustării negative a valorii incrementate"
 
-#: gtk/gtkrange.c:444
+#: ../gtk/gtkrange.c:457
 msgid "Upper stepper sensitivity"
 msgstr "Senzitivitate buton creștere"
 
-#: gtk/gtkrange.c:445
+#: ../gtk/gtkrange.c:458
 msgid ""
 "The sensitivity policy for the stepper that points to the adjustment's upper "
 "side"
 msgstr "Mărimea ajustării pozitive a valorii incrementate"
 
-#: gtk/gtkrange.c:462
+#: ../gtk/gtkrange.c:475
 msgid "Show Fill Level"
 msgstr "Arată nivelul de umplere"
 
-#: gtk/gtkrange.c:463
+#: ../gtk/gtkrange.c:476
 msgid "Whether to display a fill level indicator graphics on trough."
 msgstr ""
 "Specifică dacă trebuie afișat un element grafic care să indice nivelul de "
 "umplere în canal."
 
-#: gtk/gtkrange.c:479
+#: ../gtk/gtkrange.c:492
 msgid "Restrict to Fill Level"
 msgstr "Restricționează la nivelul de umplere"
 
-#: gtk/gtkrange.c:480
+#: ../gtk/gtkrange.c:493
 msgid "Whether to restrict the upper boundary to the fill level."
 msgstr "Specifică dacă există o limită superioară la nivelul de umplere."
 
-#: gtk/gtkrange.c:495
+#: ../gtk/gtkrange.c:508
 msgid "Fill Level"
 msgstr "Nivel de umplere"
 
-#: gtk/gtkrange.c:496
+#: ../gtk/gtkrange.c:509
 msgid "The fill level."
 msgstr "Nivelul de umplere."
 
-#: gtk/gtkrange.c:504
+#: ../gtk/gtkrange.c:517
 msgid "Slider Width"
 msgstr "Lățime derulator"
 
-#: gtk/gtkrange.c:505
+#: ../gtk/gtkrange.c:518
 msgid "Width of scrollbar or scale thumb"
 msgstr "Lățime bară de defilare sau butoane zoom"
 
-#: gtk/gtkrange.c:512
+#: ../gtk/gtkrange.c:525
 msgid "Trough Border"
 msgstr "Margine derulator"
 
-#: gtk/gtkrange.c:513
+#: ../gtk/gtkrange.c:526
 msgid "Spacing between thumb/steppers and outer trough bevel"
 msgstr "Spațiu între butoanele de derulare/zoom și cadrul de delimitare"
 
-#: gtk/gtkrange.c:520
+#: ../gtk/gtkrange.c:533
 msgid "Stepper Size"
 msgstr "Mărime butoane de zoom"
 
-#: gtk/gtkrange.c:521
+#: ../gtk/gtkrange.c:534
 msgid "Length of step buttons at ends"
 msgstr "Mărimea la capete a butoanelor de zoom"
 
-#: gtk/gtkrange.c:536
+#: ../gtk/gtkrange.c:549
 msgid "Stepper Spacing"
 msgstr "Spațiere butoane de zoom"
 
-#: gtk/gtkrange.c:537
+#: ../gtk/gtkrange.c:550
 msgid "Spacing between step buttons and thumb"
 msgstr "Spațiere între butoanele de zoom și „thumb”"
 
-#: gtk/gtkrange.c:544
+#: ../gtk/gtkrange.c:557
 msgid "Arrow X Displacement"
 msgstr "Deplasare X a săgeții"
 
-#: gtk/gtkrange.c:545
+#: ../gtk/gtkrange.c:558
 msgid ""
 "How far in the x direction to move the arrow when the button is depressed"
 msgstr ""
 "Cât de mult să fie mutată săgeata în direcția X când se dă drumul butonului "
 "apăsat"
 
-#: gtk/gtkrange.c:552
+#: ../gtk/gtkrange.c:565
 msgid "Arrow Y Displacement"
 msgstr "Deplasare Y săgeată"
 
-#: gtk/gtkrange.c:553
+#: ../gtk/gtkrange.c:566
 msgid ""
 "How far in the y direction to move the arrow when the button is depressed"
 msgstr ""
 "Cât de mult să fie mutată săgeata în direcția Y când se dă drumul butonului "
 "apăsat"
 
-#: gtk/gtkrange.c:571
+#: ../gtk/gtkrange.c:584
 msgid "Trough Under Steppers"
 msgstr "Margine inferioară completă"
 
-#: gtk/gtkrange.c:572
+#: ../gtk/gtkrange.c:585
 msgid ""
 "Whether to draw trough for full length of range or exclude the steppers and "
 "spacing"
@@ -4599,261 +4553,269 @@ msgstr ""
 "Specifică dacă se desenează jgheabul pentru întreaga lungime sau se exclud "
 "elementele de incrementare și spațiile"
 
-#: gtk/gtkrange.c:585
+#: ../gtk/gtkrange.c:598
 msgid "Arrow scaling"
 msgstr "Redimensionare săgeată"
 
-#: gtk/gtkrange.c:586
+#: ../gtk/gtkrange.c:599
 msgid "Arrow scaling with regard to scroll button size"
 msgstr "Redimensionare a săgeții la mărimea butonului de derulare"
 
-#: gtk/gtkrecentaction.c:635 gtk/gtkrecentchoosermenu.c:252
+#: ../gtk/gtkrecentaction.c:635 ../gtk/gtkrecentchoosermenu.c:246
 msgid "Show Numbers"
 msgstr "Arată numere"
 
-#: 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 "Specifică dacă elementele ar trebui afișate numerotat"
 
-#: gtk/gtkrecentchooser.c:132
+#: ../gtk/gtkrecentchooser.c:132
 msgid "Recent Manager"
 msgstr "Manager recent"
 
-#: gtk/gtkrecentchooser.c:133
+#: ../gtk/gtkrecentchooser.c:133
 msgid "The RecentManager object to use"
 msgstr "Obiectul RecentManager de utilizat"
 
-#: gtk/gtkrecentchooser.c:147
+#: ../gtk/gtkrecentchooser.c:147
 msgid "Show Private"
 msgstr "Arată tot"
 
-#: gtk/gtkrecentchooser.c:148
+#: ../gtk/gtkrecentchooser.c:148
 msgid "Whether the private items should be displayed"
 msgstr "Specifică dacă elementele confidențiale ar trebui să fie afișate"
 
-#: gtk/gtkrecentchooser.c:161
+#: ../gtk/gtkrecentchooser.c:161
 msgid "Show Tooltips"
 msgstr "Arată indicii"
 
-#: gtk/gtkrecentchooser.c:162
+#: ../gtk/gtkrecentchooser.c:162
 msgid "Whether there should be a tooltip on the item"
 msgstr "Specifică dacă ar trebui arătat un indiciu pentru fiecare element"
 
-#: gtk/gtkrecentchooser.c:174
+#: ../gtk/gtkrecentchooser.c:174
 msgid "Show Icons"
 msgstr "Arată iconițe"
 
-#: gtk/gtkrecentchooser.c:175
+#: ../gtk/gtkrecentchooser.c:175
 msgid "Whether there should be an icon near the item"
 msgstr "Specifică dacă ar trebui arătate sau nu iconițele fiecărui element"
 
-#: gtk/gtkrecentchooser.c:190
+#: ../gtk/gtkrecentchooser.c:190
 msgid "Show Not Found"
 msgstr "Arată ce s-a pierdut"
 
-#: gtk/gtkrecentchooser.c:191
+#: ../gtk/gtkrecentchooser.c:191
 msgid "Whether the items pointing to unavailable resources should be displayed"
 msgstr ""
 "Specifică dacă elementele asociate unor resurse indisponibile ar trebui să "
 "fie afișate"
 
-#: gtk/gtkrecentchooser.c:204
+#: ../gtk/gtkrecentchooser.c:204
 msgid "Whether to allow multiple items to be selected"
 msgstr "Specifică dacă este permisă selectarea mai multor elemente"
 
-#: gtk/gtkrecentchooser.c:217
+#: ../gtk/gtkrecentchooser.c:217
 msgid "Local only"
 msgstr "Doar local"
 
-#: gtk/gtkrecentchooser.c:218
+#: ../gtk/gtkrecentchooser.c:218
 msgid "Whether the selected resource(s) should be limited to local file: URIs"
 msgstr ""
 "Specifică dacă resursele selectate ar trebui limitate la fișierele locale: "
 "URI-uri"
 
-#: gtk/gtkrecentchooser.c:234
+#: ../gtk/gtkrecentchooser.c:234
 msgid "Limit"
 msgstr "Limită"
 
-#: gtk/gtkrecentchooser.c:235
+#: ../gtk/gtkrecentchooser.c:235
 msgid "The maximum number of items to be displayed"
 msgstr "Numărul maxim de elemente de afișat"
 
-#: gtk/gtkrecentchooser.c:249
+#: ../gtk/gtkrecentchooser.c:249
 msgid "Sort Type"
 msgstr "Tip de sortare"
 
-#: gtk/gtkrecentchooser.c:250
+#: ../gtk/gtkrecentchooser.c:250
 msgid "The sorting order of the items displayed"
 msgstr "Ordinea de sortare a elementelor afișate"
 
-#: gtk/gtkrecentchooser.c:265
+#: ../gtk/gtkrecentchooser.c:265
 msgid "The current filter for selecting which resources are displayed"
 msgstr "Filtrul curent pentru selectarea resurselor afișate"
 
-#: 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 ""
 "Calea completă către fișierul de utilizat pentru stocarea și citirea listei"
 
-#: gtk/gtkrecentmanager.c:306
+#: ../gtk/gtkrecentmanager.c:310
 msgid "The size of the recently used resources list"
 msgstr "Mărimea listei de resurse utilizate recent"
 
-#: gtk/gtkruler.c:138
+#: ../gtk/gtkruler.c:143
 msgid "Lower"
 msgstr "Inferioară"
 
-#: gtk/gtkruler.c:139
+#: ../gtk/gtkruler.c:144
 msgid "Lower limit of ruler"
 msgstr "Limita inferioară a riglei"
 
-#: gtk/gtkruler.c:148
+#: ../gtk/gtkruler.c:153
 msgid "Upper"
 msgstr "Superioară"
 
-#: gtk/gtkruler.c:149
+#: ../gtk/gtkruler.c:154
 msgid "Upper limit of ruler"
 msgstr "Limita superioară a riglei"
 
-#: gtk/gtkruler.c:159
+#: ../gtk/gtkruler.c:164
 msgid "Position of mark on the ruler"
 msgstr "Poziția marcajului pe riglă"
 
-#: gtk/gtkruler.c:168
+#: ../gtk/gtkruler.c:173
 msgid "Max Size"
 msgstr "Mărime maximă"
 
-#: gtk/gtkruler.c:169
+#: ../gtk/gtkruler.c:174
 msgid "Maximum size of the ruler"
 msgstr "Mărimea maximă a riglei"
 
-#: gtk/gtkruler.c:184
+#: ../gtk/gtkruler.c:189
 msgid "Metric"
 msgstr "Metrică"
 
-#: gtk/gtkruler.c:185
+#: ../gtk/gtkruler.c:190
 msgid "The metric used for the ruler"
 msgstr "Unitatea metrică utilizată pentru riglă"
 
-#: gtk/gtkscalebutton.c:221
+#: ../gtk/gtkscalebutton.c:221
 msgid "The value of the scale"
 msgstr "Valuarea redimensionării"
 
-#: gtk/gtkscalebutton.c:231
+#: ../gtk/gtkscalebutton.c:231
 msgid "The icon size"
 msgstr "Mărimea iconiței"
 
-#: gtk/gtkscalebutton.c:240
+#: ../gtk/gtkscalebutton.c:240
 msgid ""
 "The GtkAdjustment that contains the current value of this scale button object"
 msgstr ""
 "GtkAdjustement ce conține valoarea curentă a acestui obiect buton de scalare"
 
-#: gtk/gtkscalebutton.c:268
+#: ../gtk/gtkscalebutton.c:268
 msgid "Icons"
 msgstr "Iconițe"
 
-#: gtk/gtkscalebutton.c:269
+#: ../gtk/gtkscalebutton.c:269
 msgid "List of icon names"
 msgstr "Listă de nume de iconițe"
 
-#: gtk/gtkscale.c:245
+#: ../gtk/gtkscale.c:250
 msgid "The number of decimal places that are displayed in the value"
 msgstr "Numărul de valori zecimale afișate în valoare"
 
-#: gtk/gtkscale.c:254
+#: ../gtk/gtkscale.c:259
 msgid "Draw Value"
 msgstr "Arată poziția"
 
 # Wild guess... Mișu
-#: gtk/gtkscale.c:255
+#: ../gtk/gtkscale.c:260
 msgid "Whether the current value is displayed as a string next to the slider"
 msgstr "Specifică dacă poziția curentă este afișată ca un șir lângă derulator"
 
-#: gtk/gtkscale.c:262
+#: ../gtk/gtkscale.c:267
 msgid "Value Position"
 msgstr "Locație poziție"
 
-#: gtk/gtkscale.c:263
+#: ../gtk/gtkscale.c:268
 msgid "The position in which the current value is displayed"
 msgstr "Locul unde e afișată poziția curentă"
 
-#: gtk/gtkscale.c:270
+#: ../gtk/gtkscale.c:275
 msgid "Slider Length"
 msgstr "Lungime derulator"
 
-#: gtk/gtkscale.c:271
+#: ../gtk/gtkscale.c:276
 msgid "Length of scale's slider"
 msgstr "Lungimea derulatorului din bara de derulare"
 
-#: gtk/gtkscale.c:279
+#: ../gtk/gtkscale.c:284
 msgid "Value spacing"
 msgstr "Distanță spațiere"
 
-#: gtk/gtkscale.c:280
+#: ../gtk/gtkscale.c:285
 msgid "Space between value text and the slider/trough area"
 msgstr "Distanța dintre textul poziției și aria derulatorului"
 
-#: gtk/gtkscrollbar.c:50
+#: ../gtk/gtkscrollbar.c:75
 msgid "Minimum Slider Length"
 msgstr "Lungime minimă derulator"
 
-#: gtk/gtkscrollbar.c:51
+#: ../gtk/gtkscrollbar.c:76
 msgid "Minimum length of scrollbar slider"
 msgstr "Lungimea minimă a derulatorului din bara de derulare"
 
-#: gtk/gtkscrollbar.c:59
+#: ../gtk/gtkscrollbar.c:84
 msgid "Fixed slider size"
 msgstr "Mărime fixă derulator"
 
-#: gtk/gtkscrollbar.c:60
+#: ../gtk/gtkscrollbar.c:85
 msgid "Don't change slider size, just lock it to the minimum length"
 msgstr "Nu schimba mărimea derulatorului, păstrează lungimea minimă"
 
-#: gtk/gtkscrollbar.c:81
+#: ../gtk/gtkscrollbar.c:106
 msgid ""
 "Display a second backward arrow button on the opposite end of the scrollbar"
 msgstr ""
 "Arată un buton secundar de derulare înapoi la capătul opus al barei de "
 "derulare"
 
-#: gtk/gtkscrollbar.c:88
+#: ../gtk/gtkscrollbar.c:113
 msgid ""
 "Display a second forward arrow button on the opposite end of the scrollbar"
 msgstr ""
 "Arată o săgeată secundară de derulare înainte la capătul opus al barei de "
 "derulare"
 
-#: gtk/gtkscrolledwindow.c:243 gtk/gtktreeview.c:571
+#: ../gtk/gtkscrolledwindow.c:295
 msgid "Horizontal Adjustment"
 msgstr "Ajustare orizontală"
 
-#: gtk/gtkscrolledwindow.c:250 gtk/gtktreeview.c:579
+#: ../gtk/gtkscrolledwindow.c:296
+msgid "The GtkAdjustment for the horizontal position"
+msgstr "GtkAdjustment pentru poziția orizontală"
+
+#: ../gtk/gtkscrolledwindow.c:302
 msgid "Vertical Adjustment"
 msgstr "Ajustare verticală"
 
-#: gtk/gtkscrolledwindow.c:257
+#: ../gtk/gtkscrolledwindow.c:303
+msgid "The GtkAdjustment for the vertical position"
+msgstr "GtkAdjustment pentru poziția verticală"
+
+#: ../gtk/gtkscrolledwindow.c:309
 msgid "Horizontal Scrollbar Policy"
 msgstr "Afișarea barei de defilare orizontală"
 
-#: gtk/gtkscrolledwindow.c:258
+#: ../gtk/gtkscrolledwindow.c:310
 msgid "When the horizontal scrollbar is displayed"
 msgstr "Când să se afișeze bara de defilare orizontală"
 
-#: gtk/gtkscrolledwindow.c:265
+#: ../gtk/gtkscrolledwindow.c:317
 msgid "Vertical Scrollbar Policy"
 msgstr "Afișarea barei de defilare verticală"
 
-#: gtk/gtkscrolledwindow.c:266
+#: ../gtk/gtkscrolledwindow.c:318
 msgid "When the vertical scrollbar is displayed"
 msgstr "Când să se afișeze bara de defilare verticală"
 
-#: gtk/gtkscrolledwindow.c:274
+#: ../gtk/gtkscrolledwindow.c:326
 msgid "Window Placement"
 msgstr "Plasare fereastră"
 
-#: gtk/gtkscrolledwindow.c:275
+#: ../gtk/gtkscrolledwindow.c:327
 msgid ""
 "Where the contents are located with respect to the scrollbars. This property "
 "only takes effect if \"window-placement-set\" is TRUE."
@@ -4861,11 +4823,11 @@ msgstr ""
 "Unde e plasat conținutul față de barele de derulare. Această proprietate "
 "este utilizată doar dacă „window-placement-set” este TRUE."
 
-#: gtk/gtkscrolledwindow.c:292
+#: ../gtk/gtkscrolledwindow.c:344
 msgid "Window Placement Set"
 msgstr "Setare plasare fereastră"
 
-#: gtk/gtkscrolledwindow.c:293
+#: ../gtk/gtkscrolledwindow.c:345
 msgid ""
 "Whether \"window-placement\" should be used to determine the location of the "
 "contents with respect to the scrollbars."
@@ -4873,55 +4835,60 @@ msgstr ""
 "Specifică dacă „window-placement” ar trebui utilizat pentru a determina unde "
 "e plasat conținutul față de barele de derulare"
 
-#: gtk/gtkscrolledwindow.c:299
+#: ../gtk/gtkscrolledwindow.c:351
 msgid "Shadow Type"
 msgstr "Tip de umbră"
 
-#: gtk/gtkscrolledwindow.c:300
+#: ../gtk/gtkscrolledwindow.c:352
 msgid "Style of bevel around the contents"
 msgstr "Stilul cadrului din jurul conținutului"
 
-#: gtk/gtkscrolledwindow.c:314
+#: ../gtk/gtkscrolledwindow.c:366
 msgid "Scrollbars within bevel"
 msgstr "Bare de defilare înglobate"
 
-#: gtk/gtkscrolledwindow.c:315
+#: ../gtk/gtkscrolledwindow.c:367
 msgid "Place scrollbars within the scrolled window's bevel"
 msgstr "Plasează barele de defilare în interiorul cadrului fereastrei defilate"
 
-#: gtk/gtkscrolledwindow.c:321
+#: ../gtk/gtkscrolledwindow.c:373
 msgid "Scrollbar spacing"
 msgstr "Spațiere bară defilare"
 
-#: gtk/gtkscrolledwindow.c:322
+#: ../gtk/gtkscrolledwindow.c:374
 msgid "Number of pixels between the scrollbars and the scrolled window"
 msgstr "Numărul de pixeli dintre barele de defilare și fereastra defilată"
 
-#: gtk/gtkscrolledwindow.c:337
-msgid "Scrolled Window Placement"
-msgstr "Plasare fereastră derulată"
+#: ../gtk/gtkscrolledwindow.c:383
+msgid "Minimum Content Width"
+msgstr "Lățime minimă conținut"
+
+#: ../gtk/gtkscrolledwindow.c:384
+msgid "The minimum width that the scrolled window will allocate to its content"
+msgstr "Lățimea minimă pe care fereastra derulată o va aloca conținutului"
+
+#: ../gtk/gtkscrolledwindow.c:390
+msgid "Minimum Content Height"
+msgstr "Înălțime minimă conținut"
 
-#: gtk/gtkscrolledwindow.c:338
+#: ../gtk/gtkscrolledwindow.c:391
 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 ""
-"Unde e plasat conținutul ferestrelor derulate față de barele de derulare, în "
-"caz că nu primează plasarea ferestrelor derulate."
+"The minimum height that the scrolled window will allocate to its content"
+msgstr "Înălțimea minimă pe care fereastra derulată o va aloca conținutului"
 
-#: gtk/gtkseparatortoolitem.c:138
+#: ../gtk/gtkseparatortoolitem.c:143
 msgid "Draw"
 msgstr "Arată"
 
-#: gtk/gtkseparatortoolitem.c:139
+#: ../gtk/gtkseparatortoolitem.c:144
 msgid "Whether the separator is drawn, or just blank"
 msgstr "Specifică dacă sunt afișați separatorii sau doar un spațiu gol"
 
-#: gtk/gtksettings.c:225
+#: ../gtk/gtksettings.c:277
 msgid "Double Click Time"
 msgstr "Timp dublu-clic"
 
-#: gtk/gtksettings.c:226
+#: ../gtk/gtksettings.c:278
 msgid ""
 "Maximum time allowed between two clicks for them to be considered a double "
 "click (in milliseconds)"
@@ -4929,11 +4896,11 @@ msgstr ""
 "Timp maxim permis între două clicuri pentru a rezulta un dublu-clic în "
 "milisecunde)"
 
-#: gtk/gtksettings.c:233
+#: ../gtk/gtksettings.c:285
 msgid "Double Click Distance"
 msgstr "Distanță dublu-clic"
 
-#: gtk/gtksettings.c:234
+#: ../gtk/gtksettings.c:286
 msgid ""
 "Maximum distance allowed between two clicks for them to be considered a "
 "double click (in pixels)"
@@ -4941,35 +4908,35 @@ msgstr ""
 "Distanța maximă permisă între două clicuri pentru a rezulta un dublu-clic "
 "(în milisecunde)"
 
-#: gtk/gtksettings.c:250
+#: ../gtk/gtksettings.c:302
 msgid "Cursor Blink"
 msgstr "Clipire cursor"
 
-#: gtk/gtksettings.c:251
+#: ../gtk/gtksettings.c:303
 msgid "Whether the cursor should blink"
 msgstr "Specifică dacă ar trebui să clipească cursorul"
 
-#: gtk/gtksettings.c:258
+#: ../gtk/gtksettings.c:310
 msgid "Cursor Blink Time"
 msgstr "Timp clipire cursor"
 
-#: gtk/gtksettings.c:259
+#: ../gtk/gtksettings.c:311
 msgid "Length of the cursor blink cycle, in milliseconds"
 msgstr "Durata ciclului de clipire a cursorului, în milisecunde"
 
-#: gtk/gtksettings.c:278
+#: ../gtk/gtksettings.c:330
 msgid "Cursor Blink Timeout"
 msgstr "Timp clipire cursor"
 
-#: gtk/gtksettings.c:279
+#: ../gtk/gtksettings.c:331
 msgid "Time after which the cursor stops blinking, in seconds"
 msgstr "Timp după care cursorul nu mai clipește, în milisecunde"
 
-#: gtk/gtksettings.c:286
+#: ../gtk/gtksettings.c:338
 msgid "Split Cursor"
 msgstr "Cursor dublu"
 
-#: gtk/gtksettings.c:287
+#: ../gtk/gtksettings.c:339
 msgid ""
 "Whether two cursors should be displayed for mixed left-to-right and right-to-"
 "left text"
@@ -4977,156 +4944,156 @@ msgstr ""
 "Specifică dacă două cursoare ar trebui să fie afișate pentru texte "
 "amestecate de tip Stânga-Dreapta și Dreapta-Stânga"
 
-#: gtk/gtksettings.c:294
+#: ../gtk/gtksettings.c:346
 msgid "Theme Name"
 msgstr "Nume temă"
 
-#: gtk/gtksettings.c:295
+#: ../gtk/gtksettings.c:347
 msgid "Name of theme RC file to load"
 msgstr "Numele temei RC de încărcat"
 
-#: gtk/gtksettings.c:303
+#: ../gtk/gtksettings.c:355
 msgid "Icon Theme Name"
 msgstr "Nume temă iconițe"
 
-#: gtk/gtksettings.c:304
+#: ../gtk/gtksettings.c:356
 msgid "Name of icon theme to use"
 msgstr "Numele temei de iconițe de utilizat"
 
-#: gtk/gtksettings.c:312
+#: ../gtk/gtksettings.c:364
 msgid "Fallback Icon Theme Name"
 msgstr "Nume temă de rezervă iconițe"
 
-#: gtk/gtksettings.c:313
+#: ../gtk/gtksettings.c:365
 msgid "Name of a icon theme to fall back to"
 msgstr "Numele temei de iconițe de rezervă"
 
-#: gtk/gtksettings.c:321
+#: ../gtk/gtksettings.c:373
 msgid "Key Theme Name"
 msgstr "Nume temă taste"
 
-#: gtk/gtksettings.c:322
+#: ../gtk/gtksettings.c:374
 msgid "Name of key theme RC file to load"
 msgstr "Numele fișierului RC a temei de taste de încărcat"
 
-#: gtk/gtksettings.c:330
+#: ../gtk/gtksettings.c:382
 msgid "Menu bar accelerator"
 msgstr "Accelerator bară de meniu"
 
-#: gtk/gtksettings.c:331
+#: ../gtk/gtksettings.c:383
 msgid "Keybinding to activate the menu bar"
 msgstr "Combinație de taste pentru activarea barei de meniu"
 
-#: gtk/gtksettings.c:339
+#: ../gtk/gtksettings.c:391
 msgid "Drag threshold"
 msgstr "Prag la tragere"
 
-#: gtk/gtksettings.c:340
+#: ../gtk/gtksettings.c:392
 msgid "Number of pixels the cursor can move before dragging"
 msgstr "Numărul minim de pixeli pentru deplasarea cursorului la tragere"
 
-#: gtk/gtksettings.c:348
+#: ../gtk/gtksettings.c:400
 msgid "Font Name"
 msgstr "Nume font"
 
-#: gtk/gtksettings.c:349
+#: ../gtk/gtksettings.c:401
 msgid "Name of default font to use"
 msgstr "Numele fontului implicit de utilizat"
 
-#: gtk/gtksettings.c:371
+#: ../gtk/gtksettings.c:423
 msgid "Icon Sizes"
 msgstr "Mărime iconițe"
 
-#: gtk/gtksettings.c:372
+#: ../gtk/gtksettings.c:424
 msgid "List of icon sizes (gtk-menu=16,16:gtk-button=20,20..."
 msgstr "Listă mărimi iconițe (gtk-menu=16,16;gtk-button=20,20..."
 
-#: gtk/gtksettings.c:380
+#: ../gtk/gtksettings.c:432
 msgid "GTK Modules"
 msgstr "Module GTK"
 
-#: gtk/gtksettings.c:381
+#: ../gtk/gtksettings.c:433
 msgid "List of currently active GTK modules"
 msgstr "Listă module GTK active"
 
-#: gtk/gtksettings.c:390
+#: ../gtk/gtksettings.c:442
 msgid "Xft Antialias"
 msgstr "Antialiere Xft"
 
-#: gtk/gtksettings.c:391
+#: ../gtk/gtksettings.c:443
 msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
 msgstr ""
 "Specifică antialierea pentru fonturile Xft. „0” = Da, „1” = Nu și „-1” = "
 "Implicit"
 
-#: gtk/gtksettings.c:400
+#: ../gtk/gtksettings.c:452
 msgid "Xft Hinting"
 msgstr "Hinting Xft"
 
-#: gtk/gtksettings.c:401
+#: ../gtk/gtksettings.c:453
 msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
 msgstr ""
 "Specifică dacă se utilizează hinting pentru fonturile Xft. „0” = Da, „1” = "
 "Nu și „-1” = Implicit"
 
-#: gtk/gtksettings.c:410
+#: ../gtk/gtksettings.c:462
 msgid "Xft Hint Style"
 msgstr "Stil hinting Xft"
 
-#: gtk/gtksettings.c:411
+#: ../gtk/gtksettings.c:463
 msgid ""
 "What degree of hinting to use; hintnone, hintslight, hintmedium, or hintfull"
 msgstr ""
 "În ce măsură se utilizează hinting: „hintnone”, „hintslight”, „hintmedium” "
 "sau „hintfull”"
 
-#: gtk/gtksettings.c:420
+#: ../gtk/gtksettings.c:472
 msgid "Xft RGBA"
 msgstr "RGBA Xft"
 
-#: gtk/gtksettings.c:421
+#: ../gtk/gtksettings.c:473
 msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
 msgstr "Tipul de antialiere subpixel: „none”, „rgb”, „vrgb” sau „vbgr”"
 
-#: gtk/gtksettings.c:430
+#: ../gtk/gtksettings.c:482
 msgid "Xft DPI"
 msgstr "DPI Xft"
 
-#: gtk/gtksettings.c:431
+#: ../gtk/gtksettings.c:483
 msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
 msgstr ""
 "Rezoluția pentru Xft în 1024 * puncte/țol (dpi). „-1” pentru valoarea "
 "implicită"
 
-#: gtk/gtksettings.c:440
+#: ../gtk/gtksettings.c:492
 msgid "Cursor theme name"
 msgstr "Nume temă de cursoare"
 
-#: gtk/gtksettings.c:441
+#: ../gtk/gtksettings.c:493
 msgid "Name of the cursor theme to use, or NULL to use the default theme"
 msgstr "Numele temei de cursoare de utilizat, NULL pentru tema implicită"
 
-#: gtk/gtksettings.c:449
+#: ../gtk/gtksettings.c:501
 msgid "Cursor theme size"
 msgstr "Mărime temă de cursoare"
 
-#: gtk/gtksettings.c:450
+#: ../gtk/gtksettings.c:502
 msgid "Size to use for cursors, or 0 to use the default size"
 msgstr "Mărime de utilizat pentru cursoare. 0 pentru mărimea implicită"
 
-#: gtk/gtksettings.c:460
+#: ../gtk/gtksettings.c:512
 msgid "Alternative button order"
 msgstr "Ordine alternativă butoane"
 
-#: gtk/gtksettings.c:461
+#: ../gtk/gtksettings.c:513
 msgid "Whether buttons in dialogs should use the alternative button order"
 msgstr "Specifică dacă butoanele dialogurilor vor fi altfel ordonate"
 
-#: gtk/gtksettings.c:478
+#: ../gtk/gtksettings.c:530
 msgid "Alternative sort indicator direction"
 msgstr "Direcție ordine alternativă butoane"
 
-#: gtk/gtksettings.c:479
+#: ../gtk/gtksettings.c:531
 msgid ""
 "Whether the direction of the sort indicators in list and tree views is "
 "inverted compared to the default (where down means ascending)"
@@ -5134,11 +5101,11 @@ msgstr ""
 "Specifică dacă direcția indicatorilor de sortare în liste și arbori să fie "
 "inversată (adică ascendent în jos)"
 
-#: gtk/gtksettings.c:487
+#: ../gtk/gtksettings.c:539
 msgid "Show the 'Input Methods' menu"
 msgstr "Arată meniul „Metode de input”"
 
-#: gtk/gtksettings.c:488
+#: ../gtk/gtksettings.c:540
 msgid ""
 "Whether the context menus of entries and text views should offer to change "
 "the input method"
@@ -5146,11 +5113,11 @@ msgstr ""
 "Specifică dacă meniurile contextuale din intrările text ar trebui să ofere o "
 "cale de a schimba metoda de input"
 
-#: gtk/gtksettings.c:496
+#: ../gtk/gtksettings.c:548
 msgid "Show the 'Insert Unicode Control Character' menu"
 msgstr "Arată meniul „Inserare control Unicode”"
 
-#: gtk/gtksettings.c:497
+#: ../gtk/gtksettings.c:549
 msgid ""
 "Whether the context menus of entries and text views should offer to insert "
 "control characters"
@@ -5158,243 +5125,243 @@ msgstr ""
 "Specifică dacă meniurile contextuale din intrările text ar trebui sa ofere o "
 "cale de inserare a caracterelor de control"
 
-#: gtk/gtksettings.c:505
+#: ../gtk/gtksettings.c:557
 msgid "Start timeout"
 msgstr "Timeout inițial"
 
-#: gtk/gtksettings.c:506
+#: ../gtk/gtksettings.c:558
 msgid "Starting value for timeouts, when button is pressed"
 msgstr "Valoare de pornire pentru timeout la apăsarea butonului"
 
-#: gtk/gtksettings.c:515
+#: ../gtk/gtksettings.c:567
 msgid "Repeat timeout"
 msgstr "Repetare timeout"
 
-#: gtk/gtksettings.c:516
+#: ../gtk/gtksettings.c:568
 msgid "Repeat value for timeouts, when button is pressed"
 msgstr "Valoare de repetare pentru timeout la apăsarea butonului"
 
-#: gtk/gtksettings.c:525
+#: ../gtk/gtksettings.c:577
 msgid "Expand timeout"
 msgstr "Prelungire timeout"
 
-#: gtk/gtksettings.c:526
+#: ../gtk/gtksettings.c:578
 msgid "Expand value for timeouts, when a widget is expanding a new region"
 msgstr ""
 "Valoare de prelungire pentru timeout când un widget extinde o nouă regiune"
 
-#: gtk/gtksettings.c:561
+#: ../gtk/gtksettings.c:613
 msgid "Color scheme"
 msgstr "Schemă de culoare"
 
-#: gtk/gtksettings.c:562
+#: ../gtk/gtksettings.c:614
 msgid "A palette of named colors for use in themes"
 msgstr "O paletă de culori denumite pentru utilizarea în teme"
 
-#: gtk/gtksettings.c:571
+#: ../gtk/gtksettings.c:623
 msgid "Enable Animations"
 msgstr "Cu animații"
 
-#: gtk/gtksettings.c:572
+#: ../gtk/gtksettings.c:624
 msgid "Whether to enable toolkit-wide animations."
 msgstr "Specifică dacă se activează animațiile în toolkit"
 
-#: gtk/gtksettings.c:590
+#: ../gtk/gtksettings.c:642
 msgid "Enable Touchscreen Mode"
 msgstr "Activare mod touchscreen"
 
-#: gtk/gtksettings.c:591
+#: ../gtk/gtksettings.c:643
 msgid "When TRUE, there are no motion notify events delivered on this screen"
 msgstr "La activare, nu se livrează notificări de mișcare pentru acest ecran"
 
-#: gtk/gtksettings.c:608
+#: ../gtk/gtksettings.c:660
 msgid "Tooltip timeout"
 msgstr "Întârziere indiciu"
 
-#: gtk/gtksettings.c:609
+#: ../gtk/gtksettings.c:661
 msgid "Timeout before tooltip is shown"
 msgstr "Întârziere la afișarea indiciilor"
 
-#: gtk/gtksettings.c:634
+#: ../gtk/gtksettings.c:686
 msgid "Tooltip browse timeout"
 msgstr "Întârziere indiciu navigare"
 
-#: gtk/gtksettings.c:635
+#: ../gtk/gtksettings.c:687
 msgid "Timeout before tooltip is shown when browse mode is enabled"
 msgstr "Întârziere la afișarea indiciilor în modul de navigare"
 
-#: gtk/gtksettings.c:656
+#: ../gtk/gtksettings.c:708
 msgid "Tooltip browse mode timeout"
 msgstr "Întârziere indiciu mod de navigare"
 
-#: gtk/gtksettings.c:657
+#: ../gtk/gtksettings.c:709
 msgid "Timeout after which browse mode is disabled"
 msgstr "Întârziere după care modul de navigat este dezactivat"
 
-#: gtk/gtksettings.c:676
+#: ../gtk/gtksettings.c:728
 msgid "Keynav Cursor Only"
 msgstr "Navigare doar cu tastele cursor"
 
-#: gtk/gtksettings.c:677
+#: ../gtk/gtksettings.c:729
 msgid "When TRUE, there are only cursor keys available to navigate widgets"
 msgstr ""
 "La activare, doar tastele cursor vor fi disponiblie pentru navigarea între "
 "widgeturi"
 
-#: gtk/gtksettings.c:694
+#: ../gtk/gtksettings.c:746
 msgid "Keynav Wrap Around"
 msgstr "Navigare ciclică cu tastele"
 
-#: gtk/gtksettings.c:695
+#: ../gtk/gtksettings.c:747
 msgid "Whether to wrap around when keyboard-navigating widgets"
 msgstr "Specifică dacă navigarea între widgeturi cu tastele este ciclică"
 
-#: gtk/gtksettings.c:715
+#: ../gtk/gtksettings.c:767
 msgid "Error Bell"
 msgstr "Bip de alarmă"
 
-#: gtk/gtksettings.c:716
+#: ../gtk/gtksettings.c:768
 msgid "When TRUE, keyboard navigation and other errors will cause a beep"
 msgstr "La activare, navigarea cu tastele și alte erori vor produce un bip"
 
-#: gtk/gtksettings.c:733
+#: ../gtk/gtksettings.c:785
 msgid "Color Hash"
 msgstr "Hash culoare"
 
-#: gtk/gtksettings.c:734
+#: ../gtk/gtksettings.c:786
 msgid "A hash table representation of the color scheme."
 msgstr "O reprezentare de tip tabel hash a schemei de culori."
 
-#: gtk/gtksettings.c:742
+#: ../gtk/gtksettings.c:794
 msgid "Default file chooser backend"
 msgstr "Suport implicit pentru selectorul de fișiere"
 
-#: gtk/gtksettings.c:743
+#: ../gtk/gtksettings.c:795
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Numele suportului GtkFileChooser de utilizat implicit"
 
-#: gtk/gtksettings.c:760
+#: ../gtk/gtksettings.c:812
 msgid "Default print backend"
 msgstr "Suport implicit pentru tipărire"
 
-#: gtk/gtksettings.c:761
+#: ../gtk/gtksettings.c:813
 msgid "List of the GtkPrintBackend backends to use by default"
 msgstr "Listă a suporturilor GtkPrintBackend de utilizat implicit"
 
-#: gtk/gtksettings.c:784
+#: ../gtk/gtksettings.c:836
 msgid "Default command to run when displaying a print preview"
 msgstr "Comandă implicită de utilizat la afișarea previzualizării tipăririi"
 
-#: gtk/gtksettings.c:785
+#: ../gtk/gtksettings.c:837
 msgid "Command to run when displaying a print preview"
 msgstr "Comandă de utilizat la afișarea previzualizării tipăririi"
 
-#: gtk/gtksettings.c:801
+#: ../gtk/gtksettings.c:853
 msgid "Enable Mnemonics"
 msgstr "Activează mnemonicele"
 
-#: gtk/gtksettings.c:802
+#: ../gtk/gtksettings.c:854
 msgid "Whether labels should have mnemonics"
 msgstr "Specifică dacă etichetele ar trebui să aibă mnemonice"
 
-#: gtk/gtksettings.c:818
+#: ../gtk/gtksettings.c:870
 msgid "Enable Accelerators"
 msgstr "Activează acceleratorii"
 
-#: gtk/gtksettings.c:819
+#: ../gtk/gtksettings.c:871
 msgid "Whether menu items should have accelerators"
 msgstr "Specifică dacă elementele din meniu ar trebui să aibă acceleratori"
 
-#: gtk/gtksettings.c:836
+#: ../gtk/gtksettings.c:888
 msgid "Recent Files Limit"
 msgstr "Limită fișiere recente"
 
-#: gtk/gtksettings.c:837
+#: ../gtk/gtksettings.c:889
 msgid "Number of recently used files"
 msgstr "Număr de fișiere recent utilizate"
 
-#: gtk/gtksettings.c:855
+#: ../gtk/gtksettings.c:907
 msgid "Default IM module"
 msgstr "Modul IM implicit"
 
-#: gtk/gtksettings.c:856
+#: ../gtk/gtksettings.c:908
 msgid "Which IM module should be used by default"
 msgstr "Specifică ce modul IM ar trebui utilizat implicit"
 
-#: gtk/gtksettings.c:874
+#: ../gtk/gtksettings.c:926
 msgid "Recent Files Max Age"
 msgstr "Vechime maximă pentru fișiere recente"
 
-#: gtk/gtksettings.c:875
+#: ../gtk/gtksettings.c:927
 msgid "Maximum age of recently used files, in days"
 msgstr "Vechime maximă, în zile, pentru fișierele recent utilizate"
 
-#: gtk/gtksettings.c:884
+#: ../gtk/gtksettings.c:936
 msgid "Fontconfig configuration timestamp"
 msgstr "Marcaj de timp pentru configurația fontconfig"
 
-#: gtk/gtksettings.c:885
+#: ../gtk/gtksettings.c:937
 msgid "Timestamp of current fontconfig configuration"
 msgstr "Marcaj de timp pentru configurația fontconfig curentă"
 
-#: gtk/gtksettings.c:907
+#: ../gtk/gtksettings.c:959
 msgid "Sound Theme Name"
 msgstr "Nume temă de sunete"
 
-#: gtk/gtksettings.c:908
+#: ../gtk/gtksettings.c:960
 msgid "XDG sound theme name"
 msgstr "Nume temă XDG de sunete"
 
 #. Translators: this means sounds that are played as feedback to user input
-#: gtk/gtksettings.c:930
+#: ../gtk/gtksettings.c:982
 msgid "Audible Input Feedback"
 msgstr "Feedback audio"
 
-#: gtk/gtksettings.c:931
+#: ../gtk/gtksettings.c:983
 msgid "Whether to play event sounds as feedback to user input"
 msgstr ""
 "Specifică dacă se vor reda sunete ca feedback la inputul utilizatorului"
 
-#: gtk/gtksettings.c:952
+#: ../gtk/gtksettings.c:1004
 msgid "Enable Event Sounds"
 msgstr "Activează sunetele pentru evenimente"
 
-#: gtk/gtksettings.c:953
+#: ../gtk/gtksettings.c:1005
 msgid "Whether to play any event sounds at all"
 msgstr "Specifică dacă se vor reda sunete pentru anumite evenimente"
 
-#: gtk/gtksettings.c:968
+#: ../gtk/gtksettings.c:1020
 msgid "Enable Tooltips"
 msgstr "Activare indicii"
 
-#: gtk/gtksettings.c:969
+#: ../gtk/gtksettings.c:1021
 msgid "Whether tooltips should be shown on widgets"
 msgstr "Specifică dacă ar trebui afișate indicii"
 
-#: gtk/gtksettings.c:982
+#: ../gtk/gtksettings.c:1034
 msgid "Toolbar style"
 msgstr "Stil bară cu unelte"
 
-#: gtk/gtksettings.c:983
+#: ../gtk/gtksettings.c:1035
 msgid ""
 "Whether default toolbars have text only, text and icons, icons only, etc."
 msgstr ""
 "Specifică dacă barele implicite cu unelte au doar text, text și iconițe, "
 "doar iconițe etc."
 
-#: gtk/gtksettings.c:997
+#: ../gtk/gtksettings.c:1049
 msgid "Toolbar Icon Size"
 msgstr "Mărime iconițe bare cu unelte"
 
-#: gtk/gtksettings.c:998
+#: ../gtk/gtksettings.c:1050
 msgid "The size of icons in default toolbars."
 msgstr "Mărimea iconițelor în barele implicite cu unelte."
 
-#: gtk/gtksettings.c:1015
+#: ../gtk/gtksettings.c:1067
 msgid "Auto Mnemonics"
 msgstr "Activează mnemonicele"
 
-#: gtk/gtksettings.c:1016
+#: ../gtk/gtksettings.c:1068
 msgid ""
 "Whether mnemonics should be automatically shown and hidden when the user "
 "presses the mnemonic activator."
@@ -5402,19 +5369,134 @@ msgstr ""
 "Specifică dacă mnemonicele ar trebui să fie afișate automat și ascunse când "
 "utilizatorul apasă pe activatorul mnemonicii."
 
-#: gtk/gtksettings.c:1041
+#: ../gtk/gtksettings.c:1093
 msgid "Application prefers a dark theme"
 msgstr "Aplicația preferă o temă de culoare închisă"
 
-#: gtk/gtksettings.c:1042
+#: ../gtk/gtksettings.c:1094
 msgid "Whether the application prefers to have a dark theme."
 msgstr "Specifică dacă aplicația preferă o temă de culoare închisă."
 
-#: gtk/gtksizegroup.c:341
+#: ../gtk/gtksettings.c:1109
+msgid "Show button images"
+msgstr "Arată imaginea butonului"
+
+#: ../gtk/gtksettings.c:1110
+msgid "Whether images should be shown on buttons"
+msgstr "Specifică dacă ar trebui afișate imagini pe butoane"
+
+#: ../gtk/gtksettings.c:1118 ../gtk/gtksettings.c:1212
+msgid "Select on focus"
+msgstr "Selectează la focus"
+
+#: ../gtk/gtksettings.c:1119
+msgid "Whether to select the contents of an entry when it is focused"
+msgstr "Specifică dacă la focus să fie selectat conținutul intrării"
+
+#: ../gtk/gtksettings.c:1136
+msgid "Password Hint Timeout"
+msgstr "Time-out caractere parolă"
+
+#: ../gtk/gtksettings.c:1137
+msgid "How long to show the last input character in hidden entries"
+msgstr "Cât timp e afișat ultimul caracter introdus în intrări ascunse"
+
+#: ../gtk/gtksettings.c:1146
+msgid "Show menu images"
+msgstr "Arată imagini în meniu"
+
+#: ../gtk/gtksettings.c:1147
+msgid "Whether images should be shown in menus"
+msgstr "Specifică dacă ar trebui afișate imaginile în meniu"
+
+#: ../gtk/gtksettings.c:1155
+msgid "Delay before drop down menus appear"
+msgstr "Întârziere la deschiderea unui meniu"
+
+#: ../gtk/gtksettings.c:1156
+msgid "Delay before the submenus of a menu bar appear"
+msgstr "Întârziere la deschiderea sub-meniurilor barei de meniu"
+
+#: ../gtk/gtksettings.c:1173
+msgid "Scrolled Window Placement"
+msgstr "Plasare fereastră derulată"
+
+#: ../gtk/gtksettings.c:1174
+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 ""
+"Unde e plasat conținutul ferestrelor derulate față de barele de derulare, în "
+"caz că nu primează plasarea ferestrelor derulate."
+
+#: ../gtk/gtksettings.c:1183
+msgid "Can change accelerators"
+msgstr "Acceleratorii pot fi schimbați"
+
+#: ../gtk/gtksettings.c:1184
+msgid ""
+"Whether menu accelerators can be changed by pressing a key over the menu item"
+msgstr ""
+"Specifică dacă acceleratorii meniului pot fi schimbați apăsând o tastă când "
+"elementul din meniu este selectat"
+
+#: ../gtk/gtksettings.c:1192
+msgid "Delay before submenus appear"
+msgstr "Întârziere la apariția sub-meniului"
+
+#: ../gtk/gtksettings.c:1193
+msgid ""
+"Minimum time the pointer must stay over a menu item before the submenu appear"
+msgstr ""
+"Timpul minim în care cursorul de maus trebuie să staționeze deasupra unui "
+"element din meniu pentru a se deschide sub-meniul"
+
+#: ../gtk/gtksettings.c:1202
+msgid "Delay before hiding a submenu"
+msgstr "Întârziere la închiderea sub-meniului"
+
+#: ../gtk/gtksettings.c:1203
+msgid ""
+"The time before hiding a submenu when the pointer is moving towards the "
+"submenu"
+msgstr ""
+"Timpul minim înainte de închiderea unui sub-meniu după ce cursorul de maus a "
+"părăsit sub-meniul"
+
+#: ../gtk/gtksettings.c:1213
+msgid "Whether to select the contents of a selectable label when it is focused"
+msgstr ""
+"Specifică dacă la focus să fie selectat conținutul unei etichete selectabile"
+
+#: ../gtk/gtksettings.c:1221
+msgid "Custom palette"
+msgstr "Paletă personalizată"
+
+#: ../gtk/gtksettings.c:1222
+msgid "Palette to use in the color selector"
+msgstr "Paletă de utilizat în selectorul de culoare"
+
+#: ../gtk/gtksettings.c:1230
+msgid "IM Preedit style"
+msgstr "Stil pre-editare IM"
+
+#: ../gtk/gtksettings.c:1231
+msgid "How to draw the input method preedit string"
+msgstr "Mod de afișare a șirului de preeditare al metodei de input"
+
+#: ../gtk/gtksettings.c:1240
+msgid "IM Status style"
+msgstr "Stil status IM"
+
+#: ../gtk/gtksettings.c:1241
+msgid "How to draw the input method statusbar"
+msgstr "Mod de afișare a barei de stare a metodei de input"
+
+#: ../gtk/gtksizegroup.c:350
 msgid "Mode"
 msgstr "Mod"
 
-#: gtk/gtksizegroup.c:342
+#: ../gtk/gtksizegroup.c:351
 msgid ""
 "The directions in which the size group affects the requested sizes of its "
 "component widgets"
@@ -5422,27 +5504,27 @@ msgstr ""
 "Direcțiile în care mărimea grupului afectează mărimile cerute pentru "
 "widgeturile componentelor proprii"
 
-#: gtk/gtksizegroup.c:358
+#: ../gtk/gtksizegroup.c:367
 msgid "Ignore hidden"
 msgstr "Ignoră ce nu se vede"
 
-#: gtk/gtksizegroup.c:359
+#: ../gtk/gtksizegroup.c:368
 msgid ""
 "If TRUE, unmapped widgets are ignored when determining the size of the group"
 msgstr ""
 "La activare, widgeturile nemapate vor fi ignorate la determinarea mărimii "
 "unui grup"
 
-#: gtk/gtkspinbutton.c:236
+#: ../gtk/gtkspinbutton.c:238
 msgid "Climb Rate"
 msgstr "Rată de creștere"
 
-#: gtk/gtkspinbutton.c:256
+#: ../gtk/gtkspinbutton.c:258
 msgid "Snap to Ticks"
 msgstr "Corectare automată"
 
 # Wild guess, again... Mișu
-#: gtk/gtkspinbutton.c:257
+#: ../gtk/gtkspinbutton.c:259
 msgid ""
 "Whether erroneous values are automatically changed to a spin button's "
 "nearest step increment"
@@ -5450,52 +5532,52 @@ msgstr ""
 "Specifică dacă valorile eronate sunt automat schimbate către cea mai "
 "apropiată valoare corectă a butonului de incrementare"
 
-#: gtk/gtkspinbutton.c:264
+#: ../gtk/gtkspinbutton.c:266
 msgid "Numeric"
 msgstr "Numerice"
 
-#: gtk/gtkspinbutton.c:265
+#: ../gtk/gtkspinbutton.c:267
 msgid "Whether non-numeric characters should be ignored"
 msgstr "Specifică dacă ar trebui ignorate caracterele non-numerice"
 
-#: gtk/gtkspinbutton.c:272
+#: ../gtk/gtkspinbutton.c:274
 msgid "Wrap"
 msgstr "Ciclare"
 
-#: gtk/gtkspinbutton.c:273
+#: ../gtk/gtkspinbutton.c:275
 msgid "Whether a spin button should wrap upon reaching its limits"
 msgstr ""
 "Specifică dacă un buton de incrementare ar trebui să o ia de la capăt când "
 "își atinge limitele"
 
-#: gtk/gtkspinbutton.c:280
+#: ../gtk/gtkspinbutton.c:282
 msgid "Update Policy"
 msgstr "Mod de actualizare"
 
-#: gtk/gtkspinbutton.c:281
+#: ../gtk/gtkspinbutton.c:283
 msgid ""
 "Whether the spin button should update always, or only when the value is legal"
 msgstr ""
 "Specifică dacă butonul de incrementare ar trebui să arate orice valoare "
 "actualizată sau doar valorile corecte"
 
-#: gtk/gtkspinbutton.c:290
+#: ../gtk/gtkspinbutton.c:292
 msgid "Reads the current value, or sets a new value"
 msgstr "Citește valoarea curentă sau setează una nouă"
 
-#: gtk/gtkspinbutton.c:299
+#: ../gtk/gtkspinbutton.c:301
 msgid "Style of bevel around the spin button"
 msgstr "Stilul dungilor din jurul butonului de incrementare"
 
-#: gtk/gtkspinner.c:132
+#: ../gtk/gtkspinner.c:132
 msgid "Whether the spinner is active"
 msgstr "Specifică dacă spinnerul este activ"
 
-#: gtk/gtkspinner.c:146
+#: ../gtk/gtkspinner.c:146
 msgid "Number of steps"
 msgstr "Număr de pași"
 
-#: gtk/gtkspinner.c:147
+#: ../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-"
@@ -5505,222 +5587,212 @@ msgstr ""
 "ciclu. Implicit, animația va completa un ciclu într-o secundă (consultați "
 "#GtkSpinner:cycle-duration)."
 
-#: gtk/gtkspinner.c:162
+#: ../gtk/gtkspinner.c:162
 msgid "Animation duration"
 msgstr "Durata animației"
 
-#: gtk/gtkspinner.c:163
+#: ../gtk/gtkspinner.c:163
 msgid ""
 "The length of time in milliseconds for the spinner to complete a full loop"
 msgstr ""
 "Intervalul de timp în milisecunde în care un spinner face un ciclu complet"
 
-#: gtk/gtkstatusbar.c:199
-msgid "Has Resize Grip"
-msgstr "Are colț de redimensionare"
-
-#: gtk/gtkstatusbar.c:200
-msgid "Whether the statusbar has a grip for resizing the toplevel"
-msgstr "Specifică dacă bara de stare are un colț ce ușurează redimensionarea"
-
-#: gtk/gtkstatusbar.c:245
+#: ../gtk/gtkstatusbar.c:181
 msgid "Style of bevel around the statusbar text"
 msgstr "Stilul dungilor din jurul barei de stare"
 
-#: gtk/gtkstatusicon.c:270
+#: ../gtk/gtkstatusicon.c:270
 msgid "The size of the icon"
 msgstr "Mărimea iconiței"
 
-#: gtk/gtkstatusicon.c:280
+#: ../gtk/gtkstatusicon.c:280
 msgid "The screen where this status icon will be displayed"
-msgstr "Ecranul unde această iconiță de stare va fi afișată"
+msgstr "Ecranul pe care va fi afișată această iconiță de stare"
 
-#: gtk/gtkstatusicon.c:288
-#, fuzzy
+#: ../gtk/gtkstatusicon.c:288
 msgid "Whether the status icon is visible"
 msgstr "Specifică dacă iconița de stare este vizibilă"
 
-#: gtk/gtkstatusicon.c:304
-#, fuzzy
+#: ../gtk/gtkstatusicon.c:304
 msgid "Whether the status icon is embedded"
 msgstr "Specifică dacă iconița de stare este înglobată"
 
-#: gtk/gtkstatusicon.c:320 gtk/gtktrayicon-x11.c:125
+#: ../gtk/gtkstatusicon.c:320 ../gtk/gtktrayicon-x11.c:125
 msgid "The orientation of the tray"
 msgstr "Orientarea zonei de notificare"
 
-#: gtk/gtkstatusicon.c:347 gtk/gtkwidget.c:863
+#: ../gtk/gtkstatusicon.c:347 ../gtk/gtkwidget.c:1025
 msgid "Has tooltip"
 msgstr "Are indiciu"
 
-#: gtk/gtkstatusicon.c:348
+#: ../gtk/gtkstatusicon.c:348
 msgid "Whether this tray icon has a tooltip"
 msgstr "Specifică dacă iconița de stare are indiciu"
 
-#: gtk/gtkstatusicon.c:373 gtk/gtkwidget.c:884
+#: ../gtk/gtkstatusicon.c:373 ../gtk/gtkwidget.c:1046
 msgid "Tooltip Text"
 msgstr "Text indiciu"
 
-#: gtk/gtkstatusicon.c:374 gtk/gtkwidget.c:885 gtk/gtkwidget.c:906
+#: ../gtk/gtkstatusicon.c:374 ../gtk/gtkwidget.c:1047 ../gtk/gtkwidget.c:1068
 msgid "The contents of the tooltip for this widget"
 msgstr "Conținutul indiciului pentru acest widget"
 
-#: gtk/gtkstatusicon.c:397 gtk/gtkwidget.c:905
+#: ../gtk/gtkstatusicon.c:397 ../gtk/gtkwidget.c:1067
 msgid "Tooltip markup"
 msgstr "Marcaj indiciu"
 
-#: gtk/gtkstatusicon.c:398
+#: ../gtk/gtkstatusicon.c:398
 msgid "The contents of the tooltip for this tray icon"
 msgstr "Conținutul indiciului pentru această iconiță de stare"
 
-#: gtk/gtkstatusicon.c:416
+#: ../gtk/gtkstatusicon.c:416
 msgid "The title of this tray icon"
 msgstr "Titlul aceste iconițe de stare"
 
-#: gtk/gtktable.c:148
+#: ../gtk/gtktable.c:157
 msgid "Rows"
 msgstr "Linii"
 
-#: gtk/gtktable.c:149
+#: ../gtk/gtktable.c:158
 msgid "The number of rows in the table"
 msgstr "Numărul de rânduri în tabel"
 
-#: gtk/gtktable.c:157
+#: ../gtk/gtktable.c:166
 msgid "Columns"
 msgstr "Coloane"
 
-#: gtk/gtktable.c:158
+#: ../gtk/gtktable.c:167
 msgid "The number of columns in the table"
 msgstr "Numărul de coloane în tabel"
 
-#: gtk/gtktable.c:166
+#: ../gtk/gtktable.c:175
 msgid "Row spacing"
 msgstr "Spațiere rânduri"
 
-#: gtk/gtktable.c:167
+#: ../gtk/gtktable.c:176
 msgid "The amount of space between two consecutive rows"
 msgstr "Cantitatea de spațiu între două rânduri consecutive"
 
-#: gtk/gtktable.c:175
+#: ../gtk/gtktable.c:184
 msgid "Column spacing"
 msgstr "Spațiere coloane"
 
-#: gtk/gtktable.c:176
+#: ../gtk/gtktable.c:185
 msgid "The amount of space between two consecutive columns"
 msgstr "Cantitatea de spațiu între două coloane consecutive"
 
-#: gtk/gtktable.c:185
+#: ../gtk/gtktable.c:194
 msgid "If TRUE, the table cells are all the same width/height"
 msgstr ""
 "La activare, toate celulele tabelului au aceeași înălțime și dimensiune"
 
-#: gtk/gtktable.c:192
+#: ../gtk/gtktable.c:201
 msgid "Left attachment"
 msgstr "Atașare la stânga"
 
-#: gtk/gtktable.c:199
+#: ../gtk/gtktable.c:208
 msgid "Right attachment"
 msgstr "Atașare la dreapta"
 
-#: gtk/gtktable.c:200
+#: ../gtk/gtktable.c:209
 msgid "The column number to attach the right side of a child widget to"
 msgstr ""
 "Numărul coloanei de care se atașează marginea dreaptă a unui widget copil"
 
-#: gtk/gtktable.c:206
+#: ../gtk/gtktable.c:215
 msgid "Top attachment"
 msgstr "Atașare sus"
 
-#: gtk/gtktable.c:207
+#: ../gtk/gtktable.c:216
 msgid "The row number to attach the top of a child widget to"
 msgstr "Numărul rândului de care se atașează vârful unui widget copil"
 
-#: gtk/gtktable.c:213
+#: ../gtk/gtktable.c:222
 msgid "Bottom attachment"
 msgstr "Atașare jos"
 
-#: gtk/gtktable.c:220
+#: ../gtk/gtktable.c:229
 msgid "Horizontal options"
 msgstr "Opțiuni pentru orizontală"
 
-#: gtk/gtktable.c:221
+#: ../gtk/gtktable.c:230
 msgid "Options specifying the horizontal behaviour of the child"
 msgstr "Opțiuni ce specifică comportarea pe orizontală a unui copil"
 
-#: gtk/gtktable.c:227
+#: ../gtk/gtktable.c:236
 msgid "Vertical options"
 msgstr "Opțiuni pentru verticală"
 
-#: gtk/gtktable.c:228
+#: ../gtk/gtktable.c:237
 msgid "Options specifying the vertical behaviour of the child"
 msgstr "Opțiuni ce specifică comportarea pe verticală a unui copil"
 
-#: gtk/gtktable.c:234
+#: ../gtk/gtktable.c:243
 msgid "Horizontal padding"
 msgstr "Umplere orizontală"
 
-#: gtk/gtktable.c:235
+#: ../gtk/gtktable.c:244
 msgid ""
 "Extra space to put between the child and its left and right neighbors, in "
 "pixels"
 msgstr "Spațiu în plus în pixeli între copil și vecinii din stânga și dreapta"
 
-#: gtk/gtktable.c:241
+#: ../gtk/gtktable.c:250
 msgid "Vertical padding"
 msgstr "Umplere verticală"
 
-#: gtk/gtktable.c:242
+#: ../gtk/gtktable.c:251
 msgid ""
 "Extra space to put between the child and its upper and lower neighbors, in "
 "pixels"
 msgstr ""
 "Spațiu în plus în pixeli între copil și vecinii de deasupra și de dedesubt"
 
-#: gtk/gtktextbuffer.c:192
+#: ../gtk/gtktextbuffer.c:191
 msgid "Tag Table"
 msgstr "Tabel etichete"
 
-#: gtk/gtktextbuffer.c:193
+#: ../gtk/gtktextbuffer.c:192
 msgid "Text Tag Table"
 msgstr "Tabel cu etichete text"
 
-#: gtk/gtktextbuffer.c:211
+#: ../gtk/gtktextbuffer.c:210
 msgid "Current text of the buffer"
 msgstr "Textul curent din buffer"
 
-#: gtk/gtktextbuffer.c:225
+#: ../gtk/gtktextbuffer.c:224
 msgid "Has selection"
 msgstr "Are selecție"
 
-#: gtk/gtktextbuffer.c:226
+#: ../gtk/gtktextbuffer.c:225
 msgid "Whether the buffer has some text currently selected"
 msgstr "Specifică dacă în buffer există text selectat curent"
 
-#: gtk/gtktextbuffer.c:242
+#: ../gtk/gtktextbuffer.c:241
 msgid "Cursor position"
 msgstr "Poziție cursor"
 
-#: gtk/gtktextbuffer.c:243
+#: ../gtk/gtktextbuffer.c:242
 msgid ""
 "The position of the insert mark (as offset from the beginning of the buffer)"
 msgstr "Poziția semnului de inserare (ca deplasare de la începutul bufferului)"
 
-#: gtk/gtktextbuffer.c:258
+#: ../gtk/gtktextbuffer.c:257
 msgid "Copy target list"
 msgstr "Listă ținte de copiere"
 
-#: gtk/gtktextbuffer.c:259
+#: ../gtk/gtktextbuffer.c:258
 msgid ""
 "The list of targets this buffer supports for clipboard copying and DND source"
 msgstr ""
 "Lista țintelor suportate de acest buffer pentur copierea în clipboard și "
 "surse DND"
 
-#: gtk/gtktextbuffer.c:274
+#: ../gtk/gtktextbuffer.c:273
 msgid "Paste target list"
 msgstr "Listă ținte de lipire"
 
-#: gtk/gtktextbuffer.c:275
+#: ../gtk/gtktextbuffer.c:274
 msgid ""
 "The list of targets this buffer supports for clipboard pasting and DND "
 "destination"
@@ -5728,37 +5800,37 @@ msgstr ""
 "Lista țintelor suportate de acest buffer pentur lipierea din clipboard și "
 "surse DND"
 
-#: gtk/gtktextmark.c:90
+#: ../gtk/gtktextmark.c:90
 msgid "Mark name"
 msgstr "Nume marcaj"
 
-#: gtk/gtktextmark.c:97
+#: ../gtk/gtktextmark.c:97
 msgid "Left gravity"
 msgstr "Gravitate la stânga"
 
-#: gtk/gtktextmark.c:98
+#: ../gtk/gtktextmark.c:98
 msgid "Whether the mark has left gravity"
 msgstr "Specifică dacă acest marcaj are gravitate la stânga"
 
-#: gtk/gtktexttag.c:168
+#: ../gtk/gtktexttag.c:168
 msgid "Tag name"
 msgstr "Nume etichetă"
 
-#: gtk/gtktexttag.c:169
+#: ../gtk/gtktexttag.c:169
 msgid "Name used to refer to the text tag. NULL for anonymous tags"
 msgstr ""
 "Nume utilizat pentru referirea la o etichetă text. NULL pentru etichete "
 "anonime"
 
-#: gtk/gtktexttag.c:187
+#: ../gtk/gtktexttag.c:187
 msgid "Background color as a (possibly unallocated) GdkColor"
 msgstr "Culoare de fundal ca GdkColor (posibil nealocată)"
 
-#: gtk/gtktexttag.c:194
+#: ../gtk/gtktexttag.c:194
 msgid "Background full height"
 msgstr "Fundal pe toată înălțimea"
 
-#: gtk/gtktexttag.c:195
+#: ../gtk/gtktexttag.c:195
 msgid ""
 "Whether the background color fills the entire line height or only the height "
 "of the tagged characters"
@@ -5766,28 +5838,28 @@ msgstr ""
 "Specifică dacă se umple cu culoarea fundalului toată înălțimea liniei sau "
 "doar cea a caracterelor marcate"
 
-#: gtk/gtktexttag.c:211
+#: ../gtk/gtktexttag.c:211
 msgid "Foreground color as a (possibly unallocated) GdkColor"
 msgstr "Culoare de prim-plan ca GdkColor (posibil nealocată)"
 
-#: gtk/gtktexttag.c:218
+#: ../gtk/gtktexttag.c:218
 msgid "Text direction"
 msgstr "Direcție text"
 
-#: gtk/gtktexttag.c:219
+#: ../gtk/gtktexttag.c:219
 msgid "Text direction, e.g. right-to-left or left-to-right"
 msgstr "Direcția textului (de ex. Stânga-Dreapta sau Dreapta-Stânga)"
 
-#: gtk/gtktexttag.c:268
+#: ../gtk/gtktexttag.c:268
 msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
 msgstr "Stil font ca valoare PangoStyle (de ex. PANGO_STYLE_ITALIC)"
 
-#: gtk/gtktexttag.c:277
+#: ../gtk/gtktexttag.c:277
 msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
 msgstr ""
 "Variantă font ca valoare PangoVariant (de ex. PANGO_VARIANT_SMALL_CAPS)"
 
-#: gtk/gtktexttag.c:286
+#: ../gtk/gtktexttag.c:286
 msgid ""
 "Font weight as an integer, see predefined values in PangoWeight; for "
 "example, PANGO_WEIGHT_BOLD"
@@ -5795,16 +5867,16 @@ msgstr ""
 "Grosimea fontului ca un întreg, a se vedea valorile predefinite PangoWeight "
 "(de ex. PANGO_WEIGHT_BOLD)"
 
-#: gtk/gtktexttag.c:297
+#: ../gtk/gtktexttag.c:297
 msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
 msgstr ""
 "Condensarea textului ca valoare PangoStretch (de ex. PANGO_STRETCH_CONDENSED)"
 
-#: gtk/gtktexttag.c:306
+#: ../gtk/gtktexttag.c:306
 msgid "Font size in Pango units"
 msgstr "Mărime font în unități Pango"
 
-#: gtk/gtktexttag.c:316
+#: ../gtk/gtktexttag.c:316
 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 "
@@ -5814,11 +5886,11 @@ msgstr ""
 "Această utilizare este recomandată, adaptându-se mai bine schimbărilor de "
 "temă etc. Pango predefinește scalări precum PANGO_SCALE_X_LARGE"
 
-#: gtk/gtktexttag.c:336 gtk/gtktextview.c:686
+#: ../gtk/gtktexttag.c:336 ../gtk/gtktextview.c:704
 msgid "Left, right, or center justification"
 msgstr "Aliniere la stânga, dreapta sau la mijloc"
 
-#: gtk/gtktexttag.c:355
+#: ../gtk/gtktexttag.c:355
 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."
@@ -5827,31 +5899,31 @@ msgstr ""
 "sugestie la afișarea textului. Dacă nu e setat, se va folosi valoarea "
 "implicită potrivită."
 
-#: gtk/gtktexttag.c:362
+#: ../gtk/gtktexttag.c:362
 msgid "Left margin"
 msgstr "Margine stângă"
 
-#: gtk/gtktexttag.c:363 gtk/gtktextview.c:695
+#: ../gtk/gtktexttag.c:363 ../gtk/gtktextview.c:713
 msgid "Width of the left margin in pixels"
 msgstr "Lățimea marginii stângi în pixeli"
 
-#: gtk/gtktexttag.c:372
+#: ../gtk/gtktexttag.c:372
 msgid "Right margin"
 msgstr "Margine dreaptă"
 
-#: gtk/gtktexttag.c:373 gtk/gtktextview.c:705
+#: ../gtk/gtktexttag.c:373 ../gtk/gtktextview.c:723
 msgid "Width of the right margin in pixels"
 msgstr "Lățimea marginii drepte în pixeli"
 
-#: gtk/gtktexttag.c:383 gtk/gtktextview.c:714
+#: ../gtk/gtktexttag.c:383 ../gtk/gtktextview.c:732
 msgid "Indent"
 msgstr "Indentare"
 
-#: gtk/gtktexttag.c:384 gtk/gtktextview.c:715
+#: ../gtk/gtktexttag.c:384 ../gtk/gtktextview.c:733
 msgid "Amount to indent the paragraph, in pixels"
 msgstr "Numărul de pixeli cu care să fie indentat paragraful"
 
-#: gtk/gtktexttag.c:395
+#: ../gtk/gtktexttag.c:395
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative) "
 "in Pango units"
@@ -5859,349 +5931,347 @@ msgstr ""
 "Deplasarea textului deasupra liniei de bază în unități Pango (dedesubt dacă "
 "valoarea este negativă)"
 
-#: gtk/gtktexttag.c:404
+#: ../gtk/gtktexttag.c:404
 msgid "Pixels above lines"
 msgstr "Pixeli deasupra liniilor"
 
-#: gtk/gtktexttag.c:405 gtk/gtktextview.c:639
+#: ../gtk/gtktexttag.c:405 ../gtk/gtktextview.c:657
 msgid "Pixels of blank space above paragraphs"
 msgstr "Pixeli de spațiu gol deasupra paragrafelor"
 
-#: gtk/gtktexttag.c:414
+#: ../gtk/gtktexttag.c:414
 msgid "Pixels below lines"
 msgstr "Pixeli sub linii"
 
-#: gtk/gtktexttag.c:415 gtk/gtktextview.c:649
+#: ../gtk/gtktexttag.c:415 ../gtk/gtktextview.c:667
 msgid "Pixels of blank space below paragraphs"
 msgstr "Pixeli de spațiu alb sub paragrafe"
 
-#: gtk/gtktexttag.c:424
+#: ../gtk/gtktexttag.c:424
 msgid "Pixels inside wrap"
 msgstr "Pixeli între linii formatate"
 
-#: gtk/gtktexttag.c:425 gtk/gtktextview.c:659
+#: ../gtk/gtktexttag.c:425 ../gtk/gtktextview.c:677
 msgid "Pixels of blank space between wrapped lines in a paragraph"
 msgstr "Pixeli de spațiu gol între liniile formatate dintr-un paragraf"
 
-#: gtk/gtktexttag.c:452 gtk/gtktextview.c:677
+#: ../gtk/gtktexttag.c:452 ../gtk/gtktextview.c:695
 msgid ""
 "Whether to wrap lines never, at word boundaries, or at character boundaries"
 msgstr ""
 "Specifică dacă liniile să fie neformatate, formatate fără ruperea cuvintelor "
 "sau formatate cu ruperea cuvintelor"
 
-#: gtk/gtktexttag.c:461 gtk/gtktextview.c:724
+#: ../gtk/gtktexttag.c:461 ../gtk/gtktextview.c:742
 msgid "Tabs"
 msgstr "Taburi"
 
-#: gtk/gtktexttag.c:462 gtk/gtktextview.c:725
+#: ../gtk/gtktexttag.c:462 ../gtk/gtktextview.c:743
 msgid "Custom tabs for this text"
 msgstr "Taburi personalizate pentru acest text"
 
-#: gtk/gtktexttag.c:480
+#: ../gtk/gtktexttag.c:480
 msgid "Invisible"
 msgstr "Invizibil"
 
-#: gtk/gtktexttag.c:481
+#: ../gtk/gtktexttag.c:481
 msgid "Whether this text is hidden."
 msgstr "Specifică dacă această etichetă este ascunsă"
 
-#: gtk/gtktexttag.c:495
+#: ../gtk/gtktexttag.c:495
 msgid "Paragraph background color name"
 msgstr "Numele culorii de fundal a paragrafului"
 
-#: gtk/gtktexttag.c:496
+#: ../gtk/gtktexttag.c:496
 msgid "Paragraph background color as a string"
 msgstr "Culoare fundal paragraf ca șir de caractere"
 
-#: gtk/gtktexttag.c:511
+#: ../gtk/gtktexttag.c:511
 msgid "Paragraph background color"
 msgstr "Culoare fundal paragraf"
 
-#: gtk/gtktexttag.c:512
+#: ../gtk/gtktexttag.c:512
 msgid "Paragraph background color as a (possibly unallocated) GdkColor"
 msgstr "Culoare de fundal paragraf ca GdkColor (posibil nealocată)"
 
-#: gtk/gtktexttag.c:530
+#: ../gtk/gtktexttag.c:530
 msgid "Margin Accumulates"
 msgstr "Margini cumulative"
 
-#: gtk/gtktexttag.c:531
+#: ../gtk/gtktexttag.c:531
 msgid "Whether left and right margins accumulate."
 msgstr "Specifică dacă marginile din dreapta și din stânga se cumulează."
 
-#: gtk/gtktexttag.c:544
+#: ../gtk/gtktexttag.c:544
 msgid "Background full height set"
 msgstr "Setare fundal pe toată înălțimea"
 
-#: gtk/gtktexttag.c:545
+#: ../gtk/gtktexttag.c:545
 msgid "Whether this tag affects background height"
 msgstr "Specifică dacă această opțiune afectează înălțimea fundalului"
 
-#: gtk/gtktexttag.c:584
+#: ../gtk/gtktexttag.c:584
 msgid "Justification set"
 msgstr "Setare aliniere"
 
-#: gtk/gtktexttag.c:585
+#: ../gtk/gtktexttag.c:585
 msgid "Whether this tag affects paragraph justification"
 msgstr "Specifică dacă această opțiune afectează alinierea paragrafelor"
 
-#: gtk/gtktexttag.c:592
+#: ../gtk/gtktexttag.c:592
 msgid "Left margin set"
 msgstr "Setare margine stângă"
 
-#: gtk/gtktexttag.c:593
+#: ../gtk/gtktexttag.c:593
 msgid "Whether this tag affects the left margin"
 msgstr "Specifică dacă această opțiune afectează marginea stângă"
 
-#: gtk/gtktexttag.c:596
+#: ../gtk/gtktexttag.c:596
 msgid "Indent set"
 msgstr "Setare indentare"
 
-#: gtk/gtktexttag.c:597
+#: ../gtk/gtktexttag.c:597
 msgid "Whether this tag affects indentation"
 msgstr "Specifică dacă această opțiune afectează indentarea"
 
-#: gtk/gtktexttag.c:604
+#: ../gtk/gtktexttag.c:604
 msgid "Pixels above lines set"
 msgstr "Setare pixeli deasupra liniilor"
 
-#: gtk/gtktexttag.c:605 gtk/gtktexttag.c:609
+#: ../gtk/gtktexttag.c:605 ../gtk/gtktexttag.c:609
 msgid "Whether this tag affects the number of pixels above lines"
 msgstr ""
 "Specifică dacă această opțiune afectează numărul pixelilor deasupra liniilor"
 
-#: gtk/gtktexttag.c:608
+#: ../gtk/gtktexttag.c:608
 msgid "Pixels below lines set"
 msgstr "Setare pixeli dedesubtul liniilor"
 
-#: gtk/gtktexttag.c:612
+#: ../gtk/gtktexttag.c:612
 msgid "Pixels inside wrap set"
 msgstr "Setare pixeli între linii formatate"
 
-#: gtk/gtktexttag.c:613
+#: ../gtk/gtktexttag.c:613
 msgid "Whether this tag affects the number of pixels between wrapped lines"
 msgstr ""
 "Specifică dacă această opțiune afectează numărul pixelilor dintre liniile "
 "formatate"
 
-#: gtk/gtktexttag.c:620
+#: ../gtk/gtktexttag.c:620
 msgid "Right margin set"
 msgstr "Setare margine dreaptă"
 
-#: gtk/gtktexttag.c:621
+#: ../gtk/gtktexttag.c:621
 msgid "Whether this tag affects the right margin"
 msgstr "Specifică dacă această opțiune afectează marginea dreaptă"
 
-#: gtk/gtktexttag.c:628
+#: ../gtk/gtktexttag.c:628
 msgid "Wrap mode set"
 msgstr "Setare mod formatare"
 
-#: gtk/gtktexttag.c:629
+#: ../gtk/gtktexttag.c:629
 msgid "Whether this tag affects line wrap mode"
 msgstr "Specifică dacă această opțiune afectează modul de formatare a liniei"
 
-#: gtk/gtktexttag.c:632
+#: ../gtk/gtktexttag.c:632
 msgid "Tabs set"
 msgstr "Setare taburi"
 
-#: gtk/gtktexttag.c:633
+#: ../gtk/gtktexttag.c:633
 msgid "Whether this tag affects tabs"
 msgstr "Specifică dacă această opțiune afectează taburile"
 
-#: gtk/gtktexttag.c:636
+#: ../gtk/gtktexttag.c:636
 msgid "Invisible set"
 msgstr "Setare invizibilitate"
 
-#: gtk/gtktexttag.c:637
+#: ../gtk/gtktexttag.c:637
 msgid "Whether this tag affects text visibility"
 msgstr "Specifică dacă această opțiune afectează vizibilitatea textului"
 
-#: gtk/gtktexttag.c:640
+#: ../gtk/gtktexttag.c:640
 msgid "Paragraph background set"
 msgstr "Set fundal paragraf"
 
-#: gtk/gtktexttag.c:641
+#: ../gtk/gtktexttag.c:641
 msgid "Whether this tag affects the paragraph background color"
 msgstr "Specifică dacă această etichetă afectează culoarea paragrafului"
 
-#: gtk/gtktextview.c:638
+#: ../gtk/gtktextview.c:656
 msgid "Pixels Above Lines"
 msgstr "Pixeli deasupra liniilor"
 
-#: gtk/gtktextview.c:648
+#: ../gtk/gtktextview.c:666
 msgid "Pixels Below Lines"
 msgstr "Pixeli dedesubtul liniilor"
 
-#: gtk/gtktextview.c:658
+#: ../gtk/gtktextview.c:676
 msgid "Pixels Inside Wrap"
 msgstr "Pixeli între linii formatate"
 
-#: gtk/gtktextview.c:676
+#: ../gtk/gtktextview.c:694
 msgid "Wrap Mode"
 msgstr "Mod formatare"
 
-#: gtk/gtktextview.c:694
+#: ../gtk/gtktextview.c:712
 msgid "Left Margin"
 msgstr "Margine stângă"
 
-#: gtk/gtktextview.c:704
+#: ../gtk/gtktextview.c:722
 msgid "Right Margin"
 msgstr "Margine dreaptă"
 
-#: gtk/gtktextview.c:732
+#: ../gtk/gtktextview.c:750
 msgid "Cursor Visible"
 msgstr "Cursor vizibil"
 
-#: gtk/gtktextview.c:733
+#: ../gtk/gtktextview.c:751
 msgid "If the insertion cursor is shown"
 msgstr "Dacă e vizibil cursorul de inserare"
 
-#: gtk/gtktextview.c:740
+#: ../gtk/gtktextview.c:758
 msgid "Buffer"
 msgstr "Buffer"
 
-#: gtk/gtktextview.c:741
+#: ../gtk/gtktextview.c:759
 msgid "The buffer which is displayed"
 msgstr "Buffer de afișat"
 
-#: gtk/gtktextview.c:749
+#: ../gtk/gtktextview.c:767
 msgid "Whether entered text overwrites existing contents"
 msgstr "Specifică dacă textul introdus suprascrie conținutul existent"
 
-#: gtk/gtktextview.c:756
+#: ../gtk/gtktextview.c:774
 msgid "Accepts tab"
 msgstr "Acceptă Tab"
 
-#: gtk/gtktextview.c:757
+#: ../gtk/gtktextview.c:775
 msgid "Whether Tab will result in a tab character being entered"
 msgstr "Specifică dacă apăsarea tastei „Tab” va genera un caracter Tab"
 
-#: gtk/gtktextview.c:786
+#: ../gtk/gtktextview.c:810
 msgid "Error underline color"
 msgstr "Eroare în culoarea de subliniere"
 
-#: gtk/gtktextview.c:787
+#: ../gtk/gtktextview.c:811
 msgid "Color with which to draw error-indication underlines"
 msgstr "Culoarea cu care vor fi afișate sublinierile ce indică erori "
 
-#: gtk/gtktoggleaction.c:118
+#: ../gtk/gtktoggleaction.c:118
 msgid "Create the same proxies as a radio action"
 msgstr "Creează aceleași proxy-uri ca o acțiune radio"
 
-#: gtk/gtktoggleaction.c:119
+#: ../gtk/gtktoggleaction.c:119
 msgid "Whether the proxies for this action look like radio action proxies"
 msgstr ""
 "Specifică dacă proxy-urile pentru această acțiune ar trebui să arate ca "
 "proxy-uri de acțiuni radio"
 
-#: gtk/gtktoggleaction.c:134
-#, fuzzy
+#: ../gtk/gtktoggleaction.c:134
 msgid "Whether the toggle action should be active"
-msgstr "Dacă butonul de comutare ar trebui să fie activ sau nu"
+msgstr "Dacă acțiunea de comutare ar trebui să fie activă"
 
-#: gtk/gtktogglebutton.c:116 gtk/gtktoggletoolbutton.c:113
-#, fuzzy
+#: ../gtk/gtktogglebutton.c:126 ../gtk/gtktoggletoolbutton.c:113
 msgid "If the toggle button should be pressed in"
-msgstr "Dacă butonul de comutare ar trebui să fie apăsat sau nu"
+msgstr "Dacă butonul de comutare ar trebui să fie apăsat "
 
-#: gtk/gtktogglebutton.c:124
+#: ../gtk/gtktogglebutton.c:134
 msgid "If the toggle button is in an \"in between\" state"
 msgstr "Dacă butonul de comutare este într-o stare intermediară"
 
-#: gtk/gtktogglebutton.c:131
+#: ../gtk/gtktogglebutton.c:141
 msgid "Draw Indicator"
 msgstr "Indicator de afișare"
 
-#: gtk/gtktogglebutton.c:132
+#: ../gtk/gtktogglebutton.c:142
 msgid "If the toggle part of the button is displayed"
 msgstr "Dacă partea de comutare a butonului este afișată"
 
-#: gtk/gtktoolbar.c:465 gtk/gtktoolpalette.c:1033
+#: ../gtk/gtktoolbar.c:491 ../gtk/gtktoolpalette.c:1060
 msgid "Toolbar Style"
 msgstr "Stil bară cu unelte"
 
-#: gtk/gtktoolbar.c:466
+#: ../gtk/gtktoolbar.c:492
 msgid "How to draw the toolbar"
 msgstr "Mod de desenare a barei cu unelte"
 
-#: gtk/gtktoolbar.c:473
+#: ../gtk/gtktoolbar.c:499
 msgid "Show Arrow"
 msgstr "Arată săgeata"
 
-#: gtk/gtktoolbar.c:474
+#: ../gtk/gtktoolbar.c:500
 msgid "If an arrow should be shown if the toolbar doesn't fit"
 msgstr "Dacă e vizibilă săgeata care indică butoanele ascunse ale barei"
 
-#: gtk/gtktoolbar.c:495
+#: ../gtk/gtktoolbar.c:521
 msgid "Size of icons in this toolbar"
 msgstr "Mărimea iconițelor în această bară cu unelte"
 
-#: gtk/gtktoolbar.c:510 gtk/gtktoolpalette.c:1019
+#: ../gtk/gtktoolbar.c:536 ../gtk/gtktoolpalette.c:1046
 msgid "Icon size set"
 msgstr "Setare mărime iconiță"
 
-#: gtk/gtktoolbar.c:511 gtk/gtktoolpalette.c:1020
+#: ../gtk/gtktoolbar.c:537 ../gtk/gtktoolpalette.c:1047
 msgid "Whether the icon-size property has been set"
 msgstr "Specifică dacă este setată proprietatea icon-size"
 
-#: gtk/gtktoolbar.c:520
+#: ../gtk/gtktoolbar.c:546
 msgid "Whether the item should receive extra space when the toolbar grows"
 msgstr ""
 "Specifică dacă acest element ar trebui să primească spațiu în plus când bara "
 "cu unelte crește"
 
-#: gtk/gtktoolbar.c:528 gtk/gtktoolitemgroup.c:1625
+#: ../gtk/gtktoolbar.c:554 ../gtk/gtktoolitemgroup.c:1642
 msgid "Whether the item should be the same size as other homogeneous items"
 msgstr ""
 "Specifică dacă acest element ar trebui să fie de aceeași mărime ca celelalte "
 "elemente"
 
-#: gtk/gtktoolbar.c:535
+#: ../gtk/gtktoolbar.c:561
 msgid "Spacer size"
 msgstr "Mărime spațiator"
 
-#: gtk/gtktoolbar.c:536
+#: ../gtk/gtktoolbar.c:562
 msgid "Size of spacers"
 msgstr "Mărimea spațiatorilor"
 
-#: gtk/gtktoolbar.c:545
+#: ../gtk/gtktoolbar.c:571
 msgid "Amount of border space between the toolbar shadow and the buttons"
 msgstr "Spațiul marginilor dintre umbra barei cu unelte și butoane"
 
-#: gtk/gtktoolbar.c:553
+#: ../gtk/gtktoolbar.c:579
 msgid "Maximum child expand"
 msgstr "Lățime desfășurare copil"
 
-#: gtk/gtktoolbar.c:554
+#: ../gtk/gtktoolbar.c:580
 msgid "Maximum amount of space an expandable item will be given"
 msgstr "Spațiul maxim ce va fi acordat unui element ce poate fi desfășurat"
 
-#: gtk/gtktoolbar.c:562
+#: ../gtk/gtktoolbar.c:588
 msgid "Space style"
 msgstr "Stil spațiatori"
 
-#: gtk/gtktoolbar.c:563
+#: ../gtk/gtktoolbar.c:589
 msgid "Whether spacers are vertical lines or just blank"
 msgstr "Specifică dacă spațiatorii sunt linii verticale sau doar spațiu gol"
 
-#: gtk/gtktoolbar.c:570
+#: ../gtk/gtktoolbar.c:596
 msgid "Button relief"
 msgstr "Reliefare buton"
 
-#: gtk/gtktoolbar.c:571
+#: ../gtk/gtktoolbar.c:597
 msgid "Type of bevel around toolbar buttons"
 msgstr "Tipul cadrului din jurul butoanelor barei cu unelte"
 
-#: gtk/gtktoolbar.c:578
+#: ../gtk/gtktoolbar.c:604
 msgid "Style of bevel around the toolbar"
 msgstr "Stilul cadrului din jurul barei cu unelte"
 
-#: gtk/gtktoolbutton.c:203
+#: ../gtk/gtktoolbutton.c:203
 msgid "Text to show in the item."
 msgstr "Text de afișat într-un element."
 
-#: gtk/gtktoolbutton.c:210
+#: ../gtk/gtktoolbutton.c:210
 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"
@@ -6209,43 +6279,43 @@ msgstr ""
 "La activare, o linie de subliniere în etichetă indică faptul că următorul "
 "caracter ar trebui să fie utilizat pentru tasta de accelerare"
 
-#: gtk/gtktoolbutton.c:217
+#: ../gtk/gtktoolbutton.c:217
 msgid "Widget to use as the item label"
 msgstr "Widget de utilizat pentru eticheta elementului"
 
-#: gtk/gtktoolbutton.c:223
+#: ../gtk/gtktoolbutton.c:223
 msgid "Stock Id"
 msgstr "ID standard"
 
-#: gtk/gtktoolbutton.c:224
+#: ../gtk/gtktoolbutton.c:224
 msgid "The stock icon displayed on the item"
 msgstr "Iconiță standard afișată pentru element"
 
-#: gtk/gtktoolbutton.c:240
+#: ../gtk/gtktoolbutton.c:240
 msgid "Icon name"
 msgstr "Nume iconiță"
 
-#: gtk/gtktoolbutton.c:241
+#: ../gtk/gtktoolbutton.c:241
 msgid "The name of the themed icon displayed on the item"
 msgstr "Numele iconiței tematice afișate pentru element"
 
-#: gtk/gtktoolbutton.c:247
+#: ../gtk/gtktoolbutton.c:247
 msgid "Icon widget"
 msgstr "Widget iconiță"
 
-#: gtk/gtktoolbutton.c:248
+#: ../gtk/gtktoolbutton.c:248
 msgid "Icon widget to display in the item"
 msgstr "Widget iconiță de afișat în element"
 
-#: gtk/gtktoolbutton.c:261
+#: ../gtk/gtktoolbutton.c:261
 msgid "Icon spacing"
 msgstr "Spațiere iconiță"
 
-#: gtk/gtktoolbutton.c:262
+#: ../gtk/gtktoolbutton.c:262
 msgid "Spacing in pixels between the icon and label"
 msgstr "Spațiu în pixeli între iconiță și etichetă"
 
-#: gtk/gtktoolitem.c:201
+#: ../gtk/gtktoolitem.c:210
 msgid ""
 "Whether the toolbar item is considered important. When TRUE, toolbar buttons "
 "show text in GTK_TOOLBAR_BOTH_HORIZ mode"
@@ -6253,528 +6323,504 @@ msgstr ""
 "Specifică dacă elementul din bara cu unelte e considerat important. La "
 "activare, butoanele barei cu unelte au text în modul GTK_TOOLBAR_BOTH_HORIZ"
 
-#: gtk/gtktoolitemgroup.c:1572
+#: ../gtk/gtktoolitemgroup.c:1589
 msgid "The human-readable title of this item group"
 msgstr "Titlul ușor de înțeles al acestui grup de elemente"
 
-#: gtk/gtktoolitemgroup.c:1579
+#: ../gtk/gtktoolitemgroup.c:1596
 msgid "A widget to display in place of the usual label"
 msgstr "Un widget de afișat în locul etichetei obișnuite"
 
-#: gtk/gtktoolitemgroup.c:1585
+#: ../gtk/gtktoolitemgroup.c:1602
 msgid "Collapsed"
 msgstr "Înfășurat"
 
-#: gtk/gtktoolitemgroup.c:1586
-#, fuzzy
+#: ../gtk/gtktoolitemgroup.c:1603
 msgid "Whether the group has been collapsed and items are hidden"
 msgstr ""
 "Specifică dacă grupul a fost înfășurat și elementele acestuia sunt ascunse"
 
-#: gtk/gtktoolitemgroup.c:1592
+#: ../gtk/gtktoolitemgroup.c:1609
 msgid "ellipsize"
 msgstr "prescurtare"
 
-#: gtk/gtktoolitemgroup.c:1593
+#: ../gtk/gtktoolitemgroup.c:1610
 msgid "Ellipsize for item group headers"
 msgstr "Prescurtare a antetului grupului de elemente"
 
-#: gtk/gtktoolitemgroup.c:1599
+#: ../gtk/gtktoolitemgroup.c:1616
 msgid "Header Relief"
 msgstr "Relief antet"
 
-#: gtk/gtktoolitemgroup.c:1600
+#: ../gtk/gtktoolitemgroup.c:1617
 msgid "Relief of the group header button"
 msgstr "Relief al butonului antetului grupului"
 
-#: gtk/gtktoolitemgroup.c:1615
+#: ../gtk/gtktoolitemgroup.c:1632
 msgid "Header Spacing"
 msgstr "Spațiere antet"
 
-#: gtk/gtktoolitemgroup.c:1616
+#: ../gtk/gtktoolitemgroup.c:1633
 msgid "Spacing between expander arrow and caption"
 msgstr "Spațiere între săgeata desfășurătorului și titlu"
 
-#: gtk/gtktoolitemgroup.c:1632
+#: ../gtk/gtktoolitemgroup.c:1649
 msgid "Whether the item should receive extra space when the group grows"
 msgstr ""
 "Specifică dacă acest element ar trebui să primească spațiu în plus când "
 "grupul crește"
 
-#: gtk/gtktoolitemgroup.c:1639
+#: ../gtk/gtktoolitemgroup.c:1656
 msgid "Whether the item should fill the available space"
 msgstr "Specifică dacă elementul ar trebui să umple spațiul disponibil"
 
-#: gtk/gtktoolitemgroup.c:1645
+#: ../gtk/gtktoolitemgroup.c:1662
 msgid "New Row"
 msgstr "Rând nou"
 
-#: gtk/gtktoolitemgroup.c:1646
+#: ../gtk/gtktoolitemgroup.c:1663
 msgid "Whether the item should start a new row"
 msgstr "Specifică dacă elementul ar trebui să înceapă un rând nou"
 
-#: gtk/gtktoolitemgroup.c:1653
+#: ../gtk/gtktoolitemgroup.c:1670
 msgid "Position of the item within this group"
 msgstr "Poziția elementului în acest grup"
 
-#: gtk/gtktoolpalette.c:1004
+#: ../gtk/gtktoolpalette.c:1031
 msgid "Size of icons in this tool palette"
 msgstr "Mărimea iconițelor în această paletă de unelte"
 
-#: gtk/gtktoolpalette.c:1034
+#: ../gtk/gtktoolpalette.c:1061
 msgid "Style of items in the tool palette"
 msgstr "Stilul elementelor din paleta de unelte"
 
-#: gtk/gtktoolpalette.c:1050
+#: ../gtk/gtktoolpalette.c:1077
 msgid "Exclusive"
 msgstr "Exclusiv"
 
-#: gtk/gtktoolpalette.c:1051
+#: ../gtk/gtktoolpalette.c:1078
 msgid "Whether the item group should be the only expanded at a given time"
 msgstr ""
 "Specifică dacă grupul de elemente ar trebui să fie desfășurat la un anumit "
 "moment"
 
-#: gtk/gtktoolpalette.c:1066
+#: ../gtk/gtktoolpalette.c:1093
 msgid ""
 "Whether the item group should receive extra space when the palette grows"
 msgstr ""
 "Specifică dacă un grup de elemente ar trebui să primească spațiu în plus "
 "când paleta crește"
 
-#: gtk/gtktrayicon-x11.c:134
+#: ../gtk/gtktrayicon-x11.c:134
 msgid "Foreground color for symbolic icons"
 msgstr "Culoare prim-plan pentru iconițe simbolice"
 
-#: gtk/gtktrayicon-x11.c:141
+#: ../gtk/gtktrayicon-x11.c:141
 msgid "Error color"
 msgstr "Culoare eroare"
 
-#: gtk/gtktrayicon-x11.c:142
+#: ../gtk/gtktrayicon-x11.c:142
 msgid "Error color for symbolic icons"
 msgstr "Culoare de eroare pentru iconițe simbolice"
 
-#: gtk/gtktrayicon-x11.c:149
+#: ../gtk/gtktrayicon-x11.c:149
 msgid "Warning color"
 msgstr "Culoare avertisment"
 
-#: gtk/gtktrayicon-x11.c:150
+#: ../gtk/gtktrayicon-x11.c:150
 msgid "Warning color for symbolic icons"
 msgstr "Culoare de avertisment pentru iconițe simbolice"
 
-#: gtk/gtktrayicon-x11.c:157
+#: ../gtk/gtktrayicon-x11.c:157
 msgid "Success color"
 msgstr "Culoare succes"
 
-#: gtk/gtktrayicon-x11.c:158
+#: ../gtk/gtktrayicon-x11.c:158
 msgid "Success color for symbolic icons"
 msgstr "Culoare de succes pentru iconițe simbolice"
 
-#: gtk/gtktrayicon-x11.c:166
+#: ../gtk/gtktrayicon-x11.c:166
 msgid "Padding that should be put around icons in the tray"
 msgstr ""
 "Spațiu de umplere care ar trebui să fie pus în jurul iconițelor din zona de "
 "notificare"
 
-#: gtk/gtktreemodelsort.c:278
+#: ../gtk/gtktreemodelsort.c:278
 msgid "TreeModelSort Model"
 msgstr "Model TreeModelSort"
 
-#: gtk/gtktreemodelsort.c:279
+#: ../gtk/gtktreemodelsort.c:279
 msgid "The model for the TreeModelSort to sort"
 msgstr "Modelul de sortare TreeModelSort"
 
-#: gtk/gtktreeview.c:563
+#: ../gtk/gtktreeview.c:661
 msgid "TreeView Model"
 msgstr "Model TreeView"
 
-#: gtk/gtktreeview.c:564
+#: ../gtk/gtktreeview.c:662
 msgid "The model for the tree view"
 msgstr "Model pentru afișarea de tip arbore"
 
-#: gtk/gtktreeview.c:572
-msgid "Horizontal Adjustment for the widget"
-msgstr "Ajustare orizontală widget"
-
-#: gtk/gtktreeview.c:580
-msgid "Vertical Adjustment for the widget"
-msgstr "Ajustare verticală widget"
-
-#: gtk/gtktreeview.c:587
+#: ../gtk/gtktreeview.c:674
 msgid "Headers Visible"
 msgstr "Antete vizibile"
 
-#: gtk/gtktreeview.c:588
+#: ../gtk/gtktreeview.c:675
 msgid "Show the column header buttons"
 msgstr "Arată butoanele antetelor de coloană"
 
-#: gtk/gtktreeview.c:595
+#: ../gtk/gtktreeview.c:682
 msgid "Headers Clickable"
 msgstr "Antete sensibile la clic"
 
-#: gtk/gtktreeview.c:596
+#: ../gtk/gtktreeview.c:683
 msgid "Column headers respond to click events"
 msgstr "Antetele coloanelor răspund la clic"
 
-#: gtk/gtktreeview.c:603
+#: ../gtk/gtktreeview.c:690
 msgid "Expander Column"
 msgstr "Coloană de desfășurare"
 
 # Very fishy... Mișu
-#: gtk/gtktreeview.c:604
+#: ../gtk/gtktreeview.c:691
 msgid "Set the column for the expander column"
 msgstr "Setare coloană pentru coloana de desfășurare"
 
-#: gtk/gtktreeview.c:619
+#: ../gtk/gtktreeview.c:706
 msgid "Rules Hint"
 msgstr "Reguli sugerate"
 
-#: gtk/gtktreeview.c:620
+#: ../gtk/gtktreeview.c:707
 msgid "Set a hint to the theme engine to draw rows in alternating colors"
 msgstr "Sugerează motorului temei afișarea rândurilor în culori alternative"
 
-#: gtk/gtktreeview.c:627
+#: ../gtk/gtktreeview.c:714
 msgid "Enable Search"
 msgstr "Activează căutarea"
 
-#: gtk/gtktreeview.c:628
+#: ../gtk/gtktreeview.c:715
 msgid "View allows user to search through columns interactively"
 msgstr "Afișarea permite utilizatorului să caute interactiv prin coloane"
 
-#: gtk/gtktreeview.c:635
+#: ../gtk/gtktreeview.c:722
 msgid "Search Column"
 msgstr "Coloană de căutare"
 
-#: gtk/gtktreeview.c:636
+#: ../gtk/gtktreeview.c:723
 msgid "Model column to search through during interactive search"
 msgstr "Coloană model pentru căutare în timpul căutării interactive"
 
-#: gtk/gtktreeview.c:656
+#: ../gtk/gtktreeview.c:743
 msgid "Fixed Height Mode"
 msgstr "Mod cu înălțime fixă"
 
-#: gtk/gtktreeview.c:657
+#: ../gtk/gtktreeview.c:744
 msgid "Speeds up GtkTreeView by assuming that all rows have the same height"
 msgstr ""
 "Eficientizează GtkTreeView presupunând că toate rândurile au aceeași înălțime"
 
-#: gtk/gtktreeview.c:677
+#: ../gtk/gtktreeview.c:764
 msgid "Hover Selection"
 msgstr "Selecție la focus"
 
-#: gtk/gtktreeview.c:678
+#: ../gtk/gtktreeview.c:765
 msgid "Whether the selection should follow the pointer"
 msgstr "Specifică dacă selecția ar trebui să urmărească cursorul"
 
-#: gtk/gtktreeview.c:697
+#: ../gtk/gtktreeview.c:784
 msgid "Hover Expand"
 msgstr "Extindere la focus"
 
-#: gtk/gtktreeview.c:698
+#: ../gtk/gtktreeview.c:785
 msgid ""
 "Whether rows should be expanded/collapsed when the pointer moves over them"
 msgstr ""
 "Specifică dacă rândurile trebuie strânse și desfăcute la trecerea cursorului "
 "de maus"
 
-#: gtk/gtktreeview.c:712
+#: ../gtk/gtktreeview.c:799
 msgid "Show Expanders"
 msgstr "Arată desfășurătorii"
 
-#: gtk/gtktreeview.c:713
+#: ../gtk/gtktreeview.c:800
 msgid "View has expanders"
 msgstr "Vizualizarea are desfășurători"
 
-#: gtk/gtktreeview.c:727
+#: ../gtk/gtktreeview.c:814
 msgid "Level Indentation"
 msgstr "Indentare nivel"
 
-#: gtk/gtktreeview.c:728
+#: ../gtk/gtktreeview.c:815
 msgid "Extra indentation for each level"
 msgstr "Indentare în plus pentru fiecare nivel"
 
-#: gtk/gtktreeview.c:737
+#: ../gtk/gtktreeview.c:824
 msgid "Rubber Banding"
 msgstr "Fixare și tragere"
 
-#: gtk/gtktreeview.c:738
+#: ../gtk/gtktreeview.c:825
 msgid ""
 "Whether to enable selection of multiple items by dragging the mouse pointer"
 msgstr ""
 "Specifică dacă este permisă selectarea mai multor elemente prin clic și "
 "tragere de maus"
 
-#: gtk/gtktreeview.c:745
+#: ../gtk/gtktreeview.c:832
 msgid "Enable Grid Lines"
 msgstr "Activează liniile grilei"
 
-#: gtk/gtktreeview.c:746
+#: ../gtk/gtktreeview.c:833
 msgid "Whether grid lines should be drawn in the tree view"
 msgstr ""
 "Specifică dacă ar trebui arătate liniile grilei în vizualizarea de tip arbore"
 
-#: gtk/gtktreeview.c:754
+#: ../gtk/gtktreeview.c:841
 msgid "Enable Tree Lines"
 msgstr "Activează liniile arborelui"
 
-#: gtk/gtktreeview.c:755
+#: ../gtk/gtktreeview.c:842
 msgid "Whether tree lines should be drawn in the tree view"
 msgstr ""
 "Specifică dacă ar trebui arătate liniile arborelui în vizualizarea de tip "
 "arbore"
 
-#: gtk/gtktreeview.c:763
+#: ../gtk/gtktreeview.c:850
 msgid "The column in the model containing the tooltip texts for the rows"
 msgstr "O coloană a modelului ce conține textele indiciilor pentru rânduri"
 
-#: gtk/gtktreeview.c:785
+#: ../gtk/gtktreeview.c:872
 msgid "Vertical Separator Width"
 msgstr "Lățime separator vertical"
 
-#: gtk/gtktreeview.c:786
+#: ../gtk/gtktreeview.c:873
 msgid "Vertical space between cells.  Must be an even number"
 msgstr "Spațiu vertical între celule. E necesar să fie un număr par"
 
-#: gtk/gtktreeview.c:794
+#: ../gtk/gtktreeview.c:881
 msgid "Horizontal Separator Width"
 msgstr "Lățime separator orizontal"
 
-#: gtk/gtktreeview.c:795
+#: ../gtk/gtktreeview.c:882
 msgid "Horizontal space between cells.  Must be an even number"
 msgstr "Spațiu orizontal între celule. E necesar să fie un număr par"
 
-#: gtk/gtktreeview.c:803
+#: ../gtk/gtktreeview.c:890
 msgid "Allow Rules"
 msgstr "Permite reguli"
 
-#: gtk/gtktreeview.c:804
+#: ../gtk/gtktreeview.c:891
 msgid "Allow drawing of alternating color rows"
 msgstr "Permite afișarea rândurilor cu culori alternative"
 
-#: gtk/gtktreeview.c:810
+#: ../gtk/gtktreeview.c:897
 msgid "Indent Expanders"
 msgstr "Desfășurători indentați"
 
 # Not really sure 'bout this one. Mișu
-#: gtk/gtktreeview.c:811
+#: ../gtk/gtktreeview.c:898
 msgid "Make the expanders indented"
 msgstr "Indentează desfășurătorii"
 
-#: gtk/gtktreeview.c:817
+#: ../gtk/gtktreeview.c:904
 msgid "Even Row Color"
 msgstr "Culoare rând par"
 
-#: gtk/gtktreeview.c:818
+#: ../gtk/gtktreeview.c:905
 msgid "Color to use for even rows"
 msgstr "Culoare de utilizat pentru rândurile pare"
 
-#: gtk/gtktreeview.c:824
+#: ../gtk/gtktreeview.c:911
 msgid "Odd Row Color"
 msgstr "Culoare rând impar"
 
-#: gtk/gtktreeview.c:825
+#: ../gtk/gtktreeview.c:912
 msgid "Color to use for odd rows"
 msgstr "Culoare de utilizat pentru rândurile impare"
 
-#: gtk/gtktreeview.c:831
+#: ../gtk/gtktreeview.c:918
 msgid "Grid line width"
 msgstr "Lățime linie grilă"
 
-#: gtk/gtktreeview.c:832
+#: ../gtk/gtktreeview.c:919
 msgid "Width, in pixels, of the tree view grid lines"
 msgstr "Lățimea în pixeli a liniilor grilei vizualizării de tip arbore"
 
-#: gtk/gtktreeview.c:838
+#: ../gtk/gtktreeview.c:925
 msgid "Tree line width"
 msgstr "Lățime linie arbore"
 
-#: gtk/gtktreeview.c:839
+#: ../gtk/gtktreeview.c:926
 msgid "Width, in pixels, of the tree view lines"
 msgstr "Lățimea în pixeli a liniilor vizualizării de tip arbore"
 
-#: gtk/gtktreeview.c:845
+#: ../gtk/gtktreeview.c:932
 msgid "Grid line pattern"
 msgstr "Model linie grilă"
 
-#: gtk/gtktreeview.c:846
+#: ../gtk/gtktreeview.c:933
 msgid "Dash pattern used to draw the tree view grid lines"
 msgstr ""
 "Model liniar utilizat pentru desenarea liniilor grilei vizualizării de tip "
 "arbore"
 
-#: gtk/gtktreeview.c:852
+#: ../gtk/gtktreeview.c:939
 msgid "Tree line pattern"
 msgstr "Model linie arbore"
 
 # Got confused... Mișu
-#: gtk/gtktreeview.c:853
+#: ../gtk/gtktreeview.c:940
 msgid "Dash pattern used to draw the tree view lines"
 msgstr ""
 "Model liniar utilizat pentru desenarea liniilor vizualizării de tip arbore"
 
-#: gtk/gtktreeviewcolumn.c:196
+#: ../gtk/gtktreeviewcolumn.c:214
 msgid "Whether to display the column"
 msgstr "Specifică dacă se afișează coloana"
 
-#: gtk/gtktreeviewcolumn.c:203 gtk/gtkwindow.c:609
+#: ../gtk/gtktreeviewcolumn.c:221 ../gtk/gtkwindow.c:657
 msgid "Resizable"
 msgstr "Redimensionabil"
 
-#: gtk/gtktreeviewcolumn.c:204
+#: ../gtk/gtktreeviewcolumn.c:222
 msgid "Column is user-resizable"
 msgstr "Coloana poate fi redimensionată de utilizator"
 
-#: gtk/gtktreeviewcolumn.c:212
+#: ../gtk/gtktreeviewcolumn.c:230
 msgid "Current width of the column"
 msgstr "Lățimea curentă a coloanei"
 
-#: gtk/gtktreeviewcolumn.c:221
+#: ../gtk/gtktreeviewcolumn.c:239
 msgid "Space which is inserted between cells"
 msgstr "Spațiu de inserat între celule"
 
-#: gtk/gtktreeviewcolumn.c:229
+#: ../gtk/gtktreeviewcolumn.c:247
 msgid "Sizing"
 msgstr "Dimensionare"
 
-#: gtk/gtktreeviewcolumn.c:230
+#: ../gtk/gtktreeviewcolumn.c:248
 msgid "Resize mode of the column"
 msgstr "Modul de redimensionare a coloanei"
 
-#: gtk/gtktreeviewcolumn.c:238
+#: ../gtk/gtktreeviewcolumn.c:256
 msgid "Fixed Width"
 msgstr "Lățime fixă"
 
-#: gtk/gtktreeviewcolumn.c:239
+#: ../gtk/gtktreeviewcolumn.c:257
 msgid "Current fixed width of the column"
 msgstr "Lățimea fixă curentă a coloanei"
 
-#: gtk/gtktreeviewcolumn.c:248
+#: ../gtk/gtktreeviewcolumn.c:266
 msgid "Minimum Width"
 msgstr "Lățime minimă"
 
-#: gtk/gtktreeviewcolumn.c:249
+#: ../gtk/gtktreeviewcolumn.c:267
 msgid "Minimum allowed width of the column"
 msgstr "Lățimea minimă permisă a coloanei"
 
-#: gtk/gtktreeviewcolumn.c:258
+#: ../gtk/gtktreeviewcolumn.c:276
 msgid "Maximum Width"
 msgstr "Lățime maximă"
 
-#: gtk/gtktreeviewcolumn.c:259
+#: ../gtk/gtktreeviewcolumn.c:277
 msgid "Maximum allowed width of the column"
 msgstr "Lățimea maximă permisă a coloanei"
 
-#: gtk/gtktreeviewcolumn.c:269
+#: ../gtk/gtktreeviewcolumn.c:287
 msgid "Title to appear in column header"
 msgstr "Titlu de afișat în antetul coloanei"
 
-#: gtk/gtktreeviewcolumn.c:277
+#: ../gtk/gtktreeviewcolumn.c:295
 msgid "Column gets share of extra width allocated to the widget"
 msgstr "Coloana primește o parte din spațiul în plus alocat pentru widget"
 
-#: gtk/gtktreeviewcolumn.c:284
+#: ../gtk/gtktreeviewcolumn.c:302
 msgid "Clickable"
 msgstr "Sensibil la clic"
 
-#: gtk/gtktreeviewcolumn.c:285
+#: ../gtk/gtktreeviewcolumn.c:303
 msgid "Whether the header can be clicked"
 msgstr "Specifică dacă se poate face clic pe antet"
 
-#: gtk/gtktreeviewcolumn.c:293
+#: ../gtk/gtktreeviewcolumn.c:311
 msgid "Widget"
 msgstr "Widget"
 
-#: gtk/gtktreeviewcolumn.c:294
+#: ../gtk/gtktreeviewcolumn.c:312
 msgid "Widget to put in column header button instead of column title"
 msgstr "Widget de pus în butonul antetului coloanei în loc de titlul coloanei"
 
-#: gtk/gtktreeviewcolumn.c:302
+#: ../gtk/gtktreeviewcolumn.c:320
 msgid "X Alignment of the column header text or widget"
 msgstr "Alinierea X a textului antetului coloanei sau widgetului"
 
-#: gtk/gtktreeviewcolumn.c:312
+#: ../gtk/gtktreeviewcolumn.c:330
 msgid "Whether the column can be reordered around the headers"
 msgstr "Specifică dacă se poate reordona coloana în jurul antetelor"
 
-#: gtk/gtktreeviewcolumn.c:319
+#: ../gtk/gtktreeviewcolumn.c:337
 msgid "Sort indicator"
 msgstr "Indicator de sortare"
 
-#: gtk/gtktreeviewcolumn.c:320
+#: ../gtk/gtktreeviewcolumn.c:338
 msgid "Whether to show a sort indicator"
 msgstr "Specifică dacă se afișează un indicator de sortare"
 
-#: gtk/gtktreeviewcolumn.c:327
+#: ../gtk/gtktreeviewcolumn.c:345
 msgid "Sort order"
 msgstr "Ordine sortare"
 
-#: gtk/gtktreeviewcolumn.c:328
+#: ../gtk/gtktreeviewcolumn.c:346
 msgid "Sort direction the sort indicator should indicate"
 msgstr "Direcție de sortare sugerată de indicatorul de sortare"
 
-#: gtk/gtktreeviewcolumn.c:344
+#: ../gtk/gtktreeviewcolumn.c:362
 msgid "Sort column ID"
 msgstr "ID coloană de sortare"
 
-#: gtk/gtktreeviewcolumn.c:345
+#: ../gtk/gtktreeviewcolumn.c:363
 msgid "Logical sort column ID this column sorts on when selected for sorting"
 msgstr ""
 "ID-ul coloanei de sortare logică utilizat la sortare când coloana e "
 "selectată pentru sortare"
 
-#: gtk/gtkuimanager.c:225
+#: ../gtk/gtkuimanager.c:225
 msgid "Whether tearoff menu items should be added to menus"
 msgstr "Specifică dacă elementele de desprindere vor fi adăugate în meniu"
 
-#: gtk/gtkuimanager.c:232
+#: ../gtk/gtkuimanager.c:232
 msgid "Merged UI definition"
 msgstr "Definiție UI reunit"
 
-#: gtk/gtkuimanager.c:233
+#: ../gtk/gtkuimanager.c:233
 msgid "An XML string describing the merged UI"
 msgstr "Un șir XML care descrie un UI reunit"
 
-#: gtk/gtkviewport.c:143
-msgid ""
-"The GtkAdjustment that determines the values of the horizontal position for "
-"this viewport"
-msgstr ""
-"GtkAdjustment ce determină valorile poziției orizontale ale acestui "
-"„viewport”"
-
-#: gtk/gtkviewport.c:151
-msgid ""
-"The GtkAdjustment that determines the values of the vertical position for "
-"this viewport"
-msgstr ""
-"GtkAdjustment ce determină valorile poziției verticale ale acestui „viewport”"
-
-#: gtk/gtkviewport.c:159
+#: ../gtk/gtkviewport.c:155
 msgid "Determines how the shadowed box around the viewport is drawn"
-msgstr "Determină cum se va afișa cutia umbrită din jurul unui „viewport”"
+msgstr "Determină cum se va afișa căsuța umbrită din jurul unui „viewport”"
 
-#: gtk/gtkwidget.c:714
+#: ../gtk/gtkwidget.c:876
 msgid "Widget name"
 msgstr "Nume widget"
 
-#: gtk/gtkwidget.c:715
+#: ../gtk/gtkwidget.c:877
 msgid "The name of the widget"
 msgstr "Numele widgetului"
 
-#: gtk/gtkwidget.c:721
+#: ../gtk/gtkwidget.c:883
 msgid "Parent widget"
 msgstr "Widget părinte"
 
-#: gtk/gtkwidget.c:722
+#: ../gtk/gtkwidget.c:884
 msgid "The parent widget of this widget. Must be a Container widget"
 msgstr ""
 "Widgetul părinte pentru acest widget. E necesar să fie un widget „Container”"
 
-#: gtk/gtkwidget.c:729
+#: ../gtk/gtkwidget.c:891
 msgid "Width request"
 msgstr "Cerere lățime"
 
-#: gtk/gtkwidget.c:730
+#: ../gtk/gtkwidget.c:892
 msgid ""
 "Override for width request of the widget, or -1 if natural request should be "
 "used"
@@ -6782,11 +6828,11 @@ msgstr ""
 "Valoare impusă pentru lățimea widgetului sau „-1” pentru a utiliza mărimea "
 "implicită"
 
-#: gtk/gtkwidget.c:738
+#: ../gtk/gtkwidget.c:900
 msgid "Height request"
 msgstr "Cerere înălțime"
 
-#: gtk/gtkwidget.c:739
+#: ../gtk/gtkwidget.c:901
 msgid ""
 "Override for height request of the widget, or -1 if natural request should "
 "be used"
@@ -6794,237 +6840,271 @@ msgstr ""
 "Valoare impusă pentru înălțimea widgetului sau „-1” pentru a utiliza mărimea "
 "implicită"
 
-#: gtk/gtkwidget.c:748
+#: ../gtk/gtkwidget.c:910
 msgid "Whether the widget is visible"
 msgstr "Specifică dacă widgetul este vizibil"
 
 # Ugly... Mișu
-#: gtk/gtkwidget.c:755
+#: ../gtk/gtkwidget.c:917
 msgid "Whether the widget responds to input"
 msgstr "Specifică dacă widgetul răspunde la input"
 
-#: gtk/gtkwidget.c:761
+#: ../gtk/gtkwidget.c:923
 msgid "Application paintable"
 msgstr "Poate fi desenat"
 
-#: gtk/gtkwidget.c:762
+#: ../gtk/gtkwidget.c:924
 msgid "Whether the application will paint directly on the widget"
 msgstr "Specifică dacă aplicația va desena direct în widget"
 
-#: gtk/gtkwidget.c:768
+#: ../gtk/gtkwidget.c:930
 msgid "Can focus"
 msgstr "Suportă focus"
 
-#: gtk/gtkwidget.c:769
+#: ../gtk/gtkwidget.c:931
 msgid "Whether the widget can accept the input focus"
 msgstr "Specifică dacă widgetul poate accepta focus la input"
 
-#: gtk/gtkwidget.c:775
+#: ../gtk/gtkwidget.c:937
 msgid "Has focus"
 msgstr "Are focus"
 
-#: gtk/gtkwidget.c:776
+#: ../gtk/gtkwidget.c:938
 msgid "Whether the widget has the input focus"
 msgstr "Specifică dacă widgetul are focus la input"
 
-#: gtk/gtkwidget.c:782
+#: ../gtk/gtkwidget.c:944
 msgid "Is focus"
 msgstr "E focus"
 
-#: gtk/gtkwidget.c:783
+#: ../gtk/gtkwidget.c:945
 msgid "Whether the widget is the focus widget within the toplevel"
 msgstr "Specifică dacă widgetul este cel cu focus în nivelul cel mai de sus"
 
-#: gtk/gtkwidget.c:789
+#: ../gtk/gtkwidget.c:951
 msgid "Can default"
 msgstr "Poate fi implicit"
 
-#: gtk/gtkwidget.c:790
+#: ../gtk/gtkwidget.c:952
 msgid "Whether the widget can be the default widget"
 msgstr "Specifică dacă widgetul poate fi widgetul implicit"
 
-#: gtk/gtkwidget.c:796
+#: ../gtk/gtkwidget.c:958
 msgid "Has default"
 msgstr "Este implicit"
 
-#: gtk/gtkwidget.c:797
+#: ../gtk/gtkwidget.c:959
 msgid "Whether the widget is the default widget"
 msgstr "Specifică dacă widgetul este widgetul implicit"
 
-#: gtk/gtkwidget.c:803
+#: ../gtk/gtkwidget.c:965
 msgid "Receives default"
 msgstr "Primește implicit"
 
-#: gtk/gtkwidget.c:804
+#: ../gtk/gtkwidget.c:966
 msgid "If TRUE, the widget will receive the default action when it is focused"
 msgstr "La activare, widgetul va primi acțiunea implicită când are focus"
 
-#: gtk/gtkwidget.c:810
+#: ../gtk/gtkwidget.c:972
 msgid "Composite child"
 msgstr "Copil „composite”"
 
-#: gtk/gtkwidget.c:811
+#: ../gtk/gtkwidget.c:973
 msgid "Whether the widget is part of a composite widget"
 msgstr "Specifică dacă widgetul face parte dintr-un widget „composite”"
 
-#: gtk/gtkwidget.c:817
+#: ../gtk/gtkwidget.c:979
 msgid "Style"
 msgstr "Stil"
 
-#: gtk/gtkwidget.c:818
+#: ../gtk/gtkwidget.c:980
 msgid ""
 "The style of the widget, which contains information about how it will look "
 "(colors etc)"
 msgstr ""
 "Stilul widgetului, care conține informație despre cum va arăta (culori etc.)"
 
-#: gtk/gtkwidget.c:824
+#: ../gtk/gtkwidget.c:986
 msgid "Events"
 msgstr "Evenimente"
 
-#: gtk/gtkwidget.c:825
+#: ../gtk/gtkwidget.c:987
 msgid "The event mask that decides what kind of GdkEvents this widget gets"
 msgstr ""
 "Filtrul de evenimente care decide ce fel de evenimente GdkEvents primește "
 "acest widget"
 
-#: gtk/gtkwidget.c:832
+#: ../gtk/gtkwidget.c:994
 msgid "Extension events"
 msgstr "Evenimente extensie"
 
-#: gtk/gtkwidget.c:833
+#: ../gtk/gtkwidget.c:995
 msgid "The mask that decides what kind of extension events this widget gets"
 msgstr ""
 "Filtrul ce decide ce fel de evenimente de extensie primește acest widget"
 
-#: gtk/gtkwidget.c:840
+#: ../gtk/gtkwidget.c:1002
 msgid "No show all"
 msgstr "Nu arăta tot"
 
-#: gtk/gtkwidget.c:841
+#: ../gtk/gtkwidget.c:1003
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Specifică dacă gtk_widget_all() ar trebui să afecteze acest widget"
 
-#: gtk/gtkwidget.c:864
+#: ../gtk/gtkwidget.c:1026
 msgid "Whether this widget has a tooltip"
 msgstr "Specifică dacă acest widget are indiciu"
 
-#: gtk/gtkwidget.c:920
+#: ../gtk/gtkwidget.c:1082
 msgid "Window"
 msgstr "Fereastră"
 
-#: gtk/gtkwidget.c:921
+#: ../gtk/gtkwidget.c:1083
 msgid "The widget's window if it is realized"
 msgstr "Fereastra widgetului dacă acesta e creat"
 
-#: gtk/gtkwidget.c:935
+#: ../gtk/gtkwidget.c:1097
 msgid "Double Buffered"
 msgstr "În buffer dublu"
 
-#: gtk/gtkwidget.c:936
-#, fuzzy
+#: ../gtk/gtkwidget.c:1098
 msgid "Whether the widget is double buffered"
 msgstr "Specifică dacă widgetul este într-un buffer dublu"
 
-#: gtk/gtkwidget.c:951
+#: ../gtk/gtkwidget.c:1113
 msgid "How to position in extra horizontal space"
-msgstr ""
+msgstr "Cum să fie poziționat spațiul orizontal suplimentar"
 
-#: gtk/gtkwidget.c:967
+#: ../gtk/gtkwidget.c:1129
 msgid "How to position in extra vertical space"
-msgstr ""
+msgstr "Cum să fie poziționat spațiul vertical suplimentar"
 
-#: gtk/gtkwidget.c:986
-#, fuzzy
+#: ../gtk/gtkwidget.c:1148
 msgid "Margin on Left"
-msgstr "Margine"
+msgstr "Margine în stânga"
 
-#: gtk/gtkwidget.c:987
+#: ../gtk/gtkwidget.c:1149
 msgid "Pixels of extra space on the left side"
-msgstr ""
+msgstr "Pixeli ai spațiului suplimentar din partea stânga"
 
-#: gtk/gtkwidget.c:1007
+#: ../gtk/gtkwidget.c:1169
 msgid "Margin on Right"
-msgstr ""
+msgstr "Margine în dreapta"
 
-#: gtk/gtkwidget.c:1008
-#, fuzzy
+#: ../gtk/gtkwidget.c:1170
 msgid "Pixels of extra space on the right side"
-msgstr "Pixeli de spațiu gol deasupra paragrafelor"
+msgstr "Pixeli ai spațiului suplimentar în partea dreaptă"
 
-#: gtk/gtkwidget.c:1028
-#, fuzzy
+#: ../gtk/gtkwidget.c:1190
 msgid "Margin on Top"
-msgstr "Margine"
+msgstr "Margine în partea de sus"
 
-#: gtk/gtkwidget.c:1029
-#, fuzzy
+#: ../gtk/gtkwidget.c:1191
 msgid "Pixels of extra space on the top side"
-msgstr "Pixeli de spațiu gol deasupra paragrafelor"
+msgstr "Pixeli de spațiu suplimentar în partea de sus"
 
-#: gtk/gtkwidget.c:1049
+#: ../gtk/gtkwidget.c:1211
 msgid "Margin on Bottom"
-msgstr ""
+msgstr "Margine în partea de jos"
 
-#: gtk/gtkwidget.c:1050
+#: ../gtk/gtkwidget.c:1212
 msgid "Pixels of extra space on the bottom side"
-msgstr ""
+msgstr "Pixeli ai spațiului suplimentar din partea de jos"
 
-#: gtk/gtkwidget.c:1067
-#, fuzzy
+#: ../gtk/gtkwidget.c:1229
 msgid "All Margins"
-msgstr "Margine"
+msgstr "Toate marginile"
 
-#: gtk/gtkwidget.c:1068
+#: ../gtk/gtkwidget.c:1230
 msgid "Pixels of extra space on all four sides"
-msgstr ""
+msgstr "Pixeli ai spațiului suplimentar in toate patru parțile"
+
+#: ../gtk/gtkwidget.c:1263
+msgid "Horizontal Expand"
+msgstr "Extindere orizontală"
+
+#: ../gtk/gtkwidget.c:1264
+msgid "Whether widget wants more horizontal space"
+msgstr "Specifică dacă widgetul vrea mai mult spațiu orizontal"
+
+#: ../gtk/gtkwidget.c:1278
+msgid "Horizontal Expand Set"
+msgstr "Setare extindere orizontală"
 
-#: gtk/gtkwidget.c:2741
+#: ../gtk/gtkwidget.c:1279
+msgid "Whether to use the hexpand property"
+msgstr "Specifică dacă se utilizează proprietatea „hexpand”"
+
+#: ../gtk/gtkwidget.c:1293
+msgid "Vertical Expand"
+msgstr "Extindere verticală"
+
+#: ../gtk/gtkwidget.c:1294
+msgid "Whether widget wants more vertical space"
+msgstr "Specifică dacă widgetul vrea mai mult spațiu vertical"
+
+#: ../gtk/gtkwidget.c:1308
+msgid "Vertical Expand Set"
+msgstr "Setare extindere verticală"
+
+#: ../gtk/gtkwidget.c:1309
+msgid "Whether to use the vexpand property"
+msgstr "Specifică dacă se utilizează proprietatea „vexpand”"
+
+#: ../gtk/gtkwidget.c:1323
+msgid "Expand Both"
+msgstr "Extindere în ambele direcții"
+
+#: ../gtk/gtkwidget.c:1324
+msgid "Whether widget wants to expand in both directions"
+msgstr "Specifică dacă widgetul vrea să se extindă în ambele direcții"
+
+#: ../gtk/gtkwidget.c:2963
 msgid "Interior Focus"
 msgstr "Focalizare internă"
 
-#: gtk/gtkwidget.c:2742
+#: ../gtk/gtkwidget.c:2964
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Specifică dacă indicatorul de focus să fie desenat în widgeturi"
 
-#: gtk/gtkwidget.c:2748
+#: ../gtk/gtkwidget.c:2970
 msgid "Focus linewidth"
 msgstr "Lățime linie focalizată"
 
-#: gtk/gtkwidget.c:2749
+#: ../gtk/gtkwidget.c:2971
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Lățimea în pixeli a liniei indicatorului de focus"
 
-#: gtk/gtkwidget.c:2755
+#: ../gtk/gtkwidget.c:2977
 msgid "Focus line dash pattern"
 msgstr "Model evidențiere linie de focalizare"
 
 # Got confused... Mișu
-#: gtk/gtkwidget.c:2756
+#: ../gtk/gtkwidget.c:2978
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Model utilizat pentru afișarea indicatorului de focus"
 
-#: gtk/gtkwidget.c:2761
+#: ../gtk/gtkwidget.c:2983
 msgid "Focus padding"
 msgstr "Umplutură la focalizare"
 
-#: gtk/gtkwidget.c:2762
+#: ../gtk/gtkwidget.c:2984
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
-msgstr "Lățime în pixeli între indicatorul de focus și cutia widgetului"
+msgstr "Lățime în pixeli între indicatorul de focus și căsuța widgetului"
 
-#: gtk/gtkwidget.c:2767
+#: ../gtk/gtkwidget.c:2989
 msgid "Cursor color"
 msgstr "Culoare cursor"
 
-#: gtk/gtkwidget.c:2768
+#: ../gtk/gtkwidget.c:2990
 msgid "Color with which to draw insertion cursor"
 msgstr "Culoarea cu care va fi afișat cursorul de inserare"
 
-#: gtk/gtkwidget.c:2773
+#: ../gtk/gtkwidget.c:2995
 msgid "Secondary cursor color"
 msgstr "Culoare cursor secundar"
 
-#: gtk/gtkwidget.c:2774
+#: ../gtk/gtkwidget.c:2996
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -7032,126 +7112,126 @@ msgstr ""
 "Culoarea cu care va fi afișat cel de-al doilea cursor de inserare la "
 "editarea amestecată Stânga-Dreapta și Dreapta-Stânga"
 
-#: gtk/gtkwidget.c:2779
+#: ../gtk/gtkwidget.c:3001
 msgid "Cursor line aspect ratio"
 msgstr "Proporții aspect cursor"
 
-#: gtk/gtkwidget.c:2780
+#: ../gtk/gtkwidget.c:3002
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Proporțiile aspectului cu care va fi afișat cursorul de inserare"
 
-#: gtk/gtkwidget.c:2786
+#: ../gtk/gtkwidget.c:3008
 msgid "Window dragging"
 msgstr "Tragere fereastră"
 
-#: gtk/gtkwidget.c:2787
+#: ../gtk/gtkwidget.c:3009
 msgid "Whether windows can be dragged by clicking on empty areas"
 msgstr "Specifică dacă ferestrele pot fi trase prin clicuri în zone goale"
 
-#: gtk/gtkwidget.c:2800
+#: ../gtk/gtkwidget.c:3022
 msgid "Unvisited Link Color"
 msgstr "Culoare link nevizitat"
 
-#: gtk/gtkwidget.c:2801
+#: ../gtk/gtkwidget.c:3023
 msgid "Color of unvisited links"
 msgstr "Culoarea linkurilor nevizitate"
 
-#: gtk/gtkwidget.c:2814
+#: ../gtk/gtkwidget.c:3036
 msgid "Visited Link Color"
 msgstr "Culoare link vizitat"
 
-#: gtk/gtkwidget.c:2815
+#: ../gtk/gtkwidget.c:3037
 msgid "Color of visited links"
 msgstr "Culoarea linkurilor vizitate"
 
-#: gtk/gtkwidget.c:2829
+#: ../gtk/gtkwidget.c:3051
 msgid "Wide Separators"
 msgstr "Separatori îndepărtați"
 
-#: gtk/gtkwidget.c:2830
+#: ../gtk/gtkwidget.c:3052
 msgid ""
 "Whether separators have configurable width and should be drawn using a box "
 "instead of a line"
 msgstr ""
 "Specifică dacă separatorii au o lățime configurabilă și dacă ar trebui "
-"desenați utilizând un cadru în locul unei linii"
+"desenați utilizând o căsuță în locul unei linii"
 
-#: gtk/gtkwidget.c:2844
+#: ../gtk/gtkwidget.c:3066
 msgid "Separator Width"
 msgstr "Lățime separator"
 
-#: gtk/gtkwidget.c:2845
+#: ../gtk/gtkwidget.c:3067
 msgid "The width of separators if wide-separators is TRUE"
 msgstr "Lățimea separatorilor la activarea separatorilor îndepărtați"
 
-#: gtk/gtkwidget.c:2859
+#: ../gtk/gtkwidget.c:3081
 msgid "Separator Height"
 msgstr "Înălțime separatori"
 
-#: gtk/gtkwidget.c:2860
+#: ../gtk/gtkwidget.c:3082
 msgid "The height of separators if \"wide-separators\" is TRUE"
 msgstr "Înălțimea separatorilor la activarea separatorilor îndepărtați"
 
-#: gtk/gtkwidget.c:2874
+#: ../gtk/gtkwidget.c:3096
 msgid "Horizontal Scroll Arrow Length"
 msgstr "Lungime săgeată de defilare orizontală"
 
-#: gtk/gtkwidget.c:2875
+#: ../gtk/gtkwidget.c:3097
 msgid "The length of horizontal scroll arrows"
 msgstr "Lungimea săgeților de defilare pe orizontală"
 
-#: gtk/gtkwidget.c:2889
+#: ../gtk/gtkwidget.c:3111
 msgid "Vertical Scroll Arrow Length"
 msgstr "Lungime săgeată de defilare verticală"
 
-#: gtk/gtkwidget.c:2890
+#: ../gtk/gtkwidget.c:3112
 msgid "The length of vertical scroll arrows"
 msgstr "Lungimea săgeților de defilare pe verticală"
 
-#: gtk/gtkwindow.c:567
+#: ../gtk/gtkwindow.c:615
 msgid "Window Type"
 msgstr "Tip fereastră"
 
-#: gtk/gtkwindow.c:568
+#: ../gtk/gtkwindow.c:616
 msgid "The type of the window"
 msgstr "Tipul ferestrei"
 
-#: gtk/gtkwindow.c:576
+#: ../gtk/gtkwindow.c:624
 msgid "Window Title"
 msgstr "Titlu fereastră"
 
-#: gtk/gtkwindow.c:577
+#: ../gtk/gtkwindow.c:625
 msgid "The title of the window"
 msgstr "Titlul ferestrei"
 
-#: gtk/gtkwindow.c:584
+#: ../gtk/gtkwindow.c:632
 msgid "Window Role"
 msgstr "Rol fereastră"
 
-#: gtk/gtkwindow.c:585
+#: ../gtk/gtkwindow.c:633
 msgid "Unique identifier for the window to be used when restoring a session"
 msgstr ""
 "Identificator unic pentru fereastră de utilizat la restaurarea unei sesiuni"
 
-#: gtk/gtkwindow.c:601
+#: ../gtk/gtkwindow.c:649
 msgid "Startup ID"
 msgstr "ID de pornire"
 
-#: gtk/gtkwindow.c:602
+#: ../gtk/gtkwindow.c:650
 msgid "Unique startup identifier for the window used by startup-notification"
 msgstr ""
 "Identificator unic de pornire pentru această fereastră, de utilizat la "
 "notificarea la pornire"
 
-#: gtk/gtkwindow.c:610
+#: ../gtk/gtkwindow.c:658
 msgid "If TRUE, users can resize the window"
 msgstr "La activare, utilizatorul poate redimensiona fereastra"
 
-#: gtk/gtkwindow.c:617
+#: ../gtk/gtkwindow.c:665
 msgid "Modal"
 msgstr "Modală"
 
-#: gtk/gtkwindow.c:618
+#: ../gtk/gtkwindow.c:666
 msgid ""
 "If TRUE, the window is modal (other windows are not usable while this one is "
 "up)"
@@ -7159,83 +7239,83 @@ msgstr ""
 "La activare, fereastra este modală (alte ferestre nu pot fi utilizate cât "
 "timp aceasta este deschisă)"
 
-#: gtk/gtkwindow.c:625
+#: ../gtk/gtkwindow.c:673
 msgid "Window Position"
 msgstr "Poziție fereastră"
 
-#: gtk/gtkwindow.c:626
+#: ../gtk/gtkwindow.c:674
 msgid "The initial position of the window"
 msgstr "Poziția inițială a ferestrei"
 
-#: gtk/gtkwindow.c:634
+#: ../gtk/gtkwindow.c:682
 msgid "Default Width"
 msgstr "Lățime implicită"
 
-#: gtk/gtkwindow.c:635
+#: ../gtk/gtkwindow.c:683
 msgid "The default width of the window, used when initially showing the window"
 msgstr ""
 "Lățimea implicită a ferestrei, utilizată când fereastra este afișată prima "
 "dată"
 
-#: gtk/gtkwindow.c:644
+#: ../gtk/gtkwindow.c:692
 msgid "Default Height"
 msgstr "Înălțime implicită"
 
-#: gtk/gtkwindow.c:645
+#: ../gtk/gtkwindow.c:693
 msgid ""
 "The default height of the window, used when initially showing the window"
 msgstr ""
 "Înălțimea implicită a ferestrei, utilizată când fereastra este afișată prima "
 "dată"
 
-#: gtk/gtkwindow.c:654
+#: ../gtk/gtkwindow.c:702
 msgid "Destroy with Parent"
 msgstr "Distruge odată cu părintele"
 
-#: gtk/gtkwindow.c:655
+#: ../gtk/gtkwindow.c:703
 msgid "If this window should be destroyed when the parent is destroyed"
 msgstr ""
 "Dacă această fereastră ar trebui să fie distrusă când părintele este distrus"
 
-#: gtk/gtkwindow.c:663
+#: ../gtk/gtkwindow.c:711
 msgid "Icon for this window"
 msgstr "Iconiță pentru această fereastră"
 
-#: gtk/gtkwindow.c:669
+#: ../gtk/gtkwindow.c:717
 msgid "Mnemonics Visible"
 msgstr "Mnemonici vizibile"
 
-#: gtk/gtkwindow.c:670
+#: ../gtk/gtkwindow.c:718
 msgid "Whether mnemonics are currently visible in this window"
 msgstr "Specifică dacă mnemonicile sunt vizibile acum în această ferestră"
 
-#: gtk/gtkwindow.c:686
+#: ../gtk/gtkwindow.c:734
 msgid "Name of the themed icon for this window"
 msgstr "Nume iconiță tematică pentru această fereastră"
 
-#: gtk/gtkwindow.c:701
+#: ../gtk/gtkwindow.c:749
 msgid "Is Active"
 msgstr "Este activă"
 
-#: gtk/gtkwindow.c:702
+#: ../gtk/gtkwindow.c:750
 msgid "Whether the toplevel is the current active window"
 msgstr "Specifică dacă nivelul cel mai de sus este fereastra activă curent"
 
-#: gtk/gtkwindow.c:709
+#: ../gtk/gtkwindow.c:757
 msgid "Focus in Toplevel"
 msgstr "Focalizare în nivelul cel mai de sus"
 
-#: gtk/gtkwindow.c:710
+#: ../gtk/gtkwindow.c:758
 msgid "Whether the input focus is within this GtkWindow"
 msgstr ""
 "Specifică dacă focusul inputului este în interiorul acestei ferestre "
 "GtkWindow"
 
-#: gtk/gtkwindow.c:717
+#: ../gtk/gtkwindow.c:765
 msgid "Type hint"
 msgstr "Sugestie de introdus"
 
-#: gtk/gtkwindow.c:718
+#: ../gtk/gtkwindow.c:766
 msgid ""
 "Hint to help the desktop environment understand what kind of window this is "
 "and how to treat it."
@@ -7243,102 +7323,148 @@ msgstr ""
 "Sugestie pentru mediul desktop astfel încât să se înțeleagă ce fel de "
 "fereastră este și cum să fie tratată."
 
-#: gtk/gtkwindow.c:726
+#: ../gtk/gtkwindow.c:774
 msgid "Skip taskbar"
 msgstr "Nu în bara cu programe"
 
-#: gtk/gtkwindow.c:727
+#: ../gtk/gtkwindow.c:775
 msgid "TRUE if the window should not be in the task bar."
 msgstr "TRUE dacă fereastra nu ar trebui să fie în bara programelor."
 
-#: gtk/gtkwindow.c:734
+#: ../gtk/gtkwindow.c:782
 msgid "Skip pager"
 msgstr "Nu în comutatorul ecranelor"
 
-#: gtk/gtkwindow.c:735
+#: ../gtk/gtkwindow.c:783
 msgid "TRUE if the window should not be in the pager."
 msgstr "TRUE dacă fereastra nu ar trebui să apară în comutatorul de ecrane."
 
-#: gtk/gtkwindow.c:742
+#: ../gtk/gtkwindow.c:790
 msgid "Urgent"
 msgstr "Urgent"
 
-#: gtk/gtkwindow.c:743
+#: ../gtk/gtkwindow.c:791
 msgid "TRUE if the window should be brought to the user's attention."
 msgstr "TRUE dacă fereastra ar trebui să fie în atenția utilizatorului."
 
-#: gtk/gtkwindow.c:757
+#: ../gtk/gtkwindow.c:805
 msgid "Accept focus"
 msgstr "Acceptă focus"
 
-#: gtk/gtkwindow.c:758
+#: ../gtk/gtkwindow.c:806
 msgid "TRUE if the window should receive the input focus."
 msgstr "TRUE dacă fereastra ar trebui să accepte focus."
 
-#: gtk/gtkwindow.c:772
+#: ../gtk/gtkwindow.c:820
 msgid "Focus on map"
 msgstr "Focus la mapare"
 
-#: gtk/gtkwindow.c:773
+#: ../gtk/gtkwindow.c:821
 msgid "TRUE if the window should receive the input focus when mapped."
 msgstr "TRUE dacă fereastra ar trebui să primească focus la mapare."
 
-#: gtk/gtkwindow.c:787
+#: ../gtk/gtkwindow.c:835
 msgid "Decorated"
 msgstr "Decorată"
 
-#: gtk/gtkwindow.c:788
+#: ../gtk/gtkwindow.c:836
 msgid "Whether the window should be decorated by the window manager"
 msgstr ""
 "TRUE dacă fereastra ar trebui să fie decorată de administratorul de ferestre"
 
-#: gtk/gtkwindow.c:802
+#: ../gtk/gtkwindow.c:850
 msgid "Deletable"
 msgstr "Poate fi șters"
 
-#: gtk/gtkwindow.c:803
+#: ../gtk/gtkwindow.c:851
 msgid "Whether the window frame should have a close button"
 msgstr "Specifică dacă fereastra ar trebui să aibă un buton de închidere"
 
-#: gtk/gtkwindow.c:819
+#: ../gtk/gtkwindow.c:870
+msgid "Resize grip"
+msgstr "Mâner redimensionare"
+
+#: ../gtk/gtkwindow.c:871
+msgid "Specifies whether the window should have a resize grip"
+msgstr "Specifică dacă fereastra ar trebui să aibă un mâner de redimensionare"
+
+#: ../gtk/gtkwindow.c:885
+msgid "Resize grip is visible"
+msgstr "Mânerul de redimensionare este vizibil"
+
+#: ../gtk/gtkwindow.c:886
+msgid "Specifies whether the window's resize grip is visible."
+msgstr "Specifică dacă este vizibil mânerul de redimensionare al ferestrei."
+
+#: ../gtk/gtkwindow.c:902
 msgid "Gravity"
 msgstr "Gravitate"
 
-#: gtk/gtkwindow.c:820
+#: ../gtk/gtkwindow.c:903
 msgid "The window gravity of the window"
 msgstr "Gravitatea ferestrei"
 
-#: gtk/gtkwindow.c:837
+#: ../gtk/gtkwindow.c:920
 msgid "Transient for Window"
 msgstr "Tranzient pentru fereastră"
 
-#: gtk/gtkwindow.c:838
+#: ../gtk/gtkwindow.c:921
 msgid "The transient parent of the dialog"
 msgstr "Părintele tranzient al mesajului dialog"
 
-#: gtk/gtkwindow.c:853
+#: ../gtk/gtkwindow.c:936
 msgid "Opacity for Window"
 msgstr "Opacitate fereastră"
 
-#: gtk/gtkwindow.c:854
+#: ../gtk/gtkwindow.c:937
 msgid "The opacity of the window, from 0 to 1"
 msgstr "Opacitatea ferestrei, între 0 și 1"
 
-#: modules/input/gtkimcontextxim.c:334
-msgid "IM Preedit style"
-msgstr "Stil pre-editare IM"
+#: ../gtk/gtkwindow.c:947 ../gtk/gtkwindow.c:948
+msgid "Width of resize grip"
+msgstr "Lăţimea mânerului de redimensionare"
 
-#: modules/input/gtkimcontextxim.c:335
-msgid "How to draw the input method preedit string"
-msgstr "Mod de afișare a șirului de preeditare al metodei de input"
+#: ../gtk/gtkwindow.c:953 ../gtk/gtkwindow.c:954
+msgid "Height of resize grip"
+msgstr "Înălţimea mânerului de redimensionare"
 
-#: modules/input/gtkimcontextxim.c:343
-msgid "IM Status style"
-msgstr "Stil status IM"
+#: ../gtk/gtkwindow.c:973
+msgid "GtkApplication"
+msgstr "GtkApplication"
 
-#: modules/input/gtkimcontextxim.c:344
-msgid "How to draw the input method statusbar"
-msgstr "Mod de afișare a barei de stare a metodei de input"
+#: ../gtk/gtkwindow.c:974
+msgid "The GtkApplication for the window"
+msgstr "GtkApplication pentru fereastră"
+
+#~ msgid "Horizontal adjustment"
+#~ msgstr "Ajustare orizontală"
+
+#~ msgid "Vertical adjustment"
+#~ msgstr "Ajustare verticală"
+
+#~ msgid "Whether the statusbar has a grip for resizing the toplevel"
+#~ msgstr ""
+#~ "Specifică dacă bara de stare are un colț ce ușurează redimensionarea"
+
+#~ msgid "Horizontal Adjustment for the widget"
+#~ msgstr "Ajustare orizontală widget"
+
+#~ msgid "Vertical Adjustment for the widget"
+#~ msgstr "Ajustare verticală widget"
+
+#~ msgid ""
+#~ "The GtkAdjustment that determines the values of the horizontal position "
+#~ "for this viewport"
+#~ msgstr ""
+#~ "GtkAdjustment ce determină valorile poziției orizontale ale acestui "
+#~ "„viewport”"
+
+#~ msgid ""
+#~ "The GtkAdjustment that determines the values of the vertical position for "
+#~ "this viewport"
+#~ msgstr ""
+#~ "GtkAdjustment ce determină valorile poziției verticale ale acestui "
+#~ "„viewport”"
 
 #~ msgid "the GdkScreen for the renderer"
 #~ msgstr "valoare GdkScreen pentru afișare"
@@ -7410,334 +7536,3 @@ msgstr "Mod de afișare a barei de stare a metodei de input"
 #~ msgstr ""
 #~ "La activare, părțile inferioare ale celor două părți ale derulatorului "
 #~ "sunt afișate cu detalii diferite"
-
-#~| msgid "Position Set"
-#~ msgid "Stepper Position Details"
-#~ msgstr "Detalii poziții butoane de derulare"
-
-#~ msgid ""
-#~ "When TRUE, the detail string for rendering the steppers is suffixed with "
-#~ "position information"
-#~ msgstr ""
-#~ "Dacă e TRUE, șirul de detalii de randare a butoanelor de derulare este "
-#~ "sufixat cu informații despre poziție"
-
-#~ msgid "Blinking"
-#~ msgstr "Clipire"
-
-#~ msgid "Whether or not the status icon is blinking"
-#~ msgstr "Specifică dacă iconița de stare clipește"
-
-#~ msgid "Background stipple mask"
-#~ msgstr "Mască „stipple” pentru fundal"
-
-#~ msgid "Bitmap to use as a mask when drawing the text background"
-#~ msgstr "Bitmap de utilizat ca mască la afișarea unui text în fundal"
-
-#~ msgid "Foreground stipple mask"
-#~ msgstr "Mască „stipple” pentru prim-plan"
-
-#~ msgid "Bitmap to use as a mask when drawing the text foreground"
-#~ msgstr "Bitmap de utilizat ca mască la afișarea unui text în prim-plan"
-
-#~ msgid "Background stipple set"
-#~ msgstr "Setare „stipple” fundal"
-
-#~ msgid "Whether this tag affects the background stipple"
-#~ msgstr ""
-#~ "Specifică dacă această opțiune afectează masca „stipple” a fundalului"
-
-#~ msgid "Foreground stipple set"
-#~ msgstr "Setare „stipple” prim-plan"
-
-#~ msgid "Whether this tag affects the foreground stipple"
-#~ msgstr ""
-#~ "Specifică dacă această opțiune afectează masca „stipple” a prim-planului"
-
-#~ msgid "Row Ending details"
-#~ msgstr "Detalii capăt rând"
-
-#~ msgid "Enable extended row background theming"
-#~ msgstr "Activează personalizarea fundalului rândurilor extinse"
-
-#~ msgid "Draw Border"
-#~ msgstr "Margine de trasat"
-
-#~ msgid "Size of areas outside the widget's allocation to draw"
-#~ msgstr "Mărimea ariilor de trasat înafara spațiului alocat unui widget"
-
-#~ msgid "Loop"
-#~ msgstr "Buclă"
-
-#~ msgid "Whether the animation should loop when it reaches the end"
-#~ msgstr "Specifică dacă animația trebuie redată repetat"
-
-#~ msgid "Number of Channels"
-#~ msgstr "Număr de canale"
-
-#~ msgid "The number of samples per pixel"
-#~ msgstr "Numărul de eșantioane per pixel"
-
-#~ msgid "Colorspace"
-#~ msgstr "Adâncime culoare"
-
-#~ msgid "The colorspace in which the samples are interpreted"
-#~ msgstr "Adâncimea culorii în care sunt interpretate eșantioanele"
-
-#~ msgid "Has Alpha"
-#~ msgstr "Are alpha"
-
-#~ msgid "Whether the pixbuf has an alpha channel"
-#~ msgstr "Specifică dacă bufferul de pixeli are un canal alpha"
-
-#~ msgid "Bits per Sample"
-#~ msgstr "Biți per eșantion"
-
-#~ msgid "The number of bits per sample"
-#~ msgstr "Numărul de biți per eșantion"
-
-#~ msgid "The number of columns of the pixbuf"
-#~ msgstr "Numărul de coloane în bufferul de pixeli"
-
-#~ msgid "The number of rows of the pixbuf"
-#~ msgstr "Numărul de linii în bufferul de pixeli"
-
-#~ msgid "Rowstride"
-#~ msgstr "Lățime linii"
-
-#~ msgid ""
-#~ "The number of bytes between the start of a row and the start of the next "
-#~ "row"
-#~ msgstr ""
-#~ "Număr de pixeli între începutul unei linii și începutul următoarei linii"
-
-#~ msgid "Pixels"
-#~ msgstr "Pixeli"
-
-#~ msgid "A pointer to the pixel data of the pixbuf"
-#~ msgstr "Un pointer către datele pixel din bufferul de pixeli"
-
-#~ msgid "The GdkFont that is currently selected"
-#~ msgstr "GdkFont selectat curent."
-
-#~ msgid "Activity mode"
-#~ msgstr "Mod activ"
-
-#~ 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 ""
-#~ "La activare, GtkProgress este în mod activ, ceea ce înseamnă că arată că "
-#~ "se întâmplă ceva, dar nu cum progresează activitatea. Se utilizează când "
-#~ "se întâmplă ceva care nu se știe cât va dura."
-
-#~ msgid ""
-#~ "The maximum number of items to be returned by gtk_recent_manager_get_items"
-#~ "()"
-#~ msgstr ""
-#~ "Numărul maxim de elemente de returnat de către "
-#~ "gtk_recent_manager_get_items()"
-
-#~ msgid "Allow Shrink"
-#~ msgstr "Permite micșorare"
-
-#~ msgid ""
-#~ "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of "
-#~ "the time a bad idea"
-#~ msgstr ""
-#~ "La activare, fereastra nu are o mărime minimă. În 99% din cazuri aceasta "
-#~ "nu este o idee prea bună"
-
-#~ msgid "Allow Grow"
-#~ msgstr "Permite mărire"
-
-#~ msgid "If TRUE, users can expand the window beyond its minimum size"
-#~ msgstr ""
-#~ "La activare, utilizatorii pot întinde fereastra depășind mărimea minimă"
-
-#~ msgid "Enable arrow keys"
-#~ msgstr "Activează tastele săgeți"
-
-#~ msgid "Whether the arrow keys move through the list of items"
-#~ msgstr "Specifică dacă tastele săgeți navighează prin lista de elemente"
-
-#~ msgid "Always enable arrows"
-#~ msgstr "Întotdeauna activează tastele săgeți"
-
-#~ msgid "Obsolete property, ignored"
-#~ msgstr "Proprietate învechită, se ignoră"
-
-#~ msgid "Case sensitive"
-#~ msgstr "Majuscule semnificative"
-
-#~ msgid "Whether list item matching is case sensitive"
-#~ msgstr ""
-#~ "Specifică dacă potrivirea elementelor din listă ține cont de diferența "
-#~ "între literele mari și cele mici"
-
-#~ msgid "Allow empty"
-#~ msgstr "Permite nul"
-
-#~ msgid "Whether an empty value may be entered in this field"
-#~ msgstr "Specifică dacă o valoare nulă poate fi introdusă în acest câmp"
-
-#~ msgid "Value in list"
-#~ msgstr "Valoare în listă"
-
-#~ msgid "Whether entered values must already be present in the list"
-#~ msgstr ""
-#~ "Specifică dacă valorile introduse trebuie să fie prezente deja în listă"
-
-#~ msgid "Is this curve linear, spline interpolated, or free-form"
-#~ msgstr ""
-#~ "Această curbă este liniară, interpolată „spline” sau de formă liberă"
-
-#~ msgid "Minimum X"
-#~ msgstr "X minim"
-
-#~ msgid "Minimum possible value for X"
-#~ msgstr "Valoarea minimă posibilă pentru X"
-
-#~ msgid "Maximum X"
-#~ msgstr "X maxim"
-
-#~ msgid "Maximum possible X value"
-#~ msgstr "Valoarea maximă posibilă pentru X"
-
-#~ msgid "Minimum Y"
-#~ msgstr "Y minim"
-
-#~ msgid "Minimum possible value for Y"
-#~ msgstr "Valoarea minimă posibilă pentru Y"
-
-#~ msgid "Maximum Y"
-#~ msgstr "Y maxim"
-
-#~ msgid "Maximum possible value for Y"
-#~ msgstr "Valoarea maximă posibilă pentru Y"
-
-#~ msgid "File System Backend"
-#~ msgstr "Suport sistem de fișiere"
-
-#~ msgid "Name of file system backend to use"
-#~ msgstr "Numele suportului de sistem de fișiere utilizat"
-
-#~ msgid "The currently selected filename"
-#~ msgstr "Numele fișierului selectat curent."
-
-#~ msgid "Show file operations"
-#~ msgstr "Arată operațiunile cu fișiere"
-
-#~ msgid "Whether buttons for creating/manipulating files should be displayed"
-#~ msgstr ""
-#~ "Specifică dacă butoanele pentru crearea sau manipularea fișierelor ar "
-#~ "trebui să fie afișate"
-
-#~ msgid "Tab Border"
-#~ msgstr "Margine tab"
-
-#~ msgid "Width of the border around the tab labels"
-#~ msgstr "Lățimea marginii în jurul etichetelor taburilor"
-
-#~ msgid "Horizontal Tab Border"
-#~ msgstr "Margine orizontală tab"
-
-#~ msgid "Width of the horizontal border of tab labels"
-#~ msgstr "Lățimea marginii orizontale a etichetelor taburilor"
-
-#~ msgid "Vertical Tab Border"
-#~ msgstr "Margine verticală tab"
-
-#~ msgid "Width of the vertical border of tab labels"
-#~ msgstr "Lățimea marginii verticale a etichetelor tabului"
-
-#~ msgid "Whether tabs should have homogeneous sizes"
-#~ msgstr "Specifică dacă taburile ar trebui să aibă mărimi identice"
-
-#~ msgid "Group ID for tabs drag and drop"
-#~ msgstr "ID de grup pentru tragerea și plasarea taburilor"
-
-#~ msgid "User Data"
-#~ msgstr "Date utilizator"
-
-#~ msgid "Anonymous User Data Pointer"
-#~ msgstr "Pointer date utilizator anonim"
-
-#~ msgid "The menu of options"
-#~ msgstr "Meniul opțiunilor"
-
-#~ msgid "Size of dropdown indicator"
-#~ msgstr "Mărime indicator „dropdown”"
-
-#~ msgid "Spacing around indicator"
-#~ msgstr "Spațiere în jurul indicatorului"
-
-#~ msgid ""
-#~ "Whether the preview widget should take up the entire space it is allocated"
-#~ msgstr ""
-#~ "Specifică dacă widgetul de previzualizare ar trebui să ocupe întreg "
-#~ "spațiul alocat"
-
-#~ msgid "The GtkAdjustment connected to the progress bar (Deprecated)"
-#~ msgstr "GtkAdjustement conectat cu bara de progres (Învechit)"
-
-#~ msgid "Bar style"
-#~ msgstr "Stil bară"
-
-#~ msgid ""
-#~ "Specifies the visual style of the bar in percentage mode (Deprecated)"
-#~ msgstr ""
-#~ "Specifică stilul vizual pentru bara de progres în procente (Învechit)"
-
-#~ msgid "Activity Step"
-#~ msgstr "Pas activitate"
-
-#~ msgid "The increment used for each iteration in activity mode (Deprecated)"
-#~ msgstr ""
-#~ "Incrementarea utilizată pentru fiecare iterare în modul activ (Învechită)"
-
-#~ msgid "Activity Blocks"
-#~ msgstr "Blocuri de activitate"
-
-#~ msgid ""
-#~ "The number of blocks which can fit in the progress bar area in activity "
-#~ "mode (Deprecated)"
-#~ msgstr ""
-#~ "Numărul de blocuri care intră în aria barei de progres în mod activ "
-#~ "(Învechit)"
-
-#~ msgid "Discrete Blocks"
-#~ msgstr "Blocuri discrete"
-
-#~ msgid ""
-#~ "The number of discrete blocks in a progress bar (when shown in the "
-#~ "discrete style)"
-#~ msgstr ""
-#~ "Numărul blocurilor discrete într-o bară de progres (la afișarea în stil "
-#~ "discret)"
-
-#~ msgid "Horizontal adjustment for the text widget"
-#~ msgstr "Ajustare orizontală pentru un widget text"
-
-#~ msgid "Vertical adjustment for the text widget"
-#~ msgstr "Ajustare verticală pentru un widget text"
-
-#~ msgid "Line Wrap"
-#~ msgstr "Formatare linii"
-
-#~ msgid "Whether lines are wrapped at widget edges"
-#~ msgstr "Specifică dacă liniile sunt aranjate la marginile widgetului"
-
-#~ msgid "Word Wrap"
-#~ msgstr "Formatare cuvinte"
-
-#~ msgid "Whether words are wrapped at widget edges"
-#~ msgstr "Specifică dacă sunt formatate cuvintele la marginile widgetului"
-
-#~ msgid "Tooltips"
-#~ msgstr "Indicii"
-
-#~ msgid "If the tooltips of the toolbar should be active or not"
-#~ msgstr "Dacă indiciile barei de unelte ar trebui să fie active sau nu"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dda9db878b..35783a698e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -86,7 +86,6 @@ gtk/gtkhandlebox.c
 gtk/gtkhbbox.c
 gtk/gtkhbox.c
 gtk/gtkhpaned.c
-gtk/gtkhruler.c
 gtk/gtkhscale.c
 gtk/gtkhscrollbar.c
 gtk/gtkhseparator.c
@@ -147,7 +146,6 @@ gtk/gtkrecentchooser.c
 gtk/gtkrecentchooserdefault.c
 gtk/gtkrecentchoosermenu.c
 gtk/gtkrecentmanager.c
-gtk/gtkruler.c
 gtk/gtkscalebutton.c
 gtk/gtkscale.c
 gtk/gtkscrollbar.c
@@ -165,6 +163,7 @@ gtk/gtkstatusbar.c
 gtk/gtkstatusicon.c
 gtk/gtkstock.c
 gtk/gtkstyle.c
+gtk/gtkswitch.c
 gtk/gtktable.c
 gtk/gtktearoffmenuitem.c
 gtk/gtktextbuffer.c
@@ -206,7 +205,6 @@ gtk/gtkvbox.c
 gtk/gtkviewport.c
 gtk/gtkvolumebutton.c
 gtk/gtkvpaned.c
-gtk/gtkvruler.c
 gtk/gtkvscale.c
 gtk/gtkvscrollbar.c
 gtk/gtkvseparator.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e3b7a18284..0f3232e198 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,2 @@
 demos/gtk-demo/demo.ui
 gtk/paper_names.c
-
diff --git a/po/et.po b/po/et.po
index a63c9a3596..b2079502a9 100644
--- a/po/et.po
+++ b/po/et.po
@@ -16,8 +16,8 @@ msgstr ""
 "Project-Id-Version: gtk+ MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk"
 "%2b&component=general\n"
-"POT-Creation-Date: 2010-11-03 02:36+0000\n"
-"PO-Revision-Date: 2010-11-05 09:08+0200\n"
+"POT-Creation-Date: 2010-11-29 20:28+0000\n"
+"PO-Revision-Date: 2010-11-30 14:03+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -1646,7 +1646,7 @@ msgstr "URI-ga '%s' pole võimalik leida ühtegi kirjet"
 
 #, c-format
 msgid "No registered application with name '%s' for item with URI '%s' found"
-msgstr ""
+msgstr "URI '%2$s' jaoks puudub registreeritud rakendust nimega '%1$s'"
 
 msgctxt "throbbing progress animation widget"
 msgid "Spinner"
@@ -2065,6 +2065,28 @@ msgctxt "Stock label"
 msgid "Zoom _Out"
 msgstr "_Vähenda"
 
+#. Translators: if the "on" state label requires more than three
+#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
+#. * the state
+#.
+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
+#.
+msgctxt "switch"
+msgid "OFF"
+msgstr "○"
+
+msgctxt "light switch widget"
+msgid "Switch"
+msgstr "Lüliti"
+
+msgid "Switches between on and off states"
+msgstr "Kahe olekuga (sees/väljas) lüliti"
+
 #, c-format
 msgid "Unknown error when trying to deserialize %s"
 msgstr "Tundmatu viga %s deserialiseerimise katsel"
diff --git a/po/fa.po b/po/fa.po
index 9935eacb0d..2d5e7a38c4 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,402 +1,386 @@
 # Persian translation of gtk+.
 # Copyright (C) 2000, 2002, 2003, 2004, 2005 Sharif FarsiWeb, Inc.
+# Copyright (C) Iranian Free Software Users Group (IFSUG.org)translation team, 2010.
 # Roozbeh Pournader <roozbeh@farsiweb.info>, 2000, 2002, 2003, 2004, 2005.
 # Meelad Zakaria <meelad@bamdad.org>, 2005.
+# Mahyar Moghimi <mahyar.moqimi@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 15:41-0400\n"
-"PO-Revision-Date: 2005-02-14 18:03+0330\n"
-"Last-Translator: Roozbeh Pournader <roozbeh@farsiweb.info>\n"
-"Language-Team: Persian <farsi@lists.sharif.edu>\n"
-"Language: fa\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2b&component=general\n"
+"POT-Creation-Date: 2010-11-30 21:56+0000\n"
+"PO-Revision-Date: 2010-12-01 14:19+0330\n"
+"Last-Translator: Mahyar Moghimi <mahyar.moqimi@gmail.com>\n"
+"Language-Team: Persian <translate@ifsug.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Persian\n"
+"X-Poedit-Country: IRAN\n"
 
-#: gdk/gdk.c:103
+#: ../gdk/gdk.c:115
 #, c-format
 msgid "Error parsing option --gdk-debug"
-msgstr ""
+msgstr "خطا در تجزیهٔ گزینهٔ --gdk-debug"
 
-#: gdk/gdk.c:123
+#: ../gdk/gdk.c:135
 #, c-format
 msgid "Error parsing option --gdk-no-debug"
-msgstr ""
+msgstr "خطا در تجزیهٔ گزینه --gdk-no-debug"
 
 #. Description of --class=CLASS in --help output
-#: gdk/gdk.c:151
+#: ../gdk/gdk.c:163
 msgid "Program class as used by the window manager"
-msgstr "رده‌ی برنامه، به شکل مورد استفاده‌ی مدیر پنجره‌ها"
+msgstr "ردهٔ برنامه، به شکل مورد استفادهٔ مدیر پنجره‌ها"
 
 #. Placeholder in --class=CLASS in --help output
-#: gdk/gdk.c:152
+#: ../gdk/gdk.c:164
 msgid "CLASS"
-msgstr "رده"
+msgstr "CLASS"
 
 #. Description of --name=NAME in --help output
-#: gdk/gdk.c:154
+#: ../gdk/gdk.c:166
 msgid "Program name as used by the window manager"
-msgstr "نام برنامه، به شکل مورد استفاده‌ی مدیر پنجره‌ها"
+msgstr "نام برنامه، به شکل مورد استفادهٔ مدیر پنجره‌ها"
 
 #. Placeholder in --name=NAME in --help output
-#: gdk/gdk.c:155
+#: ../gdk/gdk.c:167
 msgid "NAME"
-msgstr "نام"
+msgstr "NAME"
 
 #. Description of --display=DISPLAY in --help output
-#: gdk/gdk.c:157
+#: ../gdk/gdk.c:169
 msgid "X display to use"
 msgstr "نمایش‌گر X مورد استفاده"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: gdk/gdk.c:158
+#: ../gdk/gdk.c:170
 msgid "DISPLAY"
-msgstr "نمایش"
+msgstr "DISPLAY"
 
 #. Description of --screen=SCREEN in --help output
-#: gdk/gdk.c:160
+#: ../gdk/gdk.c:172
 msgid "X screen to use"
-msgstr "صفحه‌ی X مورد استفاده"
+msgstr "صفحهٔ X مورد استفاده"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: gdk/gdk.c:161
+#: ../gdk/gdk.c:173
 msgid "SCREEN"
-msgstr "صفحه"
+msgstr "SCREEN"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: gdk/gdk.c:164
-#, fuzzy
+#: ../gdk/gdk.c:176
 msgid "GDK debugging flags to set"
-msgstr "پرچمهای اشکال‌زدایی GTK+ که باید یک شوند"
+msgstr "پرچمهای اشکال‌زدایی GDK که باید یک شوند"
 
 #. 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:177
+#: ../gdk/gdk.c:180
+#: ../gtk/gtkmain.c:525
+#: ../gtk/gtkmain.c:528
 msgid "FLAGS"
-msgstr "پرچم‌ها"
+msgstr "FLAGS"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: gdk/gdk.c:167
-#, fuzzy
+#: ../gdk/gdk.c:179
 msgid "GDK debugging flags to unset"
-msgstr "پرچمهای اشکال‌زدایی GTK+ که باید صفر شوند"
+msgstr "پرچم های اشکال‌زدایی GDK که باید صفر شوند"
 
-#: gdk/keyname-table.h:3940
-#, fuzzy
+#: ../gdk/keyname-table.h:3940
 msgctxt "keyboard label"
 msgid "BackSpace"
-msgstr "_تغییر نام"
+msgstr "پس‌بر"
 
-#: gdk/keyname-table.h:3941
+#: ../gdk/keyname-table.h:3941
 msgctxt "keyboard label"
 msgid "Tab"
-msgstr ""
+msgstr "جهش"
 
-#: gdk/keyname-table.h:3942
+#: ../gdk/keyname-table.h:3942
 msgctxt "keyboard label"
 msgid "Return"
-msgstr ""
+msgstr "بازگشت"
 
-#: gdk/keyname-table.h:3943
-#, fuzzy
+#: ../gdk/keyname-table.h:3943
 msgctxt "keyboard label"
 msgid "Pause"
-msgstr "_چسباندن"
+msgstr "مکث"
 
-#: gdk/keyname-table.h:3944
+#: ../gdk/keyname-table.h:3944
 msgctxt "keyboard label"
 msgid "Scroll_Lock"
-msgstr ""
+msgstr "قفل _لغزیدن"
 
-#: gdk/keyname-table.h:3945
-#, fuzzy
+#: ../gdk/keyname-table.h:3945
 msgctxt "keyboard label"
 msgid "Sys_Req"
-msgstr "سیستم پرونده‌ها"
+msgstr "_سیستم"
 
-#: gdk/keyname-table.h:3946
+#: ../gdk/keyname-table.h:3946
 msgctxt "keyboard label"
 msgid "Escape"
-msgstr ""
+msgstr "گریز"
 
-#: gdk/keyname-table.h:3947
+#: ../gdk/keyname-table.h:3947
 msgctxt "keyboard label"
 msgid "Multi_key"
-msgstr ""
+msgstr "کلید _رسانه"
 
-#: gdk/keyname-table.h:3948
-#, fuzzy
+#: ../gdk/keyname-table.h:3948
 msgctxt "keyboard label"
 msgid "Home"
 msgstr "آغازه"
 
-#: gdk/keyname-table.h:3949
-#, fuzzy
+#: ../gdk/keyname-table.h:3949
 msgctxt "keyboard label"
 msgid "Left"
-msgstr "_چپ"
+msgstr "چپ"
 
-#: gdk/keyname-table.h:3950
-#, fuzzy
+#: ../gdk/keyname-table.h:3950
 msgctxt "keyboard label"
 msgid "Up"
 msgstr "بالا"
 
-#: gdk/keyname-table.h:3951
-#, fuzzy
+#: ../gdk/keyname-table.h:3951
 msgctxt "keyboard label"
 msgid "Right"
-msgstr "_پرده:"
+msgstr "راست"
 
-#: gdk/keyname-table.h:3952
-#, fuzzy
+#: ../gdk/keyname-table.h:3952
 msgctxt "keyboard label"
 msgid "Down"
-msgstr "_پایین"
+msgstr "پایین"
 
-#: gdk/keyname-table.h:3953
-#, fuzzy
+#: ../gdk/keyname-table.h:3953
 msgctxt "keyboard label"
 msgid "Page_Up"
-msgstr "صفحه‌ی %Iu"
+msgstr "صفحه_بالا"
 
-#: gdk/keyname-table.h:3954
-#, fuzzy
+#: ../gdk/keyname-table.h:3954
 msgctxt "keyboard label"
 msgid "Page_Down"
-msgstr "_پایین"
+msgstr "صفحه_پایین"
 
-#: gdk/keyname-table.h:3955
+#: ../gdk/keyname-table.h:3955
 msgctxt "keyboard label"
 msgid "End"
-msgstr ""
+msgstr "پایان"
 
-#: gdk/keyname-table.h:3956
+#: ../gdk/keyname-table.h:3956
 msgctxt "keyboard label"
 msgid "Begin"
-msgstr ""
+msgstr "آغاز"
 
-#: gdk/keyname-table.h:3957
-#, fuzzy
+#: ../gdk/keyname-table.h:3957
 msgctxt "keyboard label"
 msgid "Print"
-msgstr "_چاپ"
+msgstr "چاپ"
 
-#: gdk/keyname-table.h:3958
+#: ../gdk/keyname-table.h:3958
 msgctxt "keyboard label"
 msgid "Insert"
-msgstr ""
+msgstr "درج"
 
-#: gdk/keyname-table.h:3959
+#: ../gdk/keyname-table.h:3959
 msgctxt "keyboard label"
 msgid "Num_Lock"
-msgstr ""
+msgstr "قفل _اعداد"
 
-#: gdk/keyname-table.h:3960
-#, fuzzy
+#: ../gdk/keyname-table.h:3960
 msgctxt "keyboard label"
 msgid "KP_Space"
-msgstr "_تغییر نام"
+msgstr "_فاصلهٔ صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3961
+#: ../gdk/keyname-table.h:3961
 msgctxt "keyboard label"
 msgid "KP_Tab"
-msgstr ""
+msgstr "_جهش صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3962
-#, fuzzy
+#: ../gdk/keyname-table.h:3962
 msgctxt "keyboard label"
 msgid "KP_Enter"
-msgstr "_چاپ"
+msgstr "_ورود صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3963
-#, fuzzy
+#: ../gdk/keyname-table.h:3963
 msgctxt "keyboard label"
 msgid "KP_Home"
-msgstr "آ_غازه"
+msgstr "آغا_زهٔ صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3964
-#, fuzzy
+#: ../gdk/keyname-table.h:3964
 msgctxt "keyboard label"
 msgid "KP_Left"
-msgstr "_چپ"
+msgstr "_چپ صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3965
-#, fuzzy
+#: ../gdk/keyname-table.h:3965
 msgctxt "keyboard label"
 msgid "KP_Up"
-msgstr "_بالا"
+msgstr "_بالای صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3966
-#, fuzzy
+#: ../gdk/keyname-table.h:3966
 msgctxt "keyboard label"
 msgid "KP_Right"
-msgstr "_پرده:"
+msgstr "_راست صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3967
-#, fuzzy
+#: ../gdk/keyname-table.h:3967
 msgctxt "keyboard label"
 msgid "KP_Down"
-msgstr "_پایین"
+msgstr "_پایین صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3968
+#: ../gdk/keyname-table.h:3968
 msgctxt "keyboard label"
 msgid "KP_Page_Up"
-msgstr ""
+msgstr "_صفحه‌بالای صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3969
+#: ../gdk/keyname-table.h:3969
 msgctxt "keyboard label"
 msgid "KP_Prior"
-msgstr ""
+msgstr "_پیشین صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3970
+#: ../gdk/keyname-table.h:3970
 msgctxt "keyboard label"
 msgid "KP_Page_Down"
-msgstr ""
+msgstr "_صفحه‌بالای صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3971
+#: ../gdk/keyname-table.h:3971
 msgctxt "keyboard label"
 msgid "KP_Next"
-msgstr ""
+msgstr "_پسین صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3972
+#: ../gdk/keyname-table.h:3972
 msgctxt "keyboard label"
 msgid "KP_End"
-msgstr ""
+msgstr "_پایان صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3973
+#: ../gdk/keyname-table.h:3973
 msgctxt "keyboard label"
 msgid "KP_Begin"
-msgstr ""
+msgstr "آ_غاز صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3974
+#: ../gdk/keyname-table.h:3974
 msgctxt "keyboard label"
 msgid "KP_Insert"
-msgstr ""
+msgstr "_درج صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3975
-#, fuzzy
+#: ../gdk/keyname-table.h:3975
 msgctxt "keyboard label"
 msgid "KP_Delete"
-msgstr "_حذف"
+msgstr "_حذف صفحهٔ اعداد"
 
-#: gdk/keyname-table.h:3976
-#, fuzzy
+#: ../gdk/keyname-table.h:3976
 msgctxt "keyboard label"
 msgid "Delete"
-msgstr "_حذف"
+msgstr "حذف"
 
 #. Description of --sync in --help output
-#: gdk/win32/gdkmain-win32.c:54
+#: ../gdk/win32/gdkmain-win32.c:54
 msgid "Don't batch GDI requests"
 msgstr "درخواست‌های GDI دسته نشوند"
 
 #. Description of --no-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:56
+#: ../gdk/win32/gdkmain-win32.c:56
 msgid "Don't use the Wintab API for tablet support"
-msgstr ""
+msgstr "برای پشتیبانی از tablet از Wintab API استفاده نشود"
 
 #. Description of --ignore-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:58
+#: ../gdk/win32/gdkmain-win32.c:58
 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:60
 msgid "Do use the Wintab API [default]"
-msgstr ""
+msgstr "از Wintab API استفاده شود [پیش‌فرض]"
 
 #. Description of --max-colors=COLORS in --help output
-#: gdk/win32/gdkmain-win32.c:62
+#: ../gdk/win32/gdkmain-win32.c:62
 msgid "Size of the palette in 8 bit mode"
-msgstr "اندازه‌ی تخته‌رنگ در حالت ۸ بیتی"
+msgstr "اندازهٔ تخته‌رنگ در حالت ۸ بیتی"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: gdk/win32/gdkmain-win32.c:63
+#: ../gdk/win32/gdkmain-win32.c:63
 msgid "COLORS"
-msgstr "رنگ‌ها"
+msgstr "COLORS"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:312
-#, fuzzy, c-format
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:305
+#, c-format
 msgid "Starting %s"
-msgstr "_چاپ"
+msgstr "در حال آغاز %s"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:316
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:318
 #, c-format
 msgid "Opening %s"
-msgstr ""
+msgstr "در حال باز کردن %s"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:321
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:323
 #, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
-msgstr[0] ""
+msgstr[0] "درحال باز کردن %d مورد"
 
 #. Description of --sync in --help output
-#: gdk/x11/gdkmain-x11.c:96
+#: ../gdk/x11/gdkmain-x11.c:94
 msgid "Make X calls synchronous"
 msgstr "تماسهای با X همگام شوند"
 
 #. Translators: this is the license preamble; the string at the end
 #. * contains the URL of the license.
 #.
-#: gtk/gtkaboutdialog.c:101
+#: ../gtk/gtkaboutdialog.c:101
 #, c-format
 msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s"
-msgstr ""
+msgstr "این برنامه هیچ‌گونه گارانتی ندارد؛ برای جزئیات بیشتر %s را ببینید"
 
-#: gtk/gtkaboutdialog.c:339 gtk/gtkaboutdialog.c:2235
+#: ../gtk/gtkaboutdialog.c:339
+#: ../gtk/gtkaboutdialog.c:2233
 msgid "License"
 msgstr "مجوز"
 
-#: gtk/gtkaboutdialog.c:340
+#: ../gtk/gtkaboutdialog.c:340
 msgid "The license of the program"
 msgstr "مجوز برنامه"
 
 #. Add the credits button
-#: gtk/gtkaboutdialog.c:621
-#, fuzzy
+#: ../gtk/gtkaboutdialog.c:622
 msgid "C_redits"
-msgstr "دست‌اندرکاران"
+msgstr "_دست اندر کاران"
 
 #. Add the license button
-#: gtk/gtkaboutdialog.c:635
+#: ../gtk/gtkaboutdialog.c:636
 msgid "_License"
 msgstr "_مجوز"
 
-#: gtk/gtkaboutdialog.c:839
-#, fuzzy
+#: ../gtk/gtkaboutdialog.c:840
 msgid "Could not show link"
-msgstr "نمی‌توان مورد را انتخاب کرد"
+msgstr "نمی توان پیوند را نمایش داد"
 
-#: gtk/gtkaboutdialog.c:932
+#: ../gtk/gtkaboutdialog.c:933
 #, c-format
 msgid "About %s"
-msgstr "درباره‌ی %s"
+msgstr "دربارهٔ %s"
 
-#: gtk/gtkaboutdialog.c:2153
+#: ../gtk/gtkaboutdialog.c:2151
 msgid "Credits"
 msgstr "دست‌اندرکاران"
 
-#: gtk/gtkaboutdialog.c:2185
+#: ../gtk/gtkaboutdialog.c:2183
 msgid "Written by"
-msgstr "نوشته‌ی"
+msgstr "نوشتهٔ"
 
-#: gtk/gtkaboutdialog.c:2188
+#: ../gtk/gtkaboutdialog.c:2186
 msgid "Documented by"
 msgstr "مستندسازی از"
 
-#: gtk/gtkaboutdialog.c:2200
+#: ../gtk/gtkaboutdialog.c:2198
 msgid "Translated by"
 msgstr "ترجمه از"
 
-#: gtk/gtkaboutdialog.c:2204
+#: ../gtk/gtkaboutdialog.c:2202
 msgid "Artwork by"
 msgstr "طرح‌ها و تصاویر از"
 
@@ -405,8 +389,7 @@ msgstr "طرح‌ها و تصاویر از"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:160
-#, fuzzy
+#: ../gtk/gtkaccellabel.c:160
 msgctxt "keyboard label"
 msgid "Shift"
 msgstr "تبدیل"
@@ -416,8 +399,7 @@ msgstr "تبدیل"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:166
-#, fuzzy
+#: ../gtk/gtkaccellabel.c:166
 msgctxt "keyboard label"
 msgid "Ctrl"
 msgstr "مهار"
@@ -427,8 +409,7 @@ msgstr "مهار"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:172
-#, fuzzy
+#: ../gtk/gtkaccellabel.c:172
 msgctxt "keyboard label"
 msgid "Alt"
 msgstr "دگرساز"
@@ -438,61 +419,60 @@ msgstr "دگرساز"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:770
+#: ../gtk/gtkaccellabel.c:770
 msgctxt "keyboard label"
 msgid "Super"
-msgstr ""
+msgstr "Super"
 
 #. This is the text that should appear next to menu accelerators
 #. * that use the hyper key. If the text on this key isn't typically
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:783
+#: ../gtk/gtkaccellabel.c:783
 msgctxt "keyboard label"
 msgid "Hyper"
-msgstr ""
+msgstr "Hyper"
 
 #. This is the text that should appear next to menu accelerators
 #. * that use the meta key. If the text on this key isn't typically
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:797
+#: ../gtk/gtkaccellabel.c:797
 msgctxt "keyboard label"
 msgid "Meta"
-msgstr ""
+msgstr "Meta"
 
-#: gtk/gtkaccellabel.c:813
-#, fuzzy
+#: ../gtk/gtkaccellabel.c:813
 msgctxt "keyboard label"
 msgid "Space"
-msgstr "_تغییر نام"
+msgstr "فاصله"
 
-#: gtk/gtkaccellabel.c:816
+#: ../gtk/gtkaccellabel.c:816
 msgctxt "keyboard label"
 msgid "Backslash"
-msgstr ""
+msgstr "ممیز وارونه"
 
-#: gtk/gtkbuilderparser.c:343
-#, fuzzy, c-format
+#: ../gtk/gtkbuilderparser.c:343
+#, c-format
 msgid "Invalid type function on line %d: '%s'"
-msgstr "نام پرونده‌ی نامعتبر: %s"
+msgstr "تابع با نوع نامعتبر در خط %d: «%s»"
 
-#: gtk/gtkbuilderparser.c:407
+#: ../gtk/gtkbuilderparser.c:407
 #, c-format
 msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
-msgstr ""
+msgstr "شناسهٔ شئ «%s»تکراری در خط %d (پیش‌تر در خط %d)"
 
-#: gtk/gtkbuilderparser.c:859
-#, fuzzy, c-format
+#: ../gtk/gtkbuilderparser.c:859
+#, c-format
 msgid "Invalid root element: '%s'"
-msgstr "نام پرونده‌ی نامعتبر: %s"
+msgstr "عنصر ریشهٔ نامعتبر: «%s»"
 
-#: gtk/gtkbuilderparser.c:898
+#: ../gtk/gtkbuilderparser.c:898
 #, c-format
 msgid "Unhandled tag: '%s'"
-msgstr ""
+msgstr "برچسب تصدی نشده: «%s»"
 
 #. Translate to calendar:YM if you want years to be displayed
 #. * before months; otherwise translate to calendar:MY.
@@ -504,7 +484,7 @@ msgstr ""
 #. * 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:878
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -512,7 +492,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:916
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:6"
 
@@ -521,10 +501,10 @@ msgstr "calendar:week_start:6"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: gtk/gtkcalendar.c:2006
+#: ../gtk/gtkcalendar.c:1848
 msgctxt "year measurement template"
 msgid "2000"
-msgstr ""
+msgstr "2000"
 
 #. Translators: this defines whether the day numbers should use
 #. * localized digits or the ones used in English (0123...).
@@ -536,11 +516,12 @@ msgstr ""
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: gtk/gtkcalendar.c:2037 gtk/gtkcalendar.c:2719
+#: ../gtk/gtkcalendar.c:1879
+#: ../gtk/gtkcalendar.c:2564
 #, c-format
 msgctxt "calendar:day:digits"
 msgid "%d"
-msgstr ""
+msgstr "%Id"
 
 #. Translators: this defines whether the week numbers should use
 #. * localized digits or the ones used in English (0123...).
@@ -552,11 +533,12 @@ msgstr ""
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: gtk/gtkcalendar.c:2069 gtk/gtkcalendar.c:2579
+#: ../gtk/gtkcalendar.c:1911
+#: ../gtk/gtkcalendar.c:2432
 #, c-format
 msgctxt "calendar:week:digits"
 msgid "%d"
-msgstr ""
+msgstr "%Id"
 
 #. Translators: This dictates how the year is displayed in
 #. * gtkcalendar widget.  See strftime() manual for the format.
@@ -568,191 +550,159 @@ msgstr ""
 #. *
 #. * "%Y" is appropriate for most locales.
 #.
-#: gtk/gtkcalendar.c:2361
-#, fuzzy
+#: ../gtk/gtkcalendar.c:2197
 msgctxt "calendar year format"
 msgid "%Y"
-msgstr "Y"
+msgstr "%Y"
 
 #. This label is displayed in a treeview cell displaying
 #. * a disabled accelerator key combination.
 #.
-#: gtk/gtkcellrendereraccel.c:272
-#, fuzzy
+#: ../gtk/gtkcellrendereraccel.c:272
 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
-#, fuzzy
+#: ../gtk/gtkcellrendereraccel.c:282
 msgctxt "Accelerator"
 msgid "Invalid"
-msgstr "‏UTF-8 نامعتبر"
+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:418
+#: ../gtk/gtkcellrendereraccel.c:675
 msgid "New accelerator..."
-msgstr ""
+msgstr "شتاب‌ده‌ تازه..."
 
-#: gtk/gtkcellrendererprogress.c:362 gtk/gtkcellrendererprogress.c:452
+#: ../gtk/gtkcellrendererprogress.c:362
+#: ../gtk/gtkcellrendererprogress.c:452
 #, c-format
 msgctxt "progress bar label"
 msgid "%d %%"
-msgstr ""
+msgstr "%Id ٪"
 
-#: gtk/gtkcolorbutton.c:176 gtk/gtkcolorbutton.c:445
+#: ../gtk/gtkcolorbutton.c:188
+#: ../gtk/gtkcolorbutton.c:473
 msgid "Pick a Color"
 msgstr "یک رنگ بردارید"
 
-#: gtk/gtkcolorbutton.c:336
+#: ../gtk/gtkcolorbutton.c:363
 msgid "Received invalid color data\n"
 msgstr "اطلاعات رنگی نامعتبر دریافت شد\n"
 
-#: gtk/gtkcolorsel.c:384
-msgid ""
-"Select the color you want from the outer ring. Select the darkness or "
-"lightness of that color using the inner triangle."
-msgstr ""
-"رنگی را که می‌خواهید از حلقه‌ی خارجی انتخاب کنید. تیرگی یا روشنی آن رنگ را با "
-"استفاده از مثلث داخلی انتخاب کنید."
+#: ../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."
+msgstr "رنگی را که می‌خواهید از حلقهٔ خارجی انتخاب کنید. تیرگی یا روشنی آن رنگ را با استفاده از مثلث داخلی انتخاب کنید."
 
-#: gtk/gtkcolorsel.c:408
-msgid ""
-"Click the eyedropper, then click a color anywhere on your screen to select "
-"that color."
-msgstr ""
-"روی قطره‌چکان کلیک کنید، سپس روی رنگی در هر جای صفحه‌تان کلیک کنید تا آن رنگ "
-"انتخاب شود"
+#: ../gtk/gtkcolorsel.c:440
+msgid "Click the eyedropper, then click a color anywhere on your screen to select that color."
+msgstr "روی قطره‌چکان کلیک کنید، سپس روی رنگی در هر جای صفحه‌تان کلیک کنید تا آن رنگ انتخاب شود"
 
-#: gtk/gtkcolorsel.c:417
+#: ../gtk/gtkcolorsel.c:449
 msgid "_Hue:"
 msgstr "_پرده:"
 
-#: gtk/gtkcolorsel.c:418
+#: ../gtk/gtkcolorsel.c:450
 msgid "Position on the color wheel."
 msgstr "موقعیت روی چرخ رنگ."
 
-#: gtk/gtkcolorsel.c:420
+#: ../gtk/gtkcolorsel.c:452
 msgid "_Saturation:"
 msgstr "_غلظت:"
 
-#: gtk/gtkcolorsel.c:421
-#, fuzzy
+#: ../gtk/gtkcolorsel.c:453
 msgid "Intensity of the color."
-msgstr "شفافیت رنگ"
+msgstr "شدت رنگ."
 
-#: gtk/gtkcolorsel.c:422
+#: ../gtk/gtkcolorsel.c:454
 msgid "_Value:"
 msgstr "_روشنایی:"
 
-#: gtk/gtkcolorsel.c:423
+#: ../gtk/gtkcolorsel.c:455
 msgid "Brightness of the color."
 msgstr "درخشندگی رنگ."
 
-#: gtk/gtkcolorsel.c:424
+#: ../gtk/gtkcolorsel.c:456
 msgid "_Red:"
 msgstr "_قرمز:"
 
-#: gtk/gtkcolorsel.c:425
+#: ../gtk/gtkcolorsel.c:457
 msgid "Amount of red light in the color."
 msgstr "میزان نور قرمز در رنگ."
 
-#: gtk/gtkcolorsel.c:426
+#: ../gtk/gtkcolorsel.c:458
 msgid "_Green:"
 msgstr "_سبز:"
 
-#: gtk/gtkcolorsel.c:427
+#: ../gtk/gtkcolorsel.c:459
 msgid "Amount of green light in the color."
 msgstr "میزان نور سبز در رنگ."
 
-#: gtk/gtkcolorsel.c:428
+#: ../gtk/gtkcolorsel.c:460
 msgid "_Blue:"
 msgstr "_آبی:"
 
-#: gtk/gtkcolorsel.c:429
+#: ../gtk/gtkcolorsel.c:461
 msgid "Amount of blue light in the color."
 msgstr "میزان نور آبی در رنگ."
 
-#: gtk/gtkcolorsel.c:432
-#, fuzzy
+#: ../gtk/gtkcolorsel.c:464
 msgid "Op_acity:"
-msgstr "درجه‌ی _ماتی:"
+msgstr "درجهٔ _ماتی:"
 
-#: gtk/gtkcolorsel.c:439 gtk/gtkcolorsel.c:449
+#: ../gtk/gtkcolorsel.c:471
+#: ../gtk/gtkcolorsel.c:481
 msgid "Transparency of the color."
 msgstr "شفافیت رنگ"
 
-#: gtk/gtkcolorsel.c:456
-#, fuzzy
+#: ../gtk/gtkcolorsel.c:488
 msgid "Color _name:"
 msgstr "_نام رنگ:"
 
-#: gtk/gtkcolorsel.c:470
-msgid ""
-"You can enter an HTML-style hexadecimal color value, or simply a color name "
-"such as 'orange' in this entry."
-msgstr ""
-"می‌توانید یک مقدار رنگ شانزده‌شانزدهی به سبک HTML وارد کنید، یا نام انگلیسی یک "
-"رنگ مثل «orange» برای نارنجی را وارد کنید."
+#: ../gtk/gtkcolorsel.c:502
+msgid "You can enter an HTML-style hexadecimal color value, or simply a color name such as 'orange' in this entry."
+msgstr "می‌توانید یک مقدار رنگ شانزده‌شانزدهی به سبک HTML وارد کنید، یا نام انگلیسی یک رنگ مثل «orange» برای نارنجی را وارد کنید."
 
-#: gtk/gtkcolorsel.c:500
-#, fuzzy
+#: ../gtk/gtkcolorsel.c:532
 msgid "_Palette:"
-msgstr "_تخته‌رنگ"
+msgstr "_تخته‌رنگ:"
 
-#: gtk/gtkcolorsel.c:529
+#: ../gtk/gtkcolorsel.c:561
 msgid "Color Wheel"
 msgstr "چرخ رنگ"
 
-#: gtk/gtkcolorsel.c:988
-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 "
-"current by dragging it to the other color swatch alongside."
-msgstr ""
-"رنگی که پیش‌تر انتخاب شده بود، برای مقایسه با رنگی که حالا دارید انتخاب "
-"می‌کنید. می‌توانید این رنگ را تا یک مدخل تخته‌رنگ بکشید، یا با کشیدنش به نمونه‌ی "
-"دیگر در کنار آن، این رنگ را به عنوان رنگ فعلی انتخاب کنید."
+#: ../gtk/gtkcolorsel.c:1031
+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 current by dragging it to the other color swatch alongside."
+msgstr "رنگی که پیش‌تر انتخاب شده بود، برای مقایسه با رنگی که حالا دارید انتخاب می‌کنید. می‌توانید این رنگ را تا یک مدخل تخته‌رنگ بکشید، یا با کشیدنش به نمونهٔ دیگر در کنار آن، این رنگ را به عنوان رنگ فعلی انتخاب کنید."
 
-#: gtk/gtkcolorsel.c:991
-msgid ""
-"The color you've chosen. You can drag this color to a palette entry to save "
-"it for use in the future."
-msgstr ""
-"رنگی که انتخاب کرده‌اید. می‌توانید این رنگ را به یک مدخل تخته‌رنگ بکشید تا برای "
-"استفاده در آینده ذخیره شود."
+#: ../gtk/gtkcolorsel.c:1034
+msgid "The color you've chosen. You can drag this color to a palette entry to save it for use in the future."
+msgstr "رنگی که انتخاب کرده‌اید. می‌توانید این رنگ را به یک مدخل تخته‌رنگ بکشید تا برای استفاده در آینده ذخیره شود."
 
-#: gtk/gtkcolorsel.c:996
-msgid ""
-"The previously-selected color, for comparison to the color you're selecting "
-"now."
-msgstr ""
+#: ../gtk/gtkcolorsel.c:1039
+msgid "The previously-selected color, for comparison to the color you're selecting now."
+msgstr "رنگ انتخابی پیشین، برای مقایسه با رنگی که اکنون می‌گزینید."
 
-#: gtk/gtkcolorsel.c:999
+#: ../gtk/gtkcolorsel.c:1042
 msgid "The color you've chosen."
-msgstr ""
+msgstr "رنگی که گزیده‌اید."
 
-#: gtk/gtkcolorsel.c:1396
+#: ../gtk/gtkcolorsel.c:1442
 msgid "_Save color here"
-msgstr "_ذخیره‌ی رنگ در این‌جا"
+msgstr "_ذخیرهٔ رنگ در این‌جا"
 
-#: gtk/gtkcolorsel.c:1601
-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.\""
-msgstr ""
-"روی این مدخل تخته‌رنگ کلیک کنید تا رنگ فعلی شود. برای تغییر این مدخل، یک "
-"نمونه‌ی رنگ را به اینجا بکشید یا روی آن کلیک راست کنید و «ذخیره‌ی رنگ در "
-"اینجا» را انتخاب کنید."
+#: ../gtk/gtkcolorsel.c:1647
+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.\""
+msgstr "روی این مدخل تخته‌رنگ کلیک کنید تا رنگ فعلی شود. برای تغییر این مدخل، یک نمونهٔ رنگ را به اینجا بکشید یا روی آن کلیک راست کنید و «ذخیرهٔ رنگ در اینجا» را انتخاب کنید."
 
-#: gtk/gtkcolorseldialog.c:189
+#: ../gtk/gtkcolorseldialog.c:189
 msgid "Color Selection"
 msgstr "انتخاب رنگ"
 
@@ -762,144 +712,143 @@ 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
-#, fuzzy
+#: ../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:374
+#: ../gtk/gtkprintunixdialog.c:3240
 msgid "Manage Custom Sizes"
-msgstr ""
+msgstr "مدیریت اندازه‌های سفارشی"
 
-#: gtk/gtkcustompaperunixdialog.c:534 gtk/gtkpagesetupunixdialog.c:790
+#: ../gtk/gtkcustompaperunixdialog.c:534
+#: ../gtk/gtkpagesetupunixdialog.c:790
 msgid "inch"
-msgstr ""
+msgstr "اینچ"
 
-#: gtk/gtkcustompaperunixdialog.c:536 gtk/gtkpagesetupunixdialog.c:788
+#: ../gtk/gtkcustompaperunixdialog.c:536
+#: ../gtk/gtkpagesetupunixdialog.c:788
 msgid "mm"
-msgstr ""
+msgstr "میل"
 
-#: gtk/gtkcustompaperunixdialog.c:581
+#: ../gtk/gtkcustompaperunixdialog.c:581
 msgid "Margins from Printer..."
-msgstr ""
+msgstr "حاشیه‌ها از چاپگر..."
 
-#: gtk/gtkcustompaperunixdialog.c:747
+#: ../gtk/gtkcustompaperunixdialog.c:747
 #, c-format
 msgid "Custom Size %d"
-msgstr ""
+msgstr "اندازهٔ سفارشی %Id"
 
-#: gtk/gtkcustompaperunixdialog.c:1059
+#: ../gtk/gtkcustompaperunixdialog.c:1059
 msgid "_Width:"
-msgstr ""
+msgstr "_پهنا:"
 
-#: gtk/gtkcustompaperunixdialog.c:1071
-#, fuzzy
+#: ../gtk/gtkcustompaperunixdialog.c:1071
 msgid "_Height:"
-msgstr "_پرده:"
+msgstr "_بلندی:"
 
-#: gtk/gtkcustompaperunixdialog.c:1083
-#, fuzzy
+#: ../gtk/gtkcustompaperunixdialog.c:1083
 msgid "Paper Size"
-msgstr "_ویژگی‌ها"
+msgstr "اندازهٔ _کاغذ:"
 
-#: gtk/gtkcustompaperunixdialog.c:1092
-#, fuzzy
+#: ../gtk/gtkcustompaperunixdialog.c:1092
 msgid "_Top:"
-msgstr "_بالا"
+msgstr "_بالا:"
 
-#: gtk/gtkcustompaperunixdialog.c:1104
-#, fuzzy
+#: ../gtk/gtkcustompaperunixdialog.c:1104
 msgid "_Bottom:"
-msgstr "_پایین"
+msgstr "_پایین:"
 
-#: gtk/gtkcustompaperunixdialog.c:1116
-#, fuzzy
+#: ../gtk/gtkcustompaperunixdialog.c:1116
 msgid "_Left:"
-msgstr "_چپ"
+msgstr "_چپ:"
 
-#: gtk/gtkcustompaperunixdialog.c:1128
-#, fuzzy
+#: ../gtk/gtkcustompaperunixdialog.c:1128
 msgid "_Right:"
-msgstr "_پرده:"
+msgstr "_راست:"
 
-#: gtk/gtkcustompaperunixdialog.c:1169
+#: ../gtk/gtkcustompaperunixdialog.c:1169
 msgid "Paper Margins"
-msgstr ""
+msgstr "حاشیه کاغذ"
 
-#: gtk/gtkentry.c:8601 gtk/gtktextview.c:8248
+#: ../gtk/gtkentry.c:8794
+#: ../gtk/gtktextview.c:8229
 msgid "Input _Methods"
 msgstr "روش‌های ورودی"
 
-#: gtk/gtkentry.c:8615 gtk/gtktextview.c:8262
+#: ../gtk/gtkentry.c:8808
+#: ../gtk/gtktextview.c:8243
 msgid "_Insert Unicode Control Character"
-msgstr "_درج نویسه‌ی کنترلی یونی‌کد"
+msgstr "_درج نویسهٔ کنترلی یونی‌کد"
 
-#: gtk/gtkentry.c:10015
+#: ../gtk/gtkentry.c:10208
 msgid "Caps Lock and Num Lock are on"
-msgstr ""
+msgstr "قفل تبدیل و قفل اعداد هردو روشن هستند"
 
-#: gtk/gtkentry.c:10017
-#, fuzzy
+#: ../gtk/gtkentry.c:10210
 msgid "Num Lock is on"
-msgstr "باز کردن _مکان"
+msgstr "قفل اعداد روشن است"
 
-#: gtk/gtkentry.c:10019
-#, fuzzy
+#: ../gtk/gtkentry.c:10212
 msgid "Caps Lock is on"
-msgstr "باز کردن _مکان"
+msgstr "قفل تبدیل روشن است."
 
 #. **************** *
 #. *  Private Macros  *
 #. * ****************
-#: gtk/gtkfilechooserbutton.c:61
+#: ../gtk/gtkfilechooserbutton.c:61
 msgid "Select A File"
 msgstr "یک پرونده انتخاب کنید"
 
-#: gtk/gtkfilechooserbutton.c:62 gtk/gtkfilechooserdefault.c:1812
+#: ../gtk/gtkfilechooserbutton.c:62
+#: ../gtk/gtkfilechooserdefault.c:1833
 msgid "Desktop"
 msgstr "رومیزی"
 
 # farmaan
-#: gtk/gtkfilechooserbutton.c:63
+#: ../gtk/gtkfilechooserbutton.c:63
 msgid "(None)"
 msgstr "(هیچ‌کدام)"
 
-#: gtk/gtkfilechooserbutton.c:2005
+#: ../gtk/gtkfilechooserbutton.c:2001
 msgid "Other..."
 msgstr "غیره..."
 
-#: gtk/gtkfilechooserdefault.c:148
+#: ../gtk/gtkfilechooserdefault.c:147
 msgid "Type name of new folder"
-msgstr "نام پوشه‌ی جدید را وارد کنید"
+msgstr "نام پوشهٔ جدید را وارد کنید"
 
-#: gtk/gtkfilechooserdefault.c:938
+#: ../gtk/gtkfilechooserdefault.c:946
 msgid "Could not retrieve information about the file"
-msgstr "نمی‌توان اطلاعاتی درباره‌ی پرونده بازیابی کرد"
+msgstr "نمی‌توان اطلاعاتی دربارهٔ پرونده بازیابی کرد"
 
-#: gtk/gtkfilechooserdefault.c:949
+#: ../gtk/gtkfilechooserdefault.c:957
 msgid "Could not add a bookmark"
-msgstr "نمی‌توان چوب‌الفی اضافه کرد"
+msgstr "نمی‌توان نشانکی اضافه کرد"
 
-#: gtk/gtkfilechooserdefault.c:960
+#: ../gtk/gtkfilechooserdefault.c:968
 msgid "Could not remove bookmark"
-msgstr "نمی‌توان چوب‌الف را حذف کرد"
+msgstr "نمی‌توان نشانک را حذف کرد"
 
-#: gtk/gtkfilechooserdefault.c:971
+#: ../gtk/gtkfilechooserdefault.c:979
 msgid "The folder could not be created"
 msgstr "نمی‌توان پوشه را ایجاد کرد"
 
-#: gtk/gtkfilechooserdefault.c:984
-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:992
+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:1006
+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:1016
 msgid "Invalid file name"
-msgstr "نام پرونده‌ی نامعتبر"
+msgstr "نام پروندهٔ نامعتبر"
 
-#: gtk/gtkfilechooserdefault.c:1005
+#: ../gtk/gtkfilechooserdefault.c:1026
 msgid "The folder contents could not be displayed"
 msgstr "نمی‌توان محتویات پوشه را نمایش داد"
 
@@ -907,357 +856,341 @@ msgstr "نمی‌توان محتویات پوشه را نمایش داد"
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: gtk/gtkfilechooserdefault.c:1555
+#: ../gtk/gtkfilechooserdefault.c:1576
 #, c-format
 msgid "%1$s on %2$s"
-msgstr ""
+msgstr "%1$s روی %2$s"
 
-#: gtk/gtkfilechooserdefault.c:1731
+#: ../gtk/gtkfilechooserdefault.c:1752
 msgid "Search"
-msgstr ""
+msgstr "جستجو"
 
-#: gtk/gtkfilechooserdefault.c:1755 gtk/gtkfilechooserdefault.c:9289
+#: ../gtk/gtkfilechooserdefault.c:1776
+#: ../gtk/gtkfilechooserdefault.c:9417
 msgid "Recently Used"
-msgstr ""
+msgstr "به‌تازه‌گی استفاده شده"
 
-#: gtk/gtkfilechooserdefault.c:2409
+#: ../gtk/gtkfilechooserdefault.c:2437
 msgid "Select which types of files are shown"
 msgstr "انتخاب این که کدام نوع پرونده‌ها نمایش داده شوند"
 
-#: gtk/gtkfilechooserdefault.c:2768
+#: ../gtk/gtkfilechooserdefault.c:2796
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
-msgstr "اضافه کردن پوشه‌ی «%s» به چوب‌الفها"
+msgstr "اضافه کردن پوشهٔ «%s» به نشانک‌ها"
 
-#: gtk/gtkfilechooserdefault.c:2812
+#: ../gtk/gtkfilechooserdefault.c:2840
 #, c-format
 msgid "Add the current folder to the bookmarks"
-msgstr "اضافه کردن پوشه‌ی فعلی به چوب‌الفها"
+msgstr "اضافه کردن پوشهٔ فعلی به نشانک‌ها"
 
-#: gtk/gtkfilechooserdefault.c:2814
+#: ../gtk/gtkfilechooserdefault.c:2842
 #, c-format
 msgid "Add the selected folders to the bookmarks"
-msgstr "اضافه کردن پوشه‌های انتخاب‌شده به چوب‌الفها"
+msgstr "اضافه کردن پوشه‌های انتخاب‌شده به نشانک‌ها"
 
-#: gtk/gtkfilechooserdefault.c:2852
+#: ../gtk/gtkfilechooserdefault.c:2880
 #, c-format
 msgid "Remove the bookmark '%s'"
-msgstr "حذف چوب‌الف «%s»"
+msgstr "حذف نشانک «%s»"
 
-#: gtk/gtkfilechooserdefault.c:2854
+#: ../gtk/gtkfilechooserdefault.c:2882
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
-msgstr ""
+msgstr "نشانک '%s' حذف نمی‌شود"
 
-#: gtk/gtkfilechooserdefault.c:2861 gtk/gtkfilechooserdefault.c:3725
+#: ../gtk/gtkfilechooserdefault.c:2889
+#: ../gtk/gtkfilechooserdefault.c:3750
 msgid "Remove the selected bookmark"
 msgstr "حذف پوشه‌های انتخاب‌شده"
 
-#: gtk/gtkfilechooserdefault.c:3421
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:3445
 msgid "Remove"
 msgstr "حذف"
 
-#: gtk/gtkfilechooserdefault.c:3430
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:3454
 msgid "Rename..."
-msgstr "_تغییر نام"
+msgstr "تغییر نام..."
 
 #. Accessible object name for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3593
+#: ../gtk/gtkfilechooserdefault.c:3617
 msgid "Places"
-msgstr ""
+msgstr "محل‌ها"
 
 #. Column header for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3650
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:3674
 msgid "_Places"
-msgstr "_تغییر نام"
+msgstr "_محل‌ها"
 
-#: gtk/gtkfilechooserdefault.c:3706
+#: ../gtk/gtkfilechooserdefault.c:3731
 msgid "_Add"
 msgstr "_افزودن"
 
-#: gtk/gtkfilechooserdefault.c:3713
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:3738
 msgid "Add the selected folder to the Bookmarks"
-msgstr "افزودن پوشه‌ی انتخاب‌شده به چوب‌الفها"
+msgstr "افزودن پوشهٔ گزیده‌شده به نشانک‌ها"
 
-#: gtk/gtkfilechooserdefault.c:3718
+#: ../gtk/gtkfilechooserdefault.c:3743
 msgid "_Remove"
 msgstr "_حذف"
 
-#: gtk/gtkfilechooserdefault.c:3860
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:3885
 msgid "Could not select file"
-msgstr "نمی‌توان مورد را انتخاب کرد"
+msgstr "پرونده گزیده نشد"
 
-#: gtk/gtkfilechooserdefault.c:4035
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:4060
 msgid "_Add to Bookmarks"
-msgstr "_افزودن به میانبرها"
+msgstr "_افزودن به نشانک‌ها"
 
-#: gtk/gtkfilechooserdefault.c:4048
+#: ../gtk/gtkfilechooserdefault.c:4073
 msgid "Show _Hidden Files"
 msgstr "نمایش پرونده‌های _مخفی"
 
-#: gtk/gtkfilechooserdefault.c:4055
+#: ../gtk/gtkfilechooserdefault.c:4080
 msgid "Show _Size Column"
-msgstr ""
+msgstr "نمایش ستون _اندازه"
 
-#: gtk/gtkfilechooserdefault.c:4281
+#: ../gtk/gtkfilechooserdefault.c:4306
 msgid "Files"
 msgstr "پرونده‌ها"
 
-#: gtk/gtkfilechooserdefault.c:4332
+#: ../gtk/gtkfilechooserdefault.c:4357
 msgid "Name"
-msgstr "_نام:"
+msgstr "نام"
 
-#: gtk/gtkfilechooserdefault.c:4355
+#: ../gtk/gtkfilechooserdefault.c:4380
 msgid "Size"
 msgstr "اندازه"
 
-#: gtk/gtkfilechooserdefault.c:4369
+#: ../gtk/gtkfilechooserdefault.c:4394
 msgid "Modified"
 msgstr "تغییریافته"
 
 #. Label
-#: gtk/gtkfilechooserdefault.c:4624 gtk/gtkprinteroptionwidget.c:801
+#: ../gtk/gtkfilechooserdefault.c:4649
+#: ../gtk/gtkprinteroptionwidget.c:793
 msgid "_Name:"
 msgstr "_نام:"
 
-#: gtk/gtkfilechooserdefault.c:4667
+#: ../gtk/gtkfilechooserdefault.c:4692
 msgid "_Browse for other folders"
 msgstr "_مرور برای سایر پوشه‌ها"
 
-#: gtk/gtkfilechooserdefault.c:4937
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:4962
 msgid "Type a file name"
-msgstr "نام پرونده‌ی نامعتبر"
+msgstr "یک نام پرونده وارد کنید"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:4980
+#: ../gtk/gtkfilechooserdefault.c:5005
 msgid "Create Fo_lder"
 msgstr "ایجاد پو_شه"
 
-#: gtk/gtkfilechooserdefault.c:4990
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:5015
 msgid "_Location:"
 msgstr "_مکان:"
 
-#: gtk/gtkfilechooserdefault.c:5194
+#: ../gtk/gtkfilechooserdefault.c:5219
 msgid "Save in _folder:"
-msgstr "ذخیره در پو_شه‌ی:"
+msgstr "ذخیره در پو_شهٔ:"
 
-#: gtk/gtkfilechooserdefault.c:5196
+#: ../gtk/gtkfilechooserdefault.c:5221
 msgid "Create in _folder:"
-msgstr "ایجاد در پو_شه‌ی:"
+msgstr "ایجاد در پو_شهٔ:"
 
-#: gtk/gtkfilechooserdefault.c:6248
-#, fuzzy, c-format
+#: ../gtk/gtkfilechooserdefault.c:6290
+#, c-format
 msgid "Could not read the contents of %s"
-msgstr "خطا در ایجاد شاخه‌ی «%s»: %s"
+msgstr "محتوای %s خوانده نشد"
 
-#: gtk/gtkfilechooserdefault.c:6252
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:6294
 msgid "Could not read the contents of the folder"
-msgstr ""
-"خطا در ایجاد پوشه‌ی \"%s\": %s\n"
-"%s"
+msgstr "محتوای پوشه خوانده نشد"
 
-#: gtk/gtkfilechooserdefault.c:6345 gtk/gtkfilechooserdefault.c:6413
-#: gtk/gtkfilechooserdefault.c:6558
+#: ../gtk/gtkfilechooserdefault.c:6387
+#: ../gtk/gtkfilechooserdefault.c:6455
+#: ../gtk/gtkfilechooserdefault.c:6600
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: gtk/gtkfilechooserdefault.c:6360
+#: ../gtk/gtkfilechooserdefault.c:6402
 msgid "%H:%M"
-msgstr ""
+msgstr "%H:%M"
 
-#: gtk/gtkfilechooserdefault.c:6362
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:6404
 msgid "Yesterday at %H:%M"
-msgstr "دیروز"
+msgstr "دیروز ساعت %H:%M"
 
-#: gtk/gtkfilechooserdefault.c:7028
+#: ../gtk/gtkfilechooserdefault.c:7070
 msgid "Cannot change to folder because it is not local"
 msgstr "نمی‌توان به پوشه رفت چون محلی نیست"
 
-#: gtk/gtkfilechooserdefault.c:7625 gtk/gtkfilechooserdefault.c:7646
-#, fuzzy, c-format
+#: ../gtk/gtkfilechooserdefault.c:7667
+#: ../gtk/gtkfilechooserdefault.c:7688
+#, c-format
 msgid "Shortcut %s already exists"
-msgstr "میانبر %s وجود ندارد"
+msgstr "میان‌بر %s پیشاپیش موجود است"
 
-#: gtk/gtkfilechooserdefault.c:7736
+#: ../gtk/gtkfilechooserdefault.c:7778
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "میانبر %s وجود ندارد"
 
-#: gtk/gtkfilechooserdefault.c:7997 gtk/gtkprintunixdialog.c:480
+#: ../gtk/gtkfilechooserdefault.c:8039
+#: ../gtk/gtkprintunixdialog.c:480
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr ""
+msgstr "پرونده‌ایبا نام \"%s\" پیشاپیش وجود دارد. می‌خواهید آن را جایگزین کنید؟"
 
-#: gtk/gtkfilechooserdefault.c:8000 gtk/gtkprintunixdialog.c:484
+#: ../gtk/gtkfilechooserdefault.c:8042
+#: ../gtk/gtkprintunixdialog.c:484
 #, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
+msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr "پرونده پیشاپیش در \"%s\"  وجود دارد.  با جایگزینی آن تمام محتوایش بازنویسی می‌شود."
 
-#: gtk/gtkfilechooserdefault.c:8005 gtk/gtkprintunixdialog.c:491
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:8047
+#: ../gtk/gtkprintunixdialog.c:491
 msgid "_Replace"
-msgstr "_تغییر نام"
+msgstr "_جایگزینی"
 
-#: gtk/gtkfilechooserdefault.c:8658
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:8755
 msgid "Could not start the search process"
-msgstr "نمی‌توان بقیه را ذخیره کرد"
+msgstr "فرآیند جستجو شروع نشد"
 
-#: gtk/gtkfilechooserdefault.c:8659
-msgid ""
-"The program was not able to create a connection to the indexer daemon.  "
-"Please make sure it is running."
-msgstr ""
+#: ../gtk/gtkfilechooserdefault.c:8756
+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
-#, fuzzy
+#: ../gtk/gtkfilechooserdefault.c:8770
 msgid "Could not send the search request"
-msgstr "نمی‌توان بقیه را ذخیره کرد"
+msgstr "درخواست جستجو فرستاده نشد"
 
-#: gtk/gtkfilechooserdefault.c:8861
+#: ../gtk/gtkfilechooserdefault.c:8989
 msgid "Search:"
-msgstr ""
+msgstr "جستجو:"
 
-#: gtk/gtkfilechooserdefault.c:9466
+#: ../gtk/gtkfilechooserdefault.c:9594
 #, c-format
 msgid "Could not mount %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
-#, fuzzy
+#: ../gtk/gtkfilechooserentry.c:702
+#: ../gtk/gtkfilechooserentry.c:1172
 msgid "Invalid path"
-msgstr "‏UTF-8 نامعتبر"
+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:1104
 msgid "No match"
-msgstr ""
+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
-#, fuzzy
+#: ../gtk/gtkfilechooserentry.c:1115
 msgid "Sole completion"
-msgstr "انتخاب رنگ"
+msgstr "کامل‌سازی تکی"
 
 #. translators: this text is shown when the text in a file chooser
 #. * entry is a complete filename, but could be continued to find
 #. * a longer match
 #.
-#: gtk/gtkfilechooserentry.c:1128
+#: ../gtk/gtkfilechooserentry.c:1131
 msgid "Complete, but not unique"
-msgstr ""
+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:1163
 msgid "Completing..."
-msgstr ""
+msgstr "در حال کامل‌کردن..."
 
 #. hostnames in a local_only file chooser?  user error
 #. 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:1185
+#: ../gtk/gtkfilechooserentry.c:1210
 msgid "Only local files may be selected"
-msgstr ""
+msgstr "تنها پرونده‌های محلی گزیده می‌شوند"
 
 #. Another option is to complete the hostname based on the remote volumes that are mounted
 #. 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:1194
 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
-#, fuzzy
+#: ../gtk/gtkfilechooserentry.c:1205
 msgid "Path does not exist"
-msgstr "میانبر %s وجود ندارد"
-
-#: gtk/gtkfilechoosersettings.c:486
-#, fuzzy, c-format
-msgid "Error creating folder '%s': %s"
-msgstr "خطا در ایجاد پوشه‌ی \"%s\": %s\n"
+msgstr "مسیر وجود ندارد"
 
 #. 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
-#, fuzzy
+#: ../gtk/gtkfilesystem.c:48
 msgid "File System"
 msgstr "سیستم پرونده‌ها"
 
-#: gtk/gtkfontbutton.c:142 gtk/gtkfontbutton.c:266
+#: ../gtk/gtkfontbutton.c:142
+#: ../gtk/gtkfontbutton.c:266
 msgid "Pick a Font"
 msgstr "یک قلم بردارید"
 
 #. Initialize fields
-#: gtk/gtkfontbutton.c:260
+#: ../gtk/gtkfontbutton.c:260
 msgid "Sans 12"
-msgstr ""
+msgstr "sans 12"
 
-#: gtk/gtkfontbutton.c:785
+#: ../gtk/gtkfontbutton.c:785
 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:103
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "ا‌ب‌ج‌درس‌ص‌ط‌ع‌ف‌ق‌ک‌ل‌م‌ن‌و‌ه‍‌ی"
 
-#: gtk/gtkfontsel.c:370
+#: ../gtk/gtkfontsel.c:370
 msgid "_Family:"
 msgstr "_خانواده:"
 
-#: gtk/gtkfontsel.c:376
+#: ../gtk/gtkfontsel.c:376
 msgid "_Style:"
 msgstr "_سبک:"
 
-#: gtk/gtkfontsel.c:382
+#: ../gtk/gtkfontsel.c:382
 msgid "Si_ze:"
 msgstr "_اندازه:"
 
 #. create the text entry widget
-#: gtk/gtkfontsel.c:559
+#: ../gtk/gtkfontsel.c:558
 msgid "_Preview:"
 msgstr "_پیش‌نمایش:"
 
-#: gtk/gtkfontsel.c:1659
+#: ../gtk/gtkfontsel.c:1658
 msgid "Font Selection"
 msgstr "انتخاب قلم"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: gtk/gtkiconfactory.c:1356
+#: ../gtk/gtkiconfactory.c:1356
 #, c-format
 msgid "Error loading icon: %s"
-msgstr "خطا در بار کردن شمایل: %s"
+msgstr "خطا در بار کردن نشان: %s"
 
-#: gtk/gtkicontheme.c:1354
+#: ../gtk/gtkicontheme.c:1355
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1265,88 +1198,81 @@ msgid ""
 "You can get a copy from:\n"
 "\t%s"
 msgstr ""
-"نمی‌توان شمایل «%s» را یافت. تم «%s»\n"
+"نمی‌توان نشان «%s» را یافت. تم «%s»\n"
 "را نیز نمی‌توان یافت، شاید لازم باشد نصبش کنید.\n"
-"می‌توانید یک نسخه از نشانی زیر بگیرید:\n"
+"می‌توانید یک رونوشت از نشانی زیر بگیرید:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1535
+#: ../gtk/gtkicontheme.c:1536
 #, c-format
 msgid "Icon '%s' not present in theme"
-msgstr "شمایل «%s» در تم وجود ندارد"
+msgstr "نشان «%s» در تم وجود ندارد"
 
-#: gtk/gtkicontheme.c:3048
-#, fuzzy
+#: ../gtk/gtkicontheme.c:3057
 msgid "Failed to load icon"
-msgstr "بار کردن پرونده‌ی TIFF شکست خورد"
+msgstr "خراب شدن بارکردن نشان"
 
-#: gtk/gtkimmodule.c:526
-#, fuzzy
+#: ../gtk/gtkimmodule.c:526
 msgid "Simple"
-msgstr "اندازه"
+msgstr "ساده"
 
-#: gtk/gtkimmulticontext.c:588
-#, fuzzy
+#: ../gtk/gtkimmulticontext.c:588
 msgctxt "input method menu"
 msgid "System"
-msgstr "سیستم پرونده‌ها"
+msgstr "سیستم"
 
 # farmaan
-#: gtk/gtkimmulticontext.c:598
-#, fuzzy
+#: ../gtk/gtkimmulticontext.c:598
 msgctxt "input method menu"
 msgid "None"
-msgstr "(هیچ‌کدام)"
+msgstr "هیچ‌کدام"
 
-#: gtk/gtkimmulticontext.c:681
+#: ../gtk/gtkimmulticontext.c:681
 #, c-format
 msgctxt "input method menu"
 msgid "System (%s)"
-msgstr ""
+msgstr "سیستم (%s)"
 
 #. Open Link
-#: gtk/gtklabel.c:6202
-#, fuzzy
+#: ../gtk/gtklabel.c:6214
 msgid "_Open Link"
-msgstr "باز کردن مکان"
+msgstr "_باز کردن پیوند"
 
 #. Copy Link Address
-#: gtk/gtklabel.c:6214
+#: ../gtk/gtklabel.c:6226
 msgid "Copy _Link Address"
-msgstr ""
+msgstr "_رونوشت از نشانی پیوند"
 
-#: gtk/gtklinkbutton.c:449
-#, fuzzy
+#: ../gtk/gtklinkbutton.c:484
 msgid "Copy URL"
-msgstr "_نسخه‌برداری"
+msgstr "رونوشت از نشانی وب"
 
-#: gtk/gtklinkbutton.c:601
-#, fuzzy
+#: ../gtk/gtklinkbutton.c:647
 msgid "Invalid URI"
-msgstr "‏UTF-8 نامعتبر"
+msgstr "نشانی وب نامعتبر"
 
 #. Description of --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:526
+#: ../gtk/gtkmain.c:518
 msgid "Load additional GTK+ modules"
 msgstr "پیمانه‌های GTK+ بیشتری بار شود"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:527
+#: ../gtk/gtkmain.c:519
 msgid "MODULES"
 msgstr "پیمانه‌ها"
 
 #. Description of --g-fatal-warnings in --help output
-#: gtk/gtkmain.c:529
+#: ../gtk/gtkmain.c:521
 msgid "Make all warnings fatal"
-msgstr "همه‌ی اخطارها مهلک شوند"
+msgstr "همهٔ اخطارها مهلک شوند"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: gtk/gtkmain.c:532
+#: ../gtk/gtkmain.c:524
 msgid "GTK+ debugging flags to set"
 msgstr "پرچمهای اشکال‌زدایی GTK+ که باید یک شوند"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: gtk/gtkmain.c:535
+#: ../gtk/gtkmain.c:527
 msgid "GTK+ debugging flags to unset"
 msgstr "پرچمهای اشکال‌زدایی GTK+ که باید صفر شوند"
 
@@ -1355,128 +1281,124 @@ msgstr "پرچمهای اشکال‌زدایی GTK+ که باید صفر شون�
 #. * 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:790
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: gtk/gtkmain.c:863
+#: ../gtk/gtkmain.c:855
 #, c-format
 msgid "Cannot open display: %s"
-msgstr ""
+msgstr "نمایش %s باز نمی‌شود"
 
-#: gtk/gtkmain.c:922
+#: ../gtk/gtkmain.c:914
 msgid "GTK+ Options"
 msgstr "گزینه‌های GTK+"
 
-#: gtk/gtkmain.c:922
+#: ../gtk/gtkmain.c:914
 msgid "Show GTK+ Options"
 msgstr "نشان دادن گزینه‌های GTK+"
 
-#: gtk/gtkmountoperation.c:491
-#, fuzzy
+#: ../gtk/gtkmountoperation.c:491
 msgid "Co_nnect"
-msgstr "_تبدیل"
+msgstr "ات_صال"
 
-#: gtk/gtkmountoperation.c:558
+#: ../gtk/gtkmountoperation.c:558
 msgid "Connect _anonymously"
-msgstr ""
+msgstr "اتصال بی‌نام"
 
-#: gtk/gtkmountoperation.c:567
+#: ../gtk/gtkmountoperation.c:567
 msgid "Connect as u_ser:"
-msgstr ""
+msgstr "اتصال با عنوان _کاربر:"
 
-#: gtk/gtkmountoperation.c:605
-#, fuzzy
+#: ../gtk/gtkmountoperation.c:605
 msgid "_Username:"
-msgstr "_تغییر نام"
+msgstr "نام _کاربری:"
 
-#: gtk/gtkmountoperation.c:610
-#, fuzzy
+#: ../gtk/gtkmountoperation.c:610
 msgid "_Domain:"
-msgstr "_مکان:"
+msgstr "_دامنه:"
 
-#: gtk/gtkmountoperation.c:616
-#, fuzzy
+#: ../gtk/gtkmountoperation.c:616
 msgid "_Password:"
-msgstr "فشار"
+msgstr "_گذر‌واژه:"
 
-#: gtk/gtkmountoperation.c:634
+#: ../gtk/gtkmountoperation.c:634
 msgid "Forget password _immediately"
-msgstr ""
+msgstr "گذرواژه بی‌درنگ فراموش شود"
 
-#: gtk/gtkmountoperation.c:644
+#: ../gtk/gtkmountoperation.c:644
 msgid "Remember password until you _logout"
-msgstr ""
+msgstr "گذرواژه تا هنگام _خروج به‌خاطر سپرده شود"
 
-#: gtk/gtkmountoperation.c:654
+#: ../gtk/gtkmountoperation.c:654
 msgid "Remember _forever"
-msgstr ""
+msgstr "برای _همیشه به‌خاطر سپرده شود."
 
-#: gtk/gtkmountoperation.c:883
+#: ../gtk/gtkmountoperation.c:883
 #, c-format
 msgid "Unknown Application (PID %d)"
-msgstr ""
+msgstr "برنامهٔ ناشناخته (شناسهٔ فرآیند %d)"
 
-#: gtk/gtkmountoperation.c:1066
-#, c-format
+#: ../gtk/gtkmountoperation.c:1066
 msgid "Unable to end process"
-msgstr ""
+msgstr "نمی‌توان فرآیند را به پایان رساند"
 
-#: gtk/gtkmountoperation.c:1103
+#: ../gtk/gtkmountoperation.c:1103
 msgid "_End Process"
-msgstr ""
+msgstr "به _پایان بردن فرآیند"
 
-#: gtk/gtkmountoperation-stub.c:64
+#: ../gtk/gtkmountoperation-stub.c:64
 #, c-format
 msgid "Cannot kill process with PID %d. Operation is not implemented."
-msgstr ""
+msgstr "نمی‌توان فرآیند با شناسهٔ %d را کشت. این کنش پیاده‌سازی نشده است."
 
 #. translators: this string is a name for the 'less' command
-#: gtk/gtkmountoperation-x11.c:862
-#, fuzzy
+#: ../gtk/gtkmountoperation-x11.c:862
 msgid "Terminal Pager"
-msgstr "پی_ش‌نمایش چاپ"
+msgstr "پی‌جوی پایانه"
 
-#: gtk/gtkmountoperation-x11.c:863
+#: ../gtk/gtkmountoperation-x11.c:863
 msgid "Top Command"
-msgstr ""
+msgstr "فرمان تاپ (top)"
 
-#: gtk/gtkmountoperation-x11.c:864
+#: ../gtk/gtkmountoperation-x11.c:864
 msgid "Bourne Again Shell"
-msgstr ""
+msgstr "پوستهٔ بورن اِگِین"
 
-#: gtk/gtkmountoperation-x11.c:865
+#: ../gtk/gtkmountoperation-x11.c:865
 msgid "Bourne Shell"
-msgstr ""
+msgstr "پوستهٔ بورن"
 
-#: gtk/gtkmountoperation-x11.c:866
+#: ../gtk/gtkmountoperation-x11.c:866
 msgid "Z Shell"
-msgstr ""
+msgstr "پوستهٔ زی"
 
-#: gtk/gtkmountoperation-x11.c:963
+#: ../gtk/gtkmountoperation-x11.c:963
 #, c-format
 msgid "Cannot end process with PID %d: %s"
-msgstr ""
+msgstr "نمی‌توان فرآیند با شناسهٔ %d را به پایان برد: %s"
 
-#: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170
+#: ../gtk/gtknotebook.c:4756
+#: ../gtk/gtknotebook.c:7319
 #, c-format
 msgid "Page %u"
-msgstr "صفحه‌ی %Iu"
+msgstr "صفحهٔ %Iu"
 
-#: gtk/gtkpagesetup.c:596 gtk/gtkpapersize.c:838 gtk/gtkpapersize.c:880
+#: ../gtk/gtkpagesetup.c:648
+#: ../gtk/gtkpapersize.c:838
+#: ../gtk/gtkpapersize.c:880
 msgid "Not a valid page setup file"
-msgstr ""
+msgstr "پروندهٔ برپایی صفحه نامعتبر است."
 
-#: gtk/gtkpagesetupunixdialog.c:179
-#, fuzzy
+#: ../gtk/gtkpagesetupunixdialog.c:179
 msgid "Any Printer"
-msgstr "_چاپ"
+msgstr "هرچاپگری"
 
-#: gtk/gtkpagesetupunixdialog.c:179
+#: ../gtk/gtkpagesetupunixdialog.c:179
 msgid "For portable documents"
-msgstr ""
+msgstr "برای سند‌های حمل‌پذیر"
 
-#: gtk/gtkpagesetupunixdialog.c:809
+#: ../gtk/gtkpagesetupunixdialog.c:809
 #, c-format
 msgid ""
 "Margins:\n"
@@ -1485,293 +1407,280 @@ msgid ""
 " Top: %s %s\n"
 " Bottom: %s %s"
 msgstr ""
+"حاشیه‌ها:\n"
+"چپ:%s %s\n"
+"راست:%s %s\n"
+"سر:%s %s\n"
+"ته:%s %s"
 
-#: gtk/gtkpagesetupunixdialog.c:858 gtk/gtkprintunixdialog.c:3284
+#: ../gtk/gtkpagesetupunixdialog.c:858
+#: ../gtk/gtkprintunixdialog.c:3291
 msgid "Manage Custom Sizes..."
-msgstr ""
+msgstr "مدیریت اندازه‌های سفارشی..."
 
-#: gtk/gtkpagesetupunixdialog.c:909
+#: ../gtk/gtkpagesetupunixdialog.c:909
 msgid "_Format for:"
-msgstr ""
+msgstr "_قالب‌بندی برای:"
 
-#: gtk/gtkpagesetupunixdialog.c:931 gtk/gtkprintunixdialog.c:3456
-#, fuzzy
+#: ../gtk/gtkpagesetupunixdialog.c:931
+#: ../gtk/gtkprintunixdialog.c:3463
 msgid "_Paper size:"
-msgstr "_ویژگی‌ها"
+msgstr "اندازهٔ _کاغذ:"
 
-#: gtk/gtkpagesetupunixdialog.c:962
-#, fuzzy
+#: ../gtk/gtkpagesetupunixdialog.c:962
 msgid "_Orientation:"
-msgstr "_غلظت:"
+msgstr "جهت_"
 
-#: gtk/gtkpagesetupunixdialog.c:1026 gtk/gtkprintunixdialog.c:3518
-#, fuzzy
+#: ../gtk/gtkpagesetupunixdialog.c:1026
+#: ../gtk/gtkprintunixdialog.c:3525
 msgid "Page Setup"
-msgstr "صفحه‌ی %Iu"
+msgstr "برپایی صفحه"
 
-#: gtk/gtkpathbar.c:154
+#: ../gtk/gtkpathbar.c:158
 msgid "Up Path"
-msgstr ""
+msgstr "مسیر بالا"
 
-#: gtk/gtkpathbar.c:156
+#: ../gtk/gtkpathbar.c:160
 msgid "Down Path"
-msgstr ""
+msgstr "مسیر پایین"
 
-#: gtk/gtkpathbar.c:1497
-#, fuzzy
+#: ../gtk/gtkpathbar.c:1523
 msgid "File System Root"
-msgstr "سیستم پرونده‌ها"
+msgstr "ریشهٔ سیستم پرونده"
 
-#: gtk/gtkprintbackend.c:749
-#, fuzzy
+#: ../gtk/gtkprintbackend.c:749
 msgid "Authentication"
-msgstr "_مکان:"
+msgstr "احراز هویت"
 
-#: gtk/gtkprinteroptionwidget.c:694
+#: ../gtk/gtkprinteroptionwidget.c:686
 msgid "Not available"
-msgstr ""
+msgstr "در دسترس نیست"
 
-#: gtk/gtkprinteroptionwidget.c:794
-#, fuzzy
+#: ../gtk/gtkprinteroptionwidget.c:786
 msgid "Select a folder"
-msgstr "یک پرونده انتخاب کنید"
+msgstr "یک پوشه انتخاب کنید"
 
-#: gtk/gtkprinteroptionwidget.c:813
-#, fuzzy
+#: ../gtk/gtkprinteroptionwidget.c:805
 msgid "_Save in folder:"
-msgstr "ذخیره در پو_شه‌ی:"
+msgstr "ذخیره در _پوشهٔ:"
 
 #. translators: this string is the default job title for print
 #. * jobs. %s gets replaced by the application name, %d gets replaced
 #. * by the job number.
 #.
-#: gtk/gtkprintoperation.c:190
+#: ../gtk/gtkprintoperation.c:190
 #, c-format
 msgid "%s job #%d"
-msgstr ""
+msgstr "%s کار #%d"
 
-#: gtk/gtkprintoperation.c:1695
+#: ../gtk/gtkprintoperation.c:1695
 msgctxt "print operation status"
 msgid "Initial state"
-msgstr ""
+msgstr "وضعیت نخستین"
 
-#: gtk/gtkprintoperation.c:1696
-#, fuzzy
+#: ../gtk/gtkprintoperation.c:1696
 msgctxt "print operation status"
 msgid "Preparing to print"
-msgstr "اخطار"
+msgstr "در حال آماده‌سازی برای چاپ"
 
-#: gtk/gtkprintoperation.c:1697
+#: ../gtk/gtkprintoperation.c:1697
 msgctxt "print operation status"
 msgid "Generating data"
-msgstr ""
+msgstr "درحال تولید داده"
 
-#: gtk/gtkprintoperation.c:1698
+#: ../gtk/gtkprintoperation.c:1698
 msgctxt "print operation status"
 msgid "Sending data"
-msgstr ""
+msgstr "در حال فرستادن داده"
 
-#: gtk/gtkprintoperation.c:1699
-#, fuzzy
+#: ../gtk/gtkprintoperation.c:1699
 msgctxt "print operation status"
 msgid "Waiting"
-msgstr "اخطار"
+msgstr "در حال انتظار"
 
-#: gtk/gtkprintoperation.c:1700
+#: ../gtk/gtkprintoperation.c:1700
 msgctxt "print operation status"
 msgid "Blocking on issue"
-msgstr ""
+msgstr "بازداشت بخاطر یک مشکل"
 
-#: gtk/gtkprintoperation.c:1701
-#, fuzzy
+#: ../gtk/gtkprintoperation.c:1701
 msgctxt "print operation status"
 msgid "Printing"
-msgstr "_چاپ"
+msgstr "در حال چاپ"
 
-#: gtk/gtkprintoperation.c:1702
-#, fuzzy
+#: ../gtk/gtkprintoperation.c:1702
 msgctxt "print operation status"
 msgid "Finished"
-msgstr "_یافتن"
+msgstr "پایان یافت"
 
-#: gtk/gtkprintoperation.c:1703
+#: ../gtk/gtkprintoperation.c:1703
 msgctxt "print operation status"
 msgid "Finished with error"
-msgstr ""
+msgstr "پایان با خطا"
 
-#: gtk/gtkprintoperation.c:2270
+#: ../gtk/gtkprintoperation.c:2270
 #, c-format
 msgid "Preparing %d"
-msgstr ""
+msgstr "در حال آماده‌سازی %d"
 
-#: gtk/gtkprintoperation.c:2272 gtk/gtkprintoperation.c:2902
-#, fuzzy, c-format
+#: ../gtk/gtkprintoperation.c:2272
+#: ../gtk/gtkprintoperation.c:2902
 msgid "Preparing"
-msgstr "اخطار"
+msgstr "در حال آماده‌سازی"
 
-#: gtk/gtkprintoperation.c:2275
-#, fuzzy, c-format
+#: ../gtk/gtkprintoperation.c:2275
+#, c-format
 msgid "Printing %d"
-msgstr "_چاپ"
+msgstr "در حال چاپ %d"
 
-#: gtk/gtkprintoperation.c:2932
-#, c-format
+#: ../gtk/gtkprintoperation.c:2932
 msgid "Error creating print preview"
-msgstr ""
+msgstr "خطا در ایجاد پیش‌نمایش چاپ"
 
-#: gtk/gtkprintoperation.c:2935
-#, c-format
+#: ../gtk/gtkprintoperation.c:2935
 msgid "The most probable reason is that a temporary file could not be created."
-msgstr ""
+msgstr "محتمل‌ترین دلیل این‌است که یک پروندهٔ موقت ایجاد نشد."
 
-#: gtk/gtkprintoperation-unix.c:297
+#: ../gtk/gtkprintoperation-unix.c:297
 msgid "Error launching preview"
-msgstr ""
+msgstr "خطا هنگام راه‌اندازی پیش‌نمایش"
 
-#: gtk/gtkprintoperation-unix.c:470 gtk/gtkprintoperation-win32.c:1447
-#, fuzzy
+#: ../gtk/gtkprintoperation-unix.c:470
+#: ../gtk/gtkprintoperation-win32.c:1447
 msgid "Application"
-msgstr "_مکان:"
+msgstr "برنامه"
 
-#: gtk/gtkprintoperation-win32.c:611
+#: ../gtk/gtkprintoperation-win32.c:611
 msgid "Printer offline"
-msgstr ""
+msgstr "چاپگر برون‌خط"
 
-#: gtk/gtkprintoperation-win32.c:613
+#: ../gtk/gtkprintoperation-win32.c:613
 msgid "Out of paper"
-msgstr ""
+msgstr "بی کاغذ"
 
 #. Translators: this is a printer status.
-#: gtk/gtkprintoperation-win32.c:615
-#: modules/printbackends/cups/gtkprintbackendcups.c:1998
-#, fuzzy
+#: ../gtk/gtkprintoperation-win32.c:615
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1998
 msgid "Paused"
-msgstr "_چسباندن"
+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
-#, fuzzy
+#: ../gtk/gtkprintoperation-win32.c:1539
 msgid "No printer found"
-msgstr "سرصفحه‌ی XPM یافت نشد"
+msgstr "چاپگری پیدا نشد"
 
-#: gtk/gtkprintoperation-win32.c:1566
-#, fuzzy
+#: ../gtk/gtkprintoperation-win32.c:1566
 msgid "Invalid argument to CreateDC"
-msgstr "سرصفحه‌ی نامعتبر در شمایل"
+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 ""
+msgstr "خطا از StartDoc"
 
-#: gtk/gtkprintoperation-win32.c:1684 gtk/gtkprintoperation-win32.c:1707
-#: gtk/gtkprintoperation-win32.c:1755
-#, fuzzy
+#: ../gtk/gtkprintoperation-win32.c:1684
+#: ../gtk/gtkprintoperation-win32.c:1707
+#: ../gtk/gtkprintoperation-win32.c:1755
 msgid "Not enough free memory"
-msgstr "حافظه برای بار کردن شمایل کافی نیست"
+msgstr "حافظهٔ کافی نیست"
 
-#: gtk/gtkprintoperation-win32.c:1760
+#: ../gtk/gtkprintoperation-win32.c:1760
 msgid "Invalid argument to PrintDlgEx"
-msgstr ""
+msgstr "آرگومان نامعتبر برای PrintDlgEx"
 
-#: gtk/gtkprintoperation-win32.c:1765
+#: ../gtk/gtkprintoperation-win32.c:1765
 msgid "Invalid pointer to PrintDlgEx"
-msgstr ""
+msgstr "اشاره‌گر نامعتبر برای PrintDlgEx"
 
-#: gtk/gtkprintoperation-win32.c:1770
-#, fuzzy
+#: ../gtk/gtkprintoperation-win32.c:1770
 msgid "Invalid handle to PrintDlgEx"
-msgstr "سرصفحه‌ی نامعتبر در شمایل"
+msgstr "تصدی نامعتبر به PrintDlgEx"
 
-#: gtk/gtkprintoperation-win32.c:1775
+#: ../gtk/gtkprintoperation-win32.c:1775
 msgid "Unspecified error"
-msgstr ""
+msgstr "خطا نامشخص"
 
-#: gtk/gtkprintunixdialog.c:618
+#: ../gtk/gtkprintunixdialog.c:618
 msgid "Getting printer information failed"
-msgstr ""
+msgstr "گرفتن اطلاعات چاپگر خراب شد"
 
-#: gtk/gtkprintunixdialog.c:1873
+#: ../gtk/gtkprintunixdialog.c:1873
 msgid "Getting printer information..."
-msgstr ""
+msgstr "در حال گرفتن اطلاعاتِ چاپگر..."
 
-#: gtk/gtkprintunixdialog.c:2139
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:2139
 msgid "Printer"
-msgstr "_چاپ"
+msgstr "چاپگر"
 
 #. Translators: this is the header for the location column in the print dialog
-#: gtk/gtkprintunixdialog.c:2149
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:2149
 msgid "Location"
-msgstr "_مکان:"
+msgstr "مکان"
 
 #. Translators: this is the header for the printer status column in the print dialog
-#: gtk/gtkprintunixdialog.c:2160
+#: ../gtk/gtkprintunixdialog.c:2160
 msgid "Status"
-msgstr ""
+msgstr "وضعیت"
 
-#: gtk/gtkprintunixdialog.c:2186
+#: ../gtk/gtkprintunixdialog.c:2186
 msgid "Range"
-msgstr ""
+msgstr "گستره"
 
-#: gtk/gtkprintunixdialog.c:2190
+#: ../gtk/gtkprintunixdialog.c:2190
 msgid "_All Pages"
-msgstr ""
+msgstr "_همهٔ صفحات"
 
-#: gtk/gtkprintunixdialog.c:2197
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:2197
 msgid "C_urrent Page"
-msgstr "_ایجاد"
+msgstr "صفحهٔ _جاری"
 
-#: gtk/gtkprintunixdialog.c:2207
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:2207
 msgid "Se_lection"
-msgstr "_انتخاب: "
+msgstr "_گزینش"
 
-#: gtk/gtkprintunixdialog.c:2216
+#: ../gtk/gtkprintunixdialog.c:2216
 msgid "Pag_es:"
-msgstr ""
+msgstr "_صفحه‌ها:"
 
-#: gtk/gtkprintunixdialog.c:2217
+#: ../gtk/gtkprintunixdialog.c:2217
 msgid ""
 "Specify one or more page ranges,\n"
 " e.g. 1-3,7,11"
 msgstr ""
+"یک یا چند گسترهٔ صفحه‌ها را مشخص کنید، \n"
+"مثلا: ۱-۳،۷،۱۱"
 
-#: gtk/gtkprintunixdialog.c:2227
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:2227
 msgid "Pages"
-msgstr "_تغییر نام"
+msgstr "صفحه‌ها"
 
-#: gtk/gtkprintunixdialog.c:2240
+#: ../gtk/gtkprintunixdialog.c:2240
 msgid "Copies"
-msgstr ""
+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:2245
 msgid "Copie_s:"
-msgstr ""
+msgstr "_رونوشت‌ها:"
 
-#: gtk/gtkprintunixdialog.c:2263
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:2263
 msgid "C_ollate"
-msgstr "_ایجاد"
+msgstr "_تلفیق"
 
-#: gtk/gtkprintunixdialog.c:2271
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:2271
 msgid "_Reverse"
-msgstr "باز_گشت"
+msgstr "ترتیب _معکوس"
 
-#: gtk/gtkprintunixdialog.c:2291
+#: ../gtk/gtkprintunixdialog.c:2291
 msgid "General"
-msgstr ""
+msgstr "کلی"
 
 #. Translators: These strings name the possible arrangements of
 #. * multiple pages on a sheet when printing (same as in gtkprintbackendcups.c)
@@ -1779,318 +1688,305 @@ 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:3024
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3534
 msgid "Left to right, top to bottom"
-msgstr ""
+msgstr "از چپ به راست، از سر به ته"
 
-#: gtk/gtkprintunixdialog.c:3017
-#: modules/printbackends/cups/gtkprintbackendcups.c:3508
+#: ../gtk/gtkprintunixdialog.c:3024
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3534
 msgid "Left to right, bottom to top"
-msgstr ""
+msgstr "از چپ به راست، از ته به سر"
 
-#: gtk/gtkprintunixdialog.c:3018
-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
+#: ../gtk/gtkprintunixdialog.c:3025
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3535
 msgid "Right to left, top to bottom"
-msgstr ""
+msgstr "از راست به چپ، از سر به ته"
 
-#: gtk/gtkprintunixdialog.c:3018
-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
+#: ../gtk/gtkprintunixdialog.c:3025
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3535
 msgid "Right to left, bottom to top"
-msgstr ""
+msgstr "از راست به چپ، از ته به سر"
 
-#: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
+#: ../gtk/gtkprintunixdialog.c:3026
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3536
 msgid "Top to bottom, left to right"
-msgstr ""
+msgstr "از سر به ته، از چپ به راست"
 
-#: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
+#: ../gtk/gtkprintunixdialog.c:3026
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3536
 msgid "Top to bottom, right to left"
-msgstr ""
+msgstr "از سر به ته، از راست به چپ"
 
-#: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
+#: ../gtk/gtkprintunixdialog.c:3027
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3537
 msgid "Bottom to top, left to right"
-msgstr ""
+msgstr "از ته به سر، از چپ به راست"
 
-#: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
+#: ../gtk/gtkprintunixdialog.c:3027
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3537
 msgid "Bottom to top, right to left"
-msgstr ""
+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
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3031
+#: ../gtk/gtkprintunixdialog.c:3044
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3569
 msgid "Page Ordering"
-msgstr "اخطار"
+msgstr "ترتیب صفحه‌ها"
 
-#: gtk/gtkprintunixdialog.c:3053
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3060
 msgid "Left to right"
-msgstr "نشانه‌ی _چپ‌به‌راست"
+msgstr "چپ به راست"
 
-#: gtk/gtkprintunixdialog.c:3054
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3061
 msgid "Right to left"
-msgstr "_چاپ"
+msgstr "چپ به راست"
 
-#: gtk/gtkprintunixdialog.c:3066
+#: ../gtk/gtkprintunixdialog.c:3073
 msgid "Top to bottom"
-msgstr ""
+msgstr "از سر به ته"
 
-#: gtk/gtkprintunixdialog.c:3067
+#: ../gtk/gtkprintunixdialog.c:3074
 msgid "Bottom to top"
-msgstr ""
+msgstr "از ته به سر"
 
-#: gtk/gtkprintunixdialog.c:3307
+#: ../gtk/gtkprintunixdialog.c:3314
 msgid "Layout"
-msgstr ""
+msgstr "صفحه‌بندی"
 
-#: gtk/gtkprintunixdialog.c:3311
+#: ../gtk/gtkprintunixdialog.c:3318
 msgid "T_wo-sided:"
-msgstr ""
+msgstr "_دو رو:"
 
-#: gtk/gtkprintunixdialog.c:3326
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3333
 msgid "Pages per _side:"
-msgstr "_ویژگی‌ها"
+msgstr "_تعداد صفحه‌ها در یک رو"
 
-#: gtk/gtkprintunixdialog.c:3343
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3350
 msgid "Page or_dering:"
-msgstr "_ویژگی‌ها"
+msgstr "_ترتیب صفحه‌ها"
 
-#: gtk/gtkprintunixdialog.c:3359
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3366
 msgid "_Only print:"
-msgstr "_چاپ"
+msgstr "_فقط چاپ"
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:3374
+#: ../gtk/gtkprintunixdialog.c:3381
 msgid "All sheets"
-msgstr ""
+msgstr "همهٔ صفحه‌ها"
 
-#: gtk/gtkprintunixdialog.c:3375
+#: ../gtk/gtkprintunixdialog.c:3382
 msgid "Even sheets"
-msgstr ""
+msgstr "صفحه‌های زوج"
 
-#: gtk/gtkprintunixdialog.c:3376
+#: ../gtk/gtkprintunixdialog.c:3383
 msgid "Odd sheets"
-msgstr ""
+msgstr "صفحه‌های فرد"
 
-#: gtk/gtkprintunixdialog.c:3379
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3386
 msgid "Sc_ale:"
-msgstr "_روشنایی:"
+msgstr "م_قیاس:"
 
-#: gtk/gtkprintunixdialog.c:3406
+#: ../gtk/gtkprintunixdialog.c:3413
 msgid "Paper"
-msgstr ""
+msgstr "کاغذ"
 
-#: gtk/gtkprintunixdialog.c:3410
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3417
 msgid "Paper _type:"
-msgstr "_ویژگی‌ها"
+msgstr "نو_ع کاغذ:"
 
-#: gtk/gtkprintunixdialog.c:3425
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3432
 msgid "Paper _source:"
-msgstr "_ویژگی‌ها"
+msgstr "_منبع کاغذ"
 
-#: gtk/gtkprintunixdialog.c:3440
+#: ../gtk/gtkprintunixdialog.c:3447
 msgid "Output t_ray:"
-msgstr ""
+msgstr "_سینی خروجی:"
 
-#: gtk/gtkprintunixdialog.c:3480
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3487
 msgid "Or_ientation:"
-msgstr "_غلظت:"
+msgstr "_جهت:"
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:3495
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3502
 msgid "Portrait"
-msgstr "_چاپ"
+msgstr "عمودی"
 
-#: gtk/gtkprintunixdialog.c:3496
+#: ../gtk/gtkprintunixdialog.c:3503
 msgid "Landscape"
-msgstr ""
+msgstr "منظره‌‌ای"
 
-#: gtk/gtkprintunixdialog.c:3497
+#: ../gtk/gtkprintunixdialog.c:3504
 msgid "Reverse portrait"
-msgstr ""
+msgstr "عمودی معکوس"
 
-#: gtk/gtkprintunixdialog.c:3498
+#: ../gtk/gtkprintunixdialog.c:3505
 msgid "Reverse landscape"
-msgstr ""
+msgstr "منظره‌ای معکوس"
 
-#: gtk/gtkprintunixdialog.c:3543
+#: ../gtk/gtkprintunixdialog.c:3550
 msgid "Job Details"
-msgstr ""
+msgstr "جزئیات کار"
 
-#: gtk/gtkprintunixdialog.c:3549
+#: ../gtk/gtkprintunixdialog.c:3556
 msgid "Pri_ority:"
-msgstr ""
+msgstr "او_لویت:"
 
-#: gtk/gtkprintunixdialog.c:3564
+#: ../gtk/gtkprintunixdialog.c:3571
 msgid "_Billing info:"
-msgstr ""
+msgstr "ا_طلاعات صورتحساب"
 
-#: gtk/gtkprintunixdialog.c:3582
+#: ../gtk/gtkprintunixdialog.c:3589
 msgid "Print Document"
-msgstr ""
+msgstr "چاپ سند"
 
 #. Translators: this is one of the choices for the print at option
 #. * in the print dialog
 #.
-#: gtk/gtkprintunixdialog.c:3591
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3598
 msgid "_Now"
-msgstr "_نه"
+msgstr "_اکنون"
 
-#: gtk/gtkprintunixdialog.c:3602
+#: ../gtk/gtkprintunixdialog.c:3609
 msgid "A_t:"
-msgstr ""
+msgstr "_در:"
 
 #. Translators: Ability to parse the am/pm format depends on actual locale.
 #. * You can remove the am/pm values below for your locale if they are not
 #. * supported.
 #.
-#: gtk/gtkprintunixdialog.c:3608
+#: ../gtk/gtkprintunixdialog.c:3615
 msgid ""
 "Specify the time of print,\n"
 " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
 msgstr ""
+"زمان چاپ را مشخص کنید، \n"
+"مثلا ۱۵:۳۰، ۲:۳۵ ب.ظ، ۱۴:۱۵:۲۰، ۱۱:۴۶ ق.ظ، ۴ ب.ظ"
 
-#: gtk/gtkprintunixdialog.c:3618
+#: ../gtk/gtkprintunixdialog.c:3625
 msgid "Time of print"
-msgstr ""
+msgstr "زمان چاپ"
 
-#: gtk/gtkprintunixdialog.c:3634
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3641
 msgid "On _hold"
-msgstr "_سیاه"
+msgstr "_در حل انتظار:"
 
-#: gtk/gtkprintunixdialog.c:3635
+#: ../gtk/gtkprintunixdialog.c:3642
 msgid "Hold the job until it is explicitly released"
-msgstr ""
+msgstr "کار را نگهدار تا آشکارا منتشر شود"
 
-#: gtk/gtkprintunixdialog.c:3655
+#: ../gtk/gtkprintunixdialog.c:3662
 msgid "Add Cover Page"
-msgstr ""
+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:3671
 msgid "Be_fore:"
-msgstr ""
+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:3689
 msgid "_After:"
-msgstr ""
+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:3707
 msgid "Job"
-msgstr ""
+msgstr "کار"
 
-#: gtk/gtkprintunixdialog.c:3766
+#: ../gtk/gtkprintunixdialog.c:3773
 msgid "Advanced"
-msgstr ""
+msgstr "پیشرفته"
 
 #. Translators: this will appear as tab label in print dialog.
-#: gtk/gtkprintunixdialog.c:3804
+#: ../gtk/gtkprintunixdialog.c:3811
 msgid "Image Quality"
-msgstr ""
+msgstr "کیفیت تصویر"
 
 #. Translators: this will appear as tab label in print dialog.
-#: gtk/gtkprintunixdialog.c:3808
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3815
 msgid "Color"
-msgstr "_رنگ"
+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:3820
 msgid "Finishing"
-msgstr ""
+msgstr "در حال پایان بردن"
 
-#: gtk/gtkprintunixdialog.c:3823
+#: ../gtk/gtkprintunixdialog.c:3830
 msgid "Some of the settings in the dialog conflict"
-msgstr ""
+msgstr "ببعضی از تنظیمات در جعبهٔ محاوره ناسازگارند."
 
-#: gtk/gtkprintunixdialog.c:3846
-#, fuzzy
+#: ../gtk/gtkprintunixdialog.c:3853
 msgid "Print"
-msgstr "_چاپ"
+msgstr "چاپ"
 
-#: gtk/gtkrc.c:2834
+#: ../gtk/gtkrc.c:2834
 #, c-format
 msgid "Unable to find include file: \"%s\""
-msgstr "نمی‌توان پرونده‌ی درجی را یافت: «%s»"
+msgstr "نمی‌توان پروندهٔ درجی را یافت: «%s»"
 
-#: gtk/gtkrc.c:3470 gtk/gtkrc.c:3473
+#: ../gtk/gtkrc.c:3470
+#: ../gtk/gtkrc.c:3473
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
-msgstr "نمی‌توان پرونده‌ی تصویر را در pixmap_path یافت: «%s»"
+msgstr "نمی‌توان پروندهٔ تصویر را در pixmap_path یافت: «%s»"
 
-#: gtk/gtkrecentaction.c:165 gtk/gtkrecentaction.c:173
-#: gtk/gtkrecentchoosermenu.c:615 gtk/gtkrecentchoosermenu.c:623
+#: ../gtk/gtkrecentaction.c:165
+#: ../gtk/gtkrecentaction.c:173
+#: ../gtk/gtkrecentchoosermenu.c:608
+#: ../gtk/gtkrecentchoosermenu.c:616
 #, c-format
 msgid "This function is not implemented for widgets of class '%s'"
-msgstr ""
+msgstr "این تابع برای عنصر‌های ردهٔ '%s' پیاده‌سازی نشده است"
 
-#: gtk/gtkrecentchooserdefault.c:482
-#, fuzzy
+#: ../gtk/gtkrecentchooserdefault.c:483
 msgid "Select which type of documents are shown"
-msgstr "انتخاب این که کدام نوع پرونده‌ها نمایش داده شوند"
+msgstr "انتخاب این که کدام نوع سند‌ها نمایش داده شوند"
 
-#: gtk/gtkrecentchooserdefault.c:1138 gtk/gtkrecentchooserdefault.c:1175
+#: ../gtk/gtkrecentchooserdefault.c:1133
+#: ../gtk/gtkrecentchooserdefault.c:1170
 #, c-format
 msgid "No item for URI '%s' found"
-msgstr ""
+msgstr "موردی برای نشانی «‎%s» پیدا نشد"
 
-#: gtk/gtkrecentchooserdefault.c:1302
+#: ../gtk/gtkrecentchooserdefault.c:1297
 msgid "Untitled filter"
-msgstr ""
+msgstr "پالایه بی‌نام"
 
-#: gtk/gtkrecentchooserdefault.c:1655
-#, fuzzy
+#: ../gtk/gtkrecentchooserdefault.c:1650
 msgid "Could not remove item"
-msgstr "نمی‌توان مورد را انتخاب کرد"
+msgstr "مورد حذف نشد"
 
-#: gtk/gtkrecentchooserdefault.c:1699
-#, fuzzy
+#: ../gtk/gtkrecentchooserdefault.c:1694
 msgid "Could not clear list"
-msgstr "نمی‌توان مورد را انتخاب کرد"
+msgstr "فهرست پاک نشد"
 
-#: gtk/gtkrecentchooserdefault.c:1783
-#, fuzzy
+#: ../gtk/gtkrecentchooserdefault.c:1778
 msgid "Copy _Location"
-msgstr "باز کردن _مکان"
+msgstr "_رونوشت از مکان"
 
-#: gtk/gtkrecentchooserdefault.c:1796
+#: ../gtk/gtkrecentchooserdefault.c:1791
 msgid "_Remove From List"
-msgstr ""
+msgstr "_حذف از فهرست"
 
-#: gtk/gtkrecentchooserdefault.c:1805
-#, fuzzy
+#: ../gtk/gtkrecentchooserdefault.c:1800
 msgid "_Clear List"
-msgstr "_پاک کردن"
+msgstr "پاک کردن فهرست"
 
-#: gtk/gtkrecentchooserdefault.c:1819
+#: ../gtk/gtkrecentchooserdefault.c:1814
 msgid "Show _Private Resources"
-msgstr ""
+msgstr "نشان دادن منابع _خصوصی"
 
 #. we create a placeholder menuitem, to be used in case
 #. * the menu is empty. this placeholder will stay around
@@ -2102,2552 +1998,2424 @@ msgstr ""
 #. * user appended or prepended custom menu items to the
 #. * recent chooser menu widget.
 #.
-#: gtk/gtkrecentchoosermenu.c:369
-#, fuzzy
+#: ../gtk/gtkrecentchoosermenu.c:362
 msgid "No items found"
-msgstr "سرصفحه‌ی XPM یافت نشد"
+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 ""
+msgstr "هیچ منبع به تازگی استفاده شده‌ای با نشانی وب `%s' یافت نشد"
 
-#: gtk/gtkrecentchoosermenu.c:802
+#: ../gtk/gtkrecentchoosermenu.c:795
 #, c-format
 msgid "Open '%s'"
-msgstr ""
+msgstr "باز کردن «%s»"
 
-#: gtk/gtkrecentchoosermenu.c:832
-#, fuzzy
+#: ../gtk/gtkrecentchoosermenu.c:825
 msgid "Unknown item"
-msgstr "نامعلوم"
+msgstr "مورد ناشناخته"
 
 #. This is the label format that is used for the first 10 items
 #. * in a recent files menu. The %d is the number of the item,
 #. * 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:836
 #, c-format
 msgctxt "recent menu label"
 msgid "_%d. %s"
-msgstr ""
+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:841
 #, c-format
 msgctxt "recent menu label"
 msgid "%d. %s"
-msgstr ""
-
-#: 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
-#, fuzzy, c-format
+msgstr "%d. %s"
+
+#: ../gtk/gtkrecentmanager.c:1000
+#: ../gtk/gtkrecentmanager.c:1013
+#: ../gtk/gtkrecentmanager.c:1150
+#: ../gtk/gtkrecentmanager.c:1160
+#: ../gtk/gtkrecentmanager.c:1213
+#: ../gtk/gtkrecentmanager.c:1222
+#: ../gtk/gtkrecentmanager.c:1237
+#, c-format
 msgid "Unable to find an item with URI '%s'"
-msgstr "نمی‌توان پرونده‌ی درجی را یافت: «%s»"
+msgstr "نمی‌توان موردی با نشانی «%s» یافت"
+
+#: ../gtk/gtkrecentmanager.c:2437
+#, c-format
+msgid "No registered application with name '%s' for item with URI '%s' found"
+msgstr "هیچ برنامهٔ ثبت شده‌ای با نام «%s» برای آدرس ولی «%s» یافت نشد"
 
-#: gtk/gtkspinner.c:456
+#: ../gtk/gtkspinner.c:439
 msgctxt "throbbing progress animation widget"
 msgid "Spinner"
-msgstr ""
+msgstr "گرداننده"
 
-#: gtk/gtkspinner.c:457
+#: ../gtk/gtkspinner.c:440
 msgid "Provides visual indication of progress"
-msgstr ""
+msgstr "نشان‌گر تصویری پیشرفت را فراهم می‌کند"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: gtk/gtkstock.c:313
-#, fuzzy
+#: ../gtk/gtkstock.c:313
 msgctxt "Stock label"
 msgid "Information"
 msgstr "اطلاعات"
 
-#: gtk/gtkstock.c:314
-#, fuzzy
+#: ../gtk/gtkstock.c:314
 msgctxt "Stock label"
 msgid "Warning"
 msgstr "اخطار"
 
-#: gtk/gtkstock.c:315
-#, fuzzy
+#: ../gtk/gtkstock.c:315
 msgctxt "Stock label"
 msgid "Error"
 msgstr "خطا"
 
-#: gtk/gtkstock.c:316
-#, fuzzy
+#: ../gtk/gtkstock.c:316
 msgctxt "Stock label"
 msgid "Question"
-msgstr "سؤال"
+msgstr "پرسش"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: gtk/gtkstock.c:321
-#, fuzzy
+#: ../gtk/gtkstock.c:321
 msgctxt "Stock label"
 msgid "_About"
 msgstr "_درباره"
 
-#: gtk/gtkstock.c:322
-#, fuzzy
+#: ../gtk/gtkstock.c:322
 msgctxt "Stock label"
 msgid "_Add"
-msgstr "_افزودن"
+msgstr "ا_فزودن"
 
-#: gtk/gtkstock.c:323
-#, fuzzy
+#: ../gtk/gtkstock.c:323
 msgctxt "Stock label"
 msgid "_Apply"
-msgstr "اِ_عمال"
+msgstr "_به‌کاربستن"
 
-#: gtk/gtkstock.c:324
-#, fuzzy
+#: ../gtk/gtkstock.c:324
 msgctxt "Stock label"
 msgid "_Bold"
-msgstr "_سیاه"
+msgstr "_توپر"
 
-#: gtk/gtkstock.c:325
-#, fuzzy
+#: ../gtk/gtkstock.c:325
 msgctxt "Stock label"
 msgid "_Cancel"
-msgstr "ان_صراف"
+msgstr "_انصراف"
 
-#: gtk/gtkstock.c:326
-#, fuzzy
+#: ../gtk/gtkstock.c:326
 msgctxt "Stock label"
 msgid "_CD-ROM"
 msgstr "_سی‌دی"
 
-#: gtk/gtkstock.c:327
-#, fuzzy
+#: ../gtk/gtkstock.c:327
 msgctxt "Stock label"
 msgid "_Clear"
 msgstr "_پاک کردن"
 
-#: gtk/gtkstock.c:328
-#, fuzzy
+#: ../gtk/gtkstock.c:328
 msgctxt "Stock label"
 msgid "_Close"
 msgstr "_بستن"
 
-#: gtk/gtkstock.c:329
-#, fuzzy
+#: ../gtk/gtkstock.c:329
 msgctxt "Stock label"
 msgid "C_onnect"
-msgstr "_تبدیل"
+msgstr "ات_صال"
 
-#: gtk/gtkstock.c:330
-#, fuzzy
+#: ../gtk/gtkstock.c:330
 msgctxt "Stock label"
 msgid "_Convert"
 msgstr "_تبدیل"
 
-#: gtk/gtkstock.c:331
-#, fuzzy
+#: ../gtk/gtkstock.c:331
 msgctxt "Stock label"
 msgid "_Copy"
-msgstr "_نسخه‌برداری"
+msgstr "_رونوشت"
 
-#: gtk/gtkstock.c:332
-#, fuzzy
+#: ../gtk/gtkstock.c:332
 msgctxt "Stock label"
 msgid "Cu_t"
 msgstr "_برش"
 
-#: gtk/gtkstock.c:333
-#, fuzzy
+#: ../gtk/gtkstock.c:333
 msgctxt "Stock label"
 msgid "_Delete"
 msgstr "_حذف"
 
-#: gtk/gtkstock.c:334
-#, fuzzy
+#: ../gtk/gtkstock.c:334
 msgctxt "Stock label"
 msgid "_Discard"
-msgstr "از کار افتاده"
+msgstr "_دور انداختن"
 
-#: gtk/gtkstock.c:335
-#, fuzzy
+#: ../gtk/gtkstock.c:335
 msgctxt "Stock label"
 msgid "_Disconnect"
-msgstr "_تبدیل"
+msgstr "_قطع ارتباط"
 
-#: gtk/gtkstock.c:336
-#, fuzzy
+#: ../gtk/gtkstock.c:336
 msgctxt "Stock label"
 msgid "_Execute"
 msgstr "ا_جرا"
 
-#: gtk/gtkstock.c:337
-#, fuzzy
+#: ../gtk/gtkstock.c:337
 msgctxt "Stock label"
 msgid "_Edit"
 msgstr "_ویرایش"
 
-#: gtk/gtkstock.c:338
-#, fuzzy
+#: ../gtk/gtkstock.c:338
 msgctxt "Stock label"
 msgid "_File"
-msgstr "_پرونده‌ها"
+msgstr "_پرونده"
 
-#: gtk/gtkstock.c:339
-#, fuzzy
+#: ../gtk/gtkstock.c:339
 msgctxt "Stock label"
 msgid "_Find"
 msgstr "_یافتن"
 
-#: gtk/gtkstock.c:340
-#, fuzzy
+#: ../gtk/gtkstock.c:340
 msgctxt "Stock label"
 msgid "Find and _Replace"
-msgstr "یافتن و _جای‌گزینی"
+msgstr "یافتن و _جایگزینی"
 
-#: gtk/gtkstock.c:341
-#, fuzzy
+#: ../gtk/gtkstock.c:341
 msgctxt "Stock label"
 msgid "_Floppy"
-msgstr "دیسک _نرم"
+msgstr "_فلاپی"
 
-#: gtk/gtkstock.c:342
+#: ../gtk/gtkstock.c:342
 msgctxt "Stock label"
 msgid "_Fullscreen"
-msgstr ""
+msgstr "_تمام‌صفحه"
 
-#: gtk/gtkstock.c:343
+#: ../gtk/gtkstock.c:343
 msgctxt "Stock label"
 msgid "_Leave Fullscreen"
-msgstr ""
+msgstr "تر_ک حالت تمام‌صفحه"
 
 #. This is a navigation label as in "go to the bottom of the page"
-#: gtk/gtkstock.c:345
-#, fuzzy
+#: ../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
-#, fuzzy
+#: ../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
-#, fuzzy
+#: ../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
-#, fuzzy
+#: ../gtk/gtkstock.c:351
 msgctxt "Stock label, navigation"
 msgid "_Top"
-msgstr "_بالا"
+msgstr "_سَر"
 
 #. This is a navigation label as in "go back"
-#: gtk/gtkstock.c:353
-#, fuzzy
+#: ../gtk/gtkstock.c:353
 msgctxt "Stock label, navigation"
 msgid "_Back"
 msgstr "_عقب"
 
 #. This is a navigation label as in "go down"
-#: gtk/gtkstock.c:355
-#, fuzzy
+#: ../gtk/gtkstock.c:355
 msgctxt "Stock label, navigation"
 msgid "_Down"
 msgstr "_پایین"
 
 #. This is a navigation label as in "go forward"
-#: gtk/gtkstock.c:357
-#, fuzzy
+#: ../gtk/gtkstock.c:357
 msgctxt "Stock label, navigation"
 msgid "_Forward"
 msgstr "_جلو"
 
 #. This is a navigation label as in "go up"
-#: gtk/gtkstock.c:359
-#, fuzzy
+#: ../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 "دیسک _سخت"
+msgstr "دیسکِ _سخت"
 
-#: gtk/gtkstock.c:361
-#, fuzzy
+#: ../gtk/gtkstock.c:361
 msgctxt "Stock label"
 msgid "_Help"
 msgstr "_راهنما"
 
-#: gtk/gtkstock.c:362
-#, fuzzy
+#: ../gtk/gtkstock.c:362
 msgctxt "Stock label"
 msgid "_Home"
-msgstr "آ_غازه"
+msgstr "_آغازه"
 
-#: gtk/gtkstock.c:363
-#, fuzzy
+#: ../gtk/gtkstock.c:363
 msgctxt "Stock label"
 msgid "Increase Indent"
-msgstr "افزایش تورفتگی"
+msgstr "افزای_ش تورفتگی"
 
-#: gtk/gtkstock.c:364
-#, fuzzy
+#: ../gtk/gtkstock.c:364
 msgctxt "Stock label"
 msgid "Decrease Indent"
-msgstr "کاهش تورفتگی"
+msgstr "کا_هش تورفتگی"
 
-#: gtk/gtkstock.c:365
-#, fuzzy
+#: ../gtk/gtkstock.c:365
 msgctxt "Stock label"
 msgid "_Index"
-msgstr "_نمایه"
+msgstr "نمایه"
 
-#: gtk/gtkstock.c:366
-#, fuzzy
+#: ../gtk/gtkstock.c:366
 msgctxt "Stock label"
 msgid "_Information"
 msgstr "اطلاعات"
 
-#: gtk/gtkstock.c:367
-#, fuzzy
+#: ../gtk/gtkstock.c:367
 msgctxt "Stock label"
 msgid "_Italic"
-msgstr "ای_تالیک"
+msgstr "_یک‌وری"
 
-#: gtk/gtkstock.c:368
-#, fuzzy
+#: ../gtk/gtkstock.c:368
 msgctxt "Stock label"
 msgid "_Jump to"
 msgstr "_پرش به"
 
 #. This is about text justification, "centered text"
-#: gtk/gtkstock.c:370
-#, fuzzy
+#: ../gtk/gtkstock.c:370
 msgctxt "Stock label"
 msgid "_Center"
-msgstr "_تبدیل"
+msgstr "_مرکز"
 
 #. This is about text justification
-#: gtk/gtkstock.c:372
-#, fuzzy
+#: ../gtk/gtkstock.c:372
 msgctxt "Stock label"
 msgid "_Fill"
-msgstr "_پرونده‌ها"
+msgstr "_پر کردن"
 
 #. This is about text justification, "left-justified text"
-#: gtk/gtkstock.c:374
-#, fuzzy
+#: ../gtk/gtkstock.c:374
 msgctxt "Stock label"
 msgid "_Left"
 msgstr "_چپ"
 
 #. This is about text justification, "right-justified text"
-#: gtk/gtkstock.c:376
-#, fuzzy
+#: ../gtk/gtkstock.c:376
 msgctxt "Stock label"
 msgid "_Right"
-msgstr "_پرده:"
+msgstr "_راست"
 
 #. Media label, as in "fast forward"
-#: gtk/gtkstock.c:379
-#, fuzzy
+#: ../gtk/gtkstock.c:379
 msgctxt "Stock label, media"
 msgid "_Forward"
 msgstr "_جلو"
 
 #. Media label, as in "next song"
-#: gtk/gtkstock.c:381
-#, fuzzy
+#: ../gtk/gtkstock.c:381
 msgctxt "Stock label, media"
 msgid "_Next"
-msgstr "_جدید"
+msgstr "_بعدی"
 
 #. Media label, as in "pause music"
-#: gtk/gtkstock.c:383
-#, fuzzy
+#: ../gtk/gtkstock.c:383
 msgctxt "Stock label, media"
 msgid "P_ause"
-msgstr "_چسباندن"
+msgstr "_مکث"
 
 #. Media label, as in "play music"
-#: gtk/gtkstock.c:385
-#, fuzzy
+#: ../gtk/gtkstock.c:385
 msgctxt "Stock label, media"
 msgid "_Play"
-msgstr "_تغییر نام"
+msgstr "_پخش"
 
 #. Media label, as in  "previous song"
-#: gtk/gtkstock.c:387
-#, fuzzy
+#: ../gtk/gtkstock.c:387
 msgctxt "Stock label, media"
 msgid "Pre_vious"
-msgstr "_قبلی"
+msgstr "_پیشین"
 
 #. Media label
-#: gtk/gtkstock.c:389
-#, fuzzy
+#: ../gtk/gtkstock.c:389
 msgctxt "Stock label, media"
 msgid "_Record"
-msgstr "_ضبط:"
+msgstr "_ضبط"
 
 #. Media label
-#: gtk/gtkstock.c:391
-#, fuzzy
+#: ../gtk/gtkstock.c:391
 msgctxt "Stock label, media"
 msgid "R_ewind"
-msgstr "_عقب بردن"
+msgstr "_بازپیچی"
 
 #. Media label
-#: gtk/gtkstock.c:393
-#, fuzzy
+#: ../gtk/gtkstock.c:393
 msgctxt "Stock label, media"
 msgid "_Stop"
-msgstr "_توقف"
+msgstr "ای_ست"
 
-#: gtk/gtkstock.c:394
-#, fuzzy
+#: ../gtk/gtkstock.c:394
 msgctxt "Stock label"
 msgid "_Network"
 msgstr "_شبکه"
 
-#: gtk/gtkstock.c:395
-#, fuzzy
+#: ../gtk/gtkstock.c:395
 msgctxt "Stock label"
 msgid "_New"
-msgstr "_جدید"
+msgstr "_نو"
 
-#: gtk/gtkstock.c:396
-#, fuzzy
+#: ../gtk/gtkstock.c:396
 msgctxt "Stock label"
 msgid "_No"
-msgstr "_نه"
+msgstr "_خیر"
 
-#: gtk/gtkstock.c:397
-#, fuzzy
+#: ../gtk/gtkstock.c:397
 msgctxt "Stock label"
 msgid "_OK"
-msgstr "_تأیید"
+msgstr "تأیید"
 
-#: gtk/gtkstock.c:398
-#, fuzzy
+#: ../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 ""
+msgstr "منظره‌ای"
 
 #. Page orientation
-#: gtk/gtkstock.c:402
-#, fuzzy
+#: ../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 ""
+msgstr "منظره‌ای معکوس"
 
 #. Page orientation
-#: gtk/gtkstock.c:406
+#: ../gtk/gtkstock.c:406
 msgctxt "Stock label"
 msgid "Reverse portrait"
-msgstr ""
+msgstr "عمودی معکوس"
 
-#: gtk/gtkstock.c:407
-#, fuzzy
+#: ../gtk/gtkstock.c:407
 msgctxt "Stock label"
 msgid "Page Set_up"
-msgstr "صفحه‌ی %Iu"
+msgstr "_برپاسازی چاپ"
 
-#: gtk/gtkstock.c:408
-#, fuzzy
+#: ../gtk/gtkstock.c:408
 msgctxt "Stock label"
 msgid "_Paste"
 msgstr "_چسباندن"
 
-#: gtk/gtkstock.c:409
-#, fuzzy
+#: ../gtk/gtkstock.c:409
 msgctxt "Stock label"
 msgid "_Preferences"
 msgstr "_ترجیحات"
 
-#: gtk/gtkstock.c:410
-#, fuzzy
+#: ../gtk/gtkstock.c:410
 msgctxt "Stock label"
 msgid "_Print"
 msgstr "_چاپ"
 
-#: gtk/gtkstock.c:411
-#, fuzzy
+#: ../gtk/gtkstock.c:411
 msgctxt "Stock label"
 msgid "Print Pre_view"
-msgstr "پی_ش‌نمایش چاپ"
+msgstr "_پیش‌نمایش چاپ"
 
-#: gtk/gtkstock.c:412
-#, fuzzy
+#: ../gtk/gtkstock.c:412
 msgctxt "Stock label"
 msgid "_Properties"
 msgstr "_ویژگی‌ها"
 
-#: gtk/gtkstock.c:413
-#, fuzzy
+#: ../gtk/gtkstock.c:413
 msgctxt "Stock label"
 msgid "_Quit"
-msgstr "_خروج"
+msgstr "_ترک"
 
-#: gtk/gtkstock.c:414
-#, fuzzy
+#: ../gtk/gtkstock.c:414
 msgctxt "Stock label"
 msgid "_Redo"
-msgstr "_دوباره"
+msgstr "_از نو"
 
-#: gtk/gtkstock.c:415
-#, fuzzy
+#: ../gtk/gtkstock.c:415
 msgctxt "Stock label"
 msgid "_Refresh"
 msgstr "_نوسازی"
 
-#: gtk/gtkstock.c:416
-#, fuzzy
+#: ../gtk/gtkstock.c:416
 msgctxt "Stock label"
 msgid "_Remove"
 msgstr "_حذف"
 
-#: gtk/gtkstock.c:417
-#, fuzzy
+#: ../gtk/gtkstock.c:417
 msgctxt "Stock label"
 msgid "_Revert"
 msgstr "باز_گشت"
 
-#: gtk/gtkstock.c:418
-#, fuzzy
+#: ../gtk/gtkstock.c:418
 msgctxt "Stock label"
 msgid "_Save"
 msgstr "_ذخیره"
 
-#: gtk/gtkstock.c:419
-#, fuzzy
+#: ../gtk/gtkstock.c:419
 msgctxt "Stock label"
 msgid "Save _As"
-msgstr "ذخیره با _نام"
+msgstr "ذخیره به _نام..."
 
-#: gtk/gtkstock.c:420
-#, fuzzy
+#: ../gtk/gtkstock.c:420
 msgctxt "Stock label"
 msgid "Select _All"
 msgstr "انتخاب _همه"
 
-#: gtk/gtkstock.c:421
-#, fuzzy
+#: ../gtk/gtkstock.c:421
 msgctxt "Stock label"
 msgid "_Color"
 msgstr "_رنگ"
 
-#: gtk/gtkstock.c:422
-#, fuzzy
+#: ../gtk/gtkstock.c:422
 msgctxt "Stock label"
 msgid "_Font"
-msgstr "_قلم"
+msgstr "_قلم:"
 
 #. Sorting direction
-#: gtk/gtkstock.c:424
-#, fuzzy
+#: ../gtk/gtkstock.c:424
 msgctxt "Stock label"
 msgid "_Ascending"
 msgstr "_صعودی"
 
 #. Sorting direction
-#: gtk/gtkstock.c:426
-#, fuzzy
+#: ../gtk/gtkstock.c:426
 msgctxt "Stock label"
 msgid "_Descending"
 msgstr "_نزولی"
 
-#: gtk/gtkstock.c:427
-#, fuzzy
+#: ../gtk/gtkstock.c:427
 msgctxt "Stock label"
 msgid "_Spell Check"
-msgstr "_غلطیابی املایی"
+msgstr "غلط _گیری"
 
-#: gtk/gtkstock.c:428
-#, fuzzy
+#: ../gtk/gtkstock.c:428
 msgctxt "Stock label"
 msgid "_Stop"
-msgstr "_توقف"
+msgstr "ای_ست"
 
 #. Font variant
-#: gtk/gtkstock.c:430
-#, fuzzy
+#: ../gtk/gtkstock.c:430
 msgctxt "Stock label"
 msgid "_Strikethrough"
-msgstr "_خط‌خورده"
+msgstr "خط _خورده"
 
-#: gtk/gtkstock.c:431
-#, fuzzy
+#: ../gtk/gtkstock.c:431
 msgctxt "Stock label"
 msgid "_Undelete"
-msgstr "احیا"
+msgstr "ا_حیا"
 
 #. Font variant
-#: gtk/gtkstock.c:433
-#, fuzzy
+#: ../gtk/gtkstock.c:433
 msgctxt "Stock label"
 msgid "_Underline"
-msgstr "_زیرخط‌دار"
+msgstr "زیرخط_‌دار"
 
-#: gtk/gtkstock.c:434
-#, fuzzy
+#: ../gtk/gtkstock.c:434
 msgctxt "Stock label"
 msgid "_Undo"
-msgstr "_برگشت حرکت"
+msgstr "وا_گردان"
 
-#: gtk/gtkstock.c:435
-#, fuzzy
+#: ../gtk/gtkstock.c:435
 msgctxt "Stock label"
 msgid "_Yes"
-msgstr "_بله"
+msgstr "بله"
 
 #. Zoom
-#: gtk/gtkstock.c:437
-#, fuzzy
+#: ../gtk/gtkstock.c:437
 msgctxt "Stock label"
 msgid "_Normal Size"
-msgstr "اندازه‌ی _عادی"
+msgstr "اندازهٔ _عادی"
 
 #. Zoom
-#: gtk/gtkstock.c:439
-#, fuzzy
+#: ../gtk/gtkstock.c:439
 msgctxt "Stock label"
 msgid "Best _Fit"
-msgstr "بهترین اندازه"
+msgstr "_بهترین جورشدن"
 
-#: gtk/gtkstock.c:440
-#, fuzzy
+#: ../gtk/gtkstock.c:440
 msgctxt "Stock label"
 msgid "Zoom _In"
-msgstr "زوم به _داخل"
+msgstr "_بزرگنمایی"
 
-#: gtk/gtkstock.c:441
-#, fuzzy
+#: ../gtk/gtkstock.c:441
 msgctxt "Stock label"
 msgid "Zoom _Out"
-msgstr "زوم به _خارج"
+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:296
+#: ../gtk/gtkswitch.c:339
+#: ../gtk/gtkswitch.c:531
+msgctxt "switch"
+msgid "ON"
+msgstr "U+2759"
+
+#. 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:304
+#: ../gtk/gtkswitch.c:340
+#: ../gtk/gtkswitch.c:552
+msgctxt "switch"
+msgid "OFF"
+msgstr "U+25CB"
+
+#: ../gtk/gtkswitch.c:943
+#| msgid "inch"
+msgctxt "light switch widget"
+msgid "Switch"
+msgstr "تعویض"
+
+#: ../gtk/gtkswitch.c:944
+msgid "Switches between on and off states"
+msgstr "تعویض بین حالت‌های روشن و خاموش"
+
+#: ../gtk/gtktextbufferrichtext.c:650
 #, c-format
 msgid "Unknown error when trying to deserialize %s"
-msgstr ""
+msgstr "خطای ناشناخته هنگام تلاش برای نامتوالی کردن %s"
 
-#: gtk/gtktextbufferrichtext.c:709
+#: ../gtk/gtktextbufferrichtext.c:709
 #, c-format
 msgid "No deserialize function found for format %s"
-msgstr ""
+msgstr "هیچ تابع نامتوالی‌کننده‌ای برای قالب %s یافت نشد"
 
-#: gtk/gtktextbufferserialize.c:795 gtk/gtktextbufferserialize.c:821
+#: ../gtk/gtktextbufferserialize.c:803
+#: ../gtk/gtktextbufferserialize.c:829
 #, c-format
 msgid "Both \"id\" and \"name\" were found on the <%s> element"
-msgstr ""
+msgstr "هم  «id» و هم «name» در عنصر <%s> یافت شدند"
 
-#: gtk/gtktextbufferserialize.c:805 gtk/gtktextbufferserialize.c:831
+#: ../gtk/gtktextbufferserialize.c:813
+#: ../gtk/gtktextbufferserialize.c:839
 #, c-format
 msgid "The attribute \"%s\" was found twice on the <%s> element"
-msgstr ""
+msgstr "خصیصه«%s»  دوبار در عنصر <%s> یافت شد"
 
-#: gtk/gtktextbufferserialize.c:845
+#: ../gtk/gtktextbufferserialize.c:855
 #, c-format
 msgid "<%s> element has invalid ID \"%s\""
-msgstr ""
+msgstr "عنصر <%s> شناسهٔ نامعتبر «%s» دارد"
 
-#: gtk/gtktextbufferserialize.c:855
+#: ../gtk/gtktextbufferserialize.c:865
 #, c-format
 msgid "<%s> element has neither a \"name\" nor an \"id\" attribute"
-msgstr ""
+msgstr "عنصر <%s> نه خصیصهٔ «name» و نه خصیصهٔ «id» دارد"
 
-#: gtk/gtktextbufferserialize.c:942
+#: ../gtk/gtktextbufferserialize.c:952
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
-msgstr ""
+msgstr "خصیصهٔ «%s» در عنصر <%s> یکسان دو بار تکرار شده است"
 
-#: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985
+#: ../gtk/gtktextbufferserialize.c:970
+#: ../gtk/gtktextbufferserialize.c:995
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
-msgstr ""
+msgstr "خصیصهٔ «%s» در این متن روی عنصر <%s> نامعتبر است"
 
-#: gtk/gtktextbufferserialize.c:1024
+#: ../gtk/gtktextbufferserialize.c:1034
 #, c-format
 msgid "Tag \"%s\" has not been defined."
-msgstr ""
+msgstr "برچسب «%s» تعریف نشده است."
 
-#: gtk/gtktextbufferserialize.c:1036
+#: ../gtk/gtktextbufferserialize.c:1046
 msgid "Anonymous tag found and tags can not be created."
-msgstr ""
+msgstr "برچسب بی‌نام پیدا شده و نمی‌توان برچسب ساخت."
 
-#: gtk/gtktextbufferserialize.c:1047
+#: ../gtk/gtktextbufferserialize.c:1057
 #, c-format
 msgid "Tag \"%s\" does not exist in buffer and tags can not be created."
-msgstr ""
+msgstr "برچسب \"%s\" در میان‌گیر وجود ندارد و نمی‌توان برچسب ساخت."
 
-#: gtk/gtktextbufferserialize.c:1146 gtk/gtktextbufferserialize.c:1221
-#: gtk/gtktextbufferserialize.c:1324 gtk/gtktextbufferserialize.c:1398
+#: ../gtk/gtktextbufferserialize.c:1156
+#: ../gtk/gtktextbufferserialize.c:1231
+#: ../gtk/gtktextbufferserialize.c:1336
+#: ../gtk/gtktextbufferserialize.c:1410
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
-msgstr ""
+msgstr "عنصر <%s> زیر <%s> مجاز نیست"
 
-#: gtk/gtktextbufferserialize.c:1177
+#: ../gtk/gtktextbufferserialize.c:1187
 #, c-format
 msgid "\"%s\" is not a valid attribute type"
-msgstr ""
+msgstr "«%s» نوع خصیصه‌ای نامعتبر است"
 
-#: gtk/gtktextbufferserialize.c:1185
+#: ../gtk/gtktextbufferserialize.c:1195
 #, c-format
 msgid "\"%s\" is not a valid attribute name"
-msgstr ""
+msgstr "«%s» نام خصیصهٔ معتبری نیست"
 
-#: gtk/gtktextbufferserialize.c:1195
+#: ../gtk/gtktextbufferserialize.c:1205
 #, c-format
-msgid ""
-"\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
-msgstr ""
+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:1214
 #, c-format
 msgid "\"%s\" is not a valid value for attribute \"%s\""
-msgstr ""
+msgstr "«%s» مقدار معتبری برای خصیصهٔ «%s» نیست"
 
-#: gtk/gtktextbufferserialize.c:1289
+#: ../gtk/gtktextbufferserialize.c:1299
 #, c-format
 msgid "Tag \"%s\" already defined"
-msgstr ""
+msgstr "برچسب «%s» پیشاپیش تعریف شده است"
 
-#: gtk/gtktextbufferserialize.c:1300
+#: ../gtk/gtktextbufferserialize.c:1312
 #, c-format
 msgid "Tag \"%s\" has invalid priority \"%s\""
-msgstr ""
+msgstr "برچسب «%s» دارای اولویت نامعتبر«%s» است."
 
-#: gtk/gtktextbufferserialize.c:1353
+#: ../gtk/gtktextbufferserialize.c:1365
 #, c-format
 msgid "Outermost element in text must be <text_view_markup> not <%s>"
-msgstr ""
+msgstr "بیرونی‌ترین عنصر در متن بایستی <text_view_markup> باشد نه <%s>"
 
-#: gtk/gtktextbufferserialize.c:1362 gtk/gtktextbufferserialize.c:1378
+#: ../gtk/gtktextbufferserialize.c:1374
+#: ../gtk/gtktextbufferserialize.c:1390
 #, c-format
 msgid "A <%s> element has already been specified"
-msgstr ""
+msgstr "یک  عنصر <%s> پیشاپیش مشخص شده‌است"
 
-#: gtk/gtktextbufferserialize.c:1384
+#: ../gtk/gtktextbufferserialize.c:1396
 msgid "A <text> element can't occur before a <tags> element"
-msgstr ""
+msgstr "یک عنصر <text> نمی‌تواند پیش از یک عنصر <tags> پیش‌بیاید"
 
-#: gtk/gtktextbufferserialize.c:1784
+#: ../gtk/gtktextbufferserialize.c:1796
 msgid "Serialized data is malformed"
-msgstr ""
+msgstr "دادهٔ متوالی شده بد‌ریخت است"
 
-#: gtk/gtktextbufferserialize.c:1862
-msgid ""
-"Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
-msgstr ""
+#: ../gtk/gtktextbufferserialize.c:1874
+msgid "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
+msgstr "دادهٔ متوالی شده بد‌ریخت است. اولین بخش GTKTEXTBUFFERCONTENTS-0001 نیست"
 
-#: gtk/gtktextutil.c:60
+#: ../gtk/gtktextutil.c:60
 msgid "LRM _Left-to-right mark"
-msgstr "نشانه‌ی _چپ‌به‌راست"
+msgstr "LRM نشانهٔ _چپ‌به‌راست"
 
-#: gtk/gtktextutil.c:61
+#: ../gtk/gtktextutil.c:61
 msgid "RLM _Right-to-left mark"
-msgstr "نشانه‌ی _راست‌به‌چپ"
+msgstr "RLM نشانهٔ _راست‌به‌چپ"
 
-#: gtk/gtktextutil.c:62
+#: ../gtk/gtktextutil.c:62
 msgid "LRE Left-to-right _embedding"
-msgstr "زیرمتن چپ‌به‌راست_"
+msgstr "LRE زیرمتن چپ‌به‌راست_"
 
-#: gtk/gtktextutil.c:63
+#: ../gtk/gtktextutil.c:63
 msgid "RLE Right-to-left e_mbedding"
-msgstr "ز_یرمتن راست‌به‌چپ"
+msgstr "RLE ز_یرمتن راست‌به‌چپ"
 
-#: gtk/gtktextutil.c:64
+#: ../gtk/gtktextutil.c:64
 msgid "LRO Left-to-right _override"
-msgstr "زیرمتن ا_کیداً چپ‌به‌راست"
+msgstr "LRO زیرمتن ا_کیداً چپ‌به‌راست"
 
-#: gtk/gtktextutil.c:65
+#: ../gtk/gtktextutil.c:65
 msgid "RLO Right-to-left o_verride"
-msgstr "زیرمتن اکی_داً راست‌به‌چپ"
+msgstr "RLO زیرمتن اکی_داً راست‌به‌چپ"
 
-#: gtk/gtktextutil.c:66
+#: ../gtk/gtktextutil.c:66
 msgid "PDF _Pop directional formatting"
-msgstr "پایان زیرمتن_"
+msgstr "PDF پایان زیرمتن_"
 
-#: gtk/gtktextutil.c:67
+#: ../gtk/gtktextutil.c:67
 msgid "ZWS _Zero width space"
-msgstr "فاصله‌ی _بی‌عرض"
+msgstr "ZWS فاصلهٔ _بی‌عرض"
 
-#: gtk/gtktextutil.c:68
+#: ../gtk/gtktextutil.c:68
 msgid "ZWJ Zero width _joiner"
-msgstr "_اتصال مجازی"
+msgstr "ZWJ _اتصال بی‌عرض"
 
-#: gtk/gtktextutil.c:69
+#: ../gtk/gtktextutil.c:69
 msgid "ZWNJ Zero width _non-joiner"
-msgstr "_فاصله‌ی مجازی"
+msgstr "ZWNJ _جداکنندهٔ بی‌عرض"
 
-#: gtk/gtkthemes.c:72
+#: ../gtk/gtkthemes.c:72
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "نمی‌توان موتور تم را در module_path یافت: «%s»، "
 
-#: gtk/gtkuimanager.c:1505
+#: ../gtk/gtkuimanager.c:1505
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
-msgstr "برچسب شروع غیرمنتظره «%s» در سطر %Id نویسه‌ی %Id"
+msgstr "برچسب شروع غیرمنتظره «%s» در سطر %Id نویسهٔ %Id"
 
-#: gtk/gtkuimanager.c:1595
+#: ../gtk/gtkuimanager.c:1595
 #, c-format
 msgid "Unexpected character data on line %d char %d"
-msgstr "داده‌ی نویسه‌ای غیرمنتظره در سطر %Id نویسه‌ی %Id"
+msgstr "دادهٔ نویسه‌ای غیرمنتظره در سطر %Id نویسهٔ %Id"
 
-#: gtk/gtkuimanager.c:2427
+#: ../gtk/gtkuimanager.c:2427
 msgid "Empty"
 msgstr "خالی"
 
-#: gtk/gtkvolumebutton.c:83
-#, fuzzy
+#: ../gtk/gtkvolumebutton.c:83
 msgid "Volume"
-msgstr "_روشنایی:"
+msgstr "بلندی"
 
-#: gtk/gtkvolumebutton.c:85
+#: ../gtk/gtkvolumebutton.c:85
 msgid "Turns volume down or up"
-msgstr ""
+msgstr "صدا را کم یا زیاد می‌کند."
 
-#: gtk/gtkvolumebutton.c:88
+#: ../gtk/gtkvolumebutton.c:88
 msgid "Adjusts the volume"
-msgstr ""
+msgstr "_تنظیم بلندی صدا"
 
-#: gtk/gtkvolumebutton.c:94 gtk/gtkvolumebutton.c:97
+#: ../gtk/gtkvolumebutton.c:94
+#: ../gtk/gtkvolumebutton.c:97
 msgid "Volume Down"
-msgstr ""
+msgstr "کم کردن صدا"
 
-#: gtk/gtkvolumebutton.c:96
+#: ../gtk/gtkvolumebutton.c:96
 msgid "Decreases the volume"
-msgstr ""
+msgstr "کم کردن بلندی صدا"
 
-#: gtk/gtkvolumebutton.c:100 gtk/gtkvolumebutton.c:103
+#: ../gtk/gtkvolumebutton.c:100
+#: ../gtk/gtkvolumebutton.c:103
 msgid "Volume Up"
-msgstr ""
+msgstr "بلند کردن صدا"
 
-#: gtk/gtkvolumebutton.c:102
+#: ../gtk/gtkvolumebutton.c:102
 msgid "Increases the volume"
-msgstr ""
+msgstr "بلند کردن صدا"
 
-#: gtk/gtkvolumebutton.c:160
+#: ../gtk/gtkvolumebutton.c:160
 msgid "Muted"
-msgstr ""
+msgstr "بی‌صدا"
 
-#: gtk/gtkvolumebutton.c:164
+#: ../gtk/gtkvolumebutton.c:164
 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:177
 #, c-format
 msgctxt "volume percentage"
 msgid "%d %%"
-msgstr ""
+msgstr "%Id ٪"
 
-#: gtk/paper_names_offsets.c:4
-#, fuzzy
+#: ../gtk/paper_names_offsets.c:4
 msgctxt "paper size"
 msgid "asme_f"
-msgstr "_نام:"
+msgstr "asme_f"
 
-#: gtk/paper_names_offsets.c:5
+#: ../gtk/paper_names_offsets.c:5
 msgctxt "paper size"
 msgid "A0x2"
-msgstr ""
+msgstr "A0x2"
 
-#: gtk/paper_names_offsets.c:6
+#: ../gtk/paper_names_offsets.c:6
 msgctxt "paper size"
 msgid "A0"
-msgstr ""
+msgstr "A0"
 
-#: gtk/paper_names_offsets.c:7
+#: ../gtk/paper_names_offsets.c:7
 msgctxt "paper size"
 msgid "A0x3"
-msgstr ""
+msgstr "A0x3"
 
-#: gtk/paper_names_offsets.c:8
+#: ../gtk/paper_names_offsets.c:8
 msgctxt "paper size"
 msgid "A1"
-msgstr ""
+msgstr "A1"
 
-#: gtk/paper_names_offsets.c:9
+#: ../gtk/paper_names_offsets.c:9
 msgctxt "paper size"
 msgid "A10"
-msgstr ""
+msgstr "A10"
 
-#: gtk/paper_names_offsets.c:10
+#: ../gtk/paper_names_offsets.c:10
 msgctxt "paper size"
 msgid "A1x3"
-msgstr ""
+msgstr "A1x3"
 
-#: gtk/paper_names_offsets.c:11
+#: ../gtk/paper_names_offsets.c:11
 msgctxt "paper size"
 msgid "A1x4"
-msgstr ""
+msgstr "A1x4"
 
-#: gtk/paper_names_offsets.c:12
+#: ../gtk/paper_names_offsets.c:12
 msgctxt "paper size"
 msgid "A2"
-msgstr ""
+msgstr "A2"
 
-#: gtk/paper_names_offsets.c:13
+#: ../gtk/paper_names_offsets.c:13
 msgctxt "paper size"
 msgid "A2x3"
-msgstr ""
+msgstr "A2x3"
 
-#: gtk/paper_names_offsets.c:14
+#: ../gtk/paper_names_offsets.c:14
 msgctxt "paper size"
 msgid "A2x4"
-msgstr ""
+msgstr "A2x4"
 
-#: gtk/paper_names_offsets.c:15
+#: ../gtk/paper_names_offsets.c:15
 msgctxt "paper size"
 msgid "A2x5"
-msgstr ""
+msgstr "A2x5"
 
-#: gtk/paper_names_offsets.c:16
+#: ../gtk/paper_names_offsets.c:16
 msgctxt "paper size"
 msgid "A3"
-msgstr ""
+msgstr "A3"
 
-#: gtk/paper_names_offsets.c:17
+#: ../gtk/paper_names_offsets.c:17
 msgctxt "paper size"
 msgid "A3 Extra"
-msgstr ""
+msgstr "A3 Extra"
 
-#: gtk/paper_names_offsets.c:18
+#: ../gtk/paper_names_offsets.c:18
 msgctxt "paper size"
 msgid "A3x3"
-msgstr ""
+msgstr "A3x3"
 
-#: gtk/paper_names_offsets.c:19
+#: ../gtk/paper_names_offsets.c:19
 msgctxt "paper size"
 msgid "A3x4"
-msgstr ""
+msgstr "A3x4"
 
-#: gtk/paper_names_offsets.c:20
+#: ../gtk/paper_names_offsets.c:20
 msgctxt "paper size"
 msgid "A3x5"
-msgstr ""
+msgstr "A3x5"
 
-#: gtk/paper_names_offsets.c:21
+#: ../gtk/paper_names_offsets.c:21
 msgctxt "paper size"
 msgid "A3x6"
-msgstr ""
+msgstr "A3x6"
 
-#: gtk/paper_names_offsets.c:22
+#: ../gtk/paper_names_offsets.c:22
 msgctxt "paper size"
 msgid "A3x7"
-msgstr ""
+msgstr "A3x7"
 
-#: gtk/paper_names_offsets.c:23
+#: ../gtk/paper_names_offsets.c:23
 msgctxt "paper size"
 msgid "A4"
-msgstr ""
+msgstr "A4"
 
-#: gtk/paper_names_offsets.c:24
+#: ../gtk/paper_names_offsets.c:24
 msgctxt "paper size"
 msgid "A4 Extra"
-msgstr ""
+msgstr "A4 Extra"
 
-#: gtk/paper_names_offsets.c:25
+#: ../gtk/paper_names_offsets.c:25
 msgctxt "paper size"
 msgid "A4 Tab"
-msgstr ""
+msgstr "A4 Tab"
 
-#: gtk/paper_names_offsets.c:26
+#: ../gtk/paper_names_offsets.c:26
 msgctxt "paper size"
 msgid "A4x3"
-msgstr ""
+msgstr "A4x3"
 
-#: gtk/paper_names_offsets.c:27
+#: ../gtk/paper_names_offsets.c:27
 msgctxt "paper size"
 msgid "A4x4"
-msgstr ""
+msgstr "A4x4"
 
-#: gtk/paper_names_offsets.c:28
+#: ../gtk/paper_names_offsets.c:28
 msgctxt "paper size"
 msgid "A4x5"
-msgstr ""
+msgstr "A4x5"
 
-#: gtk/paper_names_offsets.c:29
+#: ../gtk/paper_names_offsets.c:29
 msgctxt "paper size"
 msgid "A4x6"
-msgstr ""
+msgstr "A4x6"
 
-#: gtk/paper_names_offsets.c:30
+#: ../gtk/paper_names_offsets.c:30
 msgctxt "paper size"
 msgid "A4x7"
-msgstr ""
+msgstr "A4x7"
 
-#: gtk/paper_names_offsets.c:31
+#: ../gtk/paper_names_offsets.c:31
 msgctxt "paper size"
 msgid "A4x8"
-msgstr ""
+msgstr "A4x8"
 
-#: gtk/paper_names_offsets.c:32
+#: ../gtk/paper_names_offsets.c:32
 msgctxt "paper size"
 msgid "A4x9"
-msgstr ""
+msgstr "A4x9"
 
-#: gtk/paper_names_offsets.c:33
+#: ../gtk/paper_names_offsets.c:33
 msgctxt "paper size"
 msgid "A5"
-msgstr ""
+msgstr "A5"
 
-#: gtk/paper_names_offsets.c:34
+#: ../gtk/paper_names_offsets.c:34
 msgctxt "paper size"
 msgid "A5 Extra"
-msgstr ""
+msgstr "A5 Extra"
 
-#: gtk/paper_names_offsets.c:35
+#: ../gtk/paper_names_offsets.c:35
 msgctxt "paper size"
 msgid "A6"
-msgstr ""
+msgstr "A6"
 
-#: gtk/paper_names_offsets.c:36
+#: ../gtk/paper_names_offsets.c:36
 msgctxt "paper size"
 msgid "A7"
-msgstr ""
+msgstr "A7"
 
-#: gtk/paper_names_offsets.c:37
+#: ../gtk/paper_names_offsets.c:37
 msgctxt "paper size"
 msgid "A8"
-msgstr ""
+msgstr "A8"
 
-#: gtk/paper_names_offsets.c:38
+#: ../gtk/paper_names_offsets.c:38
 msgctxt "paper size"
 msgid "A9"
-msgstr ""
+msgstr "A9"
 
-#: gtk/paper_names_offsets.c:39
+#: ../gtk/paper_names_offsets.c:39
 msgctxt "paper size"
 msgid "B0"
-msgstr ""
+msgstr "B0"
 
-#: gtk/paper_names_offsets.c:40
+#: ../gtk/paper_names_offsets.c:40
 msgctxt "paper size"
 msgid "B1"
-msgstr ""
+msgstr "B1"
 
-#: gtk/paper_names_offsets.c:41
+#: ../gtk/paper_names_offsets.c:41
 msgctxt "paper size"
 msgid "B10"
-msgstr ""
+msgstr "B10"
 
-#: gtk/paper_names_offsets.c:42
+#: ../gtk/paper_names_offsets.c:42
 msgctxt "paper size"
 msgid "B2"
-msgstr ""
+msgstr "B2"
 
-#: gtk/paper_names_offsets.c:43
+#: ../gtk/paper_names_offsets.c:43
 msgctxt "paper size"
 msgid "B3"
-msgstr ""
+msgstr "B3"
 
-#: gtk/paper_names_offsets.c:44
+#: ../gtk/paper_names_offsets.c:44
 msgctxt "paper size"
 msgid "B4"
-msgstr ""
+msgstr "B4"
 
-#: gtk/paper_names_offsets.c:45
+#: ../gtk/paper_names_offsets.c:45
 msgctxt "paper size"
 msgid "B5"
-msgstr ""
+msgstr "B5"
 
-#: gtk/paper_names_offsets.c:46
+#: ../gtk/paper_names_offsets.c:46
 msgctxt "paper size"
 msgid "B5 Extra"
-msgstr ""
+msgstr "B5 Extra"
 
-#: gtk/paper_names_offsets.c:47
+#: ../gtk/paper_names_offsets.c:47
 msgctxt "paper size"
 msgid "B6"
-msgstr ""
+msgstr "B6"
 
-#: gtk/paper_names_offsets.c:48
+#: ../gtk/paper_names_offsets.c:48
 msgctxt "paper size"
 msgid "B6/C4"
-msgstr ""
+msgstr "B6/C4"
 
-#: gtk/paper_names_offsets.c:49
+#: ../gtk/paper_names_offsets.c:49
 msgctxt "paper size"
 msgid "B7"
-msgstr ""
+msgstr "B7"
 
-#: gtk/paper_names_offsets.c:50
+#: ../gtk/paper_names_offsets.c:50
 msgctxt "paper size"
 msgid "B8"
-msgstr ""
+msgstr "B8"
 
-#: gtk/paper_names_offsets.c:51
+#: ../gtk/paper_names_offsets.c:51
 msgctxt "paper size"
 msgid "B9"
-msgstr ""
+msgstr "B9"
 
-#: gtk/paper_names_offsets.c:52
+#: ../gtk/paper_names_offsets.c:52
 msgctxt "paper size"
 msgid "C0"
-msgstr ""
+msgstr "C0"
 
-#: gtk/paper_names_offsets.c:53
+#: ../gtk/paper_names_offsets.c:53
 msgctxt "paper size"
 msgid "C1"
-msgstr ""
+msgstr "C1"
 
-#: gtk/paper_names_offsets.c:54
+#: ../gtk/paper_names_offsets.c:54
 msgctxt "paper size"
 msgid "C10"
-msgstr ""
+msgstr "C10"
 
-#: gtk/paper_names_offsets.c:55
+#: ../gtk/paper_names_offsets.c:55
 msgctxt "paper size"
 msgid "C2"
-msgstr ""
+msgstr "C2"
 
-#: gtk/paper_names_offsets.c:56
+#: ../gtk/paper_names_offsets.c:56
 msgctxt "paper size"
 msgid "C3"
-msgstr ""
+msgstr "C3"
 
-#: gtk/paper_names_offsets.c:57
+#: ../gtk/paper_names_offsets.c:57
 msgctxt "paper size"
 msgid "C4"
-msgstr ""
+msgstr "C4"
 
-#: gtk/paper_names_offsets.c:58
+#: ../gtk/paper_names_offsets.c:58
 msgctxt "paper size"
 msgid "C5"
-msgstr ""
+msgstr "C5"
 
-#: gtk/paper_names_offsets.c:59
+#: ../gtk/paper_names_offsets.c:59
 msgctxt "paper size"
 msgid "C6"
-msgstr ""
+msgstr "C6"
 
-#: gtk/paper_names_offsets.c:60
+#: ../gtk/paper_names_offsets.c:60
 msgctxt "paper size"
 msgid "C6/C5"
-msgstr ""
+msgstr "C6/C5"
 
-#: gtk/paper_names_offsets.c:61
+#: ../gtk/paper_names_offsets.c:61
 msgctxt "paper size"
 msgid "C7"
-msgstr ""
+msgstr "C7"
 
-#: gtk/paper_names_offsets.c:62
+#: ../gtk/paper_names_offsets.c:62
 msgctxt "paper size"
 msgid "C7/C6"
-msgstr ""
+msgstr "C7/C6"
 
-#: gtk/paper_names_offsets.c:63
+#: ../gtk/paper_names_offsets.c:63
 msgctxt "paper size"
 msgid "C8"
-msgstr ""
+msgstr "C8"
 
-#: gtk/paper_names_offsets.c:64
+#: ../gtk/paper_names_offsets.c:64
 msgctxt "paper size"
 msgid "C9"
-msgstr ""
+msgstr "C9"
 
-#: gtk/paper_names_offsets.c:65
+#: ../gtk/paper_names_offsets.c:65
 msgctxt "paper size"
 msgid "DL Envelope"
-msgstr ""
+msgstr "پاکت DL"
 
-#: gtk/paper_names_offsets.c:66
+#: ../gtk/paper_names_offsets.c:66
 msgctxt "paper size"
 msgid "RA0"
-msgstr ""
+msgstr "RA0"
 
-#: gtk/paper_names_offsets.c:67
+#: ../gtk/paper_names_offsets.c:67
 msgctxt "paper size"
 msgid "RA1"
-msgstr ""
+msgstr "RA1"
 
-#: gtk/paper_names_offsets.c:68
+#: ../gtk/paper_names_offsets.c:68
 msgctxt "paper size"
 msgid "RA2"
-msgstr ""
+msgstr "RA2"
 
-#: gtk/paper_names_offsets.c:69
+#: ../gtk/paper_names_offsets.c:69
 msgctxt "paper size"
 msgid "SRA0"
-msgstr ""
+msgstr "SRA0"
 
-#: gtk/paper_names_offsets.c:70
+#: ../gtk/paper_names_offsets.c:70
 msgctxt "paper size"
 msgid "SRA1"
-msgstr ""
+msgstr "SRA1"
 
-#: gtk/paper_names_offsets.c:71
+#: ../gtk/paper_names_offsets.c:71
 msgctxt "paper size"
 msgid "SRA2"
-msgstr ""
+msgstr "SRA2"
 
-#: gtk/paper_names_offsets.c:72
+#: ../gtk/paper_names_offsets.c:72
 msgctxt "paper size"
 msgid "JB0"
-msgstr ""
+msgstr "JB0"
 
-#: gtk/paper_names_offsets.c:73
+#: ../gtk/paper_names_offsets.c:73
 msgctxt "paper size"
 msgid "JB1"
-msgstr ""
+msgstr "JB1"
 
-#: gtk/paper_names_offsets.c:74
+#: ../gtk/paper_names_offsets.c:74
 msgctxt "paper size"
 msgid "JB10"
-msgstr ""
+msgstr "JB10"
 
-#: gtk/paper_names_offsets.c:75
+#: ../gtk/paper_names_offsets.c:75
 msgctxt "paper size"
 msgid "JB2"
-msgstr ""
+msgstr "JB2"
 
-#: gtk/paper_names_offsets.c:76
+#: ../gtk/paper_names_offsets.c:76
 msgctxt "paper size"
 msgid "JB3"
-msgstr ""
+msgstr "JB3"
 
-#: gtk/paper_names_offsets.c:77
+#: ../gtk/paper_names_offsets.c:77
 msgctxt "paper size"
 msgid "JB4"
-msgstr ""
+msgstr "JB4"
 
-#: gtk/paper_names_offsets.c:78
+#: ../gtk/paper_names_offsets.c:78
 msgctxt "paper size"
 msgid "JB5"
-msgstr ""
+msgstr "JB5"
 
-#: gtk/paper_names_offsets.c:79
+#: ../gtk/paper_names_offsets.c:79
 msgctxt "paper size"
 msgid "JB6"
-msgstr ""
+msgstr "JB6"
 
-#: gtk/paper_names_offsets.c:80
+#: ../gtk/paper_names_offsets.c:80
 msgctxt "paper size"
 msgid "JB7"
-msgstr ""
+msgstr "JB7"
 
-#: gtk/paper_names_offsets.c:81
+#: ../gtk/paper_names_offsets.c:81
 msgctxt "paper size"
 msgid "JB8"
-msgstr ""
+msgstr "JB8"
 
-#: gtk/paper_names_offsets.c:82
+#: ../gtk/paper_names_offsets.c:82
 msgctxt "paper size"
 msgid "JB9"
-msgstr ""
+msgstr "JB9"
 
-#: gtk/paper_names_offsets.c:83
+#: ../gtk/paper_names_offsets.c:83
 msgctxt "paper size"
 msgid "jis exec"
-msgstr ""
+msgstr "jis exec"
 
-#: gtk/paper_names_offsets.c:84
+#: ../gtk/paper_names_offsets.c:84
 msgctxt "paper size"
 msgid "Choukei 2 Envelope"
-msgstr ""
+msgstr "پاکت Choukei2"
 
-#: gtk/paper_names_offsets.c:85
+#: ../gtk/paper_names_offsets.c:85
 msgctxt "paper size"
 msgid "Choukei 3 Envelope"
-msgstr ""
+msgstr "پاکت Choukei3"
 
-#: gtk/paper_names_offsets.c:86
+#: ../gtk/paper_names_offsets.c:86
 msgctxt "paper size"
 msgid "Choukei 4 Envelope"
-msgstr ""
+msgstr "پاکت Choukei4"
 
-#: gtk/paper_names_offsets.c:87
+#: ../gtk/paper_names_offsets.c:87
 msgctxt "paper size"
 msgid "hagaki (postcard)"
-msgstr ""
+msgstr "hagaki (کارت پستال)"
 
-#: gtk/paper_names_offsets.c:88
+#: ../gtk/paper_names_offsets.c:88
 msgctxt "paper size"
 msgid "kahu Envelope"
-msgstr ""
+msgstr "پاکت kahu"
 
-#: gtk/paper_names_offsets.c:89
+#: ../gtk/paper_names_offsets.c:89
 msgctxt "paper size"
 msgid "kaku2 Envelope"
-msgstr ""
+msgstr "پاکت kahu2"
 
-#: gtk/paper_names_offsets.c:90
+#: ../gtk/paper_names_offsets.c:90
 msgctxt "paper size"
 msgid "oufuku (reply postcard)"
-msgstr ""
+msgstr "oufuku (پاسخ کارت پستال)"
 
-#: gtk/paper_names_offsets.c:91
+#: ../gtk/paper_names_offsets.c:91
 msgctxt "paper size"
 msgid "you4 Envelope"
-msgstr ""
+msgstr "پاکت you4"
 
-#: gtk/paper_names_offsets.c:92
+#: ../gtk/paper_names_offsets.c:92
 msgctxt "paper size"
 msgid "10x11"
-msgstr ""
+msgstr "10x11"
 
-#: gtk/paper_names_offsets.c:93
+#: ../gtk/paper_names_offsets.c:93
 msgctxt "paper size"
 msgid "10x13"
-msgstr ""
+msgstr "10x13"
 
-#: gtk/paper_names_offsets.c:94
+#: ../gtk/paper_names_offsets.c:94
 msgctxt "paper size"
 msgid "10x14"
-msgstr ""
+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 ""
+msgstr "10x15"
 
-#: gtk/paper_names_offsets.c:97
+#: ../gtk/paper_names_offsets.c:97
 msgctxt "paper size"
 msgid "11x12"
-msgstr ""
+msgstr "11x12"
 
-#: gtk/paper_names_offsets.c:98
+#: ../gtk/paper_names_offsets.c:98
 msgctxt "paper size"
 msgid "11x15"
-msgstr ""
+msgstr "11x15"
 
-#: gtk/paper_names_offsets.c:99
+#: ../gtk/paper_names_offsets.c:99
 msgctxt "paper size"
 msgid "12x19"
-msgstr ""
+msgstr "12x19"
 
-#: gtk/paper_names_offsets.c:100
+#: ../gtk/paper_names_offsets.c:100
 msgctxt "paper size"
 msgid "5x7"
-msgstr ""
+msgstr "5x7"
 
-#: gtk/paper_names_offsets.c:101
+#: ../gtk/paper_names_offsets.c:101
 msgctxt "paper size"
 msgid "6x9 Envelope"
-msgstr ""
+msgstr "پاکت ۹×۶"
 
-#: gtk/paper_names_offsets.c:102
+#: ../gtk/paper_names_offsets.c:102
 msgctxt "paper size"
 msgid "7x9 Envelope"
-msgstr ""
+msgstr "پاکت ۹×۷"
 
-#: gtk/paper_names_offsets.c:103
+#: ../gtk/paper_names_offsets.c:103
 msgctxt "paper size"
 msgid "9x11 Envelope"
-msgstr ""
+msgstr "پاکت ۱۱×۹"
 
-#: gtk/paper_names_offsets.c:104
+#: ../gtk/paper_names_offsets.c:104
 msgctxt "paper size"
 msgid "a2 Envelope"
-msgstr ""
+msgstr "پاکت a2"
 
-#: gtk/paper_names_offsets.c:105
+#: ../gtk/paper_names_offsets.c:105
 msgctxt "paper size"
 msgid "Arch A"
-msgstr ""
+msgstr "Arch A"
 
-#: gtk/paper_names_offsets.c:106
+#: ../gtk/paper_names_offsets.c:106
 msgctxt "paper size"
 msgid "Arch B"
-msgstr ""
+msgstr "Arch B"
 
-#: gtk/paper_names_offsets.c:107
+#: ../gtk/paper_names_offsets.c:107
 msgctxt "paper size"
 msgid "Arch C"
-msgstr ""
+msgstr "Arch C"
 
-#: gtk/paper_names_offsets.c:108
+#: ../gtk/paper_names_offsets.c:108
 msgctxt "paper size"
 msgid "Arch D"
-msgstr ""
+msgstr "Arch D"
 
-#: gtk/paper_names_offsets.c:109
+#: ../gtk/paper_names_offsets.c:109
 msgctxt "paper size"
 msgid "Arch E"
-msgstr ""
+msgstr "Arch E"
 
-#: gtk/paper_names_offsets.c:110
+#: ../gtk/paper_names_offsets.c:110
 msgctxt "paper size"
 msgid "b-plus"
-msgstr ""
+msgstr "b-plus"
 
-#: gtk/paper_names_offsets.c:111
+#: ../gtk/paper_names_offsets.c:111
 msgctxt "paper size"
 msgid "c"
-msgstr ""
+msgstr "c"
 
-#: gtk/paper_names_offsets.c:112
+#: ../gtk/paper_names_offsets.c:112
 msgctxt "paper size"
 msgid "c5 Envelope"
-msgstr ""
+msgstr "پاکت C5"
 
-#: gtk/paper_names_offsets.c:113
+#: ../gtk/paper_names_offsets.c:113
 msgctxt "paper size"
 msgid "d"
-msgstr ""
+msgstr "d"
 
-#: gtk/paper_names_offsets.c:114
+#: ../gtk/paper_names_offsets.c:114
 msgctxt "paper size"
 msgid "e"
-msgstr ""
+msgstr "e"
 
-#: gtk/paper_names_offsets.c:115
+#: ../gtk/paper_names_offsets.c:115
 msgctxt "paper size"
 msgid "edp"
-msgstr ""
+msgstr "edp"
 
-#: gtk/paper_names_offsets.c:116
+#: ../gtk/paper_names_offsets.c:116
 msgctxt "paper size"
 msgid "European edp"
-msgstr ""
+msgstr "edp اروپایی"
 
-#: gtk/paper_names_offsets.c:117
-#, fuzzy
+#: ../gtk/paper_names_offsets.c:117
 msgctxt "paper size"
 msgid "Executive"
-msgstr "ا_جرا"
+msgstr "اجرایی"
 
-#: gtk/paper_names_offsets.c:118
+#: ../gtk/paper_names_offsets.c:118
 msgctxt "paper size"
 msgid "f"
-msgstr ""
+msgstr "f"
 
-#: gtk/paper_names_offsets.c:119
+#: ../gtk/paper_names_offsets.c:119
 msgctxt "paper size"
 msgid "FanFold European"
-msgstr ""
+msgstr "FanFold اروپایی"
 
-#: gtk/paper_names_offsets.c:120
+#: ../gtk/paper_names_offsets.c:120
 msgctxt "paper size"
 msgid "FanFold US"
-msgstr ""
+msgstr "FanFold ایالات متحده"
 
-#: gtk/paper_names_offsets.c:121
+#: ../gtk/paper_names_offsets.c:121
 msgctxt "paper size"
 msgid "FanFold German Legal"
-msgstr ""
+msgstr "FanFold قانونی آلمان"
 
-#: gtk/paper_names_offsets.c:122
+#: ../gtk/paper_names_offsets.c:122
 msgctxt "paper size"
 msgid "Government Legal"
-msgstr ""
+msgstr "قانونی دولتی"
 
-#: gtk/paper_names_offsets.c:123
+#: ../gtk/paper_names_offsets.c:123
 msgctxt "paper size"
 msgid "Government Letter"
-msgstr ""
+msgstr "نامهٔ دولتی"
 
-#: gtk/paper_names_offsets.c:124
-#, fuzzy
+#: ../gtk/paper_names_offsets.c:124
 msgctxt "paper size"
 msgid "Index 3x5"
-msgstr "_نمایه"
+msgstr "نمایهٔ ۵×۳"
 
-#: gtk/paper_names_offsets.c:125
+#: ../gtk/paper_names_offsets.c:125
 msgctxt "paper size"
 msgid "Index 4x6 (postcard)"
-msgstr ""
+msgstr "نمایه 4x6 (کارت‌پستال)"
 
-#: gtk/paper_names_offsets.c:126
-#, fuzzy
+#: ../gtk/paper_names_offsets.c:126
 msgctxt "paper size"
 msgid "Index 4x6 ext"
-msgstr "_نمایه"
+msgstr "نمایه ۶×۴ خارجی"
 
-#: gtk/paper_names_offsets.c:127
-#, fuzzy
+#: ../gtk/paper_names_offsets.c:127
 msgctxt "paper size"
 msgid "Index 5x8"
-msgstr "_نمایه"
+msgstr "نمایهٔ ۸×۵"
 
-#: 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 ""
+msgstr "قانونی ایالات متحده"
 
-#: gtk/paper_names_offsets.c:131
+#: ../gtk/paper_names_offsets.c:131
 msgctxt "paper size"
 msgid "US Legal Extra"
-msgstr ""
+msgstr "قانونی ایالات متحده ویژه"
 
-#: gtk/paper_names_offsets.c:132
+#: ../gtk/paper_names_offsets.c:132
 msgctxt "paper size"
 msgid "US Letter"
-msgstr ""
+msgstr "نامه‌ای ایالات متحده"
 
-#: gtk/paper_names_offsets.c:133
+#: ../gtk/paper_names_offsets.c:133
 msgctxt "paper size"
 msgid "US Letter Extra"
-msgstr ""
+msgstr "نامهٔ ایالات متحده ویژه"
 
-#: gtk/paper_names_offsets.c:134
+#: ../gtk/paper_names_offsets.c:134
 msgctxt "paper size"
 msgid "US Letter Plus"
-msgstr ""
+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 ""
+msgstr "پاکت ش۱۰"
 
-#: gtk/paper_names_offsets.c:137
+#: ../gtk/paper_names_offsets.c:137
 msgctxt "paper size"
 msgid "#11 Envelope"
-msgstr ""
+msgstr "پاکت ش۱۱"
 
-#: gtk/paper_names_offsets.c:138
+#: ../gtk/paper_names_offsets.c:138
 msgctxt "paper size"
 msgid "#12 Envelope"
-msgstr ""
+msgstr "پاکت ش۱۲"
 
-#: gtk/paper_names_offsets.c:139
+#: ../gtk/paper_names_offsets.c:139
 msgctxt "paper size"
 msgid "#14 Envelope"
-msgstr ""
+msgstr "پاکت ش۱۴"
 
-#: gtk/paper_names_offsets.c:140
+#: ../gtk/paper_names_offsets.c:140
 msgctxt "paper size"
 msgid "#9 Envelope"
-msgstr ""
+msgstr "پاکت ش۹"
 
-#: gtk/paper_names_offsets.c:141
+#: ../gtk/paper_names_offsets.c:141
 msgctxt "paper size"
 msgid "Personal Envelope"
-msgstr ""
+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 "Super A"
 
-#: gtk/paper_names_offsets.c:144
+#: ../gtk/paper_names_offsets.c:144
 msgctxt "paper size"
 msgid "Super B"
-msgstr ""
+msgstr "Super B"
 
-#: 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 "Dai-pa-kai"
 
-#: gtk/paper_names_offsets.c:147
-#, fuzzy
+#: ../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 "Folio sp"
 
-#: gtk/paper_names_offsets.c:149
+#: ../gtk/paper_names_offsets.c:149
 msgctxt "paper size"
 msgid "Invite Envelope"
-msgstr ""
+msgstr "پاکت دعوت"
 
-#: gtk/paper_names_offsets.c:150
+#: ../gtk/paper_names_offsets.c:150
 msgctxt "paper size"
 msgid "Italian Envelope"
-msgstr ""
+msgstr "پاکت ایتالیایی"
 
-#: gtk/paper_names_offsets.c:151
+#: ../gtk/paper_names_offsets.c:151
 msgctxt "paper size"
 msgid "juuro-ku-kai"
-msgstr ""
+msgstr "juuro-ku-kai"
 
-#: gtk/paper_names_offsets.c:152
+#: ../gtk/paper_names_offsets.c:152
 msgctxt "paper size"
 msgid "pa-kai"
-msgstr ""
+msgstr "pa-kai"
 
-#: gtk/paper_names_offsets.c:153
+#: ../gtk/paper_names_offsets.c:153
 msgctxt "paper size"
 msgid "Postfix Envelope"
-msgstr ""
+msgstr "پاکت Postfix"
 
-#: 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 ""
+msgstr "پاکت prc1"
 
-#: gtk/paper_names_offsets.c:156
+#: ../gtk/paper_names_offsets.c:156
 msgctxt "paper size"
 msgid "prc10 Envelope"
-msgstr ""
+msgstr "پاکت prc10"
 
-#: gtk/paper_names_offsets.c:157
+#: ../gtk/paper_names_offsets.c:157
 msgctxt "paper size"
 msgid "prc 16k"
-msgstr ""
+msgstr "prc 16k"
 
-#: gtk/paper_names_offsets.c:158
+#: ../gtk/paper_names_offsets.c:158
 msgctxt "paper size"
 msgid "prc2 Envelope"
-msgstr ""
+msgstr "پاکت prc2"
 
-#: gtk/paper_names_offsets.c:159
+#: ../gtk/paper_names_offsets.c:159
 msgctxt "paper size"
 msgid "prc3 Envelope"
-msgstr ""
+msgstr "پاکت prc3"
 
-#: gtk/paper_names_offsets.c:160
+#: ../gtk/paper_names_offsets.c:160
 msgctxt "paper size"
 msgid "prc 32k"
-msgstr ""
+msgstr "prc 32k"
 
-#: gtk/paper_names_offsets.c:161
+#: ../gtk/paper_names_offsets.c:161
 msgctxt "paper size"
 msgid "prc4 Envelope"
-msgstr ""
+msgstr "پاکت prc4"
 
-#: gtk/paper_names_offsets.c:162
+#: ../gtk/paper_names_offsets.c:162
 msgctxt "paper size"
 msgid "prc5 Envelope"
-msgstr ""
+msgstr "پاکت prc5"
 
-#: gtk/paper_names_offsets.c:163
+#: ../gtk/paper_names_offsets.c:163
 msgctxt "paper size"
 msgid "prc6 Envelope"
-msgstr ""
+msgstr "پاکت prc6"
 
-#: gtk/paper_names_offsets.c:164
+#: ../gtk/paper_names_offsets.c:164
 msgctxt "paper size"
 msgid "prc7 Envelope"
-msgstr ""
+msgstr "پاکت prc7"
 
-#: gtk/paper_names_offsets.c:165
+#: ../gtk/paper_names_offsets.c:165
 msgctxt "paper size"
 msgid "prc8 Envelope"
-msgstr ""
+msgstr "پاکت prc8"
 
-#: gtk/paper_names_offsets.c:166
+#: ../gtk/paper_names_offsets.c:166
 msgctxt "paper size"
 msgid "prc9 Envelope"
-msgstr ""
+msgstr "پاکت prc9"
 
-#: gtk/paper_names_offsets.c:167
+#: ../gtk/paper_names_offsets.c:167
 msgctxt "paper size"
 msgid "ROC 16k"
-msgstr ""
+msgstr "ROC 16k"
 
-#: gtk/paper_names_offsets.c:168
+#: ../gtk/paper_names_offsets.c:168
 msgctxt "paper size"
 msgid "ROC 8k"
-msgstr ""
+msgstr "ROC 8k"
 
-#: gtk/updateiconcache.c:492 gtk/updateiconcache.c:552
+#: ../gtk/updateiconcache.c:492
+#: ../gtk/updateiconcache.c:552
 #, c-format
 msgid "different idatas found for symlinked '%s' and '%s'\n"
-msgstr ""
+msgstr "برای پیوند نمادی «%s» و «%s» مشخصهٔ idatas متفاتی پیدا شد\n"
 
-#: gtk/updateiconcache.c:1374
-#, fuzzy, c-format
+#: ../gtk/updateiconcache.c:1374
+#, c-format
 msgid "Failed to write header\n"
-msgstr "باز کردن پرونده‌ی TIFF شکست خورد"
+msgstr "نوشتن سرآیند خراب شد\n"
 
-#: gtk/updateiconcache.c:1380
-#, fuzzy, c-format
+#: ../gtk/updateiconcache.c:1380
+#, c-format
 msgid "Failed to write hash table\n"
-msgstr "باز کردن پرونده‌ی TIFF شکست خورد"
+msgstr "نوشتن جدول درهم خراب شد \n"
 
-#: gtk/updateiconcache.c:1386
-#, fuzzy, c-format
+#: ../gtk/updateiconcache.c:1386
+#, c-format
 msgid "Failed to write folder index\n"
-msgstr "خواندن از پرونده‌ی موقت شکست خورد"
+msgstr "نوشتن نمایهٔ پوشه خراب شد\n"
 
-#: gtk/updateiconcache.c:1394
-#, fuzzy, c-format
+#: ../gtk/updateiconcache.c:1394
+#, c-format
 msgid "Failed to rewrite header\n"
-msgstr "باز کردن پرونده‌ی TIFF شکست خورد"
+msgstr "بازنویسی سرآیند خراب شد\n"
 
-#: gtk/updateiconcache.c:1463
-#, fuzzy, c-format
+#: ../gtk/updateiconcache.c:1488
+#, c-format
 msgid "Failed to open file %s : %s\n"
-msgstr "باز کردن پرونده‌ی «%s» شکست خورد: %s"
+msgstr "باز کردن پروندهٔ%s : %s خراب شد\n"
 
-#: gtk/updateiconcache.c:1471
-#, fuzzy, c-format
+#: ../gtk/updateiconcache.c:1496
+#: ../gtk/updateiconcache.c:1526
+#, c-format
 msgid "Failed to write cache file: %s\n"
-msgstr "باز کردن پرونده‌ی «%s» شکست خورد: %s"
+msgstr "نوشتن پروندهٔ نهان‌گاه «‎%s» خراب شد\n"
 
-#: gtk/updateiconcache.c:1507
+#: ../gtk/updateiconcache.c:1537
 #, c-format
 msgid "The generated cache was invalid.\n"
-msgstr ""
+msgstr "نهان‌گاه تولید شده نامعتبر بود\n"
 
-#: gtk/updateiconcache.c:1521
+#: ../gtk/updateiconcache.c:1551
 #, c-format
 msgid "Could not rename %s to %s: %s, removing %s then.\n"
-msgstr ""
+msgstr "تغییر نما %s به %s ممکن نبود:  %s، پس %s پاک می‌شود.\n"
 
-#: gtk/updateiconcache.c:1535
-#, fuzzy, c-format
+#: ../gtk/updateiconcache.c:1565
+#, c-format
 msgid "Could not rename %s to %s: %s\n"
-msgstr "خطا در ایجاد شاخه‌ی «%s»: %s"
+msgstr "تغییر نام «%s» به %s ممکن نبود: %s \n"
 
-#: gtk/updateiconcache.c:1545
-#, fuzzy, c-format
+#: ../gtk/updateiconcache.c:1575
+#, c-format
 msgid "Could not rename %s back to %s: %s.\n"
-msgstr "خطا در ایجاد شاخه‌ی «%s»: %s"
+msgstr "برگشت تغییر نام پوشهٔ %s به %s ممکن نبود: %s \n"
 
-#: gtk/updateiconcache.c:1572
+#: ../gtk/updateiconcache.c:1602
 #, c-format
 msgid "Cache file created successfully.\n"
-msgstr ""
+msgstr "پروندهٔ نهان‌گاه با موفقیت ایجاد شد.\n"
 
-#: gtk/updateiconcache.c:1611
+#: ../gtk/updateiconcache.c:1641
 msgid "Overwrite an existing cache, even if up to date"
-msgstr ""
+msgstr "جای‌نوشتن یک نهان‌گاه موجود، حتی اگر به‌روز باشد"
 
-#: gtk/updateiconcache.c:1612
+#: ../gtk/updateiconcache.c:1642
 msgid "Don't check for the existence of index.theme"
-msgstr ""
+msgstr "وجود index.theme بررسی نشود"
 
-#: gtk/updateiconcache.c:1613
+#: ../gtk/updateiconcache.c:1643
 msgid "Don't include image data in the cache"
-msgstr ""
+msgstr "نهان‌گاه داده‌های تصویر را شامل نشود"
 
-#: gtk/updateiconcache.c:1614
+#: ../gtk/updateiconcache.c:1644
 msgid "Output a C header file"
-msgstr ""
+msgstr "خروج یک سر‌آیند C"
 
-#: gtk/updateiconcache.c:1615
+#: ../gtk/updateiconcache.c:1645
 msgid "Turn off verbose output"
-msgstr ""
+msgstr "خروجی پرحرف را خاموش کن"
 
-#: gtk/updateiconcache.c:1616
+#: ../gtk/updateiconcache.c:1646
 msgid "Validate existing icon cache"
-msgstr ""
+msgstr "نهان‌گاه نشان موجود اعتبارسنجی شود"
 
-#: gtk/updateiconcache.c:1683
-#, fuzzy, c-format
+#: ../gtk/updateiconcache.c:1713
+#, c-format
 msgid "File not found: %s\n"
-msgstr "نمی‌توان %s را سوار کرد"
+msgstr "پرونده پیدا نشد (%s) \n"
 
-#: gtk/updateiconcache.c:1689
+#: ../gtk/updateiconcache.c:1719
 #, c-format
 msgid "Not a valid icon cache: %s\n"
-msgstr ""
+msgstr "این یک نهان‌گاه نشان معتبر نیست: %s\n"
 
-#: gtk/updateiconcache.c:1702
+#: ../gtk/updateiconcache.c:1732
 #, c-format
 msgid "No theme index file.\n"
-msgstr ""
+msgstr "پروندهٔ نمایهٔ چهره‌ای نیست.\n"
 
-#: gtk/updateiconcache.c:1706
+#: ../gtk/updateiconcache.c:1736
 #, 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"
 
 #. 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 "الفبای فونتیک بین‌المللی"
 
 #. ID
-#: modules/input/immultipress.c:31
+#: ../modules/input/immultipress.c:31
 msgid "Multipress"
-msgstr ""
+msgstr "چند فشاره"
 
 #. ID
-#: modules/input/imthai.c:35
+#: ../modules/input/imthai.c:35
 msgid "Thai-Lao"
-msgstr ""
+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 "شیوه‌ی ورودی X"
+msgstr "شیوهٔ ورودی X"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:811
-#: modules/printbackends/cups/gtkprintbackendcups.c:1020
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:810
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1020
 msgid "Username:"
-msgstr "_تغییر نام"
+msgstr "نام کاربری:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:812
-#: modules/printbackends/cups/gtkprintbackendcups.c:1029
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:811
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1029
 msgid "Password:"
-msgstr "فشار"
-
-#: modules/printbackends/cups/gtkprintbackendcups.c:850
-#, c-format
-msgid "Authentication is required to get a file from %s"
-msgstr ""
+msgstr "گذرواژه:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:854
-#: modules/printbackends/cups/gtkprintbackendcups.c:1042
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:850
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1042
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
-msgstr ""
+msgstr "احراز هویت برای چاپ سند '%s' برروی چاپگر  %s لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:856
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:852
 #, c-format
 msgid "Authentication is required to print a document on %s"
-msgstr ""
+msgstr "احراز هویت برای چاپ یک سند روی %s لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:860
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:856
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
-msgstr ""
+msgstr "احراز هویت برای گرفتن خصیصه‌های کار '%s' لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:862
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:858
 msgid "Authentication is required to get attributes of a job"
-msgstr ""
+msgstr "احراز هویت برای گرفتن خصیصه‌های کار لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:866
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:862
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
-msgstr ""
+msgstr "احراز هویت برای گرفتن خصیصه‌های چاپگر %s لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:868
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:864
 msgid "Authentication is required to get attributes of a printer"
-msgstr ""
+msgstr "احراز هویت برای خصیصه‌های چاپگر لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:871
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:867
 #, c-format
 msgid "Authentication is required to get default printer of %s"
-msgstr ""
+msgstr "احراز هویت برای گرفتن چاپگر پیش‌فرض %s لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:874
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:870
 #, c-format
 msgid "Authentication is required to get printers from %s"
-msgstr ""
+msgstr "احراز هویت برای گرفتن چاپگر‌ها از %s لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:877
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:875
+#, c-format
+msgid "Authentication is required to get a file from %s"
+msgstr "احراز هویت برای گرفتن یک پرونده از %s لازم است."
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:877
 #, c-format
 msgid "Authentication is required on %s"
-msgstr ""
+msgstr "احراز هویت برروی %s لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1014
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1014
 msgid "Domain:"
-msgstr "_مکان:"
+msgstr "دامنه:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1044
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1044
 #, c-format
 msgid "Authentication is required to print document '%s'"
-msgstr ""
+msgstr "احراز هویت برای چاپ سند‌ «%s» لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1049
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1049
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
-msgstr ""
+msgstr "احراز هویت برای چاپ این سند برروی چاپگر %s لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1051
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1051
 msgid "Authentication is required to print this document"
-msgstr ""
+msgstr "احراز هویت برای چاپ این سند لازم است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1672
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1672
 #, c-format
 msgid "Printer '%s' is low on toner."
-msgstr ""
+msgstr "چاپگر «%s» جوهر کم دارد."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1673
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1673
 #, c-format
 msgid "Printer '%s' has no toner left."
-msgstr ""
+msgstr "چاپگر «%s» هیچی جوهر ندارد."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1675
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1675
 #, c-format
 msgid "Printer '%s' is low on developer."
-msgstr ""
+msgstr "چاپگر «%s» فرابر(developer) کم دارد."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1677
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1677
 #, c-format
 msgid "Printer '%s' is out of developer."
-msgstr ""
+msgstr "چاپگر «%s» هیچی فرابر(developer) ندارد."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1679
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1679
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
-msgstr ""
+msgstr "چاپگر «%s» دست‌کم یک منبع نشانگر کم دارد."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1681
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1681
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
-msgstr ""
+msgstr "چاپگر «%s»  دست کم از یک منبع نشانگر هیچی ندارد."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1682
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1682
 #, c-format
 msgid "The cover is open on printer '%s'."
-msgstr ""
+msgstr "روکش روی چاپگر «%s» باز است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1683
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1683
 #, c-format
 msgid "The door is open on printer '%s'."
-msgstr ""
+msgstr "در روی چاپگر «%s» باز است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1684
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1684
 #, c-format
 msgid "Printer '%s' is low on paper."
-msgstr ""
+msgstr "چاپگر «%s» کاغذ کم دارد."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1685
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1685
 #, c-format
 msgid "Printer '%s' is out of paper."
-msgstr ""
+msgstr "چاپگر «%s» هیچی کاغذ ندارد."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1686
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1686
 #, c-format
 msgid "Printer '%s' is currently offline."
-msgstr ""
+msgstr "چاپگر «%s» هم‌اکنون برون‌خط است."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1687
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1687
 #, c-format
 msgid "There is a problem on printer '%s'."
-msgstr ""
+msgstr "چاپگر «%s» مشکلی دارد."
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:1995
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1995
 msgid "Paused ; Rejecting Jobs"
-msgstr ""
+msgstr "مکث؛ در حال رد کردن کار‌ها"
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2001
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2001
 msgid "Rejecting Jobs"
-msgstr ""
+msgstr "در حال رد کردن کار‌ها"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2777
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2777
 msgid "Two Sided"
-msgstr ""
+msgstr "دو رو"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2778
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2778
 msgid "Paper Type"
-msgstr ""
+msgstr "نوع کاغذ:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2779
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2779
 msgid "Paper Source"
-msgstr ""
+msgstr "منبع کاغذ"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2780
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2780
 msgid "Output Tray"
-msgstr ""
+msgstr "_خروجی کاغذ:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2781
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2781
 msgid "Resolution"
-msgstr "سؤال"
+msgstr "_دقت"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2782
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2782
 msgid "GhostScript pre-filtering"
-msgstr ""
+msgstr "پیش‌پالایش GhostScript"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2791
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2791
 msgid "One Sided"
-msgstr ""
+msgstr "یک رو"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2793
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2793
 msgid "Long Edge (Standard)"
-msgstr ""
+msgstr "لبه بلند (استاندارد)"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2795
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2795
 msgid "Short Edge (Flip)"
-msgstr ""
+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
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2797
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2799
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2807
 msgid "Auto Select"
-msgstr "انتخاب قلم"
+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
-#, fuzzy
+#: ../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:3305
 msgid "Printer Default"
-msgstr "پیش‌فرض"
+msgstr "پیش‌فرض چاپگر"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2811
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2811
 msgid "Embed GhostScript fonts only"
-msgstr ""
+msgstr "تنها قلم‌های GhostScript نهفته شوند"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2813
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2813
 msgid "Convert to PS level 1"
-msgstr ""
+msgstr "تبدیل به سطح ۱ از PS"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2815
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2815
 msgid "Convert to PS level 2"
-msgstr ""
+msgstr "تبدیل به سطح ۲ از PS"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2817
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2817
 msgid "No pre-filtering"
-msgstr "سرصفحه‌ی XPM یافت نشد"
+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:2826
 msgid "Miscellaneous"
-msgstr ""
+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:3529
 msgid "Urgent"
-msgstr ""
+msgstr "فوری"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3529
 msgid "High"
-msgstr ""
+msgstr "بالا"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3529
 msgid "Medium"
-msgstr ""
+msgstr "متوسط"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3529
 msgid "Low"
-msgstr ""
+msgstr "پایین"
 
 #. Cups specific, non-ppd related settings
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3527
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3553
 msgid "Pages per Sheet"
-msgstr "ارتفاع تصویر صفر است"
+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:3590
 msgid "Job Priority"
-msgstr ""
+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:3601
 msgid "Billing Info"
-msgstr ""
+msgstr "اطلاعات صورتحساب"
 
 # farmaan
 #. Translators, these strings are names for various 'standard' cover
 #. * pages that the printing system may support.
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "None"
-msgstr "(هیچ‌کدام)"
+msgstr "هیچ‌کدام"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Classified"
-msgstr ""
+msgstr "طبقه‌بندی شده"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Confidential"
-msgstr ""
+msgstr "محرمانه"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Secret"
-msgstr "صفحه‌نمایش"
+msgstr "سری"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Standard"
-msgstr ""
+msgstr "استاندارد"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Top Secret"
-msgstr ""
+msgstr "فوق سری"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Unclassified"
-msgstr ""
+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:3651
 msgid "Before"
-msgstr ""
+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:3666
 msgid "After"
-msgstr ""
+msgstr "پس از"
 
 #. Translators: this is the name of the option that controls when
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #.
-#: modules/printbackends/cups/gtkprintbackendcups.c:3660
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3686
 msgid "Print at"
-msgstr "_چاپ"
+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
-#, fuzzy
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3697
 msgid "Print at time"
-msgstr "_چاپ"
+msgstr "چاپ در زمان مشخص"
 
 #. Translators: this format is used to display a custom paper
 #. * 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:3732
 #, c-format
 msgid "Custom %sx%s"
-msgstr ""
+msgstr "سفارشی %sx%s"
 
 #. 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 ""
+msgstr "خروجی. %s"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:493
-#, fuzzy
+#: ../modules/printbackends/file/gtkprintbackendfile.c:501
 msgid "Print to File"
-msgstr "_چاپ"
+msgstr "چاپ در _پرونده"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:578
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
-#, fuzzy
+#: ../modules/printbackends/file/gtkprintbackendfile.c:578
 msgid "Postscript"
-msgstr "_چاپ"
+msgstr "پست‌اسکریپت"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:578
 msgid "SVG"
-msgstr ""
+msgstr "SVG"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:582
-#: modules/printbackends/test/gtkprintbackendtest.c:503
+#: ../modules/printbackends/file/gtkprintbackendfile.c:590
+#: ../modules/printbackends/test/gtkprintbackendtest.c:503
 msgid "Pages per _sheet:"
-msgstr ""
+msgstr "تعداد صفحات در _برگه:"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:641
-#, fuzzy
+#: ../modules/printbackends/file/gtkprintbackendfile.c:649
 msgid "File"
-msgstr "پرونده‌ها"
+msgstr "پرونده"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:651
+#: ../modules/printbackends/file/gtkprintbackendfile.c:659
 msgid "_Output format"
-msgstr ""
+msgstr "_قالب خروجی"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:395
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:395
 msgid "Print to LPR"
-msgstr ""
+msgstr "چاپ بر LPR"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:421
-#, fuzzy
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:421
 msgid "Pages Per Sheet"
-msgstr "ارتفاع تصویر صفر است"
+msgstr "تعداد صفحات در برگه"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:428
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:428
 msgid "Command Line"
-msgstr ""
+msgstr "خط فرمان"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:811
-#, fuzzy
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:811
 msgid "printer offline"
-msgstr "سرصفحه‌ی XPM یافت نشد"
+msgstr "چاپگر برون‌خط"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:829
-#, fuzzy
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:829
 msgid "ready to print"
-msgstr "اخطار"
+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
-#, fuzzy
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:836
 msgid "paused"
-msgstr "_چسباندن"
+msgstr "مکث‌کرده"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:839
-#, fuzzy
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:839
 msgid "unknown"
-msgstr "(نامعلوم)"
+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 ""
+msgstr "آزمایش خروجی.%s"
 
-#: modules/printbackends/test/gtkprintbackendtest.c:467
-#, fuzzy
+#: ../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» شکست خورد: دلیل آن معلوم نیست، احتمالاً پرونده‌ی تصویری "
-"خراب است"
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "بار کردن تصویر «%s» شکست خورد: دلیل آن معلوم نیست، احتمالاً پروندهٔ تصویری خراب است"
 
 #~ msgid "Gdk debugging flags to set"
 #~ msgstr "پرچم‌های اشکال‌زدایی Gdk که باید یک شوند"
-
 #~ msgid "Gdk debugging flags to unset"
 #~ msgstr "پرچم‌های اشکال‌زدایی Gdk که باید صفر شوند"
-
+#~ msgid "Error creating folder '%s': %s"
+#~ msgstr "خطا هنگام ایجاد پوشه «%s» : %s"
 #~ msgid "Image file '%s' contains no data"
-#~ msgstr "پرونده‌ی تصویری «%s» هیچ داده‌ای ندارد"
-
+#~ msgstr "پروندهٔ تصویری «%s» هیچ داده‌ای ندارد"
 #~ msgid ""
 #~ "Failed to load animation '%s': reason not known, probably a corrupt "
 #~ "animation file"
 #~ msgstr ""
-#~ "بار کردن پویانمایی «%s» شکست خورد: دلیل آن معلوم نیست، احتمالاً پرونده‌ی "
+#~ "بار کردن پویانمایی «%s» شکست خورد: دلیل آن معلوم نیست، احتمالاً پروندهٔ "
 #~ "پویانمایی خراب است"
-
 #~ msgid "Unable to load image-loading module: %s: %s"
-#~ msgstr "نمی‌توان پیمانه‌ی تصویربارکن را بار کرد: %s: %s"
-
+#~ msgstr "نمی‌توان پیمانهٔ تصویربارکن را بار کرد: %s: %s"
 #~ msgid ""
 #~ "Image-loading module %s does not export the proper interface; perhaps "
 #~ "it's from a different GTK version?"
 #~ msgstr ""
-#~ "پیمانه‌ی بار کردن پرونده %s رابط مناسب را صادر نمی‌کند؛ شاید از نسخه‌ی دیگری "
+#~ "پیمانهٔ بار کردن پرونده %s رابط مناسب را صادر نمی‌کند؛ شاید از نسخهٔ دیگری "
 #~ "از GTK است؟"
-
 #~ msgid "Image type '%s' is not supported"
 #~ msgstr "تصویر نوع «%s» پشتیبانی نمی‌شود"
-
 #~ msgid "Couldn't recognize the image file format for file '%s'"
-#~ msgstr "قالب پرونده‌ی تصویر برای پرونده‌ی «%s» تشخیص داده نشد"
-
+#~ msgstr "قالب پروندهٔ تصویر برای پروندهٔ «%s» تشخیص داده نشد"
 #~ msgid "Unrecognized image file format"
-#~ msgstr "قالب پرونده‌ی تصویری ناشناخته"
-
+#~ msgstr "قالب پروندهٔ تصویری ناشناخته"
 #~ msgid "Failed to load image '%s': %s"
 #~ msgstr "بار کردن تصویر «%s» شکست خورد: %s"
-
 #~ msgid "Error writing to image file: %s"
-#~ msgstr "خطا در نوشتن در پرونده‌ی تصویر: %s"
-
+#~ msgstr "خطا در نوشتن در پروندهٔ تصویر: %s"
 #~ msgid ""
 #~ "This build of gdk-pixbuf does not support saving the image format: %s"
-#~ msgstr "این ساخت gdk-pixbuf از ذخیره‌ی این قالب تصویری پشتیبانی نمی‌کند: %s"
-
+#~ msgstr "این ساخت gdk-pixbuf از ذخیرهٔ این قالب تصویری پشتیبانی نمی‌کند: %s"
 #~ msgid "Failed to open temporary file"
-#~ msgstr "باز کردن پرونده‌ی موقت شکست خورد"
-
+#~ msgstr "باز کردن پروندهٔ موقت شکست خورد"
 #~ msgid "Failed to read from temporary file"
-#~ msgstr "خواندن از پرونده‌ی موقت شکست خورد"
-
+#~ msgstr "خواندن از پروندهٔ موقت شکست خورد"
 #~ msgid "Failed to open '%s' for writing: %s"
 #~ msgstr "نمی‌توان «%s» را برای نوشتن باز کرد: %s"
-
 #~ msgid ""
 #~ "Failed to close '%s' while writing image, all data may not have been "
 #~ "saved: %s"
 #~ msgstr ""
-#~ "بستن «%s» هنگام نوشتن تصویر شکست خورد، ممکن است همه‌ی داده‌ها ذخیره نشده "
+#~ "بستن «%s» هنگام نوشتن تصویر شکست خورد، ممکن است همهٔ داده‌ها ذخیره نشده "
 #~ "باشند: %s"
-
 #~ msgid "Insufficient memory to save image into a buffer"
 #~ msgstr "حافظه برای ذخیره کردن تصویر در میان‌گیر کافی نیست"
 
 #, fuzzy
 #~ msgid "Error writing to image stream"
-#~ msgstr "خطا در نوشتن در پرونده‌ی تصویر: %s"
+#~ msgstr "خطا در نوشتن در پروندهٔ تصویر: %s"
 
 #, fuzzy
 #~ msgid ""
 #~ "Internal error: Image loader module '%s' failed to complete an operation, "
 #~ "but didn't give a reason for the failure"
 #~ msgstr ""
-#~ "خطای داخلی: پیمانه‌ی بارکننده‌ی تصویر «%s» در بار کردن یک تصویر شکست خورد،"
-#~ "ولی دلیلی برای این شکست اعلام نکرد"
-
+#~ "خطای داخلی: پیمانهٔ بارکنندهٔ تصویر «%s» در بار کردن یک تصویر شکست خورد،ولی "
+#~ "دلیلی برای این شکست اعلام نکرد"
 #~ msgid "Incremental loading of image type '%s' is not supported"
 #~ msgstr "بار کردن افزایشی تصویر نوع «%s» پشتیبانی نمی‌شود"
-
 #~ msgid "Image header corrupt"
-#~ msgstr "سرصفحه‌ی تصویر خراب است"
-
+#~ msgstr "سرصفحهٔ تصویر خراب است"
 #~ msgid "Image format unknown"
 #~ msgstr "قالب تصویر نامعلوم است"
-
 #~ msgid "Image pixel data corrupt"
 #~ msgstr "داده‌های نقطه‌ای تصویر خراب است"
-
 #~ msgid "failed to allocate image buffer of %u byte"
 #~ msgid_plural "failed to allocate image buffer of %u bytes"
 #~ msgstr[0] "تخصیص یک میانگیر تصویر %Iu بایتی شکست خورد "
-
 #~ msgid "Unexpected icon chunk in animation"
 #~ msgstr "تکه ‌شمایل غیرمنتظره در پویانمایی"
-
 #~ msgid "Unsupported animation type"
 #~ msgstr "پویانمایی از نوع پشتیبانی‌نشده"
-
 #~ msgid "Invalid header in animation"
-#~ msgstr "سرصفحه‌ی نامعتبر در پویانمایی"
-
+#~ msgstr "سرصفحهٔ نامعتبر در پویانمایی"
 #~ msgid "Not enough memory to load animation"
 #~ msgstr "حافظه برای بار کردن پویانمایی کافی نیست"
-
 #~ msgid "Malformed chunk in animation"
-#~ msgstr "تکه‌ی معیوب در پویانمایی"
-
+#~ msgstr "تکهٔ معیوب در پویانمایی"
 #~ msgid "The ANI image format"
 #~ msgstr "قالب تصویر ANI"
-
 #~ msgid "BMP image has bogus header data"
-#~ msgstr "داده‌های سرصفحه‌ی تصویر BMP جعلی است"
-
+#~ msgstr "داده‌های سرصفحهٔ تصویر BMP جعلی است"
 #~ msgid "Not enough memory to load bitmap image"
 #~ msgstr "حافظه برای بار کردن تصویر نقشه‌بیتی کافی نیست"
-
 #~ msgid "BMP image has unsupported header size"
-#~ msgstr "اندازه‌ی سرصفحه‌ی تصویر BMP پشتیبانی نمی‌شود"
-
+#~ msgstr "اندازهٔ سرصفحهٔ تصویر BMP پشتیبانی نمی‌شود"
 #~ msgid "Topdown BMP images cannot be compressed"
 #~ msgstr "تصاویر BMP ازبالا‌به‌پایین نمی‌توانند فشرده باشند"
-
 #~ msgid "Premature end-of-file encountered"
 #~ msgstr "پیش از موقع به پایان پرونده برخورد شد"
 
 #, fuzzy
 #~ msgid "Couldn't allocate memory for saving BMP file"
-#~ msgstr "نمی‌توان برای بار کردن پرونده‌ی JPEG حافظه تخصیص داد"
+#~ msgstr "نمی‌توان برای بار کردن پروندهٔ JPEG حافظه تخصیص داد"
 
 #, fuzzy
 #~ msgid "Couldn't write to BMP file"
 #~ msgstr "نمی‌توان نام پرونده را تبدیل کرد"
-
 #~ msgid "The BMP image format"
 #~ msgstr "قالب تصویر BMP"
-
 #~ msgid "Failure reading GIF: %s"
 #~ msgstr "شکست در خواندن GIF: %s"
-
 #~ msgid "GIF file was missing some data (perhaps it was truncated somehow?)"
 #~ msgstr ""
-#~ "بعضی از داده‌های پرونده‌ی GIF مفقود شده‌اند (شاید پرونده به شکلی قطع شده "
-#~ "است؟)‏"
-
+#~ "بعضی از داده‌های پروندهٔ GIF مفقود شده‌اند (شاید پرونده به شکلی قطع شده است؟)‏"
 #~ msgid "Internal error in the GIF loader (%s)"
 #~ msgstr "خطای داخلی در بارگذار GIF (%s)"
-
 #~ msgid "Stack overflow"
 #~ msgstr "سرریز پشته"
-
 #~ msgid "GIF image loader cannot understand this image."
-#~ msgstr "بارکننده‌ی تصویر GIF نمی‌تواند این تصویر را بفهمد."
-
+#~ msgstr "بارکنندهٔ تصویر GIF نمی‌تواند این تصویر را بفهمد."
 #~ msgid "Bad code encountered"
 #~ msgstr "برخورد با کد بد"
-
 #~ msgid "Circular table entry in GIF file"
-#~ msgstr "مدخل دوری جدول در پرونده‌ی GIF"
-
+#~ msgstr "مدخل دوری جدول در پروندهٔ GIF"
 #~ msgid "Not enough memory to load GIF file"
-#~ msgstr "حافظه برای بار کردن پرونده‌ی GIF کافی نیست"
+#~ msgstr "حافظه برای بار کردن پروندهٔ GIF کافی نیست"
 
 #, fuzzy
 #~ msgid "Not enough memory to composite a frame in GIF file"
-#~ msgstr "حافظه برای بار کردن پرونده‌ی GIF کافی نیست"
-
+#~ msgstr "حافظه برای بار کردن پروندهٔ GIF کافی نیست"
 #~ msgid "GIF image is corrupt (incorrect LZW compression)"
 #~ msgstr "تصویر GIF خراب است (فشرده‌سازی LZW غلط)"
-
 #~ msgid "File does not appear to be a GIF file"
-#~ msgstr "پرونده به‌نظر یک پرونده‌ی GIF نمی‌رسد"
-
+#~ msgstr "پرونده به‌نظر یک پروندهٔ GIF نمی‌رسد"
 #~ msgid "Version %s of the GIF file format is not supported"
-#~ msgstr "نسخه‌ی %s از قالب پرونده‌ی GIF پشتیبانی نمی‌شود"
-
+#~ msgstr "نسخهٔ %s از قالب پروندهٔ GIF پشتیبانی نمی‌شود"
 #~ msgid ""
 #~ "GIF image has no global colormap, and a frame inside it has no local "
 #~ "colormap."
 #~ msgstr ""
 #~ "تصویر GIF نقشه‌رنگ سراسری‌ای ندارد، و یکی از چارچوب‌های داخل آن نقشه‌رنگ محلی "
 #~ "ندارد."
-
 #~ msgid "GIF image was truncated or incomplete."
 #~ msgstr "تصویر GIF قطع شده یا ناقص است."
-
 #~ msgid "The GIF image format"
 #~ msgstr "قالب تصویر GIF"
-
 #~ msgid "Invalid header in icon"
-#~ msgstr "سرصفحه‌ی نامعتبر در شمایل"
-
+#~ msgstr "سرصفحهٔ نامعتبر در شمایل"
 #~ msgid "Not enough memory to load icon"
 #~ msgstr "حافظه برای بار کردن شمایل کافی نیست"
-
 #~ msgid "Icon has zero width"
 #~ msgstr "عرض شمایل صفر است"
-
 #~ msgid "Icon has zero height"
 #~ msgstr "ارتفاع شمایل صفر است"
-
 #~ msgid "Compressed icons are not supported"
 #~ msgstr "شمایل‌های فشرده‌شده پشتیبانی نمی‌شوند"
-
 #~ msgid "Unsupported icon type"
 #~ msgstr "شمایل از نوع پشتیانی‌نشده"
-
 #~ msgid "Not enough memory to load ICO file"
-#~ msgstr "حافظه برای بار کردن پرونده‌ی ICO کافی نیست"
-
+#~ msgstr "حافظه برای بار کردن پروندهٔ ICO کافی نیست"
 #~ msgid "Image too large to be saved as ICO"
 #~ msgstr "تصویر برای ذخیره شدن به‌عنوان ICO خیلی بزرگ است"
-
 #~ msgid "Cursor hotspot outside image"
 #~ msgstr "کانون مکان‌نما خارج از تصویر است"
-
 #~ msgid "Unsupported depth for ICO file: %d"
-#~ msgstr "عمق پشتیبانی‌نشده برای پرونده‌ی ICO: %Id"
-
+#~ msgstr "عمق پشتیبانی‌نشده برای پروندهٔ ICO: %Id"
 #~ msgid "The ICO image format"
 #~ msgstr "قالب تصویر ICO"
 
 #, fuzzy
 #~ msgid "Error reading ICNS image: %s"
-#~ msgstr "خطای مهلک در خواندن پرونده‌ی تصویری PNG‏: %s"
+#~ msgstr "خطای مهلک در خواندن پروندهٔ تصویری PNG‏: %s"
 
 #, fuzzy
 #~ msgid "Could not decode ICNS file"
@@ -4675,11 +4443,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Couldn't allocate memory for color profile"
-#~ msgstr "نمی‌توان برای بار کردن پرونده‌ی JPEG حافظه تخصیص داد"
+#~ msgstr "نمی‌توان برای بار کردن پروندهٔ JPEG حافظه تخصیص داد"
 
 #, fuzzy
 #~ msgid "Insufficient memory to open JPEG 2000 file"
-#~ msgstr "حافظه برای بار کردن پرونده‌ی TIFF کافی نیست"
+#~ msgstr "حافظه برای بار کردن پروندهٔ TIFF کافی نیست"
 
 #, fuzzy
 #~ msgid "Couldn't allocate memory to buffer image data"
@@ -4688,110 +4456,80 @@ msgstr ""
 #, fuzzy
 #~ msgid "The JPEG 2000 image format"
 #~ msgstr "قالب تصویر JPEG"
-
 #~ msgid "Error interpreting JPEG image file (%s)"
-#~ msgstr "خطا در تفسیر پرونده‌ی JPEG ‏(%s)"
-
+#~ msgstr "خطا در تفسیر پروندهٔ JPEG ‏(%s)"
 #~ msgid ""
 #~ "Insufficient memory to load image, try exiting some applications to free "
 #~ "memory"
 #~ msgstr ""
 #~ "حافظه برای بار کردن تصویر کافی نیست، برای آزاد کردن حافظه خروج از بعضی "
 #~ "برنامه‌ها را امتحان کنید"
-
 #~ msgid "Unsupported JPEG color space (%s)"
 #~ msgstr "فضای رنگ JPEG پشتیبانی نمی‌شود (%s)"
-
 #~ msgid "Couldn't allocate memory for loading JPEG file"
-#~ msgstr "نمی‌توان برای بار کردن پرونده‌ی JPEG حافظه تخصیص داد"
+#~ msgstr "نمی‌توان برای بار کردن پروندهٔ JPEG حافظه تخصیص داد"
 
 #, fuzzy
 #~ msgid "Transformed JPEG has zero width or height."
 #~ msgstr "عرض یا ارتفاع PNG تبدیل‌شده صفر است."
-
 #~ msgid ""
 #~ "JPEG quality must be a value between 0 and 100; value '%s' could not be "
 #~ "parsed."
 #~ msgstr "کیفیت JPEG باید مقداری بین ۰ و ۱۰۰ باشد؛ مقدار «%s» قابل درک نیست."
-
 #~ msgid ""
 #~ "JPEG quality must be a value between 0 and 100; value '%d' is not allowed."
 #~ msgstr "کیفیت JPEG باید مقداری بین ۰ و ۱۰۰ باشد؛ مقدار «%Id» مجاز نیست."
-
 #~ msgid "The JPEG image format"
 #~ msgstr "قالب تصویر JPEG"
-
 #~ msgid "Couldn't allocate memory for header"
 #~ msgstr "نمی‌توان برای سرصفحه حافظه تخصیص داد"
-
 #~ msgid "Couldn't allocate memory for context buffer"
 #~ msgstr "نمی‌توان برای میانگیر زمینه حافظه تخصیص داد"
-
 #~ msgid "Image has invalid width and/or height"
 #~ msgstr "ارتفاع و/یا عرض تصویر نامعتبر است"
-
 #~ msgid "Image has unsupported bpp"
 #~ msgstr "‏bpp تصویر پشتیبانی نمی‌شود"
-
 #~ msgid "Image has unsupported number of %d-bit planes"
 #~ msgstr "تعداد صفحه‌های %Idبیتی تصویر پشتیبانی نمی‌شود"
-
 #~ msgid "Couldn't create new pixbuf"
 #~ msgstr "نمی‌توان pixbuf ایجاد کرد"
-
 #~ msgid "Couldn't allocate memory for line data"
 #~ msgstr "نمی‌توان برای داده‌های خط حافظه تخصیص داد"
-
 #~ msgid "Couldn't allocate memory for paletted data"
 #~ msgstr "نمی‌توان برای داده‌های تخته‌رنگ‌شده حافظه تخصیص داد"
-
 #~ msgid "Didn't get all lines of PCX image"
-#~ msgstr "همه‌ی خطهای تصویر PCX گرفته نشد"
-
+#~ msgstr "همهٔ خطهای تصویر PCX گرفته نشد"
 #~ msgid "No palette found at end of PCX data"
 #~ msgstr "در انتهای داده‌های PCX تخته‌رنگی یافته نشد"
-
 #~ msgid "The PCX image format"
 #~ msgstr "قالب تصویر PCX"
-
 #~ msgid "Bits per channel of PNG image is invalid."
 #~ msgstr "بیت بر کانال تصویر PNG نامعتبر است."
-
 #~ msgid "Transformed PNG has zero width or height."
 #~ msgstr "عرض یا ارتفاع PNG تبدیل‌شده صفر است."
-
 #~ msgid "Bits per channel of transformed PNG is not 8."
 #~ msgstr "بیت بر کانال PNG تبدیل‌شده، ۸ نیست."
-
 #~ msgid "Transformed PNG not RGB or RGBA."
 #~ msgstr "PNG تبدیل‌شده RGB یا RGBA نیست."
-
 #~ msgid "Transformed PNG has unsupported number of channels, must be 3 or 4."
 #~ msgstr "تعداد کانالهای PNG تبدیل‌شده پشتیبانی نمی‌شود، باید ۳ یا ۴ تا باشد."
-
 #~ msgid "Fatal error in PNG image file: %s"
-#~ msgstr "خطای مهلک در پرونده‌ی تصویر PNG‏: %s"
-
+#~ msgstr "خطای مهلک در پروندهٔ تصویر PNG‏: %s"
 #~ msgid "Insufficient memory to load PNG file"
-#~ msgstr "حافظه برای بار کردن پرونده‌ی PNG کافی نیست"
-
+#~ msgstr "حافظه برای بار کردن پروندهٔ PNG کافی نیست"
 #~ msgid ""
 #~ "Insufficient memory to store a %ld by %ld image; try exiting some "
 #~ "applications to reduce memory usage"
 #~ msgstr ""
-#~ "حافظه برای ذخیره‌ی یک تصویر %Ild در %Ild کافی نیست؛ برای کاهش مصرف حافظه "
+#~ "حافظه برای ذخیرهٔ یک تصویر %Ild در %Ild کافی نیست؛ برای کاهش مصرف حافظه "
 #~ "خروج از بعضی برنامه‌ها را امتحان کنید"
-
 #~ msgid "Fatal error reading PNG image file"
-#~ msgstr "خطای مهلک در خواندن پرونده‌ی تصویری PNG"
-
+#~ msgstr "خطای مهلک در خواندن پروندهٔ تصویری PNG"
 #~ msgid "Fatal error reading PNG image file: %s"
-#~ msgstr "خطای مهلک در خواندن پرونده‌ی تصویری PNG‏: %s"
-
+#~ msgstr "خطای مهلک در خواندن پروندهٔ تصویری PNG‏: %s"
 #~ msgid ""
 #~ "Keys for PNG text chunks must have at least 1 and at most 79 characters."
 #~ msgstr "کلیدهای تکه‌متنهای PNG باید حداقل یک و حداکثر ۷۹ نویسه داشته باشند."
-
 #~ msgid "Keys for PNG text chunks must be ASCII characters."
 #~ msgstr "کلیدهای تکه‌متنهای PNG باید نویسه‌های اَسکی باشند."
 
@@ -4806,63 +4544,46 @@ msgstr ""
 #~ "PNG compression level must be a value between 0 and 9; value '%d' is not "
 #~ "allowed."
 #~ msgstr "کیفیت JPEG باید مقداری بین ۰ و ۱۰۰ باشد؛ مقدار «%Id» مجاز نیست."
-
 #~ msgid ""
 #~ "Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."
 #~ msgstr "مقدار تکه‌متن PNG «%s» را نمی‌توان به کدگذاری ISO-8859-1 تبدیل کرد."
-
 #~ msgid "The PNG image format"
 #~ msgstr "قالب تصویر PNG"
-
 #~ msgid "PNM loader expected to find an integer, but didn't"
-#~ msgstr "بارکننده‌ی PNM انتظار داشت یک عدد صحیح ببیند، ولی ندید"
-
+#~ msgstr "بارکنندهٔ PNM انتظار داشت یک عدد صحیح ببیند، ولی ندید"
 #~ msgid "PNM file has an incorrect initial byte"
-#~ msgstr "بایت ابتدایی پرونده‌ی PNM نادرست است"
-
+#~ msgstr "بایت ابتدایی پروندهٔ PNM نادرست است"
 #~ msgid "PNM file is not in a recognized PNM subformat"
-#~ msgstr "پرونده‌ی PNM در زیرقالب شناخته‌شده‌ای از PNM نیست"
-
+#~ msgstr "پروندهٔ PNM در زیرقالب شناخته‌شده‌ای از PNM نیست"
 #~ msgid "PNM file has an image width of 0"
-#~ msgstr "عرض تصویر پرونده‌ی PNM صفر است"
-
+#~ msgstr "عرض تصویر پروندهٔ PNM صفر است"
 #~ msgid "PNM file has an image height of 0"
-#~ msgstr "ارتفاع تصویر پرونده‌ی PNM صفر است"
-
+#~ msgstr "ارتفاع تصویر پروندهٔ PNM صفر است"
 #~ msgid "Maximum color value in PNM file is 0"
-#~ msgstr "حداکثر مقدار رنگ در پرونده‌ی PNM صفر است"
-
+#~ msgstr "حداکثر مقدار رنگ در پروندهٔ PNM صفر است"
 #~ msgid "Maximum color value in PNM file is too large"
-#~ msgstr "مقدار حداکثر رنگ در پرونده‌ی PNM خیلی بزرگ است"
-
+#~ msgstr "مقدار حداکثر رنگ در پروندهٔ PNM خیلی بزرگ است"
 #~ msgid "Raw PNM image type is invalid"
 #~ msgstr "نوع تصویر PNM خام نامعتبر است"
-
 #~ msgid "PNM image loader does not support this PNM subformat"
-#~ msgstr "بارکننده‌ی تصویر PNM از این زیرقالب پشتیبانی نمی‌کند"
-
+#~ msgstr "بارکنندهٔ تصویر PNM از این زیرقالب پشتیبانی نمی‌کند"
 #~ msgid "Raw PNM formats require exactly one whitespace before sample data"
 #~ msgstr ""
-#~ "قالبهای PNM خام به دقیقاً یک فاصله‌ی خالی قبل از داده‌های نمونه نیاز دارند"
-
+#~ "قالبهای PNM خام به دقیقاً یک فاصلهٔ خالی قبل از داده‌های نمونه نیاز دارند"
 #~ msgid "Cannot allocate memory for loading PNM image"
 #~ msgstr "نمی‌توان برای بار کردن تصویر PNM حافظه تخصیص داد"
-
 #~ msgid "Insufficient memory to load PNM context struct"
-#~ msgstr "حافظه برای بار کردن ساختار زمینه‌ی PNM کافی نیست"
-
+#~ msgstr "حافظه برای بار کردن ساختار زمینهٔ PNM کافی نیست"
 #~ msgid "Unexpected end of PNM image data"
-#~ msgstr "پایان غیرمنتظره‌ی داده‌های تصویر PNM"
-
+#~ msgstr "پایان غیرمنتظرهٔ داده‌های تصویر PNM"
 #~ msgid "Insufficient memory to load PNM file"
-#~ msgstr "حافظه برای بار کردن پرونده‌ی PNM کافی نیست"
-
+#~ msgstr "حافظه برای بار کردن پروندهٔ PNM کافی نیست"
 #~ msgid "The PNM/PBM/PGM/PPM image format family"
-#~ msgstr "خانواده‌ی قالبهای تصویر PNM/PBM/PGM/PPM"
+#~ msgstr "خانوادهٔ قالبهای تصویر PNM/PBM/PGM/PPM"
 
 #, fuzzy
 #~ msgid "Failed to read QTIF header"
-#~ msgstr "باز کردن پرونده‌ی TIFF شکست خورد"
+#~ msgstr "باز کردن پروندهٔ TIFF شکست خورد"
 
 #, fuzzy
 #~ msgid "Failed to allocate %d bytes for file read buffer"
@@ -4874,175 +4595,129 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Failed to allocate QTIF context structure."
-#~ msgstr "نمی‌توان برای ساختار زمینه‌ی TGA حافظه تخصیص داد"
+#~ msgstr "نمی‌توان برای ساختار زمینهٔ TGA حافظه تخصیص داد"
 
 #, fuzzy
 #~ msgid "Failed to create GdkPixbufLoader object."
-#~ msgstr "خواندن از پرونده‌ی موقت شکست خورد"
+#~ msgstr "خواندن از پروندهٔ موقت شکست خورد"
 
 #, fuzzy
 #~ msgid "Failed to find an image data atom."
-#~ msgstr "باز کردن پرونده‌ی TIFF شکست خورد"
+#~ msgstr "باز کردن پروندهٔ TIFF شکست خورد"
 
 #, fuzzy
 #~ msgid "The QTIF image format"
 #~ msgstr "قالب تصویر TIFF"
-
 #~ msgid "RAS image has bogus header data"
 #~ msgstr "داده‌های سرصفحه‌ای تصویر RAS جعلی است"
-
 #~ msgid "RAS image has unknown type"
 #~ msgstr "نوع تصویر RAS نامعلوم است"
-
 #~ msgid "unsupported RAS image variation"
 #~ msgstr "این شکل از تصاویر RAS پشتیبانی نمی‌شوند"
-
 #~ msgid "Not enough memory to load RAS image"
 #~ msgstr "حافظه برای بار کردن تصویر RAS کافی نیست"
-
 #~ msgid "Cannot allocate memory for IOBuffer struct"
 #~ msgstr "نمی‌توان برای ساختار IOBuffer حافظه تخصیص داد"
-
 #~ msgid "Cannot allocate memory for IOBuffer data"
 #~ msgstr "نمی‌توان برای داده‌های IOBuffer حافظه تخصیص داد"
-
 #~ msgid "Cannot realloc IOBuffer data"
 #~ msgstr "نمی‌توان داده‌های IOBuffer را بازتخصیص کرد"
-
 #~ msgid "Cannot allocate temporary IOBuffer data"
 #~ msgstr "نمی‌توان داده‌های موقت IOBuffer را تخصیص داد"
-
 #~ msgid "Cannot allocate new pixbuf"
 #~ msgstr "نمی‌توان pixbuf جدید تخصیص داد"
 
 #, fuzzy
 #~ msgid "Image is corrupted or truncated"
 #~ msgstr "تصویر GIF قطع شده یا ناقص است."
-
 #~ msgid "Cannot allocate colormap structure"
 #~ msgstr "نمی‌توان ساختار نقشه‌رنگ تخصیص داد"
-
 #~ msgid "Cannot allocate colormap entries"
 #~ msgstr "نمی‌توان مدخلهای نقشه‌رنگ را تخصیص داد"
-
 #~ msgid "Unexpected bitdepth for colormap entries"
 #~ msgstr "عمق بیتی غیرمنتظره برای مدخلهای نقشه‌رنگ"
-
 #~ msgid "Cannot allocate TGA header memory"
-#~ msgstr "نمی‌توان حافظه‌ی سرصفحه‌ی TGA را تخصیص داد"
-
+#~ msgstr "نمی‌توان حافظهٔ سرصفحهٔ TGA را تخصیص داد"
 #~ msgid "TGA image has invalid dimensions"
-#~ msgstr "ابعاد پرونده‌ی TGA نامعتبر است"
-
+#~ msgstr "ابعاد پروندهٔ TGA نامعتبر است"
 #~ msgid "TGA image type not supported"
 #~ msgstr "تصویر نوع TGA پشتیبانی نمی‌شود"
-
 #~ msgid "Cannot allocate memory for TGA context struct"
-#~ msgstr "نمی‌توان برای ساختار زمینه‌ی TGA حافظه تخصیص داد"
-
+#~ msgstr "نمی‌توان برای ساختار زمینهٔ TGA حافظه تخصیص داد"
 #~ msgid "Excess data in file"
 #~ msgstr "داده‌های اضافی در پرونده"
-
 #~ msgid "The Targa image format"
 #~ msgstr "قالب تصویر تارگا"
-
 #~ msgid "Could not get image width (bad TIFF file)"
-#~ msgstr "نمی‌توان عرض تصویر را گرفت (پرونده‌ی TIFF خراب)"
-
+#~ msgstr "نمی‌توان عرض تصویر را گرفت (پروندهٔ TIFF خراب)"
 #~ msgid "Could not get image height (bad TIFF file)"
-#~ msgstr "نمی‌توان ارتفاع تصویر را گرفت (پرونده‌ی TIFF خراب)"
-
+#~ msgstr "نمی‌توان ارتفاع تصویر را گرفت (پروندهٔ TIFF خراب)"
 #~ msgid "Width or height of TIFF image is zero"
 #~ msgstr "عرض یا ارتفاع تصویر TIFF صفر است"
-
 #~ msgid "Dimensions of TIFF image too large"
 #~ msgstr "ابعاد تصویر TIFF خیلی بزرگ است"
-
 #~ msgid "Insufficient memory to open TIFF file"
-#~ msgstr "حافظه برای بار کردن پرونده‌ی TIFF کافی نیست"
-
+#~ msgstr "حافظه برای بار کردن پروندهٔ TIFF کافی نیست"
 #~ msgid "Failed to load RGB data from TIFF file"
-#~ msgstr "نمی‌توان داده‌های RGB را از پرونده‌ی TIFF بار کرد"
-
+#~ msgstr "نمی‌توان داده‌های RGB را از پروندهٔ TIFF بار کرد"
 #~ msgid "Failed to open TIFF image"
-#~ msgstr "باز کردن پرونده‌ی TIFF شکست خورد"
-
+#~ msgstr "باز کردن پروندهٔ TIFF شکست خورد"
 #~ msgid "TIFFClose operation failed"
 #~ msgstr "عملیات TIFFClose شکست خورد"
-
 #~ msgid "Failed to load TIFF image"
-#~ msgstr "بار کردن پرونده‌ی TIFF شکست خورد"
+#~ msgstr "بار کردن پروندهٔ TIFF شکست خورد"
 
 #, fuzzy
 #~ msgid "Failed to save TIFF image"
-#~ msgstr "باز کردن پرونده‌ی TIFF شکست خورد"
+#~ msgstr "باز کردن پروندهٔ TIFF شکست خورد"
 
 #, fuzzy
 #~ msgid "Failed to write TIFF data"
-#~ msgstr "باز کردن پرونده‌ی TIFF شکست خورد"
+#~ msgstr "باز کردن پروندهٔ TIFF شکست خورد"
 
 #, fuzzy
 #~ msgid "Couldn't write to TIFF file"
 #~ msgstr "نمی‌توان نام پرونده را تبدیل کرد"
-
 #~ msgid "The TIFF image format"
 #~ msgstr "قالب تصویر TIFF"
-
 #~ msgid "Image has zero width"
 #~ msgstr "عرض تصویر صفر است"
-
 #~ msgid "Image has zero height"
 #~ msgstr "ارتفاع تصویر صفر است"
-
 #~ msgid "Not enough memory to load image"
 #~ msgstr "حافظه برای بار کردن تصویر کافی نیست"
-
 #~ msgid "Couldn't save the rest"
 #~ msgstr "نمی‌توان بقیه را ذخیره کرد"
-
 #~ msgid "The WBMP image format"
 #~ msgstr "قالب تصویری WBMP"
-
 #~ msgid "Invalid XBM file"
-#~ msgstr "پرونده‌ی XBM نامعتبر"
-
+#~ msgstr "پروندهٔ XBM نامعتبر"
 #~ msgid "Insufficient memory to load XBM image file"
-#~ msgstr "حافظه برای بار کردن پرونده‌ی تصویری XBM کافی نیست"
-
+#~ msgstr "حافظه برای بار کردن پروندهٔ تصویری XBM کافی نیست"
 #~ msgid "Failed to write to temporary file when loading XBM image"
-#~ msgstr "نوشتن پرونده‌ی موقت هنگام بار کردن تصویر XNM شکست خورد"
-
+#~ msgstr "نوشتن پروندهٔ موقت هنگام بار کردن تصویر XNM شکست خورد"
 #~ msgid "The XBM image format"
 #~ msgstr "قالب تصویر XBM"
-
 #~ msgid "No XPM header found"
-#~ msgstr "سرصفحه‌ی XPM یافت نشد"
+#~ msgstr "سرصفحهٔ XPM یافت نشد"
 
 #, fuzzy
 #~ msgid "Invalid XPM header"
-#~ msgstr "پرونده‌ی XBM نامعتبر"
-
+#~ msgstr "پروندهٔ XBM نامعتبر"
 #~ msgid "XPM file has image width <= 0"
-#~ msgstr "عرض تصویر پرونده‌ی XPM کمتر یا مساوی صفر است"
-
+#~ msgstr "عرض تصویر پروندهٔ XPM کمتر یا مساوی صفر است"
 #~ msgid "XPM file has image height <= 0"
-#~ msgstr "ارتفاع تصویر پرونده‌ی XPM کمتر یا مساوی صفر است"
-
+#~ msgstr "ارتفاع تصویر پروندهٔ XPM کمتر یا مساوی صفر است"
 #~ msgid "XPM has invalid number of chars per pixel"
-#~ msgstr "تعداد نویسه بر نقطه‌ی XPM نامعتبر است"
-
+#~ msgstr "تعداد نویسه بر نقطهٔ XPM نامعتبر است"
 #~ msgid "XPM file has invalid number of colors"
-#~ msgstr "تعداد رنگهای پرونده‌ی XPM نامعتبر است"
-
+#~ msgstr "تعداد رنگهای پروندهٔ XPM نامعتبر است"
 #~ msgid "Cannot allocate memory for loading XPM image"
 #~ msgstr "نمی‌توان برای بار کردن تصویر XPM حافظه تخصیص داد"
-
 #~ msgid "Cannot read XPM colormap"
 #~ msgstr "نمی‌توان نقشه‌رنگ XPM را خواند"
-
 #~ msgid "Failed to write to temporary file when loading XPM image"
-#~ msgstr "نوشتن در پرونده‌ی موقت هنگام بار کردن تصویر XPM شکست خورد"
-
+#~ msgstr "نوشتن در پروندهٔ موقت هنگام بار کردن تصویر XPM شکست خورد"
 #~ msgid "The XPM image format"
 #~ msgstr "قالب تصویر XPM"
 
@@ -5056,7 +4731,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Could not create stream: %s"
-#~ msgstr "خطا در ایجاد شاخه‌ی «%s»: %s"
+#~ msgstr "خطا در ایجاد شاخهٔ «%s»: %s"
 
 #, fuzzy
 #~ msgid "Could not seek stream: %s"
@@ -5064,7 +4739,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Could not read from stream: %s"
-#~ msgstr "خطا در ایجاد شاخه‌ی «%s»: %s"
+#~ msgstr "خطا در ایجاد شاخهٔ «%s»: %s"
 
 #, fuzzy
 #~ msgid "Couldn't load bitmap"
@@ -5085,128 +4760,96 @@ msgstr ""
 #, fuzzy
 #~ msgid "The WMF image format"
 #~ msgstr "قالب تصویری WBMP"
-
 #~ msgid "\"Deepness\" of the color."
 #~ msgstr "«عمق» رنگ."
-
 #~ msgid "Folders"
 #~ msgstr "پوشه‌ها"
-
 #~ msgid "Fol_ders"
 #~ msgstr "پو_شه‌ها"
-
 #~ msgid "Folder unreadable: %s"
 #~ msgstr "پوشه قابل خواندن نیست: %s"
-
 #~ msgid ""
 #~ "The file \"%s\" resides on another machine (called %s) and may not be "
 #~ "available to this program.\n"
 #~ "Are you sure that you want to select it?"
 #~ msgstr ""
-#~ "پرونده‌ی «%s» روی دستگاه دیگری (به نام %s) است و ممکن است برای این برنامه "
+#~ "پروندهٔ «%s» روی دستگاه دیگری (به نام %s) است و ممکن است برای این برنامه "
 #~ "قابل دسترسی نباشد.\n"
 #~ "آیا مطمئنید می‌خواهید انتخابش کنید؟"
-
 #~ msgid "_New Folder"
-#~ msgstr "پوشه‌ی _جدید"
-
+#~ msgstr "پوشهٔ _جدید"
 #~ msgid "De_lete File"
 #~ msgstr "_حذف پرونده"
-
 #~ msgid "_Rename File"
 #~ msgstr "_تغییر نام پرونده"
-
 #~ msgid ""
 #~ "The folder name \"%s\" contains symbols that are not allowed in filenames"
-#~ msgstr "نام پوشه‌ی «%s» نمادهایی دارد که در نام پرونده‌ها مجاز نیستند"
-
+#~ msgstr "نام پوشهٔ «%s» نمادهایی دارد که در نام پرونده‌ها مجاز نیستند"
 #~ msgid "New Folder"
-#~ msgstr "پوشه‌ی جدید"
-
+#~ msgstr "پوشهٔ جدید"
 #~ msgid "_Folder name:"
 #~ msgstr "_نام پوشه:"
-
 #~ msgid "C_reate"
 #~ msgstr "_ایجاد"
-
 #~ msgid ""
 #~ "The filename \"%s\" contains symbols that are not allowed in filenames"
-#~ msgstr "نام پرونده‌ی «%s» نمادهایی دارد که در نام پرونده‌ها مجاز نیستند"
+#~ msgstr "نام پروندهٔ «%s» نمادهایی دارد که در نام پرونده‌ها مجاز نیستند"
 
 #, fuzzy
 #~ msgid "Error deleting file '%s': %s"
-#~ msgstr "خطا در حذف پرونده‌ی \"%s\": %s"
-
+#~ msgstr "خطا در حذف پروندهٔ \"%s\": %s"
 #~ msgid "Really delete file \"%s\"?"
-#~ msgstr "پرونده‌ی «%s» واقعاً حذف شود؟"
-
+#~ msgstr "پروندهٔ «%s» واقعاً حذف شود؟"
 #~ msgid "Delete File"
 #~ msgstr "حذف پرونده"
 
 #, fuzzy
 #~ msgid "Error renaming file to \"%s\": %s"
 #~ msgstr ""
-#~ "خطا در تغییر نام پرونده‌ی «%s»: %s\n"
+#~ "خطا در تغییر نام پروندهٔ «%s»: %s\n"
 #~ "%s"
 
 #, fuzzy
 #~ msgid "Error renaming file \"%s\": %s"
 #~ msgstr ""
-#~ "خطا در تغییر نام پرونده‌ی «%s»: %s\n"
+#~ "خطا در تغییر نام پروندهٔ «%s»: %s\n"
 #~ "%s"
-
 #~ msgid "Error renaming file \"%s\" to \"%s\": %s"
-#~ msgstr "خطا در تغییر نام پرونده‌ی «%s» به «%s»: %s"
-
+#~ msgstr "خطا در تغییر نام پروندهٔ «%s» به «%s»: %s"
 #~ msgid "Rename File"
 #~ msgstr "تغییر نام پرونده"
-
 #~ msgid "Rename file \"%s\" to:"
-#~ msgstr "تغییر نام پرونده‌ی «%s» به:"
-
+#~ msgstr "تغییر نام پروندهٔ «%s» به:"
 #~ 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"
 #~ msgstr ""
-#~ "نام پرونده‌ی «%s» را نمی‌توان به UTF-8 تبدیل کرد. (تنظیم متغیر محیطی "
+#~ "نام پروندهٔ «%s» را نمی‌توان به UTF-8 تبدیل کرد. (تنظیم متغیر محیطی "
 #~ "G_FILENAME_ENCODING را امتحان کنید): %s"
-
 #~ msgid "Invalid UTF-8"
 #~ msgstr "‏UTF-8 نامعتبر"
-
 #~ msgid "Name too long"
 #~ msgstr "نام خیلی بلند است"
-
 #~ msgid "Couldn't convert filename"
 #~ msgstr "نمی‌توان نام پرونده را تبدیل کرد"
-
 #~ msgid "Gamma"
 #~ msgstr "گاما"
-
 #~ msgid "_Gamma value"
 #~ msgstr "مقدار _گاما"
-
 #~ msgid "Input"
 #~ msgstr "ورودی"
-
 #~ msgid "No extended input devices"
 #~ msgstr "بدون دستگاه ورودی گسترش‌یافته"
-
 #~ msgid "_Device:"
 #~ msgstr "_دستگاه:"
-
 #~ msgid "Disabled"
 #~ msgstr "از کار افتاده"
-
 #~ msgid "Screen"
 #~ msgstr "صفحه‌نمایش"
-
 #~ msgid "Window"
 #~ msgstr "پنجره"
 
@@ -5237,20 +4880,16 @@ msgstr ""
 #, fuzzy
 #~ msgid "_Wheel:"
 #~ msgstr "چرخ"
-
 #~ msgid "none"
 #~ msgstr "هیچ‌کدام"
-
 #~ msgid "(disabled)"
 #~ msgstr "(از کار افتاده)"
-
 #~ msgid "(unknown)"
 #~ msgstr "(نامعلوم)"
 
 #, fuzzy
 #~ msgid "Cl_ear"
 #~ msgstr "_پاک کردن"
-
 #~ msgid "(Empty)"
 #~ msgstr "(خالی)"
 
@@ -5261,7 +4900,6 @@ msgstr ""
 #, fuzzy
 #~ msgid "calendar:week:digits|%d"
 #~ msgstr "calendar:week_start:6"
-
 #~ msgid "progress bar label|%d %%"
 #~ msgstr "‪٪%Id‬"
 
@@ -5300,149 +4938,113 @@ msgstr ""
 #, fuzzy
 #~ msgid "Media|_Stop"
 #~ msgstr "_توقف"
-
 #~ msgid "Group"
 #~ msgstr "گروه"
-
 #~ msgid "The radio tool button whose group this button belongs to."
-#~ msgstr "دکمه‌ی ابزار رادیویی‌ای که این دکمه به گروه آن تعلق دارد."
-
+#~ msgstr "دکمهٔ ابزار رادیویی‌ای که این دکمه به گروه آن تعلق دارد."
 #~ msgid "Invalid filename: %s"
-#~ msgstr "نام پرونده‌ی نامعتبر: %s"
-
+#~ msgstr "نام پروندهٔ نامعتبر: %s"
 #~ msgid ""
 #~ "Could not add a bookmark for '%s' because it is an invalid path name."
-#~ msgstr "نمی‌توان برای «%s» چوب‌الفی اضافه کرد چون نام مسیر نامعتبری است."
+#~ msgstr "نمی‌توان برای «%s» نشانکی اضافه کرد چون نام مسیر نامعتبری است."
 
 #, fuzzy
 #~ msgid "Could not select file '%s' because it is an invalid path name."
-#~ msgstr "نمی‌توان برای «%s» چوب‌الفی اضافه کرد چون نام مسیر نامعتبری است."
+#~ msgstr "نمی‌توان برای «%s» نشانکی اضافه کرد چون نام مسیر نامعتبری است."
 
 # c-format
 #~ msgid "%d byte"
 #~ msgid_plural "%d bytes"
 #~ msgstr[0] "%Id بایت"
-
 #, fuzzy
 #~ msgid "Could not get a stock icon for %s\n"
-#~ msgstr "نمی‌توان برای پرونده‌ی «%s» اطلاعات گرفت: %s"
-
+#~ msgstr "نمی‌توان برای پروندهٔ «%s» اطلاعات گرفت: %s"
 #~ msgid "Error getting information for '%s': %s"
 #~ msgstr "خطا در گرفتن اطلاعات برای «%s»: %s"
-
 #~ msgid "This file system does not support mounting"
 #~ msgstr "این سیستم پرونده‌ها از سوار شدن پشتیبانی نمی‌کند"
-
 #~ msgid ""
 #~ "The name \"%s\" is not valid because it contains the character \"%s\". "
 #~ "Please use a different name."
 #~ msgstr ""
-#~ "نام «%s» معتبر نیست چون شامل نویسه‌ی «%s» است. لطفاً از نام دیگری استفاده "
-#~ "کنید."
-
+#~ "نام «%s» معتبر نیست چون شامل نویسهٔ «%s» است. لطفاً از نام دیگری استفاده کنید."
 #~ msgid "Bookmark saving failed: %s"
-#~ msgstr "ذخیره‌ی چوب‌الف شکست خورد: %s"
-
+#~ msgstr "ذخیرهٔ نشانک‌ شکست خورد: %s"
 #~ msgid "'%s' already exists in the bookmarks list"
-#~ msgstr "‏«%s» از قبل در فهرست چوب‌الفها موجود است"
-
+#~ msgstr "‏«%s» از قبل در فهرست نشانک‌ها موجود است"
 #~ msgid "'%s' does not exist in the bookmarks list"
-#~ msgstr "‏«%s» در فهرست چوب‌الفها موجود نیست"
-
+#~ msgstr "‏«%s» در فهرست نشانک‌ها موجود نیست"
 #~ msgid "Unknown attribute '%s' on line %d char %d"
-#~ msgstr "مشخصه‌ی نامعلوم «%s» در سطر %Id نویسه‌ی %Id"
-
+#~ msgstr "مشخصهٔ نامعلوم «%s» در سطر %Id نویسهٔ %Id"
 #~ msgid "Default"
 #~ msgstr "پیش‌فرض"
 
 #, fuzzy
 #~ msgid "_All"
 #~ msgstr "_پر کردن"
-
 #~ msgid "Today"
 #~ msgstr "امروز"
 
 #, fuzzy
 #~ msgid "Location:"
 #~ msgstr "_مکان:"
-
 #~ msgid "PNM image format is invalid"
 #~ msgstr "قالب تصویر PNM نامعتبر است"
-
 #~ msgid "Error creating directory '%s': %s"
-#~ msgstr "خطا در ایجاد شاخه‌ی «%s»: %s"
-
+#~ msgstr "خطا در ایجاد شاخهٔ «%s»: %s"
 #~ msgid "Thai (Broken)"
 #~ msgstr "تایلندی (شکسته)"
-
 #~ msgid ""
 #~ "Error creating folder \"%s\": %s\n"
 #~ "%s"
 #~ msgstr ""
-#~ "خطا در ایجاد پوشه‌ی «%s»: %s\n"
+#~ "خطا در ایجاد پوشهٔ «%s»: %s\n"
 #~ "%s"
-
 #~ msgid "You probably used symbols not allowed in filenames."
 #~ msgstr "احتمالاً از نمادهایی استفاده کرده‌اید که در نام پرونده‌ها مجاز نیستند"
-
 #~ msgid ""
 #~ "Error deleting file \"%s\": %s\n"
 #~ "%s"
 #~ msgstr ""
-#~ "خطا در حذف پرونده‌ی «%s»: %s\n"
+#~ "خطا در حذف پروندهٔ «%s»: %s\n"
 #~ "%s"
-
 #~ msgid "It probably contains symbols not allowed in filenames."
 #~ msgstr "احتمالاً نمادهایی دارد که در نام پرونده‌ها مجاز نیست."
-
 #~ msgid ""
 #~ "The file name \"%s\" contains symbols that are not allowed in filenames"
-#~ msgstr "نام پرونده‌ی «%s» نمادهایی دارد که در نام پرونده‌ها مجاز نیستند"
-
+#~ msgstr "نام پروندهٔ «%s» نمادهایی دارد که در نام پرونده‌ها مجاز نیستند"
 #~ msgid "Error getting information for '/': %s"
 #~ msgstr "خطا در گرفتن اطلاعات برای «/»: %s"
-
 #~ msgid "Select All"
 #~ msgstr "انتخاب همه"
 
 #, fuzzy
 #~ msgid "shortcut %s already exists"
 #~ msgstr "میانبر %s وجود ندارد"
-
 #~ msgid "Cannot handle PNM files with maximum color values greater than 255"
 #~ msgstr "نمی‌توان با پرونده‌های PNM با حداکثر مقدار رنگ بیشتر از ۲۵۵ کار کرد"
-
 #~ msgid "Could not get information about '%s': %s"
-#~ msgstr "نمی‌توان درباره‌ی «%s» اطلاعات گرفت: %s"
-
+#~ msgstr "نمی‌توان دربارهٔ «%s» اطلاعات گرفت: %s"
 #~ msgid "Shortcuts"
 #~ msgstr "میانبرها"
-
 #~ msgid "Folder"
 #~ msgstr "پوشه"
-
 #~ msgid "Cannot change folder"
 #~ msgstr "نمی‌توان پوشه را تغییر داد"
-
 #~ msgid "The folder you specified is an invalid path."
 #~ msgstr "پوشه‌ای که مشخص کرده‌اید مسیر نامعتبری است."
-
 #~ msgid "Could not build file name from '%s' and '%s'"
 #~ msgstr "نمی‌توان از «%s» و «%s» نام پرونده ساخت"
-
 #~ msgid "Save in Location"
 #~ msgstr "ذخیره در مکان"
-
 #~ msgid "X"
 #~ msgstr "X"
-
 #~ msgid "clear"
 #~ msgstr "پاک شود"
 
 #, fuzzy
 #~ msgid "Writing %s failed: %s"
-#~ msgstr "ذخیره‌ی چوب‌الف شکست خورد: %s"
-
+#~ msgstr "ذخیرهٔ نشانک‌ شکست خورد: %s"
 #~ msgid "_Credits"
 #~ msgstr "_دست‌اندرکاران"
 
@@ -5455,16 +5057,14 @@ msgstr ""
 #~ "Could not change the current folder to %s:\n"
 #~ "%s"
 #~ msgstr ""
-#~ "خطا در ایجاد پوشه‌ی \"%s\": %s\n"
+#~ "خطا در ایجاد پوشهٔ \"%s\": %s\n"
 #~ "%s"
 
 #, fuzzy
 #~ msgid "Could not find the path"
 #~ msgstr "نمی‌توان بقیه را ذخیره کرد"
-
 #~ msgid "Input Methods"
 #~ msgstr "روش‌های ورودی"
-
 #~ msgid "File name"
 #~ msgstr "نام پرونده"
 
@@ -5475,9 +5075,8 @@ msgstr ""
 #, fuzzy
 #~ msgid "_Filename:"
 #~ msgstr "نام پرونده"
-
 #~ msgid "Current folder: %s"
-#~ msgstr "پوشه‌ی فعلی: %s"
-
+#~ msgstr "پوشهٔ فعلی: %s"
 #~ msgid "Zoom _100%"
 #~ msgstr "زوم _۱۰۰٪"
+
diff --git a/po/id.po b/po/id.po
index d1aafb9865..fbf6506cfb 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,4 +1,3 @@
-# translation of gtk+.master.po to Indonesian
 # Indonesia translation of gtk+.
 # Copyright (C) 2003 THE gtk+'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gtk+ package.
@@ -12,72 +11,72 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 15:41-0400\n"
-"PO-Revision-Date: 2010-08-29 11:06+0700\n"
-"Last-Translator: Dirgita <dirgitadevina@yahoo.co.id>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2b&component=general\n"
+"POT-Creation-Date: 2010-11-24 12:37+0000\n"
+"PO-Revision-Date: 2010-11-26 12:06+0700\n"
+"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: GNOME Indonesian Translation Team <gnome@i15n.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Language: Indonesian\n"
 "X-Poedit-Country: Indonesia\n"
 "X-Generator: Lokalize 1.1\n"
 
-#: gdk/gdk.c:103
+#: ../gdk/gdk.c:115
 #, c-format
 msgid "Error parsing option --gdk-debug"
 msgstr "Galat sewaktu mengurai opsi --gdk-debug"
 
-#: gdk/gdk.c:123
+#: ../gdk/gdk.c:135
 #, c-format
 msgid "Error parsing option --gdk-no-debug"
 msgstr "Galat sewaktu mengurai opsi --gdk-no-debug"
 
 #. Description of --class=CLASS in --help output
-#: gdk/gdk.c:151
+#: ../gdk/gdk.c:163
 msgid "Program class as used by the window manager"
 msgstr "Kelas program yang digunakan pengatur jendela program"
 
 #. Placeholder in --class=CLASS in --help output
-#: gdk/gdk.c:152
+#: ../gdk/gdk.c:164
 msgid "CLASS"
 msgstr "KELAS"
 
 #. Description of --name=NAME in --help output
-#: gdk/gdk.c:154
+#: ../gdk/gdk.c:166
 msgid "Program name as used by the window manager"
 msgstr "Nama program sebagaimana digunakan oleh program pengatur jendela"
 
 #. Placeholder in --name=NAME in --help output
-#: gdk/gdk.c:155
+#: ../gdk/gdk.c:167
 msgid "NAME"
 msgstr "NAMA"
 
 #. Description of --display=DISPLAY in --help output
-#: gdk/gdk.c:157
+#: ../gdk/gdk.c:169
 msgid "X display to use"
 msgstr "Tampilan X yang akan dipakai"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: gdk/gdk.c:158
+#: ../gdk/gdk.c:170
 msgid "DISPLAY"
 msgstr "TAMPILAN"
 
 #. Description of --screen=SCREEN in --help output
-#: gdk/gdk.c:160
+#: ../gdk/gdk.c:172
 msgid "X screen to use"
 msgstr "Layar X yang akan dipakai"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: gdk/gdk.c:161
+#: ../gdk/gdk.c:173
 msgid "SCREEN"
 msgstr "LAYAR"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: gdk/gdk.c:164
+#: ../gdk/gdk.c:176
 msgid "GDK debugging flags to set"
 msgstr "Tanda debug GDK yang hendak disetel"
 
@@ -85,303 +84,307 @@ msgstr "Tanda debug GDK yang hendak disetel"
 #. 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:177
+#: ../gdk/gdk.c:180
+#: ../gtk/gtkmain.c:525
+#: ../gtk/gtkmain.c:528
 msgid "FLAGS"
 msgstr "TANDA"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: gdk/gdk.c:167
+#: ../gdk/gdk.c:179
 msgid "GDK debugging flags to unset"
 msgstr "Tanda debug GDK yang ingin dibuang setelannya"
 
-#: gdk/keyname-table.h:3940
+#: ../gdk/keyname-table.h:3940
 msgctxt "keyboard label"
 msgid "BackSpace"
 msgstr "BackSpace"
 
-#: gdk/keyname-table.h:3941
+#: ../gdk/keyname-table.h:3941
 msgctxt "keyboard label"
 msgid "Tab"
 msgstr "Tab"
 
-#: gdk/keyname-table.h:3942
+#: ../gdk/keyname-table.h:3942
 msgctxt "keyboard label"
 msgid "Return"
 msgstr "Return"
 
-#: gdk/keyname-table.h:3943
+#: ../gdk/keyname-table.h:3943
 msgctxt "keyboard label"
 msgid "Pause"
 msgstr "Pause"
 
-#: gdk/keyname-table.h:3944
+#: ../gdk/keyname-table.h:3944
 msgctxt "keyboard label"
 msgid "Scroll_Lock"
 msgstr "Scroll_Lock"
 
-#: gdk/keyname-table.h:3945
+#: ../gdk/keyname-table.h:3945
 msgctxt "keyboard label"
 msgid "Sys_Req"
 msgstr "Sys_Req"
 
-#: gdk/keyname-table.h:3946
+#: ../gdk/keyname-table.h:3946
 msgctxt "keyboard label"
 msgid "Escape"
 msgstr "Esc (Escape)"
 
-#: gdk/keyname-table.h:3947
+#: ../gdk/keyname-table.h:3947
 msgctxt "keyboard label"
 msgid "Multi_key"
 msgstr "_Kunci multi"
 
-#: gdk/keyname-table.h:3948
+#: ../gdk/keyname-table.h:3948
 msgctxt "keyboard label"
 msgid "Home"
 msgstr "Home"
 
-#: gdk/keyname-table.h:3949
+#: ../gdk/keyname-table.h:3949
 msgctxt "keyboard label"
 msgid "Left"
 msgstr "Kiri"
 
-#: gdk/keyname-table.h:3950
+#: ../gdk/keyname-table.h:3950
 msgctxt "keyboard label"
 msgid "Up"
 msgstr "Atas"
 
-#: gdk/keyname-table.h:3951
+#: ../gdk/keyname-table.h:3951
 msgctxt "keyboard label"
 msgid "Right"
 msgstr "Kanan"
 
-#: gdk/keyname-table.h:3952
+#: ../gdk/keyname-table.h:3952
 msgctxt "keyboard label"
 msgid "Down"
 msgstr "Bawah"
 
-#: gdk/keyname-table.h:3953
+#: ../gdk/keyname-table.h:3953
 msgctxt "keyboard label"
 msgid "Page_Up"
 msgstr "Page_Up"
 
-#: gdk/keyname-table.h:3954
+#: ../gdk/keyname-table.h:3954
 msgctxt "keyboard label"
 msgid "Page_Down"
 msgstr "Page_Down"
 
-#: gdk/keyname-table.h:3955
+#: ../gdk/keyname-table.h:3955
 msgctxt "keyboard label"
 msgid "End"
 msgstr "End"
 
-#: gdk/keyname-table.h:3956
+#: ../gdk/keyname-table.h:3956
 msgctxt "keyboard label"
 msgid "Begin"
 msgstr "Begin"
 
-#: gdk/keyname-table.h:3957
+#: ../gdk/keyname-table.h:3957
 msgctxt "keyboard label"
 msgid "Print"
 msgstr "Print"
 
-#: gdk/keyname-table.h:3958
+#: ../gdk/keyname-table.h:3958
 msgctxt "keyboard label"
 msgid "Insert"
 msgstr "Insert"
 
-#: gdk/keyname-table.h:3959
+#: ../gdk/keyname-table.h:3959
 msgctxt "keyboard label"
 msgid "Num_Lock"
 msgstr "Num_Lock"
 
-#: gdk/keyname-table.h:3960
+#: ../gdk/keyname-table.h:3960
 msgctxt "keyboard label"
 msgid "KP_Space"
 msgstr "KP_Space"
 
-#: gdk/keyname-table.h:3961
+#: ../gdk/keyname-table.h:3961
 msgctxt "keyboard label"
 msgid "KP_Tab"
 msgstr "KP_Tab"
 
-#: gdk/keyname-table.h:3962
+#: ../gdk/keyname-table.h:3962
 msgctxt "keyboard label"
 msgid "KP_Enter"
 msgstr "KP_Enter"
 
-#: gdk/keyname-table.h:3963
+#: ../gdk/keyname-table.h:3963
 msgctxt "keyboard label"
 msgid "KP_Home"
 msgstr "KP_Home"
 
-#: gdk/keyname-table.h:3964
+#: ../gdk/keyname-table.h:3964
 msgctxt "keyboard label"
 msgid "KP_Left"
 msgstr "KP_Left"
 
-#: gdk/keyname-table.h:3965
+#: ../gdk/keyname-table.h:3965
 msgctxt "keyboard label"
 msgid "KP_Up"
 msgstr "KP_Up"
 
-#: gdk/keyname-table.h:3966
+#: ../gdk/keyname-table.h:3966
 msgctxt "keyboard label"
 msgid "KP_Right"
 msgstr "KP_Right"
 
-#: gdk/keyname-table.h:3967
+#: ../gdk/keyname-table.h:3967
 msgctxt "keyboard label"
 msgid "KP_Down"
 msgstr "KP_Down"
 
-#: gdk/keyname-table.h:3968
+#: ../gdk/keyname-table.h:3968
 msgctxt "keyboard label"
 msgid "KP_Page_Up"
 msgstr "KP_Page_Up"
 
-#: gdk/keyname-table.h:3969
+#: ../gdk/keyname-table.h:3969
 msgctxt "keyboard label"
 msgid "KP_Prior"
 msgstr "KP_Prior"
 
-#: gdk/keyname-table.h:3970
+#: ../gdk/keyname-table.h:3970
 msgctxt "keyboard label"
 msgid "KP_Page_Down"
 msgstr "KP_Page_Down"
 
-#: gdk/keyname-table.h:3971
+#: ../gdk/keyname-table.h:3971
 msgctxt "keyboard label"
 msgid "KP_Next"
 msgstr "KP_Next"
 
-#: gdk/keyname-table.h:3972
+#: ../gdk/keyname-table.h:3972
 msgctxt "keyboard label"
 msgid "KP_End"
 msgstr "KP_End"
 
-#: gdk/keyname-table.h:3973
+#: ../gdk/keyname-table.h:3973
 msgctxt "keyboard label"
 msgid "KP_Begin"
 msgstr "KP_Begin"
 
-#: gdk/keyname-table.h:3974
+#: ../gdk/keyname-table.h:3974
 msgctxt "keyboard label"
 msgid "KP_Insert"
 msgstr "KP_Insert"
 
-#: gdk/keyname-table.h:3975
+#: ../gdk/keyname-table.h:3975
 msgctxt "keyboard label"
 msgid "KP_Delete"
 msgstr "KP_Delete"
 
-#: gdk/keyname-table.h:3976
+#: ../gdk/keyname-table.h:3976
 msgctxt "keyboard label"
 msgid "Delete"
 msgstr "Delete"
 
 #. Description of --sync in --help output
-#: gdk/win32/gdkmain-win32.c:54
+#: ../gdk/win32/gdkmain-win32.c:54
 msgid "Don't batch GDI requests"
 msgstr "Jangan antrikan permintaan GDI"
 
 #. Description of --no-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:56
+#: ../gdk/win32/gdkmain-win32.c:56
 msgid "Don't use the Wintab API for tablet support"
 msgstr "Jangan gunakan API Wintab untuk dukungan tablet"
 
 #. Description of --ignore-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:58
+#: ../gdk/win32/gdkmain-win32.c:58
 msgid "Same as --no-wintab"
 msgstr "Sama dengan --no-wintab"
 
 #. Description of --use-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:60
+#: ../gdk/win32/gdkmain-win32.c:60
 msgid "Do use the Wintab API [default]"
 msgstr "Jangan gunakan API Wintab (berlaku pada kondisi awal)"
 
 #. Description of --max-colors=COLORS in --help output
-#: gdk/win32/gdkmain-win32.c:62
+#: ../gdk/win32/gdkmain-win32.c:62
 msgid "Size of the palette in 8 bit mode"
 msgstr "Ukuran palet dalam moda 8 bit"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: gdk/win32/gdkmain-win32.c:63
+#: ../gdk/win32/gdkmain-win32.c:63
 msgid "COLORS"
 msgstr "WARNA"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:312
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:312
 #, c-format
 msgid "Starting %s"
 msgstr "Memulai %s"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:316
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:316
 #, c-format
 msgid "Opening %s"
 msgstr "Membuka '%s'"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:321
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:321
 #, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
 msgstr[0] "Membuka %d Item"
 
 #. Description of --sync in --help output
-#: gdk/x11/gdkmain-x11.c:96
+#: ../gdk/x11/gdkmain-x11.c:94
 msgid "Make X calls synchronous"
 msgstr "Buat panggilan X sinkronus"
 
 #. Translators: this is the license preamble; the string at the end
 #. * contains the URL of the license.
 #.
-#: gtk/gtkaboutdialog.c:101
+#: ../gtk/gtkaboutdialog.c:101
 #, c-format
 msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s"
 msgstr "Program ini TANPA JAMINAN APA PUN; untuk lebih jelas, kunjungi %s"
 
-#: gtk/gtkaboutdialog.c:339 gtk/gtkaboutdialog.c:2235
+#: ../gtk/gtkaboutdialog.c:339
+#: ../gtk/gtkaboutdialog.c:2233
 msgid "License"
 msgstr "Lisensi"
 
-#: gtk/gtkaboutdialog.c:340
+#: ../gtk/gtkaboutdialog.c:340
 msgid "The license of the program"
 msgstr "Lisensi program"
 
 #. Add the credits button
-#: gtk/gtkaboutdialog.c:621
+#: ../gtk/gtkaboutdialog.c:622
 msgid "C_redits"
 msgstr "K_redit"
 
 #. Add the license button
-#: gtk/gtkaboutdialog.c:635
+#: ../gtk/gtkaboutdialog.c:636
 msgid "_License"
 msgstr "_Lisensi"
 
-#: gtk/gtkaboutdialog.c:839
+#: ../gtk/gtkaboutdialog.c:840
 msgid "Could not show link"
 msgstr "Tidak dapat menampilkan taut"
 
-#: gtk/gtkaboutdialog.c:932
+#: ../gtk/gtkaboutdialog.c:933
 #, c-format
 msgid "About %s"
 msgstr "Tentang %s"
 
-#: gtk/gtkaboutdialog.c:2153
+#: ../gtk/gtkaboutdialog.c:2151
 msgid "Credits"
 msgstr "Kredit"
 
-#: gtk/gtkaboutdialog.c:2185
+#: ../gtk/gtkaboutdialog.c:2183
 msgid "Written by"
 msgstr "Penulis"
 
-#: gtk/gtkaboutdialog.c:2188
+#: ../gtk/gtkaboutdialog.c:2186
 msgid "Documented by"
 msgstr "Dokumentasi"
 
-#: gtk/gtkaboutdialog.c:2200
+#: ../gtk/gtkaboutdialog.c:2198
 msgid "Translated by"
 msgstr "Penerjemah"
 
-#: gtk/gtkaboutdialog.c:2204
+#: ../gtk/gtkaboutdialog.c:2202
 msgid "Artwork by"
 msgstr "Karya Seni"
 
@@ -390,7 +393,7 @@ msgstr "Karya Seni"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:160
+#: ../gtk/gtkaccellabel.c:160
 msgctxt "keyboard label"
 msgid "Shift"
 msgstr "Shift"
@@ -400,7 +403,7 @@ msgstr "Shift"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:166
+#: ../gtk/gtkaccellabel.c:166
 msgctxt "keyboard label"
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -410,7 +413,7 @@ msgstr "Ctrl"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:172
+#: ../gtk/gtkaccellabel.c:172
 msgctxt "keyboard label"
 msgid "Alt"
 msgstr "Alt"
@@ -420,7 +423,7 @@ msgstr "Alt"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:770
+#: ../gtk/gtkaccellabel.c:770
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -430,7 +433,7 @@ msgstr "Super"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:783
+#: ../gtk/gtkaccellabel.c:783
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Hyper"
@@ -440,37 +443,37 @@ msgstr "Hyper"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:797
+#: ../gtk/gtkaccellabel.c:797
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"
 
-#: gtk/gtkaccellabel.c:813
+#: ../gtk/gtkaccellabel.c:813
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Spasi"
 
-#: gtk/gtkaccellabel.c:816
+#: ../gtk/gtkaccellabel.c:816
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Backslash"
 
-#: gtk/gtkbuilderparser.c:343
+#: ../gtk/gtkbuilderparser.c:343
 #, c-format
 msgid "Invalid type function on line %d: '%s'"
 msgstr "Tipe fungsi tak valid pada baris %d: '%s'"
 
-#: gtk/gtkbuilderparser.c:407
+#: ../gtk/gtkbuilderparser.c:407
 #, c-format
 msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
 msgstr "Objek ID '%s' ganda pada baris %d (sebelumnya pada baris %d)"
 
-#: gtk/gtkbuilderparser.c:859
+#: ../gtk/gtkbuilderparser.c:859
 #, c-format
 msgid "Invalid root element: '%s'"
 msgstr "Elemen akar tidak berlaku: %s"
 
-#: gtk/gtkbuilderparser.c:898
+#: ../gtk/gtkbuilderparser.c:898
 #, c-format
 msgid "Unhandled tag: '%s'"
 msgstr "Tag tak tertangani: '%s'"
@@ -485,7 +488,7 @@ msgstr "Tag tak tertangani: '%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:878
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -494,7 +497,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:916
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:0"
 
@@ -503,7 +506,7 @@ msgstr "calendar:week_start:0"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: gtk/gtkcalendar.c:2006
+#: ../gtk/gtkcalendar.c:1848
 msgctxt "year measurement template"
 msgid "2000"
 msgstr "2000"
@@ -518,7 +521,8 @@ msgstr "2000"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: gtk/gtkcalendar.c:2037 gtk/gtkcalendar.c:2719
+#: ../gtk/gtkcalendar.c:1879
+#: ../gtk/gtkcalendar.c:2564
 #, c-format
 msgctxt "calendar:day:digits"
 msgid "%d"
@@ -534,7 +538,8 @@ msgstr "%d"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: gtk/gtkcalendar.c:2069 gtk/gtkcalendar.c:2579
+#: ../gtk/gtkcalendar.c:1911
+#: ../gtk/gtkcalendar.c:2432
 #, c-format
 msgctxt "calendar:week:digits"
 msgid "%d"
@@ -550,7 +555,7 @@ msgstr "%d"
 #. *
 #. * "%Y" is appropriate for most locales.
 #.
-#: gtk/gtkcalendar.c:2361
+#: ../gtk/gtkcalendar.c:2197
 msgctxt "calendar year format"
 msgid "%Y"
 msgstr "%Y"
@@ -558,7 +563,7 @@ msgstr "%Y"
 #. This label is displayed in a treeview cell displaying
 #. * a disabled accelerator key combination.
 #.
-#: gtk/gtkcellrendereraccel.c:272
+#: ../gtk/gtkcellrendereraccel.c:272
 msgctxt "Accelerator"
 msgid "Disabled"
 msgstr "Dinonaktifkan"
@@ -567,7 +572,7 @@ msgstr "Dinonaktifkan"
 #. * an accelerator key combination that is not valid according
 #. * to gtk_accelerator_valid().
 #.
-#: gtk/gtkcellrendereraccel.c:282
+#: ../gtk/gtkcellrendereraccel.c:282
 msgctxt "Accelerator"
 msgid "Invalid"
 msgstr "Tak valid"
@@ -576,160 +581,133 @@ msgstr "Tak valid"
 #. * an accelerator when the cell is clicked to change the
 #. * acelerator.
 #.
-#: gtk/gtkcellrendereraccel.c:418 gtk/gtkcellrendereraccel.c:675
+#: ../gtk/gtkcellrendereraccel.c:418
+#: ../gtk/gtkcellrendereraccel.c:675
 msgid "New accelerator..."
 msgstr "Akselerator baru..."
 
-#: gtk/gtkcellrendererprogress.c:362 gtk/gtkcellrendererprogress.c:452
+#: ../gtk/gtkcellrendererprogress.c:362
+#: ../gtk/gtkcellrendererprogress.c:452
 #, c-format
 msgctxt "progress bar label"
 msgid "%d %%"
 msgstr "%d %%"
 
-#: gtk/gtkcolorbutton.c:176 gtk/gtkcolorbutton.c:445
+#: ../gtk/gtkcolorbutton.c:188
+#: ../gtk/gtkcolorbutton.c:473
 msgid "Pick a Color"
 msgstr "Pilih Warna"
 
-#: gtk/gtkcolorbutton.c:336
+#: ../gtk/gtkcolorbutton.c:363
 msgid "Received invalid color data\n"
 msgstr "Menerima data warna yang salah\n"
 
-#: gtk/gtkcolorsel.c:384
-msgid ""
-"Select the color you want from the outer ring. Select the darkness or "
-"lightness of that color using the inner triangle."
-msgstr ""
-"Pilih warna untuk ring terluar. Pilih tingkat kegelapan atau keterangan pada "
-"warna tersebut menggunakan segitiga yang ada di dalam."
+#: ../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."
+msgstr "Pilih warna untuk ring terluar. Pilih tingkat kegelapan atau keterangan pada warna tersebut menggunakan segitiga yang ada di dalam."
 
-#: gtk/gtkcolorsel.c:408
-msgid ""
-"Click the eyedropper, then click a color anywhere on your screen to select "
-"that color."
-msgstr ""
-"Klik pada pengambil warna, lalu klik pada warna apa saja di layar untuk "
-"memilih warna tersebut."
+#: ../gtk/gtkcolorsel.c:440
+msgid "Click the eyedropper, then click a color anywhere on your screen to select that color."
+msgstr "Klik pada pengambil warna, lalu klik pada warna apa saja di layar untuk memilih warna tersebut."
 
-#: gtk/gtkcolorsel.c:417
+#: ../gtk/gtkcolorsel.c:449
 msgid "_Hue:"
 msgstr "_Corak:"
 
-#: gtk/gtkcolorsel.c:418
+#: ../gtk/gtkcolorsel.c:450
 msgid "Position on the color wheel."
 msgstr "Posisi pada roda warna."
 
-#: gtk/gtkcolorsel.c:420
+#: ../gtk/gtkcolorsel.c:452
 msgid "_Saturation:"
 msgstr "_Saturasi:"
 
-#: gtk/gtkcolorsel.c:421
+#: ../gtk/gtkcolorsel.c:453
 msgid "Intensity of the color."
 msgstr "Intensitas warna."
 
-#: gtk/gtkcolorsel.c:422
+#: ../gtk/gtkcolorsel.c:454
 msgid "_Value:"
 msgstr "_Nilai:"
 
-#: gtk/gtkcolorsel.c:423
+#: ../gtk/gtkcolorsel.c:455
 msgid "Brightness of the color."
 msgstr "Kecerahan warna."
 
-#: gtk/gtkcolorsel.c:424
+#: ../gtk/gtkcolorsel.c:456
 msgid "_Red:"
 msgstr "Me_rah:"
 
-#: gtk/gtkcolorsel.c:425
+#: ../gtk/gtkcolorsel.c:457
 msgid "Amount of red light in the color."
 msgstr "Intensiyas cahaya merah pada warna."
 
-#: gtk/gtkcolorsel.c:426
+#: ../gtk/gtkcolorsel.c:458
 msgid "_Green:"
 msgstr "_Hijau:"
 
-#: gtk/gtkcolorsel.c:427
+#: ../gtk/gtkcolorsel.c:459
 msgid "Amount of green light in the color."
 msgstr "Intensitas cahaya hijau pada warna."
 
-#: gtk/gtkcolorsel.c:428
+#: ../gtk/gtkcolorsel.c:460
 msgid "_Blue:"
 msgstr "_Biru:"
 
-#: gtk/gtkcolorsel.c:429
+#: ../gtk/gtkcolorsel.c:461
 msgid "Amount of blue light in the color."
 msgstr "Intensitas cahaya biru pada warna."
 
-#: gtk/gtkcolorsel.c:432
+#: ../gtk/gtkcolorsel.c:464
 msgid "Op_acity:"
 msgstr "Op_asitas:"
 
-#: gtk/gtkcolorsel.c:439 gtk/gtkcolorsel.c:449
+#: ../gtk/gtkcolorsel.c:471
+#: ../gtk/gtkcolorsel.c:481
 msgid "Transparency of the color."
 msgstr "Nilai transparansi warna."
 
-#: gtk/gtkcolorsel.c:456
+#: ../gtk/gtkcolorsel.c:488
 msgid "Color _name:"
 msgstr "_Nama warna:"
 
-#: gtk/gtkcolorsel.c:470
-msgid ""
-"You can enter an HTML-style hexadecimal color value, or simply a color name "
-"such as 'orange' in this entry."
-msgstr ""
-"Anda dapat memasukkan nilai warna dalam gaya HTML heksadesimal, atau bisa "
-"juga masukkan namanya, misalnya 'orange'."
+#: ../gtk/gtkcolorsel.c:502
+msgid "You can enter an HTML-style hexadecimal color value, or simply a color name such as 'orange' in this entry."
+msgstr "Anda dapat memasukkan nilai warna dalam gaya HTML heksadesimal, atau bisa juga masukkan namanya, misalnya 'orange'."
 
-#: gtk/gtkcolorsel.c:500
+#: ../gtk/gtkcolorsel.c:532
 msgid "_Palette:"
 msgstr "_Palet:"
 
-#: gtk/gtkcolorsel.c:529
+#: ../gtk/gtkcolorsel.c:561
 msgid "Color Wheel"
 msgstr "Roda Warna"
 
-#: gtk/gtkcolorsel.c:988
-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 "
-"current by dragging it to the other color swatch alongside."
-msgstr ""
-"Warna yang sebelumnya dipilih sebagai warna perbandingan dengan warna yang "
-"Anda pilih sekarang. Ambil warna ini ke dalam palet, atau pilih warna ini "
-"sebagai warna aktif dengan menyeretnya ke dalam kotak warna."
+#: ../gtk/gtkcolorsel.c:1031
+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 current by dragging it to the other color swatch alongside."
+msgstr "Warna yang sebelumnya dipilih sebagai warna perbandingan dengan warna yang Anda pilih sekarang. Ambil warna ini ke dalam palet, atau pilih warna ini sebagai warna aktif dengan menyeretnya ke dalam kotak warna."
 
-#: gtk/gtkcolorsel.c:991
-msgid ""
-"The color you've chosen. You can drag this color to a palette entry to save "
-"it for use in the future."
-msgstr ""
-"Warna yang Anda pilih. Ambil warna ini ke dalam palet agar dapat digunakan "
-"di kemudian hari"
+#: ../gtk/gtkcolorsel.c:1034
+msgid "The color you've chosen. You can drag this color to a palette entry to save it for use in the future."
+msgstr "Warna yang Anda pilih. Ambil warna ini ke dalam palet agar dapat digunakan di kemudian hari"
 
-#: gtk/gtkcolorsel.c:996
-msgid ""
-"The previously-selected color, for comparison to the color you're selecting "
-"now."
-msgstr ""
-"Warna yang sebelumnya dipilih, untuk perbandingan dengan warna yang kini "
-"sedang Anda pilih."
+#: ../gtk/gtkcolorsel.c:1039
+msgid "The previously-selected color, for comparison to the color you're selecting now."
+msgstr "Warna yang sebelumnya dipilih, untuk perbandingan dengan warna yang kini sedang Anda pilih."
 
-#: gtk/gtkcolorsel.c:999
+#: ../gtk/gtkcolorsel.c:1042
 msgid "The color you've chosen."
 msgstr "Warna yang telah Anda pilih."
 
-#: gtk/gtkcolorsel.c:1396
+#: ../gtk/gtkcolorsel.c:1442
 msgid "_Save color here"
 msgstr "_Simpan warna di sini"
 
-#: gtk/gtkcolorsel.c:1601
-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.\""
-msgstr ""
-"Klik pada palet untuk menjadikannya sebagai warna aktif. Untuk merubahnya, "
-"ambil warna pada kotak warna atau klik kanan dan pilih \"Simpan warna di sini"
-"\""
+#: ../gtk/gtkcolorsel.c:1647
+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.\""
+msgstr "Klik pada palet untuk menjadikannya sebagai warna aktif. Untuk merubahnya, ambil warna pada kotak warna atau klik kanan dan pilih \"Simpan warna di sini\""
 
-#: gtk/gtkcolorseldialog.c:189
+#: ../gtk/gtkcolorseldialog.c:189
 msgid "Color Selection"
 msgstr "Pemilihan Warna"
 
@@ -739,137 +717,142 @@ msgstr "Pemilihan Warna"
 #. * 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:374
+#: ../gtk/gtkprintunixdialog.c:3240
 msgid "Manage Custom Sizes"
 msgstr "Kelola Ukuran Sesuaian"
 
-#: gtk/gtkcustompaperunixdialog.c:534 gtk/gtkpagesetupunixdialog.c:790
+#: ../gtk/gtkcustompaperunixdialog.c:534
+#: ../gtk/gtkpagesetupunixdialog.c:790
 msgid "inch"
 msgstr "inci"
 
-#: gtk/gtkcustompaperunixdialog.c:536 gtk/gtkpagesetupunixdialog.c:788
+#: ../gtk/gtkcustompaperunixdialog.c:536
+#: ../gtk/gtkpagesetupunixdialog.c:788
 msgid "mm"
 msgstr "mm"
 
-#: gtk/gtkcustompaperunixdialog.c:581
+#: ../gtk/gtkcustompaperunixdialog.c:581
 msgid "Margins from Printer..."
 msgstr "Batas dari Pencetak..."
 
-#: gtk/gtkcustompaperunixdialog.c:747
+#: ../gtk/gtkcustompaperunixdialog.c:747
 #, c-format
 msgid "Custom Size %d"
 msgstr "Ukuran sesuaian %d"
 
-#: gtk/gtkcustompaperunixdialog.c:1059
+#: ../gtk/gtkcustompaperunixdialog.c:1059
 msgid "_Width:"
 msgstr "_Lebar:"
 
-#: gtk/gtkcustompaperunixdialog.c:1071
+#: ../gtk/gtkcustompaperunixdialog.c:1071
 msgid "_Height:"
 msgstr "_Tinggi:"
 
-#: gtk/gtkcustompaperunixdialog.c:1083
+#: ../gtk/gtkcustompaperunixdialog.c:1083
 msgid "Paper Size"
 msgstr "Ukuran Kertas"
 
-#: gtk/gtkcustompaperunixdialog.c:1092
+#: ../gtk/gtkcustompaperunixdialog.c:1092
 msgid "_Top:"
 msgstr "A_tas:"
 
-#: gtk/gtkcustompaperunixdialog.c:1104
+#: ../gtk/gtkcustompaperunixdialog.c:1104
 msgid "_Bottom:"
 msgstr "_Bawah:"
 
-#: gtk/gtkcustompaperunixdialog.c:1116
+#: ../gtk/gtkcustompaperunixdialog.c:1116
 msgid "_Left:"
 msgstr "K_iri"
 
-#: gtk/gtkcustompaperunixdialog.c:1128
+#: ../gtk/gtkcustompaperunixdialog.c:1128
 msgid "_Right:"
 msgstr "_Kanan:"
 
-#: gtk/gtkcustompaperunixdialog.c:1169
+#: ../gtk/gtkcustompaperunixdialog.c:1169
 msgid "Paper Margins"
 msgstr "Margin Kertas"
 
-#: gtk/gtkentry.c:8601 gtk/gtktextview.c:8248
+#: ../gtk/gtkentry.c:8794
+#: ../gtk/gtktextview.c:8229
 msgid "Input _Methods"
 msgstr "_Metode Input"
 
-#: gtk/gtkentry.c:8615 gtk/gtktextview.c:8262
+#: ../gtk/gtkentry.c:8808
+#: ../gtk/gtktextview.c:8243
 msgid "_Insert Unicode Control Character"
 msgstr "_Isikan karakter kontrol Unicode"
 
-#: gtk/gtkentry.c:10015
+#: ../gtk/gtkentry.c:10208
 msgid "Caps Lock and Num Lock are on"
 msgstr "Tombol Caps Lock dan Num Lock sedang aktif"
 
-#: gtk/gtkentry.c:10017
+#: ../gtk/gtkentry.c:10210
 msgid "Num Lock is on"
 msgstr "Num Lock menyala"
 
-#: gtk/gtkentry.c:10019
+#: ../gtk/gtkentry.c:10212
 msgid "Caps Lock is on"
 msgstr "Caps Lock menyala"
 
 #. **************** *
 #. *  Private Macros  *
 #. * ****************
-#: gtk/gtkfilechooserbutton.c:61
+#: ../gtk/gtkfilechooserbutton.c:61
 msgid "Select A File"
 msgstr "Pilih Berkas"
 
-#: gtk/gtkfilechooserbutton.c:62 gtk/gtkfilechooserdefault.c:1812
+#: ../gtk/gtkfilechooserbutton.c:62
+#: ../gtk/gtkfilechooserdefault.c:1833
 msgid "Desktop"
 msgstr "Desktop"
 
-#: gtk/gtkfilechooserbutton.c:63
+#: ../gtk/gtkfilechooserbutton.c:63
 msgid "(None)"
 msgstr "(Nihil)"
 
-#: gtk/gtkfilechooserbutton.c:2005
+#: ../gtk/gtkfilechooserbutton.c:2001
 msgid "Other..."
 msgstr "Lainnya..."
 
-#: gtk/gtkfilechooserdefault.c:148
+#: ../gtk/gtkfilechooserdefault.c:147
 msgid "Type name of new folder"
 msgstr "Ketikkan nama folder baru"
 
-#: gtk/gtkfilechooserdefault.c:938
+#: ../gtk/gtkfilechooserdefault.c:946
 msgid "Could not retrieve information about the file"
 msgstr "Informasi mengenai berkas ini tidak tersedia"
 
-#: gtk/gtkfilechooserdefault.c:949
+#: ../gtk/gtkfilechooserdefault.c:957
 msgid "Could not add a bookmark"
 msgstr "Tidak dapat menambah buku alamat"
 
-#: gtk/gtkfilechooserdefault.c:960
+#: ../gtk/gtkfilechooserdefault.c:968
 msgid "Could not remove bookmark"
 msgstr "Tidak dapat menghapus penanda alamat"
 
-#: gtk/gtkfilechooserdefault.c:971
+#: ../gtk/gtkfilechooserdefault.c:979
 msgid "The folder could not be created"
 msgstr "Folder tidak dapat dibuat"
 
-#: gtk/gtkfilechooserdefault.c:984
-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 ""
-"Folder ini tidak dapat dibuat karena sudah ada berkas di situ dengan nama "
-"yang sama. Silakan ganti nama folder ini, atau ganti nama berkas itu "
-"terlebih dahulu."
+#: ../gtk/gtkfilechooserdefault.c:992
+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 "Folder ini tidak dapat dibuat karena sudah ada berkas di situ dengan nama yang sama. Silakan ganti nama folder ini, atau ganti nama berkas itu terlebih dahulu."
 
-#: gtk/gtkfilechooserdefault.c:995
+#: ../gtk/gtkfilechooserdefault.c:1006
+msgid "You may only select folders.  The item that you selected is not a folder; try using a different item."
+msgstr "Anda hanya boleh memilih folder.  Butir yang Anda pilih bukan folder; cobalah memilih butir lain."
+
+#: ../gtk/gtkfilechooserdefault.c:1016
 msgid "Invalid file name"
 msgstr "Nama berkas tidak sah"
 
-#: gtk/gtkfilechooserdefault.c:1005
+#: ../gtk/gtkfilechooserdefault.c:1026
 msgid "The folder contents could not be displayed"
 msgstr "Isi folder tidak dapat ditampilkan"
 
@@ -877,239 +860,241 @@ msgstr "Isi folder tidak dapat ditampilkan"
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: gtk/gtkfilechooserdefault.c:1555
+#: ../gtk/gtkfilechooserdefault.c:1576
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s pada %2$s"
 
-#: gtk/gtkfilechooserdefault.c:1731
+#: ../gtk/gtkfilechooserdefault.c:1752
 msgid "Search"
 msgstr "Cari"
 
-#: gtk/gtkfilechooserdefault.c:1755 gtk/gtkfilechooserdefault.c:9289
+#: ../gtk/gtkfilechooserdefault.c:1776
+#: ../gtk/gtkfilechooserdefault.c:9417
 msgid "Recently Used"
 msgstr "Baru-baru Ini Digunakan"
 
-#: gtk/gtkfilechooserdefault.c:2409
+#: ../gtk/gtkfilechooserdefault.c:2437
 msgid "Select which types of files are shown"
 msgstr "Pilih jenis berkas yang ingin ditampilkan"
 
-#: gtk/gtkfilechooserdefault.c:2768
+#: ../gtk/gtkfilechooserdefault.c:2796
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Menambahkan folder '%s' dalam penanda tautan"
 
-#: gtk/gtkfilechooserdefault.c:2812
+#: ../gtk/gtkfilechooserdefault.c:2840
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Masukkan folder ini dalam penanda tautan"
 
-#: gtk/gtkfilechooserdefault.c:2814
+#: ../gtk/gtkfilechooserdefault.c:2842
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Menambahkan folder yang dipilih dalam penanda tautan"
 
-#: gtk/gtkfilechooserdefault.c:2852
+#: ../gtk/gtkfilechooserdefault.c:2880
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Menghapus penanda '%s'"
 
-#: gtk/gtkfilechooserdefault.c:2854
+#: ../gtk/gtkfilechooserdefault.c:2882
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "Penanda '%s' tidak dapat dihapus"
 
-#: gtk/gtkfilechooserdefault.c:2861 gtk/gtkfilechooserdefault.c:3725
+#: ../gtk/gtkfilechooserdefault.c:2889
+#: ../gtk/gtkfilechooserdefault.c:3750
 msgid "Remove the selected bookmark"
 msgstr "Menghapus penanda yang dipilih"
 
-#: gtk/gtkfilechooserdefault.c:3421
+#: ../gtk/gtkfilechooserdefault.c:3445
 msgid "Remove"
 msgstr "Hapus"
 
-#: gtk/gtkfilechooserdefault.c:3430
+#: ../gtk/gtkfilechooserdefault.c:3454
 msgid "Rename..."
 msgstr "Ubah Nama..."
 
 #. Accessible object name for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3593
+#: ../gtk/gtkfilechooserdefault.c:3617
 msgid "Places"
 msgstr "Lokasi"
 
 #. Column header for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3650
+#: ../gtk/gtkfilechooserdefault.c:3674
 msgid "_Places"
 msgstr "_Lokasi"
 
-#: gtk/gtkfilechooserdefault.c:3706
+#: ../gtk/gtkfilechooserdefault.c:3731
 msgid "_Add"
 msgstr "T_ambah"
 
-#: gtk/gtkfilechooserdefault.c:3713
+#: ../gtk/gtkfilechooserdefault.c:3738
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Menambahkan folder yang dipilih dalam Penanda Tautan"
 
-#: gtk/gtkfilechooserdefault.c:3718
+#: ../gtk/gtkfilechooserdefault.c:3743
 msgid "_Remove"
 msgstr "_Hapus"
 
-#: gtk/gtkfilechooserdefault.c:3860
+#: ../gtk/gtkfilechooserdefault.c:3885
 msgid "Could not select file"
 msgstr "Tidak dapat memilih berkas"
 
-#: gtk/gtkfilechooserdefault.c:4035
+#: ../gtk/gtkfilechooserdefault.c:4060
 msgid "_Add to Bookmarks"
 msgstr "T_ambah dalam Penanda Tautan"
 
-#: gtk/gtkfilechooserdefault.c:4048
+#: ../gtk/gtkfilechooserdefault.c:4073
 msgid "Show _Hidden Files"
 msgstr "_Tampilkan Berkas Tersembunyi"
 
-#: gtk/gtkfilechooserdefault.c:4055
+#: ../gtk/gtkfilechooserdefault.c:4080
 msgid "Show _Size Column"
 msgstr "Tampilkan Kolom _Ukuran"
 
-#: gtk/gtkfilechooserdefault.c:4281
+#: ../gtk/gtkfilechooserdefault.c:4306
 msgid "Files"
 msgstr "Berkas"
 
-#: gtk/gtkfilechooserdefault.c:4332
+#: ../gtk/gtkfilechooserdefault.c:4357
 msgid "Name"
 msgstr "Nama"
 
-#: gtk/gtkfilechooserdefault.c:4355
+#: ../gtk/gtkfilechooserdefault.c:4380
 msgid "Size"
 msgstr "Ukuran"
 
-#: gtk/gtkfilechooserdefault.c:4369
+#: ../gtk/gtkfilechooserdefault.c:4394
 msgid "Modified"
 msgstr "Diubah"
 
 #. Label
-#: gtk/gtkfilechooserdefault.c:4624 gtk/gtkprinteroptionwidget.c:801
+#: ../gtk/gtkfilechooserdefault.c:4649
+#: ../gtk/gtkprinteroptionwidget.c:793
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: gtk/gtkfilechooserdefault.c:4667
+#: ../gtk/gtkfilechooserdefault.c:4692
 msgid "_Browse for other folders"
 msgstr "_Lihat folder lainnya"
 
-#: gtk/gtkfilechooserdefault.c:4937
+#: ../gtk/gtkfilechooserdefault.c:4962
 msgid "Type a file name"
 msgstr "Ketikkan nama berkas"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:4980
+#: ../gtk/gtkfilechooserdefault.c:5005
 msgid "Create Fo_lder"
 msgstr "Buat Fo_lder"
 
-#: gtk/gtkfilechooserdefault.c:4990
+#: ../gtk/gtkfilechooserdefault.c:5015
 msgid "_Location:"
 msgstr "_Lokasi:"
 
-#: gtk/gtkfilechooserdefault.c:5194
+#: ../gtk/gtkfilechooserdefault.c:5219
 msgid "Save in _folder:"
 msgstr "Simpan dalam _folder:"
 
-#: gtk/gtkfilechooserdefault.c:5196
+#: ../gtk/gtkfilechooserdefault.c:5221
 msgid "Create in _folder:"
 msgstr "Buat dalam _folder:"
 
-#: gtk/gtkfilechooserdefault.c:6248
+#: ../gtk/gtkfilechooserdefault.c:6290
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "Tidak dapat membaca isi dari %s"
 
-#: gtk/gtkfilechooserdefault.c:6252
+#: ../gtk/gtkfilechooserdefault.c:6294
 msgid "Could not read the contents of the folder"
 msgstr "Tidak bisa membaca isi dari folder"
 
-#: gtk/gtkfilechooserdefault.c:6345 gtk/gtkfilechooserdefault.c:6413
-#: gtk/gtkfilechooserdefault.c:6558
+#: ../gtk/gtkfilechooserdefault.c:6387
+#: ../gtk/gtkfilechooserdefault.c:6455
+#: ../gtk/gtkfilechooserdefault.c:6600
 msgid "Unknown"
 msgstr "Tidak Diketahui"
 
-#: gtk/gtkfilechooserdefault.c:6360
+#: ../gtk/gtkfilechooserdefault.c:6402
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: gtk/gtkfilechooserdefault.c:6362
+#: ../gtk/gtkfilechooserdefault.c:6404
 msgid "Yesterday at %H:%M"
 msgstr "Kemarin, pukul %H:%M"
 
-#: gtk/gtkfilechooserdefault.c:7028
+#: ../gtk/gtkfilechooserdefault.c:7070
 msgid "Cannot change to folder because it is not local"
 msgstr "Tidak dapat mengganti folder karena tidak berada pada komputer lokal"
 
-#: gtk/gtkfilechooserdefault.c:7625 gtk/gtkfilechooserdefault.c:7646
+#: ../gtk/gtkfilechooserdefault.c:7667
+#: ../gtk/gtkfilechooserdefault.c:7688
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "Pintasan %s sudah ada"
 
-#: gtk/gtkfilechooserdefault.c:7736
+#: ../gtk/gtkfilechooserdefault.c:7778
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Pintasan %s tidak ada"
 
-#: gtk/gtkfilechooserdefault.c:7997 gtk/gtkprintunixdialog.c:480
+#: ../gtk/gtkfilechooserdefault.c:8039
+#: ../gtk/gtkprintunixdialog.c:480
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Berkas \"%s\" sudah ada. Timpa?"
 
-#: gtk/gtkfilechooserdefault.c:8000 gtk/gtkprintunixdialog.c:484
+#: ../gtk/gtkfilechooserdefault.c:8042
+#: ../gtk/gtkprintunixdialog.c:484
 #, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr ""
-"Berkas sudah ada dalam \"%s\". Berkas lama akan diganti dengan yang baru "
-"bila Anda menimpanya."
+msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr "Berkas sudah ada dalam \"%s\". Berkas lama akan diganti dengan yang baru bila Anda menimpanya."
 
-#: gtk/gtkfilechooserdefault.c:8005 gtk/gtkprintunixdialog.c:491
+#: ../gtk/gtkfilechooserdefault.c:8047
+#: ../gtk/gtkprintunixdialog.c:491
 msgid "_Replace"
 msgstr "_Timpa"
 
-#: gtk/gtkfilechooserdefault.c:8658
+#: ../gtk/gtkfilechooserdefault.c:8755
 msgid "Could not start the search process"
 msgstr "Tidak dapat memulai proses pencarian"
 
-#: gtk/gtkfilechooserdefault.c:8659
-msgid ""
-"The program was not able to create a connection to the indexer daemon.  "
-"Please make sure it is running."
-msgstr ""
-"Program tidak dapat membuat koneksi ke indexer daemon.  Pastikan program "
-"sedang berjalan."
+#: ../gtk/gtkfilechooserdefault.c:8756
+msgid "The program was not able to create a connection to the indexer daemon.  Please make sure it is running."
+msgstr "Program tidak dapat membuat koneksi ke indexer daemon.  Pastikan program sedang berjalan."
 
-#: gtk/gtkfilechooserdefault.c:8673
+#: ../gtk/gtkfilechooserdefault.c:8770
 msgid "Could not send the search request"
 msgstr "Tidak dapat mengirim permintaan pencarian"
 
-#: gtk/gtkfilechooserdefault.c:8861
+#: ../gtk/gtkfilechooserdefault.c:8989
 msgid "Search:"
 msgstr "Cari:"
 
-#: gtk/gtkfilechooserdefault.c:9466
+#: ../gtk/gtkfilechooserdefault.c:9594
 #, c-format
 msgid "Could not mount %s"
 msgstr "Tidak dapat mengaitkan %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:1172
 msgid "Invalid path"
 msgstr "Lokasi salah"
 
 #. 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:1104
 msgid "No match"
 msgstr "Tak ada yang cocok"
 
 #. 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:1115
 msgid "Sole completion"
 msgstr "Hasil satu-satunya"
 
@@ -1117,13 +1102,13 @@ msgstr "Hasil satu-satunya"
 #. * entry is a complete filename, but could be continued to find
 #. * a longer match
 #.
-#: gtk/gtkfilechooserentry.c:1128
+#: ../gtk/gtkfilechooserentry.c:1131
 msgid "Complete, but not unique"
 msgstr "Lengkap, tapi tak unik"
 
 #. 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:1163
 msgid "Completing..."
 msgstr "Sedang menyelesaikan..."
 
@@ -1131,7 +1116,8 @@ msgstr "Sedang menyelesaikan..."
 #. 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:1185
+#: ../gtk/gtkfilechooserentry.c:1210
 msgid "Only local files may be selected"
 msgstr "Hanya boleh memilih berkas lokal"
 
@@ -1139,80 +1125,76 @@ msgstr "Hanya boleh memilih berkas lokal"
 #. 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:1194
 msgid "Incomplete hostname; end it with '/'"
 msgstr "Nama host tak lengkap; akhirilah dengan '/'"
 
 #. 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:1205
 msgid "Path does not exist"
 msgstr "Lokasi tidak ada"
 
-#: gtk/gtkfilechoosersettings.c:486
-#, c-format
-msgid "Error creating folder '%s': %s"
-msgstr "Galat ketika membuat folder '%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 Berkas"
 
-#: gtk/gtkfontbutton.c:142 gtk/gtkfontbutton.c:266
+#: ../gtk/gtkfontbutton.c:142
+#: ../gtk/gtkfontbutton.c:266
 msgid "Pick a Font"
 msgstr "Pilih Fonta"
 
 #. Initialize fields
-#: gtk/gtkfontbutton.c:260
+#: ../gtk/gtkfontbutton.c:260
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: gtk/gtkfontbutton.c:785
+#: ../gtk/gtkfontbutton.c:785
 msgid "Font"
 msgstr "Fonta"
 
 #. 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:103
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "abcdefghijk ABCDEFGHIJK"
 
-#: gtk/gtkfontsel.c:370
+#: ../gtk/gtkfontsel.c:370
 msgid "_Family:"
 msgstr "_Keluarga:"
 
-#: gtk/gtkfontsel.c:376
+#: ../gtk/gtkfontsel.c:376
 msgid "_Style:"
 msgstr "_Gaya:"
 
-#: gtk/gtkfontsel.c:382
+#: ../gtk/gtkfontsel.c:382
 msgid "Si_ze:"
 msgstr "_Ukuran:"
 
 #. create the text entry widget
-#: gtk/gtkfontsel.c:559
+#: ../gtk/gtkfontsel.c:558
 msgid "_Preview:"
 msgstr "_Pratinjau:"
 
-#: gtk/gtkfontsel.c:1659
+#: ../gtk/gtkfontsel.c:1658
 msgid "Font Selection"
 msgstr "Seleksi Fonta"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: gtk/gtkiconfactory.c:1356
+#: ../gtk/gtkiconfactory.c:1356
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "Galat ketika memuat ikon: %s"
 
-#: gtk/gtkicontheme.c:1354
+#: ../gtk/gtkicontheme.c:1355
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1225,75 +1207,75 @@ msgstr ""
 "Anda bisa mendapatkannya dari:\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1535
+#: ../gtk/gtkicontheme.c:1536
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Ikon '%s' tidak ada pada tema"
 
-#: gtk/gtkicontheme.c:3048
+#: ../gtk/gtkicontheme.c:3057
 msgid "Failed to load icon"
 msgstr "Gagal memuat ikon"
 
-#: gtk/gtkimmodule.c:526
+#: ../gtk/gtkimmodule.c:526
 msgid "Simple"
 msgstr "Sederhana"
 
-#: 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 "Nihil"
 
-#: 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:6214
 msgid "_Open Link"
 msgstr "_Buka Taut"
 
 #. Copy Link Address
-#: gtk/gtklabel.c:6214
+#: ../gtk/gtklabel.c:6226
 msgid "Copy _Link Address"
 msgstr "Sa_lin Alamat Taut"
 
-#: gtk/gtklinkbutton.c:449
+#: ../gtk/gtklinkbutton.c:484
 msgid "Copy URL"
 msgstr "Salin URL"
 
-#: gtk/gtklinkbutton.c:601
+#: ../gtk/gtklinkbutton.c:647
 msgid "Invalid URI"
 msgstr "URI Salah"
 
 #. Description of --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:526
+#: ../gtk/gtkmain.c:518
 msgid "Load additional GTK+ modules"
 msgstr "Panggil modul GTK+ lainnya"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:527
+#: ../gtk/gtkmain.c:519
 msgid "MODULES"
 msgstr "MODUL"
 
 #. Description of --g-fatal-warnings in --help output
-#: gtk/gtkmain.c:529
+#: ../gtk/gtkmain.c:521
 msgid "Make all warnings fatal"
 msgstr "Buat semua peringatan menjadi pesan fatal"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: gtk/gtkmain.c:532
+#: ../gtk/gtkmain.c:524
 msgid "GTK+ debugging flags to set"
 msgstr "Bendera debug GTK+ yang hendak dipasang"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: gtk/gtkmain.c:535
+#: ../gtk/gtkmain.c:527
 msgid "GTK+ debugging flags to unset"
 msgstr "Bendera debug GTK+ yang hendak dilepas"
 
@@ -1302,124 +1284,125 @@ msgstr "Bendera debug GTK+ yang hendak dilepas"
 #. * 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:790
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: gtk/gtkmain.c:863
+#: ../gtk/gtkmain.c:855
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "Tak bisa membuka tampilan: %s"
 
-#: gtk/gtkmain.c:922
+#: ../gtk/gtkmain.c:914
 msgid "GTK+ Options"
 msgstr "Opsi GTK+"
 
-#: gtk/gtkmain.c:922
+#: ../gtk/gtkmain.c:914
 msgid "Show GTK+ Options"
 msgstr "Menampilkan Opsi GTK+"
 
-#: gtk/gtkmountoperation.c:491
+#: ../gtk/gtkmountoperation.c:491
 msgid "Co_nnect"
 msgstr "Sambu_ng"
 
-#: gtk/gtkmountoperation.c:558
+#: ../gtk/gtkmountoperation.c:558
 msgid "Connect _anonymously"
 msgstr "Menyambung _anonim"
 
-#: gtk/gtkmountoperation.c:567
+#: ../gtk/gtkmountoperation.c:567
 msgid "Connect as u_ser:"
 msgstr "Terhubung _sebagai pengguna:"
 
-#: gtk/gtkmountoperation.c:605
+#: ../gtk/gtkmountoperation.c:605
 msgid "_Username:"
 msgstr "Nama Pengg_una:"
 
-#: gtk/gtkmountoperation.c:610
+#: ../gtk/gtkmountoperation.c:610
 msgid "_Domain:"
 msgstr "_Domain:"
 
-#: gtk/gtkmountoperation.c:616
+#: ../gtk/gtkmountoperation.c:616
 msgid "_Password:"
 msgstr "_Sandi:"
 
-#: gtk/gtkmountoperation.c:634
+#: ../gtk/gtkmountoperation.c:634
 msgid "Forget password _immediately"
 msgstr "Lupakan sandi seket_ika"
 
-#: gtk/gtkmountoperation.c:644
+#: ../gtk/gtkmountoperation.c:644
 msgid "Remember password until you _logout"
 msgstr "Ingat sandi sampai Anda _log keluar"
 
-#: gtk/gtkmountoperation.c:654
+#: ../gtk/gtkmountoperation.c:654
 msgid "Remember _forever"
 msgstr "Ingat sela_manya"
 
-#: gtk/gtkmountoperation.c:883
+#: ../gtk/gtkmountoperation.c:883
 #, c-format
 msgid "Unknown Application (PID %d)"
 msgstr "Aplikasi Tak Dikenal (PID %d)"
 
-#: gtk/gtkmountoperation.c:1066
-#, c-format
+#: ../gtk/gtkmountoperation.c:1066
 msgid "Unable to end process"
 msgstr "Tak bisa mengakhiri proses"
 
-#: gtk/gtkmountoperation.c:1103
+#: ../gtk/gtkmountoperation.c:1103
 msgid "_End Process"
 msgstr "Akhiri Pros_es"
 
-#: gtk/gtkmountoperation-stub.c:64
+#: ../gtk/gtkmountoperation-stub.c:64
 #, c-format
 msgid "Cannot kill process with PID %d. Operation is not implemented."
-msgstr ""
-"Tidak dapat membunuh proses dengan PID %d. Operasi belum diimplementasi."
+msgstr "Tidak dapat membunuh proses dengan PID %d. Operasi belum diimplementasi."
 
 #. translators: this string is a name for the 'less' command
-#: gtk/gtkmountoperation-x11.c:862
+#: ../gtk/gtkmountoperation-x11.c:862
 msgid "Terminal Pager"
 msgstr "Penyeranta Terminal"
 
 # Ini untuk perintah "top".
-#: gtk/gtkmountoperation-x11.c:863
+#: ../gtk/gtkmountoperation-x11.c:863
 msgid "Top Command"
 msgstr "Perintah Top"
 
-#: gtk/gtkmountoperation-x11.c:864
+#: ../gtk/gtkmountoperation-x11.c:864
 msgid "Bourne Again Shell"
 msgstr "Bourne Again Shell"
 
-#: gtk/gtkmountoperation-x11.c:865
+#: ../gtk/gtkmountoperation-x11.c:865
 msgid "Bourne Shell"
 msgstr "Bourne Shell"
 
-#: gtk/gtkmountoperation-x11.c:866
+#: ../gtk/gtkmountoperation-x11.c:866
 msgid "Z Shell"
 msgstr "Z Shell"
 
-#: gtk/gtkmountoperation-x11.c:963
+#: ../gtk/gtkmountoperation-x11.c:963
 #, c-format
 msgid "Cannot end process with PID %d: %s"
 msgstr "Tidak dapat mengakhiri proses dengan PID %d: %s"
 
-#: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170
+#: ../gtk/gtknotebook.c:4756
+#: ../gtk/gtknotebook.c:7319
 #, c-format
 msgid "Page %u"
 msgstr "Halaman %u"
 
-#: gtk/gtkpagesetup.c:596 gtk/gtkpapersize.c:838 gtk/gtkpapersize.c:880
+#: ../gtk/gtkpagesetup.c:648
+#: ../gtk/gtkpapersize.c:838
+#: ../gtk/gtkpapersize.c:880
 msgid "Not a valid page setup file"
 msgstr "Bukan berkas tata halaman yang sah"
 
-#: gtk/gtkpagesetupunixdialog.c:179
+#: ../gtk/gtkpagesetupunixdialog.c:179
 msgid "Any Printer"
 msgstr "Pencetak Apa Saja"
 
-#: gtk/gtkpagesetupunixdialog.c:179
+#: ../gtk/gtkpagesetupunixdialog.c:179
 msgid "For portable documents"
 msgstr "Untuk dokumen portabel"
 
-#: gtk/gtkpagesetupunixdialog.c:809
+#: ../gtk/gtkpagesetupunixdialog.c:809
 #, c-format
 msgid ""
 "Margins:\n"
@@ -1434,51 +1417,54 @@ msgstr ""
 " Atas: %s %s\n"
 " Bawah: %s %s"
 
-#: gtk/gtkpagesetupunixdialog.c:858 gtk/gtkprintunixdialog.c:3284
+#: ../gtk/gtkpagesetupunixdialog.c:858
+#: ../gtk/gtkprintunixdialog.c:3291
 msgid "Manage Custom Sizes..."
 msgstr "Kelola Ukuran Sesuaian..."
 
-#: gtk/gtkpagesetupunixdialog.c:909
+#: ../gtk/gtkpagesetupunixdialog.c:909
 msgid "_Format for:"
 msgstr "_Bentuk untuk:"
 
-#: gtk/gtkpagesetupunixdialog.c:931 gtk/gtkprintunixdialog.c:3456
+#: ../gtk/gtkpagesetupunixdialog.c:931
+#: ../gtk/gtkprintunixdialog.c:3463
 msgid "_Paper size:"
 msgstr "_Ukuran kertas:"
 
-#: gtk/gtkpagesetupunixdialog.c:962
+#: ../gtk/gtkpagesetupunixdialog.c:962
 msgid "_Orientation:"
 msgstr "_Orientasi:"
 
-#: gtk/gtkpagesetupunixdialog.c:1026 gtk/gtkprintunixdialog.c:3518
+#: ../gtk/gtkpagesetupunixdialog.c:1026
+#: ../gtk/gtkprintunixdialog.c:3525
 msgid "Page Setup"
 msgstr "Atur Halaman"
 
-#: gtk/gtkpathbar.c:154
+#: ../gtk/gtkpathbar.c:158
 msgid "Up Path"
 msgstr "Lokasi Naik"
 
-#: gtk/gtkpathbar.c:156
+#: ../gtk/gtkpathbar.c:160
 msgid "Down Path"
 msgstr "Lokasi Turun"
 
-#: gtk/gtkpathbar.c:1497
+#: ../gtk/gtkpathbar.c:1523
 msgid "File System Root"
 msgstr "Akar Sistem Berkas"
 
-#: gtk/gtkprintbackend.c:749
+#: ../gtk/gtkprintbackend.c:749
 msgid "Authentication"
 msgstr "Otentikasi"
 
-#: gtk/gtkprinteroptionwidget.c:694
+#: ../gtk/gtkprinteroptionwidget.c:686
 msgid "Not available"
 msgstr "Tidak tersedia"
 
-#: gtk/gtkprinteroptionwidget.c:794
+#: ../gtk/gtkprinteroptionwidget.c:786
 msgid "Select a folder"
 msgstr "Pilih folder"
 
-#: gtk/gtkprinteroptionwidget.c:813
+#: ../gtk/gtkprinteroptionwidget.c:805
 msgid "_Save in folder:"
 msgstr "_Simpan pada folder:"
 
@@ -1486,187 +1472,188 @@ msgstr "_Simpan pada folder:"
 #. * jobs. %s gets replaced by the application name, %d gets replaced
 #. * by the job number.
 #.
-#: gtk/gtkprintoperation.c:190
+#: ../gtk/gtkprintoperation.c:190
 #, c-format
 msgid "%s job #%d"
 msgstr "%s tugas #%d"
 
-#: gtk/gtkprintoperation.c:1695
+#: ../gtk/gtkprintoperation.c:1695
 msgctxt "print operation status"
 msgid "Initial state"
 msgstr "Keadaan awal"
 
-#: gtk/gtkprintoperation.c:1696
+#: ../gtk/gtkprintoperation.c:1696
 msgctxt "print operation status"
 msgid "Preparing to print"
 msgstr "Bersiap mencetak..."
 
-#: gtk/gtkprintoperation.c:1697
+#: ../gtk/gtkprintoperation.c:1697
 msgctxt "print operation status"
 msgid "Generating data"
 msgstr "Membangkitkan data"
 
-#: gtk/gtkprintoperation.c:1698
+#: ../gtk/gtkprintoperation.c:1698
 msgctxt "print operation status"
 msgid "Sending data"
 msgstr "Mengirim data"
 
-#: gtk/gtkprintoperation.c:1699
+#: ../gtk/gtkprintoperation.c:1699
 msgctxt "print operation status"
 msgid "Waiting"
 msgstr "Menunggu"
 
-#: gtk/gtkprintoperation.c:1700
+#: ../gtk/gtkprintoperation.c:1700
 msgctxt "print operation status"
 msgid "Blocking on issue"
 msgstr "Menghadang karena ada masalah"
 
-#: gtk/gtkprintoperation.c:1701
+#: ../gtk/gtkprintoperation.c:1701
 msgctxt "print operation status"
 msgid "Printing"
 msgstr "Mencetak"
 
-#: gtk/gtkprintoperation.c:1702
+#: ../gtk/gtkprintoperation.c:1702
 msgctxt "print operation status"
 msgid "Finished"
 msgstr "Selesai"
 
-#: gtk/gtkprintoperation.c:1703
+#: ../gtk/gtkprintoperation.c:1703
 msgctxt "print operation status"
 msgid "Finished with error"
 msgstr "Selesai dengan galat"
 
-#: gtk/gtkprintoperation.c:2270
+#: ../gtk/gtkprintoperation.c:2270
 #, c-format
 msgid "Preparing %d"
 msgstr "Bersiap %d"
 
-#: gtk/gtkprintoperation.c:2272 gtk/gtkprintoperation.c:2902
-#, c-format
+#: ../gtk/gtkprintoperation.c:2272
+#: ../gtk/gtkprintoperation.c:2902
 msgid "Preparing"
 msgstr "Bersiap"
 
-#: gtk/gtkprintoperation.c:2275
+#: ../gtk/gtkprintoperation.c:2275
 #, c-format
 msgid "Printing %d"
 msgstr "Mencetak %d"
 
-#: gtk/gtkprintoperation.c:2932
-#, c-format
+#: ../gtk/gtkprintoperation.c:2932
 msgid "Error creating print preview"
 msgstr "Galat membuat pratinjau cetak"
 
-#: gtk/gtkprintoperation.c:2935
-#, c-format
+#: ../gtk/gtkprintoperation.c:2935
 msgid "The most probable reason is that a temporary file could not be created."
 msgstr "Alasan paling mungkin adalah berkas temporer tidak dapat dibuat."
 
-#: gtk/gtkprintoperation-unix.c:297
+#: ../gtk/gtkprintoperation-unix.c:297
 msgid "Error launching preview"
 msgstr "Galat ketika membuka pratinjau"
 
-#: gtk/gtkprintoperation-unix.c:470 gtk/gtkprintoperation-win32.c:1447
+#: ../gtk/gtkprintoperation-unix.c:470
+#: ../gtk/gtkprintoperation-win32.c:1447
 msgid "Application"
 msgstr "Aplikasi"
 
-#: gtk/gtkprintoperation-win32.c:611
+#: ../gtk/gtkprintoperation-win32.c:611
 msgid "Printer offline"
 msgstr "Pencetak sedang luring"
 
-#: gtk/gtkprintoperation-win32.c:613
+#: ../gtk/gtkprintoperation-win32.c:613
 msgid "Out of paper"
 msgstr "Habis kertas"
 
 #. 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:1998
 msgid "Paused"
 msgstr "Ditahan"
 
-#: gtk/gtkprintoperation-win32.c:617
+#: ../gtk/gtkprintoperation-win32.c:617
 msgid "Need user intervention"
 msgstr "Perlu campur tangan pengguna"
 
-#: gtk/gtkprintoperation-win32.c:717
+#: ../gtk/gtkprintoperation-win32.c:717
 msgid "Custom size"
 msgstr "Ukuran sesuaian"
 
-#: gtk/gtkprintoperation-win32.c:1539
+#: ../gtk/gtkprintoperation-win32.c:1539
 msgid "No printer found"
 msgstr "Tidak menemukan pencetak"
 
-#: gtk/gtkprintoperation-win32.c:1566
+#: ../gtk/gtkprintoperation-win32.c:1566
 msgid "Invalid argument to CreateDC"
 msgstr "Argumen tak valid untuk 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 "Kesalahan dari 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 "Tidak cukup memori bebas"
 
-#: gtk/gtkprintoperation-win32.c:1760
+#: ../gtk/gtkprintoperation-win32.c:1760
 msgid "Invalid argument to PrintDlgEx"
 msgstr "Argumen salah untuk PrintDlgEx"
 
-#: gtk/gtkprintoperation-win32.c:1765
+#: ../gtk/gtkprintoperation-win32.c:1765
 msgid "Invalid pointer to PrintDlgEx"
 msgstr "Pointer salah untuk PrintDlgEx"
 
-#: gtk/gtkprintoperation-win32.c:1770
+#: ../gtk/gtkprintoperation-win32.c:1770
 msgid "Invalid handle to PrintDlgEx"
 msgstr "Penanganan salah untuk PrintDlgEx"
 
-#: gtk/gtkprintoperation-win32.c:1775
+#: ../gtk/gtkprintoperation-win32.c:1775
 msgid "Unspecified error"
 msgstr "Kesalahan tidak jelas"
 
-#: gtk/gtkprintunixdialog.c:618
+#: ../gtk/gtkprintunixdialog.c:618
 msgid "Getting printer information failed"
 msgstr "Gagal memperoleh informasi pencetak"
 
-#: gtk/gtkprintunixdialog.c:1873
+#: ../gtk/gtkprintunixdialog.c:1873
 msgid "Getting printer information..."
 msgstr "Mengambil informasi pencetak..."
 
-#: gtk/gtkprintunixdialog.c:2139
+#: ../gtk/gtkprintunixdialog.c:2139
 msgid "Printer"
 msgstr "Pencetak"
 
 #. Translators: this is the header for the location column in the print dialog
-#: gtk/gtkprintunixdialog.c:2149
+#: ../gtk/gtkprintunixdialog.c:2149
 msgid "Location"
 msgstr "Lokasi"
 
 #. Translators: this is the header for the printer status column in the print dialog
-#: gtk/gtkprintunixdialog.c:2160
+#: ../gtk/gtkprintunixdialog.c:2160
 msgid "Status"
 msgstr "Status"
 
-#: gtk/gtkprintunixdialog.c:2186
+#: ../gtk/gtkprintunixdialog.c:2186
 msgid "Range"
 msgstr "Jangkauan"
 
-#: gtk/gtkprintunixdialog.c:2190
+#: ../gtk/gtkprintunixdialog.c:2190
 msgid "_All Pages"
 msgstr "Semu_a Halaman"
 
-#: gtk/gtkprintunixdialog.c:2197
+#: ../gtk/gtkprintunixdialog.c:2197
 msgid "C_urrent Page"
 msgstr "Halaman Sekarang"
 
-#: gtk/gtkprintunixdialog.c:2207
+#: ../gtk/gtkprintunixdialog.c:2207
 msgid "Se_lection"
 msgstr "Se_leksi"
 
-#: gtk/gtkprintunixdialog.c:2216
+#: ../gtk/gtkprintunixdialog.c:2216
 msgid "Pag_es:"
 msgstr "_Halaman:"
 
-#: gtk/gtkprintunixdialog.c:2217
+#: ../gtk/gtkprintunixdialog.c:2217
 msgid ""
 "Specify one or more page ranges,\n"
 " e.g. 1-3,7,11"
@@ -1674,28 +1661,28 @@ msgstr ""
 "Nyatakan satu atau lebih rentang halaman,\n"
 "mis: 1-3,7,11"
 
-#: gtk/gtkprintunixdialog.c:2227
+#: ../gtk/gtkprintunixdialog.c:2227
 msgid "Pages"
 msgstr "Halaman"
 
-#: gtk/gtkprintunixdialog.c:2240
+#: ../gtk/gtkprintunixdialog.c:2240
 msgid "Copies"
 msgstr "Rangkap"
 
 #. 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:2245
 msgid "Copie_s:"
 msgstr "_Rangkap:"
 
-#: gtk/gtkprintunixdialog.c:2263
+#: ../gtk/gtkprintunixdialog.c:2263
 msgid "C_ollate"
 msgstr "K_olasi"
 
-#: gtk/gtkprintunixdialog.c:2271
+#: ../gtk/gtkprintunixdialog.c:2271
 msgid "_Reverse"
 msgstr "Te_rbalik"
 
-#: gtk/gtkprintunixdialog.c:2291
+#: ../gtk/gtkprintunixdialog.c:2291
 msgid "General"
 msgstr "Umum"
 
@@ -1705,168 +1692,169 @@ msgstr "Umum"
 #. 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:3024
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3534
 msgid "Left to right, top to bottom"
 msgstr "Kiri ke kanan, puncak ke dasar"
 
-#: gtk/gtkprintunixdialog.c:3017
-#: modules/printbackends/cups/gtkprintbackendcups.c:3508
+#: ../gtk/gtkprintunixdialog.c:3024
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3534
 msgid "Left to right, bottom to top"
 msgstr "Kiri ke kanan, dasar ke puncak"
 
-#: gtk/gtkprintunixdialog.c:3018
-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
+#: ../gtk/gtkprintunixdialog.c:3025
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3535
 msgid "Right to left, top to bottom"
 msgstr "Kanan ke kiri, puncak ke dasar"
 
-#: gtk/gtkprintunixdialog.c:3018
-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
+#: ../gtk/gtkprintunixdialog.c:3025
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3535
 msgid "Right to left, bottom to top"
 msgstr "Kanan ke kiri, dasar ke puncak"
 
-#: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
+#: ../gtk/gtkprintunixdialog.c:3026
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3536
 msgid "Top to bottom, left to right"
 msgstr "Puncak ke dasar, kiri ke kanan"
 
-#: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
+#: ../gtk/gtkprintunixdialog.c:3026
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3536
 msgid "Top to bottom, right to left"
 msgstr "Puncak ke dasar, kanan ke kiri"
 
-#: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
+#: ../gtk/gtkprintunixdialog.c:3027
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3537
 msgid "Bottom to top, left to right"
 msgstr "Dasar ke puncak, kiri ke kanan"
 
-#: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
+#: ../gtk/gtkprintunixdialog.c:3027
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3537
 msgid "Bottom to top, right to left"
 msgstr "Dasar ke puncak, kanan ke kiri"
 
 #. 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:3031
+#: ../gtk/gtkprintunixdialog.c:3044
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3569
 msgid "Page Ordering"
 msgstr "Urutan Halaman"
 
-#: gtk/gtkprintunixdialog.c:3053
+#: ../gtk/gtkprintunixdialog.c:3060
 msgid "Left to right"
 msgstr "Kiri ke kanan"
 
-#: gtk/gtkprintunixdialog.c:3054
+#: ../gtk/gtkprintunixdialog.c:3061
 msgid "Right to left"
 msgstr "Kanan ke kiri"
 
-#: gtk/gtkprintunixdialog.c:3066
+#: ../gtk/gtkprintunixdialog.c:3073
 msgid "Top to bottom"
 msgstr "Puncak ke dasar"
 
-#: gtk/gtkprintunixdialog.c:3067
+#: ../gtk/gtkprintunixdialog.c:3074
 msgid "Bottom to top"
 msgstr "Dasar ke puncak"
 
-#: gtk/gtkprintunixdialog.c:3307
+#: ../gtk/gtkprintunixdialog.c:3314
 msgid "Layout"
 msgstr "Tata letak"
 
-#: gtk/gtkprintunixdialog.c:3311
+#: ../gtk/gtkprintunixdialog.c:3318
 msgid "T_wo-sided:"
 msgstr "D_ua sisi:"
 
-#: gtk/gtkprintunixdialog.c:3326
+#: ../gtk/gtkprintunixdialog.c:3333
 msgid "Pages per _side:"
 msgstr "Halaman per _sisi:"
 
-#: gtk/gtkprintunixdialog.c:3343
+#: ../gtk/gtkprintunixdialog.c:3350
 msgid "Page or_dering:"
 msgstr "U_rutan halaman:"
 
-#: gtk/gtkprintunixdialog.c:3359
+#: ../gtk/gtkprintunixdialog.c:3366
 msgid "_Only print:"
 msgstr "_Hanya cetak:"
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:3374
+#: ../gtk/gtkprintunixdialog.c:3381
 msgid "All sheets"
 msgstr "Semua lembar"
 
-#: gtk/gtkprintunixdialog.c:3375
+#: ../gtk/gtkprintunixdialog.c:3382
 msgid "Even sheets"
 msgstr "Halaman genap"
 
-#: gtk/gtkprintunixdialog.c:3376
+#: ../gtk/gtkprintunixdialog.c:3383
 msgid "Odd sheets"
 msgstr "Halaman Ganjil"
 
-#: gtk/gtkprintunixdialog.c:3379
+#: ../gtk/gtkprintunixdialog.c:3386
 msgid "Sc_ale:"
 msgstr "Sk_ala:"
 
-#: gtk/gtkprintunixdialog.c:3406
+#: ../gtk/gtkprintunixdialog.c:3413
 msgid "Paper"
 msgstr "Kertas"
 
-#: gtk/gtkprintunixdialog.c:3410
+#: ../gtk/gtkprintunixdialog.c:3417
 msgid "Paper _type:"
 msgstr "Jenis ker_tas:"
 
-#: gtk/gtkprintunixdialog.c:3425
+#: ../gtk/gtkprintunixdialog.c:3432
 msgid "Paper _source:"
 msgstr "_Sumber kertas"
 
-#: gtk/gtkprintunixdialog.c:3440
+#: ../gtk/gtkprintunixdialog.c:3447
 msgid "Output t_ray:"
 msgstr "Baki kelua_ran:"
 
-#: gtk/gtkprintunixdialog.c:3480
+#: ../gtk/gtkprintunixdialog.c:3487
 msgid "Or_ientation:"
 msgstr "Or_ientasi:"
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:3495
+#: ../gtk/gtkprintunixdialog.c:3502
 msgid "Portrait"
 msgstr "Tegak"
 
-#: gtk/gtkprintunixdialog.c:3496
+#: ../gtk/gtkprintunixdialog.c:3503
 msgid "Landscape"
 msgstr "Tumbang"
 
-#: gtk/gtkprintunixdialog.c:3497
+#: ../gtk/gtkprintunixdialog.c:3504
 msgid "Reverse portrait"
 msgstr "Tegak terjungkir"
 
-#: gtk/gtkprintunixdialog.c:3498
+#: ../gtk/gtkprintunixdialog.c:3505
 msgid "Reverse landscape"
 msgstr "Tumbang terbalik"
 
-#: gtk/gtkprintunixdialog.c:3543
+#: ../gtk/gtkprintunixdialog.c:3550
 msgid "Job Details"
 msgstr "Rincian Tugas"
 
-#: gtk/gtkprintunixdialog.c:3549
+#: ../gtk/gtkprintunixdialog.c:3556
 msgid "Pri_ority:"
 msgstr "Pri_oritas:"
 
-#: gtk/gtkprintunixdialog.c:3564
+#: ../gtk/gtkprintunixdialog.c:3571
 msgid "_Billing info:"
 msgstr "Info _Billing:"
 
-#: gtk/gtkprintunixdialog.c:3582
+#: ../gtk/gtkprintunixdialog.c:3589
 msgid "Print Document"
 msgstr "Cetak Dokumen"
 
 #. Translators: this is one of the choices for the print at option
 #. * in the print dialog
 #.
-#: gtk/gtkprintunixdialog.c:3591
+#: ../gtk/gtkprintunixdialog.c:3598
 msgid "_Now"
 msgstr "Sekara_ng"
 
-#: gtk/gtkprintunixdialog.c:3602
+#: ../gtk/gtkprintunixdialog.c:3609
 msgid "A_t:"
 msgstr "_Pada:"
 
@@ -1874,7 +1862,7 @@ msgstr "_Pada:"
 #. * You can remove the am/pm values below for your locale if they are not
 #. * supported.
 #.
-#: gtk/gtkprintunixdialog.c:3608
+#: ../gtk/gtkprintunixdialog.c:3615
 msgid ""
 "Specify the time of print,\n"
 " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
@@ -1882,121 +1870,125 @@ msgstr ""
 "Nyatakan waktu pencetakan,\n"
 "mis: 15:30, 14:15:20, 4"
 
-#: gtk/gtkprintunixdialog.c:3618
+#: ../gtk/gtkprintunixdialog.c:3625
 msgid "Time of print"
 msgstr "Waktu cetak"
 
-#: gtk/gtkprintunixdialog.c:3634
+#: ../gtk/gtkprintunixdialog.c:3641
 msgid "On _hold"
 msgstr "_Tahan"
 
-#: gtk/gtkprintunixdialog.c:3635
+#: ../gtk/gtkprintunixdialog.c:3642
 msgid "Hold the job until it is explicitly released"
 msgstr "Tahan tugas sampai dilepas secara eksplisit"
 
-#: gtk/gtkprintunixdialog.c:3655
+#: ../gtk/gtkprintunixdialog.c:3662
 msgid "Add Cover Page"
 msgstr "Tambahkan Sampulan Halaman"
 
 #. 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:3671
 msgid "Be_fore:"
 msgstr "_Sebelum:"
 
 #. 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:3689
 msgid "_After:"
 msgstr "Sesud_ah:"
 
 #. 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:3707
 msgid "Job"
 msgstr "Tugas"
 
-#: gtk/gtkprintunixdialog.c:3766
+#: ../gtk/gtkprintunixdialog.c:3773
 msgid "Advanced"
 msgstr "Diperluas"
 
 #. Translators: this will appear as tab label in print dialog.
-#: gtk/gtkprintunixdialog.c:3804
+#: ../gtk/gtkprintunixdialog.c:3811
 msgid "Image Quality"
 msgstr "Kualitas Gambar"
 
 #. Translators: this will appear as tab label in print dialog.
-#: gtk/gtkprintunixdialog.c:3808
+#: ../gtk/gtkprintunixdialog.c:3815
 msgid "Color"
 msgstr "Warna"
 
 #. 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:3820
 msgid "Finishing"
 msgstr "Penyelesaian"
 
-#: gtk/gtkprintunixdialog.c:3823
+#: ../gtk/gtkprintunixdialog.c:3830
 msgid "Some of the settings in the dialog conflict"
 msgstr "Beberapa ketentuan pada dialog konflik"
 
-#: gtk/gtkprintunixdialog.c:3846
+#: ../gtk/gtkprintunixdialog.c:3853
 msgid "Print"
 msgstr "Cetak"
 
-#: gtk/gtkrc.c:2834
+#: ../gtk/gtkrc.c:2834
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "Tidak dapat menemukan berkas yang hendak disisipkan: \"%s\""
 
-#: gtk/gtkrc.c:3470 gtk/gtkrc.c:3473
+#: ../gtk/gtkrc.c:3470
+#: ../gtk/gtkrc.c:3473
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "TIdak dapat menemukan berkas gambar pada pixmap_path: \"%s\""
 
-#: gtk/gtkrecentaction.c:165 gtk/gtkrecentaction.c:173
-#: gtk/gtkrecentchoosermenu.c:615 gtk/gtkrecentchoosermenu.c:623
+#: ../gtk/gtkrecentaction.c:165
+#: ../gtk/gtkrecentaction.c:173
+#: ../gtk/gtkrecentchoosermenu.c:608
+#: ../gtk/gtkrecentchoosermenu.c:616
 #, c-format
 msgid "This function is not implemented for widgets of class '%s'"
 msgstr "Fungsi ini tidak diterapkan untuk widget kelas '%s'"
 
-#: gtk/gtkrecentchooserdefault.c:482
+#: ../gtk/gtkrecentchooserdefault.c:483
 msgid "Select which type of documents are shown"
 msgstr "Pilih jenis berkas mana yang ingin ditampilkan"
 
-#: gtk/gtkrecentchooserdefault.c:1138 gtk/gtkrecentchooserdefault.c:1175
+#: ../gtk/gtkrecentchooserdefault.c:1133
+#: ../gtk/gtkrecentchooserdefault.c:1170
 #, c-format
 msgid "No item for URI '%s' found"
 msgstr "Tidak menemukan item untuk URI '%s'"
 
-#: gtk/gtkrecentchooserdefault.c:1302
+#: ../gtk/gtkrecentchooserdefault.c:1297
 msgid "Untitled filter"
 msgstr "Penyaring tanpa nama"
 
-#: gtk/gtkrecentchooserdefault.c:1655
+#: ../gtk/gtkrecentchooserdefault.c:1650
 msgid "Could not remove item"
 msgstr "Tidak dapat menghapus item"
 
-#: gtk/gtkrecentchooserdefault.c:1699
+#: ../gtk/gtkrecentchooserdefault.c:1694
 msgid "Could not clear list"
 msgstr "Tidak dapat membersihkan daftar"
 
-#: gtk/gtkrecentchooserdefault.c:1783
+#: ../gtk/gtkrecentchooserdefault.c:1778
 msgid "Copy _Location"
 msgstr "Salin _Lokasi"
 
-#: gtk/gtkrecentchooserdefault.c:1796
+#: ../gtk/gtkrecentchooserdefault.c:1791
 msgid "_Remove From List"
 msgstr "Buang Dari Dafta_r"
 
-#: gtk/gtkrecentchooserdefault.c:1805
+#: ../gtk/gtkrecentchooserdefault.c:1800
 msgid "_Clear List"
 msgstr "_Kosongkan Daftar"
 
-#: gtk/gtkrecentchooserdefault.c:1819
+#: ../gtk/gtkrecentchooserdefault.c:1814
 msgid "Show _Private Resources"
 msgstr "Tampilkan Sumber _Pribadi"
 
@@ -2010,21 +2002,22 @@ msgstr "Tampilkan Sumber _Pribadi"
 #. * 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 "Tidak menemukan item"
 
-#: 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 "Tidak ada sumber yang sering digunakan dengan URI '%s'"
 
-#: gtk/gtkrecentchoosermenu.c:802
+#: ../gtk/gtkrecentchoosermenu.c:795
 #, c-format
 msgid "Open '%s'"
 msgstr "Membuka '%s'"
 
-#: gtk/gtkrecentchoosermenu.c:832
+#: ../gtk/gtkrecentchoosermenu.c:825
 msgid "Unknown item"
 msgstr "Objek tak dikenal"
 
@@ -2033,7 +2026,7 @@ msgstr "Objek tak dikenal"
 #. * 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:836
 #, c-format
 msgctxt "recent menu label"
 msgid "_%d. %s"
@@ -2042,46 +2035,54 @@ 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:841
 #, 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:1000
+#: ../gtk/gtkrecentmanager.c:1013
+#: ../gtk/gtkrecentmanager.c:1150
+#: ../gtk/gtkrecentmanager.c:1160
+#: ../gtk/gtkrecentmanager.c:1213
+#: ../gtk/gtkrecentmanager.c:1222
+#: ../gtk/gtkrecentmanager.c:1237
 #, c-format
 msgid "Unable to find an item with URI '%s'"
 msgstr "Tidak dapat menemukan objek dengan URI '%s'"
 
-#: gtk/gtkspinner.c:456
+#: ../gtk/gtkrecentmanager.c:2437
+#, c-format
+msgid "No registered application with name '%s' for item with URI '%s' found"
+msgstr "Tak ditemukan aplikasi terdaftar dengan nama '%s' bagi butir dengan URI '%s'"
+
+#: ../gtk/gtkspinner.c:456
 msgctxt "throbbing progress animation widget"
 msgid "Spinner"
 msgstr "Gambar Putar"
 
-#: gtk/gtkspinner.c:457
+#: ../gtk/gtkspinner.c:457
 msgid "Provides visual indication of progress"
 msgstr "Menyediakan indikasi visual dari kemajuan"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: gtk/gtkstock.c:313
+#: ../gtk/gtkstock.c:313
 msgctxt "Stock label"
 msgid "Information"
 msgstr "Informasi"
 
-#: gtk/gtkstock.c:314
+#: ../gtk/gtkstock.c:314
 msgctxt "Stock label"
 msgid "Warning"
 msgstr "Peringatan"
 
-#: gtk/gtkstock.c:315
+#: ../gtk/gtkstock.c:315
 msgctxt "Stock label"
 msgid "Error"
 msgstr "Galat"
 
-#: gtk/gtkstock.c:316
+#: ../gtk/gtkstock.c:316
 msgctxt "Stock label"
 msgid "Question"
 msgstr "Pertanyaan"
@@ -2089,693 +2090,698 @@ msgstr "Pertanyaan"
 #. 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 "Tent_ang"
 
-#: gtk/gtkstock.c:322
+#: ../gtk/gtkstock.c:322
 msgctxt "Stock label"
 msgid "_Add"
 msgstr "T_ambah"
 
-#: gtk/gtkstock.c:323
+#: ../gtk/gtkstock.c:323
 msgctxt "Stock label"
 msgid "_Apply"
 msgstr "Ter_apkan"
 
-#: gtk/gtkstock.c:324
+#: ../gtk/gtkstock.c:324
 msgctxt "Stock label"
 msgid "_Bold"
 msgstr "Te_bal"
 
-#: gtk/gtkstock.c:325
+#: ../gtk/gtkstock.c:325
 msgctxt "Stock label"
 msgid "_Cancel"
 msgstr "Ba_tal"
 
-#: gtk/gtkstock.c:326
+#: ../gtk/gtkstock.c:326
 msgctxt "Stock label"
 msgid "_CD-ROM"
 msgstr "_CD-ROM"
 
-#: gtk/gtkstock.c:327
+#: ../gtk/gtkstock.c:327
 msgctxt "Stock label"
 msgid "_Clear"
 msgstr "_Bersihkan"
 
-#: gtk/gtkstock.c:328
+#: ../gtk/gtkstock.c:328
 msgctxt "Stock label"
 msgid "_Close"
 msgstr "_Tutup"
 
-#: gtk/gtkstock.c:329
+#: ../gtk/gtkstock.c:329
 msgctxt "Stock label"
 msgid "C_onnect"
 msgstr "_Sambung"
 
-#: gtk/gtkstock.c:330
+#: ../gtk/gtkstock.c:330
 msgctxt "Stock label"
 msgid "_Convert"
 msgstr "_Konversi"
 
-#: gtk/gtkstock.c:331
+#: ../gtk/gtkstock.c:331
 msgctxt "Stock label"
 msgid "_Copy"
 msgstr "_Salin"
 
-#: gtk/gtkstock.c:332
+#: ../gtk/gtkstock.c:332
 msgctxt "Stock label"
 msgid "Cu_t"
 msgstr "Po_tong"
 
-#: gtk/gtkstock.c:333
+#: ../gtk/gtkstock.c:333
 msgctxt "Stock label"
 msgid "_Delete"
 msgstr "_Hapus"
 
-#: gtk/gtkstock.c:334
+#: ../gtk/gtkstock.c:334
 msgctxt "Stock label"
 msgid "_Discard"
 msgstr "_Abaikan"
 
-#: gtk/gtkstock.c:335
+#: ../gtk/gtkstock.c:335
 msgctxt "Stock label"
 msgid "_Disconnect"
 msgstr "_Putus"
 
-#: gtk/gtkstock.c:336
+#: ../gtk/gtkstock.c:336
 msgctxt "Stock label"
 msgid "_Execute"
 msgstr "_Eksekusi"
 
-#: gtk/gtkstock.c:337
+#: ../gtk/gtkstock.c:337
 msgctxt "Stock label"
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: gtk/gtkstock.c:338
+#: ../gtk/gtkstock.c:338
 msgctxt "Stock label"
 msgid "_File"
 msgstr "_Berkas"
 
-#: gtk/gtkstock.c:339
+#: ../gtk/gtkstock.c:339
 msgctxt "Stock label"
 msgid "_Find"
 msgstr "_Cari"
 
-#: gtk/gtkstock.c:340
+#: ../gtk/gtkstock.c:340
 msgctxt "Stock label"
 msgid "Find and _Replace"
 msgstr "Ca_ri dan Ganti"
 
-#: gtk/gtkstock.c:341
+#: ../gtk/gtkstock.c:341
 msgctxt "Stock label"
 msgid "_Floppy"
 msgstr "_Disket"
 
-#: gtk/gtkstock.c:342
+#: ../gtk/gtkstock.c:342
 msgctxt "Stock label"
 msgid "_Fullscreen"
 msgstr "Layar _Penuh"
 
-#: gtk/gtkstock.c:343
+#: ../gtk/gtkstock.c:343
 msgctxt "Stock label"
 msgid "_Leave Fullscreen"
 msgstr "Ke_luar dari Layar Penuh"
 
 #. 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 "_Bawah"
 
 #. 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 "_Pertama"
 
 #. 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 "_Terakhir"
 
 #. 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 "A_tas"
 
 #. This is a navigation label as in "go back"
-#: gtk/gtkstock.c:353
+#: ../gtk/gtkstock.c:353
 msgctxt "Stock label, navigation"
 msgid "_Back"
 msgstr "Kem_bali"
 
 #. This is a navigation label as in "go down"
-#: gtk/gtkstock.c:355
+#: ../gtk/gtkstock.c:355
 msgctxt "Stock label, navigation"
 msgid "_Down"
 msgstr "_Turun"
 
 #. This is a navigation label as in "go forward"
-#: gtk/gtkstock.c:357
+#: ../gtk/gtkstock.c:357
 msgctxt "Stock label, navigation"
 msgid "_Forward"
 msgstr "_Maju"
 
 #. This is a navigation label as in "go up"
-#: gtk/gtkstock.c:359
+#: ../gtk/gtkstock.c:359
 msgctxt "Stock label, navigation"
 msgid "_Up"
 msgstr "_Naik"
 
-#: gtk/gtkstock.c:360
+#: ../gtk/gtkstock.c:360
 msgctxt "Stock label"
 msgid "_Hard Disk"
 msgstr "_Hard Disk"
 
-#: gtk/gtkstock.c:361
+#: ../gtk/gtkstock.c:361
 msgctxt "Stock label"
 msgid "_Help"
 msgstr "Ba_ntuan"
 
-#: gtk/gtkstock.c:362
+#: ../gtk/gtkstock.c:362
 msgctxt "Stock label"
 msgid "_Home"
 msgstr "Ruma_h"
 
-#: gtk/gtkstock.c:363
+#: ../gtk/gtkstock.c:363
 msgctxt "Stock label"
 msgid "Increase Indent"
 msgstr "Majukan Inden"
 
-#: gtk/gtkstock.c:364
+#: ../gtk/gtkstock.c:364
 msgctxt "Stock label"
 msgid "Decrease Indent"
 msgstr "Mundurkan Inden"
 
-#: 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 "_Informasi"
 
-#: gtk/gtkstock.c:367
+#: ../gtk/gtkstock.c:367
 msgctxt "Stock label"
 msgid "_Italic"
 msgstr "M_iring"
 
-#: gtk/gtkstock.c:368
+#: ../gtk/gtkstock.c:368
 msgctxt "Stock label"
 msgid "_Jump to"
 msgstr "_Lompat ke"
 
 #. This is about text justification, "centered text"
-#: gtk/gtkstock.c:370
+#: ../gtk/gtkstock.c:370
 msgctxt "Stock label"
 msgid "_Center"
 msgstr "_Tengah"
 
 #. This is about text justification
-#: gtk/gtkstock.c:372
+#: ../gtk/gtkstock.c:372
 msgctxt "Stock label"
 msgid "_Fill"
 msgstr "_Isi"
 
 #. This is about text justification, "left-justified text"
-#: gtk/gtkstock.c:374
+#: ../gtk/gtkstock.c:374
 msgctxt "Stock label"
 msgid "_Left"
 msgstr "_Kiri"
 
 #. This is about text justification, "right-justified text"
-#: gtk/gtkstock.c:376
+#: ../gtk/gtkstock.c:376
 msgctxt "Stock label"
 msgid "_Right"
 msgstr "_Kanan"
 
 #. Media label, as in "fast forward"
-#: gtk/gtkstock.c:379
+#: ../gtk/gtkstock.c:379
 msgctxt "Stock label, media"
 msgid "_Forward"
 msgstr "_Maju"
 
 #. Media label, as in "next song"
-#: gtk/gtkstock.c:381
+#: ../gtk/gtkstock.c:381
 msgctxt "Stock label, media"
 msgid "_Next"
 msgstr "Sela_njutnya"
 
 #. Media label, as in "pause music"
-#: gtk/gtkstock.c:383
+#: ../gtk/gtkstock.c:383
 msgctxt "Stock label, media"
 msgid "P_ause"
 msgstr "T_ahan"
 
 #. Media label, as in "play music"
-#: gtk/gtkstock.c:385
+#: ../gtk/gtkstock.c:385
 msgctxt "Stock label, media"
 msgid "_Play"
 msgstr "_Putar"
 
 #. Media label, as in  "previous song"
-#: gtk/gtkstock.c:387
+#: ../gtk/gtkstock.c:387
 msgctxt "Stock label, media"
 msgid "Pre_vious"
 msgstr "Se_belumnya"
 
 #. Media label
-#: gtk/gtkstock.c:389
+#: ../gtk/gtkstock.c:389
 msgctxt "Stock label, media"
 msgid "_Record"
 msgstr "_Rekam"
 
 #. Media label
-#: gtk/gtkstock.c:391
+#: ../gtk/gtkstock.c:391
 msgctxt "Stock label, media"
 msgid "R_ewind"
 msgstr "_Putar Ulang"
 
 #. Media label
-#: gtk/gtkstock.c:393
+#: ../gtk/gtkstock.c:393
 msgctxt "Stock label, media"
 msgid "_Stop"
 msgstr "_Hentikan"
 
-#: gtk/gtkstock.c:394
+#: ../gtk/gtkstock.c:394
 msgctxt "Stock label"
 msgid "_Network"
 msgstr "Jari_ngan"
 
-#: gtk/gtkstock.c:395
+#: ../gtk/gtkstock.c:395
 msgctxt "Stock label"
 msgid "_New"
 msgstr "_Baru"
 
-#: gtk/gtkstock.c:396
+#: ../gtk/gtkstock.c:396
 msgctxt "Stock label"
 msgid "_No"
 msgstr "_Tidak"
 
-#: gtk/gtkstock.c:397
+#: ../gtk/gtkstock.c:397
 msgctxt "Stock label"
 msgid "_OK"
 msgstr "_Oke"
 
-#: gtk/gtkstock.c:398
+#: ../gtk/gtkstock.c:398
 msgctxt "Stock label"
 msgid "_Open"
 msgstr "Buk_a"
 
 #. Page orientation
-#: gtk/gtkstock.c:400
+#: ../gtk/gtkstock.c:400
 msgctxt "Stock label"
 msgid "Landscape"
 msgstr "Tumbang"
 
 #. Page orientation
-#: gtk/gtkstock.c:402
+#: ../gtk/gtkstock.c:402
 msgctxt "Stock label"
 msgid "Portrait"
 msgstr "Tegak"
 
 #. Page orientation
-#: gtk/gtkstock.c:404
+#: ../gtk/gtkstock.c:404
 msgctxt "Stock label"
 msgid "Reverse landscape"
 msgstr "Tumbang terbalik"
 
 #. Page orientation
-#: gtk/gtkstock.c:406
+#: ../gtk/gtkstock.c:406
 msgctxt "Stock label"
 msgid "Reverse portrait"
 msgstr "Tegak terjungkir"
 
-#: gtk/gtkstock.c:407
+#: ../gtk/gtkstock.c:407
 msgctxt "Stock label"
 msgid "Page Set_up"
 msgstr "At_ur Halaman"
 
-#: gtk/gtkstock.c:408
+#: ../gtk/gtkstock.c:408
 msgctxt "Stock label"
 msgid "_Paste"
 msgstr "Tem_pel"
 
-#: gtk/gtkstock.c:409
+#: ../gtk/gtkstock.c:409
 msgctxt "Stock label"
 msgid "_Preferences"
 msgstr "_Preferensi"
 
-#: gtk/gtkstock.c:410
+#: ../gtk/gtkstock.c:410
 msgctxt "Stock label"
 msgid "_Print"
 msgstr "_Cetak"
 
-#: gtk/gtkstock.c:411
+#: ../gtk/gtkstock.c:411
 msgctxt "Stock label"
 msgid "Print Pre_view"
 msgstr "_Pratinjau Cetak"
 
-#: gtk/gtkstock.c:412
+#: ../gtk/gtkstock.c:412
 msgctxt "Stock label"
 msgid "_Properties"
 msgstr "_Properti"
 
-#: gtk/gtkstock.c:413
+#: ../gtk/gtkstock.c:413
 msgctxt "Stock label"
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: gtk/gtkstock.c:414
+#: ../gtk/gtkstock.c:414
 msgctxt "Stock label"
 msgid "_Redo"
 msgstr "_Jadi Lagi"
 
-#: gtk/gtkstock.c:415
+#: ../gtk/gtkstock.c:415
 msgctxt "Stock label"
 msgid "_Refresh"
 msgstr "Sega_rkan"
 
-#: gtk/gtkstock.c:416
+#: ../gtk/gtkstock.c:416
 msgctxt "Stock label"
 msgid "_Remove"
 msgstr "_Hapus"
 
-#: gtk/gtkstock.c:417
+#: ../gtk/gtkstock.c:417
 msgctxt "Stock label"
 msgid "_Revert"
 msgstr "_Kembalikan"
 
-#: gtk/gtkstock.c:418
+#: ../gtk/gtkstock.c:418
 msgctxt "Stock label"
 msgid "_Save"
 msgstr "_Simpan"
 
-#: gtk/gtkstock.c:419
+#: ../gtk/gtkstock.c:419
 msgctxt "Stock label"
 msgid "Save _As"
 msgstr "Simp_an Sebagai..."
 
-#: gtk/gtkstock.c:420
+#: ../gtk/gtkstock.c:420
 msgctxt "Stock label"
 msgid "Select _All"
 msgstr "Pilih Semu_a"
 
-#: gtk/gtkstock.c:421
+#: ../gtk/gtkstock.c:421
 msgctxt "Stock label"
 msgid "_Color"
 msgstr "_Warna"
 
-#: gtk/gtkstock.c:422
+#: ../gtk/gtkstock.c:422
 msgctxt "Stock label"
 msgid "_Font"
 msgstr "_Fonta"
 
 #. Sorting direction
-#: gtk/gtkstock.c:424
+#: ../gtk/gtkstock.c:424
 msgctxt "Stock label"
 msgid "_Ascending"
 msgstr "Men_aik"
 
 #. Sorting direction
-#: gtk/gtkstock.c:426
+#: ../gtk/gtkstock.c:426
 msgctxt "Stock label"
 msgid "_Descending"
 msgstr "Menuru_n"
 
-#: gtk/gtkstock.c:427
+#: ../gtk/gtkstock.c:427
 msgctxt "Stock label"
 msgid "_Spell Check"
 msgstr "Perik_sa Ejaan"
 
-#: gtk/gtkstock.c:428
+#: ../gtk/gtkstock.c:428
 msgctxt "Stock label"
 msgid "_Stop"
 msgstr "_Hentikan"
 
 #. Font variant
-#: gtk/gtkstock.c:430
+#: ../gtk/gtkstock.c:430
 msgctxt "Stock label"
 msgid "_Strikethrough"
 msgstr "_Coret"
 
-#: gtk/gtkstock.c:431
+#: ../gtk/gtkstock.c:431
 msgctxt "Stock label"
 msgid "_Undelete"
 msgstr "Batal Hap_us"
 
 #. Font variant
-#: gtk/gtkstock.c:433
+#: ../gtk/gtkstock.c:433
 msgctxt "Stock label"
 msgid "_Underline"
 msgstr "_Garis Bawah"
 
-#: gtk/gtkstock.c:434
+#: ../gtk/gtkstock.c:434
 msgctxt "Stock label"
 msgid "_Undo"
 msgstr "_Tidak Jadi"
 
-#: gtk/gtkstock.c:435
+#: ../gtk/gtkstock.c:435
 msgctxt "Stock label"
 msgid "_Yes"
 msgstr "_Ya"
 
 #. Zoom
-#: gtk/gtkstock.c:437
+#: ../gtk/gtkstock.c:437
 msgctxt "Stock label"
 msgid "_Normal Size"
 msgstr "Ukura_n Normal"
 
 #. Zoom
-#: gtk/gtkstock.c:439
+#: ../gtk/gtkstock.c:439
 msgctxt "Stock label"
 msgid "Best _Fit"
 msgstr "Ukuran Pa_s"
 
-#: gtk/gtkstock.c:440
+#: ../gtk/gtkstock.c:440
 msgctxt "Stock label"
 msgid "Zoom _In"
 msgstr "Perbesar Tamp_ilan"
 
-#: gtk/gtkstock.c:441
+#: ../gtk/gtkstock.c:441
 msgctxt "Stock label"
 msgid "Zoom _Out"
 msgstr "P_erkecil Tampilan"
 
-#: gtk/gtktextbufferrichtext.c:650
+#: ../gtk/gtktextbufferrichtext.c:650
 #, c-format
 msgid "Unknown error when trying to deserialize %s"
 msgstr "Kesalahan tidak dikenal ketika mencoba deserialisasi %s"
 
-#: gtk/gtktextbufferrichtext.c:709
+#: ../gtk/gtktextbufferrichtext.c:709
 #, c-format
 msgid "No deserialize function found for format %s"
 msgstr "Tidak menemukan fungsi deserialiasi untuk bentuk %s"
 
-#: gtk/gtktextbufferserialize.c:795 gtk/gtktextbufferserialize.c:821
+#: ../gtk/gtktextbufferserialize.c:803
+#: ../gtk/gtktextbufferserialize.c:829
 #, c-format
 msgid "Both \"id\" and \"name\" were found on the <%s> element"
 msgstr "Bagian \"id\" dan \"nama\" ditemukan pada bagian <%s>"
 
-#: gtk/gtktextbufferserialize.c:805 gtk/gtktextbufferserialize.c:831
+#: ../gtk/gtktextbufferserialize.c:813
+#: ../gtk/gtktextbufferserialize.c:839
 #, c-format
 msgid "The attribute \"%s\" was found twice on the <%s> element"
 msgstr "Atribu \"%s\" ditemukan dua kali di bagian <%s>"
 
-#: gtk/gtktextbufferserialize.c:845
+#: ../gtk/gtktextbufferserialize.c:855
 #, c-format
 msgid "<%s> element has invalid ID \"%s\""
 msgstr "Elemen <%s> memiliki ID \"%s\" yang tidak sah"
 
-#: gtk/gtktextbufferserialize.c:855
+#: ../gtk/gtktextbufferserialize.c:865
 #, c-format
 msgid "<%s> element has neither a \"name\" nor an \"id\" attribute"
 msgstr "bagian <%s> telah memiliki atribut \"nama\" ataupun \"id\""
 
-#: gtk/gtktextbufferserialize.c:942
+#: ../gtk/gtktextbufferserialize.c:952
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atribut \"%s\" mengulang dua kali pada bagian <%s> yang sama"
 
-#: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985
+#: ../gtk/gtktextbufferserialize.c:970
+#: ../gtk/gtktextbufferserialize.c:995
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Atribut \"%s\" salah pada bagian <%s> dalam konteks ini"
 
-#: gtk/gtktextbufferserialize.c:1024
+#: ../gtk/gtktextbufferserialize.c:1034
 #, c-format
 msgid "Tag \"%s\" has not been defined."
 msgstr "Tag \"%s\" tidak dijelaskan."
 
-#: gtk/gtktextbufferserialize.c:1036
+#: ../gtk/gtktextbufferserialize.c:1046
 msgid "Anonymous tag found and tags can not be created."
 msgstr "Tag tak dikenal ditemukan dan tags tidak bisa dibuat."
 
-#: gtk/gtktextbufferserialize.c:1047
+#: ../gtk/gtktextbufferserialize.c:1057
 #, c-format
 msgid "Tag \"%s\" does not exist in buffer and tags can not be created."
 msgstr "Tag \"%s\" tidak ada dalam buffer dan tags tidak bisa dibuat."
 
-#: gtk/gtktextbufferserialize.c:1146 gtk/gtktextbufferserialize.c:1221
-#: gtk/gtktextbufferserialize.c:1324 gtk/gtktextbufferserialize.c:1398
+#: ../gtk/gtktextbufferserialize.c:1156
+#: ../gtk/gtktextbufferserialize.c:1231
+#: ../gtk/gtktextbufferserialize.c:1336
+#: ../gtk/gtktextbufferserialize.c:1410
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Elemen <%s> tidak diperbolehkan di bawah <%s>"
 
-#: gtk/gtktextbufferserialize.c:1177
+#: ../gtk/gtktextbufferserialize.c:1187
 #, c-format
 msgid "\"%s\" is not a valid attribute type"
 msgstr "\"%s\" bukan jenis atribut yang benar"
 
-#: gtk/gtktextbufferserialize.c:1185
+#: ../gtk/gtktextbufferserialize.c:1195
 #, c-format
 msgid "\"%s\" is not a valid attribute name"
 msgstr "\"%s\" bukan nama atribut yang benar"
 
-#: gtk/gtktextbufferserialize.c:1195
+#: ../gtk/gtktextbufferserialize.c:1205
 #, c-format
-msgid ""
-"\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
+msgid "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
 msgstr "\"%s\" tidak bisa dirubah ke nilai jenis \"%s\" untuk atribut \"%s\""
 
-#: gtk/gtktextbufferserialize.c:1204
+#: ../gtk/gtktextbufferserialize.c:1214
 #, c-format
 msgid "\"%s\" is not a valid value for attribute \"%s\""
 msgstr "\"%s\" tidak benar untuk atribut \"%s\""
 
-#: gtk/gtktextbufferserialize.c:1289
+#: ../gtk/gtktextbufferserialize.c:1299
 #, c-format
 msgid "Tag \"%s\" already defined"
 msgstr "Tag \"%s\" sudah ditentukan"
 
-#: gtk/gtktextbufferserialize.c:1300
+#: ../gtk/gtktextbufferserialize.c:1312
 #, c-format
 msgid "Tag \"%s\" has invalid priority \"%s\""
 msgstr "Tag \"%s\" memiliki prioritas yang salah \"%s\""
 
-#: gtk/gtktextbufferserialize.c:1353
+#: ../gtk/gtktextbufferserialize.c:1365
 #, c-format
 msgid "Outermost element in text must be <text_view_markup> not <%s>"
 msgstr "Bagian terluar dari teks harus <text_view_markup> bukan <%s>"
 
-#: gtk/gtktextbufferserialize.c:1362 gtk/gtktextbufferserialize.c:1378
+#: ../gtk/gtktextbufferserialize.c:1374
+#: ../gtk/gtktextbufferserialize.c:1390
 #, c-format
 msgid "A <%s> element has already been specified"
 msgstr "Suatu bagian <%s> sudah ditentukan"
 
-#: gtk/gtktextbufferserialize.c:1384
+#: ../gtk/gtktextbufferserialize.c:1396
 msgid "A <text> element can't occur before a <tags> element"
 msgstr "Suatu bagian <tek"
 
-#: gtk/gtktextbufferserialize.c:1784
+#: ../gtk/gtktextbufferserialize.c:1796
 msgid "Serialized data is malformed"
 msgstr "Data yang diserialkan rusak"
 
-#: gtk/gtktextbufferserialize.c:1862
-msgid ""
-"Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
-msgstr ""
-"Data yang diserialkan rusak. Bagian pertama bukan GTKTEXTBUFFERCONTENTS-0001"
+#: ../gtk/gtktextbufferserialize.c:1874
+msgid "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
+msgstr "Data yang diserialkan rusak. Bagian pertama bukan GTKTEXTBUFFERCONTENTS-0001"
 
-#: gtk/gtktextutil.c:60
+#: ../gtk/gtktextutil.c:60
 msgid "LRM _Left-to-right mark"
 msgstr "LRM tanda _Left-to-right"
 
-#: gtk/gtktextutil.c:61
+#: ../gtk/gtktextutil.c:61
 msgid "RLM _Right-to-left mark"
 msgstr "RLM tanda _Right-to-left"
 
-#: gtk/gtktextutil.c:62
+#: ../gtk/gtktextutil.c:62
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE Left-to-right _embedding"
 
-#: gtk/gtktextutil.c:63
+#: ../gtk/gtktextutil.c:63
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE Right-to-left e_mbedding"
 
-#: gtk/gtktextutil.c:64
+#: ../gtk/gtktextutil.c:64
 msgid "LRO Left-to-right _override"
 msgstr "LRO Left-to-right _override"
 
-#: gtk/gtktextutil.c:65
+#: ../gtk/gtktextutil.c:65
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO Right-to-left o_verride"
 
-#: gtk/gtktextutil.c:66
+#: ../gtk/gtktextutil.c:66
 msgid "PDF _Pop directional formatting"
 msgstr "PDF _Pop directional formatting"
 
-#: gtk/gtktextutil.c:67
+#: ../gtk/gtktextutil.c:67
 msgid "ZWS _Zero width space"
 msgstr "ZWS _Zero width space"
 
-#: gtk/gtktextutil.c:68
+#: ../gtk/gtktextutil.c:68
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ Zero width _joiner"
 
-#: gtk/gtktextutil.c:69
+#: ../gtk/gtktextutil.c:69
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ Zero width _non-joiner"
 
-#: gtk/gtkthemes.c:72
+#: ../gtk/gtkthemes.c:72
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "Tidak bisa menemukan mesin tematik pada module_path '%s',"
 
-#: gtk/gtkuimanager.c:1505
+#: ../gtk/gtkuimanager.c:1505
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Tag awal '%s' pada baris %d kolom %d seharusnya tidak ada"
 
-#: gtk/gtkuimanager.c:1595
+#: ../gtk/gtkuimanager.c:1595
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Data karakter pada baris %d kolom %d seharusnya tidak ada"
 
-#: gtk/gtkuimanager.c:2427
+#: ../gtk/gtkuimanager.c:2427
 msgid "Empty"
 msgstr "Kosong"
 
-#: gtk/gtkvolumebutton.c:83
+#: ../gtk/gtkvolumebutton.c:83
 msgid "Volume"
 msgstr "Volume"
 
-#: gtk/gtkvolumebutton.c:85
+#: ../gtk/gtkvolumebutton.c:85
 msgid "Turns volume down or up"
 msgstr "Naikkan atau turunkan keras suara"
 
-#: gtk/gtkvolumebutton.c:88
+#: ../gtk/gtkvolumebutton.c:88
 msgid "Adjusts the volume"
 msgstr "Atur keras suara"
 
-#: gtk/gtkvolumebutton.c:94 gtk/gtkvolumebutton.c:97
+#: ../gtk/gtkvolumebutton.c:94
+#: ../gtk/gtkvolumebutton.c:97
 msgid "Volume Down"
 msgstr "Pelankan Suara"
 
-#: gtk/gtkvolumebutton.c:96
+#: ../gtk/gtkvolumebutton.c:96
 msgid "Decreases the volume"
 msgstr "Memelankan suara"
 
-#: gtk/gtkvolumebutton.c:100 gtk/gtkvolumebutton.c:103
+#: ../gtk/gtkvolumebutton.c:100
+#: ../gtk/gtkvolumebutton.c:103
 msgid "Volume Up"
 msgstr "Besarkan Suara"
 
-#: gtk/gtkvolumebutton.c:102
+#: ../gtk/gtkvolumebutton.c:102
 msgid "Increases the volume"
 msgstr "Memperkeras suara"
 
-#: gtk/gtkvolumebutton.c:160
+#: ../gtk/gtkvolumebutton.c:160
 msgid "Muted"
 msgstr "Diam"
 
-#: gtk/gtkvolumebutton.c:164
+#: ../gtk/gtkvolumebutton.c:164
 msgid "Full Volume"
 msgstr "Volume Penuh"
 
@@ -2784,1245 +2790,1247 @@ msgstr "Volume Penuh"
 #. * 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:177
 #, 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 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 "A4 Ekstra"
 
-#: gtk/paper_names_offsets.c:25
+#: ../gtk/paper_names_offsets.c:25
 msgctxt "paper size"
 msgid "A4 Tab"
 msgstr "A4 Tab"
 
-#: 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 "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 "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 "Amplop DL"
 
-#: 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"
 
-#: gtk/paper_names_offsets.c:84
+#: ../gtk/paper_names_offsets.c:84
 msgctxt "paper size"
 msgid "Choukei 2 Envelope"
 msgstr "Amplop Choukei 2"
 
-#: gtk/paper_names_offsets.c:85
+#: ../gtk/paper_names_offsets.c:85
 msgctxt "paper size"
 msgid "Choukei 3 Envelope"
 msgstr "Amplop Choukei 3"
 
-#: gtk/paper_names_offsets.c:86
+#: ../gtk/paper_names_offsets.c:86
 msgctxt "paper size"
 msgid "Choukei 4 Envelope"
 msgstr "Amplop Choukei 4"
 
-#: gtk/paper_names_offsets.c:87
+#: ../gtk/paper_names_offsets.c:87
 msgctxt "paper size"
 msgid "hagaki (postcard)"
 msgstr "hagaki (kartu pos)"
 
-#: gtk/paper_names_offsets.c:88
+#: ../gtk/paper_names_offsets.c:88
 msgctxt "paper size"
 msgid "kahu Envelope"
 msgstr "Amplop kahu"
 
-#: gtk/paper_names_offsets.c:89
+#: ../gtk/paper_names_offsets.c:89
 msgctxt "paper size"
 msgid "kaku2 Envelope"
 msgstr "Amplop kaku2"
 
-#: gtk/paper_names_offsets.c:90
+#: ../gtk/paper_names_offsets.c:90
 msgctxt "paper size"
 msgid "oufuku (reply postcard)"
 msgstr "oufuku (kartu pos balasan)"
 
-#: gtk/paper_names_offsets.c:91
+#: ../gtk/paper_names_offsets.c:91
 msgctxt "paper size"
 msgid "you4 Envelope"
 msgstr "Amplop you4"
 
-#: 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 "Amplop 6x9"
 
-#: gtk/paper_names_offsets.c:102
+#: ../gtk/paper_names_offsets.c:102
 msgctxt "paper size"
 msgid "7x9 Envelope"
 msgstr "Amplop 7x9"
 
-#: gtk/paper_names_offsets.c:103
+#: ../gtk/paper_names_offsets.c:103
 msgctxt "paper size"
 msgid "9x11 Envelope"
 msgstr "Amplop 9x11"
 
-#: gtk/paper_names_offsets.c:104
+#: ../gtk/paper_names_offsets.c:104
 msgctxt "paper size"
 msgid "a2 Envelope"
 msgstr "Amplop a2"
 
-#: gtk/paper_names_offsets.c:105
+#: ../gtk/paper_names_offsets.c:105
 msgctxt "paper size"
 msgid "Arch A"
 msgstr "Arch A"
 
-#: gtk/paper_names_offsets.c:106
+#: ../gtk/paper_names_offsets.c:106
 msgctxt "paper size"
 msgid "Arch B"
 msgstr "Arch B"
 
-#: gtk/paper_names_offsets.c:107
+#: ../gtk/paper_names_offsets.c:107
 msgctxt "paper size"
 msgid "Arch C"
 msgstr "Arch C"
 
-#: gtk/paper_names_offsets.c:108
+#: ../gtk/paper_names_offsets.c:108
 msgctxt "paper size"
 msgid "Arch D"
 msgstr "Arch D"
 
-#: gtk/paper_names_offsets.c:109
+#: ../gtk/paper_names_offsets.c:109
 msgctxt "paper size"
 msgid "Arch E"
 msgstr "Arch 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 "Amplop c5"
 
-#: 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 "edp Eropa"
 
-#: gtk/paper_names_offsets.c:117
+#: ../gtk/paper_names_offsets.c:117
 msgctxt "paper size"
 msgid "Executive"
 msgstr "Eksekutif"
 
-#: 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 "FanFold Eropa"
 
-#: gtk/paper_names_offsets.c:120
+#: ../gtk/paper_names_offsets.c:120
 msgctxt "paper size"
 msgid "FanFold US"
 msgstr "FanFold AS"
 
-#: gtk/paper_names_offsets.c:121
+#: ../gtk/paper_names_offsets.c:121
 msgctxt "paper size"
 msgid "FanFold German Legal"
 msgstr "FanFlod Legal Jerman"
 
-#: gtk/paper_names_offsets.c:122
+#: ../gtk/paper_names_offsets.c:122
 msgctxt "paper size"
 msgid "Government Legal"
 msgstr "Pemerintah Legal"
 
-#: gtk/paper_names_offsets.c:123
+#: ../gtk/paper_names_offsets.c:123
 msgctxt "paper size"
 msgid "Government Letter"
 msgstr "Surat Pemerintah"
 
-#: gtk/paper_names_offsets.c:124
+#: ../gtk/paper_names_offsets.c:124
 msgctxt "paper size"
 msgid "Index 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 (kartu pos)"
 
-#: gtk/paper_names_offsets.c:126
+#: ../gtk/paper_names_offsets.c:126
 msgctxt "paper size"
 msgid "Index 4x6 ext"
 msgstr "Indeks 4x6 ekstensi"
 
-#: gtk/paper_names_offsets.c:127
+#: ../gtk/paper_names_offsets.c:127
 msgctxt "paper size"
 msgid "Index 5x8"
 msgstr "Indeks 5x8"
 
-#: gtk/paper_names_offsets.c:128
+#: ../gtk/paper_names_offsets.c:128
 msgctxt "paper size"
 msgid "Invoice"
 msgstr "Tagihan"
 
-#: gtk/paper_names_offsets.c:129
+#: ../gtk/paper_names_offsets.c:129
 msgctxt "paper size"
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: gtk/paper_names_offsets.c:130
+#: ../gtk/paper_names_offsets.c:130
 msgctxt "paper size"
 msgid "US Legal"
 msgstr "Legal AS"
 
-#: gtk/paper_names_offsets.c:131
+#: ../gtk/paper_names_offsets.c:131
 msgctxt "paper size"
 msgid "US Legal Extra"
 msgstr "Legal AS Ekstra"
 
-#: gtk/paper_names_offsets.c:132
+#: ../gtk/paper_names_offsets.c:132
 msgctxt "paper size"
 msgid "US Letter"
 msgstr "Kuarto AS"
 
-#: gtk/paper_names_offsets.c:133
+#: ../gtk/paper_names_offsets.c:133
 msgctxt "paper size"
 msgid "US Letter Extra"
 msgstr "Kuarto AS Ekstra"
 
-#: gtk/paper_names_offsets.c:134
+#: ../gtk/paper_names_offsets.c:134
 msgctxt "paper size"
 msgid "US Letter Plus"
 msgstr "Kuarto Plus AS"
 
-#: gtk/paper_names_offsets.c:135
+#: ../gtk/paper_names_offsets.c:135
 msgctxt "paper size"
 msgid "Monarch Envelope"
 msgstr "Amplop Monarki"
 
-#: gtk/paper_names_offsets.c:136
+#: ../gtk/paper_names_offsets.c:136
 msgctxt "paper size"
 msgid "#10 Envelope"
 msgstr "Amplop #10"
 
-#: gtk/paper_names_offsets.c:137
+#: ../gtk/paper_names_offsets.c:137
 msgctxt "paper size"
 msgid "#11 Envelope"
 msgstr "Amplop #11"
 
-#: gtk/paper_names_offsets.c:138
+#: ../gtk/paper_names_offsets.c:138
 msgctxt "paper size"
 msgid "#12 Envelope"
 msgstr "Amplop #12"
 
-#: gtk/paper_names_offsets.c:139
+#: ../gtk/paper_names_offsets.c:139
 msgctxt "paper size"
 msgid "#14 Envelope"
 msgstr "Amplop #14"
 
-#: gtk/paper_names_offsets.c:140
+#: ../gtk/paper_names_offsets.c:140
 msgctxt "paper size"
 msgid "#9 Envelope"
 msgstr "Amplop #9"
 
-#: gtk/paper_names_offsets.c:141
+#: ../gtk/paper_names_offsets.c:141
 msgctxt "paper size"
 msgid "Personal Envelope"
 msgstr "Amplop Pribadi"
 
-#: gtk/paper_names_offsets.c:142
+#: ../gtk/paper_names_offsets.c:142
 msgctxt "paper size"
 msgid "Quarto"
 msgstr "Kuarto"
 
-#: gtk/paper_names_offsets.c:143
+#: ../gtk/paper_names_offsets.c:143
 msgctxt "paper size"
 msgid "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"
 
-#: gtk/paper_names_offsets.c:145
+#: ../gtk/paper_names_offsets.c:145
 msgctxt "paper size"
 msgid "Wide Format"
 msgstr "Bentuk Lebar"
 
-#: gtk/paper_names_offsets.c:146
+#: ../gtk/paper_names_offsets.c:146
 msgctxt "paper size"
 msgid "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"
 
-#: gtk/paper_names_offsets.c:148
+#: ../gtk/paper_names_offsets.c:148
 msgctxt "paper size"
 msgid "Folio sp"
 msgstr "Folio sp"
 
-#: gtk/paper_names_offsets.c:149
+#: ../gtk/paper_names_offsets.c:149
 msgctxt "paper size"
 msgid "Invite Envelope"
 msgstr "Amplop Undangan"
 
-#: gtk/paper_names_offsets.c:150
+#: ../gtk/paper_names_offsets.c:150
 msgctxt "paper size"
 msgid "Italian Envelope"
 msgstr "Amplop Italia"
 
-#: gtk/paper_names_offsets.c:151
+#: ../gtk/paper_names_offsets.c:151
 msgctxt "paper size"
 msgid "juuro-ku-kai"
 msgstr "juuro-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 "Amplop Postfix"
 
-#: gtk/paper_names_offsets.c:154
+#: ../gtk/paper_names_offsets.c:154
 msgctxt "paper size"
 msgid "Small Photo"
 msgstr "Foto Kecil"
 
-#: gtk/paper_names_offsets.c:155
+#: ../gtk/paper_names_offsets.c:155
 msgctxt "paper size"
 msgid "prc1 Envelope"
 msgstr "Amplop prc1"
 
-#: gtk/paper_names_offsets.c:156
+#: ../gtk/paper_names_offsets.c:156
 msgctxt "paper size"
 msgid "prc10 Envelope"
 msgstr "Amplop prc10"
 
-#: 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 "Amplop prc2"
 
-#: gtk/paper_names_offsets.c:159
+#: ../gtk/paper_names_offsets.c:159
 msgctxt "paper size"
 msgid "prc3 Envelope"
 msgstr "Amplop prc3"
 
-#: 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 "Amplop prc4"
 
-#: gtk/paper_names_offsets.c:162
+#: ../gtk/paper_names_offsets.c:162
 msgctxt "paper size"
 msgid "prc5 Envelope"
 msgstr "Amplop prc5"
 
-#: gtk/paper_names_offsets.c:163
+#: ../gtk/paper_names_offsets.c:163
 msgctxt "paper size"
 msgid "prc6 Envelope"
 msgstr "Amplop prc6"
 
-#: gtk/paper_names_offsets.c:164
+#: ../gtk/paper_names_offsets.c:164
 msgctxt "paper size"
 msgid "prc7 Envelope"
 msgstr "Amplop prc7"
 
-#: gtk/paper_names_offsets.c:165
+#: ../gtk/paper_names_offsets.c:165
 msgctxt "paper size"
 msgid "prc8 Envelope"
 msgstr "Amplop prc8"
 
-#: gtk/paper_names_offsets.c:166
+#: ../gtk/paper_names_offsets.c:166
 msgctxt "paper size"
 msgid "prc9 Envelope"
 msgstr "Amplop prc9"
 
-#: gtk/paper_names_offsets.c:167
+#: ../gtk/paper_names_offsets.c:167
 msgctxt "paper size"
 msgid "ROC 16k"
 msgstr "ROC 16k"
 
-#: gtk/paper_names_offsets.c:168
+#: ../gtk/paper_names_offsets.c:168
 msgctxt "paper size"
 msgid "ROC 8k"
 msgstr "ROC 8k"
 
-#: gtk/updateiconcache.c:492 gtk/updateiconcache.c:552
+#: ../gtk/updateiconcache.c:492
+#: ../gtk/updateiconcache.c:552
 #, c-format
 msgid "different idatas found for symlinked '%s' and '%s'\n"
 msgstr "idata yang berbeda ditemukan untuk symlink '%s' dan '%s'\n"
 
-#: gtk/updateiconcache.c:1374
+#: ../gtk/updateiconcache.c:1374
 #, c-format
 msgid "Failed to write header\n"
 msgstr "Gagal menulis judul\n"
 
-#: gtk/updateiconcache.c:1380
+#: ../gtk/updateiconcache.c:1380
 #, c-format
 msgid "Failed to write hash table\n"
 msgstr "Gagal menulis tabel hash\n"
 
-#: gtk/updateiconcache.c:1386
+#: ../gtk/updateiconcache.c:1386
 #, c-format
 msgid "Failed to write folder index\n"
 msgstr "Gagal menulis indeks folder\n"
 
-#: gtk/updateiconcache.c:1394
+#: ../gtk/updateiconcache.c:1394
 #, c-format
 msgid "Failed to rewrite header\n"
 msgstr "Gagal menulis ulang judul\n"
 
-#: gtk/updateiconcache.c:1463
+#: ../gtk/updateiconcache.c:1488
 #, c-format
 msgid "Failed to open file %s : %s\n"
 msgstr "Gagal membuka berkas %s: %s\n"
 
-#: gtk/updateiconcache.c:1471
+#: ../gtk/updateiconcache.c:1496
+#: ../gtk/updateiconcache.c:1526
 #, c-format
 msgid "Failed to write cache file: %s\n"
 msgstr "Gagal menulis singgahan berkas: %s\n"
 
-#: gtk/updateiconcache.c:1507
+#: ../gtk/updateiconcache.c:1537
 #, c-format
 msgid "The generated cache was invalid.\n"
 msgstr "Cache yang diolah tidak sah.\n"
 
-#: gtk/updateiconcache.c:1521
+#: ../gtk/updateiconcache.c:1551
 #, c-format
 msgid "Could not rename %s to %s: %s, removing %s then.\n"
 msgstr "Tidak bisa mengganti nama %s jadi %s: %s, membuang %s kemudian.\n"
 
-#: gtk/updateiconcache.c:1535
+#: ../gtk/updateiconcache.c:1565
 #, c-format
 msgid "Could not rename %s to %s: %s\n"
 msgstr "Tidak dapat mengubah nama %s menjadi %s: %s.\n"
 
-#: gtk/updateiconcache.c:1545
+#: ../gtk/updateiconcache.c:1575
 #, c-format
 msgid "Could not rename %s back to %s: %s.\n"
 msgstr "Tidak bisa mengganti nama %s kembali ke %s: %s.\n"
 
-#: gtk/updateiconcache.c:1572
+#: ../gtk/updateiconcache.c:1602
 #, c-format
 msgid "Cache file created successfully.\n"
 msgstr "Berkas cache dibuat dengan sukses.\n"
 
-#: gtk/updateiconcache.c:1611
+#: ../gtk/updateiconcache.c:1641
 msgid "Overwrite an existing cache, even if up to date"
 msgstr "Menimpa cache yang ada, bahkan jika terbaru"
 
-#: gtk/updateiconcache.c:1612
+#: ../gtk/updateiconcache.c:1642
 msgid "Don't check for the existence of index.theme"
 msgstr "Jangan periksa keberadaan tema indeks"
 
-#: gtk/updateiconcache.c:1613
+#: ../gtk/updateiconcache.c:1643
 msgid "Don't include image data in the cache"
 msgstr "Jangan data gambar dalam cache"
 
-#: gtk/updateiconcache.c:1614
+#: ../gtk/updateiconcache.c:1644
 msgid "Output a C header file"
 msgstr "Keluarkan judul berkas C"
 
-#: gtk/updateiconcache.c:1615
+#: ../gtk/updateiconcache.c:1645
 msgid "Turn off verbose output"
 msgstr "Matikan keluaran panjang"
 
-#: gtk/updateiconcache.c:1616
+#: ../gtk/updateiconcache.c:1646
 msgid "Validate existing icon cache"
 msgstr "Validasi cache ikon yang telah ada"
 
-#: gtk/updateiconcache.c:1683
+#: ../gtk/updateiconcache.c:1713
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Berkas tidak ditemukan: %s\n"
 
-#: gtk/updateiconcache.c:1689
+#: ../gtk/updateiconcache.c:1719
 #, c-format
 msgid "Not a valid icon cache: %s\n"
 msgstr "Bukan ikon cache yang sah: %s\n"
 
-#: gtk/updateiconcache.c:1702
+#: ../gtk/updateiconcache.c:1732
 #, c-format
 msgid "No theme index file.\n"
 msgstr "Tak ada berkas indeks tema.\n"
 
-#: gtk/updateiconcache.c:1706
+#: ../gtk/updateiconcache.c:1736
 #, 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 ""
 "Tanpa berkas index dalam '%s'.\n"
-"JIka Anda benar benar ingin membuat cache ikon di sini, gunakan --ignore-"
-"theme-index.\n"
+"JIka Anda benar benar ingin membuat cache ikon di sini, gunakan --ignore-theme-index.\n"
 
 #. ID
-#: modules/input/imam-et.c:454
+#: ../modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Amharik (EZ+)"
 
 #. ID
-#: modules/input/imcedilla.c:92
+#: ../modules/input/imcedilla.c:92
 msgid "Cedilla"
 msgstr "Cedilla"
 
 #. ID
-#: modules/input/imcyrillic-translit.c:217
+#: ../modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Sirilik (Transliterasi)"
 
 #. ID
-#: modules/input/iminuktitut.c:127
+#: ../modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inuktitut (Transliterasi)"
 
 #. ID
-#: modules/input/imipa.c:145
+#: ../modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: modules/input/immultipress.c:31
+#: ../modules/input/immultipress.c:31
 msgid "Multipress"
 msgstr "Multi tekan"
 
 #. ID
-#: modules/input/imthai.c:35
+#: ../modules/input/imthai.c:35
 msgid "Thai-Lao"
 msgstr "Thai-Lao"
 
 #. ID
-#: modules/input/imti-er.c:453
+#: ../modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Tigrigna-Eritrean (EZ+)"
 
 #. ID
-#: modules/input/imti-et.c:453
+#: ../modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Tigrigna-Ethiopian (EZ+)"
 
 #. ID
-#: modules/input/imviqr.c:244
+#: ../modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Vietnam (VIQR)"
 
 #. ID
-#: modules/input/imxim.c:28
+#: ../modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "X Input Method"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:811
-#: modules/printbackends/cups/gtkprintbackendcups.c:1020
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:810
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1020
 msgid "Username:"
 msgstr "Nama Pengguna:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:812
-#: modules/printbackends/cups/gtkprintbackendcups.c:1029
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:811
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1029
 msgid "Password:"
 msgstr "Sandi:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:850
-#, c-format
-msgid "Authentication is required to get a file from %s"
-msgstr "Perlu otentikasi untuk memperoleh suatu berkas dari %s"
-
-#: modules/printbackends/cups/gtkprintbackendcups.c:854
-#: modules/printbackends/cups/gtkprintbackendcups.c:1042
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:850
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1042
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
 msgstr "Perlu otentikasi untuk mencetak dokumen '%s' pada pencetak %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:856
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:852
 #, c-format
 msgid "Authentication is required to print a document on %s"
 msgstr "Perlu otentikasi untuk mencetak suatu dokumen pada %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:860
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:856
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
 msgstr "Perlu otentikasi untuk memperoleh atribut dari tugas '%s'"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:862
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:858
 msgid "Authentication is required to get attributes of a job"
 msgstr "Perlu otentikasi untuk memperoleh atribut dari suatu tugas"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:866
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:862
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
 msgstr "Perlu otentikasi untuk memperoleh atribut dari pencetak %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:868
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:864
 msgid "Authentication is required to get attributes of a printer"
 msgstr "Perlu otentikasi untuk memperoleh atribut dari suatu pencetak"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:871
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:867
 #, c-format
 msgid "Authentication is required to get default printer of %s"
 msgstr "Perlu otentikasi untuk memperoleh pencetak bawaan dari %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:874
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:870
 #, c-format
 msgid "Authentication is required to get printers from %s"
 msgstr "Perlu otentikasi untuk memperoleh pencetak dari %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:877
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:875
+#, c-format
+msgid "Authentication is required to get a file from %s"
+msgstr "Perlu otentikasi untuk memperoleh suatu berkas dari %s"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:877
 #, c-format
 msgid "Authentication is required on %s"
 msgstr "Perlu otentikasi pada %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1014
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1014
 msgid "Domain:"
 msgstr "Domain:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1044
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1044
 #, c-format
 msgid "Authentication is required to print document '%s'"
 msgstr "Perlu otentikasi untuk mencetak dokumen '%s'"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1049
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1049
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
 msgstr "Perlu otentikasi untuk mencetak dokumen ini pada pencetak %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1051
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1051
 msgid "Authentication is required to print this document"
 msgstr "Perlu otentikasi untuk mencetak dokumen ini"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1672
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1672
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "Tinta pada pencetak '%s' tersisa sedikit."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1673
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1673
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "Tinta pada pencetak '%s' habis."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1675
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1675
 #, c-format
 msgid "Printer '%s' is low on developer."
 msgstr "Developer pada pencetak '%s' tersisa sedikit."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1677
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1677
 #, c-format
 msgid "Printer '%s' is out of developer."
 msgstr "Developer pada pencetak '%s' habis."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1679
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1679
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
 msgstr "Paling tidak satu catu penanda pencetak '%s' tersisa sedikit."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1681
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1681
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
 msgstr "Paling tidak satu catu penanda pencetak '%s' habis."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1682
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1682
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "Penutup pencetak '%s' terbuka."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1683
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1683
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "Pintu pencetak '%s' terbuka."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1684
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1684
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "Kertas di pencetak '%s' tersisa sedikit."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1685
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1685
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "Pencetak '%s' kehabisan kertas."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1686
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1686
 #, c-format
 msgid "Printer '%s' is currently offline."
 msgstr "Pencetak '%s' sedang luring."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1687
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1687
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "Ada masalah pada pencetak '%s'."
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:1995
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1995
 msgid "Paused ; Rejecting Jobs"
 msgstr "Jeda ; Menolak Tugas"
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2001
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2001
 msgid "Rejecting Jobs"
 msgstr "Menolak Tugas"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2777
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2777
 msgid "Two Sided"
 msgstr "Dua Sisi"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2778
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2778
 msgid "Paper Type"
 msgstr "Jenis Kertas"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2779
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2779
 msgid "Paper Source"
 msgstr "Sumber Kertas"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2780
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2780
 msgid "Output Tray"
 msgstr "Baki Keluaran"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2781
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2781
 msgid "Resolution"
 msgstr "Resolusi"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2782
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2782
 msgid "GhostScript pre-filtering"
 msgstr "Pra penapisan GhostScript"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2791
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2791
 msgid "One Sided"
 msgstr "Satu Sisi"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2793
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2793
 msgid "Long Edge (Standard)"
 msgstr "Sisi Panjang (Standar)"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2795
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2795
 msgid "Short Edge (Flip)"
 msgstr "Sisi Pendek (Putar)"
 
 #. 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:2797
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2799
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2807
 msgid "Auto Select"
 msgstr "Seleksi Otomatis"
 
 # "Bawaan Pencetak" bukan "Baku Pencetak"^^
 #. 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:2801
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2803
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2805
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2809
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3305
 msgid "Printer Default"
 msgstr "Bawaan Pencetak"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2811
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2811
 msgid "Embed GhostScript fonts only"
 msgstr "Tempelkan fonta GhostScript saja"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2813
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2813
 msgid "Convert to PS level 1"
 msgstr "Konversi ke PS tingkat 1"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2815
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2815
 msgid "Convert to PS level 2"
 msgstr "Konversi ke PS tingkat 2"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2817
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2817
 msgid "No pre-filtering"
 msgstr "Tanpa prapenyaringan"
 
 #. 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:2826
 msgid "Miscellaneous"
 msgstr "Lain-lain"
 
 #. 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:3529
 msgid "Urgent"
 msgstr "Penting"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3529
 msgid "High"
 msgstr "Tinggi"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3529
 msgid "Medium"
 msgstr "Sedang"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3529
 msgid "Low"
 msgstr "Rendah"
 
@@ -4030,66 +4038,66 @@ msgstr "Rendah"
 #. 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:3553
 msgid "Pages per Sheet"
 msgstr "Halaman per Lembar"
 
 #. 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:3590
 msgid "Job Priority"
 msgstr "Prioritas Tugas"
 
 #. 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:3601
 msgid "Billing Info"
 msgstr "Info Tagihan"
 
 #. 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:3616
 msgid "None"
 msgstr "Nihil"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Classified"
 msgstr "Terklasifikasi"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Confidential"
 msgstr "Pribadi"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Secret"
 msgstr "Rahasia"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Standard"
 msgstr "Standar"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Top Secret"
 msgstr "Sangat Rahasia"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Unclassified"
 msgstr "Belum terklasifikasi"
 
 #. 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:3651
 msgid "Before"
 msgstr "Sebelum"
 
 #. 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:3666
 msgid "After"
 msgstr "Sesudah"
 
@@ -4097,14 +4105,14 @@ msgstr "Sesudah"
 #. * 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:3686
 msgid "Print at"
 msgstr "Dicetak pada"
 
 #. 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:3697
 msgid "Print at time"
 msgstr "Dicetak pada waktu"
 
@@ -4112,107 +4120,108 @@ msgstr "Dicetak pada waktu"
 #. * 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:3732
 #, c-format
 msgid "Custom %sx%s"
 msgstr "Gubahan %sx%s"
 
 #. 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 "keluaran.%s"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:493
+#: ../modules/printbackends/file/gtkprintbackendfile.c:501
 msgid "Print to File"
 msgstr "Cetak sebagai Berkas"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:578
 msgid "PDF"
 msgstr "PDF"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:578
 msgid "Postscript"
 msgstr "Postscript"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:578
 msgid "SVG"
 msgstr "SVG"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:582
-#: modules/printbackends/test/gtkprintbackendtest.c:503
+#: ../modules/printbackends/file/gtkprintbackendfile.c:590
+#: ../modules/printbackends/test/gtkprintbackendtest.c:503
 msgid "Pages per _sheet:"
 msgstr "Halaman per _lembar:"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:641
+#: ../modules/printbackends/file/gtkprintbackendfile.c:649
 msgid "File"
 msgstr "Berkas"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:651
+#: ../modules/printbackends/file/gtkprintbackendfile.c:659
 msgid "_Output format"
 msgstr "F_ormat keluaran"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:395
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:395
 msgid "Print to LPR"
 msgstr "Cetak melalui LPR"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:421
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:421
 msgid "Pages Per Sheet"
 msgstr "Halaman Per Lembar"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:428
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:428
 msgid "Command Line"
 msgstr "Baris Perintah"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:811
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:811
 msgid "printer offline"
 msgstr "pencetak sedang luring"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:829
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:829
 msgid "ready to print"
 msgstr "siap mencetak"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:832
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:832
 msgid "processing job"
 msgstr "memproses tugas"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:836
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:836
 msgid "paused"
 msgstr "ditahan"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:839
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:839
 msgid "unknown"
 msgstr "tak dikenal"
 
 #. 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 "keluaran.%s"
 
-#: modules/printbackends/test/gtkprintbackendtest.c:467
+#: ../modules/printbackends/test/gtkprintbackendtest.c:467
 msgid "Print to Test Printer"
 msgstr "Cetak untuk Menguji Pencetak"
 
-#: tests/testfilechooser.c:207
+#: ../tests/testfilechooser.c:207
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Gagal mengambil informasi mengenai berkas '%s': %s"
 
-#: tests/testfilechooser.c:222
+#: ../tests/testfilechooser.c:222
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Gagal membuka berkas '%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 ""
-"Gagal memuat citra '%s': alasan tak diketahui, mungkin berkas citra yang "
-"rusak"
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "Gagal memuat citra '%s': alasan tak diketahui, mungkin berkas citra yang rusak"
+
+#~ msgid "Error creating folder '%s': %s"
+#~ msgstr "Galat ketika membuat folder '%s': %s"
+
diff --git a/po/ro.po b/po/ro.po
index d3b9c7fafb..18ccb5b4e2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,318 +5,319 @@
 # Mișu Moldovan <dumol@gnome.ro>, 2003 - 2010.
 # Lucian Adrian Grijincu <lucian.grijincu@gmail.com>, 2009, 2010.
 # Cristian Secară <cristi AT secarica DOT ro>, 2010.
+# Eu93 <spoiala.marian@yahoo.com>, 2010.
+# Spoiala Marian <spoiala.marian@yahoo.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 15:41-0400\n"
-"PO-Revision-Date: 2010-08-04 17:26+0300\n"
-"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
-"Language-Team: Romanian Gnome Team <gnomero-list@lists.sourceforge.net>\n"
-"Language: ro\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%"
+"2b&component=general\n"
+"POT-Creation-Date: 2010-11-24 12:37+0000\n"
+"PO-Revision-Date: 2010-11-26 13:33+0300\n"
+"Last-Translator: Spoiala Marian <spoiala.marian@yahoo.com>\n"
+"Language-Team: Romania\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2);;\n"
 "X-Generator: Virtaal 0.6.1\n"
 
-#: gdk/gdk.c:103
+#: ../gdk/gdk.c:115
 #, c-format
 msgid "Error parsing option --gdk-debug"
 msgstr "Eroare la analizarea opțiunii --gtk-debug"
 
-#: gdk/gdk.c:123
+#: ../gdk/gdk.c:135
 #, c-format
 msgid "Error parsing option --gdk-no-debug"
-msgstr "Eroare la analizarea opțiunii --gtk-debug"
+msgstr "Eroare la analizarea opțiunii --gtk-no-debug"
 
 #. Description of --class=CLASS in --help output
-#: gdk/gdk.c:151
+#: ../gdk/gdk.c:163
 msgid "Program class as used by the window manager"
-msgstr "Clasa programului folosită de administratorul de ferestre"
+msgstr "Clasa programului așa cum este folosită de administratorul de ferestre"
 
 #. Placeholder in --class=CLASS in --help output
-#: gdk/gdk.c:152
+#: ../gdk/gdk.c:164
 msgid "CLASS"
 msgstr "CLASĂ"
 
 #. Description of --name=NAME in --help output
-#: gdk/gdk.c:154
+#: ../gdk/gdk.c:166
 msgid "Program name as used by the window manager"
-msgstr "Numele programului așa cum este denumit de administratorul de ferestre"
+msgstr "Numele programului așa cum este folosit de administratorul de ferestre"
 
 #. Placeholder in --name=NAME in --help output
-#: gdk/gdk.c:155
+#: ../gdk/gdk.c:167
 msgid "NAME"
 msgstr "NUME"
 
 #. Description of --display=DISPLAY in --help output
-#: gdk/gdk.c:157
+#: ../gdk/gdk.c:169
 msgid "X display to use"
 msgstr "Display X de utilizat"
 
 #. Placeholder in --display=DISPLAY in --help output
-#: gdk/gdk.c:158
+#: ../gdk/gdk.c:170
 msgid "DISPLAY"
 msgstr "DISPLAY"
 
 #. Description of --screen=SCREEN in --help output
-#: gdk/gdk.c:160
+#: ../gdk/gdk.c:172
 msgid "X screen to use"
 msgstr "Ecran X de utilizat"
 
 #. Placeholder in --screen=SCREEN in --help output
-#: gdk/gdk.c:161
+#: ../gdk/gdk.c:173
 msgid "SCREEN"
 msgstr "ECRAN"
 
 #. Description of --gdk-debug=FLAGS in --help output
-#: gdk/gdk.c:164
-#, fuzzy
+#: ../gdk/gdk.c:176
 msgid "GDK debugging flags to set"
-msgstr "Fanioane de depanare GTK+ de activat"
+msgstr "Fanioane de depanare GTK+ de selectat"
 
 #. 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:177 ../gdk/gdk.c:180 ../gtk/gtkmain.c:525 ../gtk/gtkmain.c:528
 msgid "FLAGS"
 msgstr "FANIOANE"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
-#: gdk/gdk.c:167
-#, fuzzy
+#: ../gdk/gdk.c:179
 msgid "GDK debugging flags to unset"
-msgstr "Fanioane de depanare GTK+ de dezactivat"
+msgstr "Fanioane de depanare GTK+ de deselectat"
 
-#: gdk/keyname-table.h:3940
+#: ../gdk/keyname-table.h:3940
 msgctxt "keyboard label"
 msgid "BackSpace"
 msgstr "BackSpace"
 
-#: gdk/keyname-table.h:3941
+#: ../gdk/keyname-table.h:3941
 msgctxt "keyboard label"
 msgid "Tab"
 msgstr "Tab"
 
-#: gdk/keyname-table.h:3942
+#: ../gdk/keyname-table.h:3942
 msgctxt "keyboard label"
 msgid "Return"
 msgstr "Enter"
 
-#: gdk/keyname-table.h:3943
+#: ../gdk/keyname-table.h:3943
 msgctxt "keyboard label"
 msgid "Pause"
 msgstr "Pause"
 
-#: gdk/keyname-table.h:3944
+#: ../gdk/keyname-table.h:3944
 msgctxt "keyboard label"
 msgid "Scroll_Lock"
 msgstr "Scroll_Lock"
 
-#: gdk/keyname-table.h:3945
+#: ../gdk/keyname-table.h:3945
 msgctxt "keyboard label"
 msgid "Sys_Req"
 msgstr "Sys_Req"
 
-#: gdk/keyname-table.h:3946
+#: ../gdk/keyname-table.h:3946
 msgctxt "keyboard label"
 msgid "Escape"
 msgstr "Escape"
 
-#: gdk/keyname-table.h:3947
+#: ../gdk/keyname-table.h:3947
 msgctxt "keyboard label"
 msgid "Multi_key"
 msgstr "Multi_key"
 
-#: gdk/keyname-table.h:3948
+#: ../gdk/keyname-table.h:3948
 msgctxt "keyboard label"
 msgid "Home"
 msgstr "Home"
 
-#: gdk/keyname-table.h:3949
+#: ../gdk/keyname-table.h:3949
 msgctxt "keyboard label"
 msgid "Left"
-msgstr "La stânga"
+msgstr "Stânga"
 
-#: gdk/keyname-table.h:3950
+#: ../gdk/keyname-table.h:3950
 msgctxt "keyboard label"
 msgid "Up"
-msgstr "În sus"
+msgstr "Sus"
 
-#: gdk/keyname-table.h:3951
+#: ../gdk/keyname-table.h:3951
 msgctxt "keyboard label"
 msgid "Right"
-msgstr "La dreapta"
+msgstr "Dreapta"
 
-#: gdk/keyname-table.h:3952
+#: ../gdk/keyname-table.h:3952
 msgctxt "keyboard label"
 msgid "Down"
-msgstr "În jos"
+msgstr "Jos"
 
-#: gdk/keyname-table.h:3953
+#: ../gdk/keyname-table.h:3953
 msgctxt "keyboard label"
 msgid "Page_Up"
 msgstr "Page_Up"
 
-#: gdk/keyname-table.h:3954
+#: ../gdk/keyname-table.h:3954
 msgctxt "keyboard label"
 msgid "Page_Down"
 msgstr "Page_Down"
 
-#: gdk/keyname-table.h:3955
+#: ../gdk/keyname-table.h:3955
 msgctxt "keyboard label"
 msgid "End"
 msgstr "End"
 
-#: gdk/keyname-table.h:3956
+#: ../gdk/keyname-table.h:3956
 msgctxt "keyboard label"
 msgid "Begin"
 msgstr "Begin"
 
-#: gdk/keyname-table.h:3957
+#: ../gdk/keyname-table.h:3957
 msgctxt "keyboard label"
 msgid "Print"
 msgstr "Print"
 
-#: gdk/keyname-table.h:3958
+#: ../gdk/keyname-table.h:3958
 msgctxt "keyboard label"
 msgid "Insert"
 msgstr "Insert"
 
-#: gdk/keyname-table.h:3959
+#: ../gdk/keyname-table.h:3959
 msgctxt "keyboard label"
 msgid "Num_Lock"
 msgstr "Num_Lock"
 
-#: gdk/keyname-table.h:3960
+#: ../gdk/keyname-table.h:3960
 msgctxt "keyboard label"
 msgid "KP_Space"
 msgstr "KP_Space"
 
-#: gdk/keyname-table.h:3961
+#: ../gdk/keyname-table.h:3961
 msgctxt "keyboard label"
 msgid "KP_Tab"
 msgstr "KP_Tab"
 
-#: gdk/keyname-table.h:3962
+#: ../gdk/keyname-table.h:3962
 msgctxt "keyboard label"
 msgid "KP_Enter"
 msgstr "KP_Enter"
 
-#: gdk/keyname-table.h:3963
+#: ../gdk/keyname-table.h:3963
 msgctxt "keyboard label"
 msgid "KP_Home"
 msgstr "KP_Home"
 
-#: gdk/keyname-table.h:3964
+#: ../gdk/keyname-table.h:3964
 msgctxt "keyboard label"
 msgid "KP_Left"
 msgstr "KP_Left"
 
-#: gdk/keyname-table.h:3965
+#: ../gdk/keyname-table.h:3965
 msgctxt "keyboard label"
 msgid "KP_Up"
 msgstr "KP_Up"
 
-#: gdk/keyname-table.h:3966
+#: ../gdk/keyname-table.h:3966
 msgctxt "keyboard label"
 msgid "KP_Right"
 msgstr "KP_Right"
 
-#: gdk/keyname-table.h:3967
+#: ../gdk/keyname-table.h:3967
 msgctxt "keyboard label"
 msgid "KP_Down"
 msgstr "KP_Down"
 
-#: gdk/keyname-table.h:3968
+#: ../gdk/keyname-table.h:3968
 msgctxt "keyboard label"
 msgid "KP_Page_Up"
 msgstr "KP_Page_Up"
 
-#: gdk/keyname-table.h:3969
+#: ../gdk/keyname-table.h:3969
 msgctxt "keyboard label"
 msgid "KP_Prior"
 msgstr "KP_Prior"
 
-#: gdk/keyname-table.h:3970
+#: ../gdk/keyname-table.h:3970
 msgctxt "keyboard label"
 msgid "KP_Page_Down"
 msgstr "KP_Page_Down"
 
-#: gdk/keyname-table.h:3971
+#: ../gdk/keyname-table.h:3971
 msgctxt "keyboard label"
 msgid "KP_Next"
 msgstr "KP_Next"
 
-#: gdk/keyname-table.h:3972
+#: ../gdk/keyname-table.h:3972
 msgctxt "keyboard label"
 msgid "KP_End"
 msgstr "KP_End"
 
-#: gdk/keyname-table.h:3973
+#: ../gdk/keyname-table.h:3973
 msgctxt "keyboard label"
 msgid "KP_Begin"
 msgstr "KP_Begin"
 
-#: gdk/keyname-table.h:3974
+#: ../gdk/keyname-table.h:3974
 msgctxt "keyboard label"
 msgid "KP_Insert"
 msgstr "KP_Insert"
 
-#: gdk/keyname-table.h:3975
+#: ../gdk/keyname-table.h:3975
 msgctxt "keyboard label"
 msgid "KP_Delete"
 msgstr "KP_Delete"
 
-#: gdk/keyname-table.h:3976
+#: ../gdk/keyname-table.h:3976
 msgctxt "keyboard label"
 msgid "Delete"
 msgstr "Delete"
 
 #. Description of --sync in --help output
-#: gdk/win32/gdkmain-win32.c:54
+#: ../gdk/win32/gdkmain-win32.c:54
 msgid "Don't batch GDI requests"
 msgstr "Nu grupa cererile GDI"
 
 #. Description of --no-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:56
+#: ../gdk/win32/gdkmain-win32.c:56
 msgid "Don't use the Wintab API for tablet support"
 msgstr "Nu utiliza interfața Wintab pentru suportul dispozitivelor „tablet”"
 
 #. Description of --ignore-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:58
+#: ../gdk/win32/gdkmain-win32.c:58
 msgid "Same as --no-wintab"
 msgstr "Precum --no-wintab"
 
 #. Description of --use-wintab in --help output
-#: gdk/win32/gdkmain-win32.c:60
+#: ../gdk/win32/gdkmain-win32.c:60
 msgid "Do use the Wintab API [default]"
 msgstr "Utilizează interfața Wintab (implicit)"
 
 #. Description of --max-colors=COLORS in --help output
-#: gdk/win32/gdkmain-win32.c:62
+#: ../gdk/win32/gdkmain-win32.c:62
 msgid "Size of the palette in 8 bit mode"
 msgstr "Mărimea paletei în modul pe 8 biți"
 
 #. Placeholder in --max-colors=COLORS in --help output
-#: gdk/win32/gdkmain-win32.c:63
+#: ../gdk/win32/gdkmain-win32.c:63
 msgid "COLORS"
 msgstr "CULORI"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:312
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:312
 #, c-format
 msgid "Starting %s"
 msgstr "Se pornește %s"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:316
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:316
 #, c-format
 msgid "Opening %s"
 msgstr "Se deschide „%s”"
 
-#: gdk/x11/gdkapplaunchcontext-x11.c:321
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:321
 #, c-format
 msgid "Opening %d Item"
 msgid_plural "Opening %d Items"
@@ -325,62 +326,63 @@ msgstr[1] "Se deschid %d elemente"
 msgstr[2] "Se deschid %d de elemente"
 
 #. Description of --sync in --help output
-#: gdk/x11/gdkmain-x11.c:96
+#: ../gdk/x11/gdkmain-x11.c:94
 msgid "Make X calls synchronous"
-msgstr "Cereri X sincrone"
+msgstr "Fă apeluri X sincrone"
 
 #. Translators: this is the license preamble; the string at the end
 #. * contains the URL of the license.
 #.
-#: gtk/gtkaboutdialog.c:101
+#: ../gtk/gtkaboutdialog.c:101
 #, c-format
 msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s"
 msgstr ""
+"Acest program vine fără ABSOLUT NICIO GARANŢIE; pentru detalii, vizitați %s"
 
-#: gtk/gtkaboutdialog.c:339 gtk/gtkaboutdialog.c:2235
+#: ../gtk/gtkaboutdialog.c:339 ../gtk/gtkaboutdialog.c:2233
 msgid "License"
 msgstr "Licență"
 
-#: gtk/gtkaboutdialog.c:340
+#: ../gtk/gtkaboutdialog.c:340
 msgid "The license of the program"
 msgstr "Licența programului"
 
 #. Add the credits button
-#: gtk/gtkaboutdialog.c:621
+#: ../gtk/gtkaboutdialog.c:622
 msgid "C_redits"
 msgstr "Auto_ri"
 
 #. Add the license button
-#: gtk/gtkaboutdialog.c:635
+#: ../gtk/gtkaboutdialog.c:636
 msgid "_License"
 msgstr "_Licență"
 
-#: gtk/gtkaboutdialog.c:839
+#: ../gtk/gtkaboutdialog.c:840
 msgid "Could not show link"
 msgstr "Legătura nu poate fi afișată"
 
-#: gtk/gtkaboutdialog.c:932
+#: ../gtk/gtkaboutdialog.c:933
 #, c-format
 msgid "About %s"
 msgstr "Despre %s"
 
-#: gtk/gtkaboutdialog.c:2153
+#: ../gtk/gtkaboutdialog.c:2151
 msgid "Credits"
 msgstr "Autori"
 
-#: gtk/gtkaboutdialog.c:2185
+#: ../gtk/gtkaboutdialog.c:2183
 msgid "Written by"
 msgstr "Programare"
 
-#: gtk/gtkaboutdialog.c:2188
+#: ../gtk/gtkaboutdialog.c:2186
 msgid "Documented by"
 msgstr "Documentație"
 
-#: gtk/gtkaboutdialog.c:2200
+#: ../gtk/gtkaboutdialog.c:2198
 msgid "Translated by"
 msgstr "Traducere"
 
-#: gtk/gtkaboutdialog.c:2204
+#: ../gtk/gtkaboutdialog.c:2202
 msgid "Artwork by"
 msgstr "Interfață"
 
@@ -389,7 +391,7 @@ msgstr "Interfață"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:160
+#: ../gtk/gtkaccellabel.c:160
 msgctxt "keyboard label"
 msgid "Shift"
 msgstr "Shift"
@@ -399,7 +401,7 @@ msgstr "Shift"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:166
+#: ../gtk/gtkaccellabel.c:166
 msgctxt "keyboard label"
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -409,7 +411,7 @@ msgstr "Ctrl"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:172
+#: ../gtk/gtkaccellabel.c:172
 msgctxt "keyboard label"
 msgid "Alt"
 msgstr "Alt"
@@ -419,7 +421,7 @@ msgstr "Alt"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:770
+#: ../gtk/gtkaccellabel.c:770
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -429,7 +431,7 @@ msgstr "Super"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:783
+#: ../gtk/gtkaccellabel.c:783
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Hyper"
@@ -439,37 +441,37 @@ msgstr "Hyper"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
-#: gtk/gtkaccellabel.c:797
+#: ../gtk/gtkaccellabel.c:797
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"
 
-#: gtk/gtkaccellabel.c:813
+#: ../gtk/gtkaccellabel.c:813
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Bara de spațiu"
 
-#: gtk/gtkaccellabel.c:816
+#: ../gtk/gtkaccellabel.c:816
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Backslash"
 
-#: gtk/gtkbuilderparser.c:343
+#: ../gtk/gtkbuilderparser.c:343
 #, c-format
 msgid "Invalid type function on line %d: '%s'"
 msgstr "Tip nevalid pentru funcția de la linia %d: „%s”"
 
-#: gtk/gtkbuilderparser.c:407
-#, fuzzy, c-format
+#: ../gtk/gtkbuilderparser.c:407
+#, c-format
 msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
 msgstr "ID obiect duplicat „%s” la linia %d (precedent la linia %d)"
 
-#: gtk/gtkbuilderparser.c:859
+#: ../gtk/gtkbuilderparser.c:859
 #, c-format
 msgid "Invalid root element: '%s'"
 msgstr "Element rădăcină nevalid: „%s”"
 
-#: gtk/gtkbuilderparser.c:898
+#: ../gtk/gtkbuilderparser.c:898
 #, c-format
 msgid "Unhandled tag: '%s'"
 msgstr "Marcaj negestionat: „%s”"
@@ -484,7 +486,7 @@ msgstr "Marcaj negestionat: „%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:878
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -492,7 +494,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:916
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:1"
 
@@ -501,7 +503,7 @@ msgstr "calendar:week_start:1"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
-#: gtk/gtkcalendar.c:2006
+#: ../gtk/gtkcalendar.c:1848
 msgctxt "year measurement template"
 msgid "2000"
 msgstr "2000"
@@ -516,7 +518,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:1879 ../gtk/gtkcalendar.c:2564
 #, c-format
 msgctxt "calendar:day:digits"
 msgid "%d"
@@ -532,7 +534,7 @@ msgstr "%d"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
-#: gtk/gtkcalendar.c:2069 gtk/gtkcalendar.c:2579
+#: ../gtk/gtkcalendar.c:1911 ../gtk/gtkcalendar.c:2432
 #, c-format
 msgctxt "calendar:week:digits"
 msgid "%d"
@@ -548,7 +550,7 @@ msgstr "%d"
 #. *
 #. * "%Y" is appropriate for most locales.
 #.
-#: gtk/gtkcalendar.c:2361
+#: ../gtk/gtkcalendar.c:2197
 msgctxt "calendar year format"
 msgid "%Y"
 msgstr "%Y"
@@ -556,7 +558,7 @@ msgstr "%Y"
 #. This label is displayed in a treeview cell displaying
 #. * a disabled accelerator key combination.
 #.
-#: gtk/gtkcellrendereraccel.c:272
+#: ../gtk/gtkcellrendereraccel.c:272
 msgctxt "Accelerator"
 msgid "Disabled"
 msgstr "Dezactivat"
@@ -565,7 +567,7 @@ msgstr "Dezactivat"
 #. * an accelerator key combination that is not valid according
 #. * to gtk_accelerator_valid().
 #.
-#: gtk/gtkcellrendereraccel.c:282
+#: ../gtk/gtkcellrendereraccel.c:282
 msgctxt "Accelerator"
 msgid "Invalid"
 msgstr "Nevalid"
@@ -574,25 +576,25 @@ msgstr "Nevalid"
 #. * an accelerator when the cell is clicked to change the
 #. * acelerator.
 #.
-#: gtk/gtkcellrendereraccel.c:418 gtk/gtkcellrendereraccel.c:675
+#: ../gtk/gtkcellrendereraccel.c:418 ../gtk/gtkcellrendereraccel.c:675
 msgid "New accelerator..."
 msgstr "Accelerator nou..."
 
-#: gtk/gtkcellrendererprogress.c:362 gtk/gtkcellrendererprogress.c:452
+#: ../gtk/gtkcellrendererprogress.c:362 ../gtk/gtkcellrendererprogress.c:452
 #, c-format
 msgctxt "progress bar label"
 msgid "%d %%"
 msgstr "%d %%"
 
-#: gtk/gtkcolorbutton.c:176 gtk/gtkcolorbutton.c:445
+#: ../gtk/gtkcolorbutton.c:188 ../gtk/gtkcolorbutton.c:473
 msgid "Pick a Color"
 msgstr "Alegeți o culoare"
 
-#: gtk/gtkcolorbutton.c:336
+#: ../gtk/gtkcolorbutton.c:363
 msgid "Received invalid color data\n"
 msgstr "S-au primit date incorecte de culoare\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."
@@ -600,75 +602,75 @@ msgstr ""
 "Selectați culoarea dorită din cercul exterior. Selectați luminozitatea "
 "culorii utilizând triunghiul interior."
 
-#: gtk/gtkcolorsel.c:408
+#: ../gtk/gtkcolorsel.c:440
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
 msgstr ""
-"Faceți clic pe creion, apoi alegeți o culoare oriunde pe ecran pentru a o "
+"Faceți clic pe pipetă, apoi alegeți o culoare oriunde pe ecran pentru a o "
 "selecta."
 
-#: gtk/gtkcolorsel.c:417
+#: ../gtk/gtkcolorsel.c:449
 msgid "_Hue:"
 msgstr "_Nuanță:"
 
-#: gtk/gtkcolorsel.c:418
+#: ../gtk/gtkcolorsel.c:450
 msgid "Position on the color wheel."
-msgstr "Poziția în cercul culorilor"
+msgstr "Poziția în cercul culorilor."
 
-#: gtk/gtkcolorsel.c:420
+#: ../gtk/gtkcolorsel.c:452
 msgid "_Saturation:"
 msgstr "_Saturație:"
 
-#: gtk/gtkcolorsel.c:421
+#: ../gtk/gtkcolorsel.c:453
 msgid "Intensity of the color."
 msgstr "Intensitatea culorii."
 
-#: gtk/gtkcolorsel.c:422
+#: ../gtk/gtkcolorsel.c:454
 msgid "_Value:"
 msgstr "_Valoare:"
 
-#: gtk/gtkcolorsel.c:423
+#: ../gtk/gtkcolorsel.c:455
 msgid "Brightness of the color."
 msgstr "Luminozitatea culorii"
 
-#: gtk/gtkcolorsel.c:424
+#: ../gtk/gtkcolorsel.c:456
 msgid "_Red:"
 msgstr "Roș_u:"
 
-#: gtk/gtkcolorsel.c:425
+#: ../gtk/gtkcolorsel.c:457
 msgid "Amount of red light in the color."
 msgstr "Cantitatea de roșu în culoare"
 
-#: gtk/gtkcolorsel.c:426
+#: ../gtk/gtkcolorsel.c:458
 msgid "_Green:"
 msgstr "V_erde:"
 
-#: gtk/gtkcolorsel.c:427
+#: ../gtk/gtkcolorsel.c:459
 msgid "Amount of green light in the color."
 msgstr "Cantitatea de verde în culoare"
 
-#: gtk/gtkcolorsel.c:428
+#: ../gtk/gtkcolorsel.c:460
 msgid "_Blue:"
 msgstr "_Albastru:"
 
-#: gtk/gtkcolorsel.c:429
+#: ../gtk/gtkcolorsel.c:461
 msgid "Amount of blue light in the color."
 msgstr "Cantitatea de albastru în culoare"
 
-#: gtk/gtkcolorsel.c:432
+#: ../gtk/gtkcolorsel.c:464
 msgid "Op_acity:"
 msgstr "_Opacitate:"
 
-#: gtk/gtkcolorsel.c:439 gtk/gtkcolorsel.c:449
+#: ../gtk/gtkcolorsel.c:471 ../gtk/gtkcolorsel.c:481
 msgid "Transparency of the color."
 msgstr "Transparența culorii"
 
-#: gtk/gtkcolorsel.c:456
+#: ../gtk/gtkcolorsel.c:488
 msgid "Color _name:"
 msgstr "Nume _culoare:"
 
-#: gtk/gtkcolorsel.c:470
+#: ../gtk/gtkcolorsel.c:502
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -676,25 +678,25 @@ msgstr ""
 "Puteți introduce o valoare hexazecimală în stil HTML sau un nume de culoare "
 "precum „orange” în această intrare."
 
-#: gtk/gtkcolorsel.c:500
+#: ../gtk/gtkcolorsel.c:532
 msgid "_Palette:"
 msgstr "_Paletă:"
 
-#: gtk/gtkcolorsel.c:529
+#: ../gtk/gtkcolorsel.c:561
 msgid "Color Wheel"
 msgstr "Cercul culorilor"
 
-#: gtk/gtkcolorsel.c:988
+#: ../gtk/gtkcolorsel.c:1031
 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 "
 "current by dragging it to the other color swatch alongside."
 msgstr ""
-"Culoarea selectată anterior, pentru comparație cu culoarea curent selectată. "
-"Puteți trage această culoare peste o intrare paletă sau selectați-o ca fiind "
+"Culoarea selectată anterior, pentru comparație cu cea selectată acum. Puteți "
+"trage această culoare peste o intrare paletă sau selectați-o ca fiind "
 "culoarea curentă trăgând-o peste bucata de culoare de alături."
 
-#: gtk/gtkcolorsel.c:991
+#: ../gtk/gtkcolorsel.c:1034
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -702,7 +704,7 @@ msgstr ""
 "Culoarea pe care ați ales-o. Puteți trage această culoare peste o intrare de "
 "paletă sau o puteți salva pentru a o utiliza în viitor."
 
-#: gtk/gtkcolorsel.c:996
+#: ../gtk/gtkcolorsel.c:1039
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now."
@@ -710,24 +712,24 @@ msgstr ""
 "Culoarea anterior selectată, pentru comparație cu culoarea pe care o "
 "selectați acum."
 
-#: gtk/gtkcolorsel.c:999
+#: ../gtk/gtkcolorsel.c:1042
 msgid "The color you've chosen."
 msgstr "Culoarea pe care ați ales-o."
 
-#: gtk/gtkcolorsel.c:1396
+#: ../gtk/gtkcolorsel.c:1442
 msgid "_Save color here"
 msgstr "_Salvează aici culoarea"
 
-#: gtk/gtkcolorsel.c:1601
+#: ../gtk/gtkcolorsel.c:1647
 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.\""
 msgstr ""
-"Dați click pe această intrare paletă pentru a o face culoarea curentă. "
+"Dați click pe această intrare din paletă pentru a o face culoarea curentă. "
 "Pentru a schimba această intrare, trageți o bucată de culoare aici sau "
 "faceți clic dreapta pe ea și selectați „Salvează aici culoarea.”"
 
-#: gtk/gtkcolorseldialog.c:189
+#: ../gtk/gtkcolorseldialog.c:189
 msgid "Color Selection"
 msgstr "Selecție culoare"
 
@@ -737,124 +739,124 @@ msgstr "Selecție culoare"
 #. * 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:374 ../gtk/gtkprintunixdialog.c:3240
 msgid "Manage Custom Sizes"
 msgstr "Gestionare formate personalizate"
 
-#: gtk/gtkcustompaperunixdialog.c:534 gtk/gtkpagesetupunixdialog.c:790
+#: ../gtk/gtkcustompaperunixdialog.c:534 ../gtk/gtkpagesetupunixdialog.c:790
 msgid "inch"
 msgstr "inch"
 
-#: gtk/gtkcustompaperunixdialog.c:536 gtk/gtkpagesetupunixdialog.c:788
+#: ../gtk/gtkcustompaperunixdialog.c:536 ../gtk/gtkpagesetupunixdialog.c:788
 msgid "mm"
 msgstr "mm"
 
-#: gtk/gtkcustompaperunixdialog.c:581
+#: ../gtk/gtkcustompaperunixdialog.c:581
 msgid "Margins from Printer..."
 msgstr "Margini imprimantă..."
 
-#: gtk/gtkcustompaperunixdialog.c:747
+#: ../gtk/gtkcustompaperunixdialog.c:747
 #, c-format
 msgid "Custom Size %d"
 msgstr "Format personalizat %d"
 
-#: gtk/gtkcustompaperunixdialog.c:1059
+#: ../gtk/gtkcustompaperunixdialog.c:1059
 msgid "_Width:"
 msgstr "_Lățime:"
 
-#: gtk/gtkcustompaperunixdialog.c:1071
+#: ../gtk/gtkcustompaperunixdialog.c:1071
 msgid "_Height:"
 msgstr "Î_nălțime:"
 
-#: gtk/gtkcustompaperunixdialog.c:1083
+#: ../gtk/gtkcustompaperunixdialog.c:1083
 msgid "Paper Size"
 msgstr "Mărime hârtie"
 
-#: gtk/gtkcustompaperunixdialog.c:1092
+#: ../gtk/gtkcustompaperunixdialog.c:1092
 msgid "_Top:"
 msgstr "_Sus:"
 
-#: gtk/gtkcustompaperunixdialog.c:1104
+#: ../gtk/gtkcustompaperunixdialog.c:1104
 msgid "_Bottom:"
 msgstr "_Jos:"
 
-#: gtk/gtkcustompaperunixdialog.c:1116
+#: ../gtk/gtkcustompaperunixdialog.c:1116
 msgid "_Left:"
 msgstr "_Stânga:"
 
-#: gtk/gtkcustompaperunixdialog.c:1128
+#: ../gtk/gtkcustompaperunixdialog.c:1128
 msgid "_Right:"
 msgstr "_Dreapta:"
 
-#: gtk/gtkcustompaperunixdialog.c:1169
+#: ../gtk/gtkcustompaperunixdialog.c:1169
 msgid "Paper Margins"
 msgstr "Margini hârtie"
 
-#: gtk/gtkentry.c:8601 gtk/gtktextview.c:8248
+#: ../gtk/gtkentry.c:8794 ../gtk/gtktextview.c:8229
 msgid "Input _Methods"
 msgstr "_Metode de input"
 
-#: gtk/gtkentry.c:8615 gtk/gtktextview.c:8262
+#: ../gtk/gtkentry.c:8808 ../gtk/gtktextview.c:8243
 msgid "_Insert Unicode Control Character"
 msgstr "_Inserare control Unicode"
 
-#: gtk/gtkentry.c:10015
+#: ../gtk/gtkentry.c:10208
 msgid "Caps Lock and Num Lock are on"
 msgstr "Caps Lock și Num Lock sunt activate"
 
-#: gtk/gtkentry.c:10017
+#: ../gtk/gtkentry.c:10210
 msgid "Num Lock is on"
 msgstr "Num Lock este activat"
 
-#: gtk/gtkentry.c:10019
+#: ../gtk/gtkentry.c:10212
 msgid "Caps Lock is on"
 msgstr "Caps Lock este activat"
 
 #. **************** *
 #. *  Private Macros  *
 #. * ****************
-#: gtk/gtkfilechooserbutton.c:61
+#: ../gtk/gtkfilechooserbutton.c:61
 msgid "Select A File"
 msgstr "Selectați un fișier"
 
-#: gtk/gtkfilechooserbutton.c:62 gtk/gtkfilechooserdefault.c:1812
+#: ../gtk/gtkfilechooserbutton.c:62 ../gtk/gtkfilechooserdefault.c:1833
 msgid "Desktop"
 msgstr "Desktop"
 
-#: gtk/gtkfilechooserbutton.c:63
+#: ../gtk/gtkfilechooserbutton.c:63
 msgid "(None)"
 msgstr "(Nici unul)"
 
-#: gtk/gtkfilechooserbutton.c:2005
+#: ../gtk/gtkfilechooserbutton.c:2001
 msgid "Other..."
 msgstr "Altul..."
 
-#: gtk/gtkfilechooserdefault.c:148
+#: ../gtk/gtkfilechooserdefault.c:147
 msgid "Type name of new folder"
 msgstr "Introduceți numele noului dosar"
 
-#: gtk/gtkfilechooserdefault.c:938
+#: ../gtk/gtkfilechooserdefault.c:946
 msgid "Could not retrieve information about the file"
 msgstr "Nu s-au putut obține informații despre fișier"
 
-#: gtk/gtkfilechooserdefault.c:949
+#: ../gtk/gtkfilechooserdefault.c:957
 msgid "Could not add a bookmark"
 msgstr "Nu s-a putut adăuga favoritul"
 
-#: gtk/gtkfilechooserdefault.c:960
+#: ../gtk/gtkfilechooserdefault.c:968
 msgid "Could not remove bookmark"
 msgstr "Nu s-a putut șterge favoritul"
 
-#: gtk/gtkfilechooserdefault.c:971
+#: ../gtk/gtkfilechooserdefault.c:979
 msgid "The folder could not be created"
 msgstr "Dosarul nu a putut fi creat"
 
-#: gtk/gtkfilechooserdefault.c:984
+#: ../gtk/gtkfilechooserdefault.c:992
 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."
@@ -862,11 +864,19 @@ msgstr ""
 "Dosarul nu a putut fi creat deoarece există un fișier cu același nume. "
 "Încercați să folosiți un nume diferit pentru dosar sau redenumiți fișierul."
 
-#: gtk/gtkfilechooserdefault.c:995
+#: ../gtk/gtkfilechooserdefault.c:1006
+msgid ""
+"You may only select folders.  The item that you selected is not a folder; "
+"try using a different item."
+msgstr ""
+"Puteți selecta numai dosare. Elementul care a fost selectat nu este un "
+"dosar; încercați să folosiți un element diferit."
+
+#: ../gtk/gtkfilechooserdefault.c:1016
 msgid "Invalid file name"
 msgstr "Nume incorect de fișier"
 
-#: gtk/gtkfilechooserdefault.c:1005
+#: ../gtk/gtkfilechooserdefault.c:1026
 msgid "The folder contents could not be displayed"
 msgstr "Conținutul dosarului nu a putut fi afișat"
 
@@ -874,238 +884,238 @@ msgstr "Conținutul dosarului nu a putut fi afișat"
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
-#: gtk/gtkfilechooserdefault.c:1555
+#: ../gtk/gtkfilechooserdefault.c:1576
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s pe %2$s"
 
-#: gtk/gtkfilechooserdefault.c:1731
+#: ../gtk/gtkfilechooserdefault.c:1752
 msgid "Search"
 msgstr "Căutare"
 
-#: gtk/gtkfilechooserdefault.c:1755 gtk/gtkfilechooserdefault.c:9289
+#: ../gtk/gtkfilechooserdefault.c:1776 ../gtk/gtkfilechooserdefault.c:9417
 msgid "Recently Used"
 msgstr "Utilizate recent"
 
-#: gtk/gtkfilechooserdefault.c:2409
+#: ../gtk/gtkfilechooserdefault.c:2437
 msgid "Select which types of files are shown"
 msgstr "Selectați ce tipuri de fișiere să fie afișate"
 
-#: gtk/gtkfilechooserdefault.c:2768
+#: ../gtk/gtkfilechooserdefault.c:2796
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "Adaugă dosarul „%s” la favorite"
 
-#: gtk/gtkfilechooserdefault.c:2812
+#: ../gtk/gtkfilechooserdefault.c:2840
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "Adaugă dosarul curent la favorite"
 
-#: gtk/gtkfilechooserdefault.c:2814
+#: ../gtk/gtkfilechooserdefault.c:2842
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "Adaugă dosarele selectate la favorite"
 
-#: gtk/gtkfilechooserdefault.c:2852
+#: ../gtk/gtkfilechooserdefault.c:2880
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "Șterge favoritul „%s”"
 
-#: gtk/gtkfilechooserdefault.c:2854
+#: ../gtk/gtkfilechooserdefault.c:2882
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "Favoritul „%s” nu poate fi șters"
 
-#: gtk/gtkfilechooserdefault.c:2861 gtk/gtkfilechooserdefault.c:3725
+#: ../gtk/gtkfilechooserdefault.c:2889 ../gtk/gtkfilechooserdefault.c:3750
 msgid "Remove the selected bookmark"
 msgstr "Șterge favoritul selectat"
 
-#: gtk/gtkfilechooserdefault.c:3421
+#: ../gtk/gtkfilechooserdefault.c:3445
 msgid "Remove"
 msgstr "Șterge"
 
-#: gtk/gtkfilechooserdefault.c:3430
+#: ../gtk/gtkfilechooserdefault.c:3454
 msgid "Rename..."
 msgstr "Redenumire..."
 
 #. Accessible object name for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3593
+#: ../gtk/gtkfilechooserdefault.c:3617
 msgid "Places"
 msgstr "Locuri"
 
 #. Column header for the file chooser's shortcuts pane
-#: gtk/gtkfilechooserdefault.c:3650
+#: ../gtk/gtkfilechooserdefault.c:3674
 msgid "_Places"
 msgstr "L_ocuri"
 
-#: gtk/gtkfilechooserdefault.c:3706
+#: ../gtk/gtkfilechooserdefault.c:3731
 msgid "_Add"
 msgstr "Ada_ugă"
 
-#: gtk/gtkfilechooserdefault.c:3713
+#: ../gtk/gtkfilechooserdefault.c:3738
 msgid "Add the selected folder to the Bookmarks"
 msgstr "Adaugă dosarul selectat la favorite"
 
-#: gtk/gtkfilechooserdefault.c:3718
+#: ../gtk/gtkfilechooserdefault.c:3743
 msgid "_Remove"
 msgstr "E_limină"
 
-#: gtk/gtkfilechooserdefault.c:3860
+#: ../gtk/gtkfilechooserdefault.c:3885
 msgid "Could not select file"
 msgstr "Nu s-a putut selecta fișierul"
 
-#: gtk/gtkfilechooserdefault.c:4035
+#: ../gtk/gtkfilechooserdefault.c:4060
 msgid "_Add to Bookmarks"
 msgstr "Adaugă la _favorite"
 
-#: gtk/gtkfilechooserdefault.c:4048
+#: ../gtk/gtkfilechooserdefault.c:4073
 msgid "Show _Hidden Files"
 msgstr "Arată fișierele _ascunse"
 
-#: gtk/gtkfilechooserdefault.c:4055
+#: ../gtk/gtkfilechooserdefault.c:4080
 msgid "Show _Size Column"
 msgstr "Arată coloana cu _mărimea"
 
-#: gtk/gtkfilechooserdefault.c:4281
+#: ../gtk/gtkfilechooserdefault.c:4306
 msgid "Files"
 msgstr "Fișiere"
 
-#: gtk/gtkfilechooserdefault.c:4332
+#: ../gtk/gtkfilechooserdefault.c:4357
 msgid "Name"
 msgstr "Nume"
 
-#: gtk/gtkfilechooserdefault.c:4355
+#: ../gtk/gtkfilechooserdefault.c:4380
 msgid "Size"
 msgstr "Mărime"
 
-#: gtk/gtkfilechooserdefault.c:4369
+#: ../gtk/gtkfilechooserdefault.c:4394
 msgid "Modified"
 msgstr "Modificat"
 
 #. Label
-#: gtk/gtkfilechooserdefault.c:4624 gtk/gtkprinteroptionwidget.c:801
+#: ../gtk/gtkfilechooserdefault.c:4649 ../gtk/gtkprinteroptionwidget.c:793
 msgid "_Name:"
 msgstr "_Nume:"
 
-#: gtk/gtkfilechooserdefault.c:4667
+#: ../gtk/gtkfilechooserdefault.c:4692
 msgid "_Browse for other folders"
 msgstr "Navigare în al_te dosare"
 
-#: gtk/gtkfilechooserdefault.c:4937
+#: ../gtk/gtkfilechooserdefault.c:4962
 msgid "Type a file name"
 msgstr "Introduceți un nume de fișier"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:4980
+#: ../gtk/gtkfilechooserdefault.c:5005
 msgid "Create Fo_lder"
 msgstr "Creea_ză dosar"
 
-#: gtk/gtkfilechooserdefault.c:4990
+#: ../gtk/gtkfilechooserdefault.c:5015
 msgid "_Location:"
 msgstr "_Locație:"
 
-#: gtk/gtkfilechooserdefault.c:5194
+#: ../gtk/gtkfilechooserdefault.c:5219
 msgid "Save in _folder:"
 msgstr "Salvează în _dosar:"
 
-#: gtk/gtkfilechooserdefault.c:5196
+#: ../gtk/gtkfilechooserdefault.c:5221
 msgid "Create in _folder:"
 msgstr "Creează în _dosar:"
 
-#: gtk/gtkfilechooserdefault.c:6248
+#: ../gtk/gtkfilechooserdefault.c:6290
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "Nu s-a putut citi conținutul %s"
 
-#: gtk/gtkfilechooserdefault.c:6252
+#: ../gtk/gtkfilechooserdefault.c:6294
 msgid "Could not read the contents of the folder"
-msgstr "Nu s-a putut citi conținutul directorului"
+msgstr "Nu s-a putut citi conținutul dosarului"
 
-#: gtk/gtkfilechooserdefault.c:6345 gtk/gtkfilechooserdefault.c:6413
-#: gtk/gtkfilechooserdefault.c:6558
+#: ../gtk/gtkfilechooserdefault.c:6387 ../gtk/gtkfilechooserdefault.c:6455
+#: ../gtk/gtkfilechooserdefault.c:6600
 msgid "Unknown"
 msgstr "Nu se știe"
 
-#: gtk/gtkfilechooserdefault.c:6360
+#: ../gtk/gtkfilechooserdefault.c:6402
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: gtk/gtkfilechooserdefault.c:6362
+#: ../gtk/gtkfilechooserdefault.c:6404
 msgid "Yesterday at %H:%M"
 msgstr "Ieri la %H:%M"
 
-#: gtk/gtkfilechooserdefault.c:7028
+#: ../gtk/gtkfilechooserdefault.c:7070
 msgid "Cannot change to folder because it is not local"
 msgstr "Nu se poate deschide dosarul deoarece nu este local"
 
-#: gtk/gtkfilechooserdefault.c:7625 gtk/gtkfilechooserdefault.c:7646
+#: ../gtk/gtkfilechooserdefault.c:7667 ../gtk/gtkfilechooserdefault.c:7688
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "Combinația de taste %s există deja"
 
-#: gtk/gtkfilechooserdefault.c:7736
+#: ../gtk/gtkfilechooserdefault.c:7778
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "Combinația de taste %s nu există"
 
-#: gtk/gtkfilechooserdefault.c:7997 gtk/gtkprintunixdialog.c:480
+#: ../gtk/gtkfilechooserdefault.c:8039 ../gtk/gtkprintunixdialog.c:480
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Un fișier cu numele „%s” există deja. Doriți să îl înlocuiți?"
 
-#: gtk/gtkfilechooserdefault.c:8000 gtk/gtkprintunixdialog.c:484
+#: ../gtk/gtkfilechooserdefault.c:8042 ../gtk/gtkprintunixdialog.c:484
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "Fișierul există deja în „%s”. Înlocuindu-l îi veți suprascrie conținutul."
 
-#: gtk/gtkfilechooserdefault.c:8005 gtk/gtkprintunixdialog.c:491
+#: ../gtk/gtkfilechooserdefault.c:8047 ../gtk/gtkprintunixdialog.c:491
 msgid "_Replace"
 msgstr "În_locuiește"
 
-#: gtk/gtkfilechooserdefault.c:8658
+#: ../gtk/gtkfilechooserdefault.c:8755
 msgid "Could not start the search process"
-msgstr "Nu s-a putut pornit procesul de căutare"
+msgstr "Nu s-a putut porni procesul de căutare"
 
-#: gtk/gtkfilechooserdefault.c:8659
+#: ../gtk/gtkfilechooserdefault.c:8756
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
 msgstr ""
-"Programul nu a putut crea o conexiune la demonul de indexare. Asigurați-vă "
+"Programul nu a putut crea o conexiune la serviciul de indexare. Asigurați-vă "
 "că este pornit."
 
-#: gtk/gtkfilechooserdefault.c:8673
+#: ../gtk/gtkfilechooserdefault.c:8770
 msgid "Could not send the search request"
 msgstr "Nu s-a putut trimite cererea de căutare"
 
-#: gtk/gtkfilechooserdefault.c:8861
+#: ../gtk/gtkfilechooserdefault.c:8989
 msgid "Search:"
 msgstr "Caută:"
 
-#: gtk/gtkfilechooserdefault.c:9466
+#: ../gtk/gtkfilechooserdefault.c:9594
 #, c-format
 msgid "Could not mount %s"
 msgstr "Nu s-a putut monta %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:1172
 msgid "Invalid path"
 msgstr "Cale nevalidă"
 
 #. 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:1104
 msgid "No match"
 msgstr "Nici o potrivire"
 
 #. 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:1115
 msgid "Sole completion"
 msgstr "Completare unică"
 
@@ -1113,13 +1123,13 @@ msgstr "Completare unică"
 #. * entry is a complete filename, but could be continued to find
 #. * a longer match
 #.
-#: gtk/gtkfilechooserentry.c:1128
+#: ../gtk/gtkfilechooserentry.c:1131
 msgid "Complete, but not unique"
 msgstr "Completă, dar nu unică"
 
 #. 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:1163
 msgid "Completing..."
 msgstr "Se completează..."
 
@@ -1127,7 +1137,7 @@ msgstr "Se completează..."
 #. 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:1185 ../gtk/gtkfilechooserentry.c:1210
 msgid "Only local files may be selected"
 msgstr "Se pot selecta doar fișiere locale"
 
@@ -1135,80 +1145,75 @@ msgstr "Se pot selecta doar fișiere locale"
 #. 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:1194
 msgid "Incomplete hostname; end it with '/'"
 msgstr "Nume nevalid, ar trebui să se termine cu „/”"
 
 #. 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:1205
 msgid "Path does not exist"
 msgstr "Această cale nu există"
 
-#: gtk/gtkfilechoosersettings.c:486
-#, c-format
-msgid "Error creating folder '%s': %s"
-msgstr "Eroare la crearea dosarului „%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 de fișiere"
 
-#: gtk/gtkfontbutton.c:142 gtk/gtkfontbutton.c:266
+#: ../gtk/gtkfontbutton.c:142 ../gtk/gtkfontbutton.c:266
 msgid "Pick a Font"
 msgstr "Alegeți un font"
 
 #. Initialize fields
-#: gtk/gtkfontbutton.c:260
+#: ../gtk/gtkfontbutton.c:260
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: gtk/gtkfontbutton.c:785
+#: ../gtk/gtkfontbutton.c:785
 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:103
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "aăâbcdefghiîşșţț AĂÂBCDEFGHIÎJŞȘŢȚ"
 
-#: gtk/gtkfontsel.c:370
+#: ../gtk/gtkfontsel.c:370
 msgid "_Family:"
 msgstr "_Familie:"
 
-#: gtk/gtkfontsel.c:376
+#: ../gtk/gtkfontsel.c:376
 msgid "_Style:"
 msgstr "_Stil:"
 
-#: gtk/gtkfontsel.c:382
+#: ../gtk/gtkfontsel.c:382
 msgid "Si_ze:"
 msgstr "_Mărime:"
 
 #. create the text entry widget
-#: gtk/gtkfontsel.c:559
+#: ../gtk/gtkfontsel.c:558
 msgid "_Preview:"
 msgstr "_Previzualizare:"
 
-#: gtk/gtkfontsel.c:1659
+#: ../gtk/gtkfontsel.c:1658
 msgid "Font Selection"
 msgstr "Selecție font"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
-#: gtk/gtkiconfactory.c:1356
+#: ../gtk/gtkiconfactory.c:1356
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "Eroare la încărcarea iconiței: %s"
 
-#: gtk/gtkicontheme.c:1354
+#: ../gtk/gtkicontheme.c:1355
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1219,75 +1224,75 @@ msgstr ""
 "Nu s-a găsit iconița „%s”. Nici tema „%s” nu a fost găsită, s-ar putea să "
 "trebuiască să o reinstalați. Puteți obține o copie de la: \t%s"
 
-#: gtk/gtkicontheme.c:1535
+#: ../gtk/gtkicontheme.c:1536
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "Iconița „%s” nu e prezentă în temă"
 
-#: gtk/gtkicontheme.c:3048
+#: ../gtk/gtkicontheme.c:3057
 msgid "Failed to load icon"
 msgstr "Nu s-a putut încărca iconița"
 
-#: gtk/gtkimmodule.c:526
+#: ../gtk/gtkimmodule.c:526
 msgid "Simple"
 msgstr "Simplă"
 
-#: 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 "Nici una"
 
-#: 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:6214
 msgid "_Open Link"
 msgstr "_Deschide linkul"
 
 #. Copy Link Address
-#: gtk/gtklabel.c:6214
+#: ../gtk/gtklabel.c:6226
 msgid "Copy _Link Address"
 msgstr "Copiază adresa _linkului"
 
-#: gtk/gtklinkbutton.c:449
+#: ../gtk/gtklinkbutton.c:484
 msgid "Copy URL"
 msgstr "Copiere URL"
 
-#: gtk/gtklinkbutton.c:601
+#: ../gtk/gtklinkbutton.c:647
 msgid "Invalid URI"
 msgstr "URI nevalid"
 
 #. Description of --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:526
+#: ../gtk/gtkmain.c:518
 msgid "Load additional GTK+ modules"
 msgstr "Încarcă alte module GTK+"
 
 #. Placeholder in --gtk-module=MODULES in --help output
-#: gtk/gtkmain.c:527
+#: ../gtk/gtkmain.c:519
 msgid "MODULES"
 msgstr "MODULE"
 
 #. Description of --g-fatal-warnings in --help output
-#: gtk/gtkmain.c:529
+#: ../gtk/gtkmain.c:521
 msgid "Make all warnings fatal"
-msgstr "Orice atenționare e fatală"
+msgstr "Fă ca orice avertisment să fie fatală"
 
 #. Description of --gtk-debug=FLAGS in --help output
-#: gtk/gtkmain.c:532
+#: ../gtk/gtkmain.c:524
 msgid "GTK+ debugging flags to set"
 msgstr "Fanioane de depanare GTK+ de activat"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
-#: gtk/gtkmain.c:535
+#: ../gtk/gtkmain.c:527
 msgid "GTK+ debugging flags to unset"
 msgstr "Fanioane de depanare GTK+ de dezactivat"
 
@@ -1296,124 +1301,124 @@ msgstr "Fanioane de depanare GTK+ de dezactivat"
 #. * 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:790
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: gtk/gtkmain.c:863
+#: ../gtk/gtkmain.c:855
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "Nu se poate deschide displayul: %s"
 
-#: gtk/gtkmain.c:922
+#: ../gtk/gtkmain.c:914
 msgid "GTK+ Options"
 msgstr "Opțiuni GTK+"
 
-#: gtk/gtkmain.c:922
+#: ../gtk/gtkmain.c:914
 msgid "Show GTK+ Options"
 msgstr "Arată opțiunile GTK+"
 
-#: gtk/gtkmountoperation.c:491
+#: ../gtk/gtkmountoperation.c:491
 msgid "Co_nnect"
 msgstr "Co_nectare"
 
-#: gtk/gtkmountoperation.c:558
+#: ../gtk/gtkmountoperation.c:558
 msgid "Connect _anonymously"
 msgstr "Conectare _anonimă"
 
-#: gtk/gtkmountoperation.c:567
+#: ../gtk/gtkmountoperation.c:567
 msgid "Connect as u_ser:"
 msgstr "Conectare ca utili_zator:"
 
-#: gtk/gtkmountoperation.c:605
+#: ../gtk/gtkmountoperation.c:605
 msgid "_Username:"
 msgstr "_Utilizator:"
 
-#: gtk/gtkmountoperation.c:610
+#: ../gtk/gtkmountoperation.c:610
 msgid "_Domain:"
 msgstr "_Domeniu:"
 
-#: gtk/gtkmountoperation.c:616
+#: ../gtk/gtkmountoperation.c:616
 msgid "_Password:"
 msgstr "_Parolă:"
 
-#: gtk/gtkmountoperation.c:634
+#: ../gtk/gtkmountoperation.c:634
 msgid "Forget password _immediately"
 msgstr "Uită parola _imediat"
 
-#: gtk/gtkmountoperation.c:644
+#: ../gtk/gtkmountoperation.c:644
 msgid "Remember password until you _logout"
 msgstr "Reține până la ieșirea din _sesiune"
 
-#: gtk/gtkmountoperation.c:654
+#: ../gtk/gtkmountoperation.c:654
 msgid "Remember _forever"
 msgstr "Reține parola pentru _totdeauna"
 
-#: gtk/gtkmountoperation.c:883
-#, fuzzy, c-format
+#: ../gtk/gtkmountoperation.c:883
+#, c-format
 msgid "Unknown Application (PID %d)"
 msgstr "Aplicație necunoscută (pid %d)"
 
-#: gtk/gtkmountoperation.c:1066
-#, c-format
+#: ../gtk/gtkmountoperation.c:1066
 msgid "Unable to end process"
 msgstr "Nu s-a putut încheia procesul"
 
-#: gtk/gtkmountoperation.c:1103
+#: ../gtk/gtkmountoperation.c:1103
 msgid "_End Process"
 msgstr "T_ermină procesul"
 
-#: 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 ""
 "Nu se poate termina forțat procesul cu pid-ul %d. Operațiunea nu este "
 "implementată."
 
 #. translators: this string is a name for the 'less' command
-#: gtk/gtkmountoperation-x11.c:862
+#: ../gtk/gtkmountoperation-x11.c:862
 msgid "Terminal Pager"
 msgstr "Paginator de terminal"
 
-#: gtk/gtkmountoperation-x11.c:863
+#: ../gtk/gtkmountoperation-x11.c:863
 msgid "Top Command"
 msgstr "Comanda top"
 
-#: gtk/gtkmountoperation-x11.c:864
+#: ../gtk/gtkmountoperation-x11.c:864
 msgid "Bourne Again Shell"
 msgstr "Bourne Again Shell"
 
-#: gtk/gtkmountoperation-x11.c:865
+#: ../gtk/gtkmountoperation-x11.c:865
 msgid "Bourne Shell"
 msgstr "Bourne Shell"
 
-#: gtk/gtkmountoperation-x11.c:866
+#: ../gtk/gtkmountoperation-x11.c:866
 msgid "Z Shell"
 msgstr "Z Shell"
 
-#: gtk/gtkmountoperation-x11.c:963
-#, fuzzy, c-format
+#: ../gtk/gtkmountoperation-x11.c:963
+#, c-format
 msgid "Cannot end process with PID %d: %s"
 msgstr "Nu se poate termina procesul cu pid-ul %d: %s"
 
-#: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170
+#: ../gtk/gtknotebook.c:4756 ../gtk/gtknotebook.c:7319
 #, c-format
 msgid "Page %u"
 msgstr "Pagină %u"
 
-#: gtk/gtkpagesetup.c:596 gtk/gtkpapersize.c:838 gtk/gtkpapersize.c:880
+#: ../gtk/gtkpagesetup.c:648 ../gtk/gtkpapersize.c:838
+#: ../gtk/gtkpapersize.c:880
 msgid "Not a valid page setup file"
 msgstr "Fișier nevalid de opțiuni de pagină"
 
-#: gtk/gtkpagesetupunixdialog.c:179
+#: ../gtk/gtkpagesetupunixdialog.c:179
 msgid "Any Printer"
 msgstr "Orice imprimantă"
 
-#: gtk/gtkpagesetupunixdialog.c:179
+#: ../gtk/gtkpagesetupunixdialog.c:179
 msgid "For portable documents"
 msgstr "Pentru documente portabile"
 
-#: gtk/gtkpagesetupunixdialog.c:809
+#: ../gtk/gtkpagesetupunixdialog.c:809
 #, c-format
 msgid ""
 "Margins:\n"
@@ -1428,51 +1433,51 @@ msgstr ""
 " Sus: %s %s\n"
 " Jos: %s %s"
 
-#: gtk/gtkpagesetupunixdialog.c:858 gtk/gtkprintunixdialog.c:3284
+#: ../gtk/gtkpagesetupunixdialog.c:858 ../gtk/gtkprintunixdialog.c:3291
 msgid "Manage Custom Sizes..."
 msgstr "Gestionare formate personalizate..."
 
-#: gtk/gtkpagesetupunixdialog.c:909
+#: ../gtk/gtkpagesetupunixdialog.c:909
 msgid "_Format for:"
 msgstr "_Formatare pentru:"
 
-#: gtk/gtkpagesetupunixdialog.c:931 gtk/gtkprintunixdialog.c:3456
+#: ../gtk/gtkpagesetupunixdialog.c:931 ../gtk/gtkprintunixdialog.c:3463
 msgid "_Paper size:"
 msgstr "_Mărime hârtie:"
 
-#: gtk/gtkpagesetupunixdialog.c:962
+#: ../gtk/gtkpagesetupunixdialog.c:962
 msgid "_Orientation:"
 msgstr "_Orientare:"
 
-#: gtk/gtkpagesetupunixdialog.c:1026 gtk/gtkprintunixdialog.c:3518
+#: ../gtk/gtkpagesetupunixdialog.c:1026 ../gtk/gtkprintunixdialog.c:3525
 msgid "Page Setup"
 msgstr "Opțiuni pagină"
 
-#: gtk/gtkpathbar.c:154
+#: ../gtk/gtkpathbar.c:158
 msgid "Up Path"
 msgstr "Cale în sus"
 
-#: gtk/gtkpathbar.c:156
+#: ../gtk/gtkpathbar.c:160
 msgid "Down Path"
 msgstr "Cale în jos"
 
-#: gtk/gtkpathbar.c:1497
+#: ../gtk/gtkpathbar.c:1523
 msgid "File System Root"
 msgstr "Rădăcina sistemului de fișiere"
 
-#: gtk/gtkprintbackend.c:749
+#: ../gtk/gtkprintbackend.c:749
 msgid "Authentication"
 msgstr "Autentificare"
 
-#: gtk/gtkprinteroptionwidget.c:694
+#: ../gtk/gtkprinteroptionwidget.c:686
 msgid "Not available"
 msgstr "Indisponibil"
 
-#: gtk/gtkprinteroptionwidget.c:794
+#: ../gtk/gtkprinteroptionwidget.c:786
 msgid "Select a folder"
 msgstr "Selectați un dosar"
 
-#: gtk/gtkprinteroptionwidget.c:813
+#: ../gtk/gtkprinteroptionwidget.c:805
 msgid "_Save in folder:"
 msgstr "Salvează în _dosarul:"
 
@@ -1480,187 +1485,184 @@ msgstr "Salvează în _dosarul:"
 #. * jobs. %s gets replaced by the application name, %d gets replaced
 #. * by the job number.
 #.
-#: gtk/gtkprintoperation.c:190
+#: ../gtk/gtkprintoperation.c:190
 #, c-format
 msgid "%s job #%d"
 msgstr "%s sarcina #%d"
 
-#: gtk/gtkprintoperation.c:1695
+#: ../gtk/gtkprintoperation.c:1695
 msgctxt "print operation status"
 msgid "Initial state"
 msgstr "Stare inițială"
 
-#: gtk/gtkprintoperation.c:1696
+#: ../gtk/gtkprintoperation.c:1696
 msgctxt "print operation status"
 msgid "Preparing to print"
 msgstr "Se pregătește tipărirea"
 
-#: gtk/gtkprintoperation.c:1697
+#: ../gtk/gtkprintoperation.c:1697
 msgctxt "print operation status"
 msgid "Generating data"
 msgstr "Se generează datele"
 
-#: gtk/gtkprintoperation.c:1698
+#: ../gtk/gtkprintoperation.c:1698
 msgctxt "print operation status"
 msgid "Sending data"
 msgstr "Se trimit datele"
 
-#: gtk/gtkprintoperation.c:1699
+#: ../gtk/gtkprintoperation.c:1699
 msgctxt "print operation status"
 msgid "Waiting"
 msgstr "Se așteaptă"
 
-#: gtk/gtkprintoperation.c:1700
+#: ../gtk/gtkprintoperation.c:1700
 msgctxt "print operation status"
 msgid "Blocking on issue"
 msgstr "Blocare din cauza unei probleme"
 
-#: gtk/gtkprintoperation.c:1701
+#: ../gtk/gtkprintoperation.c:1701
 msgctxt "print operation status"
 msgid "Printing"
 msgstr "Se tipărește"
 
-#: gtk/gtkprintoperation.c:1702
+#: ../gtk/gtkprintoperation.c:1702
 msgctxt "print operation status"
 msgid "Finished"
 msgstr "Finalizată"
 
-#: gtk/gtkprintoperation.c:1703
+#: ../gtk/gtkprintoperation.c:1703
 msgctxt "print operation status"
 msgid "Finished with error"
 msgstr "Finalizată cu eroare"
 
-#: gtk/gtkprintoperation.c:2270
+#: ../gtk/gtkprintoperation.c:2270
 #, c-format
 msgid "Preparing %d"
 msgstr "Se pregătește %d"
 
-#: gtk/gtkprintoperation.c:2272 gtk/gtkprintoperation.c:2902
-#, c-format
+#: ../gtk/gtkprintoperation.c:2272 ../gtk/gtkprintoperation.c:2902
 msgid "Preparing"
 msgstr "Se pregătește"
 
-#: gtk/gtkprintoperation.c:2275
+#: ../gtk/gtkprintoperation.c:2275
 #, c-format
 msgid "Printing %d"
 msgstr "Se tipărește %d"
 
-#: gtk/gtkprintoperation.c:2932
-#, c-format
+#: ../gtk/gtkprintoperation.c:2932
 msgid "Error creating print preview"
 msgstr "Eroare la crearea unei previzualizări pentru tipărire"
 
-#: gtk/gtkprintoperation.c:2935
-#, c-format
+#: ../gtk/gtkprintoperation.c:2935
 msgid "The most probable reason is that a temporary file could not be created."
 msgstr "Cel mai probabil motiv este că nu s-a putut crea un fișier temporar."
 
-#: gtk/gtkprintoperation-unix.c:297
+#: ../gtk/gtkprintoperation-unix.c:297
 msgid "Error launching preview"
 msgstr "Eroare la lansarea previzualizării"
 
-#: gtk/gtkprintoperation-unix.c:470 gtk/gtkprintoperation-win32.c:1447
+#: ../gtk/gtkprintoperation-unix.c:470 ../gtk/gtkprintoperation-win32.c:1447
 msgid "Application"
 msgstr "Aplicație"
 
-#: gtk/gtkprintoperation-win32.c:611
+#: ../gtk/gtkprintoperation-win32.c:611
 msgid "Printer offline"
 msgstr "Imprimantă deconectată"
 
-#: gtk/gtkprintoperation-win32.c:613
+#: ../gtk/gtkprintoperation-win32.c:613
 msgid "Out of paper"
 msgstr "Fără hârtie"
 
 #. 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:1998
 msgid "Paused"
 msgstr "Momentan oprită"
 
-#: gtk/gtkprintoperation-win32.c:617
+#: ../gtk/gtkprintoperation-win32.c:617
 msgid "Need user intervention"
 msgstr "Necesită intervenția utilizatorului"
 
-#: gtk/gtkprintoperation-win32.c:717
+#: ../gtk/gtkprintoperation-win32.c:717
 msgid "Custom size"
 msgstr "Format personalizat"
 
-#: gtk/gtkprintoperation-win32.c:1539
+#: ../gtk/gtkprintoperation-win32.c:1539
 msgid "No printer found"
 msgstr "Nu s-a găsit nici o imprimantă"
 
-#: gtk/gtkprintoperation-win32.c:1566
+#: ../gtk/gtkprintoperation-win32.c:1566
 msgid "Invalid argument to CreateDC"
 msgstr "Argument incorect pentru 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 "Eroare din 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 "Nu există îndeajuns de multă memorie liberă"
 
-#: gtk/gtkprintoperation-win32.c:1760
+#: ../gtk/gtkprintoperation-win32.c:1760
 msgid "Invalid argument to PrintDlgEx"
 msgstr "Argument incorect pentru PrintDlgEx"
 
-#: gtk/gtkprintoperation-win32.c:1765
+#: ../gtk/gtkprintoperation-win32.c:1765
 msgid "Invalid pointer to PrintDlgEx"
 msgstr "Pointer incorect pentru PrinDlgEx"
 
-#: gtk/gtkprintoperation-win32.c:1770
+#: ../gtk/gtkprintoperation-win32.c:1770
 msgid "Invalid handle to PrintDlgEx"
 msgstr "Handle incorect pentru PrintDlgEx"
 
-#: gtk/gtkprintoperation-win32.c:1775
+#: ../gtk/gtkprintoperation-win32.c:1775
 msgid "Unspecified error"
 msgstr "Eroare nespecificată"
 
-#: gtk/gtkprintunixdialog.c:618
+#: ../gtk/gtkprintunixdialog.c:618
 msgid "Getting printer information failed"
 msgstr "Obținerea informațiilor despre imprimantă a eșuat"
 
-#: gtk/gtkprintunixdialog.c:1873
+#: ../gtk/gtkprintunixdialog.c:1873
 msgid "Getting printer information..."
 msgstr "Se obțin informațiile despre imprimantă..."
 
-#: gtk/gtkprintunixdialog.c:2139
+#: ../gtk/gtkprintunixdialog.c:2139
 msgid "Printer"
 msgstr "Imprimantă"
 
 #. Translators: this is the header for the location column in the print dialog
-#: gtk/gtkprintunixdialog.c:2149
+#: ../gtk/gtkprintunixdialog.c:2149
 msgid "Location"
 msgstr "Locație"
 
 #. Translators: this is the header for the printer status column in the print dialog
-#: gtk/gtkprintunixdialog.c:2160
+#: ../gtk/gtkprintunixdialog.c:2160
 msgid "Status"
 msgstr "Stare"
 
-#: gtk/gtkprintunixdialog.c:2186
+#: ../gtk/gtkprintunixdialog.c:2186
 msgid "Range"
 msgstr "Interval"
 
-#: gtk/gtkprintunixdialog.c:2190
+#: ../gtk/gtkprintunixdialog.c:2190
 msgid "_All Pages"
 msgstr "To_ate paginile"
 
-#: gtk/gtkprintunixdialog.c:2197
+#: ../gtk/gtkprintunixdialog.c:2197
 msgid "C_urrent Page"
 msgstr "Pagina c_urentă"
 
-#: gtk/gtkprintunixdialog.c:2207
+#: ../gtk/gtkprintunixdialog.c:2207
 msgid "Se_lection"
 msgstr "Se_lecție"
 
-#: gtk/gtkprintunixdialog.c:2216
+#: ../gtk/gtkprintunixdialog.c:2216
 msgid "Pag_es:"
 msgstr "_Pagini:"
 
-#: gtk/gtkprintunixdialog.c:2217
+#: ../gtk/gtkprintunixdialog.c:2217
 msgid ""
 "Specify one or more page ranges,\n"
 " e.g. 1-3,7,11"
@@ -1668,28 +1670,28 @@ msgstr ""
 "Specificați unul sau mai multe intervale,\n"
 " de ex. 1-3,7,11"
 
-#: gtk/gtkprintunixdialog.c:2227
+#: ../gtk/gtkprintunixdialog.c:2227
 msgid "Pages"
 msgstr "Pagini"
 
-#: gtk/gtkprintunixdialog.c:2240
+#: ../gtk/gtkprintunixdialog.c:2240
 msgid "Copies"
 msgstr "Cópii"
 
 #. 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:2245
 msgid "Copie_s:"
 msgstr "_Cópii:"
 
-#: gtk/gtkprintunixdialog.c:2263
+#: ../gtk/gtkprintunixdialog.c:2263
 msgid "C_ollate"
 msgstr "C_olaj"
 
-#: gtk/gtkprintunixdialog.c:2271
+#: ../gtk/gtkprintunixdialog.c:2271
 msgid "_Reverse"
 msgstr "_Inversat"
 
-#: gtk/gtkprintunixdialog.c:2291
+#: ../gtk/gtkprintunixdialog.c:2291
 msgid "General"
 msgstr "Generice"
 
@@ -1699,168 +1701,168 @@ msgstr "Generice"
 #. 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:3024
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3534
 msgid "Left to right, top to bottom"
 msgstr "De la stânga la dreapta, de sus în jos"
 
-#: gtk/gtkprintunixdialog.c:3017
-#: modules/printbackends/cups/gtkprintbackendcups.c:3508
+#: ../gtk/gtkprintunixdialog.c:3024
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3534
 msgid "Left to right, bottom to top"
 msgstr "De la stânga la dreapta, de jos în sus"
 
-#: gtk/gtkprintunixdialog.c:3018
-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
+#: ../gtk/gtkprintunixdialog.c:3025
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3535
 msgid "Right to left, top to bottom"
 msgstr "De la dreapta la stânga, de sus în jos"
 
-#: gtk/gtkprintunixdialog.c:3018
-#: modules/printbackends/cups/gtkprintbackendcups.c:3509
+#: ../gtk/gtkprintunixdialog.c:3025
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3535
 msgid "Right to left, bottom to top"
 msgstr "De la dreapta la stânga, de jos în sus"
 
-#: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
+#: ../gtk/gtkprintunixdialog.c:3026
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3536
 msgid "Top to bottom, left to right"
 msgstr "De sus în jos, de la stânga la dreapta"
 
-#: gtk/gtkprintunixdialog.c:3019
-#: modules/printbackends/cups/gtkprintbackendcups.c:3510
+#: ../gtk/gtkprintunixdialog.c:3026
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3536
 msgid "Top to bottom, right to left"
 msgstr "De sus în jos, de la dreapta la stânga"
 
-#: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
+#: ../gtk/gtkprintunixdialog.c:3027
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3537
 msgid "Bottom to top, left to right"
 msgstr "De jos în sus, de la stânga la dreapta"
 
-#: gtk/gtkprintunixdialog.c:3020
-#: modules/printbackends/cups/gtkprintbackendcups.c:3511
+#: ../gtk/gtkprintunixdialog.c:3027
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3537
 msgid "Bottom to top, right to left"
 msgstr "De jos în sus, de la dreapta la stânga"
 
 #. 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:3031 ../gtk/gtkprintunixdialog.c:3044
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3569
 msgid "Page Ordering"
 msgstr "Ordonare pagini"
 
-#: gtk/gtkprintunixdialog.c:3053
+#: ../gtk/gtkprintunixdialog.c:3060
 msgid "Left to right"
 msgstr "De la stânga la dreapta"
 
-#: gtk/gtkprintunixdialog.c:3054
+#: ../gtk/gtkprintunixdialog.c:3061
 msgid "Right to left"
 msgstr "De la dreapta la stânga"
 
-#: gtk/gtkprintunixdialog.c:3066
+#: ../gtk/gtkprintunixdialog.c:3073
 msgid "Top to bottom"
 msgstr "De sus în jos"
 
-#: gtk/gtkprintunixdialog.c:3067
+#: ../gtk/gtkprintunixdialog.c:3074
 msgid "Bottom to top"
 msgstr "De jos în sus"
 
-#: gtk/gtkprintunixdialog.c:3307
+#: ../gtk/gtkprintunixdialog.c:3314
 msgid "Layout"
 msgstr "Aspect"
 
-#: gtk/gtkprintunixdialog.c:3311
+#: ../gtk/gtkprintunixdialog.c:3318
 msgid "T_wo-sided:"
 msgstr "Pe am_bele părți:"
 
-#: gtk/gtkprintunixdialog.c:3326
+#: ../gtk/gtkprintunixdialog.c:3333
 msgid "Pages per _side:"
 msgstr "_Pagini per filă:"
 
-#: gtk/gtkprintunixdialog.c:3343
+#: ../gtk/gtkprintunixdialog.c:3350
 msgid "Page or_dering:"
 msgstr "_Ordine pagini:"
 
-#: gtk/gtkprintunixdialog.c:3359
+#: ../gtk/gtkprintunixdialog.c:3366
 msgid "_Only print:"
 msgstr "Tipăr_ește:"
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:3374
+#: ../gtk/gtkprintunixdialog.c:3381
 msgid "All sheets"
 msgstr "Toate paginile"
 
-#: gtk/gtkprintunixdialog.c:3375
+#: ../gtk/gtkprintunixdialog.c:3382
 msgid "Even sheets"
 msgstr "Paginile pare"
 
-#: gtk/gtkprintunixdialog.c:3376
+#: ../gtk/gtkprintunixdialog.c:3383
 msgid "Odd sheets"
 msgstr "Paginile impare"
 
-#: gtk/gtkprintunixdialog.c:3379
+#: ../gtk/gtkprintunixdialog.c:3386
 msgid "Sc_ale:"
 msgstr "Sc_alare:"
 
-#: gtk/gtkprintunixdialog.c:3406
+#: ../gtk/gtkprintunixdialog.c:3413
 msgid "Paper"
 msgstr "Hârtie"
 
-#: gtk/gtkprintunixdialog.c:3410
+#: ../gtk/gtkprintunixdialog.c:3417
 msgid "Paper _type:"
 msgstr "Tip de _hârtie:"
 
-#: gtk/gtkprintunixdialog.c:3425
+#: ../gtk/gtkprintunixdialog.c:3432
 msgid "Paper _source:"
 msgstr "_Sursă hârtie:"
 
-#: gtk/gtkprintunixdialog.c:3440
+#: ../gtk/gtkprintunixdialog.c:3447
 msgid "Output t_ray:"
 msgstr "Tavă _ieșire:"
 
-#: gtk/gtkprintunixdialog.c:3480
+#: ../gtk/gtkprintunixdialog.c:3487
 msgid "Or_ientation:"
 msgstr "Or_ientare:"
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:3495
+#: ../gtk/gtkprintunixdialog.c:3502
 msgid "Portrait"
 msgstr "Portret"
 
-#: gtk/gtkprintunixdialog.c:3496
+#: ../gtk/gtkprintunixdialog.c:3503
 msgid "Landscape"
 msgstr "Peisaj"
 
-#: gtk/gtkprintunixdialog.c:3497
+#: ../gtk/gtkprintunixdialog.c:3504
 msgid "Reverse portrait"
 msgstr "Portret inversat"
 
-#: gtk/gtkprintunixdialog.c:3498
+#: ../gtk/gtkprintunixdialog.c:3505
 msgid "Reverse landscape"
 msgstr "Peisaj inversat"
 
-#: gtk/gtkprintunixdialog.c:3543
+#: ../gtk/gtkprintunixdialog.c:3550
 msgid "Job Details"
-msgstr "Detalii"
+msgstr "Detalii sarcină"
 
-#: gtk/gtkprintunixdialog.c:3549
+#: ../gtk/gtkprintunixdialog.c:3556
 msgid "Pri_ority:"
 msgstr "Pri_oritate:"
 
-#: gtk/gtkprintunixdialog.c:3564
+#: ../gtk/gtkprintunixdialog.c:3571
 msgid "_Billing info:"
 msgstr "Informații _de facturare"
 
-#: gtk/gtkprintunixdialog.c:3582
+#: ../gtk/gtkprintunixdialog.c:3589
 msgid "Print Document"
 msgstr "Tipărire document"
 
 #. Translators: this is one of the choices for the print at option
 #. * in the print dialog
 #.
-#: gtk/gtkprintunixdialog.c:3591
+#: ../gtk/gtkprintunixdialog.c:3598
 msgid "_Now"
 msgstr "_Acum"
 
-#: gtk/gtkprintunixdialog.c:3602
+#: ../gtk/gtkprintunixdialog.c:3609
 msgid "A_t:"
 msgstr "_La:"
 
@@ -1868,7 +1870,7 @@ msgstr "_La:"
 #. * You can remove the am/pm values below for your locale if they are not
 #. * supported.
 #.
-#: gtk/gtkprintunixdialog.c:3608
+#: ../gtk/gtkprintunixdialog.c:3615
 msgid ""
 "Specify the time of print,\n"
 " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
@@ -1876,121 +1878,121 @@ msgstr ""
 "Specificați ora tipăririi,\n"
 "de ex. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
 
-#: gtk/gtkprintunixdialog.c:3618
+#: ../gtk/gtkprintunixdialog.c:3625
 msgid "Time of print"
 msgstr "Data tipăririi"
 
-#: gtk/gtkprintunixdialog.c:3634
+#: ../gtk/gtkprintunixdialog.c:3641
 msgid "On _hold"
 msgstr "Î_n așteptare"
 
-#: gtk/gtkprintunixdialog.c:3635
+#: ../gtk/gtkprintunixdialog.c:3642
 msgid "Hold the job until it is explicitly released"
 msgstr "Ține sarcina în așteptare până i se dă drumul"
 
-#: gtk/gtkprintunixdialog.c:3655
+#: ../gtk/gtkprintunixdialog.c:3662
 msgid "Add Cover Page"
 msgstr "Adaugă pagină de gardă"
 
 #. 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:3671
 msgid "Be_fore:"
 msgstr "Îna_inte:"
 
 #. 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:3689
 msgid "_After:"
 msgstr "D_upă:"
 
 #. 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:3707
 msgid "Job"
 msgstr "Sarcină"
 
-#: gtk/gtkprintunixdialog.c:3766
+#: ../gtk/gtkprintunixdialog.c:3773
 msgid "Advanced"
 msgstr "Avansat"
 
 #. Translators: this will appear as tab label in print dialog.
-#: gtk/gtkprintunixdialog.c:3804
+#: ../gtk/gtkprintunixdialog.c:3811
 msgid "Image Quality"
 msgstr "Calitate imagine"
 
 #. Translators: this will appear as tab label in print dialog.
-#: gtk/gtkprintunixdialog.c:3808
+#: ../gtk/gtkprintunixdialog.c:3815
 msgid "Color"
 msgstr "Culoare"
 
 #. 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:3820
 msgid "Finishing"
 msgstr "Se termină"
 
-#: gtk/gtkprintunixdialog.c:3823
+#: ../gtk/gtkprintunixdialog.c:3830
 msgid "Some of the settings in the dialog conflict"
 msgstr "Unele opțiuni din acest dialog sunt incompatibile"
 
-#: gtk/gtkprintunixdialog.c:3846
+#: ../gtk/gtkprintunixdialog.c:3853
 msgid "Print"
 msgstr "Tipărire"
 
-#: gtk/gtkrc.c:2834
+#: ../gtk/gtkrc.c:2834
 #, c-format
 msgid "Unable to find include file: \"%s\""
 msgstr "Nu s-a găsit fișierul „include”: „%s”"
 
-#: gtk/gtkrc.c:3470 gtk/gtkrc.c:3473
+#: ../gtk/gtkrc.c:3470 ../gtk/gtkrc.c:3473
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "Nu se poate localiza fișierul imagine în pixmap_path: „%s”"
 
-#: gtk/gtkrecentaction.c:165 gtk/gtkrecentaction.c:173
-#: gtk/gtkrecentchoosermenu.c:615 gtk/gtkrecentchoosermenu.c:623
+#: ../gtk/gtkrecentaction.c:165 ../gtk/gtkrecentaction.c:173
+#: ../gtk/gtkrecentchoosermenu.c:608 ../gtk/gtkrecentchoosermenu.c:616
 #, c-format
 msgid "This function is not implemented for widgets of class '%s'"
 msgstr "Această funcție nu este implementată pentru widgeturi de clasă „%s”"
 
-#: gtk/gtkrecentchooserdefault.c:482
+#: ../gtk/gtkrecentchooserdefault.c:483
 msgid "Select which type of documents are shown"
 msgstr "Selectați ce tipuri de documente să fie afișate"
 
-#: gtk/gtkrecentchooserdefault.c:1138 gtk/gtkrecentchooserdefault.c:1175
+#: ../gtk/gtkrecentchooserdefault.c:1133 ../gtk/gtkrecentchooserdefault.c:1170
 #, c-format
 msgid "No item for URI '%s' found"
 msgstr "Nu s-a găsit nici un element pentru URI-ul „%s”"
 
-#: gtk/gtkrecentchooserdefault.c:1302
+#: ../gtk/gtkrecentchooserdefault.c:1297
 msgid "Untitled filter"
 msgstr "Filtru fără nume"
 
-#: gtk/gtkrecentchooserdefault.c:1655
+#: ../gtk/gtkrecentchooserdefault.c:1650
 msgid "Could not remove item"
 msgstr "Nu s-a putut șterge elementul"
 
-#: gtk/gtkrecentchooserdefault.c:1699
+#: ../gtk/gtkrecentchooserdefault.c:1694
 msgid "Could not clear list"
 msgstr "Nu s-a putut goli lista"
 
-#: gtk/gtkrecentchooserdefault.c:1783
+#: ../gtk/gtkrecentchooserdefault.c:1778
 msgid "Copy _Location"
 msgstr "Copiază _locația"
 
-#: gtk/gtkrecentchooserdefault.c:1796
+#: ../gtk/gtkrecentchooserdefault.c:1791
 msgid "_Remove From List"
 msgstr "_Scoate din listă"
 
-#: gtk/gtkrecentchooserdefault.c:1805
+#: ../gtk/gtkrecentchooserdefault.c:1800
 msgid "_Clear List"
-msgstr "Gol_ește lista"
+msgstr "_Golește lista"
 
-#: gtk/gtkrecentchooserdefault.c:1819
+#: ../gtk/gtkrecentchooserdefault.c:1814
 msgid "Show _Private Resources"
 msgstr "Arată resursele _private"
 
@@ -2004,21 +2006,21 @@ msgstr "Arată resursele _private"
 #. * 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 "Nu s-a găsit nici un element"
 
-#: 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 "Nu s-au găsit resurse utilizate recent cu URI-ul „%s”"
 
-#: gtk/gtkrecentchoosermenu.c:802
+#: ../gtk/gtkrecentchoosermenu.c:795
 #, c-format
 msgid "Open '%s'"
 msgstr "Deschide „%s”"
 
-#: gtk/gtkrecentchoosermenu.c:832
+#: ../gtk/gtkrecentchoosermenu.c:825
 msgid "Unknown item"
 msgstr "Element necunoscut"
 
@@ -2027,7 +2029,7 @@ msgstr "Element necunoscut"
 #. * 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:836
 #, c-format
 msgctxt "recent menu label"
 msgid "_%d. %s"
@@ -2036,46 +2038,53 @@ 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:841
 #, 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:1000 ../gtk/gtkrecentmanager.c:1013
+#: ../gtk/gtkrecentmanager.c:1150 ../gtk/gtkrecentmanager.c:1160
+#: ../gtk/gtkrecentmanager.c:1213 ../gtk/gtkrecentmanager.c:1222
+#: ../gtk/gtkrecentmanager.c:1237
 #, c-format
 msgid "Unable to find an item with URI '%s'"
 msgstr "Nu s-a putut găsi un element cu URI-ul „%s”"
 
-#: gtk/gtkspinner.c:456
+#: ../gtk/gtkrecentmanager.c:2437
+#, c-format
+msgid "No registered application with name '%s' for item with URI '%s' found"
+msgstr ""
+"Nu a fost găsită nicio aplicație înregistrată cu numele „%s” pentru elementul cu URI-ul „%s”"
+
+
+#: ../gtk/gtkspinner.c:456
 msgctxt "throbbing progress animation widget"
 msgid "Spinner"
 msgstr "Spinner"
 
-#: gtk/gtkspinner.c:457
+#: ../gtk/gtkspinner.c:457
 msgid "Provides visual indication of progress"
 msgstr "Oferă un indiciu vizual al progresului"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
-#: gtk/gtkstock.c:313
+#: ../gtk/gtkstock.c:313
 msgctxt "Stock label"
 msgid "Information"
 msgstr "Detalii"
 
-#: gtk/gtkstock.c:314
+#: ../gtk/gtkstock.c:314
 msgctxt "Stock label"
 msgid "Warning"
 msgstr "Avertizare"
 
-#: gtk/gtkstock.c:315
+#: ../gtk/gtkstock.c:315
 msgctxt "Stock label"
 msgid "Error"
 msgstr "Eroare"
 
-#: gtk/gtkstock.c:316
+#: ../gtk/gtkstock.c:316
 msgctxt "Stock label"
 msgid "Question"
 msgstr "Întrebare"
@@ -2083,698 +2092,696 @@ msgstr "Întrebare"
 #. 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 "_Despre"
 
-#: gtk/gtkstock.c:322
+#: ../gtk/gtkstock.c:322
 msgctxt "Stock label"
 msgid "_Add"
 msgstr "Ada_ugă"
 
-#: gtk/gtkstock.c:323
+#: ../gtk/gtkstock.c:323
 msgctxt "Stock label"
 msgid "_Apply"
 msgstr "A_plică"
 
-#: gtk/gtkstock.c:324
+#: ../gtk/gtkstock.c:324
 msgctxt "Stock label"
 msgid "_Bold"
 msgstr "_Aldin"
 
-#: gtk/gtkstock.c:325
+#: ../gtk/gtkstock.c:325
 msgctxt "Stock label"
 msgid "_Cancel"
 msgstr "_Renunță"
 
-#: gtk/gtkstock.c:326
-#, fuzzy
+#: ../gtk/gtkstock.c:326
 msgctxt "Stock label"
 msgid "_CD-ROM"
-msgstr "_CD-Rom"
+msgstr "_CD-ROM"
 
-#: gtk/gtkstock.c:327
+#: ../gtk/gtkstock.c:327
 msgctxt "Stock label"
 msgid "_Clear"
 msgstr "C_urăță"
 
-#: gtk/gtkstock.c:328
+#: ../gtk/gtkstock.c:328
 msgctxt "Stock label"
 msgid "_Close"
 msgstr "În_chide"
 
-#: gtk/gtkstock.c:329
+#: ../gtk/gtkstock.c:329
 msgctxt "Stock label"
 msgid "C_onnect"
 msgstr "C_onectare"
 
-#: gtk/gtkstock.c:330
+#: ../gtk/gtkstock.c:330
 msgctxt "Stock label"
 msgid "_Convert"
 msgstr "Con_vertește"
 
-#: gtk/gtkstock.c:331
+#: ../gtk/gtkstock.c:331
 msgctxt "Stock label"
 msgid "_Copy"
 msgstr "_Copiază"
 
-#: gtk/gtkstock.c:332
+#: ../gtk/gtkstock.c:332
 msgctxt "Stock label"
 msgid "Cu_t"
 msgstr "_Taie"
 
-#: gtk/gtkstock.c:333
+#: ../gtk/gtkstock.c:333
 msgctxt "Stock label"
 msgid "_Delete"
 msgstr "Șt_erge"
 
-#: gtk/gtkstock.c:334
+#: ../gtk/gtkstock.c:334
 msgctxt "Stock label"
 msgid "_Discard"
 msgstr "_Renunță"
 
-#: gtk/gtkstock.c:335
+#: ../gtk/gtkstock.c:335
 msgctxt "Stock label"
 msgid "_Disconnect"
 msgstr "_Deconectare"
 
-#: gtk/gtkstock.c:336
+#: ../gtk/gtkstock.c:336
 msgctxt "Stock label"
 msgid "_Execute"
 msgstr "E_xecută"
 
-#: gtk/gtkstock.c:337
+#: ../gtk/gtkstock.c:337
 msgctxt "Stock label"
 msgid "_Edit"
 msgstr "_Editare"
 
-#: gtk/gtkstock.c:338
+#: ../gtk/gtkstock.c:338
 msgctxt "Stock label"
 msgid "_File"
 msgstr "_Fișier"
 
-#: gtk/gtkstock.c:339
+#: ../gtk/gtkstock.c:339
 msgctxt "Stock label"
 msgid "_Find"
 msgstr "C_aută"
 
-#: gtk/gtkstock.c:340
+#: ../gtk/gtkstock.c:340
 msgctxt "Stock label"
 msgid "Find and _Replace"
 msgstr "Caută și î_nlocuiește"
 
-#: gtk/gtkstock.c:341
+#: ../gtk/gtkstock.c:341
 msgctxt "Stock label"
 msgid "_Floppy"
 msgstr "Disc_hetă"
 
-#: gtk/gtkstock.c:342
+#: ../gtk/gtkstock.c:342
 msgctxt "Stock label"
 msgid "_Fullscreen"
 msgstr "Pe tot _ecranul"
 
-#: gtk/gtkstock.c:343
+#: ../gtk/gtkstock.c:343
 msgctxt "Stock label"
 msgid "_Leave Fullscreen"
 msgstr "Mărime _normală"
 
 #. 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 "J_os de tot"
 
 #. 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 "_Primul"
 
 #. 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 "_Ultimul"
 
 #. 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 "S_us de tot"
 
 #. This is a navigation label as in "go back"
-#: gtk/gtkstock.c:353
+#: ../gtk/gtkstock.c:353
 msgctxt "Stock label, navigation"
 msgid "_Back"
 msgstr "Îna_poi"
 
 #. This is a navigation label as in "go down"
-#: gtk/gtkstock.c:355
+#: ../gtk/gtkstock.c:355
 msgctxt "Stock label, navigation"
 msgid "_Down"
 msgstr "_Jos"
 
 #. This is a navigation label as in "go forward"
-#: gtk/gtkstock.c:357
+#: ../gtk/gtkstock.c:357
 msgctxt "Stock label, navigation"
 msgid "_Forward"
 msgstr "Înai_nte"
 
 #. This is a navigation label as in "go up"
-#: gtk/gtkstock.c:359
+#: ../gtk/gtkstock.c:359
 msgctxt "Stock label, navigation"
 msgid "_Up"
 msgstr "_Sus"
 
-#: gtk/gtkstock.c:360
-#, fuzzy
+#: ../gtk/gtkstock.c:360
 msgctxt "Stock label"
 msgid "_Hard Disk"
-msgstr "_Disc"
+msgstr "_Hard disc"
 
-#: gtk/gtkstock.c:361
+#: ../gtk/gtkstock.c:361
 msgctxt "Stock label"
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: gtk/gtkstock.c:362
+#: ../gtk/gtkstock.c:362
 msgctxt "Stock label"
 msgid "_Home"
 msgstr "_Acasă"
 
-#: gtk/gtkstock.c:363
+#: ../gtk/gtkstock.c:363
 msgctxt "Stock label"
 msgid "Increase Indent"
 msgstr "Mărește indentarea"
 
-#: gtk/gtkstock.c:364
+#: ../gtk/gtkstock.c:364
 msgctxt "Stock label"
 msgid "Decrease Indent"
 msgstr "Micșorează indentarea"
 
-#: gtk/gtkstock.c:365
+#: ../gtk/gtkstock.c:365
 msgctxt "Stock label"
 msgid "_Index"
 msgstr "_Index"
 
-#: gtk/gtkstock.c:366
+#: ../gtk/gtkstock.c:366
 msgctxt "Stock label"
 msgid "_Information"
 msgstr "_Detalii"
 
-#: gtk/gtkstock.c:367
+#: ../gtk/gtkstock.c:367
 msgctxt "Stock label"
 msgid "_Italic"
 msgstr "Curs_iv"
 
-#: gtk/gtkstock.c:368
+#: ../gtk/gtkstock.c:368
 msgctxt "Stock label"
 msgid "_Jump to"
 msgstr "_Sări la"
 
 #. This is about text justification, "centered text"
-#: gtk/gtkstock.c:370
+#: ../gtk/gtkstock.c:370
 msgctxt "Stock label"
 msgid "_Center"
 msgstr "_Centru"
 
 #. This is about text justification
-#: gtk/gtkstock.c:372
+#: ../gtk/gtkstock.c:372
 msgctxt "Stock label"
 msgid "_Fill"
 msgstr "_Umplere"
 
 #. This is about text justification, "left-justified text"
-#: gtk/gtkstock.c:374
+#: ../gtk/gtkstock.c:374
 msgctxt "Stock label"
 msgid "_Left"
 msgstr "_Stânga"
 
 #. This is about text justification, "right-justified text"
-#: gtk/gtkstock.c:376
+#: ../gtk/gtkstock.c:376
 msgctxt "Stock label"
 msgid "_Right"
 msgstr "_Dreapta"
 
 #. Media label, as in "fast forward"
-#: gtk/gtkstock.c:379
+#: ../gtk/gtkstock.c:379
 msgctxt "Stock label, media"
 msgid "_Forward"
 msgstr "Înain_te"
 
 #. Media label, as in "next song"
-#: gtk/gtkstock.c:381
+#: ../gtk/gtkstock.c:381
 msgctxt "Stock label, media"
 msgid "_Next"
 msgstr "_Nou"
 
 #. Media label, as in "pause music"
-#: gtk/gtkstock.c:383
+#: ../gtk/gtkstock.c:383
 msgctxt "Stock label, media"
 msgid "P_ause"
 msgstr "Pau_ză"
 
 #. Media label, as in "play music"
-#: gtk/gtkstock.c:385
+#: ../gtk/gtkstock.c:385
 msgctxt "Stock label, media"
 msgid "_Play"
 msgstr "_Redare"
 
 #. Media label, as in  "previous song"
-#: gtk/gtkstock.c:387
+#: ../gtk/gtkstock.c:387
 msgctxt "Stock label, media"
 msgid "Pre_vious"
 msgstr "_Precedenta"
 
 #. Media label
-#: gtk/gtkstock.c:389
+#: ../gtk/gtkstock.c:389
 msgctxt "Stock label, media"
 msgid "_Record"
 msgstr "Înr_egistrare"
 
 #. Media label
-#: gtk/gtkstock.c:391
+#: ../gtk/gtkstock.c:391
 msgctxt "Stock label, media"
 msgid "R_ewind"
 msgstr "Î_napoi"
 
 #. Media label
-#: gtk/gtkstock.c:393
+#: ../gtk/gtkstock.c:393
 msgctxt "Stock label, media"
 msgid "_Stop"
 msgstr "_Stop"
 
-#: gtk/gtkstock.c:394
+#: ../gtk/gtkstock.c:394
 msgctxt "Stock label"
 msgid "_Network"
 msgstr "_Rețea"
 
-#: gtk/gtkstock.c:395
+#: ../gtk/gtkstock.c:395
 msgctxt "Stock label"
 msgid "_New"
 msgstr "_Nou"
 
-#: gtk/gtkstock.c:396
+#: ../gtk/gtkstock.c:396
 msgctxt "Stock label"
 msgid "_No"
 msgstr "_Nu"
 
-#: gtk/gtkstock.c:397
+#: ../gtk/gtkstock.c:397
 msgctxt "Stock label"
 msgid "_OK"
 msgstr "_OK"
 
-#: gtk/gtkstock.c:398
+#: ../gtk/gtkstock.c:398
 msgctxt "Stock label"
 msgid "_Open"
 msgstr "_Deschide"
 
 #. Page orientation
-#: gtk/gtkstock.c:400
+#: ../gtk/gtkstock.c:400
 msgctxt "Stock label"
 msgid "Landscape"
 msgstr "Vedere"
 
 #. Page orientation
-#: gtk/gtkstock.c:402
+#: ../gtk/gtkstock.c:402
 msgctxt "Stock label"
 msgid "Portrait"
 msgstr "Portret"
 
 #. Page orientation
-#: gtk/gtkstock.c:404
+#: ../gtk/gtkstock.c:404
 msgctxt "Stock label"
 msgid "Reverse landscape"
 msgstr "Vedere inversată"
 
 #. Page orientation
-#: gtk/gtkstock.c:406
+#: ../gtk/gtkstock.c:406
 msgctxt "Stock label"
 msgid "Reverse portrait"
 msgstr "Portret inversat"
 
-#: gtk/gtkstock.c:407
+#: ../gtk/gtkstock.c:407
 msgctxt "Stock label"
 msgid "Page Set_up"
 msgstr "Opți_uni pagină"
 
-#: gtk/gtkstock.c:408
+#: ../gtk/gtkstock.c:408
 msgctxt "Stock label"
 msgid "_Paste"
 msgstr "_Lipește"
 
-#: gtk/gtkstock.c:409
+#: ../gtk/gtkstock.c:409
 msgctxt "Stock label"
 msgid "_Preferences"
 msgstr "_Preferințe"
 
-#: gtk/gtkstock.c:410
+#: ../gtk/gtkstock.c:410
 msgctxt "Stock label"
 msgid "_Print"
 msgstr "_Tipărește"
 
-#: gtk/gtkstock.c:411
+#: ../gtk/gtkstock.c:411
 msgctxt "Stock label"
 msgid "Print Pre_view"
 msgstr "Pre_vizualizare tipărire"
 
-#: gtk/gtkstock.c:412
+#: ../gtk/gtkstock.c:412
 msgctxt "Stock label"
 msgid "_Properties"
 msgstr "_Proprietăți"
 
-#: gtk/gtkstock.c:413
+#: ../gtk/gtkstock.c:413
 msgctxt "Stock label"
 msgid "_Quit"
 msgstr "_Ieșire"
 
-#: gtk/gtkstock.c:414
+#: ../gtk/gtkstock.c:414
 msgctxt "Stock label"
 msgid "_Redo"
 msgstr "_Refă"
 
-#: gtk/gtkstock.c:415
+#: ../gtk/gtkstock.c:415
 msgctxt "Stock label"
 msgid "_Refresh"
 msgstr "Actuali_zează"
 
-#: gtk/gtkstock.c:416
+#: ../gtk/gtkstock.c:416
 msgctxt "Stock label"
 msgid "_Remove"
 msgstr "E_limină"
 
-#: gtk/gtkstock.c:417
+#: ../gtk/gtkstock.c:417
 msgctxt "Stock label"
 msgid "_Revert"
 msgstr "Restaurea_ză"
 
-#: gtk/gtkstock.c:418
+#: ../gtk/gtkstock.c:418
 msgctxt "Stock label"
 msgid "_Save"
 msgstr "_Salvează"
 
-#: gtk/gtkstock.c:419
+#: ../gtk/gtkstock.c:419
 msgctxt "Stock label"
 msgid "Save _As"
 msgstr "Salvează c_a"
 
-#: gtk/gtkstock.c:420
+#: ../gtk/gtkstock.c:420
 msgctxt "Stock label"
 msgid "Select _All"
 msgstr "Selectează t_ot"
 
-#: gtk/gtkstock.c:421
+#: ../gtk/gtkstock.c:421
 msgctxt "Stock label"
 msgid "_Color"
 msgstr "_Culoare"
 
-#: 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 "_Ascendent"
 
 #. Sorting direction
-#: gtk/gtkstock.c:426
+#: ../gtk/gtkstock.c:426
 msgctxt "Stock label"
 msgid "_Descending"
 msgstr "_Descendent"
 
-#: gtk/gtkstock.c:427
+#: ../gtk/gtkstock.c:427
 msgctxt "Stock label"
 msgid "_Spell Check"
 msgstr "_Verificare ortografică"
 
-#: gtk/gtkstock.c:428
+#: ../gtk/gtkstock.c:428
 msgctxt "Stock label"
 msgid "_Stop"
 msgstr "_Stop"
 
 #. Font variant
-#: gtk/gtkstock.c:430
+#: ../gtk/gtkstock.c:430
 msgctxt "Stock label"
 msgid "_Strikethrough"
 msgstr "_Tăiat"
 
-#: gtk/gtkstock.c:431
+#: ../gtk/gtkstock.c:431
 msgctxt "Stock label"
 msgid "_Undelete"
 msgstr "_Restaurează"
 
 #. Font variant
-#: gtk/gtkstock.c:433
+#: ../gtk/gtkstock.c:433
 msgctxt "Stock label"
 msgid "_Underline"
 msgstr "S_ubliniat"
 
-#: gtk/gtkstock.c:434
+#: ../gtk/gtkstock.c:434
 msgctxt "Stock label"
 msgid "_Undo"
 msgstr "_Anulează"
 
-#: 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 "Mărime _normală"
 
 #. Zoom
-#: gtk/gtkstock.c:439
+#: ../gtk/gtkstock.c:439
 msgctxt "Stock label"
 msgid "Best _Fit"
 msgstr "Încadrare o _ptimă"
 
-#: gtk/gtkstock.c:440
+#: ../gtk/gtkstock.c:440
 msgctxt "Stock label"
 msgid "Zoom _In"
 msgstr "Mă_rește"
 
-#: gtk/gtkstock.c:441
+#: ../gtk/gtkstock.c:441
 msgctxt "Stock label"
 msgid "Zoom _Out"
 msgstr "Mi_cșorează"
 
-#: gtk/gtktextbufferrichtext.c:650
+#: ../gtk/gtktextbufferrichtext.c:650
 #, c-format
 msgid "Unknown error when trying to deserialize %s"
 msgstr "Eroarea necunoscută la încercarea de a deserializa %s"
 
-#: gtk/gtktextbufferrichtext.c:709
+#: ../gtk/gtktextbufferrichtext.c:709
 #, c-format
 msgid "No deserialize function found for format %s"
 msgstr "Nu s-a găsit nici o funcție de deserializare pentru formatul %s"
 
-#: gtk/gtktextbufferserialize.c:795 gtk/gtktextbufferserialize.c:821
+#: ../gtk/gtktextbufferserialize.c:803 ../gtk/gtktextbufferserialize.c:829
 #, c-format
 msgid "Both \"id\" and \"name\" were found on the <%s> element"
 msgstr "Atât „id” cât și „name” erau prezente în elementul <%s>"
 
-#: gtk/gtktextbufferserialize.c:805 gtk/gtktextbufferserialize.c:831
+#: ../gtk/gtktextbufferserialize.c:813 ../gtk/gtktextbufferserialize.c:839
 #, c-format
 msgid "The attribute \"%s\" was found twice on the <%s> element"
 msgstr "Atributul „%s” a fost găsit duplicat în elementul <%s>"
 
-#: gtk/gtktextbufferserialize.c:845
-#, fuzzy, c-format
+#: ../gtk/gtktextbufferserialize.c:855
+#, c-format
 msgid "<%s> element has invalid ID \"%s\""
-msgstr "Elementul <%s> are un id incorect „%s”"
+msgstr "Elementul <%s> are un ID incorect „%s”"
 
-#: gtk/gtktextbufferserialize.c:855
+#: ../gtk/gtktextbufferserialize.c:865
 #, c-format
 msgid "<%s> element has neither a \"name\" nor an \"id\" attribute"
 msgstr "Elementul <%s> nu are nici atributul „name” și nici atributul „id”"
 
-#: gtk/gtktextbufferserialize.c:942
+#: ../gtk/gtktextbufferserialize.c:952
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atributul „%s” se repetă de două ori în același element <%s>"
 
-#: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985
+#: ../gtk/gtktextbufferserialize.c:970 ../gtk/gtktextbufferserialize.c:995
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Atributul „%s” este incorect în acest context pentru elementul <%s>"
 
-#: gtk/gtktextbufferserialize.c:1024
+#: ../gtk/gtktextbufferserialize.c:1034
 #, c-format
 msgid "Tag \"%s\" has not been defined."
 msgstr "Eticheta „%s” nu a fost definită."
 
-#: gtk/gtktextbufferserialize.c:1036
+#: ../gtk/gtktextbufferserialize.c:1046
 msgid "Anonymous tag found and tags can not be created."
-msgstr "S-a găsit o etichetă anonimă, nu se pot crea etichete."
+msgstr "S-a găsit o etichetă anonimă şi nu se pot crea etichete."
 
-#: gtk/gtktextbufferserialize.c:1047
+#: ../gtk/gtktextbufferserialize.c:1057
 #, c-format
 msgid "Tag \"%s\" does not exist in buffer and tags can not be created."
-msgstr "Eticheta „%s” nu există în buffer, nu se pot crea etichete."
+msgstr "Eticheta „%s” nu există în buffer şi nu se pot crea etichete."
 
-#: gtk/gtktextbufferserialize.c:1146 gtk/gtktextbufferserialize.c:1221
-#: gtk/gtktextbufferserialize.c:1324 gtk/gtktextbufferserialize.c:1398
+#: ../gtk/gtktextbufferserialize.c:1156 ../gtk/gtktextbufferserialize.c:1231
+#: ../gtk/gtktextbufferserialize.c:1336 ../gtk/gtktextbufferserialize.c:1410
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Elementul <%s> nu este permis mai jos de <%s>"
 
-#: gtk/gtktextbufferserialize.c:1177
+#: ../gtk/gtktextbufferserialize.c:1187
 #, c-format
 msgid "\"%s\" is not a valid attribute type"
 msgstr "„%s” nu este un tip de atribut valid"
 
-#: gtk/gtktextbufferserialize.c:1185
+#: ../gtk/gtktextbufferserialize.c:1195
 #, c-format
 msgid "\"%s\" is not a valid attribute name"
 msgstr "„%s” nu este un nume de atribut valid"
 
-#: gtk/gtktextbufferserialize.c:1195
+#: ../gtk/gtktextbufferserialize.c:1205
 #, c-format
 msgid ""
 "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
 msgstr ""
 "„%s” nu a putut fi convertit într-o valoare de tip „%s” pentru atributul „%s”"
 
-#: gtk/gtktextbufferserialize.c:1204
+#: ../gtk/gtktextbufferserialize.c:1214
 #, c-format
 msgid "\"%s\" is not a valid value for attribute \"%s\""
 msgstr "„%s” nu este o valoare validă pentru atributul „%s”"
 
-#: gtk/gtktextbufferserialize.c:1289
+#: ../gtk/gtktextbufferserialize.c:1299
 #, c-format
 msgid "Tag \"%s\" already defined"
 msgstr "Eticheta „%s” este deja definită"
 
-#: gtk/gtktextbufferserialize.c:1300
+#: ../gtk/gtktextbufferserialize.c:1312
 #, c-format
 msgid "Tag \"%s\" has invalid priority \"%s\""
 msgstr "Eticheta „%s” are o prioritate nevalidă „%s”"
 
-#: gtk/gtktextbufferserialize.c:1353
+#: ../gtk/gtktextbufferserialize.c:1365
 #, c-format
 msgid "Outermost element in text must be <text_view_markup> not <%s>"
 msgstr ""
 "Elementul ce delimitează textul trebuie să fie <text_view_markup>, nu <%s>"
 
-#: gtk/gtktextbufferserialize.c:1362 gtk/gtktextbufferserialize.c:1378
+#: ../gtk/gtktextbufferserialize.c:1374 ../gtk/gtktextbufferserialize.c:1390
 #, c-format
 msgid "A <%s> element has already been specified"
 msgstr "Un element <%s> a fost deja specificat"
 
-#: gtk/gtktextbufferserialize.c:1384
+#: ../gtk/gtktextbufferserialize.c:1396
 msgid "A <text> element can't occur before a <tags> element"
 msgstr "Un element <text> nu poate apărea înaintea unui element <tags>"
 
-#: gtk/gtktextbufferserialize.c:1784
+#: ../gtk/gtktextbufferserialize.c:1796
 msgid "Serialized data is malformed"
 msgstr "Datele serializate au fost deformate"
 
-#: gtk/gtktextbufferserialize.c:1862
+#: ../gtk/gtktextbufferserialize.c:1874
 msgid ""
 "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
 msgstr ""
-"Datele serializate sunt deformate. Prima secțiune nu e "
-"GTKTEXTBUFFERCONTENTS-0001"
+"Datele serializate sunt deformate. Prima secțiune nu e GTKTEXTBUFFERCONTENTS-"
+"0001"
 
-#: gtk/gtktextutil.c:60
+#: ../gtk/gtktextutil.c:60
 msgid "LRM _Left-to-right mark"
 msgstr "Semn _Stânga-Dreapta LRM"
 
-#: gtk/gtktextutil.c:61
+#: ../gtk/gtktextutil.c:61
 msgid "RLM _Right-to-left mark"
 msgstr "Semn _Dreapta-Stânga RLM"
 
-#: gtk/gtktextutil.c:62
+#: ../gtk/gtktextutil.c:62
 msgid "LRE Left-to-right _embedding"
 msgstr "Î_ncapsulare Stânga-Dreapta LRE"
 
-#: gtk/gtktextutil.c:63
+#: ../gtk/gtktextutil.c:63
 msgid "RLE Right-to-left e_mbedding"
 msgstr "În_capsulare Dreapta-Stânga RLE"
 
-#: gtk/gtktextutil.c:64
+#: ../gtk/gtktextutil.c:64
 msgid "LRO Left-to-right _override"
 msgstr "S_uprascriere Stânga-Dreapta LRO"
 
-#: gtk/gtktextutil.c:65
+#: ../gtk/gtktextutil.c:65
 msgid "RLO Right-to-left o_verride"
 msgstr "Supr_ascriere Dreapta-Stânga RLO"
 
-#: gtk/gtktextutil.c:66
+#: ../gtk/gtktextutil.c:66
 msgid "PDF _Pop directional formatting"
 msgstr "Formatare direcțională _Pop PDF"
 
-#: gtk/gtktextutil.c:67
+#: ../gtk/gtktextutil.c:67
 msgid "ZWS _Zero width space"
 msgstr "Spațiu de lungime _zero ZWS"
 
-#: gtk/gtktextutil.c:68
+#: ../gtk/gtktextutil.c:68
 msgid "ZWJ Zero width _joiner"
 msgstr "_Legătură de lungime zero ZWJ"
 
-#: gtk/gtktextutil.c:69
+#: ../gtk/gtktextutil.c:69
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "Non-le_gătură de lungime zero ZWNJ"
 
-#: gtk/gtkthemes.c:72
+#: ../gtk/gtkthemes.c:72
 #, c-format
 msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "Nu se poate localiza motorul temei în module_path: „%s”,"
 
-#: gtk/gtkuimanager.c:1505
+#: ../gtk/gtkuimanager.c:1505
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "Etichetă de start „%s” neașteptată în linia %d, caracterul %d"
 
-#: gtk/gtkuimanager.c:1595
+#: ../gtk/gtkuimanager.c:1595
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "Date tip caracter neașteptate în linia %d, caracterul %d"
 
-#: gtk/gtkuimanager.c:2427
+#: ../gtk/gtkuimanager.c:2427
 msgid "Empty"
 msgstr "Gol"
 
-#: gtk/gtkvolumebutton.c:83
+#: ../gtk/gtkvolumebutton.c:83
 msgid "Volume"
 msgstr "Sonor"
 
-#: gtk/gtkvolumebutton.c:85
+#: ../gtk/gtkvolumebutton.c:85
 msgid "Turns volume down or up"
 msgstr "Scade sau crește volumul"
 
-#: gtk/gtkvolumebutton.c:88
+#: ../gtk/gtkvolumebutton.c:88
 msgid "Adjusts the volume"
 msgstr "Ajustare sonor"
 
-#: gtk/gtkvolumebutton.c:94 gtk/gtkvolumebutton.c:97
+#: ../gtk/gtkvolumebutton.c:94 ../gtk/gtkvolumebutton.c:97
 msgid "Volume Down"
 msgstr "Volum scăzut"
 
-#: gtk/gtkvolumebutton.c:96
+#: ../gtk/gtkvolumebutton.c:96
 msgid "Decreases the volume"
 msgstr "Scade volumul"
 
-#: gtk/gtkvolumebutton.c:100 gtk/gtkvolumebutton.c:103
+#: ../gtk/gtkvolumebutton.c:100 ../gtk/gtkvolumebutton.c:103
 msgid "Volume Up"
 msgstr "Volum crescut"
 
-#: gtk/gtkvolumebutton.c:102
+#: ../gtk/gtkvolumebutton.c:102
 msgid "Increases the volume"
 msgstr "Crește volumul"
 
-#: gtk/gtkvolumebutton.c:160
+#: ../gtk/gtkvolumebutton.c:160
 msgid "Muted"
 msgstr "Mut"
 
-#: gtk/gtkvolumebutton.c:164
+#: ../gtk/gtkvolumebutton.c:164
 msgid "Full Volume"
 msgstr "Volum maxim"
 
@@ -2783,1251 +2790,1251 @@ msgstr "Volum maxim"
 #. * 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:177
 #, 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"
 
-#: 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 "A4 Extra"
 
-#: gtk/paper_names_offsets.c:25
+#: ../gtk/paper_names_offsets.c:25
 msgctxt "paper size"
 msgid "A4 Tab"
 msgstr "A4 Tab"
 
-#: 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 "A5 Extra"
 
-#: 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 "B5 Extra"
 
-#: 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 "Plic DL"
 
-#: 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"
 
-#: gtk/paper_names_offsets.c:84
+#: ../gtk/paper_names_offsets.c:84
 msgctxt "paper size"
 msgid "Choukei 2 Envelope"
 msgstr "Plic Choukei 2"
 
-#: gtk/paper_names_offsets.c:85
+#: ../gtk/paper_names_offsets.c:85
 msgctxt "paper size"
 msgid "Choukei 3 Envelope"
 msgstr "Plic Choukei 3"
 
-#: gtk/paper_names_offsets.c:86
+#: ../gtk/paper_names_offsets.c:86
 msgctxt "paper size"
 msgid "Choukei 4 Envelope"
 msgstr "Plic Choukei 4"
 
-#: gtk/paper_names_offsets.c:87
+#: ../gtk/paper_names_offsets.c:87
 msgctxt "paper size"
 msgid "hagaki (postcard)"
 msgstr "Vedere hagaki"
 
-#: gtk/paper_names_offsets.c:88
+#: ../gtk/paper_names_offsets.c:88
 msgctxt "paper size"
 msgid "kahu Envelope"
 msgstr "Plic kahu"
 
-#: gtk/paper_names_offsets.c:89
+#: ../gtk/paper_names_offsets.c:89
 msgctxt "paper size"
 msgid "kaku2 Envelope"
 msgstr "Plic kaku2"
 
-#: gtk/paper_names_offsets.c:90
+#: ../gtk/paper_names_offsets.c:90
 msgctxt "paper size"
 msgid "oufuku (reply postcard)"
 msgstr "Vedere oufuku"
 
-#: gtk/paper_names_offsets.c:91
+#: ../gtk/paper_names_offsets.c:91
 msgctxt "paper size"
 msgid "you4 Envelope"
 msgstr "Plic you4"
 
-#: 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 "Plic 6x9"
 
-#: gtk/paper_names_offsets.c:102
+#: ../gtk/paper_names_offsets.c:102
 msgctxt "paper size"
 msgid "7x9 Envelope"
 msgstr "Plic 7x9"
 
-#: gtk/paper_names_offsets.c:103
+#: ../gtk/paper_names_offsets.c:103
 msgctxt "paper size"
 msgid "9x11 Envelope"
 msgstr "Plic 9x11"
 
-#: gtk/paper_names_offsets.c:104
+#: ../gtk/paper_names_offsets.c:104
 msgctxt "paper size"
 msgid "a2 Envelope"
 msgstr "Plic a2"
 
-#: gtk/paper_names_offsets.c:105
+#: ../gtk/paper_names_offsets.c:105
 msgctxt "paper size"
 msgid "Arch A"
 msgstr "Arch A"
 
-#: gtk/paper_names_offsets.c:106
+#: ../gtk/paper_names_offsets.c:106
 msgctxt "paper size"
 msgid "Arch B"
 msgstr "Arch B"
 
-#: gtk/paper_names_offsets.c:107
+#: ../gtk/paper_names_offsets.c:107
 msgctxt "paper size"
 msgid "Arch C"
 msgstr "Arch C"
 
-#: gtk/paper_names_offsets.c:108
+#: ../gtk/paper_names_offsets.c:108
 msgctxt "paper size"
 msgid "Arch D"
 msgstr "Arch D"
 
-#: gtk/paper_names_offsets.c:109
+#: ../gtk/paper_names_offsets.c:109
 msgctxt "paper size"
 msgid "Arch E"
 msgstr "Arch 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 "Plic c5"
 
-#: 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 "edp european"
 
-#: gtk/paper_names_offsets.c:117
+#: ../gtk/paper_names_offsets.c:117
 msgctxt "paper size"
 msgid "Executive"
 msgstr "E_xecută"
 
-#: 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 "FanFold European"
 
-#: gtk/paper_names_offsets.c:120
+#: ../gtk/paper_names_offsets.c:120
 msgctxt "paper size"
 msgid "FanFold US"
 msgstr "FanFold US"
 
-#: gtk/paper_names_offsets.c:121
+#: ../gtk/paper_names_offsets.c:121
 msgctxt "paper size"
 msgid "FanFold German Legal"
 msgstr "FanFold German Legal"
 
-#: gtk/paper_names_offsets.c:122
+#: ../gtk/paper_names_offsets.c:122
 msgctxt "paper size"
 msgid "Government Legal"
 msgstr "Government Legal"
 
-#: gtk/paper_names_offsets.c:123
+#: ../gtk/paper_names_offsets.c:123
 msgctxt "paper size"
 msgid "Government Letter"
 msgstr "Government Letter"
 
-#: gtk/paper_names_offsets.c:124
+#: ../gtk/paper_names_offsets.c:124
 msgctxt "paper size"
 msgid "Index 3x5"
 msgstr "Index 3x5"
 
-#: gtk/paper_names_offsets.c:125
+#: ../gtk/paper_names_offsets.c:125
 msgctxt "paper size"
 msgid "Index 4x6 (postcard)"
 msgstr "Index 4x6 (vedere)"
 
-#: gtk/paper_names_offsets.c:126
+#: ../gtk/paper_names_offsets.c:126
 msgctxt "paper size"
 msgid "Index 4x6 ext"
 msgstr "Index 4x6 ext"
 
-#: gtk/paper_names_offsets.c:127
+#: ../gtk/paper_names_offsets.c:127
 msgctxt "paper size"
 msgid "Index 5x8"
 msgstr "Index 5x8"
 
-#: gtk/paper_names_offsets.c:128
+#: ../gtk/paper_names_offsets.c:128
 msgctxt "paper size"
 msgid "Invoice"
 msgstr "Factură"
 
-#: gtk/paper_names_offsets.c:129
+#: ../gtk/paper_names_offsets.c:129
 msgctxt "paper size"
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: gtk/paper_names_offsets.c:130
+#: ../gtk/paper_names_offsets.c:130
 msgctxt "paper size"
 msgid "US Legal"
 msgstr "US Legal"
 
-#: gtk/paper_names_offsets.c:131
+#: ../gtk/paper_names_offsets.c:131
 msgctxt "paper size"
 msgid "US Legal Extra"
 msgstr "US Legal Extra"
 
-#: gtk/paper_names_offsets.c:132
+#: ../gtk/paper_names_offsets.c:132
 msgctxt "paper size"
 msgid "US Letter"
 msgstr "US Letter"
 
-#: gtk/paper_names_offsets.c:133
+#: ../gtk/paper_names_offsets.c:133
 msgctxt "paper size"
 msgid "US Letter Extra"
 msgstr "US Letter Extra"
 
-#: gtk/paper_names_offsets.c:134
+#: ../gtk/paper_names_offsets.c:134
 msgctxt "paper size"
 msgid "US Letter Plus"
 msgstr "US Letter Plus"
 
-#: gtk/paper_names_offsets.c:135
+#: ../gtk/paper_names_offsets.c:135
 msgctxt "paper size"
 msgid "Monarch Envelope"
 msgstr "Monarch Envelope"
 
-#: gtk/paper_names_offsets.c:136
+#: ../gtk/paper_names_offsets.c:136
 msgctxt "paper size"
 msgid "#10 Envelope"
 msgstr "Plic #10"
 
-#: gtk/paper_names_offsets.c:137
+#: ../gtk/paper_names_offsets.c:137
 msgctxt "paper size"
 msgid "#11 Envelope"
 msgstr "Plic #11"
 
-#: gtk/paper_names_offsets.c:138
+#: ../gtk/paper_names_offsets.c:138
 msgctxt "paper size"
 msgid "#12 Envelope"
 msgstr "Plic #12"
 
-#: gtk/paper_names_offsets.c:139
+#: ../gtk/paper_names_offsets.c:139
 msgctxt "paper size"
 msgid "#14 Envelope"
 msgstr "Plic #14"
 
-#: gtk/paper_names_offsets.c:140
+#: ../gtk/paper_names_offsets.c:140
 msgctxt "paper size"
 msgid "#9 Envelope"
 msgstr "Plic #9"
 
-#: gtk/paper_names_offsets.c:141
+#: ../gtk/paper_names_offsets.c:141
 msgctxt "paper size"
 msgid "Personal Envelope"
 msgstr "Plic personal"
 
-#: gtk/paper_names_offsets.c:142
+#: ../gtk/paper_names_offsets.c:142
 msgctxt "paper size"
 msgid "Quarto"
 msgstr "Quarto"
 
-#: gtk/paper_names_offsets.c:143
+#: ../gtk/paper_names_offsets.c:143
 msgctxt "paper size"
 msgid "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"
 
-#: gtk/paper_names_offsets.c:145
+#: ../gtk/paper_names_offsets.c:145
 msgctxt "paper size"
 msgid "Wide Format"
 msgstr "Format lat"
 
-#: gtk/paper_names_offsets.c:146
+#: ../gtk/paper_names_offsets.c:146
 msgctxt "paper size"
 msgid "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"
 
-#: gtk/paper_names_offsets.c:148
+#: ../gtk/paper_names_offsets.c:148
 msgctxt "paper size"
 msgid "Folio sp"
 msgstr "Folio sp"
 
-#: gtk/paper_names_offsets.c:149
+#: ../gtk/paper_names_offsets.c:149
 msgctxt "paper size"
 msgid "Invite Envelope"
 msgstr "Plic invitație"
 
-#: gtk/paper_names_offsets.c:150
+#: ../gtk/paper_names_offsets.c:150
 msgctxt "paper size"
 msgid "Italian Envelope"
 msgstr "Plic italian"
 
-#: gtk/paper_names_offsets.c:151
+#: ../gtk/paper_names_offsets.c:151
 msgctxt "paper size"
 msgid "juuro-ku-kai"
 msgstr "juuro-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 "Plic Postfix"
 
-#: gtk/paper_names_offsets.c:154
+#: ../gtk/paper_names_offsets.c:154
 msgctxt "paper size"
 msgid "Small Photo"
 msgstr "Poză mică"
 
-#: gtk/paper_names_offsets.c:155
+#: ../gtk/paper_names_offsets.c:155
 msgctxt "paper size"
 msgid "prc1 Envelope"
 msgstr "Plic prc1"
 
-#: gtk/paper_names_offsets.c:156
+#: ../gtk/paper_names_offsets.c:156
 msgctxt "paper size"
 msgid "prc10 Envelope"
 msgstr "Plic prc10"
 
-#: 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 "Plic prc2"
 
-#: gtk/paper_names_offsets.c:159
+#: ../gtk/paper_names_offsets.c:159
 msgctxt "paper size"
 msgid "prc3 Envelope"
 msgstr "Plic prc3"
 
-#: 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 "Plic prc4"
 
-#: gtk/paper_names_offsets.c:162
+#: ../gtk/paper_names_offsets.c:162
 msgctxt "paper size"
 msgid "prc5 Envelope"
 msgstr "Plic c5"
 
-#: gtk/paper_names_offsets.c:163
+#: ../gtk/paper_names_offsets.c:163
 msgctxt "paper size"
 msgid "prc6 Envelope"
 msgstr "Plic prc6"
 
-#: gtk/paper_names_offsets.c:164
+#: ../gtk/paper_names_offsets.c:164
 msgctxt "paper size"
 msgid "prc7 Envelope"
 msgstr "Plic prc7"
 
-#: gtk/paper_names_offsets.c:165
+#: ../gtk/paper_names_offsets.c:165
 msgctxt "paper size"
 msgid "prc8 Envelope"
 msgstr "Plic prc8"
 
-#: gtk/paper_names_offsets.c:166
+#: ../gtk/paper_names_offsets.c:166
 msgctxt "paper size"
 msgid "prc9 Envelope"
 msgstr "Plic prc9"
 
-#: gtk/paper_names_offsets.c:167
+#: ../gtk/paper_names_offsets.c:167
 msgctxt "paper size"
 msgid "ROC 16k"
 msgstr "ROC 16k"
 
-#: gtk/paper_names_offsets.c:168
+#: ../gtk/paper_names_offsets.c:168
 msgctxt "paper size"
 msgid "ROC 8k"
 msgstr "ROC 8k"
 
-#: gtk/updateiconcache.c:492 gtk/updateiconcache.c:552
+#: ../gtk/updateiconcache.c:492 ../gtk/updateiconcache.c:552
 #, c-format
 msgid "different idatas found for symlinked '%s' and '%s'\n"
 msgstr "s-au găsit idata diferite pentru „%s” (legat simbolic) și %s\n"
 
-#: gtk/updateiconcache.c:1374
+#: ../gtk/updateiconcache.c:1374
 #, c-format
 msgid "Failed to write header\n"
 msgstr "Nu s-a putut scrie antetul\n"
 
-#: gtk/updateiconcache.c:1380
+#: ../gtk/updateiconcache.c:1380
 #, c-format
 msgid "Failed to write hash table\n"
 msgstr "Nu s-a putut scrie tabela de hash\n"
 
-#: gtk/updateiconcache.c:1386
+#: ../gtk/updateiconcache.c:1386
 #, c-format
 msgid "Failed to write folder index\n"
 msgstr "Nu s-a putut scrie indexul dosarului\n"
 
-#: gtk/updateiconcache.c:1394
+#: ../gtk/updateiconcache.c:1394
 #, c-format
 msgid "Failed to rewrite header\n"
 msgstr "Nu s-a putut rescrie antetul\n"
 
-#: gtk/updateiconcache.c:1463
+#: ../gtk/updateiconcache.c:1488
 #, c-format
 msgid "Failed to open file %s : %s\n"
 msgstr "Nu s-a putut deschide fișierul %s: %s\n"
 
-#: gtk/updateiconcache.c:1471
+#: ../gtk/updateiconcache.c:1496 ../gtk/updateiconcache.c:1526
 #, c-format
 msgid "Failed to write cache file: %s\n"
 msgstr "Nu s-a putut scrie fișierul cache: %s\n"
 
-#: gtk/updateiconcache.c:1507
+#: ../gtk/updateiconcache.c:1537
 #, c-format
 msgid "The generated cache was invalid.\n"
 msgstr "S-a generat un cache nevalid.\n"
 
-#: gtk/updateiconcache.c:1521
+#: ../gtk/updateiconcache.c:1551
 #, c-format
 msgid "Could not rename %s to %s: %s, removing %s then.\n"
 msgstr "Nu s-a putut redenumi %s în %s: %s, prin urmare se șterge %s.\n"
 
-#: gtk/updateiconcache.c:1535
+#: ../gtk/updateiconcache.c:1565
 #, c-format
 msgid "Could not rename %s to %s: %s\n"
 msgstr "Nu s-a putut redenumi %s în %s: %s\n"
 
-#: gtk/updateiconcache.c:1545
+#: ../gtk/updateiconcache.c:1575
 #, c-format
 msgid "Could not rename %s back to %s: %s.\n"
 msgstr "Nu s-a putut redenumi %s înapoi în %s: %s.\n"
 
-#: gtk/updateiconcache.c:1572
+#: ../gtk/updateiconcache.c:1602
 #, c-format
 msgid "Cache file created successfully.\n"
 msgstr "Fișierul cache a fost creat cu succes.\n"
 
-#: gtk/updateiconcache.c:1611
+#: ../gtk/updateiconcache.c:1641
 msgid "Overwrite an existing cache, even if up to date"
 msgstr "Suprascrie un cache existent, chiar dacă este la zi"
 
-#: gtk/updateiconcache.c:1612
+#: ../gtk/updateiconcache.c:1642
 msgid "Don't check for the existence of index.theme"
 msgstr "Nu verifica existența fișierului index.theme"
 
-#: gtk/updateiconcache.c:1613
+#: ../gtk/updateiconcache.c:1643
 msgid "Don't include image data in the cache"
 msgstr "Nu include data de tip imagine în cache"
 
-#: gtk/updateiconcache.c:1614
+#: ../gtk/updateiconcache.c:1644
 msgid "Output a C header file"
 msgstr "Scoate la ieșire un fișier C header"
 
-#: gtk/updateiconcache.c:1615
+#: ../gtk/updateiconcache.c:1645
 msgid "Turn off verbose output"
 msgstr "Dezactivează ieșirea detaliată"
 
-#: gtk/updateiconcache.c:1616
+#: ../gtk/updateiconcache.c:1646
 msgid "Validate existing icon cache"
 msgstr "Validare cache existent de iconițe"
 
-#: gtk/updateiconcache.c:1683
+#: ../gtk/updateiconcache.c:1713
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Nu s-a găsit fișierul: %s\n"
 
-#: gtk/updateiconcache.c:1689
+#: ../gtk/updateiconcache.c:1719
 #, c-format
 msgid "Not a valid icon cache: %s\n"
 msgstr "Nu e un cache de iconițe valid: %s\n"
 
-#: gtk/updateiconcache.c:1702
+#: ../gtk/updateiconcache.c:1732
 #, c-format
 msgid "No theme index file.\n"
 msgstr "Nu există un fișier index al temei.\n"
 
-#: gtk/updateiconcache.c:1706
+#: ../gtk/updateiconcache.c:1736
 #, 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 ""
-"Nu s-a găsit un fișier index în „%s”.\n"
+"Niciun fișier index de temă în „%s”.\n"
 "Dacă chiar doriți să creați aici un cache pentru iconițe, utilizați --ignore-"
 "theme-index.\n"
 
 #. ID
-#: modules/input/imam-et.c:454
+#: ../modules/input/imam-et.c:454
 msgid "Amharic (EZ+)"
 msgstr "Amharic (EZ+)"
 
 #. ID
-#: modules/input/imcedilla.c:92
+#: ../modules/input/imcedilla.c:92
 msgid "Cedilla"
 msgstr "Sedilă"
 
 #. ID
-#: modules/input/imcyrillic-translit.c:217
+#: ../modules/input/imcyrillic-translit.c:217
 msgid "Cyrillic (Transliterated)"
 msgstr "Chirilică (Transliterată)"
 
 #. ID
-#: modules/input/iminuktitut.c:127
+#: ../modules/input/iminuktitut.c:127
 msgid "Inuktitut (Transliterated)"
 msgstr "Inukitut (Transliterată)"
 
 #. ID
-#: modules/input/imipa.c:145
+#: ../modules/input/imipa.c:145
 msgid "IPA"
 msgstr "IPA"
 
 #. ID
-#: modules/input/immultipress.c:31
+#: ../modules/input/immultipress.c:31
 msgid "Multipress"
 msgstr "Multipress"
 
 #. ID
-#: modules/input/imthai.c:35
+#: ../modules/input/imthai.c:35
 msgid "Thai-Lao"
 msgstr "Thai-Lao"
 
 #. ID
-#: modules/input/imti-er.c:453
+#: ../modules/input/imti-er.c:453
 msgid "Tigrigna-Eritrean (EZ+)"
 msgstr "Tigrigna - Eritreeană (EZ+)"
 
 #. ID
-#: modules/input/imti-et.c:453
+#: ../modules/input/imti-et.c:453
 msgid "Tigrigna-Ethiopian (EZ+)"
 msgstr "Tigrigna - Etiopiană (EZ+)"
 
 #. ID
-#: modules/input/imviqr.c:244
+#: ../modules/input/imviqr.c:244
 msgid "Vietnamese (VIQR)"
 msgstr "Vietnameză (VIQR)"
 
 #. ID
-#: modules/input/imxim.c:28
+#: ../modules/input/imxim.c:28
 msgid "X Input Method"
 msgstr "Metodă de input X"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:811
-#: modules/printbackends/cups/gtkprintbackendcups.c:1020
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:810
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1020
 msgid "Username:"
 msgstr "Utilizator:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:812
-#: modules/printbackends/cups/gtkprintbackendcups.c:1029
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:811
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1029
 msgid "Password:"
 msgstr "Parolă:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:850
-#, c-format
-msgid "Authentication is required to get a file from %s"
-msgstr "Pentru a prelua un fișier de la %s este nevoie de autentificare"
-
-#: modules/printbackends/cups/gtkprintbackendcups.c:854
-#: modules/printbackends/cups/gtkprintbackendcups.c:1042
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:850
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1042
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
 msgstr ""
 "Pentru a tipări documentul „%s” la imprimanta %s este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:856
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:852
 #, c-format
 msgid "Authentication is required to print a document on %s"
 msgstr ""
 "Pentru a tipări un document la imprimanta %s este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:860
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:856
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
 msgstr "Pentru a afla atributele sarcinii „%s” este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:862
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:858
 msgid "Authentication is required to get attributes of a job"
 msgstr "Pentru a afla atributele unei sarcini este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:866
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:862
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
 msgstr "Pentru a afla atributele imprimantei „%s” este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:868
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:864
 msgid "Authentication is required to get attributes of a printer"
 msgstr "Pentru a afla atributele unei imprimante este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:871
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:867
 #, c-format
 msgid "Authentication is required to get default printer of %s"
 msgstr ""
 "Pentru a afla imprimanta implicită de pe %s este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:874
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:870
 #, c-format
 msgid "Authentication is required to get printers from %s"
 msgstr "Pentru a afla imprimantele de pe %s este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:877
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:875
+#, c-format
+msgid "Authentication is required to get a file from %s"
+msgstr "Pentru a prelua un fișier de la %s este nevoie de autentificare"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:877
 #, c-format
 msgid "Authentication is required on %s"
 msgstr "Este nevoie de autentificare pe %s"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1014
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1014
 msgid "Domain:"
 msgstr "Domeniu:"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1044
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1044
 #, c-format
 msgid "Authentication is required to print document '%s'"
 msgstr "Pentru a tipări documentul „%s” este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1049
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1049
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
 msgstr ""
 "Pentru a tipări acest document la imprimanta %s este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1051
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1051
 msgid "Authentication is required to print this document"
 msgstr "Pentru a tipări acest document este nevoie de autentificare"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1672
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1672
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "Imprimanta „%s” are toner pe terminate."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1673
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1673
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "Imprimanta „%s” nu mai are toner."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1675
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1675
 #, c-format
 msgid "Printer '%s' is low on developer."
 msgstr "Imprimanta „%s” are developator pe terminate."
 
 #. Translators: "Developer" like on photo development context
-#: modules/printbackends/cups/gtkprintbackendcups.c:1677
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1677
 #, c-format
 msgid "Printer '%s' is out of developer."
 msgstr "Imprimanta „%s” nu mai are developator."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1679
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1679
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
 msgstr ""
 "Imprimanta „%s” are pe terminate cel puțin una dintre rezervele de culori."
 
 #. Translators: "marker" is one color bin of the printer
-#: modules/printbackends/cups/gtkprintbackendcups.c:1681
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1681
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
 msgstr ""
 "Imprimanta „%s” nu mai are culoare în cel puțin una dintre rezervele de "
 "culori."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1682
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1682
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "Imprimanta „%s” are capacul ridicat."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1683
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1683
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "Imprimanta „%s” are ușița deschisă."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1684
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1684
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "Imprimanta „%s” are hârtie pe terminate."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1685
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1685
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "Imprimanta „%s” nu mai are hârtie."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1686
-#, fuzzy, c-format
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1686
+#, c-format
 msgid "Printer '%s' is currently offline."
 msgstr "Imprimanta „%s” este momentan deconectată."
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:1687
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1687
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "Imprimanta „%s” are o problemă."
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:1995
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1995
 msgid "Paused ; Rejecting Jobs"
 msgstr "Oprit momentan. Se refuză sarcini de tipărire"
 
 #. Translators: this is a printer status.
-#: modules/printbackends/cups/gtkprintbackendcups.c:2001
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2001
 msgid "Rejecting Jobs"
 msgstr "Se refuză sarcini de tipărire"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2777
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2777
 msgid "Two Sided"
 msgstr "Pe ambele părți"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2778
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2778
 msgid "Paper Type"
 msgstr "Tip hârtie"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2779
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2779
 msgid "Paper Source"
 msgstr "Sursă hârtie"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2780
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2780
 msgid "Output Tray"
 msgstr "Tavă de ieșire"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2781
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2781
 msgid "Resolution"
 msgstr "Rezoluție"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2782
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2782
 msgid "GhostScript pre-filtering"
 msgstr "Pre-filtrare GhostScript"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:2791
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2791
 msgid "One Sided"
 msgstr "Pe o parte"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2793
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2793
 msgid "Long Edge (Standard)"
 msgstr "Margine lungă (standard)"
 
 #. Translators: this is an option of "Two Sided"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2795
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2795
 msgid "Short Edge (Flip)"
 msgstr "Margine scurtă (întoarsă)"
 
 #. 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:2797
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2799
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2807
 msgid "Auto Select"
 msgstr "Auto-selectare"
 
 #. 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:2801
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2803
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2805
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2809
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3305
 msgid "Printer Default"
-msgstr "După opțiunile imprimantei"
+msgstr "Opțiunile implicite ale imprimantei"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2811
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2811
 msgid "Embed GhostScript fonts only"
 msgstr "Doar fonturile GhostScript înglobate"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2813
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2813
 msgid "Convert to PS level 1"
 msgstr "Convertește la PS nivelul 1"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2815
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2815
 msgid "Convert to PS level 2"
 msgstr "Convertește to PS nivelul 2"
 
 #. Translators: this is an option of "GhostScript"
-#: modules/printbackends/cups/gtkprintbackendcups.c:2817
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2817
 msgid "No pre-filtering"
 msgstr "Fără pre-filtrare"
 
 #. 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:2826
 msgid "Miscellaneous"
 msgstr "Altele"
 
 #. 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:3529
 msgid "Urgent"
 msgstr "Urgent"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3529
 msgid "High"
 msgstr "Înalt"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3529
 msgid "Medium"
 msgstr "Mediu"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3503
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3529
 msgid "Low"
 msgstr "Scăzut"
 
@@ -4035,66 +4042,66 @@ msgstr "Scăzut"
 #. 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:3553
 msgid "Pages per Sheet"
 msgstr "Pagini per foaie"
 
 #. 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:3590
 msgid "Job Priority"
 msgstr "Prioritate sarcină"
 
 #. 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:3601
 msgid "Billing Info"
 msgstr "Informații de facturare"
 
 #. 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:3616
 msgid "None"
 msgstr "Nici unul"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Classified"
 msgstr "Clasificat"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Confidential"
 msgstr "Confidențial"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Secret"
 msgstr "Secret"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Standard"
 msgstr "Standard"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Top Secret"
 msgstr "Top Secret"
 
-#: modules/printbackends/cups/gtkprintbackendcups.c:3590
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3616
 msgid "Unclassified"
 msgstr "Neclasificat"
 
 #. 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:3651
 msgid "Before"
 msgstr "Înainte"
 
 #. 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:3666
 msgid "After"
 msgstr "După"
 
@@ -4102,14 +4109,14 @@ msgstr "După"
 #. * 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:3686
 msgid "Print at"
 msgstr "Tipărește la"
 
 #. 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:3697
 msgid "Print at time"
 msgstr "Tipărește la un anumit moment"
 
@@ -4117,104 +4124,104 @@ msgstr "Tipărește la un anumit moment"
 #. * 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:3732
 #, c-format
 msgid "Custom %sx%s"
 msgstr "Personalizat %sx%s"
 
 #. 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 "tipar.%s"
+msgstr "ieșire.%s"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:493
+#: ../modules/printbackends/file/gtkprintbackendfile.c:501
 msgid "Print to File"
 msgstr "Tipărește în fișier"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:578
 msgid "PDF"
 msgstr "PDF"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:578
 msgid "Postscript"
 msgstr "PostScript"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:570
+#: ../modules/printbackends/file/gtkprintbackendfile.c:578
 msgid "SVG"
 msgstr "SVG"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:582
-#: modules/printbackends/test/gtkprintbackendtest.c:503
+#: ../modules/printbackends/file/gtkprintbackendfile.c:590
+#: ../modules/printbackends/test/gtkprintbackendtest.c:503
 msgid "Pages per _sheet:"
 msgstr "Pagini per _filă:"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:641
+#: ../modules/printbackends/file/gtkprintbackendfile.c:649
 msgid "File"
 msgstr "Fișier"
 
-#: modules/printbackends/file/gtkprintbackendfile.c:651
+#: ../modules/printbackends/file/gtkprintbackendfile.c:659
 msgid "_Output format"
 msgstr "Formate de _ieșire"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:395
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:395
 msgid "Print to LPR"
 msgstr "Tipărește cu LPR"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:421
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:421
 msgid "Pages Per Sheet"
 msgstr "Pagini per filă"
 
-#: modules/printbackends/lpr/gtkprintbackendlpr.c:428
+#: ../modules/printbackends/lpr/gtkprintbackendlpr.c:428
 msgid "Command Line"
 msgstr "Linie de comandă"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:811
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:811
 msgid "printer offline"
 msgstr "imprimantă deconectată"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:829
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:829
 msgid "ready to print"
 msgstr "pregătită pentru tipărire"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:832
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:832
 msgid "processing job"
 msgstr "se procesează sarcina"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:836
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:836
 msgid "paused"
 msgstr "întreruptă"
 
 #. SUN_BRANDING
-#: modules/printbackends/papi/gtkprintbackendpapi.c:839
+#: ../modules/printbackends/papi/gtkprintbackendpapi.c:839
 msgid "unknown"
 msgstr "necunoscut"
 
 #. 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-tipar.%s"
+msgstr "test-ieșire.%s"
 
-#: modules/printbackends/test/gtkprintbackendtest.c:467
+#: ../modules/printbackends/test/gtkprintbackendtest.c:467
 msgid "Print to Test Printer"
 msgstr "Tipărește cu imprimanta de test"
 
-#: tests/testfilechooser.c:207
+#: ../tests/testfilechooser.c:207
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "Nu s-au putut obține detalii despre fișierul „%s”: %s"
 
-#: tests/testfilechooser.c:222
+#: ../tests/testfilechooser.c:222
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nu s-a putut deschide fișierul „%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"
@@ -4222,6 +4229,9 @@ msgstr ""
 "Nu s-a putut încărca imaginea „%s” dintr-un motiv necunoscut, probabil un "
 "fișier imagine corupt"
 
+#~ msgid "Error creating folder '%s': %s"
+#~ msgstr "Eroare la crearea dosarului „%s”: %s"
+
 #~ msgid "Gdk debugging flags to set"
 #~ msgstr "Fanioane de depanare Gdk de selectat"
 
diff --git a/po/sl.po b/po/sl.po
index 0f6498fb4b..061aed40ee 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: gtk+ master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2b&component=general\n"
 "POT-Creation-Date: 2010-10-12 17:16+0000\n"
-"PO-Revision-Date: 2010-10-12 20:07+0100\n"
-"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+"PO-Revision-Date: 2010-11-29 09:32+0100\n"
+"Last-Translator: Andrej Žnidaršič <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -103,12 +103,12 @@ msgstr "Premik nazaj"
 #: ../gdk/keyname-table.h:3941
 msgctxt "keyboard label"
 msgid "Tab"
-msgstr "Tab"
+msgstr "Tabulator"
 
 #: ../gdk/keyname-table.h:3942
 msgctxt "keyboard label"
 msgid "Return"
-msgstr "Vnesi"
+msgstr "Vnosna tipka"
 
 #: ../gdk/keyname-table.h:3943
 msgctxt "keyboard label"
@@ -398,7 +398,7 @@ msgstr "Grafična podobo oblikovali"
 #: ../gtk/gtkaccellabel.c:160
 msgctxt "keyboard label"
 msgid "Shift"
-msgstr "Premakni"
+msgstr "Shift"
 
 #. This is the text that should appear next to menu accelerators
 #. * that use the control key. If the text on this key isn't typically
diff --git a/po/th.po b/po/th.po
index be303a9c1d..6dc33ad1c7 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-01 15:41-0400\n"
-"PO-Revision-Date: 2010-04-06 15:08+0700\n"
+"PO-Revision-Date: 2010-11-29 18:55+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "Language: th\n"
@@ -70,9 +70,8 @@ msgstr "SCREEN"
 
 #. Description of --gdk-debug=FLAGS in --help output
 #: gdk/gdk.c:164
-#, fuzzy
 msgid "GDK debugging flags to set"
-msgstr "แฟล็กการดีบักของ GTK+ ที่จะเปิดใช้"
+msgstr "แฟล็กการดีบั๊กของ GDK ที่จะเปิดใช้"
 
 #. Placeholder in --gdk-debug=FLAGS in --help output
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
@@ -84,9 +83,8 @@ msgstr "FLAGS"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
 #: gdk/gdk.c:167
-#, fuzzy
 msgid "GDK debugging flags to unset"
-msgstr "แฟล็กการดีบักของ GTK+ ที่จะปิด"
+msgstr "แฟล็กการดีบั๊กของ GDK ที่จะปิด"
 
 #: gdk/keyname-table.h:3940
 msgctxt "keyboard label"
@@ -330,7 +328,7 @@ msgstr "เรียกใช้ X แบบประสานเวลา"
 #: gtk/gtkaboutdialog.c:101
 #, c-format
 msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s"
-msgstr ""
+msgstr "โปรแกรมนี้ไม่มีการรับประกันใดๆ ดูรายละเอียดเพิ่มเติมได้ที่ %s"
 
 #: gtk/gtkaboutdialog.c:339 gtk/gtkaboutdialog.c:2235
 msgid "License"
@@ -455,9 +453,9 @@ msgid "Invalid type function on line %d: '%s'"
 msgstr "ฟังก์ชันถามชนิดใช้ไม่ได้ที่บรรทัด %d: '%s'"
 
 #: gtk/gtkbuilderparser.c:407
-#, fuzzy, c-format
+#, c-format
 msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
-msgstr "id ของอ็อบเจกต์ '%s' ซ้ำที่บรรทัด %d (ใช้แล้วที่บรรทัด %d)"
+msgstr "ID ของอ็อบเจกต์ '%s' ซ้ำที่บรรทัด %d (ใช้แล้วที่บรรทัด %d)"
 
 #: gtk/gtkbuilderparser.c:859
 #, c-format
@@ -612,9 +610,8 @@ msgid "_Saturation:"
 msgstr "ความส_ด:"
 
 #: gtk/gtkcolorsel.c:421
-#, fuzzy
 msgid "Intensity of the color."
-msgstr "ความโปร่งแสงของสี"
+msgstr "ความเข้มของสี"
 
 #: gtk/gtkcolorsel.c:422
 msgid "_Value:"
@@ -789,12 +786,11 @@ msgstr "แ_ทรกอักขระควบคุมของยูนิ�
 
 #: gtk/gtkentry.c:10015
 msgid "Caps Lock and Num Lock are on"
-msgstr ""
+msgstr "ปุ่ม Caps Lock และ Num Lock ติดอยู่"
 
 #: gtk/gtkentry.c:10017
-#, fuzzy
 msgid "Num Lock is on"
-msgstr "ปุ่ม Caps Lock ติดอยู่"
+msgstr "ปุ่ม Num Lock ติดอยู่"
 
 #: gtk/gtkentry.c:10019
 msgid "Caps Lock is on"
@@ -1267,12 +1263,12 @@ msgstr "ให้ความสำคัญกับคำเตือนปร
 #. Description of --gtk-debug=FLAGS in --help output
 #: gtk/gtkmain.c:532
 msgid "GTK+ debugging flags to set"
-msgstr "แฟล็กการดีบักของ GTK+ ที่จะเปิดใช้"
+msgstr "แฟล็กการดีบั๊กของ GTK+ ที่จะเปิดใช้"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
 #: gtk/gtkmain.c:535
 msgid "GTK+ debugging flags to unset"
-msgstr "แฟล็กการดีบักของ GTK+ ที่จะปิด"
+msgstr "แฟล็กการดีบั๊กของ GTK+ ที่จะปิด"
 
 #. Translate to default:RTL if you want your widgets
 #. * to be RTL, otherwise translate to default:LTR.
@@ -1333,9 +1329,9 @@ msgid "Remember _forever"
 msgstr "จำรหัสผ่านไว้_ตลอดไป"
 
 #: gtk/gtkmountoperation.c:883
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown Application (PID %d)"
-msgstr "โปรแกรมไม่ทราบชื่อ (pid %d)"
+msgstr "โปรแกรมไม่ทราบชื่อ (PID %d)"
 
 #: gtk/gtkmountoperation.c:1066
 #, c-format
@@ -1347,9 +1343,9 @@ msgid "_End Process"
 msgstr "_จบโพรเซส"
 
 #: gtk/gtkmountoperation-stub.c:64
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot kill process with PID %d. Operation is not implemented."
-msgstr "ไม่สามารถฆ่าโพรเซสที่มี pid %d ได้ เนื่องจากยังไม่ได้ทำปฏิบัติการนี้"
+msgstr "ไม่สามารถฆ่าโพรเซสที่มี PID %d ได้ เนื่องจากยังไม่ได้พัฒนาปฏิบัติการนี้"
 
 #. translators: this string is a name for the 'less' command
 #: gtk/gtkmountoperation-x11.c:862
@@ -1373,9 +1369,9 @@ msgid "Z Shell"
 msgstr "Z Shell"
 
 #: gtk/gtkmountoperation-x11.c:963
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot end process with PID %d: %s"
-msgstr "ไม่สามารถจบโพรเซสที่มี pid %d ได้: %s"
+msgstr "ไม่สามารถจบโพรเซสที่มี PID %d ได้: %s"
 
 #: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170
 #, c-format
@@ -1450,9 +1446,8 @@ msgid "Not available"
 msgstr "ไม่มี"
 
 #: gtk/gtkprinteroptionwidget.c:794
-#, fuzzy
 msgid "Select a folder"
-msgstr "เลือกแฟ้ม"
+msgstr "เลือกโฟลเดอร์"
 
 #: gtk/gtkprinteroptionwidget.c:813
 msgid "_Save in folder:"
@@ -2091,10 +2086,9 @@ msgid "_Cancel"
 msgstr "_ยกเลิก"
 
 #: gtk/gtkstock.c:326
-#, fuzzy
 msgctxt "Stock label"
 msgid "_CD-ROM"
-msgstr "_ซีดีรอม"
+msgstr "ซีดี_รอม"
 
 #: gtk/gtkstock.c:327
 msgctxt "Stock label"
@@ -2152,7 +2146,6 @@ msgid "_Edit"
 msgstr "แ_ก้ไข"
 
 #: gtk/gtkstock.c:338
-#, fuzzy
 msgctxt "Stock label"
 msgid "_File"
 msgstr "แ_ฟ้ม"
@@ -2231,7 +2224,6 @@ msgid "_Up"
 msgstr "_ขึ้น"
 
 #: gtk/gtkstock.c:360
-#, fuzzy
 msgctxt "Stock label"
 msgid "_Hard Disk"
 msgstr "ฮาร์_ดดิสก์"
@@ -2569,9 +2561,9 @@ msgid "The attribute \"%s\" was found twice on the <%s> element"
 msgstr "พบแอตทริบิวต์ \"%s\" ซ้ำในอิลิเมนต์ <%s>"
 
 #: gtk/gtktextbufferserialize.c:845
-#, fuzzy, c-format
+#, c-format
 msgid "<%s> element has invalid ID \"%s\""
-msgstr "อิลิเมนต์ <%s> มี id \"%s\" ซึ่งไม่ถูกต้อง"
+msgstr "อิลิเมนต์ <%s> มี ID \"%s\" ซึ่งไม่ถูกต้อง"
 
 #: gtk/gtktextbufferserialize.c:855
 #, c-format
@@ -3886,7 +3878,7 @@ msgid "Printer '%s' is out of paper."
 msgstr "เครื่องพิมพ์ '%s' กระดาษหมด"
 
 #: modules/printbackends/cups/gtkprintbackendcups.c:1686
-#, fuzzy, c-format
+#, c-format
 msgid "Printer '%s' is currently offline."
 msgstr "เครื่องพิมพ์ '%s' ออฟไลน์อยู่"
 
@@ -4195,10 +4187,10 @@ msgid ""
 msgstr "เปิดแฟ้มรูปภาพ '%s' ไม่สำเร็จ: ไม่แน่ใจว่าเพราะอะไร แต่อาจเป็นเพราะแฟ้มเสียหาย"
 
 #~ msgid "Gdk debugging flags to set"
-#~ msgstr "แฟล็กการดีบักของ GDK ที่จะเปิดใช้"
+#~ msgstr "แฟล็กการดีบั๊กของ GDK ที่จะเปิดใช้"
 
 #~ msgid "Gdk debugging flags to unset"
-#~ msgstr "แฟล็กการดีบักของ GDK ที่จะปิด"
+#~ msgstr "แฟล็กการดีบั๊กของ GDK ที่จะปิด"
 
 #~ msgid "Image file '%s' contains no data"
 #~ msgstr "แฟ้มรูปภาพ '%s' ไม่มีข้อมูล"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 78151044d7..283285311b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,6 +31,8 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
 	print-editor			\
 	testaccel			\
 	testadjustsize			\
+	testappchooser			\
+	testappchooserbutton		\
 	testassistant			\
 	testbbox			\
 	testbuttons			\
@@ -96,7 +98,8 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
 	testexpander			\
 	testvolumebutton		\
 	testscrolledwindow		\
-	testcellarea
+	testcellarea			\
+	testswitch
 
 if USE_X11
 noinst_PROGRAMS += testerrors
@@ -154,6 +157,8 @@ testnotebookdnd_DEPENDENCIES = $(TEST_DEPS)
 testnouiprint_DEPENDENCIES = $(TEST_DEPS)
 testoffscreen_DEPENDENCIES = $(TEST_DEPS)
 testoffscreenwindow_DEPENDENCIES = $(TEST_DEPS)
+testappchooser_DEPENDENCIES = $(TEST_DEPS)
+testappchooserbutton_DEPENDENCIES = $(TEST_DEPS)
 testorientable_DEPENDENCIES = $(TEST_DEPS)
 testprint_DEPENDENCIES = $(TEST_DEPS)
 testrecentchooser_DEPENDENCIES = $(TEST_DEPS)
@@ -186,6 +191,7 @@ testcellarea_DEPENDENCIES = $(TEST_DEPS)
 testwindows_DEPENDENCIES = $(TEST_DEPS)
 testexpand_DEPENDENCIES = $(TEST_DEPS)
 testexpander_DEPENDENCIES = $(TEST_DEPS)
+testswitch_DEPENDENCIES = $(TEST_DEPS)
 
 flicker_LDADD = $(LDADDS)
 simple_LDADD = $(LDADDS)
@@ -227,6 +233,8 @@ testnotebookdnd_LDADD = $(LDADDS)
 testnouiprint_LDADD = $(LDADDS)
 testoffscreen_LDADD = $(LDADDS)
 testoffscreenwindow_LDADD = $(LDADDS)
+testappchooser_LDADD = $(LDADDS)
+testappchooserbutton_LDADD = $(LDADDS)
 testorientable_LDADD = $(LDADDS)
 testprint_LDADD = $(LDADDS)
 testrecentchooser_LDADD = $(LDADDS)
@@ -261,6 +269,7 @@ testcellarea_LDADD = $(LDADDS)
 testwindows_LDADD = $(LDADDS)
 testexpand_LDADD = $(LDADDS)
 testexpander_LDADD = $(LDADDS)
+testswitch_LDADD = $(LDADDS)
 
 testentrycompletion_SOURCES = 	\
 	prop-editor.c		\
@@ -383,6 +392,12 @@ testoffscreen_SOURCES = 	\
 testoffscreenwindow_SOURCES =	\
 	testoffscreenwindow.c
 
+testappchooser_SOURCES = \
+	testappchooser.c
+
+testappchooserbutton_SOURCES = \
+	testappchooserbutton.c
+
 testwindows_SOURCES = 	\
 	testwindows.c
 
@@ -390,6 +405,8 @@ testexpand_SOURCES = testexpand.c
 
 testexpander_SOURCES = testexpander.c
 
+testswitch_SOURCES = testswitch.c
+
 EXTRA_DIST += 			\
 	prop-editor.h		\
 	testgtk.1 		\
diff --git a/tests/testappchooser.c b/tests/testappchooser.c
new file mode 100644
index 0000000000..a50f1b4e4c
--- /dev/null
+++ b/tests/testappchooser.c
@@ -0,0 +1,218 @@
+/* testappchooser.c
+ * Copyright (C) 2010 Red Hat, Inc.
+ * Authors: Cosimo Cecchi
+ *
+ * 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 <stdlib.h>
+#include <gtk/gtk.h>
+
+static GtkWidget *toplevel;
+static GFile *file;
+static GtkWidget *grid, *file_l, *open;
+static GtkWidget *radio_file, *radio_content, *dialog;
+static GtkWidget *app_chooser_widget;
+static GtkWidget *recommended, *fallback, *other, *all;
+
+static void
+dialog_response (GtkDialog *d,
+                 gint       response_id,
+                 gpointer   user_data)
+{
+  GAppInfo *app_info;
+  const gchar *name;
+
+  g_print ("Response: %d\n", response_id);
+
+  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);
+    }
+
+  gtk_widget_destroy (GTK_WIDGET (d));
+  dialog = NULL;
+}
+
+static void
+bind_props (void)
+{
+  g_object_bind_property (recommended, "active",
+                          app_chooser_widget, "show-recommended",
+                          G_BINDING_SYNC_CREATE);
+  g_object_bind_property (fallback, "active",
+                          app_chooser_widget, "show-fallback",
+                          G_BINDING_SYNC_CREATE);
+  g_object_bind_property (other, "active",
+                          app_chooser_widget, "show-other",
+                          G_BINDING_SYNC_CREATE);
+  g_object_bind_property (all, "active",
+                          app_chooser_widget, "show-all",
+                          G_BINDING_SYNC_CREATE);
+}
+
+static void
+prepare_dialog (void)
+{
+  gboolean use_file = FALSE;
+  gchar *content_type = NULL;
+
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radio_file)))
+    use_file = TRUE;
+  else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radio_content)))
+    use_file = FALSE;
+
+  if (use_file)
+    {
+      dialog = gtk_app_chooser_dialog_new (GTK_WINDOW (toplevel), 0, file);
+    }
+  else
+    {
+      GFileInfo *info;
+
+      info = g_file_query_info (file,
+                                G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+                                0, NULL, NULL);
+      content_type = g_strdup (g_file_info_get_content_type (info));
+
+      g_object_unref (info);
+
+      dialog = gtk_app_chooser_dialog_new_for_content_type (GTK_WINDOW (toplevel),
+                                                            0, content_type);
+    }
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (dialog_response), NULL);
+
+  g_free (content_type);
+
+  app_chooser_widget = gtk_app_chooser_dialog_get_widget (GTK_APP_CHOOSER_DIALOG (dialog));
+  bind_props ();
+}
+
+static void
+display_dialog (void)
+{
+  if (dialog == NULL)
+    prepare_dialog ();
+
+  gtk_widget_show (dialog);
+}
+
+static void
+button_clicked (GtkButton *b,
+                gpointer   user_data)
+{
+  GtkWidget *w;
+  gchar *path;
+
+  w = gtk_file_chooser_dialog_new ("Select file",
+                                   GTK_WINDOW (toplevel),
+                                   GTK_FILE_CHOOSER_ACTION_OPEN,
+                                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                   GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                   NULL);
+
+  gtk_dialog_run (GTK_DIALOG (w));
+  file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (w));
+  path = g_file_get_path (file);
+  gtk_button_set_label (GTK_BUTTON (file_l), path);
+
+  gtk_widget_destroy (w);
+
+  gtk_widget_set_sensitive (open, TRUE);
+
+  g_free (path);
+}
+
+int
+main (int argc, char **argv)
+{
+  GtkWidget *w1;
+  gchar *path;
+
+  g_type_init ();
+  gtk_init (&argc, &argv);
+
+  toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_container_set_border_width (GTK_CONTAINER (toplevel), 12);
+  grid = gtk_grid_new ();
+
+  w1 = gtk_label_new ("File:");
+  gtk_widget_set_halign (w1, GTK_ALIGN_START);
+  gtk_grid_attach (GTK_GRID (grid),
+                   w1, 0, 0, 1, 1);
+
+  file_l = gtk_button_new ();
+  path = g_build_filename (g_get_current_dir (), "apple-red.png", NULL);
+  file = g_file_new_for_path (path);
+  gtk_button_set_label (GTK_BUTTON (file_l), path);
+  g_free (path);
+
+  gtk_widget_set_halign (file_l, GTK_ALIGN_START);
+  gtk_grid_attach_next_to (GTK_GRID (grid), file_l,
+                           w1, GTK_POS_RIGHT, 3, 1);
+  g_signal_connect (file_l, "clicked",
+                    G_CALLBACK (button_clicked), NULL);
+
+  radio_file = gtk_radio_button_new_with_label (NULL, "Use GFile");
+  radio_content = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio_file),
+                                                               "Use content type");
+
+  gtk_grid_attach (GTK_GRID (grid), radio_file,
+                   0, 1, 1, 1);
+  gtk_grid_attach_next_to (GTK_GRID (grid), radio_content,
+                           radio_file, GTK_POS_BOTTOM, 1, 1);
+
+  open = gtk_button_new_with_label ("Trigger App Chooser dialog");
+  gtk_grid_attach_next_to (GTK_GRID (grid), open,
+                           radio_content, GTK_POS_BOTTOM, 1, 1);
+
+  recommended = gtk_check_button_new_with_label ("Show recommended");
+  gtk_grid_attach_next_to (GTK_GRID (grid), recommended,
+                           open, GTK_POS_BOTTOM, 1, 1);
+  g_object_set (recommended, "active", TRUE, NULL);
+
+  fallback = gtk_check_button_new_with_label ("Show fallback");
+  gtk_grid_attach_next_to (GTK_GRID (grid), fallback,
+                           recommended, GTK_POS_RIGHT, 1, 1);
+
+  other = gtk_check_button_new_with_label ("Show other");
+  gtk_grid_attach_next_to (GTK_GRID (grid), other,
+                           fallback, GTK_POS_RIGHT, 1, 1);
+
+  all = gtk_check_button_new_with_label ("Show all");
+  gtk_grid_attach_next_to (GTK_GRID (grid), all,
+                           other, GTK_POS_RIGHT, 1, 1);
+
+  prepare_dialog ();
+  g_signal_connect (open, "clicked",
+                    G_CALLBACK (display_dialog), NULL);
+
+  gtk_container_add (GTK_CONTAINER (toplevel), grid);
+
+  gtk_widget_show_all (toplevel);
+  g_signal_connect (toplevel, "delete-event",
+                    G_CALLBACK (gtk_main_quit), NULL);
+
+  gtk_main ();
+
+  return EXIT_SUCCESS;
+}
diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
new file mode 100644
index 0000000000..0416af72c5
--- /dev/null
+++ b/tests/testappchooserbutton.c
@@ -0,0 +1,136 @@
+/* testappchooserbutton.c
+ * Copyright (C) 2010 Red Hat, Inc.
+ * Authors: Cosimo Cecchi
+ *
+ * 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 <stdlib.h>
+
+#include <gtk/gtk.h>
+
+#define CUSTOM_ITEM "custom-item"
+
+static GtkWidget *toplevel, *combobox, *box;
+static GtkWidget *sel_image, *sel_name;
+
+static void
+combo_changed_cb (GtkComboBox *cb,
+                  gpointer     user_data)
+{
+  GAppInfo *app_info;
+
+  app_info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (cb));
+
+  if (app_info == NULL)
+    return;
+
+  gtk_image_set_from_gicon (GTK_IMAGE (sel_image), g_app_info_get_icon (app_info),
+                            GTK_ICON_SIZE_DIALOG);
+  gtk_label_set_text (GTK_LABEL (sel_name), g_app_info_get_display_name (app_info));
+
+  g_object_unref (app_info);
+}
+
+static void
+special_item_activated_cb (GtkAppChooserButton *b,
+                           const gchar *item_name,
+                           gpointer user_data)
+{
+  gtk_image_set_from_gicon (GTK_IMAGE (sel_image), g_themed_icon_new ("face-smile"),
+                            GTK_ICON_SIZE_DIALOG);
+  gtk_label_set_text (GTK_LABEL (sel_name), "Special Item");
+}
+
+static void
+action_cb (GtkAppChooserButton *b,
+           const gchar *item_name,
+           gpointer user_data)
+{
+  g_print ("Activated custom item %s\n", item_name);
+}
+
+int
+main (int argc,
+      char **argv)
+{
+  GtkWidget *w;
+
+  g_type_init ();
+  gtk_init (&argc, &argv);
+
+  toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_container_set_border_width (GTK_CONTAINER (toplevel), 12);
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_container_add (GTK_CONTAINER (toplevel), box);
+
+  combobox = gtk_app_chooser_button_new ("image/jpeg");
+  gtk_box_pack_start (GTK_BOX (box), combobox, TRUE, TRUE, 0);
+
+  g_signal_connect (combobox, "changed",
+                    G_CALLBACK (combo_changed_cb), NULL);
+
+  w = gtk_label_new (NULL);
+  gtk_label_set_markup (GTK_LABEL (w), "<b>Selected app info</b>");
+  gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
+
+  w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
+
+  sel_image = gtk_image_new ();
+  gtk_box_pack_start (GTK_BOX (w), sel_image, TRUE, TRUE, 0);
+  sel_name = gtk_label_new (NULL);
+  gtk_box_pack_start (GTK_BOX (w), sel_name, TRUE, TRUE, 0);
+
+  gtk_app_chooser_button_append_separator (GTK_APP_CHOOSER_BUTTON (combobox));
+  gtk_app_chooser_button_append_custom_item (GTK_APP_CHOOSER_BUTTON (combobox),
+                                             CUSTOM_ITEM,
+                                             "Hey, I'm special!",
+                                             g_themed_icon_new ("face-smile"));
+
+  /* this one will trigger a warning, and will not be added */
+  gtk_app_chooser_button_append_custom_item (GTK_APP_CHOOSER_BUTTON (combobox),
+                                             CUSTOM_ITEM,
+                                             "Hey, I'm fake!",
+                                             g_themed_icon_new ("face-evil"));
+
+  gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (combobox),
+                                               TRUE);
+
+  /* connect to the detailed signal */
+  g_signal_connect (combobox, "custom-item-activated::" CUSTOM_ITEM,
+                    G_CALLBACK (special_item_activated_cb), NULL);
+
+  /* connect to the generic signal too */
+  g_signal_connect (combobox, "custom-item-activated",
+                    G_CALLBACK (action_cb), NULL);
+
+  /* test refresh on a combo */
+  gtk_app_chooser_refresh (GTK_APP_CHOOSER (combobox));
+
+  gtk_app_chooser_button_set_active_custom_item (GTK_APP_CHOOSER_BUTTON (combobox),
+                                                 CUSTOM_ITEM);
+
+  gtk_widget_show_all (toplevel);
+
+  g_signal_connect (toplevel, "delete-event",
+                    G_CALLBACK (gtk_main_quit), NULL);
+
+  gtk_main ();
+
+  return EXIT_SUCCESS;
+}
diff --git a/tests/testmerge.c b/tests/testmerge.c
index 1e43bb818b..3f1eba0eb2 100644
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -592,6 +592,7 @@ main (int argc, char **argv)
   GtkUIManager *merge;
   GtkWidget *window, *table, *frame, *menu_box, *vbox, *view;
   GtkWidget *button, *area, *statusbar;
+  GtkWidget *box;
   gint i;
   
   gtk_init (&argc, &argv);
@@ -652,6 +653,15 @@ main (int argc, char **argv)
 			    gtk_action_group_get_action (action_group, "BoldAction"));
   gtk_widget_show (button);
 
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_end (GTK_BOX (menu_box), box, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("Bold:"));
+  button = gtk_switch_new ();
+  gtk_container_add (GTK_CONTAINER (box), button);
+  gtk_activatable_set_related_action (GTK_ACTIVATABLE (button),
+                            gtk_action_group_get_action (action_group, "BoldAction"));
+  gtk_widget_show_all (box);
+
   merge = gtk_ui_manager_new ();
 
   g_signal_connect (merge, "connect-proxy", G_CALLBACK (connect_proxy), statusbar);
diff --git a/tests/testscale.c b/tests/testscale.c
index 8621c3f2c9..0756607f5a 100755
--- a/tests/testscale.c
+++ b/tests/testscale.c
@@ -20,6 +20,16 @@
 
 #include <gtk/gtk.h>
 
+static void
+show_trough_toggled (GtkToggleButton *button,
+                     GtkScale        *scale)
+{
+  gboolean value;
+
+  value = gtk_toggle_button_get_active (button);
+  gtk_range_set_range (GTK_RANGE (scale), 0., value ? 100.0 : 0.);
+}
+
 int main (int argc, char *argv[])
 {
   GtkWidget *window;
@@ -27,6 +37,7 @@ int main (int argc, char *argv[])
   GtkWidget *box2;
   GtkWidget *frame;
   GtkWidget *scale;
+  GtkWidget *toggle;
   gdouble marks[3] = { 0.0, 50.0, 100.0 };
   const gchar *labels[3] = { 
     "<small>Left</small>", 
@@ -96,6 +107,19 @@ int main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (frame), scale);
   gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
 
+  frame = gtk_frame_new ("Show/hide trough");
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+  scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
+                                    0, 100, 1);
+  gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE, 0);
+  toggle = gtk_toggle_button_new_with_label ("Show slider trough");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), TRUE);
+  g_signal_connect (G_OBJECT (toggle), "toggled",
+                    G_CALLBACK (show_trough_toggled), scale);
+  gtk_box_pack_start (GTK_BOX (box2), toggle, TRUE, TRUE, 0);
+  gtk_container_add (GTK_CONTAINER (frame), box2);
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
+
   box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
   gtk_box_pack_start (GTK_BOX (box), box2, TRUE, TRUE, 0);
 
diff --git a/tests/testswitch.c b/tests/testswitch.c
new file mode 100644
index 0000000000..60aae773bc
--- /dev/null
+++ b/tests/testswitch.c
@@ -0,0 +1,86 @@
+#include <stdlib.h>
+#include <gtk/gtk.h>
+
+static gboolean
+boolean_to_text (GBinding *binding,
+                 const GValue *source,
+                 GValue *target,
+                 gpointer dummy G_GNUC_UNUSED)
+{
+  if (g_value_get_boolean (source))
+    g_value_set_string (target, "Enabled");
+  else
+    g_value_set_string (target, "Disabled");
+
+  return TRUE;
+}
+
+static GtkWidget *
+make_switch (gboolean is_on,
+             gboolean is_sensitive)
+{
+  GtkWidget *hbox;
+  GtkWidget *sw, *label;
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+
+  sw = gtk_switch_new ();
+  gtk_switch_set_active (GTK_SWITCH (sw), is_on);
+  gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE, 0);
+  gtk_widget_set_sensitive (sw, is_sensitive);
+  gtk_widget_show (sw);
+
+  label = gtk_label_new (is_on ? "Enabled" : "Disabled");
+  gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+  gtk_widget_show (label);
+
+  g_object_bind_property_full (sw, "active",
+                               label, "label",
+                               G_BINDING_DEFAULT,
+                               boolean_to_text,
+                               NULL,
+                               NULL, NULL);
+
+  return hbox;
+}
+
+int
+main (int   argc,
+      char *argv[])
+{
+  GtkWidget *window;
+  GtkWidget *vbox, *hbox;
+
+  gtk_init (&argc, &argv);
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window), "GtkSwitch");
+  gtk_window_set_default_size (GTK_WINDOW (window), 400, -1);
+  gtk_container_set_border_width (GTK_CONTAINER (window), 6);
+  g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
+  gtk_widget_show (window);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_widget_show (vbox);
+
+  hbox = make_switch (FALSE, TRUE);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
+  gtk_widget_show (hbox);
+
+  hbox = make_switch (TRUE, TRUE);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
+  gtk_widget_show (hbox);
+
+  hbox = make_switch (FALSE, FALSE);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
+  gtk_widget_show (hbox);
+
+  hbox = make_switch (TRUE, FALSE);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
+  gtk_widget_show (hbox);
+
+  gtk_main ();
+
+  return EXIT_SUCCESS;
+}