diff --git a/clutter/clutter-blur-effect.c b/clutter/clutter-blur-effect.c
index eb2bd57ed..12b067561 100644
--- a/clutter/clutter-blur-effect.c
+++ b/clutter/clutter-blur-effect.c
@@ -210,17 +210,6 @@ clutter_blur_effect_pre_paint (ClutterEffect *effect)
   return parent_class->pre_paint (effect);
 }
 
-static CoglHandle
-clutter_blur_effect_create_texture (ClutterOffscreenEffect *effect,
-                                    gfloat                  min_width,
-                                    gfloat                  min_height)
-{
-  return cogl_texture_new_with_size (min_width + (2 * BLUR_PADDING),
-                                     min_height + (2 * BLUR_PADDING),
-                                     COGL_TEXTURE_NO_SLICING,
-                                     COGL_PIXEL_FORMAT_RGBA_8888_PRE);
-}
-
 static void
 clutter_blur_effect_paint_target (ClutterOffscreenEffect *effect)
 {
@@ -303,7 +292,6 @@ clutter_blur_effect_class_init (ClutterBlurEffectClass *klass)
   effect_class->get_paint_volume = clutter_blur_effect_get_paint_volume;
 
   offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
-  offscreen_class->create_texture = clutter_blur_effect_create_texture;
   offscreen_class->paint_target = clutter_blur_effect_paint_target;
 }
 
diff --git a/clutter/clutter-clone.c b/clutter/clutter-clone.c
index d5ce9ef90..c73cda3a7 100644
--- a/clutter/clutter-clone.c
+++ b/clutter/clutter-clone.c
@@ -154,19 +154,17 @@ clutter_clone_apply_transform (ClutterActor *self, CoglMatrix *matrix)
 }
 
 static void
-clutter_clone_paint (ClutterActor *self)
+clutter_clone_paint (ClutterActor *actor)
 {
-  ClutterClone *clone = CLUTTER_CLONE (self);
-  ClutterClonePrivate *priv = clone->priv;
+  ClutterClone *self = CLUTTER_CLONE (actor);
+  ClutterClonePrivate *priv = self->priv;
   gboolean was_unmapped = FALSE;
 
   if (priv->clone_source == NULL)
     return;
 
-  CLUTTER_NOTE (PAINT,
-                "painting clone actor '%s'",
-		clutter_actor_get_name (self) ? clutter_actor_get_name (self)
-                                              : "unknown");
+  CLUTTER_NOTE (PAINT, "painting clone actor '%s'",
+                _clutter_actor_get_debug_name (actor));
 
   /* The final bits of magic:
    * - We need to override the paint opacity of the actor with our own
@@ -178,7 +176,7 @@ clutter_clone_paint (ClutterActor *self)
    */
   _clutter_actor_set_in_clone_paint (priv->clone_source, TRUE);
   _clutter_actor_set_opacity_override (priv->clone_source,
-                                       clutter_actor_get_paint_opacity (self));
+                                       clutter_actor_get_paint_opacity (actor));
   _clutter_actor_set_enable_model_view_transform (priv->clone_source, FALSE);
 
   if (!CLUTTER_ACTOR_IS_MAPPED (priv->clone_source))
@@ -200,10 +198,10 @@ clutter_clone_paint (ClutterActor *self)
 }
 
 static gboolean
-clutter_clone_get_paint_volume (ClutterActor *self,
+clutter_clone_get_paint_volume (ClutterActor       *actor,
                                 ClutterPaintVolume *volume)
 {
-  ClutterClonePrivate *priv = CLUTTER_CLONE (self)->priv;
+  ClutterClonePrivate *priv = CLUTTER_CLONE (actor)->priv;
   const ClutterPaintVolume *source_volume;
 
   /* if the source is not set the paint volume is defined to be empty */
@@ -213,18 +211,19 @@ clutter_clone_get_paint_volume (ClutterActor *self,
   /* query the volume of the source actor and simply masquarade it as
    * the clones volume... */
   source_volume = clutter_actor_get_paint_volume (priv->clone_source);
-  if (!source_volume)
+  if (source_volume == NULL)
     return FALSE;
 
   _clutter_paint_volume_set_from_volume (volume, source_volume);
-  _clutter_paint_volume_set_reference_actor (volume, self);
+  _clutter_paint_volume_set_reference_actor (volume, actor);
+
   return TRUE;
 }
 
 static gboolean
-clutter_clone_has_overlaps (ClutterActor *self)
+clutter_clone_has_overlaps (ClutterActor *actor)
 {
-  ClutterClonePrivate *priv = CLUTTER_CLONE (self)->priv;
+  ClutterClonePrivate *priv = CLUTTER_CLONE (actor)->priv;
 
   /* The clone has overlaps iff the source has overlaps */
 
@@ -249,15 +248,21 @@ clutter_clone_allocate (ClutterActor           *self,
   if (priv->clone_source == NULL)
     return;
 
+#if 0
+  /* XXX - this is wrong: ClutterClone cannot clone unparented
+   * actors, as it will break all invariants
+   */
+
   /* we act like a "foster parent" for the source we are cloning;
    * if the source has not been parented we have to force an
    * allocation on it, so that we can paint it correctly from
-   * within out paint() implementation. since the actor does not
+   * within our paint() implementation. since the actor does not
    * have a parent, and thus it won't be painted by the usual
    * paint cycle, we can safely give it as much size as it requires
    */
   if (clutter_actor_get_parent (priv->clone_source) == NULL)
     clutter_actor_allocate_preferred_size (priv->clone_source, flags);
+#endif
 }
 
 static void
@@ -266,12 +271,12 @@ clutter_clone_set_property (GObject      *gobject,
                             const GValue *value,
                             GParamSpec   *pspec)
 {
-  ClutterClone *clone = CLUTTER_CLONE (gobject);
+  ClutterClone *self = CLUTTER_CLONE (gobject);
 
   switch (prop_id)
     {
     case PROP_SOURCE:
-      clutter_clone_set_source (clone, g_value_get_object (value));
+      clutter_clone_set_source (self, g_value_get_object (value));
       break;
 
     default:
@@ -316,15 +321,15 @@ clutter_clone_class_init (ClutterCloneClass *klass)
 
   g_type_class_add_private (gobject_class, sizeof (ClutterClonePrivate));
 
-  actor_class->apply_transform      = clutter_clone_apply_transform;
-  actor_class->paint                = clutter_clone_paint;
-  actor_class->get_paint_volume     = clutter_clone_get_paint_volume;
-  actor_class->get_preferred_width  = clutter_clone_get_preferred_width;
+  actor_class->apply_transform = clutter_clone_apply_transform;
+  actor_class->paint = clutter_clone_paint;
+  actor_class->get_paint_volume = clutter_clone_get_paint_volume;
+  actor_class->get_preferred_width = clutter_clone_get_preferred_width;
   actor_class->get_preferred_height = clutter_clone_get_preferred_height;
-  actor_class->allocate             = clutter_clone_allocate;
-  actor_class->has_overlaps         = clutter_clone_has_overlaps;
+  actor_class->allocate = clutter_clone_allocate;
+  actor_class->has_overlaps = clutter_clone_has_overlaps;
 
-  gobject_class->dispose      = clutter_clone_dispose;
+  gobject_class->dispose = clutter_clone_dispose;
   gobject_class->set_property = clutter_clone_set_property;
   gobject_class->get_property = clutter_clone_get_property;
 
@@ -343,9 +348,7 @@ clutter_clone_class_init (ClutterCloneClass *klass)
                          G_PARAM_CONSTRUCT |
                          CLUTTER_PARAM_READWRITE);
 
-  g_object_class_install_properties (gobject_class,
-                                     PROP_LAST,
-                                     obj_props);
+  g_object_class_install_properties (gobject_class, PROP_LAST, obj_props);
 }
 
 static void
@@ -377,84 +380,84 @@ clutter_clone_new (ClutterActor *source)
 static void
 clone_source_queue_redraw_cb (ClutterActor *source,
 			      ClutterActor *origin,
-			      ClutterClone *clone)
+			      ClutterClone *self)
 {
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (clone));
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
 }
 
 static void
 clone_source_queue_relayout_cb (ClutterActor *source,
-				ClutterClone *clone)
+				ClutterClone *self)
 {
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (clone));
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 }
 
 static void
-clutter_clone_set_source_internal (ClutterClone *clone,
+clutter_clone_set_source_internal (ClutterClone *self,
 				   ClutterActor *source)
 {
-  ClutterClonePrivate *priv = clone->priv;
+  ClutterClonePrivate *priv = self->priv;
 
-  if (priv->clone_source)
+  if (priv->clone_source != NULL)
     {
       g_signal_handlers_disconnect_by_func (priv->clone_source,
-					    (void *) clone_source_queue_redraw_cb,
-					    clone);
+                                            G_CALLBACK (clone_source_queue_redraw_cb),
+					    self);
       g_signal_handlers_disconnect_by_func (priv->clone_source,
-					    (void *) clone_source_queue_relayout_cb,
-					    clone);
+					    G_CALLBACK (clone_source_queue_relayout_cb),
+					    self);
       g_object_unref (priv->clone_source);
       priv->clone_source = NULL;
     }
 
-  if (source)
+  if (source != NULL)
     {
       priv->clone_source = g_object_ref (source);
       g_signal_connect (priv->clone_source, "queue-redraw",
-			G_CALLBACK (clone_source_queue_redraw_cb), clone);
+			G_CALLBACK (clone_source_queue_redraw_cb), self);
       g_signal_connect (priv->clone_source, "queue-relayout",
-			G_CALLBACK (clone_source_queue_relayout_cb), clone);
+			G_CALLBACK (clone_source_queue_relayout_cb), self);
     }
 
-  g_object_notify_by_pspec (G_OBJECT (clone), obj_props[PROP_SOURCE]);
+  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_SOURCE]);
 
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (clone));
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 }
 
 /**
  * clutter_clone_set_source:
- * @clone: a #ClutterClone
- * @source: a #ClutterActor, or %NULL
+ * @self: a #ClutterClone
+ * @source: (allow-none): a #ClutterActor, or %NULL
  *
- * Sets @source as the source actor to be cloned by @clone.
+ * Sets @source as the source actor to be cloned by @self.
  *
  * Since: 1.0
  */
 void
-clutter_clone_set_source (ClutterClone *clone,
+clutter_clone_set_source (ClutterClone *self,
                           ClutterActor *source)
 {
-  g_return_if_fail (CLUTTER_IS_CLONE (clone));
+  g_return_if_fail (CLUTTER_IS_CLONE (self));
   g_return_if_fail (source == NULL || CLUTTER_IS_ACTOR (source));
 
-  clutter_clone_set_source_internal (clone, source);
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (clone));
+  clutter_clone_set_source_internal (self, source);
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 }
 
 /**
  * clutter_clone_get_source:
- * @clone: a #ClutterClone
+ * @self: a #ClutterClone
  *
- * Retrieves the source #ClutterActor being cloned by @clone
+ * Retrieves the source #ClutterActor being cloned by @self.
  *
  * Return value: (transfer none): the actor source for the clone
  *
  * Since: 1.0
  */
 ClutterActor *
-clutter_clone_get_source (ClutterClone *clone)
+clutter_clone_get_source (ClutterClone *self)
 {
-  g_return_val_if_fail (CLUTTER_IS_CLONE (clone), NULL);
+  g_return_val_if_fail (CLUTTER_IS_CLONE (self), NULL);
 
-  return clone->priv->clone_source;
+  return self->priv->clone_source;
 }
diff --git a/clutter/clutter-clone.h b/clutter/clutter-clone.h
index 470a20503..14fef88f2 100644
--- a/clutter/clutter-clone.h
+++ b/clutter/clutter-clone.h
@@ -81,9 +81,9 @@ struct _ClutterCloneClass
 GType clutter_clone_get_type (void) G_GNUC_CONST;
 
 ClutterActor *clutter_clone_new        (ClutterActor *source);
