Bump version to 3.4.0

Update NEWS

NEWS

@@ -1,3 +1,16 @@
+3.4.0
+=====
+* Fix crash when a full-screen window is opened [Jasper; #672797]
+* Fix memory leaks [Pavel; #672640]
+
+Contributors:
+ Jasper St. Pierre, Pavel Vasin
+
+Translations:
+ Marek Černocký, Petr Kovar [cz], Bruno Brouard [fr], Sweta Kothari [gu],
+ Yaron Shahrabani [he], Changwoo Ryu [kr], Enrico Nicoletto [pt_BR],
+ Yuri Myasoedov [ru], Muhammet Kara [tr], Nguyễn Thái Ngọc Duy [vi]
+
 3.3.92
 ======
 * Automaximize large windows on map [Adel; #671677]

configure.in

@@ -1,8 +1,8 @@
 AC_PREREQ(2.50)
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [3])
-m4_define([mutter_micro_version], [92])
+m4_define([mutter_minor_version], [4])
+m4_define([mutter_micro_version], [0])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])

po/he.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-30 10:48+0200\n"
-"PO-Revision-Date: 2011-12-30 10:49+0200\n"
+"POT-Creation-Date: 2012-03-24 19:08+0200\n"
+"PO-Revision-Date: 2012-03-24 19:08+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@@ -68,12 +68,12 @@ msgstr "ה_מתנה"
 msgid "_Force Quit"
 msgstr "_אילוץ סגירה"
 
-#: ../src/core/display.c:361
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Missing %s extension required for compositing"
 
-#: ../src/core/display.c:427
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"
@@ -138,26 +138,26 @@ msgstr "Print version"
 msgid "Comma-separated list of compositor plugins"
 msgstr "Comma-separated list of compositor plugins"
 
-#: ../src/core/prefs.c:1069
+#: ../src/core/prefs.c:1077
 msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 msgstr "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 
-#: ../src/core/prefs.c:1144
+#: ../src/core/prefs.c:1152
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Could not parse font description \"%s\" from GSettings key %s\n"
 
-#: ../src/core/prefs.c:1210
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 msgstr "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 
-#: ../src/core/prefs.c:1722
+#: ../src/core/prefs.c:1739
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 msgstr "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 
-#: ../src/core/prefs.c:1819
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "סביבת עבודה %d"
@@ -279,7 +279,7 @@ msgid "Window manager error: "
 msgstr "Window manager error: "
 
 #. first time through
-#: ../src/core/window.c:7180
+#: ../src/core/window.c:7266
 #, c-format
 msgid "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
 msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
@@ -291,7 +291,7 @@ msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADE
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7843
+#: ../src/core/window.c:7931
 #, c-format
 msgid "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
@@ -367,46 +367,54 @@ msgid "Determines whether workspace switching should happen for windows on all m
 msgstr "Determines whether workspace switching should happen for windows on all monitors or only for windows on the primary monitor."
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:6
+msgid "Determines whether workspaces are managed dynamically or whether there's a static number of workspaces (determined by the num-workspaces key in org.gnome.desktop.wm.preferences)."
+msgstr "Determines whether workspaces are managed dynamically or whether there's a static number of workspaces (determined by the num-workspaces key in org.gnome.desktop.wm.preferences)."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Draggable border width"
 msgstr "Draggable border width"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:7
+#: ../src/org.gnome.mutter.gschema.xml.in.h:8
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Enable edge tiling when dropping windows on screen edges"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:8
+#: ../src/org.gnome.mutter.gschema.xml.in.h:9
 msgid "If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely."
 msgstr "If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:9
+#: ../src/org.gnome.mutter.gschema.xml.in.h:10
 msgid "Live Hidden Windows"
 msgstr "Live Hidden Windows"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:10
+#: ../src/org.gnome.mutter.gschema.xml.in.h:11
 msgid "Modifier to use for extended window management operations"
 msgstr "Modifier to use for extended window management operations"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:11
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
 msgid "No tab popup"
 msgstr "No tab popup"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Select window from tab popup"
 msgstr "Select window from tab popup"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
 msgid "The amount of total draggable borders. If the theme's visible borders are not enough, invisible borders will be added to meet this value."
 msgstr "The amount of total draggable borders. If the theme's visible borders are not enough, invisible borders will be added to meet this value."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "This key will initiate the \"overlay\", which is a combination window overview and application launching system. The default is intended to be the \"Windows key\" on PC hardware. It's expected that this binding either the default or set to the empty string."
 msgstr "This key will initiate the \"overlay\", which is a combination window overview and application launching system. The default is intended to be the \"Windows key\" on PC hardware. It's expected that this binding either the default or set to the empty string."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
 msgid "When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window."
 msgstr "When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Workspaces are managed dynamically"
+msgstr "Workspaces are managed dynamically"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Workspaces only on primary"
 msgstr "Workspaces only on primary"
 
@@ -415,50 +423,6 @@ msgstr "Workspaces only on primary"
 msgid "Usage: %s\n"
 msgstr "שימוש: %s\n"
 
-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "סגור חלון"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "תפריט חלון"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "מזער חלון"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "הגדל חלון"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "שחזר חלון"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "גלול חלון מעלה"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "בטל גלילה"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "שמור על החלון גלוי"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "בטל שמירת החלון גלוי"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "הראה בכל סביבות העבודה"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "הראה את החלון על סביבת עבודה אחת בלבד"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -1468,6 +1432,39 @@ msgstr "y value was %d, %d was expected"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 
+#~ msgid "Close Window"
+#~ msgstr "סגור חלון"
+
+#~ msgid "Window Menu"
+#~ msgstr "תפריט חלון"
+
+#~ msgid "Minimize Window"
+#~ msgstr "מזער חלון"
+
+#~ msgid "Maximize Window"
+#~ msgstr "הגדל חלון"
+
+#~ msgid "Restore Window"
+#~ msgstr "שחזר חלון"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "גלול חלון מעלה"
+
+#~ msgid "Unroll Window"
+#~ msgstr "בטל גלילה"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "שמור על החלון גלוי"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "בטל שמירת החלון גלוי"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "הראה בכל סביבות העבודה"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "הראה את החלון על סביבת עבודה אחת בלבד"
+
 #~ msgid "Switch to workspace 1"
 #~ msgstr "מעבר למרחב עבודה 1"
 

po/ko.po

@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-13 13:41+0000\n"
-"PO-Revision-Date: 2012-03-10 23:40+0900\n"
+"POT-Creation-Date: 2012-03-15 21:29+0000\n"
+"PO-Revision-Date: 2012-03-27 01:25+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -29,17 +29,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../src/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "창"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "왼쪽 절반 뷰"
 
-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "오른쪽 절반 뷰"
 
-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Windows"
-msgstr "창"
-
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
 #: ../src/compositor/compositor.c:492
@@ -83,12 +83,12 @@ msgstr "기다리기(_W)"
 msgid "_Force Quit"
 msgstr "강제로 끝내기(_F)"
 
-#: ../src/core/display.c:365
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "콤포짓에 필요한 %s 확장 기능이 없습니다"
 
