[metacity] update Punjabi Translation

[Amanpreet Singh Alam <aman src gnome org>]

commit dfd6456a9fa59965d7df6de334342b8bfee09e4a
Author: A S Alam <aalam users sf net>
Date:   Sun Mar 21 19:16:34 2010 +0530

    update Punjabi Translation

 po/pa.po |  442 ++++++++++++++++++++++++--------------------------------------
 1 files changed, 168 insertions(+), 274 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 2c6b573..10003fe 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -4,15 +4,15 @@
 # This file is distributed under the same license as the metacity.HEAD package.
 #
 # Amanpreet_Singh <amanlinux netscape net>, 2004.
-# A S Alam <aalam users sf net>, 2004, 2005,2006,2007, 2009.
+# A S Alam <aalam users sf net>, 2004, 2005,2006,2007, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=metacity&component=general\n";
-"POT-Creation-Date: 2009-08-24 17:51+0000\n"
-"PO-Revision-Date: 2009-09-15 07:24+0530\n"
+"POT-Creation-Date: 2010-01-21 21:34+0000\n"
+"PO-Revision-Date: 2010-03-21 19:14+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
+"Language-Team: Punjabi/Panjabi <kde-i18n-doc kde org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +26,7 @@ msgstr "ਡ�ਸ��ਾਪ"
 
 #: ../src/50-metacity-key.xml.in.h:1
 msgid "Window Management"
-msgstr "ਵਿੰਡ� ਮ�ਨ��਼ਮਿੰ�"
+msgstr "ਵਿੰਡ� ਮ�ਨ��਼ਮ���"
 
 #: ../src/core/bell.c:294
 msgid "Bell event"
@@ -37,29 +37,33 @@ msgstr "�ੰ�� �ਵ���"
 msgid "Unknown window information request: %d"
 msgstr "�ਣ�ਾਣ ਵਿੰਡ� �ਾਣ�ਾਰ� ਮੰ�: %d"
 
-#: ../src/core/delete.c:104, c-format
+#. Translators: %s is a window title
+#: ../src/core/delete.c:96
+#, c-format
+#| msgid "\"%s\" is not responding."
+msgid "<tt>%s</tt> is not responding."
+msgstr "<tt>%s</tt> �ਵਾਬ ਨਹ� ਦਿੰਦਾ।"
+
+#: ../src/core/delete.c:101
 #| msgid ""
-#| "You may choose to wait a short while for it to continue or force the "
-#| "application to quit entirely."
+#| "<big><b><tt>%s</tt> is not responding.</b></big>\n"
+#| "\n"
+#| "<i>You may choose to wait a short while for it to continue or force the "
+#| "application to quit entirely.</i>"
 msgid ""
-"<big><b><tt>%s</tt> is not responding.</b></big>\n"
-"\n"
-"<i>You may choose to wait a short while for it to continue or force the "
-"application to quit entirely.</i>"
-msgstr ""
-"<big><b><tt>%s</tt> ਤ�� ��� �ਵਾਬ ਨਹ�� � ਰਿਹਾ।</b></big>\n"
-"\n"
-"<i>ਤ�ਸ�� �ਸ ਲ� ��� ਸਮ�� ਵਾਸਤ� �ਡ�� �ਰ ਸ�ਦ� ਹ� �ਾ� �ਾਰ� ਨ�ੰ ਧੱ�� ਨਾਲ ਬੰਦ �ਰ ਸ�ਦ� ਹ�।</i>"
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr "ਤ�ਸ�� �ਸ ਲ� ��� ਸਮ�� ਵਾਸਤ� �ਡ�� �ਰ ਸ�ਦ� ਹ� �ਾ� �ਾਰ� ਨ�ੰ ਧੱ�� ਨਾਲ ਬੰਦ �ਰ ਸ�ਦ� ਹ�।"
 
-#: ../src/core/delete.c:115
+#: ../src/core/delete.c:110
 msgid "_Wait"
 msgstr "�ਡ���(_W)"
 
-#: ../src/core/delete.c:115
+#: ../src/core/delete.c:110
 msgid "_Force Quit"
 msgstr "ਧੱ�� ਨਾਲ ਬੰਦ(_F)"
 
-#: ../src/core/delete.c:216
+#: ../src/core/delete.c:208
 #, c-format
 msgid "Failed to get hostname: %s\n"
 msgstr "ਹ�ਸ� ਨਾ� ਪ�ਰਾਪਤ �ਰਨ ਲ� ਫ�ਲ�ਹ: %s\n"
@@ -100,10 +104,8 @@ msgstr "��� ਹ�ਰ �ਾਰ� %s ਸਵਿੱ� ਨ�ੰ %x ਸ�
 #. Displayed when a keybinding which is
 #. * supposed to launch a program fails.
 #.
-#: ../src/core/keybindings.c:2294, c-format
-#| msgid ""
-#| "There was an error running \"%s\":\n"
-#| "%s."
+#: ../src/core/keybindings.c:2294
+#, c-format
 msgid ""
 "There was an error running <tt>%s</tt>:\n"
 "\n"
@@ -123,13 +125,8 @@ msgstr "��� �ਮਾ�ਡ %d ਪਰਭਾਸ਼ਿਤ ਨਹ� ��ਤ
 msgid "No terminal command has been defined.\n"
 msgstr "��� �ਰਮ�ਨਲ �ਮਾ�ਡ ਪ�ਰਭਾਸ਼ਿਤ ਨਹ� ��ਤ�।\n"
 
-#: ../src/core/main.c:130, c-format
-#| msgid ""
-#| "metacity %s\n"
-#| "Copyright (C) 2001-2007 Havoc Pennington, Red Hat, Inc., and others\n"
-#| "This is free software; see the source for copying conditions.\n"
-#| "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
-#| "PARTICULAR PURPOSE.\n"
+#: ../src/core/main.c:131
+#, c-format
 msgid ""
 "metacity %s\n"
 "Copyright (C) 2001-%s Havoc Pennington, Red Hat, Inc., and others\n"
@@ -142,58 +139,57 @@ msgstr ""
 "�ਹ ਮ�ਫਤ ਸਾਫ�ਵ��ਰ ਹ�; �ਤਾਰਾ ਹਾਲਤਾ� ਲ� ਸਰ�ਤ ਵ���।\n"
 "�ਸ ਦ� ��� �ਰੰ�� ਨਹ�; �ਥ�� ਤੱ� �ਿ �ਰ�ਦਦਾਰ� �ਾ� �ਾਸ ਮ�ਸਦ ਦ� ਪ�ਰਤ� ਲ� ਵ�।\n"
 
-#: ../src/core/main.c:268
+#: ../src/core/main.c:269
 msgid "Disable connection to session manager"
 msgstr "ਸ਼�ਸ਼ਨ ਪਰਬੰਧ� ਨਾਲ ��ਨ��ਸ਼ਨ �ਯ��"
 
-#: ../src/core/main.c:274
+#: ../src/core/main.c:275
 msgid "Replace the running window manager with Metacity"
 msgstr "�ੱਲ ਰਹ� ਵਿੰਡ� ਮ�ਨ��ਰ ਨ�ੰ ਮ��ਾਸਿ�� ਨਾਲ ਤਬਦ�ਲ"
 
-#: ../src/core/main.c:280
+#: ../src/core/main.c:281
 msgid "Specify session management ID"
 msgstr "ਸ਼�ਸ਼ਨ ਪਰਬੰਧਨ ID ਦਿ�"
 
-#: ../src/core/main.c:285
+#: ../src/core/main.c:286
 msgid "X Display to use"
 msgstr "ਵਰਤਣ ਲ� X ਦਰਿਸ਼"
 
-#: ../src/core/main.c:291
+#: ../src/core/main.c:292
 msgid "Initialize session from savefile"
 msgstr "ਸੰਭਾਲ� ਫਾ�ਲ ਤ�� ਸ਼�ਸ਼ਨ ਸ਼�ਰ�"
 
-#: ../src/core/main.c:297
+#: ../src/core/main.c:298
 msgid "Print version"
 msgstr "ਵਰ�ਨ �ਾਪ�"
 
-#: ../src/core/main.c:303
+#: ../src/core/main.c:304
 msgid "Make X calls synchronous"
 msgstr "X �ਾਲ ਸ��ਰ�ਨਸ ਬਣਾ�"
 
-#: ../src/core/main.c:309
-#| msgid "Compositing Manager"
+#: ../src/core/main.c:310
 msgid "Turn compositing on"
 msgstr "�ੰਪ��ਿੰ� �ਾਲ� �ਰ�"
 
-#: ../src/core/main.c:315
+#: ../src/core/main.c:316
 msgid "Turn compositing off"
 msgstr "�ੰਪ��਼�ਸ਼ਨ ਬੰਦ �ਰ�"
 
-#: ../src/core/main.c:321
+#: ../src/core/main.c:322
 msgid "Don't make fullscreen windows that are maximized and have no decorations"
 msgstr "ਪ�ਰ� ਸ�ਰ�ਨ ਵਿੰਡ� ਨਾ ਬਣਾ�, �ਿਸ ਲ� ਵੱਧ ਤ�� ਵੱਧ ਹ�ਵ�, ਪਰ ��� ਸ�ਾਵ� ਨਾ ਹ�ਵ�"
 
-#: ../src/core/main.c:543
+#: ../src/core/main.c:528
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "ਥ�ਮ ਡਾ�ਰ���ਰ� ਦ� �ਾ�� �ਸਫਲ: %s\n"
 
-#: ../src/core/main.c:559
+#: ../src/core/main.c:544
 #, c-format
 msgid "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
 msgstr "ਥ�ਮ ਨਹ� ਲੱਭ ਸ�ਿ�! ਯ��ਨ� ਬਣਾ� �ਿ %s ਮ���ਦ ਹ� �ਤ� �ਸ ਵਿ� ਵਰਤਣ ਵਾਲ� ਥ�ਮ ਹਨ।\n"
 
-#: ../src/core/main.c:618
+#: ../src/core/main.c:603
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "ਮ�� ਸ਼�ਰ� �ਰਨ ਲ� �ਸਫਲ: %s\n"
@@ -214,8 +210,8 @@ msgstr "ਮ�� ਸ਼�ਰ� �ਰਨ ਲ� �ਸਫਲ: %s\n"
 msgid "GConf key '%s' is set to an invalid value\n"
 msgstr "��-�ਾਨਫ ਸਵਿੱ� \"%s\" ਨ�ੰ �ੱ� �ਯ�� ��ਮਤ ਦਿੱਤ� �� ਹ�\n"
 