-void          clutter_clone_set_source (ClutterClone *clone,
+void          clutter_clone_set_source (ClutterClone *self,
                                         ClutterActor *source);
-ClutterActor *clutter_clone_get_source (ClutterClone *clone);
+ClutterActor *clutter_clone_get_source (ClutterClone *self);
 
 G_END_DECLS
 
diff --git a/configure.ac b/configure.ac
index 02f7507ea..9cd0d74e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,21 +179,14 @@ FLAVOUR_CFLAGS=""
 CLUTTER_WINSYS_BASE=
 CLUTTER_WINSYS_BASE_LIB=
 CLUTTER_WINSYS=
-glesversion=1.1
-use_gles2_wrapper=no
+
 experimental_backend=no
-experimental_image=no
 
 AC_ARG_WITH([flavour],
             [AS_HELP_STRING([--with-flavour=@<:@glx/opengl-egl-xlib/wayland/eglx/eglnative/osx/win32/cex100@:>@],
                             [Select the Clutter window system backend])],
             [CLUTTER_FLAVOUR=$with_flavour])
 
-AC_ARG_WITH([gles],
-            [AS_HELP_STRING([--with-gles=@<:@1.1/2.0@:>@],
-                            [Select Clutter GLES version (for EGL backends)])],
-            [glesversion=$with_gles])
-
 # base dependencies for core
 CLUTTER_BASE_PC_FILES="cogl-1.0 >= $COGL_REQ_VERSION cairo-gobject >= $CAIRO_REQ_VERSION atk >= $ATK_REQ_VERSION pangocairo >= $PANGO_REQ_VERSION cogl-pango-1.0 json-glib-1.0 >= $JSON_GLIB_REQ_VERSION"
 
@@ -404,14 +397,6 @@ AS_IF([test "x$SUPPORT_X11" = "x1"],
 AS_IF([test "x$SUPPORT_GLX" = "x1"],
       [
         AC_DEFINE([HAVE_CLUTTER_GLX], [1], [Have the GLX backend])
-
-        AC_CHECK_HEADERS([GL/glx.h],
-                         [],
-                         [AC_MSG_ERROR([Unable to locate required GLX headers])])
-
-        AC_CHECK_LIB(GL, [glXCreateContext],
-                     [HAVE_LIBGLX=yes],
-                     [AC_MSG_ERROR([Required GLX library not found])])
       ])
 
 AS_IF([test "x$SUPPORT_WAYLAND" = "x1"],
@@ -1061,9 +1046,7 @@ fi
 echo ""
 
 # General warning about experimental features
-if test "x$experimental_backend" = "xyes" ||
-   test "x$experimental_image" = "xyes"
-then
+if test "x$experimental_backend" = "xyes"; then
 echo ""
 echo "☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠"
 echo " *WARNING*"
diff --git a/po/nb.po b/po/nb.po
index 22271464e..a35b2d0fd 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,11 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: clutter 1.7.x\n"
-"Report-Msgid-Bugs-To: http://bugzilla.clutter-project.org/enter_bug.cgi?"
-"product=clutter\n"
-"POT-Creation-Date: 2011-09-12 13:51+0100\n"
-"PO-Revision-Date: 2011-08-26 13:26+0200\n"
+"Project-Id-Version: clutter 1.8.x\n"
+"Report-Msgid-Bugs-To: http://bugzilla.clutter-project.org/enter_bug.cgi?product=clutter\n"
+"POT-Creation-Date: 2011-10-19 23:13+0200\n"
+"PO-Revision-Date: 2011-10-19 23:18+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
@@ -17,2139 +16,2172 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clutter/clutter-actor.c:3852
+#: ../clutter/clutter-actor.c:3877
 msgid "X coordinate"
 msgstr "X-koordinat"
 
-#: clutter/clutter-actor.c:3853
+#: ../clutter/clutter-actor.c:3878
 msgid "X coordinate of the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:3868
+#: ../clutter/clutter-actor.c:3893
 msgid "Y coordinate"
 msgstr "Y-koordinat"
 
-#: clutter/clutter-actor.c:3869
+#: ../clutter/clutter-actor.c:3894
 msgid "Y coordinate of the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:3884 clutter/clutter-behaviour-ellipse.c:477
+#: ../clutter/clutter-actor.c:3909
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:479
 msgid "Width"
 msgstr "Bredde"
 
-#: clutter/clutter-actor.c:3885
+#: ../clutter/clutter-actor.c:3910
 msgid "Width of the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:3899 clutter/clutter-behaviour-ellipse.c:493
+#: ../clutter/clutter-actor.c:3924
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:495
 msgid "Height"
 msgstr "Høyde"
 
-#: clutter/clutter-actor.c:3900
+#: ../clutter/clutter-actor.c:3925
 msgid "Height of the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:3918
+#: ../clutter/clutter-actor.c:3943
 msgid "Fixed X"
 msgstr "Fast X"
 
-#: clutter/clutter-actor.c:3919
+#: ../clutter/clutter-actor.c:3944
 msgid "Forced X position of the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:3937
+#: ../clutter/clutter-actor.c:3962
 msgid "Fixed Y"
 msgstr "Fast Y"
 
-#: clutter/clutter-actor.c:3938
+#: ../clutter/clutter-actor.c:3963
 msgid "Forced Y position of the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:3954
+#: ../clutter/clutter-actor.c:3979
 msgid "Fixed position set"
 msgstr ""
 
-#: clutter/clutter-actor.c:3955
+#: ../clutter/clutter-actor.c:3980
 msgid "Whether to use fixed positioning for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:3977
+#: ../clutter/clutter-actor.c:4002
 msgid "Min Width"
 msgstr "Minste bredde"
 
-#: clutter/clutter-actor.c:3978
+#: ../clutter/clutter-actor.c:4003
 msgid "Forced minimum width request for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:3997
+#: ../clutter/clutter-actor.c:4022
 msgid "Min Height"
 msgstr "Minste høyde"
 
-#: clutter/clutter-actor.c:3998
+#: ../clutter/clutter-actor.c:4023
 msgid "Forced minimum height request for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:4017
+#: ../clutter/clutter-actor.c:4042
 msgid "Natural Width"
 msgstr "Naturlig bredde"
 
-#: clutter/clutter-actor.c:4018
+#: ../clutter/clutter-actor.c:4043
 msgid "Forced natural width request for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:4037
+#: ../clutter/clutter-actor.c:4062
 msgid "Natural Height"
 msgstr "Naturlig høyde"
 
-#: clutter/clutter-actor.c:4038
+#: ../clutter/clutter-actor.c:4063
 msgid "Forced natural height request for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:4054
+#: ../clutter/clutter-actor.c:4079
 msgid "Minimum width set"
 msgstr "Minimum bredde satt"
 
-#: clutter/clutter-actor.c:4055
+#: ../clutter/clutter-actor.c:4080
 msgid "Whether to use the min-width property"
 msgstr ""
 
-#: clutter/clutter-actor.c:4070
+#: ../clutter/clutter-actor.c:4095
 msgid "Minimum height set"
 msgstr "Minimum høyde satt"
 
-#: clutter/clutter-actor.c:4071
+#: ../clutter/clutter-actor.c:4096
 msgid "Whether to use the min-height property"
 msgstr ""
 
-#: clutter/clutter-actor.c:4086
+#: ../clutter/clutter-actor.c:4111
 msgid "Natural width set"
 msgstr "Naturlig bredde satt"
 
-#: clutter/clutter-actor.c:4087
+#: ../clutter/clutter-actor.c:4112
 msgid "Whether to use the natural-width property"
 msgstr ""
 
-#: clutter/clutter-actor.c:4104
+#: ../clutter/clutter-actor.c:4129
 msgid "Natural height set"
 msgstr "Naturlig høyde satt"
 
-#: clutter/clutter-actor.c:4105
+#: ../clutter/clutter-actor.c:4130
 msgid "Whether to use the natural-height property"
 msgstr ""
 
-#: clutter/clutter-actor.c:4124
+#: ../clutter/clutter-actor.c:4149
 msgid "Allocation"
 msgstr "Allokering"
 
-#: clutter/clutter-actor.c:4125
+#: ../clutter/clutter-actor.c:4150
 msgid "The actor's allocation"
 msgstr ""
 
-#: clutter/clutter-actor.c:4181
+#: ../clutter/clutter-actor.c:4206
 msgid "Request Mode"
 msgstr ""
 
-#: clutter/clutter-actor.c:4182
+#: ../clutter/clutter-actor.c:4207
 msgid "The actor's request mode"
 msgstr ""
 
-#: clutter/clutter-actor.c:4197
+#: ../clutter/clutter-actor.c:4222
 msgid "Depth"
 msgstr "Dybde"
 
-#: clutter/clutter-actor.c:4198
+#: ../clutter/clutter-actor.c:4223
 msgid "Position on the Z axis"
 msgstr "Posisjonn på Z-aksen"
 
-#: clutter/clutter-actor.c:4212
+#: ../clutter/clutter-actor.c:4237
 msgid "Opacity"
 msgstr "Ugjennomsiktighet"
 
-#: clutter/clutter-actor.c:4213
+#: ../clutter/clutter-actor.c:4238
 msgid "Opacity of an actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:4232
+#: ../clutter/clutter-actor.c:4257
 msgid "Offscreen redirect"
 msgstr ""
 
-#: clutter/clutter-actor.c:4233
+#: ../clutter/clutter-actor.c:4258
 msgid "Flags controlling when to flatten the actor into a single image"
 msgstr ""
 
-#: clutter/clutter-actor.c:4251
+#: ../clutter/clutter-actor.c:4276
 msgid "Visible"
 msgstr "Synlig"
 
-#: clutter/clutter-actor.c:4252
+#: ../clutter/clutter-actor.c:4277
 msgid "Whether the actor is visible or not"
 msgstr ""
 
-#: clutter/clutter-actor.c:4267
+#: ../clutter/clutter-actor.c:4292
 msgid "Mapped"
 msgstr ""
 
-#: clutter/clutter-actor.c:4268
+#: ../clutter/clutter-actor.c:4293
 msgid "Whether the actor will be painted"
 msgstr ""
 
-#: clutter/clutter-actor.c:4282
+#: ../clutter/clutter-actor.c:4307
 msgid "Realized"
 msgstr "Realisert"
 
-#: clutter/clutter-actor.c:4283
+#: ../clutter/clutter-actor.c:4308
 msgid "Whether the actor has been realized"
 msgstr ""
 
-#: clutter/clutter-actor.c:4299
+#: ../clutter/clutter-actor.c:4324
 msgid "Reactive"
 msgstr "Reaktiv"
 
-#: clutter/clutter-actor.c:4300
+#: ../clutter/clutter-actor.c:4325
 msgid "Whether the actor is reactive to events"
 msgstr ""
 
-#: clutter/clutter-actor.c:4312
+#: ../clutter/clutter-actor.c:4337
 msgid "Has Clip"
 msgstr ""
 
-#: clutter/clutter-actor.c:4313
+#: ../clutter/clutter-actor.c:4338
 msgid "Whether the actor has a clip set"
 msgstr ""
 
-#: clutter/clutter-actor.c:4328
+#: ../clutter/clutter-actor.c:4353
 msgid "Clip"
 msgstr ""
 
-#: clutter/clutter-actor.c:4329
+#: ../clutter/clutter-actor.c:4354
 msgid "The clip region for the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:4343 clutter/clutter-actor-meta.c:207
-#: clutter/clutter-binding-pool.c:319 clutter/clutter-input-device.c:236
+#: ../clutter/clutter-actor.c:4368 ../clutter/clutter-actor-meta.c:207
+#: ../clutter/clutter-binding-pool.c:319 ../clutter/clutter-input-device.c:236
 msgid "Name"
 msgstr "Navn"
 
-#: clutter/clutter-actor.c:4344
+#: ../clutter/clutter-actor.c:4369
 msgid "Name of the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:4358
+#: ../clutter/clutter-actor.c:4383
 msgid "Scale X"
 msgstr ""
 
-#: clutter/clutter-actor.c:4359
+#: ../clutter/clutter-actor.c:4384
 msgid "Scale factor on the X axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:4374
+#: ../clutter/clutter-actor.c:4399
 msgid "Scale Y"
 msgstr ""
 
-#: clutter/clutter-actor.c:4375
+#: ../clutter/clutter-actor.c:4400
 msgid "Scale factor on the Y axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:4390
+#: ../clutter/clutter-actor.c:4415
 msgid "Scale Center X"
 msgstr ""
 
-#: clutter/clutter-actor.c:4391
+#: ../clutter/clutter-actor.c:4416
 msgid "Horizontal scale center"
 msgstr ""
 
-#: clutter/clutter-actor.c:4406
+#: ../clutter/clutter-actor.c:4431
 msgid "Scale Center Y"
 msgstr ""
 
-#: clutter/clutter-actor.c:4407
+#: ../clutter/clutter-actor.c:4432
 msgid "Vertical scale center"
 msgstr ""
 
-#: clutter/clutter-actor.c:4422
+#: ../clutter/clutter-actor.c:4447
 msgid "Scale Gravity"
 msgstr ""
 
-#: clutter/clutter-actor.c:4423
+#: ../clutter/clutter-actor.c:4448
 msgid "The center of scaling"
 msgstr ""
 
-#: clutter/clutter-actor.c:4440
+#: ../clutter/clutter-actor.c:4465
 msgid "Rotation Angle X"
 msgstr ""
 
-#: clutter/clutter-actor.c:4441
+#: ../clutter/clutter-actor.c:4466
 msgid "The rotation angle on the X axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:4456
+#: ../clutter/clutter-actor.c:4481
 msgid "Rotation Angle Y"
 msgstr ""
 
-#: clutter/clutter-actor.c:4457
+#: ../clutter/clutter-actor.c:4482
 msgid "The rotation angle on the Y axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:4472
+#: ../clutter/clutter-actor.c:4497
 msgid "Rotation Angle Z"
 msgstr ""
 
-#: clutter/clutter-actor.c:4473
+#: ../clutter/clutter-actor.c:4498
 msgid "The rotation angle on the Z axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:4488
+#: ../clutter/clutter-actor.c:4513
 msgid "Rotation Center X"
 msgstr ""
 
-#: clutter/clutter-actor.c:4489
+#: ../clutter/clutter-actor.c:4514
 msgid "The rotation center on the X axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:4505
+#: ../clutter/clutter-actor.c:4530
 msgid "Rotation Center Y"
 msgstr ""
 
-#: clutter/clutter-actor.c:4506
+#: ../clutter/clutter-actor.c:4531
 msgid "The rotation center on the Y axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:4522
+#: ../clutter/clutter-actor.c:4547
 msgid "Rotation Center Z"
 msgstr ""
 
-#: clutter/clutter-actor.c:4523
+#: ../clutter/clutter-actor.c:4548
 msgid "The rotation center on the Z axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:4539
+#: ../clutter/clutter-actor.c:4564
 msgid "Rotation Center Z Gravity"
 msgstr ""
 
-#: clutter/clutter-actor.c:4540
+#: ../clutter/clutter-actor.c:4565
 msgid "Center point for rotation around the Z axis"
 msgstr ""
 
-#: clutter/clutter-actor.c:4558
+#: ../clutter/clutter-actor.c:4583
 msgid "Anchor X"
 msgstr "Anker X"
 
-#: clutter/clutter-actor.c:4559
+#: ../clutter/clutter-actor.c:4584
 msgid "X coordinate of the anchor point"
 msgstr "X-koordinat for ankerpunkt"
 
-#: clutter/clutter-actor.c:4575
+#: ../clutter/clutter-actor.c:4600
 msgid "Anchor Y"
 msgstr "Anker Y"
 
-#: clutter/clutter-actor.c:4576
+#: ../clutter/clutter-actor.c:4601
 msgid "Y coordinate of the anchor point"
 msgstr "Y-koordinat for ankerpunkt"
 
-#: clutter/clutter-actor.c:4591
+#: ../clutter/clutter-actor.c:4616
 msgid "Anchor Gravity"
 msgstr ""
 
-#: clutter/clutter-actor.c:4592
+#: ../clutter/clutter-actor.c:4617
 msgid "The anchor point as a ClutterGravity"
 msgstr ""
 
-#: clutter/clutter-actor.c:4611
+#: ../clutter/clutter-actor.c:4636
 msgid "Show on set parent"
 msgstr ""
 
-#: clutter/clutter-actor.c:4612
+#: ../clutter/clutter-actor.c:4637
 msgid "Whether the actor is shown when parented"
 msgstr ""
 
-#: clutter/clutter-actor.c:4632
+#: ../clutter/clutter-actor.c:4657
 msgid "Clip to Allocation"
 msgstr ""
 
-#: clutter/clutter-actor.c:4633
+#: ../clutter/clutter-actor.c:4658
 msgid "Sets the clip region to track the actor's allocation"
 msgstr ""
 
-#: clutter/clutter-actor.c:4643
+#: ../clutter/clutter-actor.c:4668
 msgid "Text Direction"
 msgstr "Tekstretning"
 
-#: clutter/clutter-actor.c:4644
+#: ../clutter/clutter-actor.c:4669
 msgid "Direction of the text"
 msgstr "Retning for teksten"
 
-#: clutter/clutter-actor.c:4662
+#: ../clutter/clutter-actor.c:4687
 msgid "Has Pointer"
 msgstr "Har peker"
 
-#: clutter/clutter-actor.c:4663
+#: ../clutter/clutter-actor.c:4688
 msgid "Whether the actor contains the pointer of an input device"
 msgstr ""
 
-#: clutter/clutter-actor.c:4680
+#: ../clutter/clutter-actor.c:4705
 msgid "Actions"
 msgstr "Hendlinger"
 
-#: clutter/clutter-actor.c:4681
+#: ../clutter/clutter-actor.c:4706
 msgid "Adds an action to the actor"
 msgstr ""
 
-#: clutter/clutter-actor.c:4695
+#: ../clutter/clutter-actor.c:4720
 msgid "Constraints"
 msgstr "Begrensninger"
 
-#: clutter/clutter-actor.c:4696
+#: ../clutter/clutter-actor.c:4721
 msgid "Adds a constraint to the actor"
 msgstr ""
 
-#: clutter/clutter-actor-meta.c:193 clutter/clutter-child-meta.c:142
+#: ../clutter/clutter-actor.c:4735
+msgid "Effect"
+msgstr ""
+
+#: ../clutter/clutter-actor.c:4736
+msgid "Add an effect to be applied on the actor"
+msgstr ""
+
+#: ../clutter/clutter-actor-meta.c:193 ../clutter/clutter-child-meta.c:142
 msgid "Actor"
 msgstr ""
 
-#: clutter/clutter-actor-meta.c:194
+#: ../clutter/clutter-actor-meta.c:194
 msgid "The actor attached to the meta"
 msgstr ""
 
-#: clutter/clutter-actor-meta.c:208
+#: ../clutter/clutter-actor-meta.c:208
 msgid "The name of the meta"
 msgstr ""
 
-#: clutter/clutter-actor-meta.c:221 clutter/clutter-input-device.c:315
-#: clutter/clutter-shader.c:307
+#: ../clutter/clutter-actor-meta.c:221 ../clutter/clutter-input-device.c:315
+#: ../clutter/deprecated/clutter-shader.c:309
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: clutter/clutter-actor-meta.c:222
+#: ../clutter/clutter-actor-meta.c:222
 msgid "Whether the meta is enabled"
 msgstr ""
 
-#: clutter/clutter-align-constraint.c:270
-#: clutter/clutter-bind-constraint.c:349 clutter/clutter-clone.c:340
-#: clutter/clutter-snap-constraint.c:321
+#: ../clutter/clutter-align-constraint.c:281
+#: ../clutter/clutter-bind-constraint.c:349 ../clutter/clutter-clone.c:345
+#: ../clutter/clutter-snap-constraint.c:321
 msgid "Source"
 msgstr "Kilde"
 
-#: clutter/clutter-align-constraint.c:271
+#: ../clutter/clutter-align-constraint.c:282
 msgid "The source of the alignment"
 msgstr ""
 
-#: clutter/clutter-align-constraint.c:284
+#: ../clutter/clutter-align-constraint.c:295
 msgid "Align Axis"
 msgstr ""
 
-#: clutter/clutter-align-constraint.c:285
+#: ../clutter/clutter-align-constraint.c:296
 msgid "The axis to align the position to"
 msgstr ""
 
-#: clutter/clutter-align-constraint.c:304
-#: clutter/clutter-desaturate-effect.c:304
+#: ../clutter/clutter-align-constraint.c:315
+#: ../clutter/clutter-desaturate-effect.c:304
 msgid "Factor"
 msgstr "Faktor"
 
-#: clutter/clutter-align-constraint.c:305
+#: ../clutter/clutter-align-constraint.c:316
 msgid "The alignment factor, between 0.0 and 1.0"
 msgstr ""
 
-#: clutter/clutter-alpha.c:345 clutter/clutter-animation.c:538
-#: clutter/clutter-animator.c:1802
+#: ../clutter/clutter-alpha.c:345 ../clutter/clutter-animation.c:538
+#: ../clutter/clutter-animator.c:1802
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: clutter/clutter-alpha.c:346
+#: ../clutter/clutter-alpha.c:346
 msgid "Timeline used by the alpha"
 msgstr ""
 
-#: clutter/clutter-alpha.c:361
+#: ../clutter/clutter-alpha.c:361
 msgid "Alpha value"
 msgstr ""
 
-#: clutter/clutter-alpha.c:362
+#: ../clutter/clutter-alpha.c:362
 msgid "Alpha value as computed by the alpha"
 msgstr ""
 
-#: clutter/clutter-alpha.c:382 clutter/clutter-animation.c:494
+#: ../clutter/clutter-alpha.c:382 ../clutter/clutter-animation.c:494
 msgid "Mode"
 msgstr "Modus"
 
-#: clutter/clutter-alpha.c:383
+#: ../clutter/clutter-alpha.c:383
 msgid "Progress mode"
 msgstr "Fremdriftsmodus"
 
-#: clutter/clutter-animation.c:478
+#: ../clutter/clutter-animation.c:478
 msgid "Object"
 msgstr "Objekt"
 
-#: clutter/clutter-animation.c:479
+#: ../clutter/clutter-animation.c:479
 msgid "Object to which the animation applies"
 msgstr ""
 
-#: clutter/clutter-animation.c:495
+#: ../clutter/clutter-animation.c:495
 msgid "The mode of the animation"
 msgstr "Modus for animasjonen"
 
-#: clutter/clutter-animation.c:509 clutter/clutter-animator.c:1786
-#: clutter/clutter-media.c:194 clutter/clutter-state.c:1486
-#: clutter/clutter-timeline.c:294
+#: ../clutter/clutter-animation.c:509 ../clutter/clutter-animator.c:1786
+#: ../clutter/clutter-media.c:194 ../clutter/clutter-state.c:1486
+#: ../clutter/clutter-timeline.c:294
 msgid "Duration"
 msgstr "Varighet"
 
-#: clutter/clutter-animation.c:510
+#: ../clutter/clutter-animation.c:510
 msgid "Duration of the animation, in milliseconds"
 msgstr "Varighet for animasjonen, i millisekunder"
 
-#: clutter/clutter-animation.c:524 clutter/clutter-timeline.c:263
+#: ../clutter/clutter-animation.c:524 ../clutter/clutter-timeline.c:263
 msgid "Loop"
 msgstr "Løkke"
 
-#: clutter/clutter-animation.c:525
+#: ../clutter/clutter-animation.c:525
 msgid "Whether the animation should loop"
 msgstr "Om animasjonen skal gå i løkke"
 
-#: clutter/clutter-animation.c:539
+#: ../clutter/clutter-animation.c:539
 msgid "The timeline used by the animation"
 msgstr "Tidslinje brukt av animasjonen"
 
-#: clutter/clutter-animation.c:552 clutter/clutter-behaviour.c:304
+#: ../clutter/clutter-animation.c:552
+#: ../clutter/deprecated/clutter-behaviour.c:240
 msgid "Alpha"
 msgstr ""
 
-#: clutter/clutter-animation.c:553
+#: ../clutter/clutter-animation.c:553
 msgid "The alpha used by the animation"
 msgstr ""
 
-#: clutter/clutter-animator.c:1787
+#: ../clutter/clutter-animator.c:1787
 msgid "The duration of the animation"
 msgstr "Varighet for animasjonen"
 
-#: clutter/clutter-animator.c:1803
+#: ../clutter/clutter-animator.c:1803
 msgid "The timeline of the animation"
 msgstr "Tidslinje for animasjonen"
 
-#: clutter/clutter-behaviour.c:305
+#: ../clutter/deprecated/clutter-behaviour.c:241
 msgid "Alpha Object to drive the behaviour"
 msgstr ""
 
-#: clutter/clutter-behaviour-depth.c:178
+#: ../clutter/deprecated/clutter-behaviour-depth.c:180
 msgid "Start Depth"
 msgstr "Startdybde"
 
-#: clutter/clutter-behaviour-depth.c:179
+#: ../clutter/deprecated/clutter-behaviour-depth.c:181
 msgid "Initial depth to apply"
 msgstr ""
 
-#: clutter/clutter-behaviour-depth.c:194
+#: ../clutter/deprecated/clutter-behaviour-depth.c:196
 msgid "End Depth"
 msgstr ""
 
-#: clutter/clutter-behaviour-depth.c:195
+#: ../clutter/deprecated/clutter-behaviour-depth.c:197
 msgid "Final depth to apply"
 msgstr ""
 
-#: clutter/clutter-behaviour-ellipse.c:397
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:399
 msgid "Start Angle"
 msgstr "Startvinkel"
 
-#: clutter/clutter-behaviour-ellipse.c:398
-#: clutter/clutter-behaviour-rotate.c:280
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:400
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:282
 msgid "Initial angle"
 msgstr "Utgangsvinkel"
 
-#: clutter/clutter-behaviour-ellipse.c:413
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:415
 msgid "End Angle"
 msgstr "Sluttvinkel"
 
-#: clutter/clutter-behaviour-ellipse.c:414
-#: clutter/clutter-behaviour-rotate.c:298
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:416
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:300
 msgid "Final angle"
 msgstr "Endelig vinkel"
 
-#: clutter/clutter-behaviour-ellipse.c:429
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:431
 msgid "Angle x tilt"
 msgstr ""
 
-#: clutter/clutter-behaviour-ellipse.c:430
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:432
 msgid "Tilt of the ellipse around x axis"
 msgstr ""
 
-#: clutter/clutter-behaviour-ellipse.c:445
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:447
 msgid "Angle y tilt"
 msgstr ""
 
-#: clutter/clutter-behaviour-ellipse.c:446
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:448
 msgid "Tilt of the ellipse around y axis"
 msgstr ""
 
-#: clutter/clutter-behaviour-ellipse.c:461
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:463
 msgid "Angle z tilt"
 msgstr ""
 
-#: clutter/clutter-behaviour-ellipse.c:462
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:464
 msgid "Tilt of the ellipse around z axis"
 msgstr ""
 
-#: clutter/clutter-behaviour-ellipse.c:478
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:480
 msgid "Width of the ellipse"
 msgstr "Bredde på ellipse"
 
-#: clutter/clutter-behaviour-ellipse.c:494
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:496
 msgid "Height of ellipse"
 msgstr "Høyde på ellipse"
 
-#: clutter/clutter-behaviour-ellipse.c:509
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:511
 msgid "Center"
 msgstr "Senter"
 
-#: clutter/clutter-behaviour-ellipse.c:510
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:512
 msgid "Center of ellipse"
 msgstr "Senter av ellipse"
 
-#: clutter/clutter-behaviour-ellipse.c:524
-#: clutter/clutter-behaviour-rotate.c:333 clutter/clutter-timeline.c:310
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:526
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:335
+#: ../clutter/clutter-timeline.c:310
 msgid "Direction"
 msgstr "Retning"
 
-#: clutter/clutter-behaviour-ellipse.c:525
-#: clutter/clutter-behaviour-rotate.c:334
+#: ../clutter/deprecated/clutter-behaviour-ellipse.c:527
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:336
 msgid "Direction of rotation"
 msgstr "Retning for rotasjon"
 
-#: clutter/clutter-behaviour-opacity.c:181
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:183
 msgid "Opacity Start"
 msgstr ""
 
-#: clutter/clutter-behaviour-opacity.c:182
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:184
 msgid "Initial opacity level"
 msgstr ""
 
-#: clutter/clutter-behaviour-opacity.c:199
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:201
 msgid "Opacity End"
 msgstr ""
 
-#: clutter/clutter-behaviour-opacity.c:200
+#: ../clutter/deprecated/clutter-behaviour-opacity.c:202
 msgid "Final opacity level"
 msgstr ""
 
-#: clutter/clutter-behaviour-path.c:222 clutter/clutter-path-constraint.c:212
+#: ../clutter/deprecated/clutter-behaviour-path.c:224
+#: ../clutter/clutter-path-constraint.c:212
 msgid "Path"
 msgstr "Sti"
 
-#: clutter/clutter-behaviour-path.c:223
+#: ../clutter/deprecated/clutter-behaviour-path.c:225
 msgid "The ClutterPath object representing the path to animate along"
 msgstr ""
 
-#: clutter/clutter-behaviour-rotate.c:279
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:281
 msgid "Angle Begin"
 msgstr "Vinkel start"
 
-#: clutter/clutter-behaviour-rotate.c:297
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:299
 msgid "Angle End"
 msgstr "Vinkel slutt"
 
-#: clutter/clutter-behaviour-rotate.c:315
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:317
 msgid "Axis"
 msgstr "Akse"
 
-#: clutter/clutter-behaviour-rotate.c:316
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:318
 msgid "Axis of rotation"
 msgstr "Rotasjonsakse"
 
-#: clutter/clutter-behaviour-rotate.c:351
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:353
 msgid "Center X"
 msgstr ""
 
-#: clutter/clutter-behaviour-rotate.c:352
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:354
 msgid "X coordinate of the center of rotation"
 msgstr ""
 
-#: clutter/clutter-behaviour-rotate.c:369
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:371
 msgid "Center Y"
 msgstr ""
 
-#: clutter/clutter-behaviour-rotate.c:370
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:372
 msgid "Y coordinate of the center of rotation"
 msgstr ""
 
-#: clutter/clutter-behaviour-rotate.c:387
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:389
 msgid "Center Z"
 msgstr ""
 
-#: clutter/clutter-behaviour-rotate.c:388
+#: ../clutter/deprecated/clutter-behaviour-rotate.c:390
 msgid "Z coordinate of the center of rotation"
 msgstr ""
 
-#: clutter/clutter-behaviour-scale.c:222
+#: ../clutter/deprecated/clutter-behaviour-scale.c:224
 msgid "X Start Scale"
 msgstr ""
 
-#: clutter/clutter-behaviour-scale.c:223
+#: ../clutter/deprecated/clutter-behaviour-scale.c:225
 msgid "Initial scale on the X axis"
 msgstr ""
 
-#: clutter/clutter-behaviour-scale.c:241
+#: ../clutter/deprecated/clutter-behaviour-scale.c:243
 msgid "X End Scale"
 msgstr ""
 
-#: clutter/clutter-behaviour-scale.c:242
+#: ../clutter/deprecated/clutter-behaviour-scale.c:244
 msgid "Final scale on the X axis"
 msgstr ""
 
-#: clutter/clutter-behaviour-scale.c:260
+#: ../clutter/deprecated/clutter-behaviour-scale.c:262
 msgid "Y Start Scale"
 msgstr ""
 
-#: clutter/clutter-behaviour-scale.c:261
+#: ../clutter/deprecated/clutter-behaviour-scale.c:263
 msgid "Initial scale on the Y axis"
 msgstr ""
 
-#: clutter/clutter-behaviour-scale.c:279
+#: ../clutter/deprecated/clutter-behaviour-scale.c:281
 msgid "Y End Scale"
 msgstr ""
 
-#: clutter/clutter-behaviour-scale.c:280
+#: ../clutter/deprecated/clutter-behaviour-scale.c:282
 msgid "Final scale on the Y axis"
 msgstr ""
 
-#: clutter/clutter-bind-constraint.c:350
+#: ../clutter/clutter-bind-constraint.c:350
 msgid "The source of the binding"
 msgstr ""
 
-#: clutter/clutter-bind-constraint.c:363
+#: ../clutter/clutter-bind-constraint.c:363
 msgid "Coordinate"
 msgstr "Koordinat"
 
-#: clutter/clutter-bind-constraint.c:364
+#: ../clutter/clutter-bind-constraint.c:364
 msgid "The coordinate to bind"
 msgstr ""
 
-#: clutter/clutter-bind-constraint.c:378 clutter/clutter-path-constraint.c:226
-#: clutter/clutter-snap-constraint.c:366
+#: ../clutter/clutter-bind-constraint.c:378
+#: ../clutter/clutter-path-constraint.c:226
+#: ../clutter/clutter-snap-constraint.c:366
 msgid "Offset"
 msgstr ""
 
-#: clutter/clutter-bind-constraint.c:379
+#: ../clutter/clutter-bind-constraint.c:379
 msgid "The offset in pixels to apply to the binding"
 msgstr ""
 
-#: clutter/clutter-binding-pool.c:320
+#: ../clutter/clutter-binding-pool.c:320
 msgid "The unique name of the binding pool"
 msgstr ""
 
-#: clutter/clutter-bin-layout.c:261 clutter/clutter-bin-layout.c:585
-#: clutter/clutter-box-layout.c:395 clutter/clutter-table-layout.c:652
+#: ../clutter/clutter-bin-layout.c:261 ../clutter/clutter-bin-layout.c:585
+#: ../clutter/clutter-box-layout.c:395 ../clutter/clutter-table-layout.c:652
 msgid "Horizontal Alignment"
 msgstr ""
 
-#: clutter/clutter-bin-layout.c:262
+#: ../clutter/clutter-bin-layout.c:262
 msgid "Horizontal alignment for the actor inside the layout manager"
 msgstr ""
 
-#: clutter/clutter-bin-layout.c:270 clutter/clutter-bin-layout.c:602
-#: clutter/clutter-box-layout.c:404 clutter/clutter-table-layout.c:667
+#: ../clutter/clutter-bin-layout.c:270 ../clutter/clutter-bin-layout.c:602
+#: ../clutter/clutter-box-layout.c:404 ../clutter/clutter-table-layout.c:667
 msgid "Vertical Alignment"
 msgstr "Vertikal justering"
 
-#: clutter/clutter-bin-layout.c:271
+#: ../clutter/clutter-bin-layout.c:271
 msgid "Vertical alignment for the actor inside the layout manager"
 msgstr ""
 
-#: clutter/clutter-bin-layout.c:586
+#: ../clutter/clutter-bin-layout.c:586
 msgid "Default horizontal alignment for the actors inside the layout manager"
 msgstr ""
 
-#: clutter/clutter-bin-layout.c:603
+#: ../clutter/clutter-bin-layout.c:603
 msgid "Default vertical alignment for the actors inside the layout manager"
 msgstr ""
 
-#: clutter/clutter-box.c:544
+#: ../clutter/clutter-box.c:544
 msgid "Layout Manager"
 msgstr ""
 
-#: clutter/clutter-box.c:545
+#: ../clutter/clutter-box.c:545
 msgid "The layout manager used by the box"
 msgstr ""
 
-#: clutter/clutter-box.c:564 clutter/clutter-rectangle.c:267
-#: clutter/clutter-stage.c:1765
+#: ../clutter/clutter-box.c:564 ../clutter/clutter-rectangle.c:267
+#: ../clutter/clutter-stage.c:1790
 msgid "Color"
 msgstr "Farge"
 
-#: clutter/clutter-box.c:565
+#: ../clutter/clutter-box.c:565
 msgid "The background color of the box"
 msgstr "Bakgrunnsfarge for boksen"
 
-#: clutter/clutter-box.c:579
+#: ../clutter/clutter-box.c:579
 msgid "Color Set"
 msgstr "Farge satt"
 
-#: clutter/clutter-box.c:580
+#: ../clutter/clutter-box.c:580
 msgid "Whether the background color is set"
 msgstr "Om bakgrunnsfarge er satt"
 
-#: clutter/clutter-box-layout.c:370
+#: ../clutter/clutter-box-layout.c:370
 msgid "Expand"
 msgstr "Utvid"
 
-#: clutter/clutter-box-layout.c:371
+#: ../clutter/clutter-box-layout.c:371
 msgid "Allocate extra space for the child"
 msgstr "Alloker ekstra plass for barn"
 
-#: clutter/clutter-box-layout.c:377 clutter/clutter-table-layout.c:631
+#: ../clutter/clutter-box-layout.c:377 ../clutter/clutter-table-layout.c:631
 msgid "Horizontal Fill"
 msgstr "Horisontalt fyll"
 
-#: clutter/clutter-box-layout.c:378 clutter/clutter-table-layout.c:632
+#: ../clutter/clutter-box-layout.c:378 ../clutter/clutter-table-layout.c:632
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the horizontal axis"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:386 clutter/clutter-table-layout.c:638
+#: ../clutter/clutter-box-layout.c:386 ../clutter/clutter-table-layout.c:638
 msgid "Vertical Fill"
 msgstr "Vertikalt fyll"
 
-#: clutter/clutter-box-layout.c:387 clutter/clutter-table-layout.c:639
+#: ../clutter/clutter-box-layout.c:387 ../clutter/clutter-table-layout.c:639
 msgid ""
 "Whether the child should receive priority when the container is allocating "
 "spare space on the vertical axis"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:396 clutter/clutter-table-layout.c:653
+#: ../clutter/clutter-box-layout.c:396 ../clutter/clutter-table-layout.c:653
 msgid "Horizontal alignment of the actor within the cell"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:405 clutter/clutter-table-layout.c:668
+#: ../clutter/clutter-box-layout.c:405 ../clutter/clutter-table-layout.c:668
 msgid "Vertical alignment of the actor within the cell"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:1305
+#: ../clutter/clutter-box-layout.c:1303
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: clutter/clutter-box-layout.c:1306
+#: ../clutter/clutter-box-layout.c:1304
 msgid "Whether the layout should be vertical, rather than horizontal"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:1321 clutter/clutter-flow-layout.c:901
+#: ../clutter/clutter-box-layout.c:1319 ../clutter/clutter-flow-layout.c:901
 msgid "Homogeneous"
 msgstr "Homogen"
 
-#: clutter/clutter-box-layout.c:1322
+#: ../clutter/clutter-box-layout.c:1320
 msgid ""
 "Whether the layout should be homogeneous, i.e. all childs get the same size"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:1337
+#: ../clutter/clutter-box-layout.c:1335
 msgid "Pack Start"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:1338
+#: ../clutter/clutter-box-layout.c:1336
 msgid "Whether to pack items at the start of the box"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:1351
+#: ../clutter/clutter-box-layout.c:1349
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: clutter/clutter-box-layout.c:1352
+#: ../clutter/clutter-box-layout.c:1350
 msgid "Spacing between children"
 msgstr "Mellomrom mellom barn"
 
-#: clutter/clutter-box-layout.c:1366 clutter/clutter-table-layout.c:1742
+#: ../clutter/clutter-box-layout.c:1364 ../clutter/clutter-table-layout.c:1742
 msgid "Use Animations"
 msgstr "Bruk animasjoner"
 
-#: clutter/clutter-box-layout.c:1367 clutter/clutter-table-layout.c:1743
+#: ../clutter/clutter-box-layout.c:1365 ../clutter/clutter-table-layout.c:1743
 msgid "Whether layout changes should be animated"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:1388 clutter/clutter-table-layout.c:1764
+#: ../clutter/clutter-box-layout.c:1386 ../clutter/clutter-table-layout.c:1764
 msgid "Easing Mode"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:1389 clutter/clutter-table-layout.c:1765
+#: ../clutter/clutter-box-layout.c:1387 ../clutter/clutter-table-layout.c:1765
 msgid "The easing mode of the animations"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:1406 clutter/clutter-table-layout.c:1782
+#: ../clutter/clutter-box-layout.c:1404 ../clutter/clutter-table-layout.c:1782
 msgid "Easing Duration"
 msgstr ""
 
-#: clutter/clutter-box-layout.c:1407 clutter/clutter-table-layout.c:1783
+#: ../clutter/clutter-box-layout.c:1405 ../clutter/clutter-table-layout.c:1783
 msgid "The duration of the animations"
 msgstr "Varighet på animasjonene"
 
-#: clutter/clutter-cairo-texture.c:582
+#: ../clutter/clutter-cairo-texture.c:582
 msgid "Surface Width"
 msgstr "Bredde på overflate"
 
-#: clutter/clutter-cairo-texture.c:583
+#: ../clutter/clutter-cairo-texture.c:583
 msgid "The width of the Cairo surface"
 msgstr "Bredde på Cairo-overflate"
 
-#: clutter/clutter-cairo-texture.c:597
+#: ../clutter/clutter-cairo-texture.c:597
 msgid "Surface Height"
 msgstr "Høyde på overflate"
 
-#: clutter/clutter-cairo-texture.c:598
+#: ../clutter/clutter-cairo-texture.c:598
 msgid "The height of the Cairo surface"
 msgstr "Høyde på Cairo-overflate"
 
-#: clutter/clutter-cairo-texture.c:615
+#: ../clutter/clutter-cairo-texture.c:615
 msgid "Auto Resize"
 msgstr "Automatisk endring av størrelse"
 
-#: clutter/clutter-cairo-texture.c:616
-#, fuzzy
+#: ../clutter/clutter-cairo-texture.c:616
 msgid "Whether the surface should match the allocation"
-msgstr "Om animasjonen skal gå i løkke"
+msgstr "Om overflaten skal være lik allokering"
 
-#: clutter/clutter-child-meta.c:127
+#: ../clutter/clutter-child-meta.c:127
 msgid "Container"
 msgstr "Konteiner"
 
-#: clutter/clutter-child-meta.c:128
+#: ../clutter/clutter-child-meta.c:128
 msgid "The container that created this data"
 msgstr ""
 
-#: clutter/clutter-child-meta.c:143
+#: ../clutter/clutter-child-meta.c:143
 msgid "The actor wrapped by this data"
 msgstr ""
 
-#: clutter/clutter-click-action.c:542
+#: ../clutter/clutter-click-action.c:542
 msgid "Pressed"
 msgstr "Trykket"
 
-#: clutter/clutter-click-action.c:543
+#: ../clutter/clutter-click-action.c:543
 msgid "Whether the clickable should be in pressed state"
 msgstr ""
 
-#: clutter/clutter-click-action.c:556
+#: ../clutter/clutter-click-action.c:556
 msgid "Held"
 msgstr "Holdt"
 
-#: clutter/clutter-click-action.c:557
+#: ../clutter/clutter-click-action.c:557
 msgid "Whether the clickable has a grab"
 msgstr ""
 
-#: clutter/clutter-click-action.c:574 clutter/clutter-settings.c:573
+#: ../clutter/clutter-click-action.c:574 ../clutter/clutter-settings.c:598
 msgid "Long Press Duration"
 msgstr ""
 
-#: clutter/clutter-click-action.c:575
+#: ../clutter/clutter-click-action.c:575
 msgid "The minimum duration of a long press to recognize the gesture"
 msgstr ""
 
-#: clutter/clutter-click-action.c:593
+#: ../clutter/clutter-click-action.c:593
 msgid "Long Press Threshold"
 msgstr ""
 
-#: clutter/clutter-click-action.c:594
+#: ../clutter/clutter-click-action.c:594
 msgid "The maximum threshold before a long press is cancelled"
 msgstr ""
 
-#: clutter/clutter-clone.c:341
+#: ../clutter/clutter-clone.c:346
 msgid "Specifies the actor to be cloned"
 msgstr ""
 
-#: clutter/clutter-colorize-effect.c:307
+#: ../clutter/clutter-colorize-effect.c:307
 msgid "Tint"
 msgstr ""
 
-#: clutter/clutter-colorize-effect.c:308
+#: ../clutter/clutter-colorize-effect.c:308
 msgid "The tint to apply"
 msgstr ""
 
-#: clutter/clutter-deform-effect.c:527
+#: ../clutter/clutter-deform-effect.c:547
 msgid "Horizontal Tiles"
-msgstr ""
+msgstr "Horisontale fliser"
 
-#: clutter/clutter-deform-effect.c:528
+#: ../clutter/clutter-deform-effect.c:548
 msgid "The number of horizontal tiles"
-msgstr ""
+msgstr "Antall horisontale fliser"
 
-#: clutter/clutter-deform-effect.c:543
+#: ../clutter/clutter-deform-effect.c:563
 msgid "Vertical Tiles"
 msgstr "Vertikale fliser"
 
-#: clutter/clutter-deform-effect.c:544
+#: ../clutter/clutter-deform-effect.c:564
 msgid "The number of vertical tiles"
-msgstr ""
+msgstr "Antall vertikale fliser"
 
-#: clutter/clutter-deform-effect.c:561
+#: ../clutter/clutter-deform-effect.c:581
 msgid "Back Material"
-msgstr ""
+msgstr "Bakgrunnsmateriale"
 
-#: clutter/clutter-deform-effect.c:562
+#: ../clutter/clutter-deform-effect.c:582
 msgid "The material to be used when painting the back of the actor"
 msgstr ""
 
-#: clutter/clutter-desaturate-effect.c:305
+#: ../clutter/clutter-desaturate-effect.c:305
 msgid "The desaturation factor"
 msgstr ""
 
-#: clutter/clutter-device-manager.c:131 clutter/clutter-input-device.c:344
-#: clutter/x11/clutter-keymap-x11.c:316
+#: ../clutter/clutter-device-manager.c:131
+#: ../clutter/clutter-input-device.c:344
+#: ../clutter/x11/clutter-keymap-x11.c:316
 msgid "Backend"
 msgstr ""
 
-#: clutter/clutter-device-manager.c:132
+#: ../clutter/clutter-device-manager.c:132
 msgid "The ClutterBackend of the device manager"
 msgstr ""
 
-#: clutter/clutter-drag-action.c:596
+#: ../clutter/clutter-drag-action.c:596
 msgid "Horizontal Drag Threshold"
 msgstr ""
 
-#: clutter/clutter-drag-action.c:597
+#: ../clutter/clutter-drag-action.c:597
 msgid "The horizontal amount of pixels required to start dragging"
 msgstr ""
 
-#: clutter/clutter-drag-action.c:624
+#: ../clutter/clutter-drag-action.c:624
 msgid "Vertical Drag Threshold"
 msgstr ""
 
-#: clutter/clutter-drag-action.c:625
+#: ../clutter/clutter-drag-action.c:625
 msgid "The vertical amount of pixels required to start dragging"
 msgstr ""
 
-#: clutter/clutter-drag-action.c:646
+#: ../clutter/clutter-drag-action.c:646
 msgid "Drag Handle"
-msgstr ""
+msgstr "Drahåndtak"
 
-#: clutter/clutter-drag-action.c:647
+#: ../clutter/clutter-drag-action.c:647
 msgid "The actor that is being dragged"
 msgstr ""
 
-#: clutter/clutter-drag-action.c:660
+#: ../clutter/clutter-drag-action.c:660
 msgid "Drag Axis"
 msgstr ""
 
-#: clutter/clutter-drag-action.c:661
+#: ../clutter/clutter-drag-action.c:661
 msgid "Constraints the dragging to an axis"
 msgstr ""
 
-#: clutter/clutter-flow-layout.c:885
+#: ../clutter/clutter-flow-layout.c:885
 msgid "Orientation"
 msgstr "Orientering"
 
-#: clutter/clutter-flow-layout.c:886
+#: ../clutter/clutter-flow-layout.c:886
 msgid "The orientation of the layout"
 msgstr "Orientering for utformingen"
 
-#: clutter/clutter-flow-layout.c:902
+#: ../clutter/clutter-flow-layout.c:902
 msgid "Whether each item should receive the same allocation"
 msgstr ""
 
-#: clutter/clutter-flow-layout.c:917 clutter/clutter-table-layout.c:1713
+#: ../clutter/clutter-flow-layout.c:917 ../clutter/clutter-table-layout.c:1713
 msgid "Column Spacing"
 msgstr "Mellomrom for kolonner"
 
-#: clutter/clutter-flow-layout.c:918
+#: ../clutter/clutter-flow-layout.c:918
 msgid "The spacing between columns"
 msgstr "Mellomrom mellom kolonner"
 
-#: clutter/clutter-flow-layout.c:934 clutter/clutter-table-layout.c:1727
+#: ../clutter/clutter-flow-layout.c:934 ../clutter/clutter-table-layout.c:1727
 msgid "Row Spacing"
 msgstr "Mellomrom for rader"
 
-#: clutter/clutter-flow-layout.c:935
+#: ../clutter/clutter-flow-layout.c:935
 msgid "The spacing between rows"
 msgstr "Mellomrom mellom rader"
 
-#: clutter/clutter-flow-layout.c:949
+#: ../clutter/clutter-flow-layout.c:949
 msgid "Minimum Column Width"
-msgstr ""
+msgstr "Minste bredde på kolonne"
 
-#: clutter/clutter-flow-layout.c:950
+#: ../clutter/clutter-flow-layout.c:950
 msgid "Minimum width for each column"
-msgstr ""
+msgstr "Minste bredde for hver kolonne"
 
-#: clutter/clutter-flow-layout.c:965
+#: ../clutter/clutter-flow-layout.c:965
 msgid "Maximum Column Width"
-msgstr ""
+msgstr "Maskimal bredde på kolonne"
 
-#: clutter/clutter-flow-layout.c:966
+#: ../clutter/clutter-flow-layout.c:966
 msgid "Maximum width for each column"
-msgstr ""
+msgstr "Maksimal bredde for hver kolonne"
 
-#: clutter/clutter-flow-layout.c:980
+#: ../clutter/clutter-flow-layout.c:980
 msgid "Minimum Row Height"
-msgstr ""
+msgstr "Minste høyde på rad"
 
-#: clutter/clutter-flow-layout.c:981
+#: ../clutter/clutter-flow-layout.c:981
 msgid "Minimum height for each row"
-msgstr ""
+msgstr "Minste høyde for hver rad"
 
-#: clutter/clutter-flow-layout.c:996
+#: ../clutter/clutter-flow-layout.c:996
 msgid "Maximum Row Height"
-msgstr ""
+msgstr "Maskimal høyde på rad"
 
-#: clutter/clutter-flow-layout.c:997
+#: ../clutter/clutter-flow-layout.c:997
 msgid "Maximum height for each row"
-msgstr ""
+msgstr "Maksimal høyde for hver rad"
 
-#: clutter/clutter-input-device.c:220
+#: ../clutter/clutter-input-device.c:220
 msgid "Id"
 msgstr "ID"
 
-#: clutter/clutter-input-device.c:221
+#: ../clutter/clutter-input-device.c:221
 msgid "Unique identifier of the device"
-msgstr ""
+msgstr "Unik identifikator for enheten"
 
-#: clutter/clutter-input-device.c:237
+#: ../clutter/clutter-input-device.c:237
 msgid "The name of the device"
 msgstr "Navn på enhet"
 
-#: clutter/clutter-input-device.c:251
+#: ../clutter/clutter-input-device.c:251
 msgid "Device Type"
 msgstr "Type enhet"
 
-#: clutter/clutter-input-device.c:252
+#: ../clutter/clutter-input-device.c:252
 msgid "The type of the device"
 msgstr "Type enhet"
 
-#: clutter/clutter-input-device.c:267
+#: ../clutter/clutter-input-device.c:267
 msgid "Device Manager"
 msgstr "Enhetshåndterer"
 
-#: clutter/clutter-input-device.c:268
+#: ../clutter/clutter-input-device.c:268
 msgid "The device manager instance"
 msgstr ""
 
-#: clutter/clutter-input-device.c:281
+#: ../clutter/clutter-input-device.c:281
 msgid "Device Mode"
-msgstr ""
+msgstr "Enhetsmodus"
 
-#: clutter/clutter-input-device.c:282
+#: ../clutter/clutter-input-device.c:282
 msgid "The mode of the device"
-msgstr ""
+msgstr "Modus for enheten"
 
-#: clutter/clutter-input-device.c:296
+#: ../clutter/clutter-input-device.c:296
 msgid "Has Cursor"
 msgstr "Har markør"
 
-#: clutter/clutter-input-device.c:297
+#: ../clutter/clutter-input-device.c:297
 msgid "Whether the device has a cursor"
-msgstr ""
+msgstr "Om enheten har en markør"
 
-#: clutter/clutter-input-device.c:316
+#: ../clutter/clutter-input-device.c:316
 msgid "Whether the device is enabled"
-msgstr ""
+msgstr "Om enheten er slått på"
 
-#: clutter/clutter-input-device.c:329
+#: ../clutter/clutter-input-device.c:329
 msgid "Number of Axes"
 msgstr "Antall akser"
 
-#: clutter/clutter-input-device.c:330
+#: ../clutter/clutter-input-device.c:330
 msgid "The number of axes on the device"
-msgstr ""
+msgstr "Antall akser på enheten"
 
-#: clutter/clutter-input-device.c:345
+#: ../clutter/clutter-input-device.c:345
 msgid "The backend instance"
 msgstr ""
 
-#: clutter/clutter-interval.c:397
+#: ../clutter/clutter-interval.c:397
 msgid "Value Type"
 msgstr "Type verdi"
 
-#: clutter/clutter-interval.c:398
+#: ../clutter/clutter-interval.c:398
 msgid "The type of the values in the interval"
 msgstr ""
 
-#: clutter/clutter-layout-meta.c:117
+#: ../clutter/clutter-layout-meta.c:117
 msgid "Manager"
 msgstr "Håndterer"
 
-#: clutter/clutter-layout-meta.c:118
+#: ../clutter/clutter-layout-meta.c:118
 msgid "The manager that created this data"
 msgstr ""
 
-#: clutter/clutter-main.c:490
+#. Translators: Leave this UNTRANSLATED if your language is
+#. * left-to-right.  If your language is right-to-left
+#. * (e.g. Hebrew, Arabic), translate it to "default:RTL".
+#. *
+#. * Do NOT translate it to non-English e.g. "predefinito:LTR"! If
+#. * it isn't default:LTR or default:RTL it will not work.
+#.
+#: ../clutter/clutter-main.c:713
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: clutter/clutter-main.c:1321
+#: ../clutter/clutter-main.c:1524
 msgid "Show frames per second"
 msgstr "Vis rammer per sekund"
 
-#: clutter/clutter-main.c:1323
+#: ../clutter/clutter-main.c:1526
 msgid "Default frame rate"
-msgstr ""
+msgstr "Forvalgt bilderate"
 
-#: clutter/clutter-main.c:1325
+#: ../clutter/clutter-main.c:1528
 msgid "Make all warnings fatal"
-msgstr ""
+msgstr "La alle advarsler være fatale"
 
-#: clutter/clutter-main.c:1328
+#: ../clutter/clutter-main.c:1531
 msgid "Direction for the text"
 msgstr "Retning for teksten"
 
-#: clutter/clutter-main.c:1331
+#: ../clutter/clutter-main.c:1534
 msgid "Disable mipmapping on text"
 msgstr ""
 
-#: clutter/clutter-main.c:1334
+#: ../clutter/clutter-main.c:1537
 msgid "Use 'fuzzy' picking"
 msgstr ""
 
-#: clutter/clutter-main.c:1337
+#: ../clutter/clutter-main.c:1540
 msgid "Clutter debugging flags to set"
 msgstr ""
 
-#: clutter/clutter-main.c:1339
+#: ../clutter/clutter-main.c:1542
 msgid "Clutter debugging flags to unset"
 msgstr ""
 
-#: clutter/clutter-main.c:1343
+#: ../clutter/clutter-main.c:1546
 msgid "Clutter profiling flags to set"
 msgstr ""
 
-#: clutter/clutter-main.c:1345
+#: ../clutter/clutter-main.c:1548
 msgid "Clutter profiling flags to unset"
 msgstr ""
 
-#: clutter/clutter-main.c:1348
+#: ../clutter/clutter-main.c:1551
 msgid "Enable accessibility"
 msgstr ""
 
-#: clutter/clutter-main.c:1530
+#: ../clutter/clutter-main.c:1739
 msgid "Clutter Options"
-msgstr ""
+msgstr "Alternativer for Clutter"
 
-#: clutter/clutter-main.c:1531
+#: ../clutter/clutter-main.c:1740
 msgid "Show Clutter Options"
-msgstr ""
+msgstr "Vis alternativer for Clutter"
 
-#: clutter/clutter-media.c:77
+#: ../clutter/clutter-media.c:77
 msgid "URI"
 msgstr "URI"
 
-#: clutter/clutter-media.c:78
+#: ../clutter/clutter-media.c:78
 msgid "URI of a media file"
-msgstr ""
+msgstr "URI for en mediefil"
 
-#: clutter/clutter-media.c:91
+#: ../clutter/clutter-media.c:91
 msgid "Playing"
 msgstr "Spiller"
 
-#: clutter/clutter-media.c:92
+#: ../clutter/clutter-media.c:92
 msgid "Whether the actor is playing"
 msgstr ""
 
-#: clutter/clutter-media.c:106
+#: ../clutter/clutter-media.c:106
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: clutter/clutter-media.c:107
+#: ../clutter/clutter-media.c:107
 msgid "Current progress of the playback"
 msgstr ""
 
-#: clutter/clutter-media.c:120
+#: ../clutter/clutter-media.c:120
 msgid "Subtitle URI"
 msgstr "URI for undertekst"
 
-#: clutter/clutter-media.c:121
+#: ../clutter/clutter-media.c:121
 msgid "URI of a subtitle file"
 msgstr "URI til en undertekstfil"
 
-#: clutter/clutter-media.c:136
+#: ../clutter/clutter-media.c:136
 msgid "Subtitle Font Name"
-msgstr ""
+msgstr "Skriftnavn for undertekst"
 
-#: clutter/clutter-media.c:137
+#: ../clutter/clutter-media.c:137
 msgid "The font used to display subtitles"
-msgstr ""
+msgstr "Skrift som brukes til å vise undertekster"
 
-#: clutter/clutter-media.c:151
+#: ../clutter/clutter-media.c:151
 msgid "Audio Volume"
 msgstr "Lydvolum"
 
-#: clutter/clutter-media.c:152
+#: ../clutter/clutter-media.c:152
 msgid "The volume of the audio"
-msgstr ""
+msgstr "Volum for lyd"
 
-#: clutter/clutter-media.c:165
+#: ../clutter/clutter-media.c:165
 msgid "Can Seek"
 msgstr "Kan søke"
 
-#: clutter/clutter-media.c:166
+#: ../clutter/clutter-media.c:166
 msgid "Whether the current stream is seekable"
 msgstr ""
 
-#: clutter/clutter-media.c:180
+#: ../clutter/clutter-media.c:180
 msgid "Buffer Fill"
 msgstr ""
 
-#: clutter/clutter-media.c:181
+#: ../clutter/clutter-media.c:181
 msgid "The fill level of the buffer"
 msgstr ""
 
-#: clutter/clutter-media.c:195
+#: ../clutter/clutter-media.c:195
 msgid "The duration of the stream, in seconds"
 msgstr ""
 
-#: clutter/clutter-path-constraint.c:213
+#: ../clutter/clutter-path-constraint.c:213
 msgid "The path used to constrain an actor"
 msgstr ""
 
-#: clutter/clutter-path-constraint.c:227
+#: ../clutter/clutter-path-constraint.c:227
 msgid "The offset along the path, between -1.0 and 2.0"
 msgstr ""
 
-#: clutter/clutter-rectangle.c:268
+#: ../clutter/clutter-rectangle.c:268
 msgid "The color of the rectangle"
-msgstr ""
+msgstr "Farge på rektangelet"
 
-#: clutter/clutter-rectangle.c:281
+#: ../clutter/clutter-rectangle.c:281
 msgid "Border Color"
 msgstr "Kantfarge"
 
-#: clutter/clutter-rectangle.c:282
+#: ../clutter/clutter-rectangle.c:282
 msgid "The color of the border of the rectangle"
-msgstr ""
+msgstr "Farge på kanten av rektangelet"
 
-#: clutter/clutter-rectangle.c:297
+#: ../clutter/clutter-rectangle.c:297
 msgid "Border Width"
 msgstr "Kantbredde"
 
-#: clutter/clutter-rectangle.c:298
+#: ../clutter/clutter-rectangle.c:298
 msgid "The width of the border of the rectangle"
-msgstr ""
+msgstr "Bredde på kanten av rektangelet"
 
-#: clutter/clutter-rectangle.c:312
+#: ../clutter/clutter-rectangle.c:312
 msgid "Has Border"
-msgstr ""
+msgstr "Har kant"
 
-#: clutter/clutter-rectangle.c:313
+#: ../clutter/clutter-rectangle.c:313
 msgid "Whether the rectangle should have a border"
-msgstr ""
+msgstr "Om rektangelet skal ha en kant"
 
-#: clutter/clutter-script.c:434
+#: ../clutter/clutter-script.c:434
 msgid "Filename Set"
 msgstr "Filnavn satt"
 
-#: clutter/clutter-script.c:435
+#: ../clutter/clutter-script.c:435
 msgid "Whether the :filename property is set"
 msgstr ""
 
-#: clutter/clutter-script.c:449 clutter/clutter-texture.c:1081
+#: ../clutter/clutter-script.c:449 ../clutter/clutter-texture.c:1071
 msgid "Filename"
 msgstr "Filnavn"
 
-#: clutter/clutter-script.c:450
+#: ../clutter/clutter-script.c:450
 msgid "The path of the currently parsed file"
 msgstr ""
 
-#: clutter/clutter-settings.c:414
+#: ../clutter/clutter-settings.c:439
 msgid "Double Click Time"
-msgstr ""
+msgstr "Tid for dobbeltklikk"
 
-#: clutter/clutter-settings.c:415
+#: ../clutter/clutter-settings.c:440
 msgid "The time between clicks necessary to detect a multiple click"
 msgstr ""
 
-#: clutter/clutter-settings.c:430
+#: ../clutter/clutter-settings.c:455
 msgid "Double Click Distance"
 msgstr ""
 
-#: clutter/clutter-settings.c:431
+#: ../clutter/clutter-settings.c:456
 msgid "The distance between clicks necessary to detect a multiple click"
 msgstr ""
 
-#: clutter/clutter-settings.c:446
+#: ../clutter/clutter-settings.c:471
 msgid "Drag Threshold"
 msgstr ""
 
-#: clutter/clutter-settings.c:447
+#: ../clutter/clutter-settings.c:472
 msgid "The distance the cursor should travel before starting to drag"
 msgstr ""
 
-#: clutter/clutter-settings.c:462 clutter/clutter-text.c:2939
+#: ../clutter/clutter-settings.c:487 ../clutter/clutter-text.c:2995
 msgid "Font Name"
 msgstr "Skriftnavn"
 
-#: clutter/clutter-settings.c:463
+#: ../clutter/clutter-settings.c:488
 msgid ""
 "The description of the default font, as one that could be parsed by Pango"
 msgstr ""
 
-#: clutter/clutter-settings.c:478
+#: ../clutter/clutter-settings.c:503
 msgid "Font Antialias"
 msgstr ""
 
-#: clutter/clutter-settings.c:479
+#: ../clutter/clutter-settings.c:504
 msgid ""
 "Whether to use antialiasing (1 to enable, 0 to disable, and -1 to use the "
 "default)"
 msgstr ""
 
-#: clutter/clutter-settings.c:495
+#: ../clutter/clutter-settings.c:520
 msgid "Font DPI"
 msgstr ""
 
-#: clutter/clutter-settings.c:496
+#: ../clutter/clutter-settings.c:521
 msgid ""
 "The resolution of the font, in 1024 * dots/inch, or -1 to use the default"
 msgstr ""
 
-#: clutter/clutter-settings.c:512
+#: ../clutter/clutter-settings.c:537
 msgid "Font Hinting"
 msgstr ""
 
-#: clutter/clutter-settings.c:513
+#: ../clutter/clutter-settings.c:538
 msgid ""
 "Whether to use hinting (1 to enable, 0 to disable and -1 to use the default)"
 msgstr ""
 
-#: clutter/clutter-settings.c:534
+#: ../clutter/clutter-settings.c:559
 msgid "Font Hint Style"
 msgstr ""
 
-#: clutter/clutter-settings.c:535
+#: ../clutter/clutter-settings.c:560
 msgid "The style of hinting (hintnone, hintslight, hintmedium, hintfull)"
 msgstr ""
 
-#: clutter/clutter-settings.c:556
+#: ../clutter/clutter-settings.c:581
 msgid "Font Subpixel Order"
 msgstr ""
 
-#: clutter/clutter-settings.c:557
+#: ../clutter/clutter-settings.c:582
 msgid "The type of subpixel antialiasing (none, rgb, bgr, vrgb, vbgr)"
 msgstr ""
 
-#: clutter/clutter-settings.c:574
+#: ../clutter/clutter-settings.c:599
 msgid "The minimum duration for a long press gesture to be recognized"
 msgstr ""
 
-#: clutter/clutter-settings.c:581
+#: ../clutter/clutter-settings.c:606
 msgid "Fontconfig configuration timestamp"
 msgstr ""
 
-#: clutter/clutter-settings.c:582
+#: ../clutter/clutter-settings.c:607
 msgid "Timestamp of the current fontconfig configuration"
 msgstr ""
 
-#: clutter/clutter-shader.c:255
+#: ../clutter/clutter-settings.c:624
+#, fuzzy
+msgid "Password Hint Time"
+msgstr "Passordtegn"
+
+#: ../clutter/clutter-settings.c:625
+msgid "How long to show the last input character in hidden entries"
+msgstr ""
+
+#: ../clutter/deprecated/clutter-shader.c:257
 msgid "Vertex Source"
 msgstr ""
 
-#: clutter/clutter-shader.c:256
+#: ../clutter/deprecated/clutter-shader.c:258
 msgid "Source of vertex shader"
 msgstr ""
 
-#: clutter/clutter-shader.c:272
+#: ../clutter/deprecated/clutter-shader.c:274
 msgid "Fragment Source"
 msgstr ""
 
-#: clutter/clutter-shader.c:273
+#: ../clutter/deprecated/clutter-shader.c:275
 msgid "Source of fragment shader"
 msgstr ""
 
-#: clutter/clutter-shader.c:290
+#: ../clutter/deprecated/clutter-shader.c:292
 msgid "Compiled"
 msgstr "Kompilert"
 
-#: clutter/clutter-shader.c:291
+#: ../clutter/deprecated/clutter-shader.c:293
 msgid "Whether the shader is compiled and linked"
 msgstr ""
 
-#: clutter/clutter-shader.c:308
+#: ../clutter/deprecated/clutter-shader.c:310
 msgid "Whether the shader is enabled"
 msgstr ""
 
-#: clutter/clutter-shader.c:519
+#: ../clutter/deprecated/clutter-shader.c:521
 #, c-format
 msgid "%s compilation failed: %s"
 msgstr ""
 
-#: clutter/clutter-shader.c:520
+#: ../clutter/deprecated/clutter-shader.c:522
 msgid "Vertex shader"
 msgstr ""
 
-#: clutter/clutter-shader.c:521
+#: ../clutter/deprecated/clutter-shader.c:523
 msgid "Fragment shader"
 msgstr ""
 
-#: clutter/clutter-shader-effect.c:415
+#: ../clutter/clutter-shader-effect.c:482
 msgid "Shader Type"
 msgstr ""
 
-#: clutter/clutter-shader-effect.c:416
+#: ../clutter/clutter-shader-effect.c:483
 msgid "The type of shader used"
 msgstr ""
 
-#: clutter/clutter-snap-constraint.c:322
+#: ../clutter/clutter-snap-constraint.c:322
 msgid "The source of the constraint"
 msgstr ""
 
-#: clutter/clutter-snap-constraint.c:335
+#: ../clutter/clutter-snap-constraint.c:335
 msgid "From Edge"
 msgstr "Fra kant"
 
-#: clutter/clutter-snap-constraint.c:336
+#: ../clutter/clutter-snap-constraint.c:336
 msgid "The edge of the actor that should be snapped"
 msgstr ""
 
-#: clutter/clutter-snap-constraint.c:350
+#: ../clutter/clutter-snap-constraint.c:350
 msgid "To Edge"
 msgstr "Til kant"
 
-#: clutter/clutter-snap-constraint.c:351
+#: ../clutter/clutter-snap-constraint.c:351
 msgid "The edge of the source that should be snapped"
 msgstr ""
 
-#: clutter/clutter-snap-constraint.c:367
+#: ../clutter/clutter-snap-constraint.c:367
 msgid "The offset in pixels to apply to the constraint"
 msgstr ""
 
-#: clutter/clutter-stage.c:1707
+#: ../clutter/clutter-stage.c:1732
 msgid "Fullscreen Set"
 msgstr "Fullskjerm satt"
 
-#: clutter/clutter-stage.c:1708
+#: ../clutter/clutter-stage.c:1733
 msgid "Whether the main stage is fullscreen"
 msgstr ""
 
-#: clutter/clutter-stage.c:1724
+#: ../clutter/clutter-stage.c:1749
 msgid "Offscreen"
-msgstr ""
+msgstr "Utenfor skjermen"
 
-#: clutter/clutter-stage.c:1725
+#: ../clutter/clutter-stage.c:1750
 msgid "Whether the main stage should be rendered offscreen"
 msgstr ""
 
-#: clutter/clutter-stage.c:1737 clutter/clutter-text.c:3052
+#: ../clutter/clutter-stage.c:1762 ../clutter/clutter-text.c:3108
 msgid "Cursor Visible"
 msgstr "Markør synlig"
 
-#: clutter/clutter-stage.c:1738
+#: ../clutter/clutter-stage.c:1763
 msgid "Whether the mouse pointer is visible on the main stage"
 msgstr ""
 
-#: clutter/clutter-stage.c:1752
+#: ../clutter/clutter-stage.c:1777
 msgid "User Resizable"
 msgstr ""
 
-#: clutter/clutter-stage.c:1753
+#: ../clutter/clutter-stage.c:1778
 msgid "Whether the stage is able to be resized via user interaction"
 msgstr ""
 
-#: clutter/clutter-stage.c:1766
+#: ../clutter/clutter-stage.c:1791
 msgid "The color of the stage"
 msgstr ""
 
-#: clutter/clutter-stage.c:1780
+#: ../clutter/clutter-stage.c:1805
 msgid "Perspective"
 msgstr "Prespektiv"
 
-#: clutter/clutter-stage.c:1781
+#: ../clutter/clutter-stage.c:1806
 msgid "Perspective projection parameters"
 msgstr ""
 
-#: clutter/clutter-stage.c:1796
+#: ../clutter/clutter-stage.c:1821
 msgid "Title"
 msgstr "Tittel"
 
-#: clutter/clutter-stage.c:1797
+#: ../clutter/clutter-stage.c:1822
 msgid "Stage Title"
 msgstr ""
 
-#: clutter/clutter-stage.c:1812
+#: ../clutter/clutter-stage.c:1837
 msgid "Use Fog"
 msgstr "Bruk tåke"
 
-#: clutter/clutter-stage.c:1813
+#: ../clutter/clutter-stage.c:1838
 msgid "Whether to enable depth cueing"
 msgstr ""
 
-#: clutter/clutter-stage.c:1827
+#: ../clutter/clutter-stage.c:1852
 msgid "Fog"
 msgstr "Tåke"
 
-#: clutter/clutter-stage.c:1828
+#: ../clutter/clutter-stage.c:1853
 msgid "Settings for the depth cueing"
 msgstr ""
 
-#: clutter/clutter-stage.c:1844
+#: ../clutter/clutter-stage.c:1869
 msgid "Use Alpha"
 msgstr ""
 
-#: clutter/clutter-stage.c:1845
+#: ../clutter/clutter-stage.c:1870
 msgid "Whether to honour the alpha component of the stage color"
 msgstr ""
 
-#: clutter/clutter-stage.c:1861
+#: ../clutter/clutter-stage.c:1886
 msgid "Key Focus"
 msgstr ""
 
-#: clutter/clutter-stage.c:1862
+#: ../clutter/clutter-stage.c:1887
 msgid "The currently key focused actor"
 msgstr ""
 
-#: clutter/clutter-stage.c:1878
+#: ../clutter/clutter-stage.c:1903
 msgid "No Clear Hint"
 msgstr ""
 
-#: clutter/clutter-stage.c:1879
+#: ../clutter/clutter-stage.c:1904
 msgid "Whether the stage should clear its contents"
 msgstr ""
 
-#: clutter/clutter-stage.c:1892
+#: ../clutter/clutter-stage.c:1917
 msgid "Accept Focus"
 msgstr ""
 
-#: clutter/clutter-stage.c:1893
+#: ../clutter/clutter-stage.c:1918
 msgid "Whether the stage should accept focus on show"
 msgstr ""
 
-#: clutter/clutter-state.c:1472
+#: ../clutter/clutter-state.c:1472
 msgid "State"
 msgstr "Tilstand"
 
-#: clutter/clutter-state.c:1473
+#: ../clutter/clutter-state.c:1473
 msgid "Currently set state, (transition to this state might not be complete)"
 msgstr ""
 
-#: clutter/clutter-state.c:1487
+#: ../clutter/clutter-state.c:1487
 msgid "Default transition duration"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:585
+#: ../clutter/clutter-table-layout.c:585
 msgid "Column Number"
 msgstr "Kolonnenummer"
 
-#: clutter/clutter-table-layout.c:586
+#: ../clutter/clutter-table-layout.c:586
 msgid "The column the widget resides in"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:593
+#: ../clutter/clutter-table-layout.c:593
 msgid "Row Number"
 msgstr "Radnummer"
 
-#: clutter/clutter-table-layout.c:594
+#: ../clutter/clutter-table-layout.c:594
 msgid "The row the widget resides in"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:601
+#: ../clutter/clutter-table-layout.c:601
 msgid "Column Span"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:602
+#: ../clutter/clutter-table-layout.c:602
 msgid "The number of columns the widget should span"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:609
+#: ../clutter/clutter-table-layout.c:609
 msgid "Row Span"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:610
+#: ../clutter/clutter-table-layout.c:610
 msgid "The number of rows the widget should span"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:617
+#: ../clutter/clutter-table-layout.c:617
 msgid "Horizontal Expand"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:618
+#: ../clutter/clutter-table-layout.c:618
 msgid "Allocate extra space for the child in horizontal axis"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:624
+#: ../clutter/clutter-table-layout.c:624
 msgid "Vertical Expand"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:625
+#: ../clutter/clutter-table-layout.c:625
 msgid "Allocate extra space for the child in vertical axis"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:1714
+#: ../clutter/clutter-table-layout.c:1714
 msgid "Spacing between columns"
 msgstr ""
 
-#: clutter/clutter-table-layout.c:1728
+#: ../clutter/clutter-table-layout.c:1728
 msgid "Spacing between rows"
 msgstr ""
 
-#: clutter/clutter-text.c:2940
+#: ../clutter/clutter-text.c:2996
 msgid "The font to be used by the text"
 msgstr ""
 
-#: clutter/clutter-text.c:2957
+#: ../clutter/clutter-text.c:3013
 msgid "Font Description"
 msgstr "Skriftbeskrivelse"
 
-#: clutter/clutter-text.c:2958
+#: ../clutter/clutter-text.c:3014
 msgid "The font description to be used"
 msgstr ""
 
-#: clutter/clutter-text.c:2974
+#: ../clutter/clutter-text.c:3030
 msgid "Text"
 msgstr "Tekst"
 
-#: clutter/clutter-text.c:2975
+#: ../clutter/clutter-text.c:3031
 msgid "The text to render"
 msgstr "Tekst som skal vises"
 
-#: clutter/clutter-text.c:2989
+#: ../clutter/clutter-text.c:3045
 msgid "Font Color"
 msgstr "Skriftfarge"
 
-#: clutter/clutter-text.c:2990
+#: ../clutter/clutter-text.c:3046
 msgid "Color of the font used by the text"
 msgstr ""
 
-#: clutter/clutter-text.c:3004
+#: ../clutter/clutter-text.c:3060
 msgid "Editable"
 msgstr "Redigerbar"
 
-#: clutter/clutter-text.c:3005
+#: ../clutter/clutter-text.c:3061
 msgid "Whether the text is editable"
 msgstr ""
 
-#: clutter/clutter-text.c:3020
+#: ../clutter/clutter-text.c:3076
 msgid "Selectable"
 msgstr "Markerbar"
 
-#: clutter/clutter-text.c:3021
+#: ../clutter/clutter-text.c:3077
 msgid "Whether the text is selectable"
 msgstr "Om teksten kan markeres"
 
-#: clutter/clutter-text.c:3035
+#: ../clutter/clutter-text.c:3091
 msgid "Activatable"
 msgstr "Kan aktiveres"
 
-#: clutter/clutter-text.c:3036
+#: ../clutter/clutter-text.c:3092
 msgid "Whether pressing return causes the activate signal to be emitted"
 msgstr ""
 
-#: clutter/clutter-text.c:3053
+#: ../clutter/clutter-text.c:3109
 msgid "Whether the input cursor is visible"
 msgstr ""
 
-#: clutter/clutter-text.c:3067 clutter/clutter-text.c:3068
+#: ../clutter/clutter-text.c:3123 ../clutter/clutter-text.c:3124
 msgid "Cursor Color"
 msgstr "Markørfarge"
 
-#: clutter/clutter-text.c:3082
+#: ../clutter/clutter-text.c:3138
 msgid "Cursor Color Set"
 msgstr "Markørfarge satt"
 
-#: clutter/clutter-text.c:3083
+#: ../clutter/clutter-text.c:3139
 msgid "Whether the cursor color has been set"
 msgstr ""
 
-#: clutter/clutter-text.c:3098
+#: ../clutter/clutter-text.c:3154
 msgid "Cursor Size"
 msgstr "Markørstørrelse"
 
-#: clutter/clutter-text.c:3099
+#: ../clutter/clutter-text.c:3155
 msgid "The width of the cursor, in pixels"
 msgstr ""
 
-#: clutter/clutter-text.c:3113
+#: ../clutter/clutter-text.c:3169
 msgid "Cursor Position"
 msgstr "Markørposisjon"
 
-#: clutter/clutter-text.c:3114
+#: ../clutter/clutter-text.c:3170
 msgid "The cursor position"
 msgstr "Posisjon for markøren"
 
-#: clutter/clutter-text.c:3129
+#: ../clutter/clutter-text.c:3185
 msgid "Selection-bound"
 msgstr ""
 
-#: clutter/clutter-text.c:3130
+#: ../clutter/clutter-text.c:3186
 msgid "The cursor position of the other end of the selection"
 msgstr ""
 
-#: clutter/clutter-text.c:3145 clutter/clutter-text.c:3146
+#: ../clutter/clutter-text.c:3201 ../clutter/clutter-text.c:3202
 msgid "Selection Color"
 msgstr "Utvalgsfarge"
 
-#: clutter/clutter-text.c:3160
+#: ../clutter/clutter-text.c:3216
 msgid "Selection Color Set"
 msgstr ""
 
-#: clutter/clutter-text.c:3161
+#: ../clutter/clutter-text.c:3217
 msgid "Whether the selection color has been set"
 msgstr ""
 
-#: clutter/clutter-text.c:3176
+#: ../clutter/clutter-text.c:3232
 msgid "Attributes"
 msgstr "Attributter"
 
-#: clutter/clutter-text.c:3177
+#: ../clutter/clutter-text.c:3233
 msgid "A list of style attributes to apply to the contents of the actor"
 msgstr ""
 
-#: clutter/clutter-text.c:3199
+#: ../clutter/clutter-text.c:3255
 msgid "Use markup"
 msgstr ""
 
-#: clutter/clutter-text.c:3200
+#: ../clutter/clutter-text.c:3256
 msgid "Whether or not the text includes Pango markup"
 msgstr ""
 
-#: clutter/clutter-text.c:3216
+#: ../clutter/clutter-text.c:3272
 msgid "Line wrap"
 msgstr "Linjebryting"
 
-#: clutter/clutter-text.c:3217
+#: ../clutter/clutter-text.c:3273
 msgid "If set, wrap the lines if the text becomes too wide"
 msgstr ""
 
-#: clutter/clutter-text.c:3232
+#: ../clutter/clutter-text.c:3288
 msgid "Line wrap mode"
 msgstr ""
 
-#: clutter/clutter-text.c:3233
+#: ../clutter/clutter-text.c:3289
 msgid "Control how line-wrapping is done"
 msgstr ""
 
-#: clutter/clutter-text.c:3248
+#: ../clutter/clutter-text.c:3304
 msgid "Ellipsize"
 msgstr ""
 
-#: clutter/clutter-text.c:3249
+#: ../clutter/clutter-text.c:3305
 msgid "The preferred place to ellipsize the string"
 msgstr ""
 
-#: clutter/clutter-text.c:3265
+#: ../clutter/clutter-text.c:3321
 msgid "Line Alignment"
 msgstr ""
 
-#: clutter/clutter-text.c:3266
+#: ../clutter/clutter-text.c:3322
 msgid "The preferred alignment for the string, for multi-line text"
 msgstr ""
 
-#: clutter/clutter-text.c:3282
+#: ../clutter/clutter-text.c:3338
 msgid "Justify"
 msgstr ""
 
-#: clutter/clutter-text.c:3283
+#: ../clutter/clutter-text.c:3339
 msgid "Whether the text should be justified"
 msgstr ""
 
-#: clutter/clutter-text.c:3298
+#: ../clutter/clutter-text.c:3354
 msgid "Password Character"
 msgstr "Passordtegn"
 
-#: clutter/clutter-text.c:3299
+#: ../clutter/clutter-text.c:3355
 msgid "If non-zero, use this character to display the actor's contents"
 msgstr ""
 
-#: clutter/clutter-text.c:3313
+#: ../clutter/clutter-text.c:3369
 msgid "Max Length"
 msgstr "Maks lengde"
 
-#: clutter/clutter-text.c:3314
+#: ../clutter/clutter-text.c:3370
 msgid "Maximum length of the text inside the actor"
 msgstr ""
 
-#: clutter/clutter-text.c:3337
+#: ../clutter/clutter-text.c:3393
 msgid "Single Line Mode"
 msgstr ""
 
-#: clutter/clutter-text.c:3338
+#: ../clutter/clutter-text.c:3394
 msgid "Whether the text should be a single line"
 msgstr ""
 
-#: clutter/clutter-text.c:3352 clutter/clutter-text.c:3353
+#: ../clutter/clutter-text.c:3408 ../clutter/clutter-text.c:3409
 msgid "Selected Text Color"
 msgstr ""
 
-#: clutter/clutter-text.c:3367
+#: ../clutter/clutter-text.c:3423
 msgid "Selected Text Color Set"
 msgstr ""
 
-#: clutter/clutter-text.c:3368
+#: ../clutter/clutter-text.c:3424
 msgid "Whether the selected text color has been set"
 msgstr ""
 
-#: clutter/clutter-texture.c:995
+#: ../clutter/clutter-texture.c:985
 msgid "Sync size of actor"
 msgstr ""
 
-#: clutter/clutter-texture.c:996
+#: ../clutter/clutter-texture.c:986
 msgid "Auto sync size of actor to underlying pixbuf dimensions"
 msgstr ""
 
-#: clutter/clutter-texture.c:1003
+#: ../clutter/clutter-texture.c:993
 msgid "Disable Slicing"
 msgstr ""
 
-#: clutter/clutter-texture.c:1004
+#: ../clutter/clutter-texture.c:994
 msgid ""
 "Forces the underlying texture to be singular and not made of smaller space "
 "saving individual textures"
 msgstr ""
 
-#: clutter/clutter-texture.c:1013
+#: ../clutter/clutter-texture.c:1003
 msgid "Tile Waste"
 msgstr ""
 
-#: clutter/clutter-texture.c:1014
+#: ../clutter/clutter-texture.c:1004
 msgid "Maximum waste area of a sliced texture"
 msgstr ""
 
-#: clutter/clutter-texture.c:1022
+#: ../clutter/clutter-texture.c:1012
 msgid "Horizontal repeat"
 msgstr ""
 
-#: clutter/clutter-texture.c:1023
+#: ../clutter/clutter-texture.c:1013
 msgid "Repeat the contents rather than scaling them horizontally"
 msgstr ""
 
-#: clutter/clutter-texture.c:1030
+#: ../clutter/clutter-texture.c:1020
 msgid "Vertical repeat"
 msgstr ""
 
-#: clutter/clutter-texture.c:1031
+#: ../clutter/clutter-texture.c:1021
 msgid "Repeat the contents rather than scaling them vertically"
 msgstr ""
 
-#: clutter/clutter-texture.c:1038
+#: ../clutter/clutter-texture.c:1028
 msgid "Filter Quality"
 msgstr ""
 
-#: clutter/clutter-texture.c:1039
+#: ../clutter/clutter-texture.c:1029
 msgid "Rendering quality used when drawing the texture"
 msgstr ""
 
-#: clutter/clutter-texture.c:1047
+#: ../clutter/clutter-texture.c:1037
 msgid "Pixel Format"
 msgstr ""
 
-#: clutter/clutter-texture.c:1048
+#: ../clutter/clutter-texture.c:1038
 msgid "The Cogl pixel format to use"
 msgstr ""
 
-#: clutter/clutter-texture.c:1056
+#: ../clutter/clutter-texture.c:1046
 msgid "Cogl Texture"
 msgstr ""
 
-#: clutter/clutter-texture.c:1057
+#: ../clutter/clutter-texture.c:1047
 msgid "The underlying Cogl texture handle used to draw this actor"
 msgstr ""
 
-#: clutter/clutter-texture.c:1064
+#: ../clutter/clutter-texture.c:1054
 msgid "Cogl Material"
 msgstr ""
 
-#: clutter/clutter-texture.c:1065
+#: ../clutter/clutter-texture.c:1055
 msgid "The underlying Cogl material handle used to draw this actor"
 msgstr ""
 
-#: clutter/clutter-texture.c:1082
+#: ../clutter/clutter-texture.c:1072
 msgid "The path of the file containing the image data"
 msgstr ""
 
-#: clutter/clutter-texture.c:1089
+#: ../clutter/clutter-texture.c:1079
 msgid "Keep Aspect Ratio"
 msgstr ""
 
-#: clutter/clutter-texture.c:1090
+#: ../clutter/clutter-texture.c:1080
 msgid ""
 "Keep the aspect ratio of the texture when requesting the preferred width or "
 "height"
 msgstr ""
 
-#: clutter/clutter-texture.c:1116
+#: ../clutter/clutter-texture.c:1106
 msgid "Load asynchronously"
 msgstr ""
 
-#: clutter/clutter-texture.c:1117
+#: ../clutter/clutter-texture.c:1107
 msgid ""
 "Load files inside a thread to avoid blocking when loading images from disk"
 msgstr ""
 
-#: clutter/clutter-texture.c:1133
+#: ../clutter/clutter-texture.c:1123
 msgid "Load data asynchronously"
 msgstr ""
 
-#: clutter/clutter-texture.c:1134
+#: ../clutter/clutter-texture.c:1124
 msgid ""
 "Decode image data files inside a thread to reduce blocking when loading "
 "images from disk"
 msgstr ""
 
-#: clutter/clutter-texture.c:1158
+#: ../clutter/clutter-texture.c:1148
 msgid "Pick With Alpha"
 msgstr ""
 
-#: clutter/clutter-texture.c:1159
+#: ../clutter/clutter-texture.c:1149
 msgid "Shape actor with alpha channel when picking"
 msgstr ""
 
-#: clutter/clutter-texture.c:1557 clutter/clutter-texture.c:1967
-#: clutter/clutter-texture.c:2062 clutter/clutter-texture.c:2343
+#: ../clutter/clutter-texture.c:1547 ../clutter/clutter-texture.c:1930
+#: ../clutter/clutter-texture.c:2024 ../clutter/clutter-texture.c:2305
+#, c-format
 msgid "Failed to load the image data"
 msgstr ""
 
-#: clutter/clutter-texture.c:1703
+#: ../clutter/clutter-texture.c:1693
+#, c-format
 msgid "YUV textures are not supported"
 msgstr ""
 
-#: clutter/clutter-texture.c:1712
+#: ../clutter/clutter-texture.c:1702
+#, c-format
 msgid "YUV2 textues are not supported"
 msgstr ""
 
-#: clutter/clutter-timeline.c:264
+#: ../clutter/clutter-timeline.c:264
 msgid "Should the timeline automatically restart"
 msgstr ""
 
-#: clutter/clutter-timeline.c:278
+#: ../clutter/clutter-timeline.c:278
 msgid "Delay"
 msgstr "Pause"
 
-#: clutter/clutter-timeline.c:279
+#: ../clutter/clutter-timeline.c:279
 msgid "Delay before start"
 msgstr "Pause før start"
 
-#: clutter/clutter-timeline.c:295
+#: ../clutter/clutter-timeline.c:295
 msgid "Duration of the timeline in milliseconds"
 msgstr "Varighet for tidslinjen i millisekunder"
 
-#: clutter/clutter-timeline.c:311
+#: ../clutter/clutter-timeline.c:311
 msgid "Direction of the timeline"
 msgstr "Retning for tidslinjen"
 
-#: clutter/clutter-timeline.c:326
+#: ../clutter/clutter-timeline.c:326
 msgid "Auto Reverse"
 msgstr ""
 
-#: clutter/clutter-timeline.c:327
+#: ../clutter/clutter-timeline.c:327
 msgid "Whether the direction should be reversed when reaching the end"
 msgstr ""
 
-#: clutter/evdev/clutter-input-device-evdev.c:147
+#: ../clutter/evdev/clutter-input-device-evdev.c:147
 msgid "sysfs Path"
 msgstr ""
 
-#: clutter/evdev/clutter-input-device-evdev.c:148
+#: ../clutter/evdev/clutter-input-device-evdev.c:148
 msgid "Path of the device in sysfs"
 msgstr ""
 
-#: clutter/evdev/clutter-input-device-evdev.c:163
+#: ../clutter/evdev/clutter-input-device-evdev.c:163
 msgid "Device Path"
 msgstr ""
 
-#: clutter/evdev/clutter-input-device-evdev.c:164
+#: ../clutter/evdev/clutter-input-device-evdev.c:164
 msgid "Path of the device node"
 msgstr ""
 
-#: clutter/x11/clutter-backend-x11.c:483
+#: ../clutter/x11/clutter-backend-x11.c:483
 msgid "X display to use"
 msgstr ""
 
-#: clutter/x11/clutter-backend-x11.c:489
+#: ../clutter/x11/clutter-backend-x11.c:489
 msgid "X screen to use"
 msgstr ""
 
-#: clutter/x11/clutter-backend-x11.c:494
+#: ../clutter/x11/clutter-backend-x11.c:494
 msgid "Make X calls synchronous"
 msgstr ""
 
-#: clutter/x11/clutter-backend-x11.c:501
+#: ../clutter/x11/clutter-backend-x11.c:501
 msgid "Enable XInput support"
 msgstr ""
 
-#: clutter/x11/clutter-keymap-x11.c:317
+#: ../clutter/x11/clutter-keymap-x11.c:317
 msgid "The Clutter backend"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:545
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:545
 msgid "Pixmap"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:546
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:546
 msgid "The X11 Pixmap to be bound"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:554
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:554
 msgid "Pixmap width"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:555
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:555
 msgid "The width of the pixmap bound to this texture"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:563
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:563
 msgid "Pixmap height"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:564
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:564
 msgid "The height of the pixmap bound to this texture"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:572
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:572
 msgid "Pixmap Depth"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:573
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:573
 msgid "The depth (in number of bits) of the pixmap bound to this texture"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:581
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:581
 msgid "Automatic Updates"
 msgstr "Automatiske oppdateringer"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:582
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:582
 msgid "If the texture should be kept in sync with any pixmap changes."
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:590
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:590
 msgid "Window"
 msgstr "Vindu"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:591
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:591
 msgid "The X11 Window to be bound"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:599
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:599
 msgid "Window Redirect Automatic"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:600
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:600
 msgid "If composite window redirects are set to Automatic (or Manual if false)"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:610
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:610
 msgid "Window Mapped"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:611
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:611
 msgid "If window is mapped"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:620
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:620
 msgid "Destroyed"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:621
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:621
 msgid "If window has been destroyed"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:629
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:629
 msgid "Window X"
 msgstr "Vindu X"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:630
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:630
 msgid "X position of window on screen according to X11"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:638
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:638
 msgid "Window Y"
 msgstr "Vindu Y"
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:639
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:639
 msgid "Y position of window on screen according to X11"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:646
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:646
 msgid "Window Override Redirect"
 msgstr ""
 
-#: clutter/x11/clutter-x11-texture-pixmap.c:647
+#: ../clutter/x11/clutter-x11-texture-pixmap.c:647
 msgid "If this is an override-redirect window"
 msgstr ""
diff --git a/tests/conform/test-pick.c b/tests/conform/test-pick.c
index c10a6b080..b3cbd7400 100644
--- a/tests/conform/test-pick.c
+++ b/tests/conform/test-pick.c
@@ -55,8 +55,8 @@ shader_paint (ClutterEffect           *effect,
     "uniform float step;\n"
     "void main (void)\n"
     "{\n"
-    "  gl_FragColor = texture2D(tex, vec2 (gl_TexCoord[0].s + step,\n"
-    "                                      gl_TexCoord[0].t));\n"
+    "  cogl_color_out = texture2D(tex, vec2 (cogl_tex_coord_in[0].s + step,\n"
+    "                                        cogl_tex_coord_in[0].t));\n"
     "}\n");
 
   tex_width = clutter_actor_get_width (actor);
diff --git a/tests/interactive/test-shader.c b/tests/interactive/test-shader.c
index 44ab581ff..14eb69ff8 100644
--- a/tests/interactive/test-shader.c
+++ b/tests/interactive/test-shader.c
@@ -36,8 +36,7 @@ typedef struct
  * correctly).
  */
 #define FRAGMENT_SHADER_END                    \
-      "  gl_FragColor = color;"    \
-      "  gl_FragColor = gl_FragColor * cogl_color_in;" \
+      "  cogl_color_out = color * cogl_color_in;" \
       "}"
 
 static ShaderSource shaders[]=