-#: ../src/core/display.c:431
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X 윈도 시스템 디스플레이 '%s'을(를) 여는데 실패하였습니다\n"
@@ -139,7 +139,7 @@ msgstr ""
 "테마를 찾을 수 없습니다! %s이(가) 있고 올바른 테마가 들어 있는지 확인하십시"
 "오.\n"
 
-#: ../src/core/mutter.c:42
+#: ../src/core/mutter.c:40
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -154,15 +154,15 @@ msgstr ""
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 
-#: ../src/core/mutter.c:56
+#: ../src/core/mutter.c:54
 msgid "Print version"
 msgstr "버전을 출력합니다"
 
-#: ../src/core/mutter.c:62
+#: ../src/core/mutter.c:60
 msgid "Comma-separated list of compositor plugins"
 msgstr "컴포짓 플러그인의 목록, 쉼표로 구분"
 
-#: ../src/core/prefs.c:1067
+#: ../src/core/prefs.c:1077
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -170,12 +170,12 @@ msgstr ""
 "응용 프로그램에 대한 임시 방편을 막았습니다. 몇몇 응용프로그램들이 제대로 동"
 "작하지 않을것입니다.\n"
 
-#: ../src/core/prefs.c:1142
+#: ../src/core/prefs.c:1152
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "GSettings 키 %2$s에서 글꼴 지정 \"%1$s\"을(를) 분석할 수 없습니다\n"
 
-#: ../src/core/prefs.c:1208
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -184,7 +184,7 @@ msgstr ""
 "설정 데이터베이스에서 찾은 \"%s\"이(가) 마우스 단추 변경 키의 올바른 값이 아"
 "닙니다\n"
 
-#: ../src/core/prefs.c:1720
+#: ../src/core/prefs.c:1739
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -193,17 +193,17 @@ msgstr ""
 "설정 데이터베이스에서 찾은 \"%s\"이(가) 단축키 \"%s\"에 대한 올바른 값이 아닙"
 "니다\n"
 
-#: ../src/core/prefs.c:1817
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "작업 공간 %d"
 
-#: ../src/core/screen.c:741
+#: ../src/core/screen.c:730
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "디스플레이 '%2$s'의 화면 %1$d은(는) 잘못되었습니다\n"
 
-#: ../src/core/screen.c:757
+#: ../src/core/screen.c:746
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -212,19 +212,19 @@ msgstr ""
 "디스플레이 \"%2$s\"의 화면 %1$d에 이미 창 관리자가 실행되고 있습니다. 현재 "
 "창 관리자를 무시하는 --replace 옵션을 써보십시오.\n"
 
-#: ../src/core/screen.c:784
+#: ../src/core/screen.c:773
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "디스플레이 \"%2$s\"의 화면 %1$d에 창 관리 선택을 가질 수 없습니다\n"
 
-#: ../src/core/screen.c:839
+#: ../src/core/screen.c:828
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "디스플레이 \"%2$s\"의 화면 %1$d은(는) 이미 창 관리자가 실행되고 있습니다\n"
 
-#: ../src/core/screen.c:1024
+#: ../src/core/screen.c:1013
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "디스플레이 \"%2$s\"의 화면 %1$d을(를) 떼어 놓을수 없습니다\n"
@@ -321,7 +321,7 @@ msgid "Window manager error: "
 msgstr "장 관리자 오류: "
 
 #. first time through
-#: ../src/core/window.c:7145
+#: ../src/core/window.c:7269
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -337,7 +337,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7808
+#: ../src/core/window.c:7932
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -400,75 +400,10 @@ msgid "Mutter"
 msgstr "머터"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
-msgid "Attach modal dialogs"
-msgstr "모달 대화 상자 부착"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "탭 팝업 취소"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
-msgid ""
-"Determines whether hidden windows (i.e., minimized windows and windows on "
-"other workspaces than the current one) should be kept alive."
-msgstr ""
-"숨긴 창을 (예를 들어 최소화한 창과 현재가 아닌 다른 작업 공간의 창) 실행 상태"
-"로 두어야 할지 지정합니다."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:4
-msgid ""
-"Determines whether the use of popup and highlight frame should be disabled "
-"for window cycling."
-msgstr "팝업 및 강조 프레임을 창 전환 목록에 사용하지 않게 만들지 여부를 결정합니다."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid ""
-"Determines whether workspace switching should happen for windows on all "
-"monitors or only for windows on the primary monitor."
-msgstr ""
-"작업 공간을 전환할 때 모든 모니터의 창에 대해 할지 주 모니터의 창에서만 할지 "
-"결정합니다."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid "Draggable border width"
-msgstr "마우스로 끌 수 있는 가장자리의 너비"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:7
-msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "창을 화면 가장자리에 끌어 놓을 때 가장자리에 맞춰 격자로 만들기"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:8
-msgid ""
-"If enabled, dropping windows on vertical screen edges maximizes them "
-"vertically and resizes them horizontally to cover half of the available "
-"area. Dropping windows on the top screen edge maximizes them completely."
-msgstr "참이면, 세로 방향 화면 가장자리에 창을 놓았을 때 세로 방향으로 최대화하고 가로 방향으로 화면을 절반을 차지하도록 크기를 바꿉니다. 화면 위 가장자리에 창을 놓으면 전체 화면으로 만듭니다."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid "Live Hidden Windows"
-msgstr "실행 중인 숨긴 창"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:10
 msgid "Modifier to use for extended window management operations"
 msgstr "창 관리 작업을 할 때 사용할 변경 키"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:11
-msgid "No tab popup"
-msgstr "탭 팝업 없음"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
-msgid "Select window from tab popup"
-msgstr "탭 팝업에서 창 선택"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
-msgid ""
-"The amount of total draggable borders. If the theme's visible borders are "
-"not enough, invisible borders will be added to meet this value."
-msgstr ""
-"마우스로 끌 수 있는 가장자리의 너비. 테마의 가장자리가 이보다 작은 경우, 투명"
-"한 가장자리가 부족한 양만큼 추가됩니다."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
 "This key will initiate the \"overlay\", which is a combination window "
 "overview and application launching system. The default is intended to be the "
@@ -480,7 +415,11 @@ msgstr ""
 "기본값은 \"윈도우 키\"입니다. 보통 이 키 바인딩은 기본값이거나 빈 문자열입니"
 "다."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
+msgid "Attach modal dialogs"
+msgstr "모달 대화 상자 부착"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -489,59 +428,91 @@ msgstr ""
 "참이면 모달 대화 상자에서 별도의 제목 표시줄을 표시하지 않고 상위 창의 제목 "
 "표시줄에 붙어서 상위 창과 함께 움직입니다."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Live Hidden Windows"