-#: ../src/core/prefs.c:587 ../src/core/prefs.c:830, c-format
-#| msgid "%d stored in GConf key %s is out of range 0 to %d\n"
+#: ../src/core/prefs.c:587 ../src/core/prefs.c:830
+#, c-format
 msgid "%d stored in GConf key %s is out of range %d to %d\n"
 msgstr "��-�ਾਨਫ ਸੰਭਾਲ� %d  ਸਵਿੱ� %s ਵਿੱ� ਨਿਸ�ਿਤ ਸ�ਮਾ�ਵਾ� %d ਤ�� %d ਬਾਹਰ ਹ�\n"
 
@@ -266,8 +262,8 @@ msgstr "ਸੰਰ�ਨਾ ਡਾ�ਾਬ�ਸ ਵਿੱ�  ਲੱਭ� ਹ
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "ਵਰ�ਸਪ�ਸ %d ਦਾ ਨਾ� \"%s\" ਸ�ੱ� �ਰਨ ਵਿੱ� �ਲਤ�:%s\n"
 
-#: ../src/core/prefs.c:2763, c-format
-#| msgid "Error setting name for workspace %d to \"%s\": %s\n"
+#: ../src/core/prefs.c:2763
+#, c-format
 msgid "Error setting compositor status: %s\n"
 msgstr "�ੰਪ��਼�ਰ ਹਾਲਤ ਸ�ੱ� �ਰਨ ਵਿੱ� �ਲਤ�:%s\n"
 
@@ -305,13 +301,6 @@ msgstr "ਸ�ਰ�ਨ %d �ੱਤ� ਡਿਸਪਲ�� \"%s\" ਰ�ਲ
 #. * "disabled" must also stay as it is.
 #.
 #: ../src/core/schema-bindings.c:169
-#| msgid ""
-#| "The keybinding used to close a window. The format looks like \"&lt;"
-#| "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
-#| "liberal and allows lower or upper case, and also abbreviations such as "
-#| "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#| "special string \"disabled\", then there will be no keybinding for this "
-#| "action."
 msgid ""
 "The format looks like \"<Control>a\" or \"<Shift><Alt>F1\".\n"
 "\n"
@@ -322,18 +311,11 @@ msgid ""
 msgstr ""
 "ਫਾਰਮ�� \"<Control>a\" �ਾ� \"<Shift><Alt>F1\" ਵਾ�� �ਾਪਦਾ ਹ�।\n"
 "\n"
-"ਪਾਰਸਰ ਪ�ਰ� ਤਰਾ� ਸਿੱ�ਿ�ਤ ਹ� �ਤ� ���� �ਾ� ਵੱਡ� �ੱ�ਰਾ� ਨ�ੰ ��ਾ�ਤ ਦਿੰਦਾ ਹ�, �ਤ� ਸੰ��ਪ ਰ�ਨਾ ਵ� "
-"�ਿਵ�� �ਿ \"&lt;Ctl&gt;\" �ਤ� \"&lt;Ctrl&gt;\"। �� ਤ�ਸ�� �ਾਸ ਸਤਰ ਦ� ��ਣ \"�ਯ��\" ਬਣਾ�ਦ� ਹ� "
+"ਪਾਰਸਰ ਪ�ਰ� ਤਰਾ� ਸਿੱ�ਿ�ਤ ਹ� �ਤ� ���� �ਾ� ਵੱਡ� �ੱ�ਰਾ� ਨ�ੰ ��ਾ�ਤ ਦਿੰਦਾ ਹ�, �ਤ� ਸੰ��ਪ ਰ�ਨਾ ਵ� �ਿਵ�� "
+"�ਿ \"&lt;Ctl&gt;\" �ਤ� \"&lt;Ctrl&gt;\"। �� ਤ�ਸ�� �ਾਸ ਸਤਰ ਦ� ��ਣ \"�ਯ��\" ਬਣਾ�ਦ� ਹ� "
 "ਤਾ� �ਸ �ਿਰਿ� ਵਾਸਤ� ��� ਸਵਿੱ�-ਬਾ�ਡਿੰ� ਨਹ�� ਹ�ਵ��ਾ।"
 
 #: ../src/core/schema-bindings.c:177
-#| msgid ""
-#| "The keybinding used to close a window. The format looks like \"&lt;"
-#| "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly "
-#| "liberal and allows lower or upper case, and also abbreviations such as "
-#| "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#| "special string \"disabled\", then there will be no keybinding for this "
-#| "action."
 msgid ""
 "The format looks like \"<Control>a\" or \"<Shift><Alt>F1\".\n"
 "\n"
@@ -347,108 +329,104 @@ msgid ""
 msgstr ""
 "ਫਾਰਮ�� \"<Control>a\" �ਾ� \"<Shift><Alt>F1\" ਵਾ�� �ਾਪਦਾ ਹ�।\n"
 "\n"
-"ਪਾਰਸਰ ਪ�ਰ� ਤਰਾ� ਸਿੱ�ਿ�ਤ ਹ� �ਤ� ���� �ਾ� ਵੱਡ� �ੱ�ਰਾ� ਨ�ੰ ��ਾ�ਤ ਦਿੰਦਾ ਹ�, �ਤ� ਸੰ��ਪ ਰ�ਨਾ "
-"ਵ� �ਿਵ�� �ਿ \"&lt;Ctl&gt;\" �ਤ� \"&lt;Ctrl&gt;\"। �� ਤ�ਸ�� �ਾਸ ਸਤਰ ਦ� ��ਣ \"�ਯ��\" ਬਣਾ�ਦ� "
-"ਹ� ਤਾ� �ਸ �ਿਰਿ� ਵਾਸਤ� ��� ਸਵਿੱ�-ਬਾ�ਡਿੰ� ਨਹ�� ਹ�ਵ��ਾ।"
+"ਪਾਰਸਰ ਪ�ਰ� ਤਰਾ� ਸਿੱ�ਿ�ਤ ਹ� �ਤ� ���� �ਾ� ਵੱਡ� �ੱ�ਰਾ� ਨ�ੰ ��ਾ�ਤ ਦਿੰਦਾ ਹ�, �ਤ� ਸੰ��ਪ ਰ�ਨਾ ਵ� �ਿਵ�� "
+"�ਿ \"&lt;Ctl&gt;\" �ਤ� \"&lt;Ctrl&gt;\"। �� ਤ�ਸ�� �ਾਸ ਸਤਰ ਦ� ��ਣ \"�ਯ��\" ਬਣਾ�ਦ� ਹ� "
+"ਤਾ� �ਸ �ਿਰਿ� ਵਾਸਤ� ��� ਸਵਿੱ�-ਬਾ�ਡਿੰ� ਨਹ�� ਹ�ਵ��ਾ।"
 
-#: ../src/core/session.c:845 ../src/core/session.c:852
+#: ../src/core/session.c:850 ../src/core/session.c:857
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "'%s' ਡਾ�ਰ���ਰ� ਬਣਾ� ਨਹ�� �ਾ ਸ��:%s\n"
 
-#: ../src/core/session.c:862
+#: ../src/core/session.c:867
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "ਲਿ�ਣ ਲ� ਸ਼�ਸ਼ਨ ਫਾ�ਲ '%s' ��ਲ�ਹ� ਨਹ�� �ਾ ਸ��: %s\n"
 
-#: ../src/core/session.c:1003
+#: ../src/core/session.c:1008
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "ਸ਼�ਸ਼ਨ ਫਾ�ਲ '%s' ਲਿ�ਣ ਦ� �ਲਤ�:%s\n"
 
-#: ../src/core/session.c:1008
+#: ../src/core/session.c:1013
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "ਸ਼�ਸ਼ਨ ਫਾ�ਲ '%s' ��ਲ�ਹਣ ਦ� �ਲਤ�: %s\n"
 
 #. oh, just give up
-#: ../src/core/session.c:1101
+#: ../src/core/session.c:1106
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "ਸੰਭਾਲ� ਸ਼�ਸ਼ਨ ਫਾ�ਲ %s ਨ�ੰ ਪ��ਹਨ ਲ� ਫ�ਲ�ਹ:%s\n"
 
-#: ../src/core/session.c:1140
+#: ../src/core/session.c:1145
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "ਸੰਭਾਲ� ਸ਼�ਸ਼ਨ ਫਾ�ਲ ਨ�ੰ ਪਾਰਸ �ਰਨ ਲ� �ਸਫਲ: %s\n"
 
-#: ../src/core/session.c:1189
+#: ../src/core/session.c:1194
 #, c-format
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "<metacity_session> ��ਣ ਦਿ�ਿ�, ਪਰ ਸਾਡ� ��ਲ ਸ਼�ਸ਼ਨ ID ਪਹਿਲਾ� ਹ� ਹ�"
 
-#: ../src/core/session.c:1202 ../src/core/session.c:1277
-#: ../src/core/session.c:1309 ../src/core/session.c:1381
-#: ../src/core/session.c:1441, c-format
-#| msgid "Unknown attribute %s on <window> element"
+#: ../src/core/session.c:1207 ../src/core/session.c:1282
+#: ../src/core/session.c:1314 ../src/core/session.c:1386
+#: ../src/core/session.c:1446
+#, c-format
 msgid "Unknown attribute %s on <%s> element"
 msgstr "<%2$s> �ਲ�ਮ��� �ੱਤ� �ਣ�ਾਣ %1$s ��ਣ"
 
-#: ../src/core/session.c:1219
+#: ../src/core/session.c:1224
 #, c-format
 msgid "nested <window> tag"
 msgstr "ਨ�ਸ�ਡ <window> ���"
 
-#: ../src/core/session.c:1461
+#: ../src/core/session.c:1466
 #, c-format
 msgid "Unknown element %s"
 msgstr "�ਣ�ਾਣ �ਲ�ਮ��� %s"
 
-#: ../src/core/session.c:1812
-#| msgid ""
-#| "These windows do not support \"save current setup\" and will have to be "
-#| "restarted manually next time you log in."
+#: ../src/core/session.c:1818
 msgid ""
 "These windows do not support &quot;save current setup&quot; and will have to "
 "be restarted manually next time you log in."
 msgstr ""
