Fix many sparse warnings.

author: Matthias Clasen <matthiasc@src.gnome.org> 2004-10-28 15:00:05 +0000
committer: Matthias Clasen <matthiasc@src.gnome.org> 2004-10-28 15:00:05 +0000
commit: d5f92150d4b8bffb78cd5110cbb2c28bfdf81136 (patch)
tree: 0d79978a95c24dcbdb2d9fd577dedf0da2795ece
parent: dbba41045ecb383810fb8962ee9b83998a89c37d (diff)
download: gdk-pixbuf-d5f92150d4b8bffb78cd5110cbb2c28bfdf81136.tar.gz
53 files changed, 1673 insertions, 1197 deletions
diff --git a/ChangeLog b/ChangeLog
index b98ac7df6..aa1cc4e8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
+	* *: Clean up many sparse warnings.  (#156698, Kjartan Maraas)
+	
 	* gtk/gtktreeview.c (gtk_tree_view_remove_widget): Disconnect
 	from the remove-widget signal after removing the signal.
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b98ac7df6..aa1cc4e8b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
+	* *: Clean up many sparse warnings.  (#156698, Kjartan Maraas)
+	
 	* gtk/gtktreeview.c (gtk_tree_view_remove_widget): Disconnect
 	from the remove-widget signal after removing the signal.
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b98ac7df6..aa1cc4e8b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,7 @@
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
+	* *: Clean up many sparse warnings.  (#156698, Kjartan Maraas)
+	
 	* gtk/gtktreeview.c (gtk_tree_view_remove_widget): Disconnect
 	from the remove-widget signal after removing the signal.
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b98ac7df6..aa1cc4e8b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,7 @@
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
+	* *: Clean up many sparse warnings.  (#156698, Kjartan Maraas)
+	
 	* gtk/gtktreeview.c (gtk_tree_view_remove_widget): Disconnect
 	from the remove-widget signal after removing the signal.
 
diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
index 351e4dae5..b5d0f8e3e 100644
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
@@ -821,7 +821,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 
       image_info->stage_buf = NULL;
 
-      image_info->own_gc = 0;
+      image_info->own_gc = NULL;
       
       image_info->red_shift = 0;
       image_info->red_prec = 0;
@@ -908,7 +908,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 					 image_info->x_visual_info->visual,
 					 1,
 					 XYBitmap,
-					 0, 0, IMAGE_WIDTH, IMAGE_HEIGHT,
+					 0, NULL, IMAGE_WIDTH, IMAGE_HEIGHT,
 					 8,
 					 0);
 	  static_image[i]->data = malloc(IMAGE_WIDTH * IMAGE_HEIGHT >> 3);
@@ -920,7 +920,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 					 image_info->x_visual_info->visual,
 					 (unsigned int)image_info->x_visual_info->depth,
 					 ZPixmap,
-					 0, 0,
+					 0, NULL,
 					 IMAGE_WIDTH,
 					 IMAGE_HEIGHT,
 					 32, 0);
@@ -3651,7 +3651,7 @@ xlib_rgb_get_visual (void)
   if (image_info)
     return image_info->x_visual_info->visual;
   else
-    return 0;
+    return NULL;
 }
 
 /**
@@ -3668,7 +3668,7 @@ xlib_rgb_get_visual_info (void)
   if (image_info)
     return image_info->x_visual_info;
   else
-    return 0;
+    return NULL;
 }
 
 /**
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 2142e7258..3382f72f9 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -386,7 +386,7 @@ parse_chars (gchar     *text,
 
 /* While not as cool as c-mode, this will do as a quick attempt at highlighting */
 static void
-fontify ()
+fontify (void)
 {
   GtkTextIter start_iter, next_iter, tmp_iter;
   gint state;
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 5ac2936bd..3db348715 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -4,6 +4,8 @@
 
 2004-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtk-sections.txt: Additions.
+
 	* gdk-pixbuf/tmpl/scaling.sgml: Document GdkPixbufRotation. 
 
 	* gtk/gtk-update-icon-cache.1: Regenerated.
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 7820519c1..74b0258cf 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -30,6 +30,8 @@ gtk_about_dialog_get_translator_credits
 gtk_about_dialog_set_translator_credits
 gtk_about_dialog_get_logo
 gtk_about_dialog_set_logo
+gtk_about_dialog_get_logo_icon_name
+gtk_about_dialog_set_logo_icon_name
 GtkAboutDialogActivateLinkFunc
 gtk_about_dialog_set_email_hook
 gtk_about_dialog_set_url_hook
@@ -5113,6 +5115,8 @@ gtk_drag_source_unset
 gtk_drag_source_set_target_list
 gtk_drag_source_get_target_list
 gtk_drag_source_add_text_targets
+gtk_drag_source_add_image_targets
+gtk_drag_source_add_uri_targets
 </SECTION>
 
 
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index b22fc86aa..4c607f91c 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -81,7 +81,7 @@ static GSList *file_formats = NULL;
 static void gdk_pixbuf_io_init ();
 
 static GSList *
-get_file_formats ()
+get_file_formats (void)
 {
 	if (file_formats == NULL)
 		gdk_pixbuf_io_init ();
@@ -236,7 +236,7 @@ gdk_pixbuf_get_module_file (void)
 }
 
 static void 
-gdk_pixbuf_io_init ()
+gdk_pixbuf_io_init (void)
 {
 	GIOChannel *channel;
 	gchar *line_buf;
@@ -334,7 +334,7 @@ gdk_pixbuf_io_init ()
 					module->info->mime_types =
 						g_realloc (module->info->mime_types, (n + 1) * sizeof (gchar*));
 					module->info->mime_types[n - 1] = g_strdup (tmp_buf->str);
-					module->info->mime_types[n] = 0;
+					module->info->mime_types[n] = NULL;
 					n++;
 				}
 			}
@@ -347,7 +347,7 @@ gdk_pixbuf_io_init ()
 					module->info->extensions =
 						g_realloc (module->info->extensions, (n + 1) * sizeof (gchar*));
 					module->info->extensions[n - 1] = g_strdup (tmp_buf->str);
-					module->info->extensions[n] = 0;
+					module->info->extensions[n] = NULL;
 					n++;
 				}
 			}
@@ -1952,7 +1952,7 @@ gdk_pixbuf_format_set_disabled (GdkPixbufFormat *format,
 gchar*
 gdk_pixbuf_format_get_license (GdkPixbufFormat *format)
 {
-	g_return_val_if_fail (format != NULL, FALSE);
+	g_return_val_if_fail (format != NULL, NULL);
 
 	return g_strdup (format->license);
 }
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 7af44a573..f9d418a8f 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -353,13 +353,13 @@ gdk_exit (gint errorcode)
 }
 
 void
-gdk_threads_enter ()
+gdk_threads_enter (void)
 {
   GDK_THREADS_ENTER ();
 }
 
 void
-gdk_threads_leave ()
+gdk_threads_leave (void)
 {
   GDK_THREADS_LEAVE ();
 }
@@ -389,7 +389,7 @@ gdk_threads_impl_unlock (void)
  * GTK+; to be safe, call it before gtk_init().
  **/
 void
-gdk_threads_init ()
+gdk_threads_init (void)
 {
   if (!g_thread_supported ())
     g_error ("g_thread_init() must be called before gdk_threads_init()");
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 839814671..32108cba5 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -1042,7 +1042,7 @@ _gdk_event_button_generate (GdkDisplay *display,
       display->button_click_time[1] = 0;
       display->button_click_time[0] = 0;
       display->button_window[1] = NULL;
-      display->button_window[0] = 0;
+      display->button_window[0] = NULL;
       display->button_number[1] = -1;
       display->button_number[0] = -1;
       display->button_x[0] = display->button_x[1] = 0;
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 4db944d2b..df791419a 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -917,7 +917,7 @@ broadcast_xmessage   (GdkDisplay   *display,
                      0,
                      CopyFromParent,
                      CopyFromParent,
-                     CopyFromParent,
+                     (Visual *)CopyFromParent,
                      CWOverrideRedirect | CWEventMask,
                      &attrs);
   }
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 2d35bcde8..5eb2cd7dd 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -853,7 +853,7 @@ motif_find_drag_window (GdkDisplay *display,
 		XCreateWindow (persistant_xdisplay, 
 			       RootWindow (persistant_xdisplay, 0),
 			      -100, -100, 10, 10, 0, 0,
-			      InputOnly, CopyFromParent,
+			      InputOnly, (Visual *)CopyFromParent,
 			      (CWOverrideRedirect | CWEventMask), &attr);
 	      
 	      GDK_NOTE (DND,
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index f55c29f80..2308a3acd 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -853,7 +853,7 @@ static GdkDrawable * get_impl_drawable (GdkDrawable *drawable)
   else
     {
       g_warning (G_STRLOC " drawable is not a pixmap or window");
-      return None;
+      return (GdkDrawable *)None;
     }
   return impl;
 }
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 20d68ca52..651a16ab3 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -109,7 +109,7 @@ gdk_set_locale (void)
 }
 
 static GdkDisplay *
-find_a_display ()
+find_a_display (void)
 {
   GdkDisplay *display = gdk_display_get_default ();
 
diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index 47363f326..d1970a163 100644
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -183,7 +183,7 @@ gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint width, gint height)
       xvisual = ((GdkVisualPrivate*) visual)->xvisual;
       private->ximage = XCreateImage (GDK_SCREEN_XDISPLAY (private->screen),
 				      xvisual, 1, XYBitmap,
-				      0, 0, width, height, 8, 0);
+				      0, NULL, width, height, 8, 0);
     }
   
   private->ximage->data = data;
@@ -318,7 +318,7 @@ _gdk_image_new_for_depth (GdkScreen    *screen,
 		}
 
 	      x_shm_info->readOnly = False;
-	      x_shm_info->shmaddr = shmat (x_shm_info->shmid, 0, 0);
+	      x_shm_info->shmaddr = shmat (x_shm_info->shmid, NULL, 0);
 	      private->ximage->data = x_shm_info->shmaddr;
 
 	      if (x_shm_info->shmaddr == (char*) -1)
@@ -350,7 +350,7 @@ _gdk_image_new_for_depth (GdkScreen    *screen,
 	       * we die in XShmAttach. In theory, a signal handler
 	       * could be set up.
 	       */
-	      shmctl (x_shm_info->shmid, IPC_RMID, 0);		      
+	      shmctl (x_shm_info->shmid, IPC_RMID, NULL);		      
 
 	      if (image)
 		image_list = g_list_prepend (image_list, image);
@@ -361,7 +361,7 @@ _gdk_image_new_for_depth (GdkScreen    *screen,
 	  break;
 	case GDK_IMAGE_NORMAL:
 	  private->ximage = XCreateImage (screen_x11->xdisplay, xvisual, depth,
-					  ZPixmap, 0, 0, width, height, 32, 0);
+					  ZPixmap, 0, NULL, width, height, 32, 0);
 
 	  /* Use malloc, not g_malloc here, because X will call free()
 	   * on this data
@@ -402,7 +402,7 @@ _gdk_image_new_for_depth (GdkScreen    *screen,
       if (x_shm_info->shmaddr != (char *)-1)
 	shmdt (x_shm_info->shmaddr);
       if (x_shm_info->shmid != -1) 
-	shmctl (x_shm_info->shmid, IPC_RMID, 0);
+	shmctl (x_shm_info->shmid, IPC_RMID, NULL);
       
       g_free (x_shm_info);
       private->x_shm_info = NULL;
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index ae9a22200..287415ebc 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -736,7 +736,7 @@ _gdk_region_get_xrectangles (GdkRegion   *region,
  * gdk_x11_grab_server()/gdk_x11_ungrab_server() calls can be nested.
  **/ 
 void
-gdk_x11_grab_server ()
+gdk_x11_grab_server (void)
 {
   gdk_x11_display_grab (gdk_display_get_default ());
 }
@@ -748,7 +748,7 @@ gdk_x11_grab_server ()
  * gdk_x11_grab_server(). 
  **/
 void
-gdk_x11_ungrab_server ()
+gdk_x11_ungrab_server (void)
 {
   gdk_x11_display_ungrab (gdk_display_get_default ());
 }
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 80908580d..0856a010f 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -61,7 +61,7 @@ static gpointer parent_class = NULL;
 static guint signals[LAST_SIGNAL] = { 0 };
 
 GType
-_gdk_screen_x11_get_type ()
+_gdk_screen_x11_get_type (void)
 {
   static GType object_type = 0;
 
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 410e000e5..d6dfda7df 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -2262,7 +2262,7 @@ gdk_window_set_modal_hint (GdkWindow *window,
   if (GDK_WINDOW_IS_MAPPED (window))
     gdk_wmspec_change_state (modal, window,
 			     gdk_atom_intern ("_NET_WM_STATE_MODAL", FALSE), 
-			     0);
+			     NULL);
 }
 
 /**
@@ -2298,7 +2298,7 @@ gdk_window_set_skip_taskbar_hint (GdkWindow *window,
   if (GDK_WINDOW_IS_MAPPED (window))
     gdk_wmspec_change_state (skips_taskbar, window,
 			     gdk_atom_intern ("_NET_WM_STATE_SKIP_TASKBAR", FALSE), 
-			     0);
+			     NULL);
 }
 
 /**
@@ -2335,7 +2335,7 @@ gdk_window_set_skip_pager_hint (GdkWindow *window,
   if (GDK_WINDOW_IS_MAPPED (window))
     gdk_wmspec_change_state (skips_pager, window,
 			     gdk_atom_intern ("_NET_WM_STATE_SKIP_PAGER", FALSE), 
-			     0);
+			     NULL);
 }
 
 /**
@@ -4064,7 +4064,7 @@ gdk_window_stick (GdkWindow *window)
       /* Request stick during viewport scroll */
       gdk_wmspec_change_state (TRUE, window,
 			       gdk_atom_intern ("_NET_WM_STATE_STICKY", FALSE),
-			       0);
+			       NULL);
 
       /* Request desktop 0xFFFFFFFF */
       xev.xclient.type = ClientMessage;
@@ -4124,7 +4124,7 @@ gdk_window_unstick (GdkWindow *window)
       /* Request unstick from viewport */
       gdk_wmspec_change_state (FALSE, window,
 			       gdk_atom_intern ("_NET_WM_STATE_STICKY", FALSE),
-			       0);
+			       NULL);
 
       /* Get current desktop, then set it; this is a race, but not
        * one that matters much in practice.
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 095743b0c..9370420ca 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -519,7 +519,7 @@ gtk_about_dialog_get_property (GObject    *object,
     case PROP_LOGO_ICON_NAME:
       if (gtk_image_get_storage_type (GTK_IMAGE (priv->logo_image)) == GTK_IMAGE_ICON_NAME)
 	{
-	  gchar *icon_name;
+	  const gchar *icon_name;
 
 	  gtk_image_get_icon_name (GTK_IMAGE (priv->logo_image), &icon_name, NULL);
 	  g_value_set_string (value, icon_name);
@@ -1333,7 +1333,7 @@ G_CONST_RETURN gchar *
 gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
 {
   GtkAboutDialogPrivate *priv;
-  gchar *icon_name = NULL;
+  const gchar *icon_name;
   
   g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL);
 
diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c
index 6abe62c62..56523f845 100644
--- a/gtk/gtkcurve.c
+++ b/gtk/gtkcurve.c
@@ -189,7 +189,7 @@ gtk_curve_init (GtkCurve *curve)
   curve->grab_point = -1;
 
   curve->num_points = 0;
-  curve->point = 0;
+  curve->point = NULL;
 
   curve->num_ctlpoints = 0;
   curve->ctlpoint = NULL;
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index c59bd0f99..df4f11656 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -355,7 +355,7 @@ static struct {
   const guchar *mask;
   GdkCursor    *cursor;
 } drag_cursors[] = {
-  { GDK_ACTION_DEFAULT, 0 },
+  { GDK_ACTION_DEFAULT, NULL },
   { GDK_ACTION_ASK,   action_ask_bits,  action_ask_mask_bits,  NULL },
   { GDK_ACTION_COPY,  action_copy_bits, action_copy_mask_bits, NULL },
   { GDK_ACTION_MOVE,  action_move_bits, action_move_mask_bits, NULL },
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 39205b01a..dbec22c61 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -577,7 +577,7 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
 }
 
 GtkWidget *
-gtk_font_selection_new ()
+gtk_font_selection_new (void)
 {
   GtkFontSelection *fontsel;
   
@@ -644,7 +644,7 @@ set_cursor_to_iter (GtkTreeView *view,
   GtkTreeModel *model = gtk_tree_view_get_model (view);
   GtkTreePath *path = gtk_tree_model_get_path (model, iter);
   
-  gtk_tree_view_set_cursor (view, path, 0, FALSE);
+  gtk_tree_view_set_cursor (view, path, NULL, FALSE);
 
   gtk_tree_path_free (path);
 }
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 0336fd944..dfce91604 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -513,7 +513,7 @@ gtk_icon_theme_set_screen (GtkIconTheme *icon_theme,
  * with GdkPixbuf.
  */
 static gboolean
-pixbuf_supports_svg ()
+pixbuf_supports_svg (void)
 {
   GSList *formats = gdk_pixbuf_get_formats ();
   GSList *tmp_list;
@@ -1434,7 +1434,7 @@ gtk_icon_theme_get_icon_sizes (GtkIconTheme *icon_theme,
   
   GtkIconThemePrivate *priv;
 
-  g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), FALSE);
+  g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
   
   priv = icon_theme->priv;
 
@@ -1544,7 +1544,7 @@ gtk_icon_theme_list_icons (GtkIconTheme *icon_theme,
 			  add_key_to_hash,
 			  icons);
 