+msgstr "실행 중인 숨긴 창"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:6
+msgid ""
+"Determines whether hidden windows (i.e., minimized windows and windows on "
+"other workspaces than the current one) should be kept alive."
+msgstr ""
+"숨긴 창을 (예를 들어 최소화한 창과 현재가 아닌 다른 작업 공간의 창) 실행 상태"
+"로 두어야 할지 지정합니다."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:7
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "창을 화면 가장자리에 끌어 놓을 때 가장자리에 맞춰 격자로 만들기"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:8
+msgid ""
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
+msgstr ""
+"참이면, 세로 방향 화면 가장자리에 창을 놓았을 때 세로 방향으로 최대화하고 가"
+"로 방향으로 화면을 절반을 차지하도록 크기를 바꿉니다. 화면 위 가장자리에 창"
+"을 놓으면 전체 화면으로 만듭니다."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:9
+msgid "Workspaces are managed dynamically"
+msgstr "작업 공간을 동적으로 관리"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:10
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr "작업 공간을 동적으로 관리할지 아니면 작업 공간이 고정된 개수인지 지정합니다. (고정된 개수는 org.gnome.desktop.wm.preferences의 num-workspaces 키로 지정합니다.)"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:11
 msgid "Workspaces only on primary"
 msgstr "주 모니터에서만 작업 공간"
 
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+"작업 공간을 전환할 때 모든 모니터의 창에 대해 할지 주 모니터의 창에서만 할지 "
+"결정합니다."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
+msgid "No tab popup"
+msgstr "탭 팝업 없음"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+"팝업 및 강조 프레임을 창 전환 목록에 사용하지 않게 만들지 여부를 결정합니다."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Draggable border width"
+msgstr "마우스로 끌 수 있는 가장자리의 너비"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+msgid ""
+"The amount of total draggable borders. If the theme's visible borders are "
+"not enough, invisible borders will be added to meet this value."
+msgstr ""
+"마우스로 끌 수 있는 가장자리의 너비. 테마의 가장자리가 이보다 작은 경우, 투명"
+"한 가장자리가 부족한 양만큼 추가됩니다."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Select window from tab popup"
+msgstr "탭 팝업에서 창 선택"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
+msgid "Cancel tab popup"
+msgstr "탭 팝업 취소"
+
 #: ../src/tools/mutter-message.c:123
 #, c-format
 msgid "Usage: %s\n"
 msgstr "사용법: %s\n"
 
-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "창 닫기"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "창 메뉴"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "창 최소화"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "창 최대화"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "창 복귀"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "창 말아올리기"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "창 펼치기"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "창을 맨 위에 두기"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "창을 맨 위에서 빼기"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "항상 현재 작업 공간에 놓기"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "창을 한 개 작업 공간에만 두기"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -1603,3 +1574,36 @@ msgstr "세로값이 %d입니다. 와야 하는 값은 %d입니다"
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d개의 좌표 표현식을 %g초에 파싱했습니다 (평균 %g초)\n"
+
+#~ msgid "Close Window"
+#~ msgstr "창 닫기"
+
+#~ msgid "Window Menu"
+#~ msgstr "창 메뉴"
+
+#~ msgid "Minimize Window"
+#~ msgstr "창 최소화"
+
+#~ msgid "Maximize Window"
+#~ msgstr "창 최대화"
+
+#~ msgid "Restore Window"
+#~ msgstr "창 복귀"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "창 말아올리기"
+
+#~ msgid "Unroll Window"
+#~ msgstr "창 펼치기"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "창을 맨 위에 두기"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "창을 맨 위에서 빼기"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "항상 현재 작업 공간에 놓기"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "창을 한 개 작업 공간에만 두기"

po/ru.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity ru\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-13 13:41+0000\n"
-"PO-Revision-Date: 2012-03-11 20:40+0300\n"
+"POT-Creation-Date: 2012-03-15 21:29+0000\n"
+"PO-Revision-Date: 2012-03-21 22:26+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,18 +22,17 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 
 #: ../src/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "Окна"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "Разделитель слева"
 
-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "Разделитель справа"
 
-#: ../src/50-mutter-windows.xml.in.h:3
-#| msgid "_Windows"
-msgid "Windows"
-msgstr "Окна"
-
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
 #: ../src/compositor/compositor.c:492
@@ -71,12 +70,12 @@ msgstr "_Подождать"
 msgid "_Force Quit"
 msgstr "Завер_шить"
 
-#: ../src/core/display.c:365
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Отсутствует расширение %s, требуемое для композиции"
 
-#: ../src/core/display.c:431
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Не удалось открыть дисплей «%s» системы X Window\n"
@@ -120,7 +119,7 @@ msgstr "Не удалось прочитать каталог тем: %s\n"
 msgid "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
 msgstr "Не удалось найти тему! Убедитесь, что «%s» существует и содержит обычные темы.\n"
 
-#: ../src/core/mutter.c:42
+#: ../src/core/mutter.c:40
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -133,60 +132,59 @@ msgstr ""
 "Это — свободное программное обеспечение; условия копирования указаны в исходном тексте.\n"
 "Распространяется без каких-либо гарантий, в том числе и БЕЗ гарантий потребительской стоимости и пригодности для выполнения каких бы то ни было определённых задач.\n"
 
-#: ../src/core/mutter.c:56
+#: ../src/core/mutter.c:54
 msgid "Print version"
 msgstr "Вывести версию"
 
-#: ../src/core/mutter.c:62
+#: ../src/core/mutter.c:60
 msgid "Comma-separated list of compositor plugins"
 msgstr "Список модулей, разделённых запятыми"
 
-#: ../src/core/prefs.c:1067
+#: ../src/core/prefs.c:1077
 msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 msgstr "Устранение недоделок для сломанных приложений отключено. Некоторые приложения могут работать неправильно.\n"
 
-#: ../src/core/prefs.c:1142
+#: ../src/core/prefs.c:1152
 #, c-format
-#| msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Не удалось разобрать описание шрифта «%s» из ключа GSettings %s\n"
 
-#: ../src/core/prefs.c:1208
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 msgstr "Значение «%s» из базы данных настроек является недопустимым значением для модификатора кнопки мыши\n"
 
-#: ../src/core/prefs.c:1720
+#: ../src/core/prefs.c:1739
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 msgstr "Значение «%s» из базы данных настроек является недопустимым значением для комбинации клавиш «%s»\n"
 
-#: ../src/core/prefs.c:1817
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "Рабочее место %d"
 
-#: ../src/core/screen.c:741
+#: ../src/core/screen.c:730
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Недопустимый экран %d дисплея «%s»\n"
 
-#: ../src/core/screen.c:757
+#: ../src/core/screen.c:746
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n"
 msgstr "У экрана %d дисплея «%s» уже есть менеджер окон. Попробуйте использовать параметр --replace, чтобы заместить текущий менеджер окон.\n"
 
-#: ../src/core/screen.c:784
+#: ../src/core/screen.c:773
 #, c-format
 msgid "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Не удалось выбрать менеджер окон на экране %d дисплея «%s»\n"
 
-#: ../src/core/screen.c:839
+#: ../src/core/screen.c:828
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "У экрана %d дисплея «%s» уже есть менеджер окон\n"
 
-#: ../src/core/screen.c:1024
+#: ../src/core/screen.c:1013
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Не удалось освободить экран %d дисплея «%s»\n"
@@ -283,7 +281,7 @@ msgid "Window manager error: "
 msgstr "Ошибка менеджера окон: "
 
 #. first time through
-#: ../src/core/window.c:7145
+#: ../src/core/window.c:7269
 #, c-format
 msgid "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
 msgstr "Окно %s установило на себя значение SM_CLIENT_ID вместо окна с значением WM_CLIENT_LEADER, как это определено в ICCCM.\n"