-"�ਹ ਵਿੰਡ� &quot;ਮ���ਦਾ ਸਥਿਤ� ਸੰਭਾਲ�&quot; ਵਾਸਤ� ਸਹਾ�� ਨਹ�� �ਤ� ��ਲ� ਵਾਰ �ਦ�� ਤ�ਸ�� ਲਾ��ਨ �ਰ��� ਤਾ� "
-"ਮ�� "
-"ਸ਼�ਰ� �ਰਨਾ ਪਵ��ਾ।"
+"�ਹ ਵਿੰਡ� &quot;ਮ���ਦਾ ਸਥਿਤ� ਸੰਭਾਲ�&quot; ਵਾਸਤ� ਸਹਾ�� ਨਹ�� �ਤ� ��ਲ� ਵਾਰ �ਦ�� ਤ�ਸ�� ਲਾ��ਨ "
+"�ਰ��� ਤਾ� ਮ�� ਸ਼�ਰ� �ਰਨਾ ਪਵ��ਾ।"
 
-#: ../src/core/util.c:103
+#: ../src/core/util.c:101
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "ਡ�ਬੱ� ਲਾ� ��ਲ�ਹਣ ਵਿੱ� �ਸਫਲ: %s\n"
 
-#: ../src/core/util.c:113
+#: ../src/core/util.c:111
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "ਲਾ� ਫਾ�ਲ %s ਨ�ੰ fdopen() ਲ� �ਸਫਲ: %s\n"
 
-#: ../src/core/util.c:119
+#: ../src/core/util.c:117
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "��ੱਲ�ਹ� ਲਾ� ਫਾ�ਲ %s\n"
 
-#: ../src/core/util.c:138 ../src/tools/metacity-message.c:176
+#: ../src/core/util.c:136 ../src/tools/metacity-message.c:176
 #, c-format
 msgid "Metacity was compiled without support for verbose mode\n"
 msgstr "ਮ��ਾਸਿ��, ਵਰਬ�� ਮ�ਡ ਲ� ਸਹਾਰ� ਤ�� ਬਿਨਾ� �ੰਪਾ�ਲ ਹ���\n"
 
-#: ../src/core/util.c:238
+#: ../src/core/util.c:236
 msgid "Window manager: "
 msgstr "ਵਿੰਡ� ਮ�ਨ��ਰ: "
 
-#: ../src/core/util.c:390
+#: ../src/core/util.c:388
 msgid "Bug in window manager: "
 msgstr "ਵਿੰਡ� ਮ�ਨ��ਰ ਵਿੱ� ਬੱ�: "
 
-#: ../src/core/util.c:423
+#: ../src/core/util.c:421
 msgid "Window manager warning: "
 msgstr "ਵਿੰਡ� ਮ�ਨ��ਰ ��ਤਾਵਨ�: "
 
-#: ../src/core/util.c:451
+#: ../src/core/util.c:449
 msgid "Window manager error: "
 msgstr "ਵਿੰਡ� ਮ�ਨ��ਰ �ਲਤ�: "
 
@@ -460,7 +438,7 @@ msgid "Metacity"
 msgstr "ਮ��ਾਸਿ��"
 
 #. first time through
-#: ../src/core/window.c:5627
+#: ../src/core/window.c:5642
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -476,7 +454,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:6192
+#: ../src/core/window.c:6207
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -504,8 +482,8 @@ msgstr "%s (ਸ�ਪਰਯ��਼ਰ ਵਾ��)"
 
 #. Translators: the title of a window owned by another user
 #. * on this machine
-#: ../src/core/window-props.c:438, c-format
-#| msgid "%s (on %s)"
+#: ../src/core/window-props.c:438
+#, c-format
 msgid "%s (as %s)"
 msgstr "%s (%s ਵਾ��)"
 
@@ -516,7 +494,7 @@ msgstr "%s (%s ਵਾ��)"
 msgid "%s (as another user)"
 msgstr "%s (ਹ�ਰ ਯ��਼ਰ ਵ���)"
 
-#: ../src/core/window-props.c:1429
+#: ../src/core/window-props.c:1430
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "�ਲਤ WM_TRANSIENT_FOR ਵਿੰਡ� 0x%lx %s ਲ� ਦਿੱਤਾ �ਿ� ਹ�।\n"
@@ -595,52 +573,42 @@ msgid "Switch to workspace 12"
 msgstr "ਵਰ�ਸਪ�ਸ 12 ਵਿੱ� �ਾ�"
 
 #: ../src/include/all-keybindings.h:122
-#| msgid "Switch to workspace on the left"
 msgid "Switch to workspace on the left of the current workspace"
 msgstr "ਵਰ�ਸਪ�ਸ ਨ�ੰ ਮ���ਦਾ ਵਰ�ਸਪ�ਸ ਦ� �ੱਬ� ਵਰ�ਸਪ�ਸ ਵਿੱ� ਭ���"
 
 #: ../src/include/all-keybindings.h:126
-#| msgid "Switch to workspace on the right"
 msgid "Switch to workspace on the right of the current workspace"
 msgstr "ਵਰ�ਸਪ�ਸ ਨ�ੰ ਮ���ਦਾ ਵਰ�ਸਪ�ਸ ਦ� ਸੱ�� ਵਰ�ਸਪ�ਸ ਵਿੱ� ਭ���"
 
 #: ../src/include/all-keybindings.h:130
-#| msgid "Switch to workspace above this one"
 msgid "Switch to workspace above the current workspace"
 msgstr "ਵਰ�ਸਪ�ਸ ਨ�ੰ ਮ���ਦਾ ਵਰ�ਸਪ�ਸ ਦ� �ਸ ਤ�� �ੱਪਰਲ� ਵਰ�ਸਪ�ਸ ਵਿੱ� ਭ���"
 
 #: ../src/include/all-keybindings.h:134
-#| msgid "Switch to workspace below this one"
 msgid "Switch to workspace below the current workspace"
 msgstr "ਵਰ�ਸਪ�ਸ ਨ�ੰ ਮ���ਦਾ ਵਰ�ਸਪ�ਸ ਦ� �ਸ ਤ�� ਹ�ਠਲ� ਵਰ�ਸਪ�ਸ ਵਿੱ� ਭ���"
 
 #: ../src/include/all-keybindings.h:150
-#| msgid "Move between windows of an application with popup"
 msgid "Move between windows of an application, using a popup window"
 msgstr "�ੱ� �ਾਰ� ਦ� ਵਿੰਡ� ਵਿੱ� �ਾਣ ਸਮ�� ਪ�ਪ�ੱਪ ਵਿੰਡ� ਦ� ਵਰਤ�� �ਰ�"
 
 #: ../src/include/all-keybindings.h:153
-#| msgid "Move backwards between windows of an application with popup"
 msgid "Move backward between windows of an application, using a popup window"
 msgstr "�ੱ� �ਾਰ� ਦ��� ਵਿੰਡ� ਵਿੱ� ਪਿੱ�� ਵੱਲ ਭ��ਣ ਸਮ�� ਪ�ਪ�ੱਪ ਨਾਲ �ਾ�"
 
 #: ../src/include/all-keybindings.h:157
-#| msgid "Move between windows with popup"
 msgid "Move between windows, using a popup window"
 msgstr "ਵਿੰਡ� ਵਿੱ� ਭ��ਣ ਸਮ�� ਪ�ਪ�ੱਪ ਨਾਲ ਭ���"
 
 #: ../src/include/all-keybindings.h:160
-#| msgid "Move focus backwards between windows using popup display"
 msgid "Move backward between windows, using a popup window"
 msgstr "ਵਿੰਡ� ਵਿ� ਪਿੱ�� ਭ��ਣ ਦ�ਰਾਨ ਪ�ਪ�ੱਪ ਵਿੰਡ� ਦ� ਵਰਤ�� �ਰ�"
 
 #: ../src/include/all-keybindings.h:163
-#| msgid "Move between panels and the desktop with popup"
 msgid "Move between panels and the desktop, using a popup window"
 msgstr "ਪ�ਨਲ �ਤ� ਡ�ਸ��ਾਪ ਵਿੱ� ਭ��ਣ ਲ� ਪ�ਪ�ੱਪ ਵਿੰਡ� ਦ� ਵਰਤ�� �ਰ�"
 
 #: ../src/include/all-keybindings.h:166
-#| msgid "Move backwards between panels and the desktop with popup"
 msgid "Move backward between panels and the desktop, using a popup window"
 msgstr "ਪ�ਨਲ �ਤ� ਡ�ਸ��ਾਪ ਵਿੱ��� ਪਿੱ�� �ਾਣ ਲ� ਪ�ਪ�ੱਪ ਵਿੰਡ� ਦ� ਵਰਤ�� �ਰ�"
 
@@ -649,7 +617,6 @@ msgid "Move between windows of an application immediately"
 msgstr "�ੱ� �ਪਲ���ਸ਼ਨ ਦ��� ਵਿੰਡ� ਵਿੱ� ਤ�ਰੰਤ ਭ���"
 
 #: ../src/include/all-keybindings.h:174
-#| msgid "Move backwards between windows of an application immediately"
 msgid "Move backward between windows of an application immediately"
 msgstr "�ੱ� �ਪਲ���ਸ਼ਨ ਦ� ਵਿੰਡ� ਵਿੱ� ਤ�ਰੰਤ ਪਿੱ�� ਵੱਲ ਨ�ੰ �ਾ�"
 
@@ -658,7 +625,6 @@ msgid "Move between windows immediately"
 msgstr "ਵਿੰਡ� ਵਿ� ਫ�ਰਤ� ਨਾਲ ਲ� �ਾ�"
 
 #: ../src/include/all-keybindings.h:180
-#| msgid "Move backwards between windows immediately"
 msgid "Move backward between windows immediately"
 msgstr "ਵਿੰਡ� ਵਿ��ਾਰ ਫ�ਰਤ� ਨਾਲ ਪਿੱ�� ਵੱਲ ਨ�ੰ ਲ� �ਾ�"
 
@@ -671,17 +637,14 @@ msgid "Move backward between panels and the desktop immediately"
 msgstr "ਪ�ਨਲ �ਤ� ਵਿੰਡ� ਵਿ��ਾਰ ਤ�ਰੰਤ ਪਿੱ�� ਵੱਲ ਨ�ੰ �ਾ�"
 
 #: ../src/include/all-keybindings.h:191
-#| msgid "Hide all windows and focus desktop"
 msgid "Hide all normal windows and set focus to the desktop"
 msgstr "ਸਭ ਸਧਾਰਨ ਵਿੰਡ� �ਹਲ� �ਤ� ਡ�ਸ��ਾਪ ਫ��ਸ �ਰ�"
 
 #: ../src/include/all-keybindings.h:194
