elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-11-28 04:05:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

update to trunk rev390

Browse Source
This commit is contained in:
Tom Beckmann 2014-06-29 15:59:45 +02:00
commit e82a819d0e
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
po/POTFILES.in
View File

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

1
po/POTFILES.skip
View File

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

14
po/gala.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -51,3 +51,15 @@ msgstr ""
#: ../src/EndSessionDialog.vala:125 #: ../src/EndSessionDialog.vala:125
msgid "Cancel" msgid "Cancel"
msgstr "" 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 ""

8
vapi/libmutter.vapi
View File

@ -896,6 +896,11 @@ namespace Meta {
[NoAccessorMethod] [NoAccessorMethod]
public bool minimized { get; } public bool minimized { get; }
public string mutter_hints { 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] [NoAccessorMethod]
public bool resizeable { get; } public bool resizeable { get; }
#if HAS_MUTTER312 #if HAS_MUTTER312
@ -942,6 +947,9 @@ namespace Meta {
public bool no_shadow { get; set; } public bool no_shadow { get; set; }
[NoAccessorMethod] [NoAccessorMethod]
public string shadow_class { owned get; set; } public string shadow_class { owned get; set; }
#if HAS_MUTTER314
public signal void first_frame ();
#endif
#if !HAS_MUTTER312 #if !HAS_MUTTER312
public signal void position_changed (); public signal void position_changed ();
public signal void size_changed (); public signal void size_changed ();