@@ -295,7 +293,7 @@ msgstr "Окно %s установило на себя значение SM_CLIEN
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7808
+#: ../src/core/window.c:7932
 #, c-format
 msgid "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr "Окно %s установило подсказку MWM, определяющую, что его размер не меняется, но установило минимальный размер %d × %d и максимальный размер %d × %d, что не имеет смысла.\n"
@@ -351,28 +349,28 @@ msgid "Mutter"
 msgstr "Mutter"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
+msgid "Modifier to use for extended window management operations"
+msgstr "Модификатор для использования дополнительных действий управления окнами"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
+msgid "This key will initiate the \"overlay\", which is a combination window overview and application launching system. The default is intended to be the \"Windows key\" on PC hardware. It's expected that this binding either the default or set to the empty string."
+msgstr "Этот ключ инициирует перекрытие (обзор окон и система запуска приложений). Для обычных ПК используется клавиша «Windows». Ожидается, что значение этой привязки будет иметь значение по умолчанию или будет пустой строкой."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Прикреплять модальные диалоговые окна"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "Отменить всплывающую табуляцию"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
-msgid "Determines whether hidden windows (i.e., minimized windows and windows on other workspaces than the current one) should be kept alive."
-msgstr "Определяет, должны ли существовать скрытые окна (например, минимизированные окна и окна, находящиеся на другом рабочем месте)."
-
 #: ../src/org.gnome.mutter.gschema.xml.in.h:4
-msgid "Determines whether the use of popup and highlight frame should be disabled for window cycling."
-msgstr "Определяет, нужно ли отключить использование всплывающей области для циклического переключения окон."
+msgid "When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window."
+msgstr "Если установлено, вместо независимых заголовков окон модальные диалоговые окна будут прикрепляться к заголовку родительского окна и перемещаться вместе с родительским окном."
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid "Determines whether workspace switching should happen for windows on all monitors or only for windows on the primary monitor."
-msgstr "Определяет, должно ли переключение рабочего места происходить для окон на всех мониторах или только для окон на главном мониторе."
+msgid "Live Hidden Windows"
+msgstr "Существование скрытых окон"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid "Draggable border width"
-msgstr "Ширина рамки перетаскивания"
+msgid "Determines whether hidden windows (i.e., minimized windows and windows on other workspaces than the current one) should be kept alive."
+msgstr "Определяет, должны ли существовать скрытые окна (например, минимизированные окна и окна, находящиеся на другом рабочем месте)."
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Enable edge tiling when dropping windows on screen edges"
@@ -383,87 +381,50 @@ msgid "If enabled, dropping windows on vertical screen edges maximizes them vert
 msgstr "Если включено, то перемещение окна к вертикальным границам экрана разворачивает окно по вертикали и изменяет горизонтальный размер окна, покрывая половину доступного места. Перемещение окна к верхней части экрана полностью разворачивает окно."
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid "Live Hidden Windows"
-msgstr "Существование скрытых окон"
+msgid "Workspaces are managed dynamically"
+msgstr "Рабочие места управляются динамически"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:10
-msgid "Modifier to use for extended window management operations"
-msgstr "Модификатор для использования дополнительных действий управления окнами"
+msgid "Determines whether workspaces are managed dynamically or whether there's a static number of workspaces (determined by the num-workspaces key in org.gnome.desktop.wm.preferences)."
+msgstr "Определяет, управляются ли рабочие места автоматически или количество рабочих место постоянно (количество задаётся ключом в org.gnome.desktop.wm.preferences)."
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
+msgid "Workspaces only on primary"
+msgstr "Рабочие места только на главном окне"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+msgid "Determines whether workspace switching should happen for windows on all monitors or only for windows on the primary monitor."
+msgstr "Определяет, должно ли переключение рабочего места происходить для окон на всех мониторах или только для окон на главном мониторе."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
 msgid "No tab popup"
 msgstr "Без всплывающей табуляции"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
-#| msgid "Remove Window From Top"
-msgid "Select window from tab popup"
-msgstr "Выбор окна из всплывающей табуляции"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+msgid "Determines whether the use of popup and highlight frame should be disabled for window cycling."
+msgstr "Определяет, нужно ли отключить использование всплывающей области для циклического переключения окон."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Draggable border width"
+msgstr "Ширина рамки перетаскивания"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
 msgid "The amount of total draggable borders. If the theme's visible borders are not enough, invisible borders will be added to meet this value."
 msgstr "Общая ширина рамок для перетаскивания. Если видимых рамок темы недостаточно, то до этого значения будут добавлены невидимые рамки."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
-msgid "This key will initiate the \"overlay\", which is a combination window overview and application launching system. The default is intended to be the \"Windows key\" on PC hardware. It's expected that this binding either the default or set to the empty string."
-msgstr "Этот ключ инициирует перекрытие (обзор окон и система запуска приложений). Для обычных ПК используется клавиша «Windows». Ожидается, что значение этой привязки будет иметь значение по умолчанию или будет пустой строкой."
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Select window from tab popup"
+msgstr "Выбор окна из всплывающей табуляции"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
-msgid "When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window."
-msgstr "Если установлено, вместо независимых заголовков окон модальные диалоговые окна будут прикрепляться к заголовку родительского окна и перемещаться вместе с родительским окном."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
-msgid "Workspaces only on primary"
-msgstr "Рабочие места только на главном окне"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
+msgid "Cancel tab popup"
+msgstr "Отменить всплывающую табуляцию"
 
 #: ../src/tools/mutter-message.c:123
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Применение: %s\n"
 
-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "Закрыть окно"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "Меню окна"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "Свернуть окно"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "Развернуть окно на весь экран"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "Восстановить окно"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "Скрутить окно в полоску"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "Раскатать окно"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "Сохранять окно на переднем плане"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "Убрать с переднего плана"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "Всегда на видимом рабочем месте"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "Помещать только на одно рабочее место"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -1473,6 +1434,39 @@ msgstr "значение y было %d, а ожидалось %d"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d координатных выражений разобрано за %g секунд (в среднем %g c)\n"
 
+#~ msgid "Close Window"
+#~ msgstr "Закрыть окно"
+
+#~ msgid "Window Menu"
+#~ msgstr "Меню окна"
+
+#~ msgid "Minimize Window"
+#~ msgstr "Свернуть окно"
+
+#~ msgid "Maximize Window"
+#~ msgstr "Развернуть окно на весь экран"
+
+#~ msgid "Restore Window"
+#~ msgstr "Восстановить окно"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "Скрутить окно в полоску"
+
+#~ msgid "Unroll Window"
+#~ msgstr "Раскатать окно"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "Сохранять окно на переднем плане"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "Убрать с переднего плана"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "Всегда на видимом рабочем месте"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "Помещать только на одно рабочее место"
+
 #~ msgid "Switch to workspace 1"
 #~ msgstr "Переключиться на рабочее место 1"
 

po/tr.po