-#| msgid "Show the panel menu"
 msgid "Show the panel's main menu"
 msgstr "ਪ�ਨਲ ਦਾ ਮ�ੱ� ਮ�ਨ� ਵਿ��"
 
 #: ../src/include/all-keybindings.h:197
-#| msgid "Show the panel run application dialog"
 msgid "Show the panel's \"Run Application\" dialog box"
 msgstr "ਪ�ਨਲ ਵਿ� \"�ਪਲ���ਸ਼ਨ �ਲਾ�\" ਡਾ�ਲਾ� ਵ���"
 
@@ -698,7 +661,6 @@ msgid "Run a terminal"
 msgstr "�ਰਮ�ਨਲ �ਲਾ�"
 
 #: ../src/include/all-keybindings.h:257
-#| msgid "Activate window menu"
 msgid "Activate the window menu"
 msgstr "���ਿਵ ਵਿੰਡ� ਮ�ਨ�"
 
@@ -711,7 +673,6 @@ msgid "Toggle maximization state"
 msgstr "�ਧਿ�ਤਮ ਸਥਿਤ� �ਰ�"
 
 #: ../src/include/all-keybindings.h:264
-#| msgid "Lower window below other windows"
 msgid "Toggle whether a window will always be visible over other windows"
 msgstr "ਬਦਲ� �ਿ �� ਵਿੰਡ� ਹਮ�ਸ਼ਾ ਦ��ਿ�� ਵਿੰਡ��਼ �ੱਤ� ਵ��ਾ� ਦ�ਵ�"
 
@@ -720,7 +681,6 @@ msgid "Maximize window"
 msgstr "ਵਿੰਡ� �ਧਿ�ਤਮ"
 
 #: ../src/include/all-keybindings.h:268
-#| msgid "Resize window"
 msgid "Restore window"
 msgstr "ਵਿੰਡ� ਮ��-ਸ��ਰ"
 
@@ -745,7 +705,6 @@ msgid "Resize window"
 msgstr "ਵਿੰਡ� ਮ��-��ਾਰ"
 
 #: ../src/include/all-keybindings.h:281
-#| msgid "Toggle window on all workspaces"
 msgid "Toggle whether window is on all workspaces or just one"
 msgstr "ਬਦਲ� �ਿ �� ਵਿੰਡ� ਸਭ ਵਰ�ਸਪ�ਸਾ� ਵਿੱ� ਹ�ਵ� �ਾ� �ੱ� ਵਿੱ�"
 
@@ -814,7 +773,6 @@ msgid "Move window one workspace down"
 msgstr "ਵਿੰਡ� ਨ�ੰ �ੱ� ਵਰ�ਸਪ�ਸ ਹ�ਠਾ� ਲਿ�ਾ�"
 
 #: ../src/include/all-keybindings.h:342
-#| msgid "Raise obscured window, otherwise lower"
 msgid "Raise window if it's covered by another window, otherwise lower it"
 msgstr "ਵਿੰਡ� �ਭਾਰ�, �� ਹ�ਰ ਵਿੰਡ� ਨਾਲ ਢੱ�� ਹ�, ਨਹ�� ਤਾ� ਹ�ਠਾ� ਭ���"
 
@@ -835,47 +793,38 @@ msgid "Maximize window horizontally"
 msgstr "ਵਿੰਡ� �ਿਤਿ�� �ਧਿ�ਤਮ"
 
 #: ../src/include/all-keybindings.h:358
-#| msgid "Move window to north-west corner"
 msgid "Move window to north-west (top left) corner"
 msgstr "ਵਿੰਡ� �ੱਤਰ�-ਪੱ�ਮ� (�ੱਤ�-�ੱਬ�) ��ਨ� '� ਭ���"
 
 #: ../src/include/all-keybindings.h:361
-#| msgid "Move window to north-east corner"
 msgid "Move window to north-east (top right) corner"
 msgstr "ਵਿੰਡ� �ੱਤਰ�-ਪ�ਰਬ� (�ੱਤ� ਸੱ��) ��ਨ� '� ਭ���"
 
 #: ../src/include/all-keybindings.h:364
-#| msgid "Move window to south-west corner"
 msgid "Move window to south-west (bottom left) corner"
 msgstr "ਵਿੰਡ� ਦੱ�ਣ�-ਪੱ�ਮ� (ਹ�ਠਾ� �ੱਬ�) ��ਨ� '� ਭ���"
 
 #: ../src/include/all-keybindings.h:367
-#| msgid "Move window to south-east corner"
 msgid "Move window to south-east (bottom right) corner"
 msgstr "ਵਿੰਡ� ਦੱ�ਣ�-ਪ�ਰਬ� (ਹ�ਠਾ� ਸੱ��) ��ਨ� '� ਭ���"
 
 #: ../src/include/all-keybindings.h:371
-#| msgid "Move window to north side of screen"
 msgid "Move window to north (top) side of screen"
 msgstr "ਵਿੰਡ� ਨ�ੰ ਸ�ਰ�ਨ ਦ� �ੱਤਰ� ਪਾਸ� (�ੱਤ�) ਭ���"
 
 #: ../src/include/all-keybindings.h:374
-#| msgid "Move window to south side of screen"
 msgid "Move window to south (bottom) side of screen"
 msgstr "ਵਿੰਡ� ਨ�ੰ ਸ�ਰ�ਨ ਦ� ਦੱ�ਣ� (ਹ�ਠਾ�) ਪਾਸ� ਭ���"
 
 #: ../src/include/all-keybindings.h:377
-#| msgid "Move window to east side of screen"
 msgid "Move window to east (right) side of screen"
 msgstr "ਵਿੰਡ� ਨ�ੰ ਸ�ਰ�ਨ ਦ� ਪ�ਰਬ� (ਸੱ��) ਪਾਸ� ਭ���"
 
 #: ../src/include/all-keybindings.h:380
-#| msgid "Move window to west side of screen"
 msgid "Move window to west (left) side of screen"
 msgstr "ਵਿੰਡ� ਨ�ੰ ਸ�ਰ�ਨ ਦ� ਪੱ�ਮ� (�ੱਬ�) ਪਾਸ� ਭ���"
 
 #: ../src/include/all-keybindings.h:383
-#| msgid "Move window to east side of screen"
 msgid "Move window to center of screen"
 msgstr "ਵਿੰਡ� ਨ�ੰ ਸ�ਰ�ਨ ਦ� ਸ���ਰ ਵਿੱ� ਭ���"
 
@@ -911,13 +860,6 @@ msgid "Arrangement of buttons on the titlebar"
 msgstr "�ਾ��ਲ-ਬਾਰ �ੱਤ� ਬ�ਨਾ� ਦ� ਤਰਤ�ਬ"
 
 #: ../src/metacity.schemas.in.in.h:7
-#| msgid ""
-#| "Arrangement of buttons on the titlebar. The value should be a string, "
-#| "such as \"menu:minimize,maximize,close\"; the colon separates the left "
-#| "corner of the window from the right corner, and the button names are "
-#| "comma-separated. Duplicate buttons are not allowed. Unknown button names "
-#| "are silently ignored so that buttons can be added in future metacity "
-#| "versions without breaking older versions."
 msgid ""
 "Arrangement of buttons on the titlebar. The value should be a string, such "
 "as \"menu:minimize,maximize,spacer,close\"; the colon separates the left "
@@ -927,11 +869,10 @@ msgid ""
 "without breaking older versions. A special spacer tag can be used to insert "
 "some space between two adjacent buttons."
 msgstr ""
-"�ਾ��ਲ-ਬਾਰ �ੱਤ� ਬ�ਨਾ� ਦਾ ਪਰਬੰਧ। ��ਮਤ, ਸਤਰ ਹ�ਣ� �ਾਹ�ਦ� ਹ�, �ਿਵ�� �ਿ "
-"\"menu:minimize,maximize,spacer,close(ਮ�ਨ�:���ਾ,ਵੱਡਾ ਬੰਦ)\"; ��ਲਨ ਵਿੰਡ� ਦ� �ੱਬ� ��ੰ�� ਨ�ੰ ਸੱ�� ਤ�� "
-"ਵੱ� "
-"�ਰਦਾ ਹ�,�ਤ� ਬ�ਨ ਨਾ� �ਾਮ� ਨਾਲ ਵੱ� ਹਨ। ਨ�ਲ� ਬ�ਨਾ� ਦ� ��ਾ�ਤ ਨਹ��। �ਣ�ਾਣ ਬ�ਨ �ਣਡਿੱਠ ��ਤ� "
-"�ਾਣ�� ਤਾ� �ਿ ਬ�ਨ, ਮ��ਾਸਿ�� ਦ� ਪ�ਰਾਣ�ਵਰ�ਨ ਨ�ੰ ਤ��� ਬਿਨਾ� ਨਵ�� ਵਰ�ਨ ਵਿੱ� ���� �ਾ ਸ�ਣ।"
+"�ਾ��ਲ-ਬਾਰ �ੱਤ� ਬ�ਨਾ� ਦਾ ਪਰਬੰਧ। ��ਮਤ, ਸਤਰ ਹ�ਣ� �ਾਹ�ਦ� ਹ�, �ਿਵ�� �ਿ \"menu:minimize,"
+"maximize,spacer,close(ਮ�ਨ�:���ਾ,ਵੱਡਾ ਬੰਦ)\"; ��ਲਨ ਵਿੰਡ� ਦ� �ੱਬ� ��ੰ�� ਨ�ੰ ਸੱ�� ਤ�� ਵੱ� �ਰਦਾ ਹ�,�ਤ� "
+"ਬ�ਨ ਨਾ� �ਾਮ� ਨਾਲ ਵੱ� ਹਨ। ਨ�ਲ� ਬ�ਨਾ� ਦ� ��ਾ�ਤ ਨਹ��। �ਣ�ਾਣ ਬ�ਨ �ਣਡਿੱਠ ��ਤ� �ਾਣ�� ਤਾ� �ਿ "
+"ਬ�ਨ, ਮ��ਾਸਿ�� ਦ� ਪ�ਰਾਣ�ਵਰ�ਨ ਨ�ੰ ਤ��� ਬਿਨਾ� ਨਵ�� ਵਰ�ਨ ਵਿੱ� ���� �ਾ ਸ�ਣ।"
 
 #: ../src/metacity.schemas.in.in.h:8
 msgid "Automatically raises the focused window"