-  list = 0;
+  list = NULL;
   
   g_hash_table_foreach (icons,
 			add_key_to_list,
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 1d9a46ec5..742142945 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -5433,7 +5433,7 @@ gtk_icon_view_accessible_ref_selection (AtkSelection *selection,
 
   widget = GTK_ACCESSIBLE (selection)->widget;
   if (widget == NULL)
-    return FALSE;
+    return NULL;
 
   icon_view = GTK_ICON_VIEW (widget);
 
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 4c250cfd0..8043d2cca 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -266,7 +266,7 @@ correct_libdir_prefix (gchar **path)
 
 
 static void
-gtk_im_module_init ()
+gtk_im_module_init (void)
 {
   GString *line_buf = g_string_new (NULL);
   GString *tmp_buf = g_string_new (NULL);
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index d94aa91c3..4cd91a6df 100644
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -335,7 +335,7 @@ gtk_input_dialog_init (GtkInputDialog *inputd)
 
   gtk_widget_show (inputd->axis_listbox);
 
-  inputd->axis_list = 0;
+  inputd->axis_list = NULL;
 
   /* Keys listbox */
 
@@ -351,7 +351,7 @@ gtk_input_dialog_init (GtkInputDialog *inputd)
 
   gtk_widget_show (inputd->keys_listbox);
 
-  inputd->keys_list = 0;
+  inputd->keys_list = NULL;
 
   inputd->save_button = gtk_button_new_from_stock (GTK_STOCK_SAVE);
   GTK_WIDGET_SET_FLAGS (inputd->save_button, GTK_CAN_DEFAULT);
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 4fbaacb21..7f2107051 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -393,7 +393,7 @@ gtk_message_dialog_new (GtkWindow     *parent,
 {
   GtkWidget *widget;
   GtkDialog *dialog;
-  gchar* msg = 0;
+  gchar* msg = NULL;
   va_list args;
 
   g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index f91428aa3..8ebbf9c75 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -65,8 +65,8 @@ struct _ButtonData
   GtkFilePath *path;
   GtkWidget *image;
   GtkWidget *label;
-  gint ignore_changes : 1;
-  gint file_is_hidden : 1;
+  guint ignore_changes : 1;
+  guint file_is_hidden : 1;
 };
 
 G_DEFINE_TYPE (GtkPathBar,
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 43adcee1d..178b344eb 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -79,7 +79,7 @@ enum {
 static guint plug_signals[LAST_SIGNAL] = { 0 };
 
 GType
-gtk_plug_get_type ()
+gtk_plug_get_type (void)
 {
   static GType plug_type = 0;
 
diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c
index b32b8a697..368eead79 100644
--- a/gtk/gtkprogress.c
+++ b/gtk/gtkprogress.c
@@ -713,7 +713,7 @@ gtk_progress_set_format_string (GtkProgress *progress,
 gchar *
 gtk_progress_get_current_text (GtkProgress *progress)
 {
-  g_return_val_if_fail (GTK_IS_PROGRESS (progress), 0);
+  g_return_val_if_fail (GTK_IS_PROGRESS (progress), NULL);
 
   if (!progress->adjustment)
     gtk_progress_set_adjustment (progress, NULL);
@@ -726,7 +726,7 @@ gchar *
 gtk_progress_get_text_from_value (GtkProgress *progress,
 				  gdouble      value)
 {
-  g_return_val_if_fail (GTK_IS_PROGRESS (progress), 0);
+  g_return_val_if_fail (GTK_IS_PROGRESS (progress), NULL);
 
   if (!progress->adjustment)
     gtk_progress_set_adjustment (progress, NULL);
diff --git a/gtk/gtkrbtree.c b/gtk/gtkrbtree.c
index f8532f48a..a6c68c4f6 100644
--- a/gtk/gtkrbtree.c
+++ b/gtk/gtkrbtree.c
@@ -991,7 +991,7 @@ _gtk_rbtree_reorder (GtkRBTree *tree,
 		     gint      *new_order,
 		     gint       length)
 {
-  GtkRBReorder reorder = {0, };
+  GtkRBReorder reorder = { NULL };
   GArray *array;
   GtkRBNode *node;
   gint i;
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 7b3230843..ac8836975 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1354,7 +1354,7 @@ gtk_selection_data_set_uris (GtkSelectionData  *selection_data,
       gchar *result;
       gsize length;
       
-      list = g_string_new (0);
+      list = g_string_new (NULL);
       for (i = 0; uris[i]; i++)
 	{
 	  g_string_append (list, uris[i]);
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 525df9131..31c24f01a 100644
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -45,7 +45,7 @@ gtk_signal_newv (const gchar         *name,
   
   g_return_val_if_fail (n_params < SIGNAL_MAX_PARAMS, 0);
   
-  closure = function_offset ? g_signal_type_cclosure_new (object_type, function_offset) : 0;
+  closure = function_offset ? g_signal_type_cclosure_new (object_type, function_offset) : NULL;
   
   return g_signal_newv (name, object_type, (GSignalFlags)signal_flags, closure,
 			NULL, NULL, marshaller, return_val, n_params, params);
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index bdc18ca97..96f2bc681 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -3453,7 +3453,7 @@ cut_or_copy (GtkTextBuffer *buffer,
 					contents))
 	g_object_unref (contents);
       else
-	gtk_clipboard_set_can_store (clipboard, targets, G_N_ELEMENTS (targets) -1);
+	gtk_clipboard_set_can_store (clipboard, (GtkTargetEntry *)targets, G_N_ELEMENTS (targets) -1);
 				     
       if (delete_region_after)
         {
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index ccc774f45..148f153f2 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -230,7 +230,7 @@ row_inserted_marshal (GClosure          *closure,
 
   void (* row_inserted_callback) (GtkTreeModel *tree_model,
                                   GtkTreePath *path,
-                                  GtkTreeIter *iter) = 0;
+                                  GtkTreeIter *iter) = NULL;
             
   GObject *model = g_value_get_object (param_values + 0);
   GtkTreePath *path = (GtkTreePath *)g_value_get_boxed (param_values + 1);
@@ -261,7 +261,7 @@ row_deleted_marshal (GClosure          *closure,
 {
   GtkTreeModelIface *iface;
   void (* row_deleted_callback) (GtkTreeModel *tree_model,
-                                 GtkTreePath  *path) = 0;                                 
+                                 GtkTreePath  *path) = NULL;                                 
   GObject *model = g_value_get_object (param_values + 0);
   GtkTreePath *path = (GtkTreePath *)g_value_get_boxed (param_values + 1);
  
diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
index 07d55b4e8..af6689301 100644
--- a/gtk/gtktreeselection.c
+++ b/gtk/gtktreeselection.c
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include <string.h>
 #include "gtkalias.h"
 #include "gtktreeselection.h"
 #include "gtktreeprivate.h"
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index f670cab8b..e7b83779b 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3700,7 +3700,7 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
 	      if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT)
 		{
 		  gint x, y;
-		  gdk_window_get_pointer (tree_view->priv->bin_window, &x, &y, 0);
+		  gdk_window_get_pointer (tree_view->priv->bin_window, &x, &y, NULL);
 		  gtk_tree_view_draw_arrow (GTK_TREE_VIEW (widget),
                                             tree,
 					    node,
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index ddaa38a8f..7c3719a2b 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -411,7 +411,7 @@ gtk_ui_manager_finalize (GObject *object)
   
   g_node_traverse (self->private_data->root_node, 
 		   G_POST_ORDER, G_TRAVERSE_ALL, -1,
-		   (GNodeTraverseFunc)free_node, 0);
+		   (GNodeTraverseFunc)free_node, NULL);
   g_node_destroy (self->private_data->root_node);
   self->private_data->root_node = NULL;
   
@@ -2197,7 +2197,7 @@ update_node (GtkUIManager *self,
 		    gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), menu);
 		    gtk_menu_shell_insert (GTK_MENU_SHELL (menushell), info->proxy, pos);
 		    g_signal_connect (info->proxy, "notify::visible",
-				      G_CALLBACK (update_smart_separators), 0);
+				      G_CALLBACK (update_smart_separators), NULL);
 		  }
 	      }
 	    else
@@ -2341,7 +2341,7 @@ update_node (GtkUIManager *self,
 	    {
 	      g_signal_handlers_disconnect_by_func (info->proxy,
 						    G_CALLBACK (update_smart_separators),
-						    0);  
+						    NULL);  
 	      gtk_action_disconnect_proxy (info->action, info->proxy);
 	      gtk_container_remove (GTK_CONTAINER (info->proxy->parent),
 				    info->proxy);
@@ -2369,12 +2369,12 @@ update_node (GtkUIManager *self,
 	    {
 	      g_signal_handlers_disconnect_by_func (info->proxy,
 						    G_CALLBACK (update_smart_separators),
-						    0);
+						    NULL);
 	      gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), NULL);
 	      gtk_action_connect_proxy (action, info->proxy);
 	    }
 	  g_signal_connect (info->proxy, "notify::visible",
-			    G_CALLBACK (update_smart_separators), 0);
+			    G_CALLBACK (update_smart_separators), NULL);
 	  if (in_popup) 
 	    {
 	      /* don't show accels in popups */
@@ -2392,7 +2392,7 @@ update_node (GtkUIManager *self,
 	    {
 	      g_signal_handlers_disconnect_by_func (info->proxy,
 						    G_CALLBACK (update_smart_separators),
-						    0);
+						    NULL);
 	      gtk_action_disconnect_proxy (info->action, info->proxy);
 	      gtk_container_remove (GTK_CONTAINER (info->proxy->parent),
 				    info->proxy);
@@ -2428,11 +2428,11 @@ update_node (GtkUIManager *self,
 	    {
 	      g_signal_handlers_disconnect_by_func (info->proxy,
 						    G_CALLBACK (update_smart_separators),
-						    0);
+						    NULL);
 	      gtk_action_connect_proxy (action, info->proxy);
 	    }
 	  g_signal_connect (info->proxy, "notify::visible",
-			    G_CALLBACK (update_smart_separators), 0);
+			    G_CALLBACK (update_smart_separators), NULL);
 	  break;
 	case NODE_TYPE_SEPARATOR:
 	  if (NODE_INFO (node->parent)->type == NODE_TYPE_TOOLBAR ||
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index ad389b5ad..5b0bca310 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -1379,7 +1379,7 @@ gtk_im_context_xim_get_ic (GtkIMContextXIM *context_xim)
       const char *name2 = NULL;
       XVaNestedList list2 = NULL;
       XIMStyle im_style = 0;
-      XIC xic = 0;
+      XIC xic = NULL;
 
       if (context_xim->use_preedit &&
 	  (context_xim->im_info->style & PREEDIT_MASK) == XIMPreeditCallbacks)
diff --git a/po-properties/nb.po b/po-properties/nb.po
index 0c4e1efad..7f3bfb1de 100644
--- a/po-properties/nb.po
+++ b/po-properties/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+ 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-12 16:19-0400\n"
-"PO-Revision-Date: 2004-03-03 13:40+0100\n"
+"POT-Creation-Date: 2004-10-27 12:47+0200\n"
+"PO-Revision-Date: 2004-10-27 12:48+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (bokmål) <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -15,144 +15,260 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gdk-pixbuf/gdk-pixbuf.c:101
+#: gdk-pixbuf/gdk-pixbuf.c:102
 msgid "Number of Channels"
 msgstr "Antall kanaler"
 
-#: gdk-pixbuf/gdk-pixbuf.c:102
+#: gdk-pixbuf/gdk-pixbuf.c:103
 msgid "The number of samples per pixel"
 msgstr "Antall datapunkter per piksel"
 
-#: gdk-pixbuf/gdk-pixbuf.c:112
+#: gdk-pixbuf/gdk-pixbuf.c:113
 msgid "Colorspace"
 msgstr "Fargeområde"
 
-#: gdk-pixbuf/gdk-pixbuf.c:113
+#: gdk-pixbuf/gdk-pixbuf.c:114
 msgid "The colorspace in which the samples are interpreted"
 msgstr "Fargeområde hvor datapunktene tolkes"
 
-#: gdk-pixbuf/gdk-pixbuf.c:123
+#: gdk-pixbuf/gdk-pixbuf.c:124
 msgid "Has Alpha"
 msgstr "Har alpha"
 
-#: gdk-pixbuf/gdk-pixbuf.c:124
+#: gdk-pixbuf/gdk-pixbuf.c:125
 msgid "Whether the pixbuf has an alpha channel"
 msgstr "Om pixbufen har en alphakanal"
 
-#: gdk-pixbuf/gdk-pixbuf.c:132
+#: gdk-pixbuf/gdk-pixbuf.c:133
 msgid "Bits per Sample"
 msgstr "Bits per datapunkt"
 
-#: gdk-pixbuf/gdk-pixbuf.c:133
+#: gdk-pixbuf/gdk-pixbuf.c:134
 msgid "The number of bits per sample"
 msgstr "Antall bits per datapunkt"
 
-#: gdk-pixbuf/gdk-pixbuf.c:143 gtk/gtklayout.c:650 gtk/gtktreeviewcolumn.c:239
+#: gdk-pixbuf/gdk-pixbuf.c:144 gtk/gtklayout.c:651 gtk/gtktreeviewcolumn.c:241
 msgid "Width"
 msgstr "Bredde"
 
-#: gdk-pixbuf/gdk-pixbuf.c:144
+#: gdk-pixbuf/gdk-pixbuf.c:145
 msgid "The number of columns of the pixbuf"
 msgstr "Antall kolonner i pixbufen"
 
-#: gdk-pixbuf/gdk-pixbuf.c:154 gtk/gtklayout.c:659
+#: gdk-pixbuf/gdk-pixbuf.c:155 gtk/gtklayout.c:660
 msgid "Height"
 msgstr "Høyde"
 
-#: gdk-pixbuf/gdk-pixbuf.c:155
+#: gdk-pixbuf/gdk-pixbuf.c:156
 msgid "The number of rows of the pixbuf"
 msgstr "Antall rader i pixbufen"
 
-#: gdk-pixbuf/gdk-pixbuf.c:165
+#: gdk-pixbuf/gdk-pixbuf.c:166
 msgid "Rowstride"
 msgstr "Radlengde"
 
-#: gdk-pixbuf/gdk-pixbuf.c:166
+#: gdk-pixbuf/gdk-pixbuf.c:167
 msgid ""
 "The number of bytes between the start of a row and the start of the next row"
 msgstr "Antall bytes fra starten av en rad til starten på neste rad"
 
-#: gdk-pixbuf/gdk-pixbuf.c:176
+#: gdk-pixbuf/gdk-pixbuf.c:177
 msgid "Pixels"
 msgstr "Piksler"
 
-#: gdk-pixbuf/gdk-pixbuf.c:177
+#: gdk-pixbuf/gdk-pixbuf.c:178
 msgid "A pointer to the pixel data of the pixbuf"
 msgstr "En peker til pikseldata for pixbufen"
 
-#: gdk/gdkdisplaymanager.c:126
+#: gdk/gdkdisplaymanager.c:127
 msgid "Default Display"
 msgstr "Forvalgt skjerm"
 
-#: gdk/gdkdisplaymanager.c:127
+#: gdk/gdkdisplaymanager.c:128
 msgid "The default display for GDK"
 msgstr "Forvalgt skjerm for GDK"
 
-#: gtk/gtkaccellabel.c:138
+#: gtk/gtkaboutdialog.c:187
+msgid "Program name"
+msgstr "Navn på program"
+
+#: gtk/gtkaboutdialog.c:188
+msgid ""
+"The name of the program. If this is not set, it defaults to "
+"g_get_application_name()"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:195
+msgid "Program version"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:196
+#, fuzzy
+msgid "The version of the program"
+msgstr "Orientering for verktøylinjen"
+
+#: gtk/gtkaboutdialog.c:202
+msgid "Copyright string"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:203
+msgid "Copyright information for the program"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:210
+#, fuzzy
+msgid "Comments string"
+msgstr "Avstand mellom kolonner"
+
+#: gtk/gtkaboutdialog.c:211
+msgid "Comments about the program"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:225
+msgid "Website URL"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:226
+msgid "The URL for the link to the website of the program"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:233
+#, fuzzy
+msgid "Website label"
+msgstr "Bruk størrelse i etikett"
+
+#: gtk/gtkaboutdialog.c:234
+msgid ""
+"The label for the link to the website of the program. If this is not set, it "
+"defaults to the URL"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:241
+msgid "Authors"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:242
+msgid "List of authors of the programs"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:248
+msgid "Documenters"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:249
+msgid "List of people documenting the program"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:256
+msgid "Artists"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:257
+msgid "List of people who have contributed artwork to the program"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:264
+msgid "Translator credits"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:265
+msgid ""
+"Credits to the translators. This string should be marked as translatable"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:272
+msgid "Logo"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:273
+msgid ""
+"A logo for the about box. If this is not set, it defaults to "
+"gtk_window_get_default_icon_list()"
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:280
+#, fuzzy
+msgid "Logo Icon Name"
+msgstr "Navn på ikontema"
+
+#: gtk/gtkaboutdialog.c:281
+msgid "A named icon to use as the logo for the about box."
+msgstr ""
+
+#: gtk/gtkaboutdialog.c:288
+#, fuzzy
+msgid "Link Color"
+msgstr "Aktiv farge"
+
+#: gtk/gtkaboutdialog.c:289
+msgid "Color of hyperlinks"
+msgstr ""
+
+#: gtk/gtkaccellabel.c:139
 msgid "Accelerator Closure"
 msgstr "Aksellerator-«closure»"
 
-#: gtk/gtkaccellabel.c:139
+#: gtk/gtkaccellabel.c:140
 msgid "The closure to be monitored for accelerator changes"
 msgstr "«Closure» som skal overvåkes for akselleratorendringer"
 
-#: gtk/gtkaccellabel.c:145
+#: gtk/gtkaccellabel.c:146
 msgid "Accelerator Widget"
 msgstr "Akselleratorwidget"
 
-#: gtk/gtkaccellabel.c:146
+#: gtk/gtkaccellabel.c:147
 msgid "The widget to be monitored for accelerator changes"
 msgstr "Widgetet som skal overvåkes for akselleratorendringer"
 
-#: gtk/gtkaction.c:193 gtk/gtkactiongroup.c:133
+#: gtk/gtkaction.c:196 gtk/gtkactiongroup.c:134
 msgid "Name"
 msgstr "Navn"
 
-#: gtk/gtkaction.c:194
+#: gtk/gtkaction.c:197
 msgid "A unique name for the action."
 msgstr "Et unikt navn for handlingen."
 
-#: gtk/gtkaction.c:201 gtk/gtkbutton.c:212 gtk/gtkexpander.c:205
-#: gtk/gtkframe.c:126 gtk/gtklabel.c:292 gtk/gtktoolbutton.c:180
+#: gtk/gtkaction.c:204 gtk/gtkbutton.c:220 gtk/gtkexpander.c:206
+#: gtk/gtkframe.c:127 gtk/gtklabel.c:300 gtk/gtktoolbutton.c:181
 msgid "Label"
 msgstr "Etikett"
 
-#: gtk/gtkaction.c:202
+#: gtk/gtkaction.c:205
 msgid "The label used for menu items and buttons that activate this action."
 msgstr ""
 "Etikett som brukes for menyoppføringer og knapper som aktiverer denne "
 "handlingen."
 
-#: gtk/gtkaction.c:208
+#: gtk/gtkaction.c:212
 msgid "Short label"
 msgstr "Kort etikett"
 
-#: gtk/gtkaction.c:209
+#: gtk/gtkaction.c:213
 msgid "A shorter label that may be used on toolbar buttons."
 msgstr "En kortere etikett som kan brukes på verktøylinjeknapper."
 
-#: gtk/gtkaction.c:215
+#: gtk/gtkaction.c:219
 msgid "Tooltip"
 msgstr "Verktøytips"
 
-#: gtk/gtkaction.c:216
+#: gtk/gtkaction.c:220
 msgid "A tooltip for this action."
 msgstr "Et verktøytips for denne handlingen."
 
-#: gtk/gtkaction.c:222
+#: gtk/gtkaction.c:226
 msgid "Stock Icon"
 msgstr "Standard ikon"
 
-#: gtk/gtkaction.c:223
+#: gtk/gtkaction.c:227
 msgid "The stock icon displayed in widgets representing this action."
 msgstr ""
 "Standard ikon som vises i komponenter som representerer denne handlingen."
 
-#: gtk/gtkaction.c:229 gtk/gtktoolitem.c:158
+#: gtk/gtkaction.c:234 gtk/gtktoolitem.c:159
 msgid "Visible when horizontal"
 msgstr "Synlig når horisontal"
 
-#: gtk/gtkaction.c:230 gtk/gtktoolitem.c:159
+#: gtk/gtkaction.c:235 gtk/gtktoolitem.c:160
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a horizontal "
 "orientation."
@@ -160,11 +276,23 @@ msgstr ""
 "Om verktøylinjeoppføringen er synlig når verktøylinjen har horisontal "
 "orientering."
 
-#: gtk/gtkaction.c:236 gtk/gtktoolitem.c:165
+#: gtk/gtkaction.c:250
+#, fuzzy
+msgid "Visible when overflown"
+msgstr "Synlig når vertikal"
+
+#: gtk/gtkaction.c:251
+#, fuzzy
+msgid ""
+"When TRUE, toolitem proxies for this action are represented in the toolbar "
+"overflow menu."
+msgstr "Når TRUE vil tomme menyproxyer for denne handlingen skjules."
+
+#: gtk/gtkaction.c:258 gtk/gtktoolitem.c:166
 msgid "Visible when vertical"
 msgstr "Synlig når vertikal"
 
-#: gtk/gtkaction.c:237 gtk/gtktoolitem.c:166
+#: gtk/gtkaction.c:259 gtk/gtktoolitem.c:167
 msgid ""
 "Whether the toolbar item is visible when the toolbar is in a vertical "
 "orientation."
@@ -172,11 +300,11 @@ msgstr ""
 "Om verktøylinjeoppføringen er synlig når verktøylinjen har vertikal "
 "orientering."
 
-#: gtk/gtkaction.c:243 gtk/gtktoolitem.c:172
+#: gtk/gtkaction.c:266 gtk/gtktoolitem.c:173
 msgid "Is important"
 msgstr "Er viktig"
 
-#: gtk/gtkaction.c:244
+#: gtk/gtkaction.c:267
 msgid ""
 "Whether the action is considered important. When TRUE, toolitem proxies for "
 "this action show text in GTK_TOOLBAR_BOTH_HORIZ mode."
@@ -184,36 +312,37 @@ msgstr ""
 "Om handlingen ses på som viktig. Når denne er satt til TRUE viser proxyer "
 "for verktøylinjeoppføringene tekst i GTK_TOOLBAR_BOTH_HORIZ-modus."
 
-#: gtk/gtkaction.c:250
+#: gtk/gtkaction.c:275
 msgid "Hide if empty"
 msgstr "Skjul hvis tom"
 
-#: gtk/gtkaction.c:251
+#: gtk/gtkaction.c:276
 msgid "When TRUE, empty menu proxies for this action are hidden."
 msgstr "Når TRUE vil tomme menyproxyer for denne handlingen skjules."
 
-#: gtk/gtkaction.c:257 gtk/gtkactiongroup.c:141 gtk/gtkwidget.c:449
+#: gtk/gtkaction.c:282 gtk/gtkactiongroup.c:142 gtk/gtkcellrenderer.c:221
+#: gtk/gtkwidget.c:450
 msgid "Sensitive"
 msgstr "Følsomt"
 
-#: gtk/gtkaction.c:258
+#: gtk/gtkaction.c:283
 msgid "Whether the action is enabled."
 msgstr "Om handlingen er aktivert."
 
-#: gtk/gtkaction.c:264 gtk/gtkactiongroup.c:148 gtk/gtktreeview.c:564
-#: gtk/gtktreeviewcolumn.c:223 gtk/gtkwidget.c:442
+#: gtk/gtkaction.c:289 gtk/gtkactiongroup.c:149 gtk/gtktreeview.c:582
+#: gtk/gtktreeviewcolumn.c:225 gtk/gtkwidget.c:443
 msgid "Visible"
 msgstr "Synlig"
 
-#: gtk/gtkaction.c:265
+#: gtk/gtkaction.c:290
 msgid "Whether the action is visible."
 msgstr "Om handlingen er synlig"
 
-#: gtk/gtkaction.c:271
+#: gtk/gtkaction.c:296
 msgid "Action Group"
 msgstr "Handlingsgruppe"
 
-#: gtk/gtkaction.c:272
+#: gtk/gtkaction.c:297
 msgid ""
 "The GtkActionGroup this GtkAction is associated with, or NULL (for internal "
 "use)."
@@ -221,71 +350,72 @@ msgstr ""
 "GtkActionGroup denne GtkAction er assosiert med, eller NULL (for intern "
 "bruk)."
 
-#: gtk/gtkactiongroup.c:134
+#: gtk/gtkactiongroup.c:135
 msgid "A name for the action group."
 msgstr "Et navn for handlingsgruppen."
 
-#: gtk/gtkactiongroup.c:142
+#: gtk/gtkactiongroup.c:143
 msgid "Whether the action group is enabled."
 msgstr "Om handlingsgruppen er aktivert."
 
-#: gtk/gtkactiongroup.c:149
+#: gtk/gtkactiongroup.c:150
 msgid "Whether the action group is visible."
 msgstr "Om handlingsgruppen er synlig"
 
-#: gtk/gtkadjustment.c:107 gtk/gtkspinbutton.c:302
+#: gtk/gtkadjustment.c:108 gtk/gtkcellrendererprogress.c:115
+#: gtk/gtkspinbutton.c:303
 msgid "Value"
 msgstr "Verdi"
 
-#: gtk/gtkadjustment.c:108
+#: gtk/gtkadjustment.c:109
 msgid "The value of the adjustment"
 msgstr "Verdien for justeringen"
 
-#: gtk/gtkadjustment.c:117
+#: gtk/gtkadjustment.c:118
 msgid "Minimum Value"
 msgstr "Minimumsverdi"
 
-#: gtk/gtkadjustment.c:118
+#: gtk/gtkadjustment.c:119
 msgid "The minimum value of the adjustment"
 msgstr "Minimumsverdi for justeringen"
 
-#: gtk/gtkadjustment.c:127
+#: gtk/gtkadjustment.c:128
 msgid "Maximum Value"
 msgstr "Maksimumsverdi"
 
-#: gtk/gtkadjustment.c:128
+#: gtk/gtkadjustment.c:129
 msgid "The maximum value of the adjustment"
 msgstr "Maksimumsverdi for justeringen"
 
-#: gtk/gtkadjustment.c:137
+#: gtk/gtkadjustment.c:138
 msgid "Step Increment"
 msgstr "Størrelse på steg"
 
-#: gtk/gtkadjustment.c:138
+#: gtk/gtkadjustment.c:139
 msgid "The step increment of the adjustment"
 msgstr "Størrelse på steg for justeringen"
 
-#: gtk/gtkadjustment.c:147
+#: gtk/gtkadjustment.c:148
 msgid "Page Increment"
 msgstr "Størrelse på side"
 
-#: gtk/gtkadjustment.c:148
+#: gtk/gtkadjustment.c:149
 msgid "The page increment of the adjustment"
 msgstr "Sidestørrelse for justeringen"
 
-#: gtk/gtkadjustment.c:157
+#: gtk/gtkadjustment.c:158
 msgid "Page Size"
 msgstr "Sidestørrelse"
 
-#: gtk/gtkadjustment.c:158
+#: gtk/gtkadjustment.c:159
 msgid "The page size of the adjustment"
 msgstr "Sidestørrelse for justeringen"
 
-#: gtk/gtkalignment.c:117
+#: gtk/gtkalignment.c:118
 msgid "Horizontal alignment"
 msgstr "Horisontal justering"
 
-#: gtk/gtkalignment.c:118 gtk/gtkbutton.c:263
+#: gtk/gtkalignment.c:119 gtk/gtkbutton.c:271
 msgid ""
 "Horizontal position of child in available space. 0.0 is left aligned, 1.0 is "
 "right aligned"
@@ -293,11 +423,11 @@ msgstr ""
 "Horisontal posisjon for barn i tilgjengelig område. 0.0 er venstrejustert, "
 "1.0 er høyrejustert"
 
-#: gtk/gtkalignment.c:127
+#: gtk/gtkalignment.c:128
 msgid "Vertical alignment"
 msgstr "Vertikal justering"
 
-#: gtk/gtkalignment.c:128 gtk/gtkbutton.c:282
+#: gtk/gtkalignment.c:129 gtk/gtkbutton.c:290
 msgid ""
 "Vertical position of child in available space. 0.0 is top aligned, 1.0 is "
 "bottom aligned"
@@ -305,11 +435,11 @@ msgstr ""
 "Vertikal plassering av barn i tilgjengelig område. 0.0 er øverst, 1.0 er "
 "nederst"
 
-#: gtk/gtkalignment.c:136
+#: gtk/gtkalignment.c:137
 msgid "Horizontal scale"
 msgstr "Horisontal skalering"
 
-#: gtk/gtkalignment.c:137
+#: gtk/gtkalignment.c:138
 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"
@@ -317,11 +447,11 @@ msgstr ""
 "Hvor mye av det horisontale området som brukes for barnet hvis det er plass "
 "til overs. 0.0 betyr ingenting, 1.0 betyr hele"
 
-#: gtk/gtkalignment.c:145
+#: gtk/gtkalignment.c:146
 msgid "Vertical scale"
 msgstr "Vertikal skalering"
 
-#: gtk/gtkalignment.c:146
+#: gtk/gtkalignment.c:147
 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"
@@ -329,123 +459,123 @@ msgstr ""
 "Hvor mye av det vertikale området som brukes for barnet hvis det er plass "
 "til overs. 0.0 betyr ingenting, 1.0 betyr hele"
 
-#: gtk/gtkalignment.c:163
+#: gtk/gtkalignment.c:164
 msgid "Top Padding"
 msgstr "Toppfyll"
 
-#: gtk/gtkalignment.c:164
+#: gtk/gtkalignment.c:165
 msgid "The padding to insert at the top of the widget."
 msgstr "Fyll som plasseres øverst i komponenten."
 
-#: gtk/gtkalignment.c:180
+#: gtk/gtkalignment.c:181
 msgid "Bottom Padding"
 msgstr "Bunnfyll"
 
-#: gtk/gtkalignment.c:181
+#: gtk/gtkalignment.c:182
 msgid "The padding to insert at the bottom of the widget."
 msgstr "Fyll som plasseres nederst i komponenten."
 
-#: gtk/gtkalignment.c:197
+#: gtk/gtkalignment.c:198
 msgid "Left Padding"
 msgstr "Venstrefyll"
 
-#: gtk/gtkalignment.c:198
+#: gtk/gtkalignment.c:199
 msgid "The padding to insert at the left of the widget."
 msgstr "Fyll som plasseres til venstre i komponenten."
 
-#: gtk/gtkalignment.c:214
+#: gtk/gtkalignment.c:215
 msgid "Right Padding"
 msgstr "Høyrefyll"
 
-#: gtk/gtkalignment.c:215
+#: gtk/gtkalignment.c:216
 msgid "The padding to insert at the right of the widget."
 msgstr "Fyll som plasseres til høyre i komponenten."
 
-#: gtk/gtkarrow.c:99
+#: gtk/gtkarrow.c:100
 msgid "Arrow direction"
 msgstr "Pilretning"
 
-#: gtk/gtkarrow.c:100
+#: gtk/gtkarrow.c:101
 msgid "The direction the arrow should point"
 msgstr "Pekeretning for pilen"
 
-#: gtk/gtkarrow.c:107
+#: gtk/gtkarrow.c:108
 msgid "Arrow shadow"
 msgstr "Pilens skygge"
 
-#: gtk/gtkarrow.c:108
+#: gtk/gtkarrow.c:109
 msgid "Appearance of the shadow surrounding the arrow"
 msgstr "Utseende for skyggen som omgir pilen"
 
-#: gtk/gtkaspectframe.c:109
+#: gtk/gtkaspectframe.c:110
 msgid "Horizontal Alignment"
 msgstr "Horisontal justering"
 
-#: gtk/gtkaspectframe.c:110
+#: gtk/gtkaspectframe.c:111
 msgid "X alignment of the child"
 msgstr "X-justering for barn"
 
-#: gtk/gtkaspectframe.c:116
+#: gtk/gtkaspectframe.c:117
 msgid "Vertical Alignment"
 msgstr "Vertikal justering"
 
-#: gtk/gtkaspectframe.c:117
+#: gtk/gtkaspectframe.c:118
 msgid "Y alignment of the child"
 msgstr "Y-justering for barn"
 
-#: gtk/gtkaspectframe.c:123
+#: gtk/gtkaspectframe.c:124
 msgid "Ratio"
 msgstr "Rate"
 
-#: gtk/gtkaspectframe.c:124
+#: gtk/gtkaspectframe.c:125
 msgid "Aspect ratio if obey_child is FALSE"
 msgstr "Aspektrate hvis obey_child er USANN"
 
-#: gtk/gtkaspectframe.c:130
+#: gtk/gtkaspectframe.c:131
 msgid "Obey child"
 msgstr "Adlyd barn"
 
-#: gtk/gtkaspectframe.c:131
+#: gtk/gtkaspectframe.c:132
 msgid "Force aspect ratio to match that of the frame's child"
 msgstr "Tving aspektraten til å passe til rammens barn"
 
-#: gtk/gtkbbox.c:120
+#: gtk/gtkbbox.c:121
 msgid "Minimum child width"
 msgstr "Minimal bredde for barn"
 
-#: gtk/gtkbbox.c:121
+#: gtk/gtkbbox.c:122
 msgid "Minimum width of buttons inside the box"
 msgstr "Minimum bredde på knappene inne i boksen"
 
-#: gtk/gtkbbox.c:129
+#: gtk/gtkbbox.c:130
 msgid "Minimum child height"
 msgstr "Minimal høyde for barn"
 
-#: gtk/gtkbbox.c:130
+#: gtk/gtkbbox.c:131
 msgid "Minimum height of buttons inside the box"
 msgstr "Minimum høyde på knappene inne i boksen"
 
-#: gtk/gtkbbox.c:138
+#: gtk/gtkbbox.c:139
 msgid "Child internal width padding"
 msgstr "Internt breddefyll for barn"
 
-#: gtk/gtkbbox.c:139
+#: gtk/gtkbbox.c:140
 msgid "Amount to increase child's size on either side"
 msgstr "Økning av størrelse på barn på hver side"
 
-#: gtk/gtkbbox.c:147
+#: gtk/gtkbbox.c:148
 msgid "Child internal height padding"
 msgstr "Fyll for barns interne høyde"
 
-#: gtk/gtkbbox.c:148
+#: gtk/gtkbbox.c:149
 msgid "Amount to increase child's size on the top and bottom"
 msgstr "Hvor mye barnets størrelse skal økes på topp og bunn"
 
-#: gtk/gtkbbox.c:156
+#: gtk/gtkbbox.c:157
 msgid "Layout style"
 msgstr "Stil for plassering"
 
-#: gtk/gtkbbox.c:157
+#: gtk/gtkbbox.c:158
 msgid ""
 "How to layout the buttons in the box. Possible values are default, spread, "
 "edge, start and end"
@@ -453,11 +583,11 @@ msgstr ""
 "Hvordan knappene skal plasseres i boksen. Mulige verdier er forvalgt, spre "
 "utover, kant, start og slutt"
 
-#: gtk/gtkbbox.c:165
+#: gtk/gtkbbox.c:166
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: gtk/gtkbbox.c:166
+#: gtk/gtkbbox.c:167
 msgid ""
 "If TRUE, the child appears in a secondary group of children, suitable for, e."
 "g., help buttons"
@@ -465,36 +595,36 @@ msgstr ""
 "Hvis SANN vil barnet vises i en sekundær gruppe av barn, passer for eksempel "
 "til hjelp-knapper"
 
-#: gtk/gtkbox.c:129 gtk/gtkexpander.c:229
+#: gtk/gtkbox.c:130 gtk/gtkexpander.c:230 gtk/gtktreeviewcolumn.c:250
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: gtk/gtkbox.c:130
+#: gtk/gtkbox.c:131
 msgid "The amount of space between children"
 msgstr "Mengde mellomrom mellom barn."
 
-#: gtk/gtkbox.c:139 gtk/gtknotebook.c:469 gtk/gtktoolbar.c:533
+#: gtk/gtkbox.c:140 gtk/gtknotebook.c:473 gtk/gtktoolbar.c:541
 msgid "Homogeneous"
 msgstr "Homogen"
 
-#: gtk/gtkbox.c:140
+#: gtk/gtkbox.c:141
 msgid "Whether the children should all be the same size"
 msgstr "Om alle barn skal være av samme størrelse."
 
-#: gtk/gtkbox.c:147 gtk/gtkpreview.c:132 gtk/gtktoolbar.c:525
-#: gtk/gtktreeviewcolumn.c:295
+#: gtk/gtkbox.c:148 gtk/gtkpreview.c:133 gtk/gtktoolbar.c:533
+#: gtk/gtktreeviewcolumn.c:306
 msgid "Expand"
 msgstr "Utvid"
 
-#: gtk/gtkbox.c:148
+#: gtk/gtkbox.c:149
 msgid "Whether the child should receive extra space when the parent grows"
 msgstr "La etterkommeren få mer plass når opphavet vokser"
 
-#: gtk/gtkbox.c:154
+#: gtk/gtkbox.c:155
 msgid "Fill"
 msgstr "Fyll"
 
-#: gtk/gtkbox.c:155
+#: gtk/gtkbox.c:156
 msgid ""
 "Whether extra space given to the child should be allocated to the child or "
 "used as padding"
@@ -502,21 +632,21 @@ msgstr ""
 "Om ekstra mellomrom som gis til etterkommeren skal allokeres til "
 "etterkommeren eller brukes som fyll"
 
-#: gtk/gtkbox.c:161
+#: gtk/gtkbox.c:162
 msgid "Padding"
 msgstr "Fyll"
 
-#: gtk/gtkbox.c:162
+#: gtk/gtkbox.c:163
 msgid "Extra space to put between the child and its neighbors, in pixels"
 msgstr ""
 "Ekstra mellomrom som skal plasseres mellom en etterkommer og dens naboer i "
 "piksler"
 
-#: gtk/gtkbox.c:168
+#: gtk/gtkbox.c:169
 msgid "Pack type"
 msgstr "Type pakking"
 
-#: gtk/gtkbox.c:169 gtk/gtknotebook.c:513
+#: gtk/gtkbox.c:170 gtk/gtknotebook.c:517
 msgid ""
 "A GtkPackType indicating whether the child is packed with reference to the "
 "start or end of the parent"
@@ -524,28 +654,28 @@ msgstr ""
 "En GtkPackType viser om etterkommeren er pakket med referanse til start "
 "eller slutt av opphavet"
 
-#: gtk/gtkbox.c:175 gtk/gtknotebook.c:491 gtk/gtkpaned.c:239
-#: gtk/gtkruler.c:139
+#: gtk/gtkbox.c:176 gtk/gtknotebook.c:495 gtk/gtkpaned.c:240
+#: gtk/gtkruler.c:140
 msgid "Position"
 msgstr "Posisjon"
 
-#: gtk/gtkbox.c:176 gtk/gtknotebook.c:492
+#: gtk/gtkbox.c:177 gtk/gtknotebook.c:496
 msgid "The index of the child in the parent"
 msgstr "Indeks for etterkommer i opphav"
 
-#: gtk/gtkbutton.c:213
+#: gtk/gtkbutton.c:221
 msgid ""
 "Text of the label widget inside the button, if the button contains a label "
 "widget"
 msgstr ""
 "Tekst for etiketten inne i knappen, hvis knappen inneholder en etikett."
 
-#: gtk/gtkbutton.c:220 gtk/gtkexpander.c:213 gtk/gtklabel.c:313
-#: gtk/gtktoolbutton.c:187
+#: gtk/gtkbutton.c:228 gtk/gtkexpander.c:214 gtk/gtklabel.c:321
+#: gtk/gtktoolbutton.c:188
 msgid "Use underline"
 msgstr "Bruk understreking"
 
-#: gtk/gtkbutton.c:221 gtk/gtkexpander.c:214 gtk/gtklabel.c:314
+#: gtk/gtkbutton.c:229 gtk/gtkexpander.c:215 gtk/gtklabel.c:322
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -553,54 +683,54 @@ msgstr ""
 "Hvis satt vil en underscore i teksten indikere at neste tegn skal brukes som "
 "akselleratorhint"
 
-#: gtk/gtkbutton.c:228
+#: gtk/gtkbutton.c:236
 msgid "Use stock"
 msgstr "Bruk lager"
 
-#: gtk/gtkbutton.c:229
+#: gtk/gtkbutton.c:237
 msgid ""
 "If set, the label is used to pick a stock item instead of being displayed"
 msgstr ""
 "HVis satt brukes etiketten til å velge en standardoppføring i stedet for å "
 "vises"
 
-#: gtk/gtkbutton.c:236
+#: gtk/gtkbutton.c:244 gtk/gtkcombobox.c:612
 msgid "Focus on click"
 msgstr "Fokus ved klikk"
 
-#: gtk/gtkbutton.c:237
+#: gtk/gtkbutton.c:245
 msgid "Whether the button grabs focus when it is clicked with the mouse"
 msgstr "Om knappen tar fokus når den klikkes med musen"
 
-#: gtk/gtkbutton.c:244
+#: gtk/gtkbutton.c:252
 msgid "Border relief"
 msgstr "Kantrelief"
 
-#: gtk/gtkbutton.c:245
+#: gtk/gtkbutton.c:253
 msgid "The border relief style"
 msgstr "Stil for kantrelief"
 
-#: gtk/gtkbutton.c:262
+#: gtk/gtkbutton.c:270
 msgid "Horizontal alignment for child"
 msgstr "Horisontal justering for barnet"
 
-#: gtk/gtkbutton.c:281
+#: gtk/gtkbutton.c:289
 msgid "Vertical alignment for child"
 msgstr "Vertikal justering for barnet"
 
-#: gtk/gtkbutton.c:350
+#: gtk/gtkbutton.c:358
 msgid "Default Spacing"
 msgstr "Standard avstand"
 
-#: gtk/gtkbutton.c:351
+#: gtk/gtkbutton.c:359
 msgid "Extra space to add for CAN_DEFAULT buttons"
 msgstr "Ekstra plass for CAN_DEFAULT-knapper"
 
-#: gtk/gtkbutton.c:357
+#: gtk/gtkbutton.c:365
 msgid "Default Outside Spacing"
 msgstr "Forvalgt utvendig mellomrom"
 
-#: gtk/gtkbutton.c:358
+#: gtk/gtkbutton.c:366
 msgid ""
 "Extra space to add for CAN_DEFAULT buttons that is always drawn outside the "
 "border"
@@ -608,409 +738,464 @@ msgstr ""
 "Ekstra plass som skal legges til for CAN_DEFAULT-knapper som alltid tegnes "
 "utenfor kanten"
 
-#: gtk/gtkbutton.c:363
+#: gtk/gtkbutton.c:371
 msgid "Child X Displacement"
 msgstr "X-forskyvning for barn"
 
-#: gtk/gtkbutton.c:364
+#: gtk/gtkbutton.c:372
 msgid ""
 "How far in the x direction to move the child when the button is depressed"
 msgstr "Hvor langt barnet flyttes i x-retning når knappen er nedtrykt"
 
-#: gtk/gtkbutton.c:371
+#: gtk/gtkbutton.c:379
 msgid "Child Y Displacement"
 msgstr "Y-forskyvning for barn"
 
-#: gtk/gtkbutton.c:372
+#: gtk/gtkbutton.c:380
 msgid ""
 "How far in the y direction to move the child when the button is depressed"
 msgstr "Hvor langt barnet flyttes i y-retning når knappen er nedtrykt"
 
-#: gtk/gtkbutton.c:379
+#: gtk/gtkbutton.c:396
+#, fuzzy
+msgid "Displace focus"
+msgstr "Er fokus"
+
+#: gtk/gtkbutton.c:397
+msgid ""
+"Whether the child_displacement_x/_y properties should also affect the focus "
+"rectangle"
+msgstr ""
+
+#: gtk/gtkbutton.c:402
 msgid "Show button images"
 msgstr "Vis knappebilder"
 
-#: gtk/gtkbutton.c:380
+#: gtk/gtkbutton.c:403
 msgid "Whether stock icons should be shown in buttons"
 msgstr "Om standardikoner skal vises i knapper"
 
-#: gtk/gtkcalendar.c:464
+#: gtk/gtkcalendar.c:468
 msgid "Year"
 msgstr "År"
 
-#: gtk/gtkcalendar.c:465
+#: gtk/gtkcalendar.c:469
 msgid "The selected year"
 msgstr "Valgt år"
 
-#: gtk/gtkcalendar.c:471
+#: gtk/gtkcalendar.c:475
 msgid "Month"
 msgstr "Måned"
 
-#: gtk/gtkcalendar.c:472
+#: gtk/gtkcalendar.c:476
 msgid "The selected month (as a number between 0 and 11)"
 msgstr "Valgt måned (som et tall mellom 0 og 11)"
 
-#: gtk/gtkcalendar.c:478
+#: gtk/gtkcalendar.c:482
 msgid "Day"
 msgstr "Dag"
 
-#: gtk/gtkcalendar.c:479
+#: gtk/gtkcalendar.c:483
 msgid ""
 "The selected day (as a number between 1 and 31, or 0 to unselect the "
 "currently selected day)"
 msgstr ""
 "Valgt dag (som et tall mellom 1 og 31, eller 0 for å velge bort valgt dag)"
 
-#: gtk/gtkcalendar.c:493
+#: gtk/gtkcalendar.c:497
 msgid "Show Heading"
 msgstr "Vis topptekst"
 
-#: gtk/gtkcalendar.c:494
+#: gtk/gtkcalendar.c:498
 msgid "If TRUE, a heading is displayed"
 msgstr "En topptekst vises hvis denne settes til TRUE"
 
-#: gtk/gtkcalendar.c:508
+#: gtk/gtkcalendar.c:512
 msgid "Show Day Names"
 msgstr "Vis navn på dager"
 
-#: gtk/gtkcalendar.c:509
+#: gtk/gtkcalendar.c:513
 msgid "If TRUE, day names are displayed"
 msgstr "Dagnavn vises hvis denne settes til TRUE"
 
-#: gtk/gtkcalendar.c:522
+#: gtk/gtkcalendar.c:526
 msgid "No Month Change"
 msgstr "Ingen endring i måned"
 
-#: gtk/gtkcalendar.c:523
-msgid "If TRUE, the selected month can not be changed"
+#: gtk/gtkcalendar.c:527
+#, fuzzy
+msgid "If TRUE, the selected month cannot be changed"
 msgstr "Måned kan ikke endres hvis denne er satt til TRUE"
 
-#: gtk/gtkcalendar.c:537
+#: gtk/gtkcalendar.c:541
 msgid "Show Week Numbers"
 msgstr "Vis ukenummer"
 
-#: gtk/gtkcalendar.c:538
+#: gtk/gtkcalendar.c:542
 msgid "If TRUE, week numbers are displayed"
 msgstr "Ukenummer vises hvis denne er satt til TRUE"
 
-#: gtk/gtkcellrenderer.c:152
+#: gtk/gtkcellrenderer.c:204
 msgid "mode"
 msgstr "modus"
 
-#: gtk/gtkcellrenderer.c:153
+#: gtk/gtkcellrenderer.c:205
 msgid "Editable mode of the CellRenderer"
 msgstr "Redigerbart modus for CellRenderer"
 
-#: gtk/gtkcellrenderer.c:162
+#: gtk/gtkcellrenderer.c:214
 msgid "visible"
 msgstr "synlig"
 
-#: gtk/gtkcellrenderer.c:163
+#: gtk/gtkcellrenderer.c:215
 msgid "Display the cell"
 msgstr "Vis cellen"
 
-#: gtk/gtkcellrenderer.c:171
+#: gtk/gtkcellrenderer.c:222
+#, fuzzy
+msgid "Display the cell sensitive"
+msgstr "Vis cellen"
+
+#: gtk/gtkcellrenderer.c:229
 msgid "xalign"
 msgstr "xalign"
 
-#: gtk/gtkcellrenderer.c:172
+#: gtk/gtkcellrenderer.c:230
 msgid "The x-align"
 msgstr "X-justering"
 
-#: gtk/gtkcellrenderer.c:182
+#: gtk/gtkcellrenderer.c:240
 msgid "yalign"
 msgstr "yalign"
 
-#: gtk/gtkcellrenderer.c:183
+#: gtk/gtkcellrenderer.c:241
 msgid "The y-align"
 msgstr "Y-justering"
 
-#: gtk/gtkcellrenderer.c:193
+#: gtk/gtkcellrenderer.c:251
 msgid "xpad"
 msgstr "x-fyll"
 
-#: gtk/gtkcellrenderer.c:194
+#: gtk/gtkcellrenderer.c:252
 msgid "The xpad"
 msgstr "X-fyll"
 
-#: gtk/gtkcellrenderer.c:204
+#: gtk/gtkcellrenderer.c:262
 msgid "ypad"
 msgstr "y-fyll"
 
-#: gtk/gtkcellrenderer.c:205
+#: gtk/gtkcellrenderer.c:263
 msgid "The ypad"
 msgstr "Y-fyll"
 
-#: gtk/gtkcellrenderer.c:215
+#: gtk/gtkcellrenderer.c:273
 msgid "width"
 msgstr "bredde"
 
-#: gtk/gtkcellrenderer.c:216
+#: gtk/gtkcellrenderer.c:274
 msgid "The fixed width"
 msgstr "Den faste bredden"
 
-#: gtk/gtkcellrenderer.c:226
+#: gtk/gtkcellrenderer.c:284
 msgid "height"
 msgstr "høyde"
 
-#: gtk/gtkcellrenderer.c:227
+#: gtk/gtkcellrenderer.c:285
 msgid "The fixed height"
 msgstr "Den faste høyden"
 
-#: gtk/gtkcellrenderer.c:237
+#: gtk/gtkcellrenderer.c:295
 msgid "Is Expander"
 msgstr "Er utvider"
 
-#: gtk/gtkcellrenderer.c:238
+#: gtk/gtkcellrenderer.c:296
 msgid "Row has children"
 msgstr "Rad har etterkommere"
 
-#: gtk/gtkcellrenderer.c:247
+#: gtk/gtkcellrenderer.c:305
 msgid "Is Expanded"
 msgstr "Er utvidet"
 
-#: gtk/gtkcellrenderer.c:248
+#: gtk/gtkcellrenderer.c:306
 msgid "Row is an expander row, and is expanded"
 msgstr "Raden er en utvider-rad, og er utvidet"
 
-#: gtk/gtkcellrenderer.c:256
+#: gtk/gtkcellrenderer.c:314
 msgid "Cell background color name"
 msgstr "Navn på bakgrunnsfarge for celle"
 
-#: gtk/gtkcellrenderer.c:257
+#: gtk/gtkcellrenderer.c:315
 msgid "Cell background color as a string"
 msgstr "Bakgrunnsfarge for celle som en streng"
 
-#: gtk/gtkcellrenderer.c:264
+#: gtk/gtkcellrenderer.c:322
 msgid "Cell background color"
 msgstr "Bakgrunnsfarge for celle"
 
-#: gtk/gtkcellrenderer.c:265
+#: gtk/gtkcellrenderer.c:323
 msgid "Cell background color as a GdkColor"
 msgstr "Bakgrunnsfarge for celle som en GdkColor"
 
-#: gtk/gtkcellrenderer.c:273
+#: gtk/gtkcellrenderer.c:331
 msgid "Cell background set"
 msgstr "Bakgrunn for celle satt"
 
-#: gtk/gtkcellrenderer.c:274
+#: gtk/gtkcellrenderer.c:332
 msgid "Whether this tag affects the cell background color"
 msgstr "Om denne merkingen påvirker bakgrunnsfargen for cellen"
 
-#: gtk/gtkcellrendererpixbuf.c:134
+#: gtk/gtkcellrenderercombo.c:89
+#, fuzzy
+msgid "Model"
+msgstr "Modus"
+
+#: gtk/gtkcellrenderercombo.c:90
+#, fuzzy
+msgid "The model containing the possible values for the combo box"
+msgstr "Modell for komboboksen"
+
+#: gtk/gtkcellrenderercombo.c:108 gtk/gtkcomboboxentry.c:114
+msgid "Text Column"
+msgstr "Tekstkolonne"
+
+#: gtk/gtkcellrenderercombo.c:109 gtk/gtkcomboboxentry.c:115
+msgid "A column in the data source model to get the strings from"
+msgstr "En kolonne i datakildemodellen hvor man kan hente strenger"
+
+#: gtk/gtkcellrenderercombo.c:127
+msgid "Has Entry"
+msgstr ""
+
+#: gtk/gtkcellrenderercombo.c:128
+#, c-format
+msgid "If %FALSE, don't allow to enter strings other than the chosen ones"
+msgstr ""
+
+#: gtk/gtkcellrendererpixbuf.c:136
 msgid "Pixbuf Object"
 msgstr "Pixbuf-objekt"
 
-#: gtk/gtkcellrendererpixbuf.c:135
+#: gtk/gtkcellrendererpixbuf.c:137
 msgid "The pixbuf to render"
 msgstr "Pixbuf som skal rendres"
 
-#: gtk/gtkcellrendererpixbuf.c:143
+#: gtk/gtkcellrendererpixbuf.c:145
 msgid "Pixbuf Expander Open"
 msgstr "Pixbuf for åpen utvider"
 
-#: gtk/gtkcellrendererpixbuf.c:144
+#: gtk/gtkcellrendererpixbuf.c:146
 msgid "Pixbuf for open expander"
 msgstr "Pixbuf for åpen utvider"
 
-#: gtk/gtkcellrendererpixbuf.c:152
+#: gtk/gtkcellrendererpixbuf.c:154
 msgid "Pixbuf Expander Closed"
 msgstr "Pixbuf for lukket utvider"
 
-#: gtk/gtkcellrendererpixbuf.c:153
+#: gtk/gtkcellrendererpixbuf.c:155
 msgid "Pixbuf for closed expander"
 msgstr "Pixbuf for lukket utvider"
 
-#: gtk/gtkcellrendererpixbuf.c:161 gtk/gtkimage.c:177
+#: gtk/gtkcellrendererpixbuf.c:163 gtk/gtkimage.c:199
 msgid "Stock ID"
 msgstr "Standard ID"
 
-#: gtk/gtkcellrendererpixbuf.c:162
+#: gtk/gtkcellrendererpixbuf.c:164
 msgid "The stock ID of the stock icon to render"
 msgstr "Standard-ID for standardikon som skal rendres"
 
-#: gtk/gtkcellrendererpixbuf.c:169
+#: gtk/gtkcellrendererpixbuf.c:171
 msgid "Size"
 msgstr "Størrelse"
 
-#: gtk/gtkcellrendererpixbuf.c:170
+#: gtk/gtkcellrendererpixbuf.c:172
 msgid "The GtkIconSize value that specifies the size of the rendered icon"
 msgstr "Verdien for GtkIconSize som spesifiserer størrelsen for rendret ikon"
 
-#: gtk/gtkcellrendererpixbuf.c:179
+#: gtk/gtkcellrendererpixbuf.c:181
 msgid "Detail"
 msgstr "Detalj"
 
-#: gtk/gtkcellrendererpixbuf.c:180
+#: gtk/gtkcellrendererpixbuf.c:182
 msgid "Render detail to pass to the theme engine"
 msgstr "Rendringsdetalj som skal sendes til temamotor"
 
-#: gtk/gtkcellrenderertext.c:193 gtk/gtkentry.c:551 gtk/gtkprogressbar.c:218
+#: gtk/gtkcellrendererprogress.c:116
+#, fuzzy
+msgid "Value of the progress bar"
+msgstr "Tekst som skal vises i fremgangsmåleren"
+
+#: gtk/gtkcellrendererprogress.c:133 gtk/gtkcellrenderertext.c:204
+#: gtk/gtkentry.c:573 gtk/gtkprogressbar.c:219
 msgid "Text"
 msgstr "Tekst"
 
-#: gtk/gtkcellrenderertext.c:194
+#: gtk/gtkcellrendererprogress.c:134
+#, fuzzy
+msgid "Text on the progress bar"
+msgstr "Tekst som skal vises i fremgangsmåleren"
+
+#: gtk/gtkcellrenderertext.c:205
 msgid "Text to render"
 msgstr "Tekst som skal rendres"
 
-#: gtk/gtkcellrenderertext.c:201
+#: gtk/gtkcellrenderertext.c:212
 msgid "Markup"
 msgstr "Tagging"
 
-#: gtk/gtkcellrenderertext.c:202
+#: gtk/gtkcellrenderertext.c:213
 msgid "Marked up text to render"
 msgstr "Tagget tekst som skal rendres"
 
-#: gtk/gtkcellrenderertext.c:209 gtk/gtklabel.c:299
+#: gtk/gtkcellrenderertext.c:220 gtk/gtklabel.c:307
 msgid "Attributes"
 msgstr "Attributter"
 
-#: gtk/gtkcellrenderertext.c:210
+#: gtk/gtkcellrenderertext.c:221
 msgid "A list of style attributes to apply to the text of the renderer"
 msgstr "En liste med stilattributter som skal brukes på teksten som rendres"
 
-#: gtk/gtkcellrenderertext.c:217
+#: gtk/gtkcellrenderertext.c:228
 msgid "Single Paragraph Mode"
 msgstr "Modus for enkelt avsnitt"
 
-#: gtk/gtkcellrenderertext.c:218
+#: gtk/gtkcellrenderertext.c:229
 msgid "Whether or not to keep all text in a single paragraph"
 msgstr "Om all tekst skal holdes i ett enkelt avsnitt eller ikke"
 
-#: gtk/gtkcellrenderertext.c:226 gtk/gtkcellview.c:180 gtk/gtktexttag.c:206
+#: gtk/gtkcellrenderertext.c:237 gtk/gtkcellview.c:180 gtk/gtktexttag.c:207
 msgid "Background color name"
 msgstr "Navn på bakgrunnsfarge"
 
-#: gtk/gtkcellrenderertext.c:227 gtk/gtkcellview.c:181 gtk/gtktexttag.c:207
+#: gtk/gtkcellrenderertext.c:238 gtk/gtkcellview.c:181 gtk/gtktexttag.c:208
 msgid "Background color as a string"
 msgstr "Bakgrunnsfarge som en streng"
 
-#: gtk/gtkcellrenderertext.c:234 gtk/gtkcellview.c:187 gtk/gtktexttag.c:214
+#: gtk/gtkcellrenderertext.c:245 gtk/gtkcellview.c:187 gtk/gtktexttag.c:215
 msgid "Background color"
 msgstr "Bakgrunnsfarge"
 
-#: gtk/gtkcellrenderertext.c:235 gtk/gtkcellview.c:188
+#: gtk/gtkcellrenderertext.c:246 gtk/gtkcellview.c:188
 msgid "Background color as a GdkColor"
 msgstr "Bakgrunnsfarge som en GdkColor"
 
-#: gtk/gtkcellrenderertext.c:242 gtk/gtktexttag.c:240
+#: gtk/gtkcellrenderertext.c:253 gtk/gtktexttag.c:241
 msgid "Foreground color name"
 msgstr "Navn på forgrunnsfarge"
 
-#: gtk/gtkcellrenderertext.c:243 gtk/gtktexttag.c:241
+#: gtk/gtkcellrenderertext.c:254 gtk/gtktexttag.c:242
 msgid "Foreground color as a string"
 msgstr "Forgrunnsfarge som en streng"
 
-#: gtk/gtkcellrenderertext.c:250 gtk/gtktexttag.c:248
+#: gtk/gtkcellrenderertext.c:261 gtk/gtktexttag.c:249
 msgid "Foreground color"
 msgstr "Forgrunnsfarge"
 
-#: gtk/gtkcellrenderertext.c:251
+#: gtk/gtkcellrenderertext.c:262
 msgid "Foreground color as a GdkColor"
 msgstr "Forgrunnsfarge som en GdkColor"
 
-#: gtk/gtkcellrenderertext.c:259 gtk/gtkentry.c:483 gtk/gtktexttag.c:274
-#: gtk/gtktextview.c:587
+#: gtk/gtkcellrenderertext.c:270 gtk/gtkentry.c:505 gtk/gtktexttag.c:275
+#: gtk/gtktextview.c:577
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: gtk/gtkcellrenderertext.c:260 gtk/gtktexttag.c:275 gtk/gtktextview.c:588
+#: gtk/gtkcellrenderertext.c:271 gtk/gtktexttag.c:276 gtk/gtktextview.c:578
 msgid "Whether the text can be modified by the user"
 msgstr "Om teksten kan endres av brukeren"
 
-#: gtk/gtkcellrenderertext.c:267 gtk/gtkcellrenderertext.c:275
-#: gtk/gtkfontsel.c:221 gtk/gtktexttag.c:282 gtk/gtktexttag.c:290
+#: gtk/gtkcellrenderertext.c:278 gtk/gtkcellrenderertext.c:286
+#: gtk/gtkfontsel.c:222 gtk/gtktexttag.c:283 gtk/gtktexttag.c:291
 msgid "Font"
 msgstr "Skrift"
 
-#: gtk/gtkcellrenderertext.c:268
+#: gtk/gtkcellrenderertext.c:279
 msgid "Font description as a string"
 msgstr "Beskrivelse av skriften som en streng"
 
-#: gtk/gtkcellrenderertext.c:276 gtk/gtktexttag.c:291
+#: gtk/gtkcellrenderertext.c:287 gtk/gtktexttag.c:292
 msgid "Font description as a PangoFontDescription struct"
 msgstr "Skriftbeskrivelse som en PangoFontDescription struct"
 
-#: gtk/gtkcellrenderertext.c:284 gtk/gtktexttag.c:299
+#: gtk/gtkcellrenderertext.c:295 gtk/gtktexttag.c:300
 msgid "Font family"
 msgstr "Skriftfamilie"
 
-#: gtk/gtkcellrenderertext.c:285 gtk/gtktexttag.c:300
+#: gtk/gtkcellrenderertext.c:296 gtk/gtktexttag.c:301
 msgid "Name of the font family, e.g. Sans, Helvetica, Times, Monospace"
 msgstr "Navn på skriftfamilien, f.eks Sans, Helvetica, Times, Monospace"
 
-#: gtk/gtkcellrenderertext.c:292 gtk/gtkcellrenderertext.c:293
-#: gtk/gtktexttag.c:307
+#: gtk/gtkcellrenderertext.c:303 gtk/gtkcellrenderertext.c:304
+#: gtk/gtktexttag.c:308
 msgid "Font style"
 msgstr "Skriftstil"
 
-#: gtk/gtkcellrenderertext.c:301 gtk/gtkcellrenderertext.c:302
-#: gtk/gtktexttag.c:316
+#: gtk/gtkcellrenderertext.c:312 gtk/gtkcellrenderertext.c:313
+#: gtk/gtktexttag.c:317
 msgid "Font variant"
 msgstr "Skriftvariant"
 
-#: gtk/gtkcellrenderertext.c:310 gtk/gtkcellrenderertext.c:311
-#: gtk/gtktexttag.c:325
+#: gtk/gtkcellrenderertext.c:321 gtk/gtkcellrenderertext.c:322
+#: gtk/gtktexttag.c:326
 msgid "Font weight"
 msgstr "Skriftens vekt"
 
-#: gtk/gtkcellrenderertext.c:320 gtk/gtkcellrenderertext.c:321
-#: gtk/gtktexttag.c:336
+#: gtk/gtkcellrenderertext.c:331 gtk/gtkcellrenderertext.c:332
+#: gtk/gtktexttag.c:337
 msgid "Font stretch"
 msgstr "Skriftens \"strekk\""
 
-#: gtk/gtkcellrenderertext.c:329 gtk/gtkcellrenderertext.c:330
-#: gtk/gtktexttag.c:345
+#: gtk/gtkcellrenderertext.c:340 gtk/gtkcellrenderertext.c:341
+#: gtk/gtktexttag.c:346
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
-#: gtk/gtkcellrenderertext.c:339 gtk/gtktexttag.c:365
+#: gtk/gtkcellrenderertext.c:350 gtk/gtktexttag.c:366
 msgid "Font points"
 msgstr "Skriftpunkter"
 
-#: gtk/gtkcellrenderertext.c:340 gtk/gtktexttag.c:366
+#: gtk/gtkcellrenderertext.c:351 gtk/gtktexttag.c:367
 msgid "Font size in points"
 msgstr "Størrelse på skrift i punkter"
 
-#: gtk/gtkcellrenderertext.c:349 gtk/gtktexttag.c:355
+#: gtk/gtkcellrenderertext.c:360 gtk/gtktexttag.c:356
 msgid "Font scale"
 msgstr "Skriftskalering"
 
-#: gtk/gtkcellrenderertext.c:350
+#: gtk/gtkcellrenderertext.c:361
 msgid "Font scaling factor"
 msgstr "Skaleringsfaktor for skrift"
 
-#: gtk/gtkcellrenderertext.c:359 gtk/gtktexttag.c:424
+#: gtk/gtkcellrenderertext.c:370 gtk/gtktexttag.c:425
 msgid "Rise"
 msgstr "Hev"
 
-#: gtk/gtkcellrenderertext.c:360
+#: gtk/gtkcellrenderertext.c:371
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative)"
 msgstr ""
 "Tekstavstand over grunnlinjen (under grunnlinjen hvis hevingen er negativ)"
 
-#: gtk/gtkcellrenderertext.c:370 gtk/gtktexttag.c:464
+#: gtk/gtkcellrenderertext.c:381 gtk/gtktexttag.c:465
 msgid "Strikethrough"
 msgstr "Gjennomstreking"
 
-#: gtk/gtkcellrenderertext.c:371 gtk/gtktexttag.c:465
+#: gtk/gtkcellrenderertext.c:382 gtk/gtktexttag.c:466
 msgid "Whether to strike through the text"
 msgstr "Bruk gjennomstreking av teksten"
 
-#: gtk/gtkcellrenderertext.c:378 gtk/gtktexttag.c:472
+#: gtk/gtkcellrenderertext.c:389 gtk/gtktexttag.c:473
 msgid "Underline"
 msgstr "Understrek"
 
-#: gtk/gtkcellrenderertext.c:379 gtk/gtktexttag.c:473
+#: gtk/gtkcellrenderertext.c:390 gtk/gtktexttag.c:474
 msgid "Style of underline for this text"
 msgstr "Stil for understreking av denne teksten."
 
-#: gtk/gtkcellrenderertext.c:387 gtk/gtktexttag.c:384
+#: gtk/gtkcellrenderertext.c:398 gtk/gtktexttag.c:385
 msgid "Language"
 msgstr "Språk"
 
-#: gtk/gtkcellrenderertext.c:388 gtk/gtktexttag.c:385
+#: gtk/gtkcellrenderertext.c:399
 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 "
@@ -1020,516 +1205,549 @@ msgstr ""
 "som et hint når teksten rendres. Hvis du ikke forstår denne parameteren "
 "trenger du den sannsynligvis ikke"
 
-#: gtk/gtkcellrenderertext.c:398 gtk/gtkcellview.c:195 gtk/gtktexttag.c:509
+#: gtk/gtkcellrenderertext.c:407 gtk/gtklabel.c:413
+msgid "Ellipsize"
+msgstr ""
+
+#: gtk/gtkcellrenderertext.c:408
+msgid ""
+"The preferred place to ellipsize the string, if the cell renderer does not "
+"have enough room to display the entire string, if at all"
+msgstr ""
+
+#: gtk/gtkcellrenderertext.c:418 gtk/gtkcellview.c:195 gtk/gtktexttag.c:510
 msgid "Background set"
 msgstr "Bakgrunn satt"
 
-#: gtk/gtkcellrenderertext.c:399 gtk/gtkcellview.c:196 gtk/gtktexttag.c:510
+#: gtk/gtkcellrenderertext.c:419 gtk/gtkcellview.c:196 gtk/gtktexttag.c:511
 msgid "Whether this tag affects the background color"
 msgstr "Om denne merkingen påvirker bakgrunnsfargen"
 
-#: gtk/gtkcellrenderertext.c:402 gtk/gtktexttag.c:521
+#: gtk/gtkcellrenderertext.c:422 gtk/gtktexttag.c:522
 msgid "Foreground set"
 msgstr "Forgrunn satt"
 
-#: gtk/gtkcellrenderertext.c:403 gtk/gtktexttag.c:522
+#: gtk/gtkcellrenderertext.c:423 gtk/gtktexttag.c:523
 msgid "Whether this tag affects the foreground color"
 msgstr "Om denne merkingen påvirker forgrunnsfargen"
 
-#: gtk/gtkcellrenderertext.c:406 gtk/gtktexttag.c:529
+#: gtk/gtkcellrenderertext.c:426 gtk/gtktexttag.c:530
 msgid "Editability set"
 msgstr "Redigerbarhet satt"
 
-#: gtk/gtkcellrenderertext.c:407 gtk/gtktexttag.c:530
+#: gtk/gtkcellrenderertext.c:427 gtk/gtktexttag.c:531
 msgid "Whether this tag affects text editability"
 msgstr "Om denne merkingen påvirker redigerbarhet for teksten"
 
-#: gtk/gtkcellrenderertext.c:410 gtk/gtktexttag.c:533
+#: gtk/gtkcellrenderertext.c:430 gtk/gtktexttag.c:534
 msgid "Font family set"
 msgstr "Skriftfamilie satt"
 
-#: gtk/gtkcellrenderertext.c:411 gtk/gtktexttag.c:534
+#: gtk/gtkcellrenderertext.c:431 gtk/gtktexttag.c:535
 msgid "Whether this tag affects the font family"
 msgstr "Om denne merkingen påvirker skriftfamilien"
 
-#: gtk/gtkcellrenderertext.c:414 gtk/gtktexttag.c:537
+#: gtk/gtkcellrenderertext.c:434 gtk/gtktexttag.c:538
 msgid "Font style set"
 msgstr "Skriftstil satt"
 
-#: gtk/gtkcellrenderertext.c:415 gtk/gtktexttag.c:538
+#: gtk/gtkcellrenderertext.c:435 gtk/gtktexttag.c:539
 msgid "Whether this tag affects the font style"
 msgstr "Om denne merkingen påvirker skriftstil"
 
-#: gtk/gtkcellrenderertext.c:418 gtk/gtktexttag.c:541
+#: gtk/gtkcellrenderertext.c:438 gtk/gtktexttag.c:542
 msgid "Font variant set"
 msgstr "Skrifttypevariant satt"
 
-#: gtk/gtkcellrenderertext.c:419 gtk/gtktexttag.c:542
+#: gtk/gtkcellrenderertext.c:439 gtk/gtktexttag.c:543
 msgid "Whether this tag affects the font variant"
 msgstr "Om denne merkingen påvirker skriftvarianten"
 
-#: gtk/gtkcellrenderertext.c:422 gtk/gtktexttag.c:545
+#: gtk/gtkcellrenderertext.c:442 gtk/gtktexttag.c:546
 msgid "Font weight set"
 msgstr "Skrifttyngde satt"
 
-#: gtk/gtkcellrenderertext.c:423 gtk/gtktexttag.c:546
+#: gtk/gtkcellrenderertext.c:443 gtk/gtktexttag.c:547
 msgid "Whether this tag affects the font weight"
 msgstr "Om denne merkingen påvirker skrifttyngden"
 
-#: gtk/gtkcellrenderertext.c:426 gtk/gtktexttag.c:549
+#: gtk/gtkcellrenderertext.c:446 gtk/gtktexttag.c:550
 msgid "Font stretch set"
 msgstr "Skriftstrekk satt"
 
-#: gtk/gtkcellrenderertext.c:427 gtk/gtktexttag.c:550
+#: gtk/gtkcellrenderertext.c:447 gtk/gtktexttag.c:551
 msgid "Whether this tag affects the font stretch"
 msgstr "Om denne merkingen påvirker strekking av skriften"
 
-#: gtk/gtkcellrenderertext.c:430 gtk/gtktexttag.c:553
+#: gtk/gtkcellrenderertext.c:450 gtk/gtktexttag.c:554
 msgid "Font size set"
 msgstr "Skriftstørrelse satt"
 
-#: gtk/gtkcellrenderertext.c:431 gtk/gtktexttag.c:554
+#: gtk/gtkcellrenderertext.c:451 gtk/gtktexttag.c:555
 msgid "Whether this tag affects the font size"
 msgstr "Om denne merkingen påvirker skriftstørrelsen"
 
-#: gtk/gtkcellrenderertext.c:434 gtk/gtktexttag.c:557
+#: gtk/gtkcellrenderertext.c:454 gtk/gtktexttag.c:558
 msgid "Font scale set"
 msgstr "Skriftskalering satt"
 
-#: gtk/gtkcellrenderertext.c:435 gtk/gtktexttag.c:558
+#: gtk/gtkcellrenderertext.c:455 gtk/gtktexttag.c:559
 msgid "Whether this tag scales the font size by a factor"
 msgstr "Om denne merkingen skalerer skriftstørrelsen med en gitt faktor"
 
-#: gtk/gtkcellrenderertext.c:438 gtk/gtktexttag.c:577
+#: gtk/gtkcellrenderertext.c:458 gtk/gtktexttag.c:578
 msgid "Rise set"
 msgstr "Heving satt"
 
-#: gtk/gtkcellrenderertext.c:439 gtk/gtktexttag.c:578
+#: gtk/gtkcellrenderertext.c:459 gtk/gtktexttag.c:579
 msgid "Whether this tag affects the rise"
 msgstr "Om denne merkingen påvirker heving"
 
-#: gtk/gtkcellrenderertext.c:442 gtk/gtktexttag.c:593
+#: gtk/gtkcellrenderertext.c:462 gtk/gtktexttag.c:594
 msgid "Strikethrough set"
 msgstr "Gjennomstreking satt"
 
-#: gtk/gtkcellrenderertext.c:443 gtk/gtktexttag.c:594
+#: gtk/gtkcellrenderertext.c:463 gtk/gtktexttag.c:595
 msgid "Whether this tag affects strikethrough"
 msgstr "Om denne merkingen påvirker gjennomstreking"
 
-#: gtk/gtkcellrenderertext.c:446 gtk/gtktexttag.c:601
+#: gtk/gtkcellrenderertext.c:466 gtk/gtktexttag.c:602
 msgid "Underline set"
 msgstr "Understreking satt"
 
-#: gtk/gtkcellrenderertext.c:447 gtk/gtktexttag.c:602
+#: gtk/gtkcellrenderertext.c:467 gtk/gtktexttag.c:603
 msgid "Whether this tag affects underlining"
 msgstr "Om denne merkingen påvirker understreking"
 
-#: gtk/gtkcellrenderertext.c:450 gtk/gtktexttag.c:565
+#: gtk/gtkcellrenderertext.c:470 gtk/gtktexttag.c:566
 msgid "Language set"
 msgstr "Språk satt"
 
-#: gtk/gtkcellrenderertext.c:451 gtk/gtktexttag.c:566
+#: gtk/gtkcellrenderertext.c:471 gtk/gtktexttag.c:567
 msgid "Whether this tag affects the language the text is rendered as"
 msgstr "Om denne merkingen påvirker språket teksten skal rendres som"
 
-#: gtk/gtkcellrenderertoggle.c:141
+#: gtk/gtkcellrenderertext.c:474
+#, fuzzy
+msgid "Ellipsize set"
+msgstr "Heving satt"
+
+#: gtk/gtkcellrenderertext.c:475
+#, fuzzy
+msgid "Whether this tag affects the ellipsize mode"
+msgstr "Om denne merkingen påvirker heving"
+
+#: gtk/gtkcellrenderertoggle.c:142
 msgid "Toggle state"
 msgstr "Knappetilstand"
 
-#: gtk/gtkcellrenderertoggle.c:142
+#: gtk/gtkcellrenderertoggle.c:143
 msgid "The toggle state of the button"
 msgstr "Tilstand for knapp (vending)"
 
-#: gtk/gtkcellrenderertoggle.c:150
+#: gtk/gtkcellrenderertoggle.c:151
 msgid "Inconsistent state"
 msgstr "Ukonsistent tilstand"
 
-#: gtk/gtkcellrenderertoggle.c:151
+#: gtk/gtkcellrenderertoggle.c:152
 msgid "The inconsistent state of the button"
 msgstr "Den ukonsistente tilstanden for knappen"
 
-#: gtk/gtkcellrenderertoggle.c:159
+#: gtk/gtkcellrenderertoggle.c:160
 msgid "Activatable"
 msgstr "Aktiverbar"
 
-#: gtk/gtkcellrenderertoggle.c:160
+#: gtk/gtkcellrenderertoggle.c:161
 msgid "The toggle button can be activated"
 msgstr "Venderknappen kan aktiveres"
 
-#: gtk/gtkcellrenderertoggle.c:168
+#: gtk/gtkcellrenderertoggle.c:169
 msgid "Radio state"
 msgstr "Radiotilstand"
 
-#: gtk/gtkcellrenderertoggle.c:169
+#: gtk/gtkcellrenderertoggle.c:170
 msgid "Draw the toggle button as a radio button"
 msgstr "Tegn knapp for vending som en radioknapp"
 
-#: gtk/gtkcheckbutton.c:99 gtk/gtkcheckmenuitem.c:140 gtk/gtkoptionmenu.c:200
+#: gtk/gtkcheckbutton.c:100 gtk/gtkcheckmenuitem.c:141 gtk/gtkoptionmenu.c:201
 msgid "Indicator Size"
 msgstr "Indikatorstørrelse"
 
-#: gtk/gtkcheckbutton.c:100 gtk/gtkcheckmenuitem.c:142
+#: gtk/gtkcheckbutton.c:101 gtk/gtkcheckmenuitem.c:143
 msgid "Size of check or radio indicator"
 msgstr "Størrelse på avkrysnings- eller radioindikator"
 
-#: gtk/gtkcheckbutton.c:107 gtk/gtkexpander.c:255 gtk/gtkoptionmenu.c:206
+#: gtk/gtkcheckbutton.c:108 gtk/gtkexpander.c:256 gtk/gtkoptionmenu.c:207
 msgid "Indicator Spacing"
 msgstr "Mellomrom for indikator"
 
-#: gtk/gtkcheckbutton.c:108
+#: gtk/gtkcheckbutton.c:109
 msgid "Spacing around check or radio indicator"
 msgstr "Mellomrom rundt avkrysnings- eller radioindikator"
 
-#: gtk/gtkcheckmenuitem.c:117 gtk/gtktogglebutton.c:133
+#: gtk/gtkcheckmenuitem.c:118 gtk/gtkfilechooserbutton.c:257
+#: gtk/gtktogglebutton.c:134
 msgid "Active"
 msgstr "Aktiv"
 
-#: gtk/gtkcheckmenuitem.c:118
+#: gtk/gtkcheckmenuitem.c:119
 msgid "Whether the menu item is checked"
 msgstr "Om menyoppføringen er avkrysset"
 
-#: gtk/gtkcheckmenuitem.c:125 gtk/gtktogglebutton.c:141
+#: gtk/gtkcheckmenuitem.c:126 gtk/gtktogglebutton.c:142
 msgid "Inconsistent"
 msgstr "Inkonsistent"
 
-#: gtk/gtkcheckmenuitem.c:126
+#: gtk/gtkcheckmenuitem.c:127
 msgid "Whether to display an \"inconsistent\" state"
 msgstr "Om inkonsistent tilstand skal anvises"
 
-#: gtk/gtkcheckmenuitem.c:133
+#: gtk/gtkcheckmenuitem.c:134
 msgid "Draw as radio menu item"
 msgstr "Tegn som radiomenyoppføring"
 
-#: gtk/gtkcheckmenuitem.c:134
+#: gtk/gtkcheckmenuitem.c:135
 msgid "Whether the menu item looks like a radio menu item"
 msgstr "Om menyoppføringen ser ut som en radiomenyoppføring"
 
-#: gtk/gtkcolorbutton.c:202
+#: gtk/gtkcolorbutton.c:203
 msgid "Use alpha"
 msgstr "Bruk alpha"
 
-#: gtk/gtkcolorbutton.c:203
+#: gtk/gtkcolorbutton.c:204
 msgid "Whether or not to give the color an alpha value"
 msgstr "Om fargen skal få en alphaverdi eller ikke"
 
-#: gtk/gtkcolorbutton.c:217 gtk/gtkfontbutton.c:175
-#: gtk/gtktreeviewcolumn.c:287
+#: gtk/gtkcolorbutton.c:218 gtk/gtkfilechooserbutton.c:251
+#: gtk/gtkfontbutton.c:176 gtk/gtktreeviewcolumn.c:298
 msgid "Title"
 msgstr "Tittel"
 
-#: gtk/gtkcolorbutton.c:218
+#: gtk/gtkcolorbutton.c:219
 msgid "The title of the color selection dialog"
 msgstr "Tittel på dialogen for fargevalg"
 
-#: gtk/gtkcolorbutton.c:232 gtk/gtkcolorsel.c:1781
+#: gtk/gtkcolorbutton.c:233 gtk/gtkcolorsel.c:1782
 msgid "Current Color"
 msgstr "Aktiv farge"
 
-#: gtk/gtkcolorbutton.c:233
+#: gtk/gtkcolorbutton.c:234
 msgid "The selected color"
 msgstr "Valgt farge"
 
-#: gtk/gtkcolorbutton.c:247 gtk/gtkcolorsel.c:1788
+#: gtk/gtkcolorbutton.c:248 gtk/gtkcolorsel.c:1789
 msgid "Current Alpha"
 msgstr "Nåværende alpha"
 
-#: gtk/gtkcolorbutton.c:248
+#: gtk/gtkcolorbutton.c:249
 msgid "The selected opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr ""
 "Nåværende verdi for ugjennomsiktighet (0 helt gjennomsiktig, 65535 helt "
 "ugjennomsiktig)"
 
-#: gtk/gtkcolorsel.c:1767
+#: gtk/gtkcolorsel.c:1768
 msgid "Has Opacity Control"
 msgstr "Har kontroll for ugjennomsiktighet"
 
-#: gtk/gtkcolorsel.c:1768
+#: gtk/gtkcolorsel.c:1769
 msgid "Whether the color selector should allow setting opacity"
 msgstr "La fargevelgeren tillate å sette ugjennomsiktighet"
 
-#: gtk/gtkcolorsel.c:1774
+#: gtk/gtkcolorsel.c:1775
 msgid "Has palette"
 msgstr "Har palett"
 
-#: gtk/gtkcolorsel.c:1775
+#: gtk/gtkcolorsel.c:1776
 msgid "Whether a palette should be used"
 msgstr "Skal en palett brukes"
 
-#: gtk/gtkcolorsel.c:1782
+#: gtk/gtkcolorsel.c:1783
 msgid "The current color"
 msgstr "Den aktive fargen"
 
-#: gtk/gtkcolorsel.c:1789
+#: gtk/gtkcolorsel.c:1790
 msgid "The current opacity value (0 fully transparent, 65535 fully opaque)"
 msgstr ""
 "Nåværende verdi for ugjennomsiktighet (0 helt gjennomsiktig, 65535 helt "
 "ugjennomsiktig)"
 
-#: gtk/gtkcolorsel.c:1803
+#: gtk/gtkcolorsel.c:1804
 msgid "Custom palette"
 msgstr "Egendefinert palett"
 
-#: gtk/gtkcolorsel.c:1804
+#: gtk/gtkcolorsel.c:1805
 msgid "Palette to use in the color selector"
 msgstr "Palett som skal brukes i fargevelgeren"
 
-#: gtk/gtkcombo.c:144
+#: gtk/gtkcombo.c:145
 msgid "Enable arrow keys"
 msgstr "Aktiver piltaster"
 
-#: gtk/gtkcombo.c:145
+#: gtk/gtkcombo.c:146
 msgid "Whether the arrow keys move through the list of items"
 msgstr "Om piltastene skal flytte markøren gjennom listen med oppføringer"
 
-#: gtk/gtkcombo.c:151
+#: gtk/gtkcombo.c:152
 msgid "Always enable arrows"
 msgstr "Alltid aktiver piler"
 
-#: gtk/gtkcombo.c:152
+#: gtk/gtkcombo.c:153
 msgid "Obsolete property, ignored"
 msgstr "Gammel egenskap, ignorert"
 
-#: gtk/gtkcombo.c:158
+#: gtk/gtkcombo.c:159
 msgid "Case sensitive"
 msgstr "Skill mellom små/store bokstaver"
 
-#: gtk/gtkcombo.c:159
+#: gtk/gtkcombo.c:160
 msgid "Whether list item matching is case sensitive"
 msgstr "Om det skilles på små og store bokstaver i listeoppføringen"
 
-#: gtk/gtkcombo.c:166
+#: gtk/gtkcombo.c:167
 msgid "Allow empty"
 msgstr "Tillat tom"
 
-#: gtk/gtkcombo.c:167
+#: gtk/gtkcombo.c:168
 msgid "Whether an empty value may be entered in this field"
 msgstr "En tom verdi kan oppgis i dette feltet"
 
-#: gtk/gtkcombo.c:174
+#: gtk/gtkcombo.c:175
 msgid "Value in list"
 msgstr "Verdi i listen"
 
-#: gtk/gtkcombo.c:175
+#: gtk/gtkcombo.c:176
 msgid "Whether entered values must already be present in the list"
 msgstr "Verdier som spesifiseres må allerede være i listen"
 
-#: gtk/gtkcombobox.c:464
+#: gtk/gtkcombobox.c:529
 msgid "ComboBox model"
 msgstr "Modell for ComboBox"
 
-#: gtk/gtkcombobox.c:465
+#: gtk/gtkcombobox.c:530
 msgid "The model for the combo box"
 msgstr "Modell for komboboksen"
 
-#: gtk/gtkcombobox.c:472
+#: gtk/gtkcombobox.c:537
 msgid "Wrap width"
 msgstr "Bredde for bryting"
 
-#: gtk/gtkcombobox.c:473
+#: gtk/gtkcombobox.c:538
 msgid "Wrap width for layouting the items in a grid"
 msgstr "Brytningsbredde for utplassering av oppføringer i et rutenett"
 
-#: gtk/gtkcombobox.c:482
+#: gtk/gtkcombobox.c:547
 msgid "Row span column"
 msgstr "Kolonne for radutbredelse"
 
-#: gtk/gtkcombobox.c:483
+#: gtk/gtkcombobox.c:548
 msgid "TreeModel column containing the row span values"
 msgstr "TreeModel-kolonne som inneholder verdier for radutbredelse"
 
-#: gtk/gtkcombobox.c:492
+#: gtk/gtkcombobox.c:557
 msgid "Column span column"
 msgstr "Kolonne for kolonneutbredelse"
 
-#: gtk/gtkcombobox.c:493
+#: gtk/gtkcombobox.c:558
 msgid "TreeModel column containing the column span values"
 msgstr "TreeModel-kolonne som inneholder verdier for kolonneutbredelse"
 
-#: gtk/gtkcombobox.c:502
+#: gtk/gtkcombobox.c:568
 msgid "Active item"
 msgstr "Aktiv oppføring"
 
-#: gtk/gtkcombobox.c:503
+#: gtk/gtkcombobox.c:569
 msgid "The item which is currently active"
 msgstr "Oppføringen som er aktiv"
 
-#: gtk/gtkcombobox.c:511
+#: gtk/gtkcombobox.c:588 gtk/gtkuimanager.c:221
+msgid "Add tearoffs to menus"
+msgstr "Legg til avrivningsfelt til menyer"
+
+#: gtk/gtkcombobox.c:589
+#, fuzzy
+msgid "Whether dropdowns should have a tearoff menu item"
+msgstr "Om faner skal ha ensartet størrelse"
+
+#: gtk/gtkcombobox.c:604 gtk/gtkentry.c:530
+msgid "Has Frame"
+msgstr "Har ramme"
+
+#: gtk/gtkcombobox.c:605
+#, fuzzy
+msgid "Whether the combo box draws a frame around the child"
+msgstr "Kolonnen kan omorganiseres etter titler"
+
+#: gtk/gtkcombobox.c:613
+#, fuzzy
+msgid "Whether the combo box grabs focus when it is clicked with the mouse"
+msgstr "Om knappen tar fokus når den klikkes med musen"
+
+#: gtk/gtkcombobox.c:619
 msgid "Appears as list"
 msgstr "Vises som liste"
 
-#: gtk/gtkcombobox.c:512
-msgid "Whether combobox dropdowns should look like lists rather than menus"
+#: gtk/gtkcombobox.c:620
+#, fuzzy
+msgid "Whether dropdowns should look like lists rather than menus"
 msgstr ""
 "Om nedtrekksmenyer i kombobokser skal se ut som lister i stedet for menyer"
 
-#: gtk/gtkcomboboxentry.c:110
-msgid "Text Column"
-msgstr "Tekstkolonne"
-
-#: gtk/gtkcomboboxentry.c:111
-msgid "A column in the data source model to get the strings from"
-msgstr "En kolonne i datakildemodellen hvor man kan hente strenger"
-
-#: gtk/gtkcontainer.c:204
+#: gtk/gtkcontainer.c:205
 msgid "Resize mode"
 msgstr "Modus for endring av størrelse"
 
-#: gtk/gtkcontainer.c:205
+#: gtk/gtkcontainer.c:206
 msgid "Specify how resize events are handled"
 msgstr "Spesifiser hvordan hendelser for endring av størrelse håndteres"
 
-#: gtk/gtkcontainer.c:212
+#: gtk/gtkcontainer.c:213
 msgid "Border width"
 msgstr "Kantbredde"
 
-#: gtk/gtkcontainer.c:213
+#: gtk/gtkcontainer.c:214
 msgid "The width of the empty border outside the containers children"
 msgstr "Bredde på den tomme kanten utenfor kontainerens etterkommere"
 
-#: gtk/gtkcontainer.c:221
+#: gtk/gtkcontainer.c:222
 msgid "Child"
 msgstr "Etterkommer"
 
-#: gtk/gtkcontainer.c:222
+#: gtk/gtkcontainer.c:223
 msgid "Can be used to add a new child to the container"
 msgstr "Kan brukes for å legge til en ny etterkommer i kontaineren"
 
-#: gtk/gtkcurve.c:122
+#: gtk/gtkcurve.c:123
 msgid "Curve type"
 msgstr "Kurvetype"
 
-#: gtk/gtkcurve.c:123
+#: gtk/gtkcurve.c:124
 msgid "Is this curve linear, spline interpolated, or free-form"
 msgstr "Er kurven lineær, «spline-interpolated», eller i fri-form"
 
-#: gtk/gtkcurve.c:131
+#: gtk/gtkcurve.c:132
 msgid "Minimum X"
 msgstr "Minimum X"
 
-#: gtk/gtkcurve.c:132
+#: gtk/gtkcurve.c:133
 msgid "Minimum possible value for X"
 msgstr "Minste mulige verdi for X"
 
-#: gtk/gtkcurve.c:141
+#: gtk/gtkcurve.c:142
 msgid "Maximum X"
 msgstr "Maksimum X"
 
-#: gtk/gtkcurve.c:142
+#: gtk/gtkcurve.c:143
 msgid "Maximum possible X value"
 msgstr "Største mulige verdi for X"
 
-#: gtk/gtkcurve.c:151
+#: gtk/gtkcurve.c:152
 msgid "Minimum Y"
 msgstr "Minimum Y"
 
-#: gtk/gtkcurve.c:152
+#: gtk/gtkcurve.c:153
 msgid "Minimum possible value for Y"
 msgstr "Minste mulige verdi for Y"
 
-#: gtk/gtkcurve.c:161
+#: gtk/gtkcurve.c:162
 msgid "Maximum Y"
 msgstr "Maksimum Y"
 
-#: gtk/gtkcurve.c:162
+#: gtk/gtkcurve.c:163
 msgid "Maximum possible value for Y"
 msgstr "Største mulige verdi for Y"
 
-#: gtk/gtkdialog.c:146
+#: gtk/gtkdialog.c:148
 msgid "Has separator"
 msgstr "Har separator"
 
-#: gtk/gtkdialog.c:147
+#: gtk/gtkdialog.c:149
 msgid "The dialog has a separator bar above its buttons"
 msgstr "Dialogen har en skillelinje over knappene"
 
-#: gtk/gtkdialog.c:172
+#: gtk/gtkdialog.c:174
 msgid "Content area border"
 msgstr "Kant for innholdsområde"
 
-#: gtk/gtkdialog.c:173
+#: gtk/gtkdialog.c:175
 msgid "Width of border around the main dialog area"
 msgstr "Bredde på kanten rundt hoveddialogområdet"
 
-#: gtk/gtkdialog.c:180
+#: gtk/gtkdialog.c:182
 msgid "Button spacing"
 msgstr "Knappeavstand"
 
-#: gtk/gtkdialog.c:181
+#: gtk/gtkdialog.c:183
 msgid "Spacing between buttons"
 msgstr "Avstand mellom knapper"
 
-#: gtk/gtkdialog.c:189
+#: gtk/gtkdialog.c:191
 msgid "Action area border"
 msgstr "Kant for handlingsområde"
 
-#: gtk/gtkdialog.c:190
+#: gtk/gtkdialog.c:192
 msgid "Width of border around the button area at the bottom of the dialog"
 msgstr "Bredde på kanten rundt knappeområdet nederst i dialogen"
 
-#: gtk/gtkentry.c:463 gtk/gtklabel.c:370
+#: gtk/gtkentry.c:485 gtk/gtklabel.c:378
 msgid "Cursor Position"
 msgstr "Markørposisjon"
 
-#: gtk/gtkentry.c:464 gtk/gtklabel.c:371
+#: gtk/gtkentry.c:486 gtk/gtklabel.c:379
 msgid "The current position of the insertion cursor in chars"
 msgstr "Nåværende posisjon for innsettingsmarkør i tegn"
 
-#: gtk/gtkentry.c:473 gtk/gtklabel.c:380
+#: gtk/gtkentry.c:495 gtk/gtklabel.c:388
 msgid "Selection Bound"
 msgstr "Utvalg bundet"
 
-#: gtk/gtkentry.c:474 gtk/gtklabel.c:381
+#: gtk/gtkentry.c:496 gtk/gtklabel.c:389
 msgid ""
 "The position of the opposite end of the selection from the cursor in chars"
 msgstr "Posisjon for motsatt ende av utvalget fra markøren i tegn"
 
-#: gtk/gtkentry.c:484
+#: gtk/gtkentry.c:506
 msgid "Whether the entry contents can be edited"
 msgstr "Innhold i oppføringen kan redigeres"
 
-#: gtk/gtkentry.c:491
+#: gtk/gtkentry.c:513
 msgid "Maximum length"
 msgstr "Maksimal lengde"
 
-#: gtk/gtkentry.c:492
+#: gtk/gtkentry.c:514
 msgid "Maximum number of characters for this entry. Zero if no maximum"
 msgstr ""
 "Maksimalt antall tegn for denne oppføringen. Null hvis ingen maksimalverdi "
 "er satt"
 
-#: gtk/gtkentry.c:500
+#: gtk/gtkentry.c:522
 msgid "Visibility"
 msgstr "Synlighet"
 
-#: gtk/gtkentry.c:501
+#: gtk/gtkentry.c:523
 msgid ""
 "FALSE displays the \"invisible char\" instead of the actual text (password "
 "mode)"
 msgstr "USANN viser «usynlige tegn» i stedet for faktisk tekst (passordmodus)"
 
-#: gtk/gtkentry.c:508
-msgid "Has Frame"
-msgstr "Har ramme"
-
-#: gtk/gtkentry.c:509
+#: gtk/gtkentry.c:531
 msgid "FALSE removes outside bevel from entry"
 msgstr "USANN fjerner ytre kant fra oppføringen"
 
-#: gtk/gtkentry.c:516
+#: gtk/gtkentry.c:538
 msgid "Invisible character"
 msgstr "Usynlig tegn"
 
-#: gtk/gtkentry.c:517
+#: gtk/gtkentry.c:539
 msgid "The character to use when masking entry contents (in \"password mode\")"
 msgstr ""
 "Tegnet som skal brukes når man masker ut innhold i oppføringen (i «passord "
 "modus»)"
 
-#: gtk/gtkentry.c:524
+#: gtk/gtkentry.c:546
 msgid "Activates default"
 msgstr "Aktiverer forvalg"
 
-#: gtk/gtkentry.c:525
+#: gtk/gtkentry.c:547
 msgid ""
 "Whether to activate the default widget (such as the default button in a "
 "dialog) when Enter is pressed"
@@ -1537,67 +1755,96 @@ msgstr ""
 "Om forvalgt widget skal aktiveres (f.eks forvalgt knapp i en dialog) når man "
 "trykker linjeskift"
 
-#: gtk/gtkentry.c:531
+#: gtk/gtkentry.c:553
 msgid "Width in chars"
 msgstr "Bredde i tegn"
 
-#: gtk/gtkentry.c:532
+#: gtk/gtkentry.c:554
 msgid "Number of characters to leave space for in the entry"
 msgstr "Antall tegn det skal være plass til i feltet"
 
-#: gtk/gtkentry.c:541
+#: gtk/gtkentry.c:563
 msgid "Scroll offset"
 msgstr "Rulleavstand"
 
-#: gtk/gtkentry.c:542
+#: gtk/gtkentry.c:564
 msgid "Number of pixels of the entry scrolled off the screen to the left"
 msgstr "Antall piksler av oppføringen som rullet ut av skjermen til venstre"
 
-#: gtk/gtkentry.c:552
+#: gtk/gtkentry.c:574
 msgid "The contents of the entry"
 msgstr "Innhold i oppføringen"
 
-#: gtk/gtkentry.c:567 gtk/gtkmisc.c:99
+#: gtk/gtkentry.c:589 gtk/gtkmisc.c:100
 msgid "X align"
 msgstr "X-justering"
 
-#: gtk/gtkentry.c:568 gtk/gtkmisc.c:100
+#: gtk/gtkentry.c:590 gtk/gtkmisc.c:101
+#, fuzzy
 msgid ""
 "The horizontal alignment, from 0 (left) to 1 (right). Reversed for RTL "
-"layouts"
+"layouts."
 msgstr ""
 "Horisontal justering, fra 0 (venstre) til 1 (høyre). Omvendt for RTL-"
 "utforminger"
 
-#: gtk/gtkentry.c:801
+#: gtk/gtkentry.c:828
 msgid "Select on focus"
 msgstr "Velg på fokus"
 
-#: gtk/gtkentry.c:802
+#: gtk/gtkentry.c:829
 msgid "Whether to select the contents of an entry when it is focused"
 msgstr "Om innholdet i oppføringen skal markeres når den får fokus"
 
-#: gtk/gtkentrycompletion.c:229
+#: gtk/gtkentrycompletion.c:273
 msgid "Completion Model"
 msgstr "Fullføringsmodell"
 
-#: gtk/gtkentrycompletion.c:230
+#: gtk/gtkentrycompletion.c:274
 msgid "The model to find matches in"
 msgstr "Modell for søk etter treff"
 
-#: gtk/gtkentrycompletion.c:236
+#: gtk/gtkentrycompletion.c:280
 msgid "Minimum Key Length"
 msgstr "Minste lengde på nøkkel"
 
-#: gtk/gtkentrycompletion.c:237
+#: gtk/gtkentrycompletion.c:281
 msgid "Minimum length of the search key in order to look up matches"
 msgstr "Minimumslengde på nøkkel for søk for å slå opp treff"
 
-#: gtk/gtkeventbox.c:120
+#: gtk/gtkentrycompletion.c:296 gtk/gtkiconview.c:361
+#, fuzzy
+msgid "Text column"
+msgstr "Tekstkolonne"
+
+#: gtk/gtkentrycompletion.c:297
+#, fuzzy
+msgid "The column of the model containing the strings."
+msgstr "En kolonne i datakildemodellen hvor man kan hente strenger"
+
+#: gtk/gtkentrycompletion.c:315
+msgid "Inline completion"
+msgstr ""
+
+#: gtk/gtkentrycompletion.c:316
+#, fuzzy
+msgid "Whether the common prefix should be inserted automatically"
+msgstr "Vis/ikke vis kant"
+
+#: gtk/gtkentrycompletion.c:330
+msgid "Popup completion"
+msgstr ""
+
+#: gtk/gtkentrycompletion.c:331
+#, fuzzy
+msgid "Whether the completions should be shown in a popup window"
+msgstr "Vis/ikke vis kant"
+
+#: gtk/gtkeventbox.c:121
 msgid "Visible Window"
 msgstr "Synlig vindu"
 
-#: gtk/gtkeventbox.c:121
+#: gtk/gtkeventbox.c:122
 msgid ""
 "Whether the event box is visible, as opposed to invisible and only used to "
 "trap events."
@@ -1605,11 +1852,11 @@ msgstr ""
 "Om handlingsboksen er synlig i motsetning til usynlig. I tillegg kan den kun "
 "brukes til å fange opp hendelser."
 
-#: gtk/gtkeventbox.c:127
+#: gtk/gtkeventbox.c:128
 msgid "Above child"
 msgstr "Over barn"
 
-#: gtk/gtkeventbox.c:128
+#: gtk/gtkeventbox.c:129
 msgid ""
 "Whether the event-trapping window of the eventbox is above the window of the "
 "child widget as opposed to below it."
@@ -1617,310 +1864,337 @@ msgstr ""
 "Om vinduet som fanger hendelser i hendelsesboksen er over etterkommers vindu "
 "eller under det."
 
-#: gtk/gtkexpander.c:197
+#: gtk/gtkexpander.c:198
 msgid "Expanded"
 msgstr "Utvidet"
 
-#: gtk/gtkexpander.c:198
+#: gtk/gtkexpander.c:199
 msgid "Whether the expander has been opened to reveal the child widget"
 msgstr "Om utvideren er åpnet for å avdekke underkomponenten"
 
-#: gtk/gtkexpander.c:206
+#: gtk/gtkexpander.c:207
 msgid "Text of the expander's label"
 msgstr "Tekst i utviderens etikett"
 
-#: gtk/gtkexpander.c:221 gtk/gtklabel.c:306
+#: gtk/gtkexpander.c:222 gtk/gtklabel.c:314
 msgid "Use markup"
 msgstr "Bruk tagging"
 
-#: gtk/gtkexpander.c:222 gtk/gtklabel.c:307
+#: gtk/gtkexpander.c:223 gtk/gtklabel.c:315
 msgid "The text of the label includes XML markup. See pango_parse_markup()"
 msgstr "Teksten i etiketten inneholder XML-tagger. Se pango_parse_markup()"
 
-#: gtk/gtkexpander.c:230
+#: gtk/gtkexpander.c:231
 msgid "Space to put between the label and the child"
 msgstr "Mellomrom som skal plasseres mellom etiketten og barnet"
 
-#: gtk/gtkexpander.c:239 gtk/gtkframe.c:170 gtk/gtktoolbutton.c:194
+#: gtk/gtkexpander.c:240 gtk/gtkframe.c:171 gtk/gtktoolbutton.c:195
 msgid "Label widget"
 msgstr "Etikett-widget"
 
-#: gtk/gtkexpander.c:240
+#: gtk/gtkexpander.c:241
 msgid "A widget to display in place of the usual expander label"
 msgstr "Et widget som vises i stedet for den vanlige utvideretiketten"
 
-#: gtk/gtkexpander.c:246 gtk/gtktreeview.c:645
+#: gtk/gtkexpander.c:247 gtk/gtktreeview.c:704
 msgid "Expander Size"
 msgstr "Størrelse på utvider"
 
-#: gtk/gtkexpander.c:247 gtk/gtktreeview.c:646
+#: gtk/gtkexpander.c:248 gtk/gtktreeview.c:705
 msgid "Size of the expander arrow"
 msgstr "Størrelse på utviderpil"
 
-#: gtk/gtkexpander.c:256
+#: gtk/gtkexpander.c:257
 msgid "Spacing around expander arrow"
 msgstr "Tomrom rundt utviderpilen"
 
-#: gtk/gtkfilechooser.c:175
+#: gtk/gtkfilechooser.c:176
 msgid "Action"
 msgstr "Handling"
 
-#: gtk/gtkfilechooser.c:176
+#: gtk/gtkfilechooser.c:177
 msgid "The type of operation that the file selector is performing"
 msgstr "Type operasjon om utføres av filutvalgsdialogen"
 
-#: gtk/gtkfilechooser.c:182
+#: gtk/gtkfilechooser.c:183
 msgid "File System Backend"
 msgstr "Filsystem-motor"
 
-#: gtk/gtkfilechooser.c:183
+#: gtk/gtkfilechooser.c:184
 msgid "Name of file system backend to use"
 msgstr "Navn på filsystem-motor som skal brukes"
 
-#: gtk/gtkfilechooser.c:188
+#: gtk/gtkfilechooser.c:189
 msgid "Filter"
 msgstr "Filter"
 
-#: gtk/gtkfilechooser.c:189
+#: gtk/gtkfilechooser.c:190
 msgid "The current filter for selecting which files are displayed"
 msgstr "Filter for å velge hvilke filer som vises"
 
-#: gtk/gtkfilechooser.c:194
+#: gtk/gtkfilechooser.c:195
 msgid "Local Only"
 msgstr "Kun lokalt"
 
-#: gtk/gtkfilechooser.c:195
+#: gtk/gtkfilechooser.c:196
 msgid "Whether the selected file(s) should be limited to local file: URLs"
 msgstr "Om valgt(e) fil(er) skal begrenses til lokale file: URLer"
 
-#: gtk/gtkfilechooser.c:200
+#: gtk/gtkfilechooser.c:201
 msgid "Preview widget"
 msgstr "Forhåndsvisningskomponent"
 
-#: gtk/gtkfilechooser.c:201
+#: gtk/gtkfilechooser.c:202
 msgid "Application supplied widget for custom previews."
 msgstr "Komponent for egendefinerte forhåndsvisninger levert av programmet."
 
-#: gtk/gtkfilechooser.c:206
+#: gtk/gtkfilechooser.c:207
 msgid "Preview Widget Active"
 msgstr "Forhåndsvisningskomponent aktiv"
 
-#: gtk/gtkfilechooser.c:207
+#: gtk/gtkfilechooser.c:208
 msgid ""
 "Whether the application supplied widget for custom previews should be shown."
 msgstr ""
 "Om komponent for egendefinerte forhåndsvisninger levert av programmet skal "
 "vises."
 
-#: gtk/gtkfilechooser.c:212
+#: gtk/gtkfilechooser.c:213
 msgid "Use Preview Label"
 msgstr "Bruk etikett for forhåndsvisning"
 
-#: gtk/gtkfilechooser.c:213
+#: gtk/gtkfilechooser.c:214
 msgid "Whether to display a stock label with the name of the previewed file."
 msgstr "Om en standardetikett med navn på forhåndsvist fil skal vises."
 
-#: gtk/gtkfilechooser.c:218
+#: gtk/gtkfilechooser.c:219
 msgid "Extra widget"
 msgstr "Ekstra komponent"
 
-#: gtk/gtkfilechooser.c:219
+#: gtk/gtkfilechooser.c:220
 msgid "Application supplied widget for extra options."
 msgstr "Komponent for ekstra alternativer levert av programmet."
 
-#: gtk/gtkfilechooser.c:224
+#: gtk/gtkfilechooser.c:225
 msgid "Select Multiple"
 msgstr "Velg flere"
 
-#: gtk/gtkfilechooser.c:225 gtk/gtkfilesel.c:575
+#: gtk/gtkfilechooser.c:226 gtk/gtkfilesel.c:576
 msgid "Whether to allow multiple files to be selected"
 msgstr "Om valg av flere filer skal tillates"
 
-#: gtk/gtkfilechooser.c:231
+#: gtk/gtkfilechooser.c:232
 msgid "Show Hidden"
 msgstr "Vis skjulte"
 
-#: gtk/gtkfilechooser.c:232
+#: gtk/gtkfilechooser.c:233
 msgid "Whether the hidden files and folders should be displayed"
 msgstr "Om skjulte filer og mapper skal vises"
 
-#: gtk/gtkfilechooserdefault.c:570
+#: gtk/gtkfilechooserbutton.c:244
+msgid "Dialog"
+msgstr ""
+
+#: gtk/gtkfilechooserbutton.c:245
+msgid "The file chooser dialog to use."
+msgstr ""
+
+#: gtk/gtkfilechooserbutton.c:252
+#, fuzzy
+msgid "The title of the file chooser dialog."
+msgstr "Tittelen på dialogen for skriftvalg"
+
+#: gtk/gtkfilechooserbutton.c:258
+#, fuzzy
+msgid "Whether the browse dialog is visible or not."
+msgstr "Widgetet er synlig"
+
+#: gtk/gtkfilechooserbutton.c:262
+#, fuzzy
+msgid "Width In Characters"
+msgstr "Bredde i tegn"
+
+#: gtk/gtkfilechooserbutton.c:263
+msgid "The desired width of the button widget, in characters."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:589
 msgid "Default file chooser backend"
 msgstr "Forvalgt motor for filvelger"
 
-#: gtk/gtkfilechooserdefault.c:571
+#: gtk/gtkfilechooserdefault.c:590
 msgid "Name of the GtkFileChooser backend to use by default"
 msgstr "Navn på GtkFileChooser-motor som skal brukes som forvalg"
 
-#: gtk/gtkfilesel.c:559 gtk/gtkimage.c:168
+#: gtk/gtkfilesel.c:560 gtk/gtkimage.c:190
 msgid "Filename"
 msgstr "Filnavn"
 
-#: gtk/gtkfilesel.c:560
+#: gtk/gtkfilesel.c:561
 msgid "The currently selected filename"
 msgstr "Valgt filnavn"
 
-#: gtk/gtkfilesel.c:566
+#: gtk/gtkfilesel.c:567
 msgid "Show file operations"
 msgstr "Vis filoperasjoner"
 
-#: gtk/gtkfilesel.c:567
+#: gtk/gtkfilesel.c:568
 msgid "Whether buttons for creating/manipulating files should be displayed"
 msgstr "Om knapper for oppretting/manipulering av filer skal vises"
 
-#: gtk/gtkfilesel.c:574
+#: gtk/gtkfilesel.c:575
 msgid "Select multiple"
 msgstr "Velg flere"
 
-#: gtk/gtkfixed.c:121 gtk/gtklayout.c:614
+#: gtk/gtkfixed.c:122 gtk/gtklayout.c:615
 msgid "X position"
 msgstr "X-posisjon"
 
-#: gtk/gtkfixed.c:122 gtk/gtklayout.c:615
+#: gtk/gtkfixed.c:123 gtk/gtklayout.c:616
 msgid "X position of child widget"
 msgstr "X-posisjon for underwidgetet"
 
-#: gtk/gtkfixed.c:131 gtk/gtklayout.c:624
+#: gtk/gtkfixed.c:132 gtk/gtklayout.c:625
 msgid "Y position"
 msgstr "Y-posisjon"
 
-#: gtk/gtkfixed.c:132 gtk/gtklayout.c:625
+#: gtk/gtkfixed.c:133 gtk/gtklayout.c:626
 msgid "Y position of child widget"
 msgstr "Y-posisjon for underwidgetet"
 
-#: gtk/gtkfontbutton.c:176
+#: gtk/gtkfontbutton.c:177
 msgid "The title of the font selection dialog"
 msgstr "Tittelen på dialogen for skriftvalg"
 
-#: gtk/gtkfontbutton.c:191 gtk/gtkfontsel.c:214
+#: gtk/gtkfontbutton.c:192 gtk/gtkfontsel.c:215
 msgid "Font name"
 msgstr "Skriftnavn"
 
-#: gtk/gtkfontbutton.c:192
+#: gtk/gtkfontbutton.c:193
 msgid "The name of the selected font"
 msgstr "Navn på valgt skrift"
 
-#: gtk/gtkfontbutton.c:193
+#: gtk/gtkfontbutton.c:194
 msgid "Sans 12"
 msgstr "Sans 12"
 
-#: gtk/gtkfontbutton.c:207
+#: gtk/gtkfontbutton.c:208
 msgid "Use font in label"
 msgstr "Bruk skrift i etikett"
 
-#: gtk/gtkfontbutton.c:208
+#: gtk/gtkfontbutton.c:209
 msgid "Whether the label is drawn in the selected font"
 msgstr "Om etiketten tegnes med valgt skrift"
 
-#: gtk/gtkfontbutton.c:223
+#: gtk/gtkfontbutton.c:224
 msgid "Use size in label"
 msgstr "Bruk størrelse i etikett"
 
-#: gtk/gtkfontbutton.c:224
+#: gtk/gtkfontbutton.c:225
 msgid "Whether the label is drawn with the selected font size"
 msgstr "Om etiketteksten tegnes med valgt skriftstørrelse"
 
-#: gtk/gtkfontbutton.c:240
+#: gtk/gtkfontbutton.c:241
 msgid "Show style"
 msgstr "Vis stil"
 
-#: gtk/gtkfontbutton.c:241
+#: gtk/gtkfontbutton.c:242
 msgid "Whether the selected font style is shown in the label"
 msgstr "Om valgt skriftstil vises i etiketten"
 
-#: gtk/gtkfontbutton.c:256
+#: gtk/gtkfontbutton.c:257
 msgid "Show size"
 msgstr "Vis størrelse"
 
-#: gtk/gtkfontbutton.c:257
+#: gtk/gtkfontbutton.c:258
 msgid "Whether selected font size is shown in the label"
 msgstr "Om valgt skriftstørrelse vises i etiketten"
 
-#: gtk/gtkfontsel.c:215
+#: gtk/gtkfontsel.c:216
 msgid "The X string that represents this font"
 msgstr "X-strengen som representerer denne skriften"
 
-#: gtk/gtkfontsel.c:222
+#: gtk/gtkfontsel.c:223
 msgid "The GdkFont that is currently selected"
 msgstr "GdkFont som er valgt nå"
 
-#: gtk/gtkfontsel.c:228
+#: gtk/gtkfontsel.c:229
 msgid "Preview text"
 msgstr "Forhåndsvisningstekst"
 
-#: gtk/gtkfontsel.c:229
+#: gtk/gtkfontsel.c:230
 msgid "The text to display in order to demonstrate the selected font"
 msgstr "Tekst som skal vises for å demonstrere valgt skrift"
 
-#: gtk/gtkframe.c:127
+#: gtk/gtkframe.c:128
 msgid "Text of the frame's label"
 msgstr "Teksten i rammens etikett"
 
-#: gtk/gtkframe.c:134
+#: gtk/gtkframe.c:135
 msgid "Label xalign"
 msgstr "X-justering for etikett"
 
-#: gtk/gtkframe.c:135
+#: gtk/gtkframe.c:136
 msgid "The horizontal alignment of the label"
 msgstr "Horisontal justering for etikett"
 
-#: gtk/gtkframe.c:144
+#: gtk/gtkframe.c:145
 msgid "Label yalign"
 msgstr "Y-justering for etikett"
 
-#: gtk/gtkframe.c:145
+#: gtk/gtkframe.c:146
 msgid "The vertical alignment of the label"
 msgstr "Vertikal justering for etikett"
 
-#: gtk/gtkframe.c:154 gtk/gtkhandlebox.c:196
+#: gtk/gtkframe.c:155 gtk/gtkhandlebox.c:200
 msgid "Deprecated property, use shadow_type instead"
 msgstr "Utfaset egenskap. Bruk shadow_type i steden"
 
-#: gtk/gtkframe.c:161
+#: gtk/gtkframe.c:162
 msgid "Frame shadow"
 msgstr "Skygge for ramme"
 
-#: gtk/gtkframe.c:162
+#: gtk/gtkframe.c:163
 msgid "Appearance of the frame border"
 msgstr "Utseende for rammekanten"
 
-#: gtk/gtkframe.c:171
+#: gtk/gtkframe.c:172
 msgid "A widget to display in place of the usual frame label"
 msgstr "Et widget som vises i stedet for den vanlige rammeetiketten"
 
-#: gtk/gtkhandlebox.c:203 gtk/gtkmenubar.c:156 gtk/gtkstatusbar.c:200
-#: gtk/gtktoolbar.c:574 gtk/gtkviewport.c:151
+#: gtk/gtkhandlebox.c:207 gtk/gtkmenubar.c:157 gtk/gtkstatusbar.c:201
+#: gtk/gtktoolbar.c:582 gtk/gtkviewport.c:152
 msgid "Shadow type"
 msgstr "Skyggetype"
 
-#: gtk/gtkhandlebox.c:204
+#: gtk/gtkhandlebox.c:208
 msgid "Appearance of the shadow that surrounds the container"
 msgstr "Utseende for skyggen som omslutter kontaineren"
 
-#: gtk/gtkhandlebox.c:212
+#: gtk/gtkhandlebox.c:216
 msgid "Handle position"
 msgstr "Plassering av håndtak"
 
-#: gtk/gtkhandlebox.c:213
+#: gtk/gtkhandlebox.c:217
 msgid "Position of the handle relative to the child widget"
 msgstr "Posisjon for håndtaket relativt til etterkommer"
 
-#: gtk/gtkhandlebox.c:221
+#: gtk/gtkhandlebox.c:225
 msgid "Snap edge"
 msgstr "Fest til kant"
 
-#: gtk/gtkhandlebox.c:222
+#: gtk/gtkhandlebox.c:226
 msgid ""
 "Side of the handlebox that's lined up with the docking point to dock the "
 "handlebox"
 msgstr ""
 "Siden på håndtakboksen som er på linje med dokkingpunktet for håndtakboksen"
 
-#: gtk/gtkhandlebox.c:230
+#: gtk/gtkhandlebox.c:234
 msgid "Snap edge set"
 msgstr "Fest til kant satt"
 
-#: gtk/gtkhandlebox.c:231
+#: gtk/gtkhandlebox.c:235
 msgid ""
 "Whether to use the value from the snap_edge property or a value derived from "
 "handle_position"
@@ -1928,115 +2202,207 @@ msgstr ""
 "Om verdien fra egenskapen snap_edge eller en verdi derivert fra "
 "handle_position skal brukes"
 
-#: gtk/gtkimage.c:136
+#: gtk/gtkiconview.c:324
+#, fuzzy
+msgid "Selection mode"
+msgstr "Utvalg bundet"
+
+#: gtk/gtkiconview.c:325
+#, fuzzy
+msgid "The selection mode"
+msgstr "Valgt år"
+
+#: gtk/gtkiconview.c:343
+#, fuzzy
+msgid "Pixbuf column"
+msgstr "Pixbuf"
+
+#: gtk/gtkiconview.c:344
+msgid "Model column used to retrieve the icon pixbuf from"
+msgstr ""
+
+#: gtk/gtkiconview.c:362
+msgid "Model column used to retrieve the text from"
+msgstr ""
+
+#: gtk/gtkiconview.c:381
+#, fuzzy
+msgid "Markup column"
+msgstr "Tagging"
+
+#: gtk/gtkiconview.c:382
+msgid "Model column used to retrieve the text if using Pango markup"
+msgstr ""
+
+#: gtk/gtkiconview.c:389
+#, fuzzy
+msgid "Icon View Model"
+msgstr "TreeView modell"
+
+#: gtk/gtkiconview.c:390
+#, fuzzy
+msgid "The model for the icon view"
+msgstr "Modell for treevisning"
+
+#: gtk/gtkiconview.c:397 gtk/gtkprogressbar.c:151 gtk/gtktoolbar.c:507
+msgid "Orientation"
+msgstr "Orientering"
+
+#: gtk/gtkiconview.c:398
+msgid ""
+"How the text and icon of each item are positioned relative to each other"
+msgstr ""
+
+#: gtk/gtkiconview.c:406
+#, fuzzy
+msgid "Selection Box Color"
+msgstr "Utvalg bundet"
+
+#: gtk/gtkiconview.c:407
+#, fuzzy
+msgid "Color of the selection box"
+msgstr "Tittelen på dialogen for skriftvalg"
+
+#: gtk/gtkiconview.c:413
+#, fuzzy
+msgid "Selection Box Alpha"
+msgstr "Utvalg bundet"
+
+#: gtk/gtkiconview.c:414
+#, fuzzy
+msgid "Opacity of the selection box"
+msgstr "Tittelen på dialogen for skriftvalg"
+
+#: gtk/gtkimage.c:158
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: gtk/gtkimage.c:137
+#: gtk/gtkimage.c:159
 msgid "A GdkPixbuf to display"
 msgstr "En GdkPixuf som skal vises"
 
-#: gtk/gtkimage.c:144
+#: gtk/gtkimage.c:166
 msgid "Pixmap"
 msgstr "Pixmap"
 
-#: gtk/gtkimage.c:145
+#: gtk/gtkimage.c:167
 msgid "A GdkPixmap to display"
 msgstr "Et GdkPixmap som skal vises"
 
-#: gtk/gtkimage.c:152
+#: gtk/gtkimage.c:174
 msgid "Image"
 msgstr "Bilde"
 
-#: gtk/gtkimage.c:153
+#: gtk/gtkimage.c:175
 msgid "A GdkImage to display"
 msgstr "Et GdkImage som skal vises"
 
-#: gtk/gtkimage.c:160
+#: gtk/gtkimage.c:182
 msgid "Mask"
 msgstr "Maske"
 
-#: gtk/gtkimage.c:161
+#: gtk/gtkimage.c:183
 msgid "Mask bitmap to use with GdkImage or GdkPixmap"
 msgstr "Maskebitkart for bruk med GdkImage eller GdkPixmap"
 
-#: gtk/gtkimage.c:169
+#: gtk/gtkimage.c:191
 msgid "Filename to load and display"
 msgstr "Filnavn som skal lastes og vises"
 
-#: gtk/gtkimage.c:178
+#: gtk/gtkimage.c:200
 msgid "Stock ID for a stock image to display"
 msgstr "Standard ID for et standardbilde som skal vises"
 
-#: gtk/gtkimage.c:185
+#: gtk/gtkimage.c:207
 msgid "Icon set"
 msgstr "Ikonsett"
 
-#: gtk/gtkimage.c:186
+#: gtk/gtkimage.c:208
 msgid "Icon set to display"
 msgstr "Ikonsett som skal vises"
 
-#: gtk/gtkimage.c:193
+#: gtk/gtkimage.c:215
 msgid "Icon size"
 msgstr "Ikonstørrelse"
 
-#: gtk/gtkimage.c:194
-msgid "Size to use for stock icon or icon set"
+#: gtk/gtkimage.c:216
+#, fuzzy
+msgid "Symbolic size to use for stock icon, icon set or named icon"
 msgstr "Størrelse som skal brukes for standardikon eller ikonsett"
 
-#: gtk/gtkimage.c:202
+#: gtk/gtkimage.c:232
+#, fuzzy
+msgid "Pixel size"
+msgstr "Piksler"
+
+#: gtk/gtkimage.c:233
+#, fuzzy
+msgid "Pixel size to use for named icon"
+msgstr "Størrelse som skal brukes for standardikon eller ikonsett"
+
+#: gtk/gtkimage.c:241
 msgid "Animation"
 msgstr "Animasjon"
 
-#: gtk/gtkimage.c:203
+#: gtk/gtkimage.c:242
 msgid "GdkPixbufAnimation to display"
 msgstr "GdkPixbufAnimation som skal vises"
 
-#: gtk/gtkimage.c:210
+#: gtk/gtkimage.c:257 gtk/gtkwindow.c:563
+#, fuzzy
+msgid "Icon Name"
+msgstr "Skriftnavn"
+
+#: gtk/gtkimage.c:258
+#, fuzzy
+msgid "The name of the icon from the icon theme"
+msgstr "Navn på valgt skrift"
+
+#: gtk/gtkimage.c:265
 msgid "Storage type"
 msgstr "Lagertype"
 
-#: gtk/gtkimage.c:211
+#: gtk/gtkimage.c:266
 msgid "The representation being used for image data"
 msgstr "Representasjonen som brukes for bildedata"
 
-#: gtk/gtkimagemenuitem.c:138
+#: gtk/gtkimagemenuitem.c:139
 msgid "Image widget"
 msgstr "Bildewidget"
 
-#: gtk/gtkimagemenuitem.c:139
+#: gtk/gtkimagemenuitem.c:140
 msgid "Child widget to appear next to the menu text"
 msgstr "Barnwidget som skal vises ved siden av menyteksten"
 
-#: gtk/gtkimagemenuitem.c:144
+#: gtk/gtkimagemenuitem.c:145
 msgid "Show menu images"
 msgstr "Vis bilder i menyer"
 
-#: gtk/gtkimagemenuitem.c:145
+#: gtk/gtkimagemenuitem.c:146
 msgid "Whether images should be shown in menus"
 msgstr "Om bilder skal vises i menyer"
 
-#: gtk/gtkinvisible.c:115 gtk/gtkwindow.c:543
+#: gtk/gtkinvisible.c:116 gtk/gtkwindow.c:571
 msgid "Screen"
 msgstr "Skjerm"
 
-#: gtk/gtkinvisible.c:116 gtk/gtkwindow.c:544
+#: gtk/gtkinvisible.c:117 gtk/gtkwindow.c:572
 msgid "The screen where this window will be displayed"
 msgstr "Skjermen hvor dette vinduet vil vises"
 
-#: gtk/gtklabel.c:293
+#: gtk/gtklabel.c:301
 msgid "The text of the label"
 msgstr "Tekst for etiketten"
 
-#: gtk/gtklabel.c:300
+#: gtk/gtklabel.c:308
 msgid "A list of style attributes to apply to the text of the label"
 msgstr "En liste med stilattributter som skal påføres etikettens tekst"
 
-#: gtk/gtklabel.c:321 gtk/gtktexttag.c:375 gtk/gtktextview.c:604
+#: gtk/gtklabel.c:329 gtk/gtktexttag.c:376 gtk/gtktextview.c:594
 msgid "Justification"
 msgstr "Justering"
 
-#: gtk/gtklabel.c:322
+#: gtk/gtklabel.c:330
 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 "
@@ -2046,11 +2412,11 @@ msgstr ""
 "påvirker IKKE justeringen av etiketten innen sitt område. Se GtkMisc::xalign "
 "for det"
 
-#: gtk/gtklabel.c:330
+#: gtk/gtklabel.c:338
 msgid "Pattern"
 msgstr "Mønster"
 
-#: gtk/gtklabel.c:331
+#: gtk/gtklabel.c:339
 msgid ""
 "A string with _ characters in positions correspond to characters in the text "
 "to underline"
@@ -2058,86 +2424,112 @@ msgstr ""
 "En streng med «_»-tegn i posisjoner tilsvarer tegn i teksten som skal "
 "understrekes"
 
-#: gtk/gtklabel.c:338
+#: gtk/gtklabel.c:346
 msgid "Line wrap"
 msgstr "Linjebryting"
 
-#: gtk/gtklabel.c:339
+#: gtk/gtklabel.c:347
 msgid "If set, wrap lines if the text becomes too wide"
 msgstr "Bryt linjer hvis teksten blir for bred hvis dette er satt"
 
-#: gtk/gtklabel.c:345
+#: gtk/gtklabel.c:353
 msgid "Selectable"
 msgstr "Velgbar"
 
-#: gtk/gtklabel.c:346
+#: gtk/gtklabel.c:354
 msgid "Whether the label text can be selected with the mouse"
 msgstr "Om etiketteksten kan velges med musen"
 
-#: gtk/gtklabel.c:352
+#: gtk/gtklabel.c:360
 msgid "Mnemonic key"
 msgstr "Hinttast"
 
-#: gtk/gtklabel.c:353
+#: gtk/gtklabel.c:361
 msgid "The mnemonic accelerator key for this label"
 msgstr "Hint for akselleratortast for denne etiketten"
 
-#: gtk/gtklabel.c:361
+#: gtk/gtklabel.c:369
 msgid "Mnemonic widget"
 msgstr "Hintwidget"
 
-#: gtk/gtklabel.c:362
+#: gtk/gtklabel.c:370
 msgid "The widget to be activated when the label's mnemonic key is pressed"
 msgstr "Widget som skal aktiveres når etikettens hinttast trykkes"
 
-#: gtk/gtklayout.c:634 gtk/gtkviewport.c:135
+#: gtk/gtklabel.c:414
+msgid ""
+"The preferred place to ellipsize the string, if the label does not have "
+"enough room to display the entire string, if at all"
+msgstr ""
+
+#: gtk/gtklabel.c:431
+#, fuzzy
+msgid "Width In Chararacters"
+msgstr "Bredde i tegn"
+
+#: gtk/gtklabel.c:432
+msgid "The desired width of the label, in characters"
+msgstr ""
+
+#: gtk/gtklayout.c:635 gtk/gtkviewport.c:136
 msgid "Horizontal adjustment"
 msgstr "Horisontal justering"
 
-#: gtk/gtklayout.c:635 gtk/gtkscrolledwindow.c:238
+#: gtk/gtklayout.c:636 gtk/gtkscrolledwindow.c:239
 msgid "The GtkAdjustment for the horizontal position"
 msgstr "GtkAdjustment for horisontal posisjon"
 
-#: gtk/gtklayout.c:642 gtk/gtkviewport.c:143
+#: gtk/gtklayout.c:643 gtk/gtkviewport.c:144
 msgid "Vertical adjustment"
 msgstr "Vertikal justering"
 
-#: gtk/gtklayout.c:643 gtk/gtkscrolledwindow.c:245
+#: gtk/gtklayout.c:644 gtk/gtkscrolledwindow.c:246
 msgid "The GtkAdjustment for the vertical position"
 msgstr "GtkAdjustment for vertikal posisjon"
 
-#: gtk/gtklayout.c:651
+#: gtk/gtklayout.c:652
 msgid "The width of the layout"
 msgstr "Bredde på plasseringen"
 
-#: gtk/gtklayout.c:660
+#: gtk/gtklayout.c:661
 msgid "The height of the layout"
 msgstr "Høyde på plasseringen"
 
-#: gtk/gtkmenu.c:518
+#: gtk/gtkmenu.c:521
 msgid "Tearoff Title"
 msgstr "Tittel for avrevet meny"
 
-#: gtk/gtkmenu.c:519
+#: gtk/gtkmenu.c:522
 msgid ""
 "A title that may be displayed by the window manager when this menu is torn-"
 "off"
 msgstr ""
 "En tittel som skal vises av vindushåndtereren når denne menyen er avrevet"
 
-#: gtk/gtkmenu.c:525
+#: gtk/gtkmenu.c:536
+#, fuzzy
+msgid "Tearoff State"
+msgstr "Tittel for avrevet meny"
+
+#: gtk/gtkmenu.c:537
+#, fuzzy
+msgid "A boolean that indicates whether the menu is torn-off"
+msgstr ""
+"En tittel som skal vises av vindushåndtereren når denne menyen er avrevet"
+
+#: gtk/gtkmenu.c:543
 msgid "Vertical Padding"
 msgstr "Vertikalt fyll"
 
-#: gtk/gtkmenu.c:526
+#: gtk/gtkmenu.c:544
 msgid "Extra space at the top and bottom of the menu"
 msgstr "Ekstra mellomrom på topp og bunn av menyen"
 
-#: gtk/gtkmenu.c:534
+#: gtk/gtkmenu.c:552
 msgid "Vertical Offset"
 msgstr "Vertikal avstand"
 
-#: gtk/gtkmenu.c:535
+#: gtk/gtkmenu.c:553
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "vertically"
@@ -2145,11 +2537,11 @@ msgstr ""
 "Plasser menyen med vertikal avstand lik dette antall piksler når den er en "
 "undermeny"
 
-#: gtk/gtkmenu.c:543
+#: gtk/gtkmenu.c:561
 msgid "Horizontal Offset"
 msgstr "Horisontal avstand"
 
-#: gtk/gtkmenu.c:544
+#: gtk/gtkmenu.c:562
 msgid ""
 "When the menu is a submenu, position it this number of pixels offset "
 "horizontally"
@@ -2157,218 +2549,226 @@ msgstr ""
 "Plasser menyen med horisontal avstand lik dette antall piksler når den er en "
 "undermeny."
 
-#: gtk/gtkmenu.c:554
+#: gtk/gtkmenu.c:572
 msgid "Left Attach"
 msgstr "Venstre feste"
 
-#: gtk/gtkmenu.c:555 gtk/gtktable.c:204
+#: gtk/gtkmenu.c:573 gtk/gtktable.c:205
 msgid "The column number to attach the left side of the child to"
 msgstr "Kolonnenummer som venstre side av etterkommer skal festes til"
 
-#: gtk/gtkmenu.c:562
+#: gtk/gtkmenu.c:580
 msgid "Right Attach"
 msgstr "Høyre feste"
 
-#: gtk/gtkmenu.c:563
+#: gtk/gtkmenu.c:581
 msgid "The column number to attach the right side of the child to"
 msgstr "Kolonnenummer som høyre side av etterkommer skal festes til"
 
-#: gtk/gtkmenu.c:570
+#: gtk/gtkmenu.c:588
 msgid "Top Attach"
 msgstr "Toppfeste"
 
-#: gtk/gtkmenu.c:571
+#: gtk/gtkmenu.c:589
 msgid "The row number to attach the top of the child to"
 msgstr "Radnummer som toppen av etterkommer skal festes til"
 
-#: gtk/gtkmenu.c:578
+#: gtk/gtkmenu.c:596
 msgid "Bottom Attach"
 msgstr "Bunnfeste"
 
-#: gtk/gtkmenu.c:579 gtk/gtktable.c:225
+#: gtk/gtkmenu.c:597 gtk/gtktable.c:226
 msgid "The row number to attach the bottom of the child to"
 msgstr "Radnummer som bunn av etterkommer skal festes til"
 
-#: gtk/gtkmenu.c:666
+#: gtk/gtkmenu.c:684
 msgid "Can change accelerators"
 msgstr "Kan endre akselleratorer"
 
-#: gtk/gtkmenu.c:667
+#: gtk/gtkmenu.c:685
 msgid ""
 "Whether menu accelerators can be changed by pressing a key over the menu item"
 msgstr ""
 "Om menyakselleratorer kan endres ved å trykke en tast over menyoppføringen"
 
-#: gtk/gtkmenu.c:672
+#: gtk/gtkmenu.c:690
 msgid "Delay before submenus appear"
 msgstr "Pause før undermenyer vises"
 
-#: gtk/gtkmenu.c:673
+#: gtk/gtkmenu.c:691
 msgid ""
 "Minimum time the pointer must stay over a menu item before the submenu appear"
 msgstr ""
 "Minste tid pekeren kan være over en menyoppføring før undermenyen vises"
 
-#: gtk/gtkmenu.c:680
+#: gtk/gtkmenu.c:698
 msgid "Delay before hiding a submenu"
 msgstr "Pause før en undermeny skjules"
 
-#: gtk/gtkmenu.c:681
+#: gtk/gtkmenu.c:699
 msgid ""
 "The time before hiding a submenu when the pointer is moving towards the "
 "submenu"
 msgstr "Tid før undermenyen skjules når pekeren beveger seg mot undermenyen"
 
-#: gtk/gtkmenubar.c:157
+#: gtk/gtkmenubar.c:158
 msgid "Style of bevel around the menubar"
 msgstr "Stil på kanten rundt menylinjen"
 
-#: gtk/gtkmenubar.c:164 gtk/gtktoolbar.c:550
+#: gtk/gtkmenubar.c:165 gtk/gtktoolbar.c:558
 msgid "Internal padding"
 msgstr "Internt fyll"
 
-#: gtk/gtkmenubar.c:165
+#: gtk/gtkmenubar.c:166
 msgid "Amount of border space between the menubar shadow and the menu items"
 msgstr "Mengde med kantplass mellom menylinjens skygge og menyoppføringene"
 
-#: gtk/gtkmenubar.c:172
+#: gtk/gtkmenubar.c:173
 msgid "Delay before drop down menus appear"
 msgstr "Pause før nedtrekksmenyer vises"
 
-#: gtk/gtkmenubar.c:173
+#: gtk/gtkmenubar.c:174
 msgid "Delay before the submenus of a menu bar appear"
 msgstr "Pause før undermenyene i en menylinje vises"
 
-#: gtk/gtkmessagedialog.c:107
+#: gtk/gtkmenutoolbutton.c:247 gtk/gtkoptionmenu.c:194
+msgid "Menu"
+msgstr "Meny"
+
+#: gtk/gtkmenutoolbutton.c:248
+msgid "The dropdown menu"
+msgstr ""
+
+#: gtk/gtkmessagedialog.c:124
 msgid "Image/label border"
 msgstr "Kant for bilde/etikett"
 
-#: gtk/gtkmessagedialog.c:108
+#: gtk/gtkmessagedialog.c:125
 msgid "Width of border around the label and image in the message dialog"
 msgstr "Bredde på kanten rundt etikett og bilde i meldingsdialogen"
 
-#: gtk/gtkmessagedialog.c:123
+#: gtk/gtkmessagedialog.c:140
 msgid "Use separator"
 msgstr "Bruk skillelinje"
 
-#: gtk/gtkmessagedialog.c:124
+#: gtk/gtkmessagedialog.c:141
 msgid ""
 "Whether to put a separator between the message dialog's text and the buttons"
 msgstr "Om en skillelinje skal plasseres mellom dialogens tekst og knapper"
 
-#: gtk/gtkmessagedialog.c:130
+#: gtk/gtkmessagedialog.c:147
 msgid "Message Type"
 msgstr "Meldingstype"
 
-#: gtk/gtkmessagedialog.c:131
+#: gtk/gtkmessagedialog.c:148
 msgid "The type of message"
 msgstr "Type melding"
 
-#: gtk/gtkmessagedialog.c:138
+#: gtk/gtkmessagedialog.c:155
 msgid "Message Buttons"
 msgstr "Meldingsknapper"
 
-#: gtk/gtkmessagedialog.c:139
+#: gtk/gtkmessagedialog.c:156
 msgid "The buttons shown in the message dialog"
 msgstr "Knappene som vises i meldingsdialogen"
 
-#: gtk/gtkmisc.c:109
+#: gtk/gtkmisc.c:110
 msgid "Y align"
 msgstr "Y-justering"
 
-#: gtk/gtkmisc.c:110
+#: gtk/gtkmisc.c:111
 msgid "The vertical alignment, from 0 (top) to 1 (bottom)"
 msgstr "Vertikal justering, fra 0 (øverst) til 1 (nederst)"
 
-#: gtk/gtkmisc.c:119
+#: gtk/gtkmisc.c:120
 msgid "X pad"
 msgstr "X-fyll"
 
-#: gtk/gtkmisc.c:120
+#: gtk/gtkmisc.c:121
 msgid ""
 "The amount of space to add on the left and right of the widget, in pixels"
 msgstr "Mengde mellomrom til venstre og høyre for widgetet, i piksler"
 
-#: gtk/gtkmisc.c:129
+#: gtk/gtkmisc.c:130
 msgid "Y pad"
 msgstr "Y-fyll"
 
-#: gtk/gtkmisc.c:130
+#: gtk/gtkmisc.c:131
 msgid ""
 "The amount of space to add on the top and bottom of the widget, in pixels"
 msgstr "Mende mellomrom over og under widgetet, i piksler"
 
-#: gtk/gtknotebook.c:397
+#: gtk/gtknotebook.c:401
 msgid "Page"
 msgstr "Side"
 
-#: gtk/gtknotebook.c:398
+#: gtk/gtknotebook.c:402
 msgid "The index of the current page"
 msgstr "Indeks for aktiv side"
 
-#: gtk/gtknotebook.c:406
+#: gtk/gtknotebook.c:410
 msgid "Tab Position"
 msgstr "Faneplassering"
 
-#: gtk/gtknotebook.c:407
+#: gtk/gtknotebook.c:411
 msgid "Which side of the notebook holds the tabs"
 msgstr "Hvilken side av notisblokken innehar fanene"
 
-#: gtk/gtknotebook.c:414
+#: gtk/gtknotebook.c:418
 msgid "Tab Border"
 msgstr "Fanekant"
 
-#: gtk/gtknotebook.c:415
+#: gtk/gtknotebook.c:419
 msgid "Width of the border around the tab labels"
 msgstr "Bredde på kanten rundt faneetikettene"
 
-#: gtk/gtknotebook.c:423
+#: gtk/gtknotebook.c:427
 msgid "Horizontal Tab Border"
 msgstr "Horisontal fanekant"
 
-#: gtk/gtknotebook.c:424
+#: gtk/gtknotebook.c:428
 msgid "Width of the horizontal border of tab labels"
 msgstr "Bredde på horisontal kant på faneetikettene"
 
-#: gtk/gtknotebook.c:432
+#: gtk/gtknotebook.c:436
 msgid "Vertical Tab Border"
 msgstr "Vertikal fanekant"
 
-#: gtk/gtknotebook.c:433
+#: gtk/gtknotebook.c:437
 msgid "Width of the vertical border of tab labels"
 msgstr "Bredde på vertikal kant på faneetikettene"
 
-#: gtk/gtknotebook.c:441
+#: gtk/gtknotebook.c:445
 msgid "Show Tabs"
 msgstr "Vis faner"
 
-#: gtk/gtknotebook.c:442
+#: gtk/gtknotebook.c:446
 msgid "Whether tabs should be shown or not"
 msgstr "Vis/Ikke vis faner"
 
-#: gtk/gtknotebook.c:448
+#: gtk/gtknotebook.c:452
 msgid "Show Border"
 msgstr "Vis kant"
 
-#: gtk/gtknotebook.c:449
+#: gtk/gtknotebook.c:453
 msgid "Whether the border should be shown or not"
 msgstr "Vis/ikke vis kant"
 
-#: gtk/gtknotebook.c:455
+#: gtk/gtknotebook.c:459
 msgid "Scrollable"
 msgstr "Rullbar"
 
-#: gtk/gtknotebook.c:456
+#: gtk/gtknotebook.c:460
 msgid "If TRUE, scroll arrows are added if there are too many tabs to fit"
 msgstr ""
 "Hvis SANN vil rullepiler legges til hvis det er flere faner enn det som "
 "passer"
 
-#: gtk/gtknotebook.c:462
+#: gtk/gtknotebook.c:466
 msgid "Enable Popup"
 msgstr "Slå på oppsprett"
 
-#: gtk/gtknotebook.c:463
+#: gtk/gtknotebook.c:467
 msgid ""
 "If TRUE, pressing the right mouse button on the notebook pops up a menu that "
 "you can use to go to a page"
@@ -2376,160 +2776,160 @@ msgstr ""
 "Hvis denne er satt til SANN vil det ved å klikke på notisblokken med høyre "
 "musknapp sprette opp en meny som kan brukes til å gå til en side"
 
-#: gtk/gtknotebook.c:470
+#: gtk/gtknotebook.c:474
 msgid "Whether tabs should have homogeneous sizes"
 msgstr "Om faner skal ha ensartet størrelse"
 
-#: gtk/gtknotebook.c:477
+#: gtk/gtknotebook.c:481
 msgid "Tab label"
 msgstr "Etikett for fanen"
 
-#: gtk/gtknotebook.c:478
-msgid "The string displayed on the childs tab label"
+#: gtk/gtknotebook.c:482
+#, fuzzy
+msgid "The string displayed on the child's tab label"
 msgstr "Strengen som vises i etterkommerens faneetikett"
 
-#: gtk/gtknotebook.c:484
+#: gtk/gtknotebook.c:488
 msgid "Menu label"
 msgstr "Etikett for meny"
 
-#: gtk/gtknotebook.c:485
-msgid "The string displayed in the childs menu entry"
+#: gtk/gtknotebook.c:489
+#, fuzzy
+msgid "The string displayed in the child's menu entry"
 msgstr "Strengen som vises i etterkommerens menyoppføring"
 
-#: gtk/gtknotebook.c:498
+#: gtk/gtknotebook.c:502
 msgid "Tab expand"
 msgstr "Faneutvidelse"
 
-#: gtk/gtknotebook.c:499
-msgid "Whether to expand the childs tab or not"
+#: gtk/gtknotebook.c:503
+#, fuzzy
+msgid "Whether to expand the child's tab or not"
 msgstr "Om etterkommers fane skal utvides eller ikke"
 
-#: gtk/gtknotebook.c:505
+#: gtk/gtknotebook.c:509
 msgid "Tab fill"
 msgstr "Fyll for fane"
 
-#: gtk/gtknotebook.c:506
-msgid "Wheather the childs tab should fill the allocated area or not"
+#: gtk/gtknotebook.c:510
+#, fuzzy
+msgid "Whether the child's tab should fill the allocated area or not"
 msgstr "Om etterkommers fane skal fylle allokert område eller ikke"
 
-#: gtk/gtknotebook.c:512
+#: gtk/gtknotebook.c:516
 msgid "Tab pack type"
 msgstr "Type fanepakking"
 
-#: gtk/gtknotebook.c:528 gtk/gtkscrollbar.c:114
+#: gtk/gtknotebook.c:532 gtk/gtkscrollbar.c:115
 msgid "Secondary backward stepper"
 msgstr "Sekundært bakoversteg"
 
-#: gtk/gtknotebook.c:529
+#: gtk/gtknotebook.c:533
 msgid ""
 "Display a second backward arrow button on the opposite end of the tab area"
 msgstr "Vis en sekundær knapp med bakoverpil på motsatt side av fanefeltet"
 
-#: gtk/gtknotebook.c:545 gtk/gtkscrollbar.c:122
+#: gtk/gtknotebook.c:549 gtk/gtkscrollbar.c:123
 msgid "Secondary forward stepper"
 msgstr "Sekundært framoversteg"
 
-#: gtk/gtknotebook.c:546
+#: gtk/gtknotebook.c:550
 msgid ""
 "Display a second forward arrow button on the opposite end of the tab area"
 msgstr "Vis en sekundær knapp med framoverpil på motsatt side av fanefeltet"
 
-#: gtk/gtknotebook.c:561 gtk/gtkscrollbar.c:98
+#: gtk/gtknotebook.c:565 gtk/gtkscrollbar.c:99
 msgid "Backward stepper"
 msgstr "Bakoversteg"
 
-#: gtk/gtknotebook.c:562 gtk/gtkscrollbar.c:99
+#: gtk/gtknotebook.c:566 gtk/gtkscrollbar.c:100
 msgid "Display the standard backward arrow button"
 msgstr "Vis standard knapp med bakoverpil"
 
-#: gtk/gtknotebook.c:577 gtk/gtkscrollbar.c:106
+#: gtk/gtknotebook.c:581 gtk/gtkscrollbar.c:107
 msgid "Forward stepper"
 msgstr "Framoversteg"
 
-#: gtk/gtknotebook.c:578 gtk/gtkscrollbar.c:107
+#: gtk/gtknotebook.c:582 gtk/gtkscrollbar.c:108
 msgid "Display the standard forward arrow button"
 msgstr "Vis standard knapp med framoversteg"
 
-#: gtk/gtkoptionmenu.c:193
-msgid "Menu"
-msgstr "Meny"
-
-#: gtk/gtkoptionmenu.c:194
+#: gtk/gtkoptionmenu.c:195
 msgid "The menu of options"
 msgstr "Meny med alternativer"
 
-#: gtk/gtkoptionmenu.c:201
+#: gtk/gtkoptionmenu.c:202
 msgid "Size of dropdown indicator"
 msgstr "Størrelse på nedtrekksindikator"
 
-#: gtk/gtkoptionmenu.c:207
+#: gtk/gtkoptionmenu.c:208
 msgid "Spacing around indicator"
 msgstr "Plass rundt indikatoren"
 
-#: gtk/gtkpaned.c:240
+#: gtk/gtkpaned.c:241
 msgid ""
 "Position of paned separator in pixels (0 means all the way to the left/top)"
 msgstr "Posisjon for «paned»-separator i piksler (0 betyr øverst til venstre)"
 
-#: gtk/gtkpaned.c:248
+#: gtk/gtkpaned.c:249
 msgid "Position Set"
 msgstr "Posisjon satt"
 
-#: gtk/gtkpaned.c:249
+#: gtk/gtkpaned.c:250
 msgid "TRUE if the Position property should be used"
 msgstr "SANN hvis egenskapen Position skal brukes"
 
-#: gtk/gtkpaned.c:255
+#: gtk/gtkpaned.c:256
 msgid "Handle Size"
 msgstr "Størrelse på håndtak"
 
-#: gtk/gtkpaned.c:256
+#: gtk/gtkpaned.c:257
 msgid "Width of handle"
 msgstr "Størrelse på håndtak"
 
-#: gtk/gtkpaned.c:272
+#: gtk/gtkpaned.c:273
 msgid "Minimal Position"
 msgstr "Minste posisjon"
 
-#: gtk/gtkpaned.c:273
+#: gtk/gtkpaned.c:274
 msgid "Smallest possible value for the \"position\" property"
 msgstr "Minste mulige verdi for egenskapen «position»"
 
-#: gtk/gtkpaned.c:290
+#: gtk/gtkpaned.c:291
 msgid "Maximal Position"
 msgstr "Største posisjon"
 
-#: gtk/gtkpaned.c:291
+#: gtk/gtkpaned.c:292
 msgid "Largest possible value for the \"position\" property"
 msgstr "Største mulige verdi for egenskapen «position»"
 
-#: gtk/gtkpaned.c:308
+#: gtk/gtkpaned.c:309
 msgid "Resize"
 msgstr "Endre størrelse"
 
-#: gtk/gtkpaned.c:309
+#: gtk/gtkpaned.c:310
 msgid "If TRUE, the child expands and shrinks along with the paned widget"
 msgstr ""
 "Hvis SANN vil etterkommer utvides og krypmes sammen med paned-komponenten"
 
-#: gtk/gtkpaned.c:324
+#: gtk/gtkpaned.c:325
 msgid "Shrink"
 msgstr "Krymp"
 
-#: gtk/gtkpaned.c:325
+#: gtk/gtkpaned.c:326
 msgid "If TRUE, the child can be made smaller than its requisition"
 msgstr "Hvis SANN vil etter kommer gjøres mindre enn forespurt størrelse"
 
-#: gtk/gtkpreview.c:133
+#: gtk/gtkpreview.c:134
 msgid ""
 "Whether the preview widget should take up the entire space it is allocated"
 msgstr "Om forhåndsvisningswidgetet skal bruke all plassen det får tildelt"
 
-#: gtk/gtkprogress.c:130
+#: gtk/gtkprogress.c:131
 msgid "Activity mode"
 msgstr "Aktivitetsmodus"
 
-#: gtk/gtkprogress.c:131
+#: gtk/gtkprogress.c:132
 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 "
@@ -2539,19 +2939,19 @@ msgstr ""
 "om at noe skjer, men ikke hvor stor del av aktiviteten som er fullført. "
 "Dette brukes når du utfører en aktivitet som du ikke vet hvor lang tid vil ta"
 
-#: gtk/gtkprogress.c:138
+#: gtk/gtkprogress.c:139
 msgid "Show text"
 msgstr "Vis tekst"
 
-#: gtk/gtkprogress.c:139
+#: gtk/gtkprogress.c:140
 msgid "Whether the progress is shown as text"
 msgstr "Vis fremgang som tekst"
 
-#: gtk/gtkprogress.c:146
+#: gtk/gtkprogress.c:147
 msgid "Text x alignment"
 msgstr "X-justering for tekst"
 
-#: gtk/gtkprogress.c:147
+#: gtk/gtkprogress.c:148
 msgid ""
 "A number between 0.0 and 1.0 specifying the horizontal alignment of the text "
 "in the progress widget"
@@ -2559,11 +2959,11 @@ msgstr ""
 "Et tall mellom 0.0 og 1.0 spesifiserer horisontal justering for teksten i "
 "fremgangsmåleren"
 
-#: gtk/gtkprogress.c:155
+#: gtk/gtkprogress.c:156
 msgid "Text y alignment"
 msgstr "Y-justering for tekst"
 
-#: gtk/gtkprogress.c:156
+#: gtk/gtkprogress.c:157
 msgid ""
 "A number between 0.0 and 1.0 specifying the vertical alignment of the text "
 "in the progress widget"
@@ -2571,43 +2971,39 @@ msgstr ""
 "Et tall mellom 0.0 og 1.0 som spesifiserer vertikal justering av teksten i "
 "fremgangsmåleren"
 
-#: gtk/gtkprogressbar.c:142 gtk/gtkrange.c:293 gtk/gtkspinbutton.c:241
+#: gtk/gtkprogressbar.c:143 gtk/gtkrange.c:334 gtk/gtkspinbutton.c:242
 msgid "Adjustment"
 msgstr "Justering"
 
-#: gtk/gtkprogressbar.c:143
+#: gtk/gtkprogressbar.c:144
 msgid "The GtkAdjustment connected to the progress bar (Deprecated)"
 msgstr "GtkAdjustment koblet til fremgangsmåleren (Utfaset)"
 
-#: gtk/gtkprogressbar.c:150 gtk/gtktoolbar.c:499
-msgid "Orientation"
-msgstr "Orientering"
-
-#: gtk/gtkprogressbar.c:151
+#: gtk/gtkprogressbar.c:152
 msgid "Orientation and growth direction of the progress bar"
 msgstr "Orientering og vekstretning for fremgangsmåleren"
 
-#: gtk/gtkprogressbar.c:159
+#: gtk/gtkprogressbar.c:160
 msgid "Bar style"
 msgstr "Stil for linje"
 
-#: gtk/gtkprogressbar.c:160
+#: gtk/gtkprogressbar.c:161
 msgid "Specifies the visual style of the bar in percentage mode (Deprecated)"
 msgstr "Spesifiserer visuell stil for måleren i prosentmodus (Utfaset)"
 
-#: gtk/gtkprogressbar.c:168
+#: gtk/gtkprogressbar.c:169
 msgid "Activity Step"
 msgstr "Aktivitetssteg"
 
-#: gtk/gtkprogressbar.c:169
+#: gtk/gtkprogressbar.c:170
 msgid "The increment used for each iteration in activity mode (Deprecated)"
 msgstr "Stegverdien som brukes for hver gjennomgang i aktivitetsmodus (Utgått)"
 
-#: gtk/gtkprogressbar.c:178
+#: gtk/gtkprogressbar.c:179
 msgid "Activity Blocks"
 msgstr "Aktivitetsblokker"
 
-#: gtk/gtkprogressbar.c:179
+#: gtk/gtkprogressbar.c:180
 msgid ""
 "The number of blocks which can fit in the progress bar area in activity mode "
 "(Deprecated)"
@@ -2615,43 +3011,43 @@ msgstr ""
 "Antall blokker det er plass til i fremgangsmålerområdet i aktivitetsmodus "
 "(Utfaset)"
 
-#: gtk/gtkprogressbar.c:188
+#: gtk/gtkprogressbar.c:189
 msgid "Discrete Blocks"
 msgstr "Diskrete blokker"
 
-#: gtk/gtkprogressbar.c:189
+#: gtk/gtkprogressbar.c:190
 msgid ""
 "The number of discrete blocks in a progress bar (when shown in the discrete "
 "style)"
 msgstr ""
 "Antall diskrete blokker i en fremgangsmåler (når den vises i diskret stil)"
 
-#: gtk/gtkprogressbar.c:198
+#: gtk/gtkprogressbar.c:199
 msgid "Fraction"
 msgstr "Andel"
 
-#: gtk/gtkprogressbar.c:199
+#: gtk/gtkprogressbar.c:200
 msgid "The fraction of total work that has been completed"
 msgstr "Total andel av arbeid som er fullført"
 
-#: gtk/gtkprogressbar.c:208
+#: gtk/gtkprogressbar.c:209
 msgid "Pulse Step"
 msgstr "Pulssteg"
 
-#: gtk/gtkprogressbar.c:209
+#: gtk/gtkprogressbar.c:210
 msgid "The fraction of total progress to move the bouncing block when pulsed"
 msgstr ""
 "Andel total fremgang for bevegelse av den sprettende blokken for hver puls"
 
-#: gtk/gtkprogressbar.c:219
+#: gtk/gtkprogressbar.c:220
 msgid "Text to be displayed in the progress bar"
 msgstr "Tekst som skal vises i fremgangsmåleren"
 
-#: gtk/gtkradioaction.c:138
+#: gtk/gtkradioaction.c:139
 msgid "The value"
 msgstr "Verdien"
 
-#: gtk/gtkradioaction.c:139
+#: gtk/gtkradioaction.c:140
 msgid ""
 "The value returned by gtk_radio_action_get_current_value() when this action "
 "is the current action of its group."
@@ -2659,243 +3055,245 @@ msgstr ""
 "Verdien som returneres av gtk_radio_action_get_current_value() når denne "
 "handlingen er aktiv handling i sin gruppe."
 
-#: gtk/gtkradioaction.c:155 gtk/gtkradiobutton.c:112
+#: gtk/gtkradioaction.c:156 gtk/gtkradiobutton.c:113
 msgid "Group"
 msgstr "Gruppe"
 
-#: gtk/gtkradioaction.c:156
-msgid "The radio action whose group this action belongs."
+#: gtk/gtkradioaction.c:157
+#, fuzzy
+msgid "The radio action whose group this action belongs to."
 msgstr "Radiohandling hvis gruppe denne handlingen tilhører."
 
-#: gtk/gtkradiobutton.c:113
-msgid "The radio button whose group this widget belongs."
+#: gtk/gtkradiobutton.c:114
+#, fuzzy
+msgid "The radio button whose group this widget belongs to."
 msgstr "Radioknappen med samme gruppe som widgetet tilhører."
 
-#: gtk/gtkrange.c:284
+#: gtk/gtkrange.c:325
 msgid "Update policy"
 msgstr "Oppdateringspolicy"
 
-#: gtk/gtkrange.c:285
+#: gtk/gtkrange.c:326
 msgid "How the range should be updated on the screen"
 msgstr "Hvordan området skal oppdateres på skjermen"
 
-#: gtk/gtkrange.c:294
+#: gtk/gtkrange.c:335
 msgid "The GtkAdjustment that contains the current value of this range object"
 msgstr "GtkAdjustment som inneholder nåværende verdi for dette områdeobjektet"
 
-#: gtk/gtkrange.c:301
+#: gtk/gtkrange.c:342
 msgid "Inverted"
 msgstr "Invertert"
 
-#: gtk/gtkrange.c:302
+#: gtk/gtkrange.c:343
 msgid "Invert direction slider moves to increase range value"
 msgstr "Snu retningen glideren beveger seg for å øke verdien i området"
 
-#: gtk/gtkrange.c:308
+#: gtk/gtkrange.c:349
 msgid "Slider Width"
 msgstr "Bredde på rullelisten"
 
-#: gtk/gtkrange.c:309
+#: gtk/gtkrange.c:350
 msgid "Width of scrollbar or scale thumb"
 msgstr "Bredde for rullefeltet eller skalering"
 
-#: gtk/gtkrange.c:316
+#: gtk/gtkrange.c:357
 msgid "Trough Border"
 msgstr "Gjennom kant"
 
-#: gtk/gtkrange.c:317
+#: gtk/gtkrange.c:358
 msgid "Spacing between thumb/steppers and outer trough bevel"
 msgstr "Mellomrom mellom «thumb/steppers» og ytre kant"
 
-#: gtk/gtkrange.c:324
+#: gtk/gtkrange.c:365
 msgid "Stepper Size"
 msgstr "Størrelse på steg"
 
-#: gtk/gtkrange.c:325
+#: gtk/gtkrange.c:366
 msgid "Length of step buttons at ends"
 msgstr "Lengde på stegknappene ved kantene"
 
-#: gtk/gtkrange.c:332
+#: gtk/gtkrange.c:373
 msgid "Stepper Spacing"
 msgstr "Stegmellomrom"
 
-#: gtk/gtkrange.c:333
+#: gtk/gtkrange.c:374
 msgid "Spacing between step buttons and thumb"
 msgstr "Mellomrom mellom stegknapper og «thumb»"
 
-#: gtk/gtkrange.c:340
+#: gtk/gtkrange.c:381
 msgid "Arrow X Displacement"
 msgstr "X-forskyvning for pil"
 
-#: gtk/gtkrange.c:341
+#: gtk/gtkrange.c:382
 msgid ""
 "How far in the x direction to move the arrow when the button is depressed"
 msgstr "Hvor langt pilen flyttes i x-retning når knappen er nedtrykt"
 
-#: gtk/gtkrange.c:348
+#: gtk/gtkrange.c:389
 msgid "Arrow Y Displacement"
 msgstr "Y-forskyvning for pil"
 
-#: gtk/gtkrange.c:349
+#: gtk/gtkrange.c:390
 msgid ""
 "How far in the y direction to move the arrow when the button is depressed"
 msgstr "Hvor langt pilen flyttes i y-retning når knappen er nedtrykt"
 
-#: gtk/gtkruler.c:119
+#: gtk/gtkruler.c:120
 msgid "Lower"
 msgstr "Nedre"
 
-#: gtk/gtkruler.c:120
+#: gtk/gtkruler.c:121
 msgid "Lower limit of ruler"
 msgstr "Nedre grense for linjal"
 
-#: gtk/gtkruler.c:129
+#: gtk/gtkruler.c:130
 msgid "Upper"
 msgstr "Øvre"
 
-#: gtk/gtkruler.c:130
+#: gtk/gtkruler.c:131
 msgid "Upper limit of ruler"
 msgstr "Øvre grense for linjal"
 
-#: gtk/gtkruler.c:140
+#: gtk/gtkruler.c:141
 msgid "Position of mark on the ruler"
 msgstr "Posisjon for merke på linjal"
 
-#: gtk/gtkruler.c:149
+#: gtk/gtkruler.c:150
 msgid "Max Size"
 msgstr "Maks størrelse"
 
-#: gtk/gtkruler.c:150
+#: gtk/gtkruler.c:151
 msgid "Maximum size of the ruler"
 msgstr "Maksimum størrelse på linjal"
 
-#: gtk/gtkscale.c:171 gtk/gtkspinbutton.c:259
+#: gtk/gtkscale.c:172 gtk/gtkspinbutton.c:260
 msgid "Digits"
 msgstr "Tall"
 
-#: gtk/gtkscale.c:172
+#: gtk/gtkscale.c:173
 msgid "The number of decimal places that are displayed in the value"
 msgstr "Antall desimalplasser som vises i verdien"
 
-#: gtk/gtkscale.c:181
+#: gtk/gtkscale.c:182
 msgid "Draw Value"
 msgstr "Tegn verdi"
 
-#: gtk/gtkscale.c:182
+#: gtk/gtkscale.c:183
 msgid "Whether the current value is displayed as a string next to the slider"
 msgstr "Om aktiv verdi vises som en streng ved siden av rullelisten"
 
-#: gtk/gtkscale.c:189
+#: gtk/gtkscale.c:190
 msgid "Value Position"
 msgstr "Plassering av verdi"
 
-#: gtk/gtkscale.c:190
+#: gtk/gtkscale.c:191
 msgid "The position in which the current value is displayed"
 msgstr "Posisjon hvor aktiv verdi vises"
 
-#: gtk/gtkscale.c:197
+#: gtk/gtkscale.c:198
 msgid "Slider Length"
 msgstr "Lengde på rulleliste"
 
-#: gtk/gtkscale.c:198
+#: gtk/gtkscale.c:199
 msgid "Length of scale's slider"
 msgstr "Lendge på skaleringslisten"
 
-#: gtk/gtkscale.c:206
+#: gtk/gtkscale.c:207
 msgid "Value spacing"
 msgstr "Mellomrom for verdier"
 
-#: gtk/gtkscale.c:207
+#: gtk/gtkscale.c:208
 msgid "Space between value text and the slider/trough area"
 msgstr "Mellomrom mellom verditekst og område for glider/«through»"
 
-#: gtk/gtkscrollbar.c:81
+#: gtk/gtkscrollbar.c:82
 msgid "Minimum Slider Length"
 msgstr "Minste lengde på rulleliste"
 
-#: gtk/gtkscrollbar.c:82
+#: gtk/gtkscrollbar.c:83
 msgid "Minimum length of scrollbar slider"
 msgstr "Minste lengde på rullefeltglider"
 
-#: gtk/gtkscrollbar.c:90
+#: gtk/gtkscrollbar.c:91
 msgid "Fixed slider size"
 msgstr "Fast størrelse for rulleliste"
 
-#: gtk/gtkscrollbar.c:91
+#: gtk/gtkscrollbar.c:92
 msgid "Don't change slider size, just lock it to the minimum length"
 msgstr "Ikke endre størrelse på glider, bare lås den til minste lengde"
 
-#: gtk/gtkscrollbar.c:115
+#: gtk/gtkscrollbar.c:116
 msgid ""
 "Display a second backward arrow button on the opposite end of the scrollbar"
 msgstr "Vis en sekundær knapp med bakoverpil på motsatt side av rullefeltet"
 
-#: gtk/gtkscrollbar.c:123
+#: gtk/gtkscrollbar.c:124
 msgid ""
 "Display a secondary forward arrow button on the opposite end of the scrollbar"
 msgstr "Vis en sekundær knapp med framoverpil på motsatt side av rullefeltet"
 
-#: gtk/gtkscrolledwindow.c:237 gtk/gtktext.c:602 gtk/gtktreeview.c:548
+#: gtk/gtkscrolledwindow.c:238 gtk/gtktext.c:603 gtk/gtktreeview.c:566
 msgid "Horizontal Adjustment"
 msgstr "Horisontal justering"
 
-#: gtk/gtkscrolledwindow.c:244 gtk/gtktext.c:610 gtk/gtktreeview.c:556
+#: gtk/gtkscrolledwindow.c:245 gtk/gtktext.c:611 gtk/gtktreeview.c:574
 msgid "Vertical Adjustment"
 msgstr "Vertikal justering"
 
-#: gtk/gtkscrolledwindow.c:251
+#: gtk/gtkscrolledwindow.c:252
 msgid "Horizontal Scrollbar Policy"
 msgstr "Oppførsel for horisontalt rullefelt"
 
-#: gtk/gtkscrolledwindow.c:252
+#: gtk/gtkscrolledwindow.c:253
 msgid "When the horizontal scrollbar is displayed"
 msgstr "Når horisontalt rullefelt skal vises"
 
-#: gtk/gtkscrolledwindow.c:259
+#: gtk/gtkscrolledwindow.c:260
 msgid "Vertical Scrollbar Policy"
 msgstr "Oppførsel for vertikalt rullefelt"
 
-#: gtk/gtkscrolledwindow.c:260
+#: gtk/gtkscrolledwindow.c:261
 msgid "When the vertical scrollbar is displayed"
 msgstr "Når vertikalt rullefelt skal vises"
 
-#: gtk/gtkscrolledwindow.c:268
+#: gtk/gtkscrolledwindow.c:269
 msgid "Window Placement"
 msgstr "Vinduplassering"
 
-#: gtk/gtkscrolledwindow.c:269
+#: gtk/gtkscrolledwindow.c:270
 msgid "Where the contents are located with respect to the scrollbars"
 msgstr "Plassering av innhold i forhold til rullefeltene"
 
-#: gtk/gtkscrolledwindow.c:276
+#: gtk/gtkscrolledwindow.c:277
 msgid "Shadow Type"
 msgstr "Skyggetype"
 
-#: gtk/gtkscrolledwindow.c:277
+#: gtk/gtkscrolledwindow.c:278
 msgid "Style of bevel around the contents"
 msgstr "Stil på kanten rundt innholdet"
 
-#: gtk/gtkscrolledwindow.c:284
+#: gtk/gtkscrolledwindow.c:285
 msgid "Scrollbar spacing"
 msgstr "Avstand for rullefelt"
 
-#: gtk/gtkscrolledwindow.c:285
+#: gtk/gtkscrolledwindow.c:286
 msgid "Number of pixels between the scrollbars and the scrolled window"
 msgstr "Antall piksler mellom rullefeltet og vinduet som rulles"
 
-#: gtk/gtkseparatortoolitem.c:135
+#: gtk/gtkseparatortoolitem.c:136
 msgid "Draw"
 msgstr "Tegn"
 
-#: gtk/gtkseparatortoolitem.c:136
+#: gtk/gtkseparatortoolitem.c:137
 msgid "Whether the separator is drawn, or just blank"
 msgstr "Om  en skillelinje eller bare tomrom vises"
 
-#: gtk/gtksettings.c:262
+#: gtk/gtksettings.c:268
 msgid "Double Click Time"
 msgstr "Tid for dobbelklikk"
 
-#: gtk/gtksettings.c:263
+#: gtk/gtksettings.c:269
 msgid ""
 "Maximum time allowed between two clicks for them to be considered a double "
 "click (in milliseconds)"
@@ -2903,11 +3301,11 @@ msgstr ""
 "Lengste tidsintervall mellom to klikk for at de skal betraktes som et "
 "dobbelklikk (i millisekunder)"
 
-#: gtk/gtksettings.c:270
+#: gtk/gtksettings.c:276
 msgid "Double Click Distance"
 msgstr "Avstand for dobbelklikk"
 
-#: gtk/gtksettings.c:271
+#: gtk/gtksettings.c:277
 msgid ""
 "Maximum distance allowed between two clicks for them to be considered a "
 "double click (in pixels)"
@@ -2915,27 +3313,27 @@ msgstr ""
 "Lengste avstand mellom to klikk for at de skal betraktes som et dobbelklikk "
 "(i piksler)"
 
-#: gtk/gtksettings.c:278
+#: gtk/gtksettings.c:284
 msgid "Cursor Blink"
 msgstr "Markørblinking"
 
-#: gtk/gtksettings.c:279
+#: gtk/gtksettings.c:285
 msgid "Whether the cursor should blink"
 msgstr "La markøren blinke"
 
-#: gtk/gtksettings.c:286
+#: gtk/gtksettings.c:292
 msgid "Cursor Blink Time"
 msgstr "Tid for markørblink"
 
-#: gtk/gtksettings.c:287
+#: gtk/gtksettings.c:293
 msgid "Length of the cursor blink cycle, in milleseconds"
 msgstr "Lengde på markørblinking, i millisekunder"
 
-#: gtk/gtksettings.c:294
+#: gtk/gtksettings.c:300
 msgid "Split Cursor"
 msgstr "Delt markør"
 
-#: gtk/gtksettings.c:295
+#: gtk/gtksettings.c:301
 msgid ""
 "Whether two cursors should be displayed for mixed left-to-right and right-to-"
 "left text"
@@ -2943,109 +3341,126 @@ msgstr ""
 "Om to markører skal vises for blandet venstre-til-høyre og høyre-til-venstre "
 "tekst"
 
-#: gtk/gtksettings.c:302
+#: gtk/gtksettings.c:308
 msgid "Theme Name"
 msgstr "Temanavn"
 
-#: gtk/gtksettings.c:303
+#: gtk/gtksettings.c:309
 msgid "Name of theme RC file to load"
 msgstr "Navn på RC-fil som skal lastes"
 
-#: gtk/gtksettings.c:310
+#: gtk/gtksettings.c:316
 msgid "Icon Theme Name"
 msgstr "Navn på ikontema"
 
-#: gtk/gtksettings.c:311
+#: gtk/gtksettings.c:317
 msgid "Name of icon theme to use"
 msgstr "Navn på ikontema som skal brukes"
 
-#: gtk/gtksettings.c:319
+#: gtk/gtksettings.c:325
 msgid "Key Theme Name"
 msgstr "Navn på nøkkeltema"
 
-#: gtk/gtksettings.c:320
+#: gtk/gtksettings.c:326
 msgid "Name of key theme RC file to load"
 msgstr "Navn på RC-fil for nøkkeltema som skal lastes"
 
-#: gtk/gtksettings.c:328
+#: gtk/gtksettings.c:334
 msgid "Menu bar accelerator"
 msgstr "Aksellerator for menylinje"
 
-#: gtk/gtksettings.c:329
+#: gtk/gtksettings.c:335
 msgid "Keybinding to activate the menu bar"
 msgstr "Tastaturbinding som aktiverer menylinjen"
 
-#: gtk/gtksettings.c:337
+#: gtk/gtksettings.c:343
 msgid "Drag threshold"
 msgstr "Terskel for dra-operasjon"
 
-#: gtk/gtksettings.c:338
+#: gtk/gtksettings.c:344
 msgid "Number of pixels the cursor can move before dragging"
 msgstr "Antall piklser markøren kan flyttes før en dra-operasjon startes"
 
-#: gtk/gtksettings.c:346
+#: gtk/gtksettings.c:352
 msgid "Font Name"
 msgstr "Skriftnavn"
 
-#: gtk/gtksettings.c:347
+#: gtk/gtksettings.c:353
 msgid "Name of default font to use"
 msgstr "Navn på forvalgt skrift"
 
-#: gtk/gtksettings.c:355
+#: gtk/gtksettings.c:361
 msgid "Icon Sizes"
 msgstr "Ikonstørrelser"
 
-#: gtk/gtksettings.c:356
+#: gtk/gtksettings.c:362
 msgid "List of icon sizes (gtk-menu=16,16;gtk-button=20,20..."
 msgstr "Liste over ikonstørrelser (gtk-menu=16,16;gtk-button=20,20..."
 
-#: gtk/gtksettings.c:365
+#: gtk/gtksettings.c:370
+msgid "GTK Modules"
+msgstr ""
+
+#: gtk/gtksettings.c:371
+msgid "List of currently active GTK modules"
+msgstr ""
+
+#: gtk/gtksettings.c:380
 msgid "Xft Antialias"
 msgstr "Xft skriftutjevning"
 
-#: gtk/gtksettings.c:366
+#: gtk/gtksettings.c:381
 msgid "Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"
 msgstr ""
 "Om skriftutjevning skal brukes for Xft-skrifter; 0=nei, 1=ja, -1=forvalg"
 
-#: gtk/gtksettings.c:375
+#: gtk/gtksettings.c:390
 msgid "Xft Hinting"
 msgstr "Xft-hint"
 
-#: gtk/gtksettings.c:376
+#: gtk/gtksettings.c:391
 msgid "Whether to hint Xft fonts; 0=no, 1=yes, -1=default"
 msgstr "Om hint skal brukes for Xft-skrifter"
 
-#: gtk/gtksettings.c:385
+#: gtk/gtksettings.c:400
 msgid "Xft Hint Style"
 msgstr "Xft-hintstil"
 
-#: gtk/gtksettings.c:386
+#: gtk/gtksettings.c:401
 msgid "What degree of hinting to use; none, slight, medium, or full"
 msgstr "Grad av hint som skal brukes. none, slight, medium eller full"
 
-#: gtk/gtksettings.c:395
+#: gtk/gtksettings.c:410
 msgid "Xft RGBA"
 msgstr "Xft RGBA"
 
-#: gtk/gtksettings.c:396
+#: gtk/gtksettings.c:411
 msgid "Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"
 msgstr "Type pikselutjevning: none, rgb, bgr, vrgb, vbgr"
 
-#: gtk/gtksettings.c:405
+#: gtk/gtksettings.c:420
 msgid "Xft DPI"
 msgstr "Xft DPI"
 
-#: gtk/gtksettings.c:406
+#: gtk/gtksettings.c:421
 msgid "Resolution for Xft, in 1024 * dots/inch. -1 to use default value"
 msgstr ""
 "Oppløsning for Xft i 1024 * punkter per tomme. -1 for å bruke forvalgt verdi"
 
-#: gtk/gtksizegroup.c:242
+#: gtk/gtksettings.c:430
+msgid "Alternative button order"
+msgstr ""
+
+#: gtk/gtksettings.c:431
+#, fuzzy
+msgid "Whether buttons in dialogs should use the alternative button order"
+msgstr "Om standardikoner skal vises i knapper"
+
+#: gtk/gtksizegroup.c:243
 msgid "Mode"
 msgstr "Modus"
 
-#: gtk/gtksizegroup.c:243
+#: gtk/gtksizegroup.c:244
 msgid ""
 "The directions in which the size group effects the requested sizes of its "
 "component widgets"
@@ -3053,164 +3468,164 @@ msgstr ""
 "Størrelsesgruppens retning ved effektuering av forespurte størrelser for "
 "sine komponentwidget"
 
-#: gtk/gtkspinbutton.c:242
+#: gtk/gtkspinbutton.c:243
 msgid "The adjustment that holds the value of the spinbutton"
 msgstr "Justeringen som innehar verdien for en «spinbutton»"
 
-#: gtk/gtkspinbutton.c:249
+#: gtk/gtkspinbutton.c:250
 msgid "Climb Rate"
 msgstr "Klatrerate"
 
-#: gtk/gtkspinbutton.c:250
+#: gtk/gtkspinbutton.c:251
 msgid "The acceleration rate when you hold down a button"
 msgstr "Akselleratorrate når du holder nede en knapp"
 
-#: gtk/gtkspinbutton.c:260
+#: gtk/gtkspinbutton.c:261
 msgid "The number of decimal places to display"
 msgstr "Antall desimalplasser som skal vises"
 
-#: gtk/gtkspinbutton.c:269
+#: gtk/gtkspinbutton.c:270
 msgid "Snap to Ticks"
 msgstr "Fest til tikk"
 
-#: gtk/gtkspinbutton.c:270
+#: gtk/gtkspinbutton.c:271
 msgid ""
 "Whether erroneous values are automatically changed to a spin button's "
 "nearest step increment"
 msgstr ""
 "Om feilverdier skal endres automatisk til nærmeste verdisteg for knappen"
 
-#: gtk/gtkspinbutton.c:277
+#: gtk/gtkspinbutton.c:278
 msgid "Numeric"
 msgstr "Numerisk"
 
-#: gtk/gtkspinbutton.c:278
+#: gtk/gtkspinbutton.c:279
 msgid "Whether non-numeric characters should be ignored"
 msgstr "Ignorer ikke-numeriske tegn"
 
-#: gtk/gtkspinbutton.c:285
+#: gtk/gtkspinbutton.c:286
 msgid "Wrap"
 msgstr "Bryt"
 
-#: gtk/gtkspinbutton.c:286
+#: gtk/gtkspinbutton.c:287
 msgid "Whether a spin button should wrap upon reaching its limits"
 msgstr "Om en «spin button» skal snu rundt når den når grenseverdiene"
 
-#: gtk/gtkspinbutton.c:293
+#: gtk/gtkspinbutton.c:294
 msgid "Update Policy"
 msgstr "Oppdateringspolicy"
 
-#: gtk/gtkspinbutton.c:294
+#: gtk/gtkspinbutton.c:295
 msgid ""
 "Whether the spin button should update always, or only when the value is legal"
 msgstr ""
 "Om «spin button» alltid skal oppdatere, eller kun når verdien er gyldig"
 
-#: gtk/gtkspinbutton.c:303
+#: gtk/gtkspinbutton.c:304
 msgid "Reads the current value, or sets a new value"
 msgstr "Leser aktiv verdi eller setter en ny"
 
-#: gtk/gtkspinbutton.c:312
+#: gtk/gtkspinbutton.c:313
 msgid "Style of bevel around the spin button"
 msgstr "Stil på kanten rundt spinbutton"
 
-#: gtk/gtkstatusbar.c:173
+#: gtk/gtkstatusbar.c:174
 msgid "Has Resize Grip"
 msgstr "Har håndtak for endring av størrelse"
 
-#: gtk/gtkstatusbar.c:174
+#: gtk/gtkstatusbar.c:175
 msgid "Whether the statusbar has a grip for resizing the toplevel"
 msgstr "Om statuslinjen har et håndtak for å endre størrelse på toppnoden"
 
-#: gtk/gtkstatusbar.c:201
+#: gtk/gtkstatusbar.c:202
 msgid "Style of bevel around the statusbar text"
 msgstr "Stil for kant rundt statuslinjetekst"
 
-#: gtk/gtktable.c:159
+#: gtk/gtktable.c:160
 msgid "Rows"
 msgstr "Rader"
 
-#: gtk/gtktable.c:160
+#: gtk/gtktable.c:161
 msgid "The number of rows in the table"
 msgstr "Antall rader i tabellen"
 
-#: gtk/gtktable.c:168
+#: gtk/gtktable.c:169
 msgid "Columns"
 msgstr "Kolonner"
 
-#: gtk/gtktable.c:169
+#: gtk/gtktable.c:170
 msgid "The number of columns in the table"
 msgstr "Antall kolonner i tabellen"
 
-#: gtk/gtktable.c:177
+#: gtk/gtktable.c:178
 msgid "Row spacing"
 msgstr "Avstand mellom rader"
 
-#: gtk/gtktable.c:178
+#: gtk/gtktable.c:179
 msgid "The amount of space between two consecutive rows"
 msgstr "Avstand mellom to etterfølgende rader"
 
-#: gtk/gtktable.c:186
+#: gtk/gtktable.c:187
 msgid "Column spacing"
 msgstr "Avstand mellom kolonner"
 
-#: gtk/gtktable.c:187
+#: gtk/gtktable.c:188
 msgid "The amount of space between two consecutive columns"
 msgstr "Avstand mellom to etterfølgende kolonner"
 
-#: gtk/gtktable.c:195
+#: gtk/gtktable.c:196
 msgid "Homogenous"
 msgstr "Homogen"
 
-#: gtk/gtktable.c:196
+#: gtk/gtktable.c:197
 msgid "If TRUE this means the table cells are all the same width/height"
 msgstr "Hvis SANN betyr dette at alle tabellcellene har samme bredde/høyde"
 
-#: gtk/gtktable.c:203
+#: gtk/gtktable.c:204
 msgid "Left attachment"
 msgstr "Venstre feste"
 
-#: gtk/gtktable.c:210
+#: gtk/gtktable.c:211
 msgid "Right attachment"
 msgstr "Høyre feste"
 
-#: gtk/gtktable.c:211
+#: gtk/gtktable.c:212
 msgid "The column number to attach the right side of a child widget to"
 msgstr "Kolonnenummer som høyre side av etterkommer skal festes til"
 
-#: gtk/gtktable.c:217
+#: gtk/gtktable.c:218
 msgid "Top attachment"
 msgstr "Toppfeste"
 
-#: gtk/gtktable.c:218
+#: gtk/gtktable.c:219
 msgid "The row number to attach the top of a child widget to"
 msgstr "Radnummer som toppen av etterkommer skal festes til"
 
-#: gtk/gtktable.c:224
+#: gtk/gtktable.c:225
 msgid "Bottom attachment"
 msgstr "Bunnfeste"
 
-#: gtk/gtktable.c:231
+#: gtk/gtktable.c:232
 msgid "Horizontal options"
 msgstr "Horisontale alternativer"
 
-#: gtk/gtktable.c:232
+#: gtk/gtktable.c:233
 msgid "Options specifying the horizontal behaviour of the child"
 msgstr "Alternativer som spesifiserer vertikal oppførsel for etterkommer"
 
-#: gtk/gtktable.c:238
+#: gtk/gtktable.c:239
 msgid "Vertical options"
 msgstr "Vertikale alternativer"
 
-#: gtk/gtktable.c:239
+#: gtk/gtktable.c:240
 msgid "Options specifying the vertical behaviour of the child"
 msgstr "Alternativer som spesifiserer vertikal oppførsel for etterkommer"
 
-#: gtk/gtktable.c:245
+#: gtk/gtktable.c:246
 msgid "Horizontal padding"
 msgstr "Horisontalt fyll"
 
-#: gtk/gtktable.c:246
+#: gtk/gtktable.c:247
 msgid ""
 "Extra space to put between the child and its left and right neighbors, in "
 "pixels"
@@ -3218,67 +3633,67 @@ msgstr ""
 "Ekstra plass i piksler som skal legges mellom etterkommer og dens venstre og "
 "høyre nabo"
 
-#: gtk/gtktable.c:252
+#: gtk/gtktable.c:253
 msgid "Vertical padding"
 msgstr "Vertikalt fyll"
 
-#: gtk/gtktable.c:253
+#: gtk/gtktable.c:254
 msgid ""
 "Extra space to put between the child and its upper and lower neighbors, in "
 "pixels"
 msgstr ""
 "Ekstra mellomrom mellom etterkommer og dens øvre og nedre naboer, i piksler"
 
-#: gtk/gtktext.c:603
+#: gtk/gtktext.c:604
 msgid "Horizontal adjustment for the text widget"
 msgstr "Horisontal justering for tekstwidget"
 
-#: gtk/gtktext.c:611
+#: gtk/gtktext.c:612
 msgid "Vertical adjustment for the text widget"
 msgstr "Vertikal justering for tekstwidgetet"
 
-#: gtk/gtktext.c:618
+#: gtk/gtktext.c:619
 msgid "Line Wrap"
 msgstr "Linjebryting"
 
-#: gtk/gtktext.c:619
+#: gtk/gtktext.c:620
 msgid "Whether lines are wrapped at widget edges"
 msgstr "Linjer brytes ved widgetets kant"
 
-#: gtk/gtktext.c:626
+#: gtk/gtktext.c:627
 msgid "Word Wrap"
 msgstr "Ordbryting"
 
-#: gtk/gtktext.c:627
+#: gtk/gtktext.c:628
 msgid "Whether words are wrapped at widget edges"
 msgstr "Ord brytes ved kanten av et widget"
 
-#: gtk/gtktextbuffer.c:181
+#: gtk/gtktextbuffer.c:184
 msgid "Tag Table"
 msgstr "Tabell med tagger"
 
-#: gtk/gtktextbuffer.c:182
+#: gtk/gtktextbuffer.c:185
 msgid "Text Tag Table"
 msgstr "Tabell med teksttagger"
 
-#: gtk/gtktexttag.c:196
+#: gtk/gtktexttag.c:197
 msgid "Tag name"
 msgstr "Navn på tag"
 
-#: gtk/gtktexttag.c:197
+#: gtk/gtktexttag.c:198
 msgid "Name used to refer to the text tag. NULL for anonymous tags"
 msgstr ""
 "Navn som brukes ved referanse til tekst-taggen. NULL for anonyme tagger"
 
-#: gtk/gtktexttag.c:215
+#: gtk/gtktexttag.c:216
 msgid "Background color as a (possibly unallocated) GdkColor"
 msgstr "Bakgrunnsfarge som en (mulig ikke-allokert) GdkColor"
 
-#: gtk/gtktexttag.c:222
+#: gtk/gtktexttag.c:223
 msgid "Background full height"
 msgstr "Full høyde for bakgrunnsfarge"
 
-#: gtk/gtktexttag.c:223
+#: gtk/gtktexttag.c:224
 msgid ""
 "Whether the background color fills the entire line height or only the height "
 "of the tagged characters"
@@ -3286,47 +3701,47 @@ msgstr ""
 "Om bakgrunnsfargen fyller hele linjehøyden eller kun høyden av de merkede "
 "tegnene"
 
-#: gtk/gtktexttag.c:231
+#: gtk/gtktexttag.c:232
 msgid "Background stipple mask"
 msgstr "Stiplingsmaske for bakgrunnsfarge"
 
-#: gtk/gtktexttag.c:232
+#: gtk/gtktexttag.c:233
 msgid "Bitmap to use as a mask when drawing the text background"
 msgstr "Bitkart som skal brukes som maske under tegning av tekstbakgrunnen"
 
-#: gtk/gtktexttag.c:249
+#: gtk/gtktexttag.c:250
 msgid "Foreground color as a (possibly unallocated) GdkColor"
 msgstr "Forgrunnsfarge som en (mulig ikke-allokert) GdkColor"
 
-#: gtk/gtktexttag.c:257
+#: gtk/gtktexttag.c:258
 msgid "Foreground stipple mask"
 msgstr "Stiplingsmaske for forgrunnsfarge"
 
-#: gtk/gtktexttag.c:258
+#: gtk/gtktexttag.c:259
 msgid "Bitmap to use as a mask when drawing the text foreground"
 msgstr "Bitkart som skal brukes som maske ved tegning av tekstforgrunn"
 
-#: gtk/gtktexttag.c:265
+#: gtk/gtktexttag.c:266
 msgid "Text direction"
 msgstr "Tekstretning"
 
-#: gtk/gtktexttag.c:266
+#: gtk/gtktexttag.c:267
 msgid "Text direction, e.g. right-to-left or left-to-right"
 msgstr "Tekstretning; høyre-til-venstre eller venstre-til-høyre"
 
-#: gtk/gtktexttag.c:283
+#: gtk/gtktexttag.c:284
 msgid "Font description as a string, e.g. \"Sans Italic 12\""
 msgstr "Beskrivelse av skriften som en streng, f.eks «Sans Italic 12»"
 
-#: gtk/gtktexttag.c:308
+#: gtk/gtktexttag.c:309
 msgid "Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"
 msgstr "Skriftstil som PangoStyle, f.eks. PANGO_STYLE_ITALIC"
 
-#: gtk/gtktexttag.c:317
+#: gtk/gtktexttag.c:318
 msgid "Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"
 msgstr "Skriftvariant som PangoVariant, f.eks. PANGO_VARIANT_SMALL_CAPS"
 
-#: gtk/gtktexttag.c:326
+#: gtk/gtktexttag.c:327
 msgid ""
 "Font weight as an integer, see predefined values in PangoWeight; for "
 "example, PANGO_WEIGHT_BOLD"
@@ -3334,15 +3749,15 @@ msgstr ""
 "Skrifttyngde som et heltall. Se forhåndsdefinerte verdier i PangoWeight; f."
 "eks. PANGO_WEIGHT_BOLD"
 
-#: gtk/gtktexttag.c:337
+#: gtk/gtktexttag.c:338
 msgid "Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"
 msgstr "Skriftstrekking som PangoStretch, f.eks. PANGO_STRETCH_CONDENSED"
 
-#: gtk/gtktexttag.c:346
+#: gtk/gtktexttag.c:347
 msgid "Font size in Pango units"
 msgstr "Størrelse på skrift i Pango-enheter"
 
-#: gtk/gtktexttag.c:356
+#: gtk/gtktexttag.c:357
 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 "
@@ -3353,361 +3768,371 @@ msgstr ""
 "er derfor anbefalt. Pango predefinerer noen skaleringer slik som "
 "PANGO_SCALE_X_LARGE"
 
-#: gtk/gtktexttag.c:376 gtk/gtktextview.c:605
+#: gtk/gtktexttag.c:377 gtk/gtktextview.c:595
 msgid "Left, right, or center justification"
 msgstr "Venstre-, høyre- eller senterjustering"
 
-#: gtk/gtktexttag.c:392
+#: gtk/gtktexttag.c:386
+#, fuzzy
+msgid ""
+"The language this text is in, as an ISO code. Pango can use this as a hint "
+"when rendering the text. If not set, an appropriate default will be used."
+msgstr ""
+"Språket denne teksten er skrevet i som en ISO-kode. Pango kan bruke dette "
+"som et hint når teksten rendres. Hvis du ikke forstår denne parameteren "
+"trenger du den sannsynligvis ikke"
+
+#: gtk/gtktexttag.c:393
 msgid "Left margin"
 msgstr "Venstre marg"
 
-#: gtk/gtktexttag.c:393 gtk/gtktextview.c:614
+#: gtk/gtktexttag.c:394 gtk/gtktextview.c:604
 msgid "Width of the left margin in pixels"
 msgstr "Bredde på venstre marg i piksler"
 
-#: gtk/gtktexttag.c:402
+#: gtk/gtktexttag.c:403
 msgid "Right margin"
 msgstr "Høyre marg"
 
-#: gtk/gtktexttag.c:403 gtk/gtktextview.c:624
+#: gtk/gtktexttag.c:404 gtk/gtktextview.c:614
 msgid "Width of the right margin in pixels"
 msgstr "Bredde på høyre marg i piksler"
 
-#: gtk/gtktexttag.c:413 gtk/gtktextview.c:633
+#: gtk/gtktexttag.c:414 gtk/gtktextview.c:623
 msgid "Indent"
 msgstr "Rykk inn"
 
-#: gtk/gtktexttag.c:414 gtk/gtktextview.c:634
+#: gtk/gtktexttag.c:415 gtk/gtktextview.c:624
 msgid "Amount to indent the paragraph, in pixels"
 msgstr "Innrykksmengde for avsnittet, i piksler"
 
-#: gtk/gtktexttag.c:425
+#: gtk/gtktexttag.c:426
 msgid ""
 "Offset of text above the baseline (below the baseline if rise is negative) "
 "in pixels"
 msgstr ""
 "Tekstavstand over grunnlinjen (under grunnlinjen hvis hevingen er negativ) "
 
-#: gtk/gtktexttag.c:434
+#: gtk/gtktexttag.c:435
 msgid "Pixels above lines"
 msgstr "Piksler over linjer"
 
-#: gtk/gtktexttag.c:435 gtk/gtktextview.c:558
+#: gtk/gtktexttag.c:436 gtk/gtktextview.c:548
 msgid "Pixels of blank space above paragraphs"
 msgstr "Antall piksler med tomrom over avsnittene"
 
-#: gtk/gtktexttag.c:444
+#: gtk/gtktexttag.c:445
 msgid "Pixels below lines"
 msgstr "Piksler under linjer"
 
-#: gtk/gtktexttag.c:445 gtk/gtktextview.c:568
+#: gtk/gtktexttag.c:446 gtk/gtktextview.c:558
 msgid "Pixels of blank space below paragraphs"
 msgstr "Antall piksler med tomrom under avsnittene"
 
-#: gtk/gtktexttag.c:454
+#: gtk/gtktexttag.c:455
 msgid "Pixels inside wrap"
 msgstr "Piksler før brytning"
 
-#: gtk/gtktexttag.c:455 gtk/gtktextview.c:578
+#: gtk/gtktexttag.c:456 gtk/gtktextview.c:568
 msgid "Pixels of blank space between wrapped lines in a paragraph"
 msgstr "Piksler med tomt rom mellom brutte linjer i et avsnitt"
 
-#: gtk/gtktexttag.c:481
+#: gtk/gtktexttag.c:482
 msgid "Wrap mode"
 msgstr "Brytningsmodus"
 
-#: gtk/gtktexttag.c:482 gtk/gtktextview.c:596
+#: gtk/gtktexttag.c:483 gtk/gtktextview.c:586
 msgid ""
 "Whether to wrap lines never, at word boundaries, or at character boundaries"
 msgstr "Regler for linjebryting; aldri, ved ordgrenser eller ved tegngrenser"
 
-#: gtk/gtktexttag.c:491 gtk/gtktextview.c:643
+#: gtk/gtktexttag.c:492 gtk/gtktextview.c:633
 msgid "Tabs"
 msgstr "Faner"
 
-#: gtk/gtktexttag.c:492 gtk/gtktextview.c:644
+#: gtk/gtktexttag.c:493 gtk/gtktextview.c:634
 msgid "Custom tabs for this text"
 msgstr "Egendefinerte faner for denne teksten"
 
-#: gtk/gtktexttag.c:499
+#: gtk/gtktexttag.c:500
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: gtk/gtktexttag.c:500
+#: gtk/gtktexttag.c:501
 msgid "Whether this text is hidden. Not implemented in GTK 2.0"
 msgstr "Om denne teksten er skjult. Ikke implementert i GTK 2.0"
 
-#: gtk/gtktexttag.c:513
+#: gtk/gtktexttag.c:514
 msgid "Background full height set"
 msgstr "Full høyde for bakgrunn satt"
 
-#: gtk/gtktexttag.c:514
+#: gtk/gtktexttag.c:515
 msgid "Whether this tag affects background height"
 msgstr "Om denne merkingen påvirker bakgrunnshøyden"
 
-#: gtk/gtktexttag.c:517
+#: gtk/gtktexttag.c:518
 msgid "Background stipple set"
 msgstr "Stiplet bakgrunn satt"
 
-#: gtk/gtktexttag.c:518
+#: gtk/gtktexttag.c:519
 msgid "Whether this tag affects the background stipple"
 msgstr "Om denne merkingen påvirker stipling av bakgrunn"
 
-#: gtk/gtktexttag.c:525
+#: gtk/gtktexttag.c:526
 msgid "Foreground stipple set"
 msgstr "Stiplet forgrunn satt"
 
-#: gtk/gtktexttag.c:526
+#: gtk/gtktexttag.c:527
 msgid "Whether this tag affects the foreground stipple"
 msgstr "Om denne merkingen påvirker stipling av forgrunn"
 
-#: gtk/gtktexttag.c:561
+#: gtk/gtktexttag.c:562
 msgid "Justification set"
 msgstr "Plassering satt"
 
-#: gtk/gtktexttag.c:562
+#: gtk/gtktexttag.c:563
 msgid "Whether this tag affects paragraph justification"
 msgstr "Om denne merkingen påvirker plassering av avsnitt"
 
-#: gtk/gtktexttag.c:569
+#: gtk/gtktexttag.c:570
 msgid "Left margin set"
 msgstr "Venstre marg satt"
 
-#: gtk/gtktexttag.c:570
+#: gtk/gtktexttag.c:571
 msgid "Whether this tag affects the left margin"
 msgstr "Om denne merkingen påvirker venstre marg"
 
-#: gtk/gtktexttag.c:573
+#: gtk/gtktexttag.c:574
 msgid "Indent set"
 msgstr "Innrykk satt"
 
-#: gtk/gtktexttag.c:574
+#: gtk/gtktexttag.c:575
 msgid "Whether this tag affects indentation"
 msgstr "Om denne merkingen påvirker innrykk"
 
-#: gtk/gtktexttag.c:581
+#: gtk/gtktexttag.c:582
 msgid "Pixels above lines set"
 msgstr "Piksler over linjer satt"
 
-#: gtk/gtktexttag.c:582 gtk/gtktexttag.c:586
+#: gtk/gtktexttag.c:583 gtk/gtktexttag.c:587
 msgid "Whether this tag affects the number of pixels above lines"
 msgstr "Om denne merkingen påvirker antall piksler over linjer"
 
-#: gtk/gtktexttag.c:585
+#: gtk/gtktexttag.c:586
 msgid "Pixels below lines set"
 msgstr "Piksler under linjer satt"
 
-#: gtk/gtktexttag.c:589
+#: gtk/gtktexttag.c:590
 msgid "Pixels inside wrap set"
 msgstr "Piksler innenfor brytningssett"
 
-#: gtk/gtktexttag.c:590
+#: gtk/gtktexttag.c:591
 msgid "Whether this tag affects the number of pixels between wrapped lines"
 msgstr "Om denne merkingen påvirker antall piksler mellom brutte linjer"
 
-#: gtk/gtktexttag.c:597
+#: gtk/gtktexttag.c:598
 msgid "Right margin set"
 msgstr "Høyre marg satt"
 
-#: gtk/gtktexttag.c:598
+#: gtk/gtktexttag.c:599
 msgid "Whether this tag affects the right margin"
 msgstr "Om denne merkingen påvirker høyre marg"
 
-#: gtk/gtktexttag.c:605
+#: gtk/gtktexttag.c:606
 msgid "Wrap mode set"
 msgstr "Brytningsmodus satt"
 
-#: gtk/gtktexttag.c:606
+#: gtk/gtktexttag.c:607
 msgid "Whether this tag affects line wrap mode"
 msgstr "Om denne merkingen påvirker brytningsmodus"
 
-#: gtk/gtktexttag.c:609
+#: gtk/gtktexttag.c:610
 msgid "Tabs set"
 msgstr "Faner satt"
 
-#: gtk/gtktexttag.c:610
+#: gtk/gtktexttag.c:611
 msgid "Whether this tag affects tabs"
 msgstr "Om denne merkingen påvirker faner"
 
-#: gtk/gtktexttag.c:613
+#: gtk/gtktexttag.c:614
 msgid "Invisible set"
 msgstr "Usynlig satt"
 
-#: gtk/gtktexttag.c:614
+#: gtk/gtktexttag.c:615
 msgid "Whether this tag affects text visibility"
 msgstr "Om denne merkingen påvirker tekstsynlighet"
 
-#: gtk/gtktextview.c:557
+#: gtk/gtktextview.c:547
 msgid "Pixels Above Lines"
 msgstr "Piksler over linjer"
 
-#: gtk/gtktextview.c:567
+#: gtk/gtktextview.c:557
 msgid "Pixels Below Lines"
 msgstr "Piksler under linjer"
 
-#: gtk/gtktextview.c:577
+#: gtk/gtktextview.c:567
 msgid "Pixels Inside Wrap"
 msgstr "Piksler før brytning"
 
-#: gtk/gtktextview.c:595
+#: gtk/gtktextview.c:585
 msgid "Wrap Mode"
 msgstr "Brytningsmodus"
 
-#: gtk/gtktextview.c:613
+#: gtk/gtktextview.c:603
 msgid "Left Margin"
 msgstr "Venstre marg"
 
-#: gtk/gtktextview.c:623
+#: gtk/gtktextview.c:613
 msgid "Right Margin"
 msgstr "Høyre marg"
 
-#: gtk/gtktextview.c:651
+#: gtk/gtktextview.c:641
 msgid "Cursor Visible"
 msgstr "Synlig markør"
 
-#: gtk/gtktextview.c:652
+#: gtk/gtktextview.c:642
 msgid "If the insertion cursor is shown"
 msgstr "Vis innsettingsmarkør"
 
-#: gtk/gtktextview.c:659
+#: gtk/gtktextview.c:649
 msgid "Buffer"
 msgstr "Buffer"
 
-#: gtk/gtktextview.c:660
+#: gtk/gtktextview.c:650
 msgid "The buffer which is displayed"
 msgstr "Buffer som vises"
 
-#: gtk/gtktextview.c:667
+#: gtk/gtktextview.c:657
 msgid "Overwrite mode"
 msgstr "Overskrivingsmodus"
 
-#: gtk/gtktextview.c:668
+#: gtk/gtktextview.c:658
 msgid "Whether entered text overwrites existing contents"
 msgstr "Om oppgitt tekst overskriver eksisterende innhold"
 
-#: gtk/gtktextview.c:675
+#: gtk/gtktextview.c:665
 msgid "Accepts tab"
 msgstr "Godtar tabulator"
 
-#: gtk/gtktextview.c:676
+#: gtk/gtktextview.c:666
 msgid "Whether Tab will result in a tab character being entered"
 msgstr "Om tab resulterer i at et tabulatortegn settes inn"
 
-#: gtk/gtktextview.c:685
+#: gtk/gtktextview.c:675
 msgid "Error underline color"
 msgstr "Farge for understreking av feil"
 
-#: gtk/gtktextview.c:686
+#: gtk/gtktextview.c:676
 msgid "Color with which to draw error-indication underlines"
 msgstr "Farge for understreking av feil"
 
-#: gtk/gtktoggleaction.c:129
+#: gtk/gtktoggleaction.c:130
 msgid "Create the same proxies as a radio action"
 msgstr "Opprett samme proxyer som en radiohandling"
 
-#: gtk/gtktoggleaction.c:130
+#: gtk/gtktoggleaction.c:131
 msgid "Whether the proxies for this action look like radio action proxies"
 msgstr "Om proxyene for denne handlingen ser ut som radiohandlingproxyer"
 
-#: gtk/gtktogglebutton.c:134
+#: gtk/gtktogglebutton.c:135
 msgid "If the toggle button should be pressed in or not"
 msgstr "Om knappen skal trykkes inn eller ikke"
 
-#: gtk/gtktogglebutton.c:142
+#: gtk/gtktogglebutton.c:143
 msgid "If the toggle button is in an \"in between\" state"
 msgstr "Om knappen er i en mellomtilstand"
 
-#: gtk/gtktogglebutton.c:149
+#: gtk/gtktogglebutton.c:150
 msgid "Draw Indicator"
 msgstr "Tegn indikator"
 
-#: gtk/gtktogglebutton.c:150
+#: gtk/gtktogglebutton.c:151
 msgid "If the toggle part of the button is displayed"
 msgstr "Om venderdelen av knappen skal vises"
 
-#: gtk/gtktoolbar.c:500
+#: gtk/gtktoolbar.c:508
 msgid "The orientation of the toolbar"
 msgstr "Orientering for verktøylinjen"
 
-#: gtk/gtktoolbar.c:508
+#: gtk/gtktoolbar.c:516
 msgid "Toolbar Style"
 msgstr "Stil for verktøylinje"
 
-#: gtk/gtktoolbar.c:509
+#: gtk/gtktoolbar.c:517
 msgid "How to draw the toolbar"
 msgstr "Hvordan tegnes verktøylinjen"
 
-#: gtk/gtktoolbar.c:516
+#: gtk/gtktoolbar.c:524
 msgid "Show Arrow"
 msgstr "Vis pil"
 
-#: gtk/gtktoolbar.c:517
+#: gtk/gtktoolbar.c:525
 msgid "If an arrow should be shown if the toolbar doesn't fit"
 msgstr "Om en pil skal vises hvis verktøylinjen ikke passer"
 
-#: gtk/gtktoolbar.c:526
+#: gtk/gtktoolbar.c:534
 msgid "Whether the item should receive extra space when the toolbar grows"
 msgstr "Om oppføringen skal få mer plass når verktøylinjen vokser"
 
-#: gtk/gtktoolbar.c:534
+#: gtk/gtktoolbar.c:542
 msgid "Whether the item should be the same size as other homogeneous items"
 msgstr ""
 "Om oppføringen skal forbli samme størrelse som andre homogene oppføringer"
 
-#: gtk/gtktoolbar.c:541
+#: gtk/gtktoolbar.c:549
 msgid "Spacer size"
 msgstr "Størrelse på mellomrom"
 
-#: gtk/gtktoolbar.c:542
+#: gtk/gtktoolbar.c:550
 msgid "Size of spacers"
 msgstr "Størrelse på plassholdere"
 
-#: gtk/gtktoolbar.c:551
+#: gtk/gtktoolbar.c:559
 msgid "Amount of border space between the toolbar shadow and the buttons"
 msgstr "Mengde kantområde mellom verktøylinjens skygge og knappene"
 
-#: gtk/gtktoolbar.c:559
+#: gtk/gtktoolbar.c:567
 msgid "Space style"
 msgstr "Stil på mellomrom"
 
-#: gtk/gtktoolbar.c:560
+#: gtk/gtktoolbar.c:568
 msgid "Whether spacers are vertical lines or just blank"
 msgstr "Om mellomrommene er vertikale linjer eller bare tomrom"
 
-#: gtk/gtktoolbar.c:567
+#: gtk/gtktoolbar.c:575
 msgid "Button relief"
 msgstr "Kantavsleping"
 
-#: gtk/gtktoolbar.c:568
+#: gtk/gtktoolbar.c:576
 msgid "Type of bevel around toolbar buttons"
 msgstr "Type kant rundt verktøylinjeknappene"
 
-#: gtk/gtktoolbar.c:575
+#: gtk/gtktoolbar.c:583
 msgid "Style of bevel around the toolbar"
 msgstr "Stil på kant rundt verktøylinjen"
 
-#: gtk/gtktoolbar.c:581
+#: gtk/gtktoolbar.c:589
 msgid "Toolbar style"
 msgstr "Verktøylinjestil"
 
-#: gtk/gtktoolbar.c:582
+#: gtk/gtktoolbar.c:590
 msgid ""
 "Whether default toolbars have text only, text and icons, icons only, etc."
 msgstr "Om forvalgte verktøylinje har tekst, tekst og ikoner, kun ikoner, etc."
 
-#: gtk/gtktoolbar.c:588
+#: gtk/gtktoolbar.c:596
 msgid "Toolbar icon size"
 msgstr "Størrelse på verktøylinjeikon"
 
-#: gtk/gtktoolbar.c:589
+#: gtk/gtktoolbar.c:597
 msgid "Size of icons in default toolbars"
 msgstr "Størrelse på ikiner i standard verktøylinjer"
 
-#: gtk/gtktoolbutton.c:181
+#: gtk/gtktoolbutton.c:182
 msgid "Text to show in the item."
 msgstr "Tekst som skal vises i oppføringen."
 
-#: gtk/gtktoolbutton.c:188
+#: gtk/gtktoolbutton.c:189
 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"
@@ -3715,27 +4140,27 @@ msgstr ""
 "Hvis satt vil en understreking i teksten indikere at neste tegn skal brukes "
 "som akselleratortast i overflytmenyen"
 
-#: gtk/gtktoolbutton.c:195
+#: gtk/gtktoolbutton.c:196
 msgid "Widget to use as the item label"
 msgstr "Komponent som skal brukes som etikett for oppføringen"
 
-#: gtk/gtktoolbutton.c:201
+#: gtk/gtktoolbutton.c:202
 msgid "Stock Id"
 msgstr "Standard-ID"
 
-#: gtk/gtktoolbutton.c:202
+#: gtk/gtktoolbutton.c:203
 msgid "The stock icon displayed on the item"
 msgstr "Standardikon som vises på oppføringen"
 
-#: gtk/gtktoolbutton.c:208
+#: gtk/gtktoolbutton.c:209
 msgid "Icon widget"
 msgstr "Ikonkomponent"
 
-#: gtk/gtktoolbutton.c:209
+#: gtk/gtktoolbutton.c:210
 msgid "Icon widget to display in the item"
 msgstr "Ikonkomponent som skal vises i oppføringen"
 
-#: gtk/gtktoolitem.c:173
+#: gtk/gtktoolitem.c:174
 msgid ""
 "Whether the toolbar item is considered important. When TRUE, toolbar buttons "
 "show text in GTK_TOOLBAR_BOTH_HORIZ mode"
@@ -3743,257 +4168,278 @@ msgstr ""
 "Om verktøylinjeoppføringen ses på som viktig. Hvis TRUE vil knapper på "
 "verktøylinjen ha tekst i GTK_TOOLBAR_BOTH_HORIZ-modus"
 
-#: gtk/gtktreemodelsort.c:329
+#: gtk/gtktreemodelsort.c:330
 msgid "TreeModelSort Model"
 msgstr "TreeModelSort modell"
 
-#: gtk/gtktreemodelsort.c:330
+#: gtk/gtktreemodelsort.c:331
 msgid "The model for the TreeModelSort to sort"
 msgstr "Modell som TreeModelSort skal sortere"
 
-#: gtk/gtktreeview.c:540
+#: gtk/gtktreeview.c:558
 msgid "TreeView Model"
 msgstr "TreeView modell"
 
-#: gtk/gtktreeview.c:541
+#: gtk/gtktreeview.c:559
 msgid "The model for the tree view"
 msgstr "Modell for treevisning"
 
-#: gtk/gtktreeview.c:549
+#: gtk/gtktreeview.c:567
 msgid "Horizontal Adjustment for the widget"
 msgstr "Horisontal justering for widget"
 
-#: gtk/gtktreeview.c:557
+#: gtk/gtktreeview.c:575
 msgid "Vertical Adjustment for the widget"
 msgstr "Vertikal justering for widget"
 
-#: gtk/gtktreeview.c:565
+#: gtk/gtktreeview.c:583
 msgid "Show the column header buttons"
 msgstr "Vis knapper for kolonnetopptekst"
 
-#: gtk/gtktreeview.c:572
+#: gtk/gtktreeview.c:590
 msgid "Headers Clickable"
 msgstr "Topptekster kan klikkes"
 
-#: gtk/gtktreeview.c:573
+#: gtk/gtktreeview.c:591
 msgid "Column headers respond to click events"
 msgstr "Kolonnetitler svarer på klikk"
 
-#: gtk/gtktreeview.c:580
+#: gtk/gtktreeview.c:598
 msgid "Expander Column"
 msgstr "Utviderkolonne"
 
-#: gtk/gtktreeview.c:581
+#: gtk/gtktreeview.c:599
 msgid "Set the column for the expander column"
 msgstr "Sett kolonne for utviderkolonne"
 
-#: gtk/gtktreeview.c:588 gtk/gtktreeviewcolumn.c:330
+#: gtk/gtktreeview.c:606 gtk/gtktreeviewcolumn.c:341
 msgid "Reorderable"
 msgstr "Kan omorganiseres"
 
-#: gtk/gtktreeview.c:589
+#: gtk/gtktreeview.c:607
 msgid "View is reorderable"
 msgstr "Visningen kan omorganiseres"
 
-#: gtk/gtktreeview.c:596
+#: gtk/gtktreeview.c:614
 msgid "Rules Hint"
 msgstr "Regelhint"
 
-#: gtk/gtktreeview.c:597
+#: gtk/gtktreeview.c:615
 msgid "Set a hint to the theme engine to draw rows in alternating colors"
 msgstr "Sett et hint til temamotoren for å tegne rader i alternerende farger"
 
-#: gtk/gtktreeview.c:604
+#: gtk/gtktreeview.c:622
 msgid "Enable Search"
 msgstr "Aktiver søk"
 
-#: gtk/gtktreeview.c:605
+#: gtk/gtktreeview.c:623
 msgid "View allows user to search through columns interactively"
 msgstr "Visning lar bruker søke gjennom kolonner interaktivt"
 
-#: gtk/gtktreeview.c:612
+#: gtk/gtktreeview.c:630
 msgid "Search Column"
 msgstr "Søkekolonne"
 
-#: gtk/gtktreeview.c:613
+#: gtk/gtktreeview.c:631
 msgid "Model column to search through when searching through code"
 msgstr "Modellkolonne som skal søkes gjennom ved søk i koden"
 
-#: gtk/gtktreeview.c:633
+#: gtk/gtktreeview.c:651
 msgid "Fixed Height Mode"
 msgstr "Fast høyde"
 
-#: gtk/gtktreeview.c:634
+#: gtk/gtktreeview.c:652
 msgid "Speeds up GtkTreeView by assuming that all rows have the same height"
 msgstr "Gjør GtkTreeView raskere ved å anta at alle rader har samme høyde"
 
-#: gtk/gtktreeview.c:654
+#: gtk/gtktreeview.c:672
+#, fuzzy
+msgid "Hover Selection"
+msgstr "Utvalg bundet"
+
+#: gtk/gtktreeview.c:673
+#, fuzzy
+msgid "Whether the selection should follow the pointer"
+msgstr "La fargevelgeren tillate å sette ugjennomsiktighet"
+
+#: gtk/gtktreeview.c:692
+#, fuzzy
+msgid "Hover Expand"
+msgstr "Utvid"
+
+#: gtk/gtktreeview.c:693
+#, fuzzy
+msgid ""
+"Whether rows should be expanded/collaped when the pointer moves over them"
+msgstr "Om vinduet skal dekoreres av vindushåndtereren"
+
+#: gtk/gtktreeview.c:713
 msgid "Vertical Separator Width"
 msgstr "Bredde på vertikal separator"
 
-#: gtk/gtktreeview.c:655
+#: gtk/gtktreeview.c:714
 msgid "Vertical space between cells.  Must be an even number"
 msgstr "Vertikalt mellomrom mellom celler. Må være et liketall"
 
-#: gtk/gtktreeview.c:663
+#: gtk/gtktreeview.c:722
 msgid "Horizontal Separator Width"
 msgstr "Bredde på horisontal separator"
 
-#: gtk/gtktreeview.c:664
+#: gtk/gtktreeview.c:723
 msgid "Horizontal space between cells.  Must be an even number"
 msgstr "Horisontalt mellomrom mellom celler. Må være et liketall"
 
-#: gtk/gtktreeview.c:672
+#: gtk/gtktreeview.c:731
 msgid "Allow Rules"
 msgstr "Tillat linjaler"
 
-#: gtk/gtktreeview.c:673
+#: gtk/gtktreeview.c:732
 msgid "Allow drawing of alternating color rows"
 msgstr "Tillat tegning av alternerende fargerader"
 
-#: gtk/gtktreeview.c:679
+#: gtk/gtktreeview.c:738
 msgid "Indent Expanders"
 msgstr "Indenter utvidere"
 
-#: gtk/gtktreeview.c:680
+#: gtk/gtktreeview.c:739
 msgid "Make the expanders indented"
 msgstr "Gjør utvidere indentert"
 
-#: gtk/gtktreeview.c:686
+#: gtk/gtktreeview.c:745
 msgid "Even Row Color"
 msgstr "Farge for like rader"
 
-#: gtk/gtktreeview.c:687
+#: gtk/gtktreeview.c:746
 msgid "Color to use for even rows"
 msgstr "Farge som skal brukes for like rader"
 
-#: gtk/gtktreeview.c:693
+#: gtk/gtktreeview.c:752
 msgid "Odd Row Color"
 msgstr "Farge for ulike rader"
 
-#: gtk/gtktreeview.c:694
+#: gtk/gtktreeview.c:753
 msgid "Color to use for odd rows"
 msgstr "Farge som skal brukes for ulike rader"
 
-#: gtk/gtktreeviewcolumn.c:224
+#: gtk/gtktreeviewcolumn.c:226
 msgid "Whether to display the column"
 msgstr "Vis kolonnen"
 
-#: gtk/gtktreeviewcolumn.c:231 gtk/gtkwindow.c:482
+#: gtk/gtktreeviewcolumn.c:233 gtk/gtkwindow.c:494
 msgid "Resizable"
 msgstr "Kan endre størrelse"
 
-#: gtk/gtktreeviewcolumn.c:232
+#: gtk/gtktreeviewcolumn.c:234
 msgid "Column is user-resizable"
 msgstr "Bruker kan endre størrelse på kolonnen"
 
-#: gtk/gtktreeviewcolumn.c:240
+#: gtk/gtktreeviewcolumn.c:242
 msgid "Current width of the column"
 msgstr "Nåværende bredde på kolonnen"
 
-#: gtk/gtktreeviewcolumn.c:248
+#: gtk/gtktreeviewcolumn.c:251
+msgid "Space which is inserted between cells"
+msgstr ""
+
+#: gtk/gtktreeviewcolumn.c:259
 msgid "Sizing"
 msgstr "Størrelse"
 
-#: gtk/gtktreeviewcolumn.c:249
+#: gtk/gtktreeviewcolumn.c:260
 msgid "Resize mode of the column"
 msgstr "Modus for endring av størrelse for kolonnen"
 
-#: gtk/gtktreeviewcolumn.c:257
+#: gtk/gtktreeviewcolumn.c:268
 msgid "Fixed Width"
 msgstr "Fast bredde"
 
-#: gtk/gtktreeviewcolumn.c:258
+#: gtk/gtktreeviewcolumn.c:269
 msgid "Current fixed width of the column"
 msgstr "Nåværende fast bredde på kolonnen"
 
-#: gtk/gtktreeviewcolumn.c:267
+#: gtk/gtktreeviewcolumn.c:278
 msgid "Minimum Width"
 msgstr "Minimal bredde"
 
-#: gtk/gtktreeviewcolumn.c:268
+#: gtk/gtktreeviewcolumn.c:279
 msgid "Minimum allowed width of the column"
 msgstr "Minimum tillatt bredde på kolonne"
 
-#: gtk/gtktreeviewcolumn.c:277
+#: gtk/gtktreeviewcolumn.c:288
 msgid "Maximum Width"
 msgstr "Maksimal bredde"
 
-#: gtk/gtktreeviewcolumn.c:278
+#: gtk/gtktreeviewcolumn.c:289
 msgid "Maximum allowed width of the column"
 msgstr "Maksimum tillatt bredde på kolonnen"
 
-#: gtk/gtktreeviewcolumn.c:288
+#: gtk/gtktreeviewcolumn.c:299
 msgid "Title to appear in column header"
 msgstr "Tittel som vises i kolonnetopptekst"
 
-#: gtk/gtktreeviewcolumn.c:296
+#: gtk/gtktreeviewcolumn.c:307
 msgid "Column gets share of extra width allocated to the widget"
 msgstr "Kolonnen får en del av ekstra bredde allokert til komponenten"
 
-#: gtk/gtktreeviewcolumn.c:303
+#: gtk/gtktreeviewcolumn.c:314
 msgid "Clickable"
 msgstr "Klikkbar"
 
-#: gtk/gtktreeviewcolumn.c:304
+#: gtk/gtktreeviewcolumn.c:315
 msgid "Whether the header can be clicked"
 msgstr "Om toppteksten kan klikkes"
 
-#: gtk/gtktreeviewcolumn.c:312
+#: gtk/gtktreeviewcolumn.c:323
 msgid "Widget"
 msgstr "Widget"
 
-#: gtk/gtktreeviewcolumn.c:313
+#: gtk/gtktreeviewcolumn.c:324
 msgid "Widget to put in column header button instead of column title"
 msgstr ""
 "Widget som skal legges i kappen for kolonneheader i stedet for kolonnens "
 "tittel"
 
-#: gtk/gtktreeviewcolumn.c:320
+#: gtk/gtktreeviewcolumn.c:331
 msgid "Alignment"
 msgstr "Justering"
 
-#: gtk/gtktreeviewcolumn.c:321
+#: gtk/gtktreeviewcolumn.c:332
 msgid "X Alignment of the column header text or widget"
 msgstr "X-justering for kolonneheaders tekst eller widget"
 
-#: gtk/gtktreeviewcolumn.c:331
+#: gtk/gtktreeviewcolumn.c:342
 msgid "Whether the column can be reordered around the headers"
 msgstr "Kolonnen kan omorganiseres etter titler"
 
-#: gtk/gtktreeviewcolumn.c:338
+#: gtk/gtktreeviewcolumn.c:349
 msgid "Sort indicator"
 msgstr "Sorter indikator"
 
-#: gtk/gtktreeviewcolumn.c:339
+#: gtk/gtktreeviewcolumn.c:350
 msgid "Whether to show a sort indicator"
 msgstr "Sorter indikator eller ikke"
 
-#: gtk/gtktreeviewcolumn.c:346
+#: gtk/gtktreeviewcolumn.c:357
 msgid "Sort order"
 msgstr "Sorteringsrekkefølge"
 
-#: gtk/gtktreeviewcolumn.c:347
+#: gtk/gtktreeviewcolumn.c:358
 msgid "Sort direction the sort indicator should indicate"
 msgstr "Sorteringsretning indikert av sorteringsindikator"
 
-#: gtk/gtkuimanager.c:220
-msgid "Add tearoffs to menus"
-msgstr "Legg til avrivningsfelt til menyer"
-
-#: gtk/gtkuimanager.c:221
+#: gtk/gtkuimanager.c:222
 msgid "Whether tearoff menu items should be added to menus"
 msgstr "Om avrivningsoppføringer skal legges til for menyen"
 
-#: gtk/gtkuimanager.c:228
+#: gtk/gtkuimanager.c:229
 msgid "Merged UI definition"
 msgstr "Flettet brukergrensesnittdefinisjon"
 
-#: gtk/gtkuimanager.c:229
+#: gtk/gtkuimanager.c:230
 msgid "An XML string describing the merged UI"
 msgstr "En XML-streng som beskriver flettet brukergrensesnitt"
 
-#: gtk/gtkviewport.c:136
+#: gtk/gtkviewport.c:137
 msgid ""
 "The GtkAdjustment that determines the values of the horizontal position for "
 "this viewport"
@@ -4001,7 +4447,7 @@ msgstr ""
 "GtkAdjustment som bestemmer verdiene for horisontal posisjon for dette "
 "visningsområdet"
 
-#: gtk/gtkviewport.c:144
+#: gtk/gtkviewport.c:145
 msgid ""
 "The GtkAdjustment that determines the values of the vertical position for "
 "this viewport"
@@ -4009,31 +4455,31 @@ msgstr ""
 "GtkAdjustment som bestemmer verdiene for vertikal posisjon for dette "
 "visningsområdet"
 
-#: gtk/gtkviewport.c:152
+#: gtk/gtkviewport.c:153
 msgid "Determines how the shadowed box around the viewport is drawn"
 msgstr "Bestemmer hvordan den skyggelagte boksen rundt visningsområdet tegnes"
 
-#: gtk/gtkwidget.c:409
+#: gtk/gtkwidget.c:410
 msgid "Widget name"
 msgstr "Navn på widget"
 
-#: gtk/gtkwidget.c:410
+#: gtk/gtkwidget.c:411
 msgid "The name of the widget"
 msgstr "Navnet på komponenten"
 
-#: gtk/gtkwidget.c:416
+#: gtk/gtkwidget.c:417
 msgid "Parent widget"
 msgstr "Opphavswidget"
 
-#: gtk/gtkwidget.c:417
+#: gtk/gtkwidget.c:418
 msgid "The parent widget of this widget. Must be a Container widget"
 msgstr "Opphav for widget. Må være et container-widget"
 
-#: gtk/gtkwidget.c:424
+#: gtk/gtkwidget.c:425
 msgid "Width request"
 msgstr "Breddeforespørsel"
 
-#: gtk/gtkwidget.c:425
+#: gtk/gtkwidget.c:426
 msgid ""
 "Override for width request of the widget, or -1 if natural request should be "
 "used"
@@ -4041,11 +4487,11 @@ msgstr ""
 "Overstyring for breddeforespørsel for widget, eller -1 hvis naturlig "
 "forespørsel skal brukes"
 
-#: gtk/gtkwidget.c:433
+#: gtk/gtkwidget.c:434
 msgid "Height request"
 msgstr "Høydeforespørsel"
 
-#: gtk/gtkwidget.c:434
+#: gtk/gtkwidget.c:435
 msgid ""
 "Override for height request of the widget, or -1 if natural request should "
 "be used"
@@ -4053,83 +4499,83 @@ msgstr ""
 "Overstyring for høydeforespørsel for widget, eller -1 hvis vanlig "
 "forespørsel skal brukes"
 
-#: gtk/gtkwidget.c:443
+#: gtk/gtkwidget.c:444
 msgid "Whether the widget is visible"
 msgstr "Widgetet er synlig"
 
-#: gtk/gtkwidget.c:450
+#: gtk/gtkwidget.c:451
 msgid "Whether the widget responds to input"
 msgstr "Widgetet tar imot inndata"
 
-#: gtk/gtkwidget.c:456
+#: gtk/gtkwidget.c:457
 msgid "Application paintable"
 msgstr "Tegnbar av applikasjon"
 
-#: gtk/gtkwidget.c:457
+#: gtk/gtkwidget.c:458
 msgid "Whether the application will paint directly on the widget"
 msgstr "Applikasjonen vil tegne direkte på widgetet"
 
-#: gtk/gtkwidget.c:463
+#: gtk/gtkwidget.c:464
 msgid "Can focus"
 msgstr "Kan fokusere"
 
-#: gtk/gtkwidget.c:464
+#: gtk/gtkwidget.c:465
 msgid "Whether the widget can accept the input focus"
 msgstr "Widget kan akseptere inndatafokus"
 
-#: gtk/gtkwidget.c:470
+#: gtk/gtkwidget.c:471
 msgid "Has focus"
 msgstr "Har fokus"
 
-#: gtk/gtkwidget.c:471
+#: gtk/gtkwidget.c:472
 msgid "Whether the widget has the input focus"
 msgstr "Widget har inndatafokus"
 
-#: gtk/gtkwidget.c:477
+#: gtk/gtkwidget.c:478
 msgid "Is focus"
 msgstr "Er fokus"
 
-#: gtk/gtkwidget.c:478
+#: gtk/gtkwidget.c:479
 msgid "Whether the widget is the focus widget within the toplevel"
 msgstr "Om widget er fokus-widget i toppnoden"
 
-#: gtk/gtkwidget.c:484
+#: gtk/gtkwidget.c:485
 msgid "Can default"
 msgstr "Kan være forvalgt"
 
-#: gtk/gtkwidget.c:485
+#: gtk/gtkwidget.c:486
 msgid "Whether the widget can be the default widget"
 msgstr "Om widget kan være forvalgt widget"
 
-#: gtk/gtkwidget.c:491
+#: gtk/gtkwidget.c:492
 msgid "Has default"
 msgstr "Har forvalg"
 
-#: gtk/gtkwidget.c:492
+#: gtk/gtkwidget.c:493
 msgid "Whether the widget is the default widget"
 msgstr "Widget er forvalgt widget"
 
-#: gtk/gtkwidget.c:498
+#: gtk/gtkwidget.c:499
 msgid "Receives default"
 msgstr "Mottar forvalg"
 
-#: gtk/gtkwidget.c:499
+#: gtk/gtkwidget.c:500
 msgid "If TRUE, the widget will receive the default action when it is focused"
 msgstr "Hvis SANN, vil widgetet motta forvalgt handling når det er fokusert"
 
-#: gtk/gtkwidget.c:505
+#: gtk/gtkwidget.c:506
 msgid "Composite child"
 msgstr "Sammensatt barn"
 
-#: gtk/gtkwidget.c:506
+#: gtk/gtkwidget.c:507
 msgid "Whether the widget is part of a composite widget"
 msgstr "Om widgetet er en del av et sammensatt widget"
 
-#: gtk/gtkwidget.c:512
+#: gtk/gtkwidget.c:513
 msgid "Style"
 msgstr "Stil"
 
-#: gtk/gtkwidget.c:513
+#: gtk/gtkwidget.c:514
 msgid ""
 "The style of the widget, which contains information about how it will look "
 "(colors etc)"
@@ -4137,77 +4583,77 @@ msgstr ""
 "Stil for widgetet. Inneholder informasjon om hvordan det vil se ut (farger "
 "etc)"
 
-#: gtk/gtkwidget.c:519
+#: gtk/gtkwidget.c:520
 msgid "Events"
 msgstr "Hendelser"
 
-#: gtk/gtkwidget.c:520
+#: gtk/gtkwidget.c:521
 msgid "The event mask that decides what kind of GdkEvents this widget gets"
 msgstr ""
 "Hendelsesmasken som bestemmer hvilke typer GdkEvents dette widgetet mottar"
 
-#: gtk/gtkwidget.c:527
+#: gtk/gtkwidget.c:528
 msgid "Extension events"
 msgstr "Utvidelseshendelser"
 
-#: gtk/gtkwidget.c:528
+#: gtk/gtkwidget.c:529
 msgid "The mask that decides what kind of extension events this widget gets"
 msgstr ""
 "Masken som bestemmer hvilken type utvidelseshendelser dette widgetet mottar"
 
-#: gtk/gtkwidget.c:535
+#: gtk/gtkwidget.c:536
 msgid "No show all"
 msgstr "Ikke vis alle"
 
-#: gtk/gtkwidget.c:536
+#: gtk/gtkwidget.c:537
 msgid "Whether gtk_widget_show_all() should not affect this widget"
 msgstr "Om gtk_widget_show_all() skal ha effekt for denne komponenten"
 
-#: gtk/gtkwidget.c:1377
+#: gtk/gtkwidget.c:1378
 msgid "Interior Focus"
 msgstr "Internt fokus"
 
-#: gtk/gtkwidget.c:1378
+#: gtk/gtkwidget.c:1379
 msgid "Whether to draw the focus indicator inside widgets"
 msgstr "Om fokusindikator skal tegnes inne i et widget"
 
-#: gtk/gtkwidget.c:1384
+#: gtk/gtkwidget.c:1385
 msgid "Focus linewidth"
 msgstr "Fokuslinjebredde"
 
-#: gtk/gtkwidget.c:1385
+#: gtk/gtkwidget.c:1386
 msgid "Width, in pixels, of the focus indicator line"
 msgstr "Fokusindikatorlinjens bredde i piksler"
 
-#: gtk/gtkwidget.c:1391
+#: gtk/gtkwidget.c:1392
 msgid "Focus line dash pattern"
 msgstr "Prikkemønster for fokuslinje"
 
-#: gtk/gtkwidget.c:1392
+#: gtk/gtkwidget.c:1393
 msgid "Dash pattern used to draw the focus indicator"
 msgstr "Prikkemønster som brukes til å tegne fokusindikator"
 
-#: gtk/gtkwidget.c:1397
+#: gtk/gtkwidget.c:1398
 msgid "Focus padding"
 msgstr "Fyll for fokus"
 
-#: gtk/gtkwidget.c:1398
+#: gtk/gtkwidget.c:1399
 msgid "Width, in pixels, between focus indicator and the widget 'box'"
 msgstr "Bredde i piksler mellom fokusindikator og widgetboksen"
 
-#: gtk/gtkwidget.c:1403
+#: gtk/gtkwidget.c:1404
 msgid "Cursor color"
 msgstr "Markørfarge"
 
-#: gtk/gtkwidget.c:1404
+#: gtk/gtkwidget.c:1405
 msgid "Color with which to draw insertion cursor"
 msgstr "Farge som markøren skal tegnes med"
 
-#: gtk/gtkwidget.c:1409
+#: gtk/gtkwidget.c:1410
 msgid "Secondary cursor color"
 msgstr "Sekundær markørfarge"
 
-#: gtk/gtkwidget.c:1410
+#: gtk/gtkwidget.c:1411
 msgid ""
 "Color with which to draw the secondary insertion cursor when editing mixed "
 "right-to-left and left-to-right text"
@@ -4215,44 +4661,44 @@ msgstr ""
 "Farge for sekundær innsettingsmarkør ved redigering av blandet høyre-til-"
 "venstre og venstre-til-høyre tekst"
 
-#: gtk/gtkwidget.c:1415
+#: gtk/gtkwidget.c:1416
 msgid "Cursor line aspect ratio"
 msgstr "Aspektrate for markørlinje"
 
-#: gtk/gtkwidget.c:1416
+#: gtk/gtkwidget.c:1417
 msgid "Aspect ratio with which to draw insertion cursor"
 msgstr "Aspektrate for tegning av innsettingsmarkør"
 
-#: gtk/gtkwindow.c:440
+#: gtk/gtkwindow.c:452
 msgid "Window Type"
 msgstr "Vindustype"
 
-#: gtk/gtkwindow.c:441
+#: gtk/gtkwindow.c:453
 msgid "The type of the window"
 msgstr "Type vindu"
 
-#: gtk/gtkwindow.c:449
+#: gtk/gtkwindow.c:461
 msgid "Window Title"
 msgstr "Vindustittel"
 
-#: gtk/gtkwindow.c:450
+#: gtk/gtkwindow.c:462
 msgid "The title of the window"
 msgstr "Tittelen på vinduet"
 
-#: gtk/gtkwindow.c:457
+#: gtk/gtkwindow.c:469
 msgid "Window Role"
 msgstr "Vindusrolle"
 
-#: gtk/gtkwindow.c:458
+#: gtk/gtkwindow.c:470
 msgid "Unique identifier for the window to be used when restoring a session"
 msgstr ""
 "Unik indentifikator for vinduet som brukes ved gjenoppretting av en sesjon"
 
-#: gtk/gtkwindow.c:465
+#: gtk/gtkwindow.c:477
 msgid "Allow Shrink"
 msgstr "Tillat krymping"
 
-#: gtk/gtkwindow.c:467
+#: gtk/gtkwindow.c:479
 #, no-c-format
 msgid ""
 "If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the "
@@ -4261,91 +4707,96 @@ msgstr ""
 "Hvis SANN får vinduet ingen minimum størrelse. Denne bør ikke settes til "
 "SANN 99% av tiden"
 
-#: gtk/gtkwindow.c:474
+#: gtk/gtkwindow.c:486
 msgid "Allow Grow"
 msgstr "Tillat vekst"
 
-#: gtk/gtkwindow.c:475
+#: gtk/gtkwindow.c:487
 msgid "If TRUE, users can expand the window beyond its minimum size"
 msgstr "Brukere kan utvide vinduet utover minste størrelse hvis SANN"
 
-#: gtk/gtkwindow.c:483
+#: gtk/gtkwindow.c:495
 msgid "If TRUE, users can resize the window"
 msgstr "Brukere kan endre størrelse på vinduet hvis SANN"
 
-#: gtk/gtkwindow.c:490
+#: gtk/gtkwindow.c:502
 msgid "Modal"
 msgstr "Modal"
 
-#: gtk/gtkwindow.c:491
+#: gtk/gtkwindow.c:503
 msgid ""
 "If TRUE, the window is modal (other windows are not usable while this one is "
 "up)"
 msgstr ""
 "Hvis SANN er vinduet modalt (andre vinduer er ikke brukbare når dette vises)"
 
-#: gtk/gtkwindow.c:498
+#: gtk/gtkwindow.c:510
 msgid "Window Position"
 msgstr "Vindusplassering"
 
-#: gtk/gtkwindow.c:499
+#: gtk/gtkwindow.c:511
 msgid "The initial position of the window"
 msgstr "Startposisjon for vinduet"
 
-#: gtk/gtkwindow.c:507
+#: gtk/gtkwindow.c:519
 msgid "Default Width"
 msgstr "Standard bredde"
 
-#: gtk/gtkwindow.c:508
+#: gtk/gtkwindow.c:520
 msgid "The default width of the window, used when initially showing the window"
 msgstr "Forvalgt bredde for vinduet. Brukt når vinduet først vises"
 
-#: gtk/gtkwindow.c:517
+#: gtk/gtkwindow.c:529
 msgid "Default Height"
 msgstr "Standard høyde"
 
-#: gtk/gtkwindow.c:518
+#: gtk/gtkwindow.c:530
 msgid ""
 "The default height of the window, used when initially showing the window"
 msgstr "Forvalgt høyde for vindu. Brukt når vinduet først vises"
 
-#: gtk/gtkwindow.c:527
+#: gtk/gtkwindow.c:539
 msgid "Destroy with Parent"
 msgstr "Ødelegg med opphav"
 
-#: gtk/gtkwindow.c:528
+#: gtk/gtkwindow.c:540
 msgid "If this window should be destroyed when the parent is destroyed"
 msgstr "Vinduet skal ødelegges når opphavet ødelegges"
 
-#: gtk/gtkwindow.c:535
+#: gtk/gtkwindow.c:547
 msgid "Icon"
 msgstr "Ikon"
 
-#: gtk/gtkwindow.c:536
+#: gtk/gtkwindow.c:548
 msgid "Icon for this window"
 msgstr "Ikon for dette vinduet"
 
-#: gtk/gtkwindow.c:551
+#: gtk/gtkwindow.c:564
+#, fuzzy
+msgid "Name of the themed icon for this window"
+msgstr "Ikon for dette vinduet"
+
+#: gtk/gtkwindow.c:579
 msgid "Is Active"
 msgstr "Er aktiv"
 
-#: gtk/gtkwindow.c:552
+#: gtk/gtkwindow.c:580
 msgid "Whether the toplevel is the current active window"
 msgstr "Om toppnivået er aktivt vindu"
 
-#: gtk/gtkwindow.c:559
+#: gtk/gtkwindow.c:587
 msgid "Focus in Toplevel"
 msgstr "Fokus i toppnivå"
 
-#: gtk/gtkwindow.c:560
+#: gtk/gtkwindow.c:588
 msgid "Whether the input focus is within this GtkWindow"
 msgstr "Om inndatafokus er i dette GtkWindow"
 
-#: gtk/gtkwindow.c:567
+#: gtk/gtkwindow.c:595
 msgid "Type hint"
 msgstr "Type hint"
 
-#: gtk/gtkwindow.c:568
+#: gtk/gtkwindow.c:596
 msgid ""
 "Hint to help the desktop environment understand what kind of window this is "
 "and how to treat it."
@@ -4353,43 +4804,53 @@ msgstr ""
 "Hint som skal hjelpe skrivebordsmiljøet med å forstå hvilken type vindu "
 "dette er og hvordan det skal behandles."
 
-#: gtk/gtkwindow.c:576
+#: gtk/gtkwindow.c:604
 msgid "Skip taskbar"
 msgstr "Hopp over oppgaveliste"
 
-#: gtk/gtkwindow.c:577
+#: gtk/gtkwindow.c:605
 msgid "TRUE if the window should not be in the task bar."
 msgstr "SANN hvis vinduet ikke skal være i oppgavelisten."
 
-#: gtk/gtkwindow.c:584
+#: gtk/gtkwindow.c:612
 msgid "Skip pager"
 msgstr "Hopp over vinduliste"
 
-#: gtk/gtkwindow.c:585
+#: gtk/gtkwindow.c:613
 msgid "TRUE if the window should not be in the pager."
 msgstr "SANN hvis vinduet ikke skal være i vindulisten."
 
-#: gtk/gtkwindow.c:599
+#: gtk/gtkwindow.c:627
 msgid "Accept focus"
 msgstr "Godta fokus"
 
-#: gtk/gtkwindow.c:600
+#: gtk/gtkwindow.c:628
 msgid "TRUE if the window should receive the input focus."
 msgstr "SANN hvis vinduet skal motta fokus for inndata."
 
-#: gtk/gtkwindow.c:614
+#: gtk/gtkwindow.c:642
+#, fuzzy
+msgid "Focus on map"
+msgstr "Fokus ved klikk"
+
+#: gtk/gtkwindow.c:643
+#, fuzzy
+msgid "TRUE if the window should receive the input focus when mapped."
+msgstr "SANN hvis vinduet skal motta fokus for inndata."
+
+#: gtk/gtkwindow.c:657
 msgid "Decorated"
 msgstr "Dekorert"
 
-#: gtk/gtkwindow.c:615
+#: gtk/gtkwindow.c:658
 msgid "Whether the window should be decorated by the window manager"
 msgstr "Om vinduet skal dekoreres av vindushåndtereren"
 
-#: gtk/gtkwindow.c:630
+#: gtk/gtkwindow.c:673
 msgid "Gravity"
 msgstr "Tyngde"
 
-#: gtk/gtkwindow.c:631
+#: gtk/gtkwindow.c:674
 msgid "The window gravity of the window"
 msgstr "Vinduets tyngde"
 
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 618de95d1..0ab4409ee 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -163,7 +163,7 @@ void calendar_set_flags( CalendarData *calendar )
 	options=options + (1<<i);
       }
   if (calendar->window)
-    gtk_calendar_display_options (GTK_CALENDAR (calendar->window), options);
+    gtk_calendar_set_display_options (GTK_CALENDAR (calendar->window), options);
 }
 
 void calendar_toggle_flag( GtkWidget    *toggle,
@@ -234,7 +234,7 @@ void calendar_select_font( GtkWidget    *button,
 
 }
 
-void create_calendar()
+void create_calendar(void)
 {
   GtkWidget *window;
   GtkWidget *vbox, *vbox2, *vbox3;
diff --git a/tests/testcombo.c b/tests/testcombo.c
index f2b7c7401..232b4372c 100644
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -44,7 +44,7 @@ create_color_pixbuf (const char *color)
 }
 
 static GtkWidget *
-create_combo_box_grid_demo ()
+create_combo_box_grid_demo (void)
 {
         GtkWidget *combo;
         GtkTreeIter iter;
@@ -118,7 +118,7 @@ create_combo_box_grid_demo ()
 
 /* blaat */
 static GtkTreeModel *
-create_tree_blaat ()
+create_tree_blaat (void)
 {
         GdkPixbuf *pixbuf;
         GtkWidget *cellview;
@@ -189,7 +189,7 @@ create_tree_blaat ()
 }
 
 static GtkTreeModel *
-create_list_blaat ()
+create_list_blaat (void)
 {
         GdkPixbuf *pixbuf;
         GtkWidget *cellview;
@@ -253,7 +253,7 @@ create_list_blaat ()
 
 /* blaat */
 static GtkTreeModel *
-create_phylogenetic_tree ()
+create_phylogenetic_tree (void)
 {
         GtkTreeIter iter, iter2, iter3;
         GtkTreeStore *store;
@@ -506,7 +506,7 @@ create_phylogenetic_tree ()
 
 /* blaat */
 static GtkTreeModel *
-create_capital_tree ()
+create_capital_tree (void)
 {
         GtkTreeIter iter, iter2;
         GtkTreeStore *store;
diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index f673a4066..a58efda26 100644
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -9,7 +9,7 @@ GArray *contents;
 static char next_value = 'A';
 
 static void
-test_init ()
+test_init (void)
 {
   if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
 		   G_FILE_TEST_EXISTS))
@@ -20,7 +20,7 @@ test_init ()
 }
 
 static void
-log (const char *fmt,
+combochange_log (const char *fmt,
      ...)
 {
   GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
@@ -120,7 +120,7 @@ on_insert (void)
 
   g_array_insert_val (contents, insert_pos, new_value);
 
-  log ("Inserted '%c' at position %d", new_value[0], insert_pos);
+  combochange_log ("Inserted '%c' at position %d", new_value[0], insert_pos);
 }
 
 static void
@@ -141,7 +141,7 @@ on_delete (void)
 
   old_val = g_array_index (contents, char, delete_pos);
   g_array_remove_index (contents, delete_pos);
-  log ("Deleted '%c' from position %d", old_val, delete_pos);
+  combochange_log ("Deleted '%c' from position %d", old_val, delete_pos);
 }
 
 static void
@@ -175,7 +175,7 @@ on_reorder (void)
   g_array_free (contents, TRUE);
   contents = new_contents;
 
-  log ("Reordered array");
+  combochange_log ("Reordered array");
     
   g_free (shuffle_array);
 }
diff --git a/tests/testdnd.c b/tests/testdnd.c
index 55d50f16a..a3904ae9b 100644
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -556,7 +556,7 @@ source_drag_data_delete  (GtkWidget          *widget,
 }
   
 void
-test_init ()
+test_init (void)
 {
   if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
 		   G_FILE_TEST_EXISTS))
diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 01bd20330..0f7a74f76 100644
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -217,7 +217,7 @@ animation_timer (GtkEntryCompletion *completion)
 	{
 	  g_print ("readding model!\n");
 	  
-	  gtk_entry_completion_set_model (completion, old_store);
+	  gtk_entry_completion_set_model (completion, GTK_TREE_MODEL(old_store));
 	  g_object_unref (old_store);
 	  old_store = NULL;
 	}
@@ -342,7 +342,7 @@ main (int argc, char *argv[])
 
   gtk_entry_completion_insert_action_text (completion, 100, "action!");
   gtk_entry_completion_insert_action_text (completion, 101, "'nother action!");
-  g_signal_connect (completion, "action_activated", G_CALLBACK (activated_cb), 0);
+  g_signal_connect (completion, "action_activated", G_CALLBACK (activated_cb), NULL);
 
   /* Create our third entry */
   entry = gtk_entry_new ();
diff --git a/tests/testgtk.c b/tests/testgtk.c
index fb0e54409..0ca5a617c 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -3931,7 +3931,7 @@ dump_accels (gpointer             callback_data,
     
 static GtkItemFactoryEntry menu_items[] =
 {
-  { "/_File",                  NULL,         0,                     0, "<Branch>" },
+  { "/_File",                  NULL,         NULL,                  0, "<Branch>" },
   { "/File/tearoff1",          NULL,         gtk_ifactory_cb,       0, "<Tearoff>" },
   { "/File/_New",              NULL,         gtk_ifactory_cb,       0, "<StockItem>", GTK_STOCK_NEW },
   { "/File/_Open",             NULL,         gtk_ifactory_cb,       0, "<StockItem>", GTK_STOCK_OPEN },
@@ -7537,7 +7537,7 @@ create_flipping (GtkWidget *widget)
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
 
       g_signal_connect (check_button, "toggled",
-			G_CALLBACK (flipping_toggled_cb), FALSE);
+			G_CALLBACK (flipping_toggled_cb), NULL);
 
       gtk_container_set_border_width (GTK_CONTAINER (check_button), 10);
       
@@ -12794,7 +12794,7 @@ create_main_window (void)
 }
 
 static void
-test_init ()
+test_init (void)
 {
   if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
 		   G_FILE_TEST_EXISTS))
diff --git a/tests/testiconview.c b/tests/testiconview.c
index 446336727..142307db3 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -201,7 +201,7 @@ do_popup_menu (GtkWidget      *icon_list,
   data = g_new0 (ItemData, 1);
   data->icon_list = GTK_ICON_VIEW (icon_list);
   data->path = path;
-  g_object_set_data_full (G_OBJECT (menu), "item-path", data, free_item_data);
+  g_object_set_data_full (G_OBJECT (menu), "item-path", data, (GDestroyNotify)free_item_data);
 
   menuitem = gtk_menu_item_new_with_label ("Activate");
   gtk_widget_show (menuitem);
diff --git a/tests/testmerge.c b/tests/testmerge.c
index dff451a64..8ca7ca7ce 100644
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -121,7 +121,7 @@ static void
 toggle_dynamic (GtkWidget    *button, 
 		GtkUIManager *merge)
 {
-  g_timeout_add (2000, delayed_toggle_dynamic, merge);
+  g_timeout_add (2000, (GSourceFunc)delayed_toggle_dynamic, merge);
 }
 
 static void
@@ -557,8 +557,8 @@ connect_proxy (GtkUIManager *merge,
 	  g_object_set_data_full (G_OBJECT (proxy), "action-status", 
 				  data, action_status_destroy);
 	  
-	  g_signal_connect (proxy, "select",  G_CALLBACK (set_tip), 0);
-	  g_signal_connect (proxy, "deselect", G_CALLBACK (unset_tip), 0);
+	  g_signal_connect (proxy, "select",  G_CALLBACK (set_tip), NULL);
+	  g_signal_connect (proxy, "deselect", G_CALLBACK (unset_tip), NULL);
 	}
     }
 }
diff --git a/tests/testselection.c b/tests/testselection.c
index c430073b6..53935b580 100644
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -65,43 +65,43 @@ typedef struct _Target {
    in the ICCCM */
 
 static Target targets[] = {
-  { "ADOBE_PORTABLE_DOCUMENT_FORMAT",	    STRING, 	   0, 8 },
-  { "APPLE_PICT", 			    APPLE_PICT,    0, 8 },
-  { "BACKGROUND",			    PIXEL,         0, 32 },
-  { "BITMAP", 				    BITMAP,        0, 32 },
-  { "CHARACTER_POSITION",                   SPAN, 	   0, 32 },
-  { "CLASS", 				    TEXT, 	   0, 8 },
-  { "CLIENT_WINDOW", 			    WINDOW, 	   0, 32 },
-  { "COLORMAP", 			    COLORMAP,      0, 32 },
-  { "COLUMN_NUMBER", 			    SPAN, 	   0, 32 },
-  { "COMPOUND_TEXT", 			    COMPOUND_TEXT, 0, 8 },
+  { "ADOBE_PORTABLE_DOCUMENT_FORMAT",	    STRING, 	   NULL, 8 },
+  { "APPLE_PICT", 			    APPLE_PICT,    NULL, 8 },
+  { "BACKGROUND",			    PIXEL,         NULL, 32 },
+  { "BITMAP", 				    BITMAP,        NULL, 32 },
+  { "CHARACTER_POSITION",                   SPAN, 	   NULL, 32 },
+  { "CLASS", 				    TEXT, 	   NULL, 8 },
+  { "CLIENT_WINDOW", 			    WINDOW, 	   NULL, 32 },
+  { "COLORMAP", 			    COLORMAP,      NULL, 32 },
+  { "COLUMN_NUMBER", 			    SPAN, 	   NULL, 32 },
+  { "COMPOUND_TEXT", 			    COMPOUND_TEXT, NULL, 8 },
   /*  { "DELETE", "NULL", 0, ? }, */
-  { "DRAWABLE", 			    DRAWABLE,      0, 32 },
-  { "ENCAPSULATED_POSTSCRIPT", 		    STRING, 	   0, 8 },
-  { "ENCAPSULATED_POSTSCRIPT_INTERCHANGE",  STRING, 	   0, 8 },
-  { "FILE_NAME", 			    TEXT, 	   0, 8 },
-  { "FOREGROUND", 			    PIXEL, 	   0, 32 },
-  { "HOST_NAME", 			    TEXT, 	   0, 8 },
+  { "DRAWABLE", 			    DRAWABLE,      NULL, 32 },
+  { "ENCAPSULATED_POSTSCRIPT", 		    STRING, 	   NULL, 8 },
+  { "ENCAPSULATED_POSTSCRIPT_INTERCHANGE",  STRING, 	   NULL, 8 },
+  { "FILE_NAME", 			    TEXT, 	   NULL, 8 },
+  { "FOREGROUND", 			    PIXEL, 	   NULL, 32 },
+  { "HOST_NAME", 			    TEXT, 	   NULL, 8 },
   /*  { "INSERT_PROPERTY", "NULL", 0, ? NULL }, */
   /*  { "INSERT_SELECTION", "NULL", 0, ? NULL }, */
-  { "LENGTH", 				    INTEGER, 	   0, 32 },
-  { "LINE_NUMBER", 			    SPAN, 	   0, 32 },
-  { "LIST_LENGTH", 			    INTEGER,       0, 32 },
-  { "MODULE", 				    TEXT, 	   0, 8 },
+  { "LENGTH", 				    INTEGER, 	   NULL, 32 },
+  { "LINE_NUMBER", 			    SPAN, 	   NULL, 32 },
+  { "LIST_LENGTH", 			    INTEGER,       NULL, 32 },
+  { "MODULE", 				    TEXT, 	   NULL, 8 },
   /*  { "MULTIPLE", "ATOM_PAIR", 0, 32 }, */
-  { "NAME", 				    TEXT, 	   0, 8 },
-  { "ODIF", 				    TEXT,          0, 8 },
-  { "OWNER_OS", 			    TEXT, 	   0, 8 },
-  { "PIXMAP", 				    PIXMAP,        0, 32 },
-  { "POSTSCRIPT", 			    STRING,        0, 8 },
-  { "PROCEDURE", 			    TEXT,          0, 8 },
-  { "PROCESS",				    INTEGER,       0, 32 },
-  { "STRING", 				    STRING,        0, 8 },
-  { "TARGETS", 				    ATOM, 	   0, 32 },
-  { "TASK", 				    INTEGER,       0, 32 },
-  { "TEXT", 				    TEXT,          0, 8  },
-  { "TIMESTAMP", 			    INTEGER,       0, 32 },
-  { "USER", 				    TEXT, 	   0, 8 },
+  { "NAME", 				    TEXT, 	   NULL, 8 },
+  { "ODIF", 				    TEXT,          NULL, 8 },
+  { "OWNER_OS", 			    TEXT, 	   NULL, 8 },
+  { "PIXMAP", 				    PIXMAP,        NULL, 32 },
+  { "POSTSCRIPT", 			    STRING,        NULL, 8 },
+  { "PROCEDURE", 			    TEXT,          NULL, 8 },
+  { "PROCESS",				    INTEGER,       NULL, 32 },
+  { "STRING", 				    STRING,        NULL, 8 },
+  { "TARGETS", 				    ATOM, 	   NULL, 32 },
+  { "TASK", 				    INTEGER,       NULL, 32 },
+  { "TEXT", 				    TEXT,          NULL, 8  },
+  { "TIMESTAMP", 			    INTEGER,       NULL, 32 },
+  { "USER", 				    TEXT, 	   NULL, 8 },
 };
 
 static int num_targets = sizeof(targets)/sizeof(Target);
diff --git a/tests/testsocket.c b/tests/testsocket.c
index 682a3354c..41e827673 100644
--- a/tests/testsocket.c
+++ b/tests/testsocket.c
@@ -43,7 +43,7 @@ quit_cb (gpointer        callback_data,
 
 static GtkItemFactoryEntry menu_items[] =
 {
-  { "/_File",            NULL,         0,                     0, "<Branch>" },
+  { "/_File",            NULL,         NULL,                  0, "<Branch>" },
   { "/File/_Quit",       "<control>Q", quit_cb,               0 },
 };
 
diff --git a/tests/testsocket_common.c b/tests/testsocket_common.c
index 9fc246c43..1783a65a8 100644
--- a/tests/testsocket_common.c
+++ b/tests/testsocket_common.c
@@ -60,7 +60,7 @@ blink_cb (gpointer data)
   GtkWidget *widget = data;
 
   gtk_widget_show (widget);
-  g_object_set_data (G_OBJECT (widget), "blink", GPOINTER_TO_UINT (0));
+  g_object_set_data (G_OBJECT (widget), "blink", NULL);
 
   return FALSE;
 }
diff --git a/tests/testtext.c b/tests/testtext.c
index 9aa6572d2..80fc9bbb6 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -1499,42 +1499,42 @@ view_init_menus (View *view)
 
 static GtkItemFactoryEntry menu_items[] =
 {
-  { "/_File",            NULL,         0,           0, "<Branch>" },
+  { "/_File",            NULL,         NULL,        0, "<Branch>" },
   { "/File/_New",        "<control>N", do_new,      0, NULL },
   { "/File/New _View",   NULL,         do_new_view, 0, NULL },
   { "/File/_Open",       "<control>O", do_open,     0, NULL },
   { "/File/_Save",       "<control>S", do_save,     0, NULL },
   { "/File/Save _As...", NULL,         do_save_as,  0, NULL },
-  { "/File/sep1",        NULL,         0,           0, "<Separator>" },
+  { "/File/sep1",        NULL,         NULL,        0, "<Separator>" },
   { "/File/_Close",     "<control>W" , do_close,    0, NULL },
   { "/File/E_xit",      "<control>Q" , do_exit,     0, NULL },
 
   { "/_Edit", NULL, 0, 0, "<Branch>" },
   { "/Edit/Find...", NULL, do_search, 0, NULL },
 
-  { "/_Settings",   	  NULL,         0,                0, "<Branch>" },
+  { "/_Settings",   	  NULL,         NULL,             0, "<Branch>" },
   { "/Settings/Wrap _Off",   NULL,      do_wrap_changed,  GTK_WRAP_NONE, "<RadioItem>" },
   { "/Settings/Wrap _Words", NULL,      do_wrap_changed,  GTK_WRAP_WORD, "/Settings/Wrap Off" },
   { "/Settings/Wrap _Chars", NULL,      do_wrap_changed,  GTK_WRAP_CHAR, "/Settings/Wrap Off" },
-  { "/Settings/sep1",        NULL,      0,                0, "<Separator>" },
+  { "/Settings/sep1",        NULL,      NULL,             0, "<Separator>" },
   { "/Settings/Editable", NULL,      do_editable_changed,  TRUE, "<RadioItem>" },
   { "/Settings/Not editable",    NULL,      do_editable_changed,  FALSE, "/Settings/Editable" },
-  { "/Settings/sep1",        NULL,      0,                0, "<Separator>" },
+  { "/Settings/sep1",        NULL,      NULL,             0, "<Separator>" },
 
   { "/Settings/Cursor visible",    NULL,      do_cursor_visible_changed,  TRUE, "<RadioItem>" },
   { "/Settings/Cursor not visible", NULL,      do_cursor_visible_changed,  FALSE, "/Settings/Cursor visible" },
-  { "/Settings/sep1",        NULL,      0,                0, "<Separator>" },
+  { "/Settings/sep1",        NULL,      NULL,          0, "<Separator>" },
   
   { "/Settings/Left-to-Right", NULL,    do_direction_changed,  GTK_TEXT_DIR_LTR, "<RadioItem>" },
   { "/Settings/Right-to-Left", NULL,    do_direction_changed,  GTK_TEXT_DIR_RTL, "/Settings/Left-to-Right" },
 
-  { "/Settings/sep1",        NULL,      0,                0, "<Separator>" },
+  { "/Settings/sep1",        NULL,      NULL,                0, "<Separator>" },
   { "/Settings/Sane spacing", NULL,    do_spacing_changed,  FALSE, "<RadioItem>" },
   { "/Settings/Funky spacing", NULL,    do_spacing_changed,  TRUE, "/Settings/Sane spacing" },
-  { "/Settings/sep1",        NULL,      0,                0, "<Separator>" },
+  { "/Settings/sep1",        NULL,      NULL,                0, "<Separator>" },
   { "/Settings/Don't cycle color tags", NULL,    do_color_cycle_changed,  FALSE, "<RadioItem>" },
   { "/Settings/Cycle colors", NULL,    do_color_cycle_changed,  TRUE, "/Settings/Don't cycle color tags" },
-  { "/_Attributes",   	  NULL,         0,                0, "<Branch>" },
+  { "/_Attributes",   	  NULL,         NULL,                0, "<Branch>" },
   { "/Attributes/Editable",   	  NULL,         do_apply_editable, TRUE, NULL },
   { "/Attributes/Not editable",   	  NULL,         do_apply_editable, FALSE, NULL },
   { "/Attributes/Invisible",   	  NULL,         do_apply_invisible, FALSE, NULL },
@@ -1545,7 +1545,7 @@ static GtkItemFactoryEntry menu_items[] =
   { "/Attributes/No colors",   	          NULL,         do_apply_colors, FALSE, NULL },
   { "/Attributes/Remove all tags",       NULL, do_remove_tags, 0, NULL },
   { "/Attributes/Properties",       NULL, do_properties, 0, NULL },
-  { "/_Test",   	 NULL,         0,           0, "<Branch>" },
+  { "/_Test",   	 NULL,         NULL,           0, "<Branch>" },
   { "/Test/_Example",  	 NULL,         do_example,  0, NULL },
   { "/Test/_Insert and scroll", NULL,         do_insert_and_scroll,  0, NULL },
   { "/Test/_Add fixed children", NULL,         do_add_children,  0, NULL },
@@ -2542,7 +2542,7 @@ view_add_example_widgets (View *view)
 }
 
 void
-test_init ()
+test_init (void)
 {
   if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
 		   G_FILE_TEST_EXISTS))
author	Matthias Clasen <matthiasc@src.gnome.org>	2004-10-28 15:00:05 +0000
committer	Matthias Clasen <matthiasc@src.gnome.org>	2004-10-28 15:00:05 +0000
commit	d5f92150d4b8bffb78cd5110cbb2c28bfdf81136 (patch)
tree	0d79978a95c24dcbdb2d9fd577dedf0da2795ece
parent	dbba41045ecb383810fb8962ee9b83998a89c37d (diff)
download	gdk-pixbuf-d5f92150d4b8bffb78cd5110cbb2c28bfdf81136.tar.gz