@@ -6,14 +6,14 @@
 # Baris Cicek <baris@teamforce.name.tr>, 2004, 2005, 2008, 2009.
 # İlker DAĞLI <ilker@ilkerdagli.info>, 2011.
 # Muhammed EKEN <gnome@m-eken.com>, 2011.
-# Muhammet Kara <muhammet.k@gmail.com>, 2011.
+# Muhammet Kara <muhammet.k@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-13 13:41+0000\n"
-"PO-Revision-Date: 2011-12-24 16:54+0200\n"
+"POT-Creation-Date: 2012-03-15 21:29+0000\n"
+"PO-Revision-Date: 2012-03-23 21:56+0000\n"
 "Last-Translator: Muhammet Kara <muhammet.k@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,18 +24,17 @@ msgstr ""
 "Language: tr\n"
 
 #: ../src/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "Pencereler"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "Solda bölünmüş olarak göster"
 
-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "Sağda bölünmüş olarak göster"
 
-#: ../src/50-mutter-windows.xml.in.h:3
-#| msgid "_Windows"
-msgid "Windows"
-msgstr "Pencereler"
-
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
 #: ../src/compositor/compositor.c:492
@@ -81,12 +80,12 @@ msgstr "_Bekle"
 msgid "_Force Quit"
 msgstr "_Sonlandır"
 
-#: ../src/core/display.c:365
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Kompozisyon için gerekli olan %s eklentisi eksik"
 
-#: ../src/core/display.c:431
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X Pencere Sistemi '%s' ekranı açılamadı\n"
@@ -137,7 +136,7 @@ msgstr ""
 "Hiç tema bulunamadı! %s varlığından ve bildiğimiz temaları içerdiğinden emin "
 "olun.\n"
 
-#: ../src/core/mutter.c:42
+#: ../src/core/mutter.c:40
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -151,15 +150,15 @@ msgstr ""
 "Bu bir özgür yazılımdır; telif koşullarını öğrenmek için kaynak koda bakın.\n"
 "Hiç bir garantisi, BELİRLİ BİR AMACA UYGUNLUĞU için dahi, YOKTUR.\n"
 
-#: ../src/core/mutter.c:56
+#: ../src/core/mutter.c:54
 msgid "Print version"
 msgstr "Sürümü yazdır"
 
-#: ../src/core/mutter.c:62
+#: ../src/core/mutter.c:60
 msgid "Comma-separated list of compositor plugins"
 msgstr "Kompozisyon eklentilerinin listesi (virgül ile ayrılmış)"
 
-#: ../src/core/prefs.c:1067
+#: ../src/core/prefs.c:1077
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -167,14 +166,13 @@ msgstr ""
 "Hatalı uygulamalara yönelik çözümler devre dışı. Bazı uygulamalar düzgün "
 "işlemeyebilir.\n"
 
-#: ../src/core/prefs.c:1142
+#: ../src/core/prefs.c:1152
 #, c-format
-#| msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "\"%s\" yazıtipi tanımlaması, %s GSettings anahtarından ayrıştırılamadı\n"
 
-#: ../src/core/prefs.c:1208
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -183,7 +181,7 @@ msgstr ""
 "Yapılandırma veritabanında bulunan \"%s\", fare düğme düzenleyicisi olarak "
 "geçerli bir değer değil\n"
 
-#: ../src/core/prefs.c:1720
+#: ../src/core/prefs.c:1739
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -192,17 +190,17 @@ msgstr ""
 "Yapılandırma veritabanında bulunan \"%s\", \"%s\" tuş bağı olarak geçerli "
 "bir değer değil\n"
 
-#: ../src/core/prefs.c:1817
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "Çalışma Alanı %d"
 
-#: ../src/core/screen.c:741
+#: ../src/core/screen.c:730
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "'%2$s' X oturumundaki ekran %1$d geçersiz\n"
 
-#: ../src/core/screen.c:757
+#: ../src/core/screen.c:746
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -212,7 +210,7 @@ msgstr ""
 "geçerli pencere yöneticisinin yerine bir başkasını koymak için --replace "
 "seçeneğini kullanmayı deneyin.\n"
 
-#: ../src/core/screen.c:784
+#: ../src/core/screen.c:773
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -220,13 +218,13 @@ msgstr ""
 "\"%2$s\" X oturumundaki ekran %1$d hangi pencere yöneticisine "
 "sahipöğrenilemedi\n"
 
-#: ../src/core/screen.c:839
+#: ../src/core/screen.c:828
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "\"%2$s\" X oturumundaki ekran %1$d bir pencere yöneticisine zaten sahip\n"
 
-#: ../src/core/screen.c:1024
+#: ../src/core/screen.c:1013
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "\"%2$s\" X oturumundaki ekran %1$d serberst bırakılamadı\"\n"
@@ -325,7 +323,7 @@ msgid "Window manager error: "
 msgstr "Pencere yöneticisi hatası: "
 
 #. first time through
-#: ../src/core/window.c:7145
+#: ../src/core/window.c:7269
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -341,7 +339,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7808
+#: ../src/core/window.c:7932
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -404,14 +402,40 @@ msgid "Mutter"
 msgstr "Mutter"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
+msgid "Modifier to use for extended window management operations"
+msgstr "Genişletilmiş pencere yönetimi işlemleri için kullanılacak değiştirici"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
+msgid ""
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
+msgstr ""
+"Bu anahtar, pencere genel görünümü ve uygulama başlatma sisteminin bir "
+"birleşimi olan \"bindirme\" işlemini başlatır. Öntanımlı olarak PC "
+"donanımındaki \"windows tuşu\" olması tasarlanmıştır. Bağlayıcı varsayılan "
+"olarak veya boş dize olarak ayarlanması beklenir."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Yardımcı diyalogları ekle"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "Sekmeyi yeni pencerede açmayı iptal et"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:4
+msgid ""
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr ""
+"Eğer \"doğru\" ise, bağımsız başlık çubuklarına sahip olduğundan, yardım "
+"diyalogları üst pencerenin başlık çubuğunda ekli gözükür ve üst pencere ile "
+"birlikte hareket eder."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
+#: ../src/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Live Hidden Windows"
+msgstr "Çalışır Durumdaki Gizli Pencereler"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "Determines whether hidden windows (i.e., minimized windows and windows on "
 "other workspaces than the current one) should be kept alive."
@@ -419,27 +443,6 @@ msgstr ""
 "Gizli pencerelerin (ö.r. küçültülmüş pencereler ve diğer çalışma alanındaki "
 "pencereler) çalışır bırakılıp bırakılmayacağını belirler."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:4
-msgid ""
-"Determines whether the use of popup and highlight frame should be disabled "
-"for window cycling."
-msgstr ""
-"Pencere geçişinde çerçeve vurgulanması ve açılır pencere kullanımının "
-"kapatılıp "
-"kapatılmayacağını belirler."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid ""
-"Determines whether workspace switching should happen for windows on all "
-"monitors or only for windows on the primary monitor."
-msgstr ""
-"Çalışma alanı değiştirilmesinin, tüm monitörlerdeki pencerelerde mi yoksa "
-"sadece birincil monitördekilerde mi gerçekleşeceğini belirler."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid "Draggable border width"
-msgstr "Sürüklenebilir kenarlık genişliği"
-
 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