@@ -941,18 +882,20 @@ msgstr "ਫ��ਸ ਹ�� ਵਿੰਡ� ��ਮ��ਿ� �ਭਾ
 #| msgid ""
 #| "Clicking a window while holding down this modifier key will move the "
 #| "window (left click), resize the window (middle click), or show the window "
-#| "menu (right click). Modifier is expressed as \"&lt;Alt&gt;\" or \"&lt;"
-#| "Super&gt;\" for example."
+#| "menu (right click). The left and right operations may be swapped using "
+#| "the \"mouse_button_resize\" key. Modifier is expressed as \"&lt;Alt&gt;\" "
+#| "or \"&lt;Super&gt;\" for example."
 msgid ""
 "Clicking a window while holding down this modifier key will move the window "
 "(left click), resize the window (middle click), or show the window menu "
-"(right click). The left and right operations may be swapped using the "
-"\"mouse_button_resize\" key. Modifier is expressed as \"&lt;Alt&gt;\" or "
-"\"&lt;Super&gt;\" for example."
+"(right click). The middle and right click operations may be swapped using "
+"the \"resize_with_right_button\" key. Modifier is expressed as \"&lt;Alt&gt;"
+"\" or \"&lt;Super&gt;\" for example."
 msgstr ""
 "�ਸ ਸ�ਧ� ਸਵਿੱ� ਨ�ੰ ਦਬਾ �� ਵਿੰਡ� �ੱਤ� ਦਬਾ� ਨਾਲ ਵਿੰਡ� ਹਿੱਲ��� (�ੱਬਾ ਦਬਾ�ਣ ਨਾਲ), ਵਿੰਡ� ਨ�ੰ ਮ�� ��ਾਰ "
-"ਦਿ� (ਵਿ��ਾਰਲਾ ਦਬਾ�ਣ ਨਾਲ), �ਾ� ਵਿੰਡ� ਮ�ਨ� ਵਿ�ਾ� (ਸੱ�ਾ ਦਬਾ�ਣ ਨਾਲ)। ਮ�ਡ�ਫਾ�ਰ �ਦਾਹਰਨ ਵ��� "
-"�ਸ ਤਰਾ� ਦਰਸਾ�� �ਿ� \"&lt;Alt&gt;\" �ਾ� \"&lt;Super&gt;\""
+"ਦਿ� (ਵਿ��ਾਰਲਾ ਦਬਾ�ਣ ਨਾਲ), �ਾ� ਵਿੰਡ� ਮ�ਨ� ਵਿ�ਾ� (ਸੱ�ਾ ਦਬਾ�ਣ ਨਾਲ)। ਮੱਧ �ਤ� ਸੱ�ਾ �ਲਿੱ� "
+"�ਪਰ�ਸ਼ਨ \"resize_with_right_button\" ਨਾਲ �ਪਸ ਵਿੱ� ਬਦਲ� �ਾ ਸ�ਦ� ਹਨ। ਮ�ਡ�ਫਾ�ਰ "
+"�ਦਾਹਰਨ ਵ��� �ਸ ਤਰਾ� ਦਰਸਾ�� �ਿ� \"&lt;Alt&gt;\" �ਾ� \"&lt;Super&gt;\""
 
 #: ../src/metacity.schemas.in.in.h:10
 msgid "Commands to run in response to keybindings"
@@ -1075,28 +1018,10 @@ msgid ""
 "set it to false to make it work the opposite way around."
 msgstr ""
 "�� ਸਹ�� ��ਤਾ ਤਾ� ਸੱ�� ਬ�ਨ ਨਾਲ ਮ��-ਸਾ��਼ ��ਤਾ �ਾਵ��ਾ �ਤ� ਮੱਧ �ਲਿੱ� ਨਾਲ ਮ�ਨ� ਵ��ਾ�� �ਾਵ��ਾ, "
-"�ਦ�� �� \"mouse_button_modifier\" ਵਿੱ� ਦਿੱਤ� ��ੰ�� ਹ�ਲਡ ��ਤ� �ਾਵ���; �ਸ ਨ�ੰ �ਲਤ ਰੱ�ਣ "
-"ਦਾ �ਰਥ ਹ� �ਿ �ਸ ਦ� �ਲ� �ੰਮ �ਰਨਾ"
+"�ਦ�� �� \"mouse_button_modifier\" ਵਿੱ� ਦਿੱਤ� ��ੰ�� ਹ�ਲਡ ��ਤ� �ਾਵ���; �ਸ ਨ�ੰ �ਲਤ ਰੱ�ਣ ਦਾ "
+"�ਰਥ ਹ� �ਿ �ਸ ਦ� �ਲ� �ੰਮ �ਰਨਾ"
 
 #: ../src/metacity.schemas.in.in.h:30
-#| msgid ""
-#| "Setting this option to false can lead to buggy behavior, so users are "
-#| "strongly discouraged from changing it from the default of true. Many "
-#| "actions (e.g. clicking in the client area, moving or resizing the window) "
-#| "normally raise the window as a side-effect. Set this option to false to "
-#| "decouple raising from other user actions. Even when this option is false, "
-#| "windows can still be raised by an alt-left-click anywhere on the window, "
-#| "a normal click on the window decorations, or by special messages from "
-#| "pagers, such as activation requests from tasklist applets. This option is "
-#| "currently disabled in click-to-focus mode. Note that the list of ways to "
-#| "raise windows when raise_on_click is false does not include programmatic "
-#| "requests from applications to raise windows; such requests will be "
-#| "ignored regardless of the reason for the request. If you are an "
-#| "application developer and have a user complaining that your application "
-#| "does not work with this setting disabled, tell them it is _their_ fault "
-#| "for breaking their window manager and that they need to change this "
-#| "option back to true or live with the bug they requested. See also http://";
-#| "bugzilla.gnome.org/show_bug.cgi?id=445447#c6."
 msgid ""
 "Setting this option to false can lead to buggy behavior, so users are "
 "strongly discouraged from changing it from the default of true. Many actions "
@@ -1121,14 +1046,14 @@ msgstr ""
 "�ਿ� ਹ�। ��� ਫੰ�ਸ਼ਨ (�ਿਵ�� �ਿ �ਲਾ�� ��ਤਰ ਵਿੱ� �ਲਿੱ� �ਰਨਾ, ਵਿੰਡ� ਹਿਲਾ�ਣ� �ਾ� ਮ��-��ਾਰ �ਰਨਾ) "
 "ਸਾ�ਡ-ਪਰਭਾਵ ਦ� �ਧ�ਨ ਵਿੰਡ� �ਭਾਰ ਦਿੰਦ� ਹਨ। �ਹ ��ਣ �ਲਤ �ਰਨ ਨਾਲ, ਹ�ਰ ਯ��਼ਰ ��ਸ਼ਨ ਤ�� �ਭਾਰਨ ਨ�ੰ "
 "ਡਿ-�ਪਲ �ਰ ਦਿੰਦ� ਹ�। http://bugzilla.gnome.org/show_bug.cgi?id=445447#c6 ਵ���। "
-"ਭਾਵ�� �ਹ ��ਣ �ਲਤ ਹ�, ਵਿੰਡ� ਨ�ੰ ਵਿੰਡ� �ੱਤ� �ਿਤ� ਵ� alt-left-click �ਰਨ, �ੱ� "
-"�ਮ ਵਿੰਡ� ਸ�ਾਵ�, �ਾ� ਪ��਼ਰ ਤ�� �ਾਸ ਸ�ਨ�ਹਿ�� ਨਾਲ ਨਾਲ �ਭਾਰਿ� �ਾ ਸ�ਦਾ ਹ�, �ਿਵ�� �ਿ �ਾਸ�-ਲਿਸ� "
-"�ਪਲਿ� ਤ�� ����ਵ�ਸ਼ਨ ਮੰ�। �ਹ ��ਣ �ਸ ਸਮ�� �ਲਿੱ�-�ਤ�-ਫ��ਸ ਮ�ਡ ਰਾਹ�� �ਯ�� ਹ�। ਯਾਦ ਰੱ�� �ਿ ਵਿੰਡ� ਨ�ੰ "
-"�ਭਾਰਨ ਦ� ਢੰ� ਦ� ਲਿਸ�, �ਦ�� �ਿ raise_on_click �ਲਤ ਹ�ਵ�, �ਪਲ���ਸ਼ਨ ਤ�� ਵਿੰਡ� �ਭਾਰਨ ਦ� ਮੰ� "
-"ਵਿੱ� ਸ਼ਾਮਲ ਨਹ�� ਹ�, �ਿਵ�� �ਿ �ਸ �ਿਸਮ ਦ��� ਮੰ� ਨ�ੰ �ਾਰਨ ਬਿਨਾ� ਹ� �ਣਡਿੱਠਾ �ਰ ਦਿੱਤਾ �ਾਵ��ਾ। �� "
-"ਤ�ਸ�� �ਾਰ� ���� ਹ� �ਤ� ਯ��਼ਰ ਸ਼ਿ�ਾ�ਤ ਹ� �ਿ �ਹ ਸ��ਿੰ� �ਯ�� �ਰਨ ਨਾਲ ਤ�ਹਾਡ� �ਪਲ���ਸ਼ਨ �ੰਮ ਨਹ�� "
-"�ਰਦ� ਹ� ਤਾ� �ਹ �ਨ�ਹਾ� ਦ� �ਲਤ� ਹ�, �ਿ���ਿ �ਨ�ਹਾ� ਦਾ ਵਿੰਡ� ਮ�ਨ��ਰ �ਰਾਬ ਹ� �ਤ� �ਨ�ਹਾ� ਨ�ੰ �ਹ ��ਣ "
-"ਬਦਲ �� ਠ�� �ਰਨ� ਹ�ਵ��� �ਾ� �ਨ�ਹਾ� ਨ�ੰ ਬੱ� ਦ� ਦਿ�।"
+"ਭਾਵ�� �ਹ ��ਣ �ਲਤ ਹ�, ਵਿੰਡ� ਨ�ੰ ਵਿੰਡ� �ੱਤ� �ਿਤ� ਵ� alt-left-click �ਰਨ, �ੱ� �ਮ ਵਿੰਡ� ਸ�ਾਵ�, �ਾ� "
+"ਪ��਼ਰ ਤ�� �ਾਸ ਸ�ਨ�ਹਿ�� ਨਾਲ ਨਾਲ �ਭਾਰਿ� �ਾ ਸ�ਦਾ ਹ�, �ਿਵ�� �ਿ �ਾਸ�-ਲਿਸ� �ਪਲਿ� ਤ�� ����ਵ�ਸ਼ਨ "
+"ਮੰ�। �ਹ ��ਣ �ਸ ਸਮ�� �ਲਿੱ�-�ਤ�-ਫ��ਸ ਮ�ਡ ਰਾਹ�� �ਯ�� ਹ�। ਯਾਦ ਰੱ�� �ਿ ਵਿੰਡ� ਨ�ੰ �ਭਾਰਨ ਦ� ਢੰ� ਦ� "
+"ਲਿਸ�, �ਦ�� �ਿ raise_on_click �ਲਤ ਹ�ਵ�, �ਪਲ���ਸ਼ਨ ਤ�� ਵਿੰਡ� �ਭਾਰਨ ਦ� ਮੰ� ਵਿੱ� ਸ਼ਾਮਲ ਨਹ�� ਹ�, "
+"�ਿਵ�� �ਿ �ਸ �ਿਸਮ ਦ��� ਮੰ� ਨ�ੰ �ਾਰਨ ਬਿਨਾ� ਹ� �ਣਡਿੱਠਾ �ਰ ਦਿੱਤਾ �ਾਵ��ਾ। �� ਤ�ਸ�� �ਾਰ� ���� ਹ� "
+"�ਤ� ਯ��਼ਰ ਸ਼ਿ�ਾ�ਤ ਹ� �ਿ �ਹ ਸ��ਿੰ� �ਯ�� �ਰਨ ਨਾਲ ਤ�ਹਾਡ� �ਪਲ���ਸ਼ਨ �ੰਮ ਨਹ�� �ਰਦ� ਹ� ਤਾ� �ਹ "
+"�ਨ�ਹਾ� ਦ� �ਲਤ� ਹ�, �ਿ���ਿ �ਨ�ਹਾ� ਦਾ ਵਿੰਡ� ਮ�ਨ��ਰ �ਰਾਬ ਹ� �ਤ� �ਨ�ਹਾ� ਨ�ੰ �ਹ ��ਣ ਬਦਲ �� ਠ�� �ਰਨ� "
+"ਹ�ਵ��� �ਾ� �ਨ�ਹਾ� ਨ�ੰ ਬੱ� ਦ� ਦਿ�।"
 
 #: ../src/metacity.schemas.in.in.h:31
 msgid ""
