update to trunk rev390

po/POTFILES.in

@@ -1 +1,2 @@
 src/EndSessionDialog.vala
+src/WindowManager.vala

po/POTFILES.skip

@@ -1 +1,2 @@
 src/EndSessionDialog.c
+src/WindowManager.c

po/gala.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-03 20:20+0200\n"
+"POT-Creation-Date: 2014-06-26 14:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,3 +51,15 @@ msgstr ""
 #: ../src/EndSessionDialog.vala:125
 msgid "Cancel"
 msgstr ""
+
+#: ../src/WindowManager.vala:1107
+msgid "Does the display look OK?"
+msgstr ""
+
+#: ../src/WindowManager.vala:1110
+msgid "Keep This Configuration"
+msgstr ""
+
+#: ../src/WindowManager.vala:1111
+msgid "Restore Previous Configuration"
+msgstr ""

vapi/libmutter.vapi

@@ -896,6 +896,11 @@ namespace Meta {
 		[NoAccessorMethod]
 		public bool minimized { get; }
 		public string mutter_hints { get; }
+#if HAS_MUTTER312
+// backported from mutter 3.14 to 3.12.2-1ubuntu99~elementary0.3.3
+		[NoAccessorMethod]
+		public bool on_all_workspaces { get; }
+#endif
 		[NoAccessorMethod]
 		public bool resizeable { get; }
 #if HAS_MUTTER312
@@ -942,6 +947,9 @@ namespace Meta {
 		public bool no_shadow { get; set; }
 		[NoAccessorMethod]
 		public string shadow_class { owned get; set; }
+#if HAS_MUTTER314
+		public signal void first_frame ();
+#endif
 #if !HAS_MUTTER312
 		public signal void position_changed ();
 		public signal void size_changed ();