@@ -452,30 +455,54 @@ msgid ""
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
 "Eğer etkinleştirilirse, dikey ekran kenarlarına bırakılan pencereler dikey "
-"olarak "
-"ekranı kaplar ve yatayda kullanılabilir alanın yarısını kaplayacak şekilde "
-"yeniden "
-"boyutlandırılır. Ekranın tepedeki kenarına bırakılan pencereler ekranı "
-"tamamen kaplar."
+"olarak ekranı kaplar ve yatayda kullanılabilir alanın yarısını kaplayacak "
+"şekilde yeniden boyutlandırılır. Ekranın tepedeki kenarına bırakılan "
+"pencereler ekranı tamamen kaplar."
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid "Live Hidden Windows"
-msgstr "Çalışır Durumdaki Gizli Pencereler"
+msgid "Workspaces are managed dynamically"
+msgstr "Çalışma alanları dinamik olarak yönetilir"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:10
-msgid "Modifier to use for extended window management operations"
-msgstr "Genişletilmiş pencere yönetimi işlemleri için kullanılacak değiştirici"
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr ""
+"Çalışma alanlarının dinamik olarak mı yönetileceğini yoksa sabit sayıda "
+"çalışma alanı mı olacağını "
+"belirler (org.gnome.desktop.wm.preferences içindeki num-workspaces değişkeni "
+"tarafından belirlenir)."
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
+msgid "Workspaces only on primary"
+msgstr "Sadece birincil monitördeki çalışma alanları"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+"Çalışma alanı değiştirilmesinin, tüm monitörlerdeki pencerelerde mi yoksa "
+"sadece birincil monitördekilerde mi gerçekleşeceğini belirler."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
 msgid "No tab popup"
 msgstr "Sekme açılır penceresi yok"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
-#| msgid "Remove Window From Top"
-msgid "Select window from tab popup"
-msgstr "Pencereyi, sekme açılır penceresinden seç"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+"Pencere geçişinde çerçeve vurgulanması ve açılır pencere kullanımının "
+"kapatılıp kapatılmayacağını belirler."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Draggable border width"
+msgstr "Sürüklenebilir kenarlık genişliği"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
 "The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
@@ -484,81 +511,19 @@ msgstr ""
 "kenarlıkları yetersiz gelirse, bu değere ulaşmak için görünmez kenarlıklar "
 "eklenir."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
-msgid ""
-"This key will initiate the \"overlay\", which is a combination window "
-"overview and application launching system. The default is intended to be the "
-"\"Windows key\" on PC hardware. It's expected that this binding either the "
-"default or set to the empty string."
-msgstr ""
-"Bu anahtar, pencere genel görünümü ve uygulama başlatma sisteminin bir "
-"birleşimi olan \"bindirme\" işlemini başlatır. Öntanımlı olarak PC "
-"donanımındaki \"windows tuşu\" olması tasarlanmıştır. Bağlayıcı varsayılan "
-"olarak veya boş dize olarak ayarlanması beklenir."
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Select window from tab popup"
+msgstr "Pencereyi, sekme açılır penceresinden seç"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
-msgid ""
-"When true, instead of having independent titlebars, modal dialogs appear "
-"attached to the titlebar of the parent window and are moved together with "
-"the parent window."
-msgstr ""
-"Eğer \"doğru\" ise, bağımsız başlık çubuklarına sahip olduğundan, yardım "
-"diyalogları üst pencerenin başlık çubuğunda ekli gözükür ve üst pencere ile "
-"birlikte hareket eder."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
-msgid "Workspaces only on primary"
-msgstr "Sadece birincil monitördeki çalışma alanları"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
+msgid "Cancel tab popup"
+msgstr "Sekmeyi yeni pencerede açmayı iptal et"
 
 #: ../src/tools/mutter-message.c:123
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Kullanım: %s\n"
 
-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "Pencereyi Kapat"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "Pencere Menüsü"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "Pencereyi Küçült"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "Pencereyi Büyült"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "Pencere Geri Getir"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "Pencereyi Yukarı Sar"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "Pencereyi Geri Sar"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "Pencereyi Üstte Tut"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "Pencereyi Üstten Kaldır"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "Her Zaman Görünen Çalışma Alanında"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "Pencereyi Sadece Bir Çalışma Alanına Yerleştir"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -1629,6 +1594,39 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d kordinat ifadesi %g saniye içinde ayrıştırıldı (%g saniye ortalama ile)\n"
 
+#~ msgid "Close Window"
+#~ msgstr "Pencereyi Kapat"
+
+#~ msgid "Window Menu"
+#~ msgstr "Pencere Menüsü"
+
+#~ msgid "Minimize Window"
+#~ msgstr "Pencereyi Küçült"
+
+#~ msgid "Maximize Window"
+#~ msgstr "Pencereyi Büyült"
+
+#~ msgid "Restore Window"
+#~ msgstr "Pencere Geri Getir"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "Pencereyi Yukarı Sar"
+
+#~ msgid "Unroll Window"
+#~ msgstr "Pencereyi Geri Sar"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "Pencereyi Üstte Tut"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "Pencereyi Üstten Kaldır"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "Her Zaman Görünen Çalışma Alanında"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "Pencereyi Sadece Bir Çalışma Alanına Yerleştir"
+
 #~ msgid "Switch to workspace 1"
 #~ msgstr "Çalışma alanı 1'e geç"
 

po/vi.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: metacity GNOME 2.26\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-13 13:41+0000\n"
-"PO-Revision-Date: 2012-03-04 11:34+0700\n"
+"POT-Creation-Date: 2012-03-15 21:29+0000\n"
+"PO-Revision-Date: 2012-03-22 10:45+0700\n"
 "Last-Translator: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -20,18 +20,17 @@ msgstr ""
 "X-Generator: LocFactoryEditor 1.8\n"
 
 #: ../src/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "Cửa sổ"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "Phân đôi bên trái"
 
-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "Phân đôi bên phải"
 
-#: ../src/50-mutter-windows.xml.in.h:3
-#| msgid "_Windows"
-msgid "Windows"
-msgstr "Cửa sổ"
-
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
 #: ../src/compositor/compositor.c:492
@@ -74,12 +73,12 @@ msgstr "_Chờ"
 msgid "_Force Quit"
 msgstr "_Buộc thoát"
 
-#: ../src/core/display.c:365
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Thiếu phần mở rộng %s cần thiết để tổng hợp"
 
-#: ../src/core/display.c:431
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Lỗi mở bộ trình bày Hệ thống Cửa sổ X \"%s\".\n"
@@ -130,7 +129,7 @@ msgstr ""
 "Không tìm thấy sắc thái. Hãy bảo đảm %s tồn tại và chứa những sắc thái bình "
 "thường.\n"
 
-#: ../src/core/mutter.c:42
+#: ../src/core/mutter.c:40
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -146,15 +145,15 @@ msgstr ""
 "KHÔNG CÓ BẢO HÀNH GÌ CẢ, THẬM CHÍ KHÔNG CÓ BẢO ĐẢM ĐƯỢC NGỤ Ý KHẢ NĂNG BÁN "
 "HAY KHẢ NĂNG LÀM ĐƯỢC VIỆC DỨT KHOÁT.\n"
 