@@ -1241,12 +1166,6 @@ msgid "The window screenshot command"
 msgstr "ਵਿੰਡ� ਸ�ਰ�ਨ-ਸ਼ਾ� �ਮਾ�ਡ"
 
 #: ../src/metacity.schemas.in.in.h:44
-#| msgid ""
-#| "This option determines the effects of double-clicking on the title bar. "
-#| "Current valid options are 'toggle_shade', which will shade/unshade the "
-#| "window, 'toggle_maximize' which will maximize/unmaximize the window, "
-#| "'minimize' which will minimize the window, and 'none' which will not do "
-#| "anything."
 msgid ""
 "This option determines the effects of double-clicking on the title bar. "
 "Current valid options are 'toggle_shade', which will shade/unshade the "
@@ -1258,21 +1177,14 @@ msgid ""
 "the others, and 'none' which will not do anything."
 msgstr ""
 "�ਹ ��ਣ �ਾ��ਲ-ਬਾਰ �ੱਤ� ਦ� ਵਾਰ ਦਬਾ� ਦਾ ਪ�ਰਭਾਵ ਨਿਰਧਾਰਿਤ �ਰਦ� ਹ�। ਮ���ਦ ਯ�� ��ਣਾ� ਹਨ  "
-"'toggle_shade (ਰੰ�ਤ_ਬਦਲ�)', �ਿਹ�� ਵਿੰਡ� ਨ�ੰ ਰੰ�ਤ/ਬਿਨਾ�-ਰੰ�ਤ �ਰਦ� ਹ�, �ਤ� 'toggle_maximize "
-"(�ਧਿ�ਤਮ ਬਦਲ�)' �ਿਹ�� ਵਿੰਡ� ਨ�ੰ maximize/unmaximize (�ਧਿ�ਤਮ/ਨਾ-�ਧਿ�ਤਮ) �ਰਦ� ਹ�, "
-"'toggle_maximize_horizontally' �ਤ� 'toggle_maximize_vertically' �� ਵਿੰਡ� ਨ�ੰ "
-"�ਸ ਦਿਸ਼ਾ ਵਿੱ� ਵੱਧ�-ਵੱਧ/�ਣ-ਵੱਧ�-ਵੱਧ �ਰਦ� ਹ�,'�ਪਲ��ਰਨ', �� �ਿ ਵਿੰਢ� ਨ�ੰ �ਪਲ��ਰਨ �ਰਦ� ਹ�, �ਤ� "
-"'��� ਨਹ��' ��� ਨਹ�� �ਰ��ਾ, 'ਮ�ਨ�' ਵਿੰਡ� ਮ�ਨ� ਵ��ਾ��ਾ, 'ਸ਼�ਡ' ਵਿੰਡ� ਰ�ਲ �ਰ��ਾ, �ਤ� 'ਹ�ਠਾ�' ਵਿੰਡ� "
-"ਨ�ੰ ਹ�ਰ "
-"ਵਿੰਡ� ਹ�ਠ ਭ����ਾ।"
+"'toggle_shade (ਰੰ�ਤ_ਬਦਲ�)', �ਿਹ�� ਵਿੰਡ� ਨ�ੰ ਰੰ�ਤ/ਬਿਨਾ�-ਰੰ�ਤ �ਰਦ� ਹ�, �ਤ� "
+"'toggle_maximize (�ਧਿ�ਤਮ ਬਦਲ�)' �ਿਹ�� ਵਿੰਡ� ਨ�ੰ maximize/unmaximize (�ਧਿ�ਤਮ/ਨਾ-"
+"�ਧਿ�ਤਮ) �ਰਦ� ਹ�, 'toggle_maximize_horizontally' �ਤ� "
+"'toggle_maximize_vertically' �� ਵਿੰਡ� ਨ�ੰ �ਸ ਦਿਸ਼ਾ ਵਿੱ� ਵੱਧ�-ਵੱਧ/�ਣ-ਵੱਧ�-ਵੱਧ �ਰਦ� "
+"ਹ�,'�ਪਲ��ਰਨ', �� �ਿ ਵਿੰਢ� ਨ�ੰ �ਪਲ��ਰਨ �ਰਦ� ਹ�, �ਤ� '��� ਨਹ��' ��� ਨਹ�� �ਰ��ਾ, 'ਮ�ਨ�' ਵਿੰਡ� ਮ�ਨ� "
+"ਵ��ਾ��ਾ, 'ਸ਼�ਡ' ਵਿੰਡ� ਰ�ਲ �ਰ��ਾ, �ਤ� 'ਹ�ਠਾ�' ਵਿੰਡ� ਨ�ੰ ਹ�ਰ ਵਿੰਡ� ਹ�ਠ ਭ����ਾ।"
 
 #: ../src/metacity.schemas.in.in.h:45
-#| msgid ""
-#| "This option determines the effects of middle-clicking on the title bar. "
-#| "Current valid options are 'toggle_shade', which will shade/unshade the "
-#| "window, 'toggle_maximize' which will maximize/unmaximize the window, "
-#| "'minimize' which will minimize the window, and 'none' which will not do "
-#| "anything."
 msgid ""
 "This option determines the effects of middle-clicking on the title bar. "
 "Current valid options are 'toggle_shade', which will shade/unshade the "
@@ -1284,21 +1196,14 @@ msgid ""
 "the others, and 'none' which will not do anything."
 msgstr ""
 "�ਹ ��ਣ �ਾ��ਲ-ਬਾਰ �ੱਤ� ਮਿਡਲ-�ਲਿੱ� ਦਬਾ� ਦਾ ਪ�ਰਭਾਵ ਪ�ਾਣਦ� ਹ�। ਮ���ਦ ਯ�� ��ਣਾ� ਹਨ  "
-"'toggle_shade (ਰੰ�ਤ_ਬਦਲ�)', �ਿਹ�� ਵਿੰਡ� ਨ�ੰ ਰੰ�ਤ/ਬਿਨਾ�-ਰੰ�ਤ �ਰਦ� ਹ�, �ਤ� 'toggle_maximize "
-"(�ਧਿ�ਤਮ ਬਦਲ�)' �ਿਹ�� ਵਿੰਡ� ਨ�ੰ maximize/unmaximize (�ਧਿ�ਤਮ/ਨਾ-�ਧਿ�ਤਮ) �ਰਦ� ਹ�, "
-"'toggle_maximize_horizontally' �ਤ� 'toggle_maximize_vertically' �� ਵਿੰਡ� ਨ�ੰ "
-"�ਸ ਦਿਸ਼ਾ ਵਿੱ� ਵੱਧ�-ਵੱਧ/�ਣ-ਵੱਧ�-ਵੱਧ �ਰਦ� ਹ�,'�ਪਲ��ਰਨ', �� �ਿ ਵਿੰਢ� ਨ�ੰ �ਪਲ��ਰਨ �ਰਦ� ਹ�, �ਤ� "
-"'��� ਨਹ��' ��� ਨਹ�� �ਰ��ਾ, 'ਮ�ਨ�' ਵਿੰਡ� ਮ�ਨ� ਵ��ਾ��ਾ, 'ਸ਼�ਡ' ਵਿੰਡ� ਰ�ਲ �ਰ��ਾ, �ਤ� 'ਹ�ਠਾ�' ਵਿੰਡ� "
-"ਨ�ੰ ਹ�ਰ "
-"ਵਿੰਡ� ਹ�ਠ ਭ����ਾ।"
+"'toggle_shade (ਰੰ�ਤ_ਬਦਲ�)', �ਿਹ�� ਵਿੰਡ� ਨ�ੰ ਰੰ�ਤ/ਬਿਨਾ�-ਰੰ�ਤ �ਰਦ� ਹ�, �ਤ� "
+"'toggle_maximize (�ਧਿ�ਤਮ ਬਦਲ�)' �ਿਹ�� ਵਿੰਡ� ਨ�ੰ maximize/unmaximize (�ਧਿ�ਤਮ/ਨਾ-"
+"�ਧਿ�ਤਮ) �ਰਦ� ਹ�, 'toggle_maximize_horizontally' �ਤ� "
+"'toggle_maximize_vertically' �� ਵਿੰਡ� ਨ�ੰ �ਸ ਦਿਸ਼ਾ ਵਿੱ� ਵੱਧ�-ਵੱਧ/�ਣ-ਵੱਧ�-ਵੱਧ �ਰਦ� "
+"ਹ�,'�ਪਲ��ਰਨ', �� �ਿ ਵਿੰਢ� ਨ�ੰ �ਪਲ��ਰਨ �ਰਦ� ਹ�, �ਤ� '��� ਨਹ��' ��� ਨਹ�� �ਰ��ਾ, 'ਮ�ਨ�' ਵਿੰਡ� ਮ�ਨ� "
+"ਵ��ਾ��ਾ, 'ਸ਼�ਡ' ਵਿੰਡ� ਰ�ਲ �ਰ��ਾ, �ਤ� 'ਹ�ਠਾ�' ਵਿੰਡ� ਨ�ੰ ਹ�ਰ ਵਿੰਡ� ਹ�ਠ ਭ����ਾ।"
 
 #: ../src/metacity.schemas.in.in.h:46
-#| msgid ""
-#| "This option determines the effects of right-clicking on the title bar. "
-#| "Current valid options are 'toggle_shade', which will shade/unshade the "
-#| "window, 'toggle_maximize' which will maximize/unmaximize the window, "
-#| "'minimize' which will minimize the window, and 'none' which will not do "
-#| "anything."
 msgid ""
 "This option determines the effects of right-clicking on the title bar. "
 "Current valid options are 'toggle_shade', which will shade/unshade the "
@@ -1310,13 +1215,12 @@ msgid ""
 "the others, and 'none' which will not do anything."
 msgstr ""
 "�ਹ ��ਣ �ਾ��ਲ-ਬਾਰ �ੱਤ� ਸੱ�ਾ-�ਲਿੱ� ਦਬਾ� ਦਾ ਪ�ਰਭਾਵ ਪ�ਾਣਦ� ਹ�। ਮ���ਦ ਯ�� ��ਣਾ� ਹਨ  "
-"'toggle_shade (ਰੰ�ਤ_ਬਦਲ�)', �ਿਹ�� ਵਿੰਡ� ਨ�ੰ ਰੰ�ਤ/ਬਿਨਾ�-ਰੰ�ਤ �ਰਦ� ਹ�, �ਤ� 'toggle_maximize "
-"(�ਧਿ�ਤਮ ਬਦਲ�)' �ਿਹ�� ਵਿੰਡ� ਨ�ੰ maximize/unmaximize (�ਧਿ�ਤਮ/ਨਾ-�ਧਿ�ਤਮ) �ਰਦ� ਹ�, "
-"'toggle_maximize_horizontally' �ਤ� 'toggle_maximize_vertically' �� ਵਿੰਡ� ਨ�ੰ "
-"�ਸ ਦਿਸ਼ਾ ਵਿੱ� ਵੱਧ�-ਵੱਧ/�ਣ-ਵੱਧ�-ਵੱਧ �ਰਦ� ਹ�,'�ਪਲ��ਰਨ', �� �ਿ ਵਿੰਢ� ਨ�ੰ �ਪਲ��ਰਨ �ਰਦ� ਹ�, �ਤ� "
-"'��� ਨਹ��' ��� ਨਹ�� �ਰ��ਾ, 'ਮ�ਨ�' ਵਿੰਡ� ਮ�ਨ� ਵ��ਾ��ਾ, 'ਸ਼�ਡ' ਵਿੰਡ� ਰ�ਲ �ਰ��ਾ, �ਤ� 'ਹ�ਠਾ�' ਵਿੰਡ� "
-"ਨ�ੰ ਹ�ਰ "
-"ਵਿੰਡ� ਹ�ਠ ਭ����ਾ।"
+"'toggle_shade (ਰੰ�ਤ_ਬਦਲ�)', �ਿਹ�� ਵਿੰਡ� ਨ�ੰ ਰੰ�ਤ/ਬਿਨਾ�-ਰੰ�ਤ �ਰਦ� ਹ�, �ਤ� "
+"'toggle_maximize (�ਧਿ�ਤਮ ਬਦਲ�)' �ਿਹ�� ਵਿੰਡ� ਨ�ੰ maximize/unmaximize (�ਧਿ�ਤਮ/ਨਾ-"
+"�ਧਿ�ਤਮ) �ਰਦ� ਹ�, 'toggle_maximize_horizontally' �ਤ� "
+"'toggle_maximize_vertically' �� ਵਿੰਡ� ਨ�ੰ �ਸ ਦਿਸ਼ਾ ਵਿੱ� ਵੱਧ�-ਵੱਧ/�ਣ-ਵੱਧ�-ਵੱਧ �ਰਦ� "
+"ਹ�,'�ਪਲ��ਰਨ', �� �ਿ ਵਿੰਢ� ਨ�ੰ �ਪਲ��ਰਨ �ਰਦ� ਹ�, �ਤ� '��� ਨਹ��' ��� ਨਹ�� �ਰ��ਾ, 'ਮ�ਨ�' ਵਿੰਡ� ਮ�ਨ� "
+"ਵ��ਾ��ਾ, 'ਸ਼�ਡ' ਵਿੰਡ� ਰ�ਲ �ਰ��ਾ, �ਤ� 'ਹ�ਠਾ�' ਵਿੰਡ� ਨ�ੰ ਹ�ਰ ਵਿੰਡ� ਹ�ਠ ਭ����ਾ।"
 
 #: ../src/metacity.schemas.in.in.h:47
 msgid ""
@@ -1384,7 +1288,6 @@ msgid "Maximize Window"
 msgstr "ਵਿੰਡ� �ਧਿ�ਤਮ �ਰ�"
 
 #: ../src/ui/frames.c:1130
-#| msgid "Resize window"
 msgid "Restore Window"
 msgstr "ਵਿੰਡ� ਮ��-ਸ��ਰ �ਰ�"
 
@@ -1494,8 +1397,8 @@ msgstr "ਵਰ�ਸਪ�ਸ ਵਿੱ� ਹ�ਠਾ� ਲ� �ਾ�(_D)"
 msgid "_Close"
 msgstr "ਬੰਦ �ਰ�(_C)"
 
-#: ../src/ui/menu.c:203, c-format
-#| msgid "Workspace %d"
+#: ../src/ui/menu.c:203
+#, c-format
 msgid "Workspace %d%n"
 msgstr "ਵਰ�ਸਪ�ਸ %d%n"
 
@@ -1805,8 +1708,8 @@ msgstr "�ਰ��ਡ�ਨ�� ��ਸ਼ਪਰ�ਸ਼ਨ ਵਿੱ�
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "�ਰ��ਡ�ਨ�� ��ਸ਼ਪਰ�ਸ਼ਨ ਵਿੱ� ��� ਵ� �ਪ�ਰ��ਰ �ਾ� ਪ�ਰਭਾਵ� �ੰ� ਨਹ�� ਦਿਸਦਾ"
 
-#: ../src/ui/theme.c:2596 ../src/ui/theme.c:2616 ../src/ui/theme.c:2636, c-format
-#| msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
+#: ../src/ui/theme.c:2596 ../src/ui/theme.c:2616 ../src/ui/theme.c:2636
+#, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "ਥ�ਮ ਵਿੱ� ਸਮ��ਰਨ ਹ�, �ਿਸ ਦਾ ਨਤ��ਾ ਹ� �ਲਤ�: %s\n"
 
@@ -1857,8 +1760,8 @@ msgstr "ਸਥਿਰ \"%s\" ਪਹਿਲਾ� ਹ� ਪਰਭਾਸ਼ਿਤ �
 #. Translators: This means that an attribute which should have been found
 #. * on an XML element was not in fact found.
 #.
-#: ../src/ui/theme-parser.c:202, c-format
-#| msgid "No \"x\" attribute on element <%s>"
+#: ../src/ui/theme-parser.c:202
+#, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%2$s> �ਲ�ਮ��� �ੱਤ� ��� \"%1$s\" ��ਣ ਨਹ��"
 
@@ -1976,15 +1879,12 @@ msgstr "<%s> �ਲ�ਮ��� ਨ�ੰ <%s> ਹ�ਠਾ� ��ਾ�
 
 #: ../src/ui/theme-parser.c:1343 ../src/ui/theme-parser.c:1357
 #: ../src/ui/theme-parser.c:1402
-#| msgid ""
-#| "Cannot specify both button_width/button_height and aspect ratio for "
-#| "buttons"
 msgid ""
 "Cannot specify both \"button_width\"/\"button_height\" and \"aspect_ratio\" "
 "for buttons"
 msgstr ""
-"ਬ�ਨਾ� ਲ� ਦ�ਨ�� \"button_width\"/\"button_height\" �ਤ� \"aspect_ratio\" "
-"ਦਿੱਤਾ ਨਹ�� �ਾ ਸ�ਦਾ ਹ�"
+"ਬ�ਨਾ� ਲ� ਦ�ਨ�� \"button_width\"/\"button_height\" �ਤ� \"aspect_ratio\" ਦਿੱਤਾ ਨਹ�� "
+"�ਾ ਸ�ਦਾ ਹ�"
 
 #: ../src/ui/theme-parser.c:1366
 #, c-format
@@ -2194,8 +2094,8 @@ msgstr "<%s> �ਲ�ਮ��� ਵਿੱ� �ਿਸ� ਪਾਠ ਨ�ੰ
 
 #: ../src/ui/theme-parser.c:3724 ../src/ui/theme-parser.c:3736
 #: ../src/ui/theme-parser.c:3748 ../src/ui/theme-parser.c:3760
-#: ../src/ui/theme-parser.c:3772, c-format
-#| msgid "<name> specified twice for this theme"
+#: ../src/ui/theme-parser.c:3772
+#, c-format
 msgid "<%s> specified twice for this theme"
 msgstr "�ਸ ਥ�ਮ ਲ� <%s> ਦ� ਵਾਰ ਦਿੱਤਾ �ਿ�"
 
@@ -2257,109 +2157,97 @@ msgstr "/ਵਿੰਡ�/ਸਾਰ� ਡ��(_A)"
 msgid "/Windows/Des_ktop"
 msgstr "/ਵਿੰਡ�/ਡ�ਸ��ਾਪ(_k)"
 