-#: ../src/core/mutter.c:56
+#: ../src/core/mutter.c:54
 msgid "Print version"
 msgstr "In phiên bản"
 
-#: ../src/core/mutter.c:62
+#: ../src/core/mutter.c:60
 msgid "Comma-separated list of compositor plugins"
 msgstr "Danh sách phần bổ sung tổng hợp cách nhau bằng dấu phẩy"
 
-#: ../src/core/prefs.c:1067
+#: ../src/core/prefs.c:1077
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -162,13 +161,12 @@ msgstr ""
 "Khả năng chỉnh sửa cho các ứng dụng không theo chuẩn đã đã tắt. Vài ứng dụng "
 "có thể sẽ xử sự không đúng.\n"
 
-#: ../src/core/prefs.c:1142
+#: ../src/core/prefs.c:1152
 #, c-format
-#| msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Không thể phân tích mô tả phông \"%s\" từ khóa GSettings \"%s\"\n"
 
-#: ../src/core/prefs.c:1208
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -177,7 +175,7 @@ msgstr ""
 "Tìm thấy « %s » trong cơ sở dữ liệu cấu hình không phải giá trị hợp lệ cho "
 "bộ biến đổi nút chuột.\n"
 
-#: ../src/core/prefs.c:1720
+#: ../src/core/prefs.c:1739
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -186,17 +184,17 @@ msgstr ""
 "Tìm thấy « %s » trong cơ sở dữ liệu cấu hình không phải giá trị hợp lệ cho "
 "tổ hợp phím « %s ».\n"
 
-#: ../src/core/prefs.c:1817
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "Vùng làm việc %d"
 
-#: ../src/core/screen.c:741
+#: ../src/core/screen.c:730
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Màn hình %d trên bộ trình bày « %s » không hợp lệ.\n"
 
-#: ../src/core/screen.c:757
+#: ../src/core/screen.c:746
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -205,7 +203,7 @@ msgstr ""
 "Màn hình %d trên bộ trình bày « %s » đã có bộ quản lý cửa sổ rồi; hãy thử "
 "dùng tùy chọn «--replace» để _thay thế_ bộ quản lý cửa sổ đang dùng.\n"
 
-#: ../src/core/screen.c:784
+#: ../src/core/screen.c:773
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -213,12 +211,12 @@ msgstr ""
 "Không thể lấy vùng chọn bộ quản lý cửa sổ trên Màn hình %d trên bộ trình bày "
 "« %s ».\n"
 
-#: ../src/core/screen.c:839
+#: ../src/core/screen.c:828
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Màn hình %d trên bộ trình bày « %s » đã có bộ quản lý cửa sổ.\n"
 
-#: ../src/core/screen.c:1024
+#: ../src/core/screen.c:1013
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Không thể giải phóng Màn hình %d trên bộ trình bày « %s ».\n"
@@ -315,7 +313,7 @@ msgid "Window manager error: "
 msgstr "Lỗi bộ quản lý cửa sổ: "
 
 #. first time through
-#: ../src/core/window.c:7145
+#: ../src/core/window.c:7269
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -331,7 +329,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7808
+#: ../src/core/window.c:7932
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -393,14 +391,39 @@ msgid "Mutter"
 msgstr "Mutter"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
+msgid "Modifier to use for extended window management operations"
+msgstr "Phím bổ trợ dùng cho chức năng quản lý cửa sổ mở rộng"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
+msgid ""
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
+msgstr ""
+"Phím này kích hoạt \"overlay\", một tổ hợp tổng quát cửa sổ và hệ thống chạy "
+"ứng dụng. Mặc định là \"phím Windows\" trên phần cứng PC. Chứa một tổ hợp "
+"phím, hoặc mặc định, hoặc chuỗi rỗng."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Gắn hộp thoại cách thức"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "Huỷ tab popup"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:4
+msgid ""
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr ""
+"Nếu đúng (true), thay vì hiện thanh tiêu đề độc lập, hộp thoại cách thức sẽ "
+"xuất hiện gắn với thanh tiêu đề của cửa sổ cha và được di chuyển cùng với "
+"cửa sổ cha."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
+#: ../src/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Live Hidden Windows"
+msgstr "Cửa sổ ẩn sống"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "Determines whether hidden windows (i.e., minimized windows and windows on "
 "other workspaces than the current one) should be kept alive."
@@ -408,24 +431,6 @@ msgstr ""
 "Xác định có giữ cửa sổ ẩn (ví dụ cửa sổ thu nhỏ, và cửa sổ ở vùng làm việc "
 "khác) không."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:4
-msgid ""
-"Determines whether the use of popup and highlight frame should be disabled "
-"for window cycling."
-msgstr "Xác định có bỏ qua popup và khung tô sáng khi xoay vòng cửa sổ không."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid ""
-"Determines whether workspace switching should happen for windows on all "
-"monitors or only for windows on the primary monitor."
-msgstr ""
-"Xác định chuyển vùng làm việc cho cửa sổ trên mọi màn hình hay chỉ trên màn "
-"hình chính."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid "Draggable border width"
-msgstr "Độ rông biên có thể kéo"
-
 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Bật lợp cạnh khi thả cửa sổ trên cạnh màn hình"
@@ -441,23 +446,45 @@ msgstr ""
 "hình sẽ phóng to toàn màn hình."
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid "Live Hidden Windows"
-msgstr "Cửa sổ ẩn sống"
+msgid "Workspaces are managed dynamically"
+msgstr "Vùng làm việc được quản lý động"
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:10
-msgid "Modifier to use for extended window management operations"
-msgstr "Phím bổ trợ dùng cho chức năng quản lý cửa sổ mở rộng"
+msgid ""
+"Determines whether workspaces are managed dynamically or whether there's a "
+"static number of workspaces (determined by the num-workspaces key in org."
+"gnome.desktop.wm.preferences)."
+msgstr ""
+"Xác định vùng làm việc được quản lý động, hay cố định số vùng làm việc, xác "
+"định bởi khoá num-workspaces trong org.gnome.desktop.wm.preferences."
 
 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
+msgid "Workspaces only on primary"
+msgstr "Vùng làm việc chỉ trên màn hình chính"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+"Xác định chuyển vùng làm việc cho cửa sổ trên mọi màn hình hay chỉ trên màn "
+"hình chính."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
 msgid "No tab popup"
 msgstr "Không tab popup"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
-#| msgid "Move between windows with popup"
-msgid "Select window from tab popup"
-msgstr "Chọn cửa sổ từ tab popup"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr "Xác định có bỏ qua popup và khung tô sáng khi xoay vòng cửa sổ không."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+msgid "Draggable border width"
+msgstr "Độ rông biên có thể kéo"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
 "The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