-#: ../src/ui/theme-viewer.c:136
-msgid "Open another one of these windows"
-msgstr "�ਹਨਾ� ਵਿੰਡ��਼ ਵਿੱ��� ��� ਹ�ਰ ��ਲ�ਹ�"
-
-#: ../src/ui/theme-viewer.c:143
-msgid "This is a demo button with an 'open' icon"
-msgstr "�ਹ '��ਲ�ਹ�' ���ਾਨ ਨਾਲ ਡ�ਮ� ਬ�ਨ ਹ�"
-
-#: ../src/ui/theme-viewer.c:150
-msgid "This is a demo button with a 'quit' icon"
-msgstr "�ਹ 'ਬਾਹਰ �ਾ�' ���ਾਨ ਨਾਲ ਡ�ਮ� ਬ�ਨ ਹ�"
-
-#: ../src/ui/theme-viewer.c:243
+#: ../src/ui/theme-viewer.c:244
 msgid "This is a sample message in a sample dialog"
 msgstr "�ਹ ਸ��ਪਲ ਡਾ�ਲਾ� ਵਿੱ� ਸ��ਪਲ ਸ�ਨ�ਹਾ ਹ�"
 
-#: ../src/ui/theme-viewer.c:326
+#: ../src/ui/theme-viewer.c:327
 #, c-format
 msgid "Fake menu item %d\n"
 msgstr "ਨ�ਲ� ਮ�ਨ� ���ਮ %d\n"
 
-#: ../src/ui/theme-viewer.c:360
+#: ../src/ui/theme-viewer.c:361
 msgid "Border-only window"
 msgstr "��ਵਲ ਬਾਰਡਰ ਵਿੰਡ�"
 
-#: ../src/ui/theme-viewer.c:362
+#: ../src/ui/theme-viewer.c:363
 msgid "Bar"
 msgstr "ਬਾਰ"
 
-#: ../src/ui/theme-viewer.c:379
+#: ../src/ui/theme-viewer.c:380
 msgid "Normal Application Window"
 msgstr "ਸਾਧਾਰਨ �ਪਲ���ਸ਼ਨ ਵਿੰਡ�"
 
-#: ../src/ui/theme-viewer.c:383
+#: ../src/ui/theme-viewer.c:384
 msgid "Dialog Box"
 msgstr "ਡਾ�ਲਾ� ਡੱਬਾ"
 
-#: ../src/ui/theme-viewer.c:387
+#: ../src/ui/theme-viewer.c:388
 msgid "Modal Dialog Box"
 msgstr "ਮਾਡਲ ਡਾ�ਲਾ� ਡੱਬਾ"
 
-#: ../src/ui/theme-viewer.c:391
+#: ../src/ui/theme-viewer.c:392
 msgid "Utility Palette"
 msgstr "ਸਹ�ਲਤ ਪਲ���"
 
-#: ../src/ui/theme-viewer.c:395
+#: ../src/ui/theme-viewer.c:396
 msgid "Torn-off Menu"
 msgstr "ਮ�ਨ� ਵੱ� �ਰ�"
 
-#: ../src/ui/theme-viewer.c:399
+#: ../src/ui/theme-viewer.c:400
 msgid "Border"
 msgstr "ਬਾਰਡਰ"
 
-#: ../src/ui/theme-viewer.c:727
+#: ../src/ui/theme-viewer.c:728
 #, c-format
 msgid "Button layout test %d"
 msgstr "ਬ�ਨ ਲ���� ��ਸ� %d"
 
-#: ../src/ui/theme-viewer.c:756
+#: ../src/ui/theme-viewer.c:757
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "�ੱ� ਵਿੰਡ� ਫਰ�ਮ �ਲ��ਣ ਲ� %g ਮਿਲ� ਸ�ਿੰ�"
 
-#: ../src/ui/theme-viewer.c:799
+#: ../src/ui/theme-viewer.c:800
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "ਵਰਤ��: metacity-theme-viewer [THEMENAME]\n"
 
-#: ../src/ui/theme-viewer.c:806
+#: ../src/ui/theme-viewer.c:807
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "ਥ�ਮ ਲ�ਡ �ਰਨ ਵਿੱ� �ਲਤ�: %s\n"
 
-#: ../src/ui/theme-viewer.c:812
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "ਥ�ਮ \"%s\" ਨ�ੰ ਲ�ਡ �ਰਨ ਵਿੱ� ਲੱ�ਾ ਸਮਾ� %g ਸ�ਿੰ�ਾ� ਵਿੱ� \n"
 
-#: ../src/ui/theme-viewer.c:853
+#: ../src/ui/theme-viewer.c:854
 msgid "Normal Title Font"
 msgstr "ਸਾਧਾਰਨ �ਾ��ਲ ਫ���"
 
-#: ../src/ui/theme-viewer.c:859
+#: ../src/ui/theme-viewer.c:860
 msgid "Small Title Font"
 msgstr "���� �ਾ��ਲ ਫ���"
 
-#: ../src/ui/theme-viewer.c:865
+#: ../src/ui/theme-viewer.c:866
 msgid "Large Title Font"
 msgstr "ਵੱਡ� �ਾ��ਲ ਫ���"
 
-#: ../src/ui/theme-viewer.c:870
+#: ../src/ui/theme-viewer.c:871
 msgid "Button Layouts"
 msgstr "ਬ�ਨ ਲ����"
 
-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:876
 msgid "Benchmark"
 msgstr "ਬ���ਮਾਰ�"
 
-#: ../src/ui/theme-viewer.c:922
+#: ../src/ui/theme-viewer.c:923
 msgid "Window Title Goes Here"
 msgstr "ਵਿੰਡ� �ਾ��ਲ �ੱਥ� ਹ�ਵ��ਾ"
 
-#: ../src/ui/theme-viewer.c:1026
+#: ../src/ui/theme-viewer.c:1027
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@@ -2369,43 +2257,52 @@ msgstr ""
 "%d ਫਰ�ਮ �ਲ��� %g �ਲਾ��� ਸਾ�ਡ ਸ�ਿੰ�ਾ� ਵਿੱ� (%g ਮਿਲ� ਸ�ਿੰ� ਪ�ਰਤ� ਫਰ�ਮ) �ਤ� X ਸਰਵਰ ਸਮ�ਤ %g "
 "ਸ�ਿੰ� �ੰਧ ��� ਸਮਾ� (%g ਮਿਲ� ਸ�ਿੰ� ਪ�ਰਤ� ਫਰ�ਮ)\n"
 
-#: ../src/ui/theme-viewer.c:1245
+#: ../src/ui/theme-viewer.c:1246
 msgid "position expression test returned TRUE but set error"
 msgstr "ਸਥਿਤ� �ਥਨ �ਾ�� ਨ� �ਵਾਬ ਠ��(TRUE) ਦਿੱਤਾ ਪਰ �ਲਤ� �ੱਢ� ਹ�"
 
-#: ../src/ui/theme-viewer.c:1247
+#: ../src/ui/theme-viewer.c:1248
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "ਸਥਿਤ� �ਥਨ �ਾ�� ਨ� �ਵਾਬ �ਲਤ(FALSE) ਦਿੱਤਾ ਪਰ �ਲਤ� ਨਹ�� �ੱਢ� ਹ�"
 
-#: ../src/ui/theme-viewer.c:1251
+#: ../src/ui/theme-viewer.c:1252
 msgid "Error was expected but none given"
 msgstr "�ਲਤ� ਦ� �ਮ�ਦ ਸ� ਪਰ ��� ਵਿ�ਾ� ਨਹ��"
 
-#: ../src/ui/theme-viewer.c:1253
+#: ../src/ui/theme-viewer.c:1254
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "�ਲਤ� %d ਦ� �ਮ�ਦ ਸ� ਪਰ ਵਿ�ਾ� %d"
 
-#: ../src/ui/theme-viewer.c:1259
+#: ../src/ui/theme-viewer.c:1260
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "�ਲਤ� ਦ� �ਮ�ਦ ਨਹ�� ਸ� ਪਰ �ੱ� ਨਿ�ਲ�: %s"
 
-#: ../src/ui/theme-viewer.c:1263
+#: ../src/ui/theme-viewer.c:1264
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "x ��ਮਤ %d ਹ�, %d ਦ� �ਮ�ਦ ਸ�"
 
-#: ../src/ui/theme-viewer.c:1266
+#: ../src/ui/theme-viewer.c:1267
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "y ��ਮਤ %d ਸ�, %d ਦ� �ਮ�ਦ ਸ�"
 
-#: ../src/ui/theme-viewer.c:1331
+#: ../src/ui/theme-viewer.c:1332
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d ਸਮਾਨਾਰਥ� �ਥਨ ਦ� ਪਾਰਸ %g ਸ�ਿੰ�ਾ� ਵਿੱ� ��ਤ� (�ਸਤਨ %g ਸ�ਿੰ�)\n"
 
+#~ msgid "Open another one of these windows"
+#~ msgstr "�ਹਨਾ� ਵਿੰਡ��਼ ਵਿੱ��� ��� ਹ�ਰ ��ਲ�ਹ�"
+
+#~ msgid "This is a demo button with an 'open' icon"
+#~ msgstr "�ਹ '��ਲ�ਹ�' ���ਾਨ ਨਾਲ ਡ�ਮ� ਬ�ਨ ਹ�"
+
+#~ msgid "This is a demo button with a 'quit' icon"
+#~ msgstr "�ਹ 'ਬਾਹਰ �ਾ�' ���ਾਨ ਨਾਲ ਡ�ਮ� ਬ�ਨ ਹ�"
+
 #~ msgid "Failed to parse message \"%s\" from dialog process\n"
 #~ msgstr "ਡਾ�ਲਾ� ਪਰ�ਸ�ਸ ਵਿੱ��� \"%s\" ਸ�ਨ�ਹ� ਦ� ਪਾਰਸ �ਰਨ ਵਿੱ� ਫ�ਲ�ਹ\n"
 
@@ -2423,9 +2320,6 @@ msgstr "%d ਸਮਾਨਾਰਥ� �ਥਨ ਦ� ਪਾਰਸ %g ਸ�ਿ
 #~ "Error launching metacity-dialog to print an error about a command: %s\n"
 #~ msgstr "�ਮਾ�ਡ ਬਾਰ� �ਲਤ� �ਾਪਣ ਵਾਲ� ਮ��ਾਸਿ�� ਡਾ�ਲਾ� ਨ�ੰ ਸ਼�ਰ� �ਰਨ ਵਿੱ� �ਲਤ�: %s \n"
 
-#~ msgid "\"%s\" is not responding."
-#~ msgstr "\"%s\" �ਵਾਬ ਨਹ� ਦਿੰਦਾ।"
-
 #~ msgid "Title"
 #~ msgstr "�ਾ��ਲ"