@@ -465,80 +492,19 @@ msgstr ""
 "Kích thước biên có thể kéo. Nếu biên thấy được của sắc thái không đủ, biên "
 "vô hình sẽ được thêm vào để thoả mãn giá trị này."
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
-msgid ""
-"This key will initiate the \"overlay\", which is a combination window "
-"overview and application launching system. The default is intended to be the "
-"\"Windows key\" on PC hardware. It's expected that this binding either the "
-"default or set to the empty string."
-msgstr ""
-"Phím này kích hoạt \"overlay\", một tổ hợp tổng quát cửa sổ và hệ thống chạy "
-"ứng dụng. Mặc định là \"phím Windows\" trên phần cứng PC. Chứa một tổ hợp "
-"phím, hoặc mặc định, hoặc chuỗi rỗng."
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+msgid "Select window from tab popup"
+msgstr "Chọn cửa sổ từ tab popup"
 
-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
-msgid ""
-"When true, instead of having independent titlebars, modal dialogs appear "
-"attached to the titlebar of the parent window and are moved together with "
-"the parent window."
-msgstr ""
-"Nếu đúng (true), thay vì hiện thanh tiêu đề độc lập, hộp thoại cách thức sẽ "
-"xuất hiện gắn với thanh tiêu đề của cửa sổ cha và được di chuyển cùng với "
-"cửa sổ cha."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
-msgid "Workspaces only on primary"
-msgstr "Vùng làm việc chỉ trên màn hình chính"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
+msgid "Cancel tab popup"
+msgstr "Huỷ tab popup"
 
 #: ../src/tools/mutter-message.c:123
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Cách dùng: %s\n"
 
-#: ../src/ui/frames.c:1157
-msgid "Close Window"
-msgstr "Đóng cửa sổ"
-
-#: ../src/ui/frames.c:1160
-msgid "Window Menu"
-msgstr "Trình đơn cửa sổ"
-
-#: ../src/ui/frames.c:1163
-msgid "Minimize Window"
-msgstr "Thu nhỏ cửa sổ"
-
-#: ../src/ui/frames.c:1166
-msgid "Maximize Window"
-msgstr "Phóng to cửa sổ"
-
-#: ../src/ui/frames.c:1169
-msgid "Restore Window"
-msgstr "Phục hồi Cửa sổ"
-
-#: ../src/ui/frames.c:1172
-msgid "Roll Up Window"
-msgstr "Cuộn cửa sổ lên"
-
-#: ../src/ui/frames.c:1175
-msgid "Unroll Window"
-msgstr "Thả cửa sổ xuống"
-
-#: ../src/ui/frames.c:1178
-msgid "Keep Window On Top"
-msgstr "Giữ cửa sổ ở trên cùng"
-
-#: ../src/ui/frames.c:1181
-msgid "Remove Window From Top"
-msgstr "Thôi giữ cửa sổ ở trên cùng"
-
-#: ../src/ui/frames.c:1184
-msgid "Always On Visible Workspace"
-msgstr "Luôn nằm trong vùng làm việc có thể thấy"
-
-#: ../src/ui/frames.c:1187
-msgid "Put Window On Only One Workspace"
-msgstr "Đặt cửa sổ trên chỉ một vùng làm việc"
-
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:69
 msgid "Mi_nimize"
@@ -1625,6 +1591,39 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "phân tích \"%d\" biểu thức tọa độ trong vòng %g giây (%g giây trung bình).\n"
 
+#~ msgid "Close Window"
+#~ msgstr "Đóng cửa sổ"
+
+#~ msgid "Window Menu"
+#~ msgstr "Trình đơn cửa sổ"
+
+#~ msgid "Minimize Window"
+#~ msgstr "Thu nhỏ cửa sổ"
+
+#~ msgid "Maximize Window"
+#~ msgstr "Phóng to cửa sổ"
+
+#~ msgid "Restore Window"
+#~ msgstr "Phục hồi Cửa sổ"
+
+#~ msgid "Roll Up Window"
+#~ msgstr "Cuộn cửa sổ lên"
+
+#~ msgid "Unroll Window"
+#~ msgstr "Thả cửa sổ xuống"
+
+#~ msgid "Keep Window On Top"
+#~ msgstr "Giữ cửa sổ ở trên cùng"
+
+#~ msgid "Remove Window From Top"
+#~ msgstr "Thôi giữ cửa sổ ở trên cùng"
+
+#~ msgid "Always On Visible Workspace"
+#~ msgstr "Luôn nằm trong vùng làm việc có thể thấy"
+
+#~ msgid "Put Window On Only One Workspace"
+#~ msgstr "Đặt cửa sổ trên chỉ một vùng làm việc"
+
 #~ msgid "Switch to workspace 1"
 #~ msgstr "Chuyển sang vùng làm việc 1"
 

src/compositor/plugins/Makefile.am

@@ -16,3 +16,9 @@ pkglib_LTLIBRARIES = default.la
 install-exec-hook:
 	-rm $(DESTDIR)$(pkglibdir)/*.a
 	-rm $(DESTDIR)$(pkglibdir)/*.la
+
+# Since we removed the .la file, 'make uninstall' doesn't work properly,
+# since it counts on libtool to remove the .la files, so just kill the
+# .so file manually.
+uninstall-local:
+	-rm -f $(DESTDIR)$(pkglibdir)/default.so

src/core/display.c

@@ -4654,12 +4654,13 @@ meta_display_get_tab_list (MetaDisplay   *display,
   tab_list = g_list_reverse (tab_list);
 
   {
-    GSList *tmp;
+    GSList *windows, *tmp;
     MetaWindow *l_window;
 
-    tmp = meta_display_list_windows (display, META_LIST_DEFAULT);
+    windows = meta_display_list_windows (display, META_LIST_DEFAULT);
 
     /* Go through all windows */
+    tmp = windows;
     while (tmp != NULL)
       {
         l_window=tmp->data;
@@ -4675,6 +4676,8 @@ meta_display_get_tab_list (MetaDisplay   *display,
 
         tmp = tmp->next;
       } /* End while tmp!=NULL */
+
+    g_slist_free (windows);
   }
   
   return tab_list;

src/core/stack.c

@@ -189,7 +189,7 @@ meta_stack_raise (MetaStack  *stack,
   int max_stack_position = window->stack_position;
   MetaWorkspace *workspace;
 
-  g_assert (stack->added == NULL);
+  stack_ensure_sorted (stack);
 
   workspace = meta_window_get_workspace (window);
   for (l = stack->sorted; l; l = l->next)
@@ -217,7 +217,7 @@ meta_stack_lower (MetaStack  *stack,
   int min_stack_position = window->stack_position;
   MetaWorkspace *workspace;
 
-  g_assert (stack->added == NULL);
+  stack_ensure_sorted (stack);
 
   workspace = meta_window_get_workspace (window);
   for (l = stack->sorted; l; l = l->next)
@@ -257,16 +257,17 @@ void
 meta_stack_update_window_tile_matches (MetaStack     *stack,
                                        MetaWorkspace *workspace)
 {
-  GList *windows;
+  GList *windows, *tmp;
 
   if (stack->freeze_count > 0)
     return;
 
   windows = meta_stack_list_windows (stack, workspace);
-  while (windows)
+  tmp = windows;
+  while (tmp)
     {
-      meta_window_compute_tile_match ((MetaWindow *) windows->data);
-      windows = windows->next;
+      meta_window_compute_tile_match ((MetaWindow *) tmp->data);
+      tmp = tmp->next;
     }
 
   g_list_free (windows);