2.13.8 release

2006-01-02 Elijah Newren <newren@gmail.com> * NEWS: 2.13.8 release
Updated Finnish translation
2006-01-02 17:59:18 +00:00 · 2005-12-30 14:03:29 +00:00 · 2005-12-30 07:49:05 +00:00 · 2005-12-28 06:24:30 +00:00 · 2005-12-27 16:40:47 +00:00 · 2005-12-25 14:27:11 +00:00
19 changed files with 1480 additions and 1480 deletions
--- a/45
+++ b/45
@@ -1,3 +1,48 @@
+2006-01-02  Elijah Newren  <newren@gmail.com>
+
+	* NEWS:	2.13.8 release
+
+2005-12-27  Elijah Newren  <newren@gmail.com>
+
+	Make the workspace switcher work with dual-head (non-xinerama)
+	setups.  Fixes #319423.
+
+	* src/display.c (meta_display_open, event_callback,
+	  meta_display_focus_the_no_focus_window):
+	* src/display.h (struct MetaDisplay,
+	  meta_display_focus_the_no_focus_window):
+	* src/keybindings.c (primary_modifier_still_pressed):
+	* src/screen.c (meta_screen_new):
+	* src/screen.h (struct MetaScreen):
+	* src/window.c (meta_window_new_with_attrs, meta_window_show):
+	* src/workspace.c (meta_workspace_focus_default_window):
+	Replace display->no_focus_window with a no_focus_window for each
+	screen.
+
+	* src/display.[ch] (meta_display_xwindow_is_a_no_focus_window,
+	  event_callback):
+	* src/window.c (meta_window_new_with_attrs):
+	New utility function, meta_display_xwindow_is_a_no_focus_window(),
+	for checking if the given xwindow is a no_focus_window for one of
+	the screens.
+
+2005-12-27  Elijah Newren  <newren@gmail.com>
+
+	* src/tabpopup.c (meta_ui_tab_popup_new): since the title is going
+	to be treated as markup, escape it.  Fixes #324846.
+
+2005-12-13  Kang Jeong-Hee  <Keizi@mail.co.kr>
+
+	* src/compositor.c: replace old call to width and height
+	of MetaScreen struct with rect.width and rect.height.
+	Now compile ok.
+	* src/delete.c: make an int variable into unsigned int.
+	Now compile warning has gone.
+
+2005-12-12  Elijah Newren  <newren@gmail.com>
+
+	* configure.in: post-release version bump to 2.13.8
+
 2005-12-12  Elijah Newren  <newren@gmail.com>

 	* NEWS:	2.13.5 release
--- a/15
+++ b/15
@@ -1,3 +1,18 @@
+2.13.8
+==
+
+Thanks to Kang Jeong-Hee and Elijah Newren for improvements in this
+release.
+
+ - Fix some compilation warnings and issues (Kang)
+ - Escape the title since it is going to be treated as Markup (Elijah)
+   [#324846]
+ - Make the workspace switcher work with dual-head (non-xinerama)
+   setups (Elijah) [#319423]
+
+Translations
+  Ilkka Tuohela (fi), Ankit Patel (gu), Kang Joeng-Hee (ko)
+
 2.13.5
 ==

--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)

 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-AC_INIT([metacity], [2.13.5],
+AC_INIT([metacity], [2.13.8],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])

 AC_CONFIG_SRCDIR(src/display.c)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,10 +1,18 @@
+2005-12-31  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2005-12-25  Kang Jeong-Hee  <Keizi@mail.co.kr>
+
+	* ko.po: Updated Korean translation.
+
 2005-12-11  Miloslav Trmac  <mitr@volny.cz>

 	* cs.po: Updated Czech translation.

 2005-12-11  Ankit Patel  <ankit644@yahoo.com>

-        * gu.po: Updated Gujarati Translation.
+	* gu.po: Updated Gujarati Translation.

 2005-12-03  Adam Weinberger  <adamw@gnome.org>

--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-19 12:30+0200\n"
-"PO-Revision-Date: 2005-07-24 21:12+0300\n"
+"POT-Creation-Date: 2005-12-30 15:53+0200\n"
+"PO-Revision-Date: 2005-12-30 15:59+0200\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -22,33 +22,33 @@ msgstr ""
 msgid "Usage: %s\n"
 msgstr "Käyttö: %s\n"

-#: ../src/tools/metacity-message.c:176 ../src/util.c:128
+#: ../src/tools/metacity-message.c:176 ../src/util.c:130
 msgid "Metacity was compiled without support for verbose mode\n"
 msgstr "Metacity on käännetty ilman tukea monisanaisille ilmoituksille\n"

-#: ../src/delete.c:63 ../src/delete.c:90 ../src/metacity-dialog.c:70
+#: ../src/delete.c:64 ../src/delete.c:91 ../src/metacity-dialog.c:71
 #: ../src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "\"%s\" ei jäsentynyt kokonaisluvuksi"

-#: ../src/delete.c:70 ../src/delete.c:97 ../src/metacity-dialog.c:77
+#: ../src/delete.c:71 ../src/delete.c:98 ../src/metacity-dialog.c:78
 #: ../src/theme-parser.c:476 ../src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "Perässä olevat merkit \"%s\" merkkijonossa \"%s\" eivät ole järkeviä"

-#: ../src/delete.c:128
+#: ../src/delete.c:129
 #, c-format
 msgid "Failed to parse message \"%s\" from dialog process\n"
 msgstr "Valintaikkunaprosessilta tullut viesti \"%s\" ei jäsenny\n"

-#: ../src/delete.c:263
+#: ../src/delete.c:264
 #, c-format
 msgid "Error reading from dialog display process: %s\n"
 msgstr "Virhe valintaikkunan näyttämisprosessilta lukemisessa: %s\n"

-#: ../src/delete.c:344
+#: ../src/delete.c:345
 #, c-format
 msgid ""
 "Error launching metacity-dialog to ask about killing an application: %s\n"
@@ -56,12 +56,12 @@ msgstr ""
 "Virhe metacity-dialogin käynnistämisessä sovelluksen tappamisesta kysymistä "
 "varten: %s\n"

-#: ../src/delete.c:452
+#: ../src/delete.c:453
 #, c-format
 msgid "Failed to get hostname: %s\n"
 msgstr "Isäntänimen haku epäonnistui: %s\n"

-#: ../src/display.c:319
+#: ../src/display.c:308
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X-ikkunointijärjestelmän näytön \"%s\" avaaminen epäonnistui\n"
@@ -82,27 +82,27 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Vakava IO-virhe %d (%s) näytöllä \"%s\".\n"

-#: ../src/frames.c:1125
+#: ../src/frames.c:1123
 msgid "Close Window"
 msgstr "Sulje ikkuna"

-#: ../src/frames.c:1128
+#: ../src/frames.c:1126
 msgid "Window Menu"
 msgstr "Ikkunavalikko"

-#: ../src/frames.c:1131
+#: ../src/frames.c:1129
 msgid "Minimize Window"
 msgstr "Pienennä ikkuna"

-#: ../src/frames.c:1134
+#: ../src/frames.c:1132
 msgid "Maximize Window"
 msgstr "Suurenna ikkuna"

-#: ../src/frames.c:1137
+#: ../src/frames.c:1135
 msgid "Unmaximize Window"
 msgstr "Palauta ikkuna"

-#: ../src/keybindings.c:994
+#: ../src/keybindings.c:996
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -110,19 +110,19 @@ msgid ""
 msgstr ""
 "Jokin muu ohjelma käyttää jo näppäintä %s muunnoksin %x pikanäppäimenään\n"

-#: ../src/keybindings.c:2620
+#: ../src/keybindings.c:2498
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr ""
 "Virhe metacity-dialogin käynnistämisessä komennon virheen tulostamista "
 "varten: %s\n"

-#: ../src/keybindings.c:2725
+#: ../src/keybindings.c:2603
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Mitään komentoa %d ei ole määritelty.\n"

-#: ../src/keybindings.c:3570
+#: ../src/keybindings.c:3465
 msgid "No terminal command has been defined.\n"
 msgstr "Mitään päätteen komentoa ei ole määritelty.\n"

@@ -183,83 +183,87 @@ msgstr ""
 msgid "Failed to restart: %s\n"
 msgstr "Uudelleenkäynnistys epäonnistui: %s\n"

-#: ../src/menu.c:54
+#: ../src/menu.c:55
 msgid "Mi_nimize"
 msgstr "_Pienennä"

-#: ../src/menu.c:55
+#: ../src/menu.c:56
 msgid "Ma_ximize"
 msgstr "_Suurenna"

-#: ../src/menu.c:56
+#: ../src/menu.c:57
 msgid "Unma_ximize"
 msgstr "_Palauta"

-#: ../src/menu.c:57
+#: ../src/menu.c:58
 msgid "Roll _Up"
 msgstr "_Rullaa ylös"

-#: ../src/menu.c:58
+#: ../src/menu.c:59
 msgid "_Unroll"
 msgstr "_Rullaa alas"

-#: ../src/menu.c:59 ../src/menu.c:60
+#: ../src/menu.c:60 ../src/menu.c:61
 msgid "On _Top"
 msgstr "_Päällimmäisenä"

-#: ../src/menu.c:61
+#: ../src/menu.c:62
 msgid "_Move"
 msgstr "S_iirrä"

-#: ../src/menu.c:62
+#: ../src/menu.c:63
 msgid "_Resize"
 msgstr "_Muuta kokoa"

-#. separator
 #: ../src/menu.c:64
+msgid "Move Titlebar On_screen"
+msgstr "Siirrä otsikkopalkkia _näytöllä"
+
+#. separator
+#: ../src/menu.c:66
 msgid "_Close"
 msgstr "_Sulje"

 #. separator
-#: ../src/menu.c:66
+#: ../src/menu.c:68
 msgid "_Always on Visible Workspace"
 msgstr "Näytä _aina tässä työtilassa"

-#: ../src/menu.c:67
+#: ../src/menu.c:69
 msgid "_Only on This Workspace"
 msgstr "Näytä vain _tässä työtilassa"

-#: ../src/menu.c:68
+#: ../src/menu.c:70
 msgid "Move to Workspace _Left"
 msgstr "Siirrä _vasempaan työtilaan"

-#: ../src/menu.c:69
+#: ../src/menu.c:71
 msgid "Move to Workspace R_ight"
 msgstr "Siirrä _oikeaan työtilaan"

-#: ../src/menu.c:70
+#: ../src/menu.c:72
 msgid "Move to Workspace _Up"
 msgstr "Siirry _ylläolevaan työtilaan"

-#: ../src/menu.c:71
+#: ../src/menu.c:73
 msgid "Move to Workspace _Down"
 msgstr "Siirrä _alla olevaan työtilaan"

-#: ../src/menu.c:162 ../src/prefs.c:2106
+#: ../src/menu.c:164 ../src/prefs.c:2112
 #, c-format
 msgid "Workspace %d"
 msgstr "Työtila %d"

-#: ../src/menu.c:171
+#: ../src/menu.c:173
 msgid "Workspace 1_0"
 msgstr "Työtila 1_0"

-#: ../src/menu.c:173
+#: ../src/menu.c:175
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Työtila %s%d"

-#: ../src/menu.c:368
+#: ../src/menu.c:370
 msgid "Move to Another _Workspace"
 msgstr "Siirrä toiseen t_yötilaan"

@@ -353,31 +357,31 @@ msgstr "Mod4"
 msgid "Mod5"
 msgstr "Mod5"

-#: ../src/metacity-dialog.c:110
+#: ../src/metacity-dialog.c:111
 #, c-format
 msgid "The window \"%s\" is not responding."
 msgstr "Ikkuna \"%s\" ei vastaa."

-#: ../src/metacity-dialog.c:118
+#: ../src/metacity-dialog.c:119
 msgid ""
 "Forcing this application to quit will cause you to lose any unsaved changes."
 msgstr ""
 "Tämän sovelluksen sulkeminen väkisin saa tallentamattomat muutokset "
 "katoamaan."

-#: ../src/metacity-dialog.c:129
+#: ../src/metacity-dialog.c:130
 msgid "_Force Quit"
 msgstr "Sulje _väkisin"

-#: ../src/metacity-dialog.c:226
+#: ../src/metacity-dialog.c:227
 msgid "Title"
 msgstr "Otsikko"

-#: ../src/metacity-dialog.c:238
+#: ../src/metacity-dialog.c:239
 msgid "Class"
 msgstr "Luokka"

-#: ../src/metacity-dialog.c:264
+#: ../src/metacity-dialog.c:265
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -385,7 +389,7 @@ msgstr ""
 "Nämä ikkunat eivät ymmärrä \"tallenna nykyinen tila\"-komentoa, ja ne täytyy "
 "käynnistää käsin uudelleen kun kirjaudut seuraavan kerran sisään."

-#: ../src/metacity-dialog.c:330
+#: ../src/metacity-dialog.c:331
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -505,11 +509,25 @@ msgstr "Piilota kaikki ikkunat ja kohdista työpöytä"
 msgid ""
 "If true, and the focus mode is either \"sloppy\" or \"mouse\" then the "
 "focused window will be automatically raised after a delay (the delay is "
-"specified by the auto_raise_delay key)."
+"specified by the auto_raise_delay key). This preference is poorly named, but "
+"kept for backwards compatibility. To try to be more clear (at least to the "
+"technically inclined), its meaning is \"automatically raise the window "
+"following a timeout which is triggered by non-grabbed mouse entry in sloppy "
+"or mouse focus modes\". It is unrelated to clicking behavior (i.e. this is "
+"not related to raise-on-click/orthogonal-raise). It is unrelated to entering "
+"a window during drag and drop (because that results in the application "
+"grabbing the mouse)"
 msgstr ""
-"Jos tosi, ja kohdistustapa on joko \"sloppy\" tai \"mouse\", niin "
-"kohdistettu ikkuna nousee itsestään viiveen jälkeen (viive määritelty "
-"avaimessa auto_raise_delay)."
+"Jos arvo on \"true\" ja kohdistustapa on joko \"sloppy\" tai \"mouse\", "
+"nostetaan kohdistettu ikkuna päällimmäiseksi viiveen jälkeen "
+"automaattisesti. Viive määritellään avaimessa \"auto_raise_delay\". Tämä "
+"asetus on huonosti nimetty, mutta nimi pidetään yhteensopivuuden takia "
+"samana. Täsmällisemmin selitettynä tämän selitys on \"nosta ikkuna "
+"automaattisesti päällimmäiseksi aikaviiveellä, joka lasketaan hetkestä "
+"kun hiiri siirtyy ikkunan päälle tilan ollessa \"sloppy\" tai \"mouse\"."
+"Tämä asetus ei liity ikkunan napsautuksen toimintatapaan, eikä se liity "
+"ikkunaan siirtymiseen siirron ja raahauksen aikana, koska se aiheuttaa "
+"kohdeikkunan tarttuvan hiireen joka tapauksessa." 

 #: ../src/metacity.schemas.in.h:18
 msgid ""
@@ -1985,12 +2003,12 @@ msgstr ""
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d, joka on GConf-avaimessa %s, ei ole välillä 0 - %d\n"

-#: ../src/prefs.c:1589
+#: ../src/prefs.c:1595
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Virhe työtilojen määrän asettamisessa arvoon %d: %s\n"

-#: ../src/prefs.c:1833
+#: ../src/prefs.c:1839
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1999,7 +2017,7 @@ msgstr ""
 "\"%s\", joka on asetustietokannassa, ei ole kelvollinen näppäinsidonnan \"%s"
 "\" arvo\n"

-#: ../src/prefs.c:2187
+#: ../src/prefs.c:2193
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Virhe työtilan %d nimen asettamisessa nimeksi \"%s\": %s\n"
@@ -2009,12 +2027,12 @@ msgstr "Virhe työtilan %d nimen asettamisessa nimeksi \"%s\": %s\n"
 msgid "%d x %d"
 msgstr "%d × %d"

-#: ../src/screen.c:408
+#: ../src/screen.c:403
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Näytön \"%2$s\" ruutu %1$d ei ole kelvollinen\n"

-#: ../src/screen.c:424
+#: ../src/screen.c:419
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -2023,7 +2041,7 @@ msgstr ""
 "Näytön \"%2$s\" ruudulla %1$d on jo ikkunointiohjelma: kokeile valitsinta --"
 "replace, jos haluat korvata nykyisen ikkunointiohjelman.\n"

-#: ../src/screen.c:448
+#: ../src/screen.c:443
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -2031,81 +2049,81 @@ msgstr ""
 "Näytön \"%2$s\" ruudun %1$d ikkunointiohjelman valinnan hankkiminen "
 "epäonnistui\n"

-#: ../src/screen.c:506
+#: ../src/screen.c:501
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Näytön \"%2$s\" ruudulla %1$d on jo ikkunointiohjelma\n"

-#: ../src/screen.c:716
+#: ../src/screen.c:710
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Näytön \"%2$s\" ruudun %1$d vapauttaminen ei onnistunut\n"

-#: ../src/session.c:884 ../src/session.c:891
+#: ../src/session.c:844 ../src/session.c:851
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Kansion \"%s\" luominen ei onnistunut: %s\n"

-#: ../src/session.c:901
+#: ../src/session.c:861
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr ""
 "Istuntotiedoston \"%s\" avaaminen kirjoittamista varten ei onnistunut: %s\n"

-#: ../src/session.c:1053
+#: ../src/session.c:1013
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Virhe istuntotiedoston \"%s\" kirjoittamisessa: %s\n"

-#: ../src/session.c:1058
+#: ../src/session.c:1018
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Virhe istuntotiedoston \"%s\" sulkemisessa: %s\n"

-#: ../src/session.c:1133
+#: ../src/session.c:1093
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Tallennetun istuntotiedoston \"%s\" luku epäonnistui: %s\n"

-#: ../src/session.c:1168
+#: ../src/session.c:1128
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Tallennetun istuntotiedoston jäsennys epäonnistui: %s\n"

-#: ../src/session.c:1217
+#: ../src/session.c:1177
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "<metacity_session>-määre havaittu, mutta istunnon ID on jo selvinnyt"

-#: ../src/session.c:1230
+#: ../src/session.c:1190
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "<metacity_session>-elementin määre %s on tuntematon"

-#: ../src/session.c:1247
+#: ../src/session.c:1207
 msgid "nested <window> tag"
 msgstr "sisäkkäiset <window>-laput"

-#: ../src/session.c:1305 ../src/session.c:1337
+#: ../src/session.c:1265 ../src/session.c:1297
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Tuntematon <window>-elementin määre %s"

-#: ../src/session.c:1409
+#: ../src/session.c:1369
 #, c-format
 msgid "Unknown attribute %s on <maximized> element"
 msgstr "Tuntematon <maximized>-elementin määre %s"

-#: ../src/session.c:1469
+#: ../src/session.c:1429
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Tuntematon <geometry>-elementin määre %s"

-#: ../src/session.c:1489
+#: ../src/session.c:1449
 #, c-format
 msgid "Unknown element %s"
 msgstr "Tuntematon elementti %s"

-#: ../src/session.c:1961
+#: ../src/session.c:1921
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -3114,44 +3132,44 @@ msgstr ""
 msgid "Constant \"%s\" has already been defined"
 msgstr "Vakio \"%s\" on jo määritelty"

-#: ../src/util.c:93
+#: ../src/util.c:95
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Vianetsintälokin avaaminen epäonnistui: %s\n"

-#: ../src/util.c:103
+#: ../src/util.c:105
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Lokitiedoston \"%s\" fdopen() epäonnistui: %s\n"

-#: ../src/util.c:109
+#: ../src/util.c:111
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Lokitiedosto %s avattu\n"

-#: ../src/util.c:203
+#: ../src/util.c:219
 msgid "Window manager: "
 msgstr "Ikkunointiohjelma:"

-#: ../src/util.c:349
+#: ../src/util.c:365
 msgid "Bug in window manager: "
 msgstr "Vika ikkunointiohjelmassa."

-#: ../src/util.c:378
+#: ../src/util.c:394
 msgid "Window manager warning: "
 msgstr "Ikkunointiohjelman varoitus:"

-#: ../src/util.c:402
+#: ../src/util.c:418
 msgid "Window manager error: "
 msgstr "Ikkunointiohjelmavirhe:"

-#: ../src/window-props.c:162
+#: ../src/window-props.c:165
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Sovellus asetti virheellisen _NET_WM_PID:n %ld\n"

 #. first time through
-#: ../src/window.c:5205
+#: ../src/window.c:5238
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3167,7 +3185,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/window.c:5876
+#: ../src/window.c:5878
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3204,3 +3222,12 @@ msgid ""
 msgstr ""
 "Ikkunan 0x%2$lx ominaisuus %1$s sisälsi virheellistä UTF-8:aa luettelon "
 "kohdassa %3$d\n"
+
+#~ msgid ""
+#~ "If true, and the focus mode is either \"sloppy\" or \"mouse\" then the "
+#~ "focused window will be automatically raised after a delay (the delay is "
+#~ "specified by the auto_raise_delay key)."
+#~ msgstr ""
+#~ "Jos tosi, ja kohdistustapa on joko \"sloppy\" tai \"mouse\", niin "
+#~ "kohdistettu ikkuna nousee itsestään viiveen jälkeen (viive määritelty "
+#~ "avaimessa auto_raise_delay)."
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/mk.po
+++ b/po/mk.po
@@ -15,61 +15,60 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-19 12:30+0200\n"
-"PO-Revision-Date: 2005-07-20 23:36+0200\n"
-"Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n"
+"POT-Creation-Date: 2005-12-18 23:06+0100\n"
+"PO-Revision-Date: 2005-12-19 00:12+0100\n"
+"Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
-"X-Generator: KBabel 1.10\n"
+"X-Generator: KBabel 1.10.2\n"

 #: ../src/tools/metacity-message.c:150
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Употреба: %s\n"

-#: ../src/tools/metacity-message.c:176 ../src/util.c:128
+#: ../src/tools/metacity-message.c:176 ../src/util.c:130
 msgid "Metacity was compiled without support for verbose mode\n"
 msgstr "Metacity беше компајлиран без поддршка за verbose режимот\n"

-#: ../src/delete.c:63 ../src/delete.c:90 ../src/metacity-dialog.c:70
+#: ../src/delete.c:64 ../src/delete.c:91 ../src/metacity-dialog.c:71
 #: ../src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Не можам да го парсирам \"%s\" како целосен број"

-#: ../src/delete.c:70 ../src/delete.c:97 ../src/metacity-dialog.c:77
+#: ../src/delete.c:71 ../src/delete.c:98 ../src/metacity-dialog.c:78
 #: ../src/theme-parser.c:476 ../src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "Не ги разбирам трејлинг карактерите \"%s\" во стрингот \"%s\""

-#: ../src/delete.c:128
+#: ../src/delete.c:129
 #, c-format
 msgid "Failed to parse message \"%s\" from dialog process\n"
 msgstr "Не успеав да ја парсирам пораката \"%s\" од дијалогот за процесот\n"

-#: ../src/delete.c:263
+#: ../src/delete.c:264
 #, c-format
 msgid "Error reading from dialog display process: %s\n"
 msgstr "Грешка во читањето од процесот на дијалогот: %s\n"

-#: ../src/delete.c:344
+#: ../src/delete.c:345
 #, c-format
-msgid ""
-"Error launching metacity-dialog to ask about killing an application: %s\n"
+msgid "Error launching metacity-dialog to ask about killing an application: %s\n"
 msgstr ""
 "Грешка при отворањето на metacity-дијалог да се праша за затварање на "
 "апликација: %s\n"

-#: ../src/delete.c:452
+#: ../src/delete.c:453
 #, c-format
 msgid "Failed to get hostname: %s\n"
 msgstr "Не успеав да добијам име на хост: %s\n"

-#: ../src/display.c:319
+#: ../src/display.c:308
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Не успеав да го отворам приказот за X системот за прозорци '%s'\n"
@@ -90,27 +89,27 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Фатална IO грешка %d (%s) на приказ '%s'.\n"

-#: ../src/frames.c:1125
+#: ../src/frames.c:1123
 msgid "Close Window"
 msgstr "Затвори прозорец"

-#: ../src/frames.c:1128
+#: ../src/frames.c:1126
 msgid "Window Menu"
 msgstr "Мени во прозорец"

-#: ../src/frames.c:1131
+#: ../src/frames.c:1129
 msgid "Minimize Window"
 msgstr "Спушти прозорец"

-#: ../src/frames.c:1134
+#: ../src/frames.c:1132
 msgid "Maximize Window"
 msgstr "Зголеми прозорец"

-#: ../src/frames.c:1137
+#: ../src/frames.c:1135
 msgid "Unmaximize Window"
 msgstr "Намали прозорец"

-#: ../src/keybindings.c:994
+#: ../src/keybindings.c:996
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -119,18 +118,17 @@ msgstr ""
 "Некоја друга програма веќе го користи тоа копче %s со изменувачи %x како "
 "биндинг\n"

-#: ../src/keybindings.c:2620
+#: ../src/keybindings.c:2494
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
-msgstr ""
-"Грешка при отворањето на metacity-дијалог да печати грешка за команда: %s\n"
+msgstr "Грешка при отворањето на metacity-дијалог да печати грешка за команда: %s\n"

-#: ../src/keybindings.c:2725
+#: ../src/keybindings.c:2599
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Ниедна команда %d не е дефинирана.\n"

-#: ../src/keybindings.c:3570
+#: ../src/keybindings.c:3461
 msgid "No terminal command has been defined.\n"
 msgstr "Ниедна команда %d не е дефинирана.\n"

@@ -179,8 +177,7 @@ msgstr "Не успеав да го скенирам директориумот

 #: ../src/main.c:456
 #, c-format
-msgid ""
-"Could not find a theme! Be sure %s exists and contains the usual themes."
+msgid "Could not find a theme! Be sure %s exists and contains the usual themes."
 msgstr ""
 "Не можам да ја пронајдам темата! Осигурајте се дека %s постои и содржи "
 "вообичаени теми."
@@ -190,83 +187,87 @@ msgstr ""
 msgid "Failed to restart: %s\n"
 msgstr "Не успеав да рестартирам: %s\n"

-#: ../src/menu.c:54
+#: ../src/menu.c:55
 msgid "Mi_nimize"
 msgstr "Ми_нимизирај"

-#: ../src/menu.c:55
+#: ../src/menu.c:56
 msgid "Ma_ximize"
 msgstr "Ма_ксимизирај"

-#: ../src/menu.c:56
+#: ../src/menu.c:57
 msgid "Unma_ximize"
 msgstr "Нама_ли"

-#: ../src/menu.c:57
+#: ../src/menu.c:58
 msgid "Roll _Up"
 msgstr "Завиткај"

-#: ../src/menu.c:58
+#: ../src/menu.c:59
 msgid "_Unroll"
 msgstr "Одвиткај"

-#: ../src/menu.c:59 ../src/menu.c:60
+#: ../src/menu.c:60 ../src/menu.c:61
 msgid "On _Top"
 msgstr "Горе"

-#: ../src/menu.c:61
+#: ../src/menu.c:62
 msgid "_Move"
 msgstr "_Помести"

-#: ../src/menu.c:62
+#: ../src/menu.c:63
 msgid "_Resize"
 msgstr "Промени големина"

-#. separator
 #: ../src/menu.c:64
+msgid "Move Titlebar On_screen"
+msgstr "Премести ја лентата со алатки на _екранот"
+
+#. separator
+#: ../src/menu.c:66
 msgid "_Close"
 msgstr "Затвори"

 #. separator
-#: ../src/menu.c:66
+#: ../src/menu.c:68
 msgid "_Always on Visible Workspace"
 msgstr "Само на овој работен простор"

-#: ../src/menu.c:67
+#: ../src/menu.c:69
 msgid "_Only on This Workspace"
 msgstr "Само на овој работен простор"

-#: ../src/menu.c:68
+#: ../src/menu.c:70
 msgid "Move to Workspace _Left"
 msgstr "Премести на _левиот работен простор"

-#: ../src/menu.c:69
+#: ../src/menu.c:71
 msgid "Move to Workspace R_ight"
 msgstr "Премести на _десниот работен простор"

-#: ../src/menu.c:70
+#: ../src/menu.c:72
 msgid "Move to Workspace _Up"
 msgstr "Премести на _горниот работен простор"

-#: ../src/menu.c:71
+#: ../src/menu.c:73
 msgid "Move to Workspace _Down"
 msgstr "Премести на _долниот работен простор"

-#: ../src/menu.c:162 ../src/prefs.c:2106
+#: ../src/menu.c:164 ../src/prefs.c:2112
 #, c-format
 msgid "Workspace %d"
 msgstr "Работно место %d"

-#: ../src/menu.c:171
+#: ../src/menu.c:173
 msgid "Workspace 1_0"
 msgstr "Работно место 1_0"

-#: ../src/menu.c:173
+#: ../src/menu.c:175
 #, c-format
 msgid "Workspace %s%d"
 msgstr "Работно место %s%d"

-#: ../src/menu.c:368
+#: ../src/menu.c:370
 msgid "Move to Another _Workspace"
 msgstr "Премести на друг _работен простор"

@@ -360,31 +361,30 @@ msgstr "Режим4"
 msgid "Mod5"
 msgstr "Режим5"

-#: ../src/metacity-dialog.c:110
+#: ../src/metacity-dialog.c:111
 #, c-format
 msgid "The window \"%s\" is not responding."
 msgstr "Прозорецот \"%s\" не одговара."

-#: ../src/metacity-dialog.c:118
-msgid ""
-"Forcing this application to quit will cause you to lose any unsaved changes."
+#: ../src/metacity-dialog.c:119
+msgid "Forcing this application to quit will cause you to lose any unsaved changes."
 msgstr ""
 "Принудување оваа апликација да излезe ќе направи да ги изгубите "
 "незачуванитедокументи."

-#: ../src/metacity-dialog.c:129
+#: ../src/metacity-dialog.c:130
 msgid "_Force Quit"
 msgstr "Принуди излез"

-#: ../src/metacity-dialog.c:226
+#: ../src/metacity-dialog.c:227
 msgid "Title"
 msgstr "Наслов"

-#: ../src/metacity-dialog.c:238
+#: ../src/metacity-dialog.c:239
 msgid "Class"
 msgstr "Класа"

-#: ../src/metacity-dialog.c:264
+#: ../src/metacity-dialog.c:265
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
@@ -392,7 +392,7 @@ msgstr ""
 "Овие прозорци не поддржуваат \"сними моментални измени\" и ќе мора да бидат "
 "рестартирани рачно наредниот пат кога ќе се најавите."

-#: ../src/metacity-dialog.c:330
+#: ../src/metacity-dialog.c:331
 #, c-format
 msgid ""
 "There was an error running \"%s\":\n"
@@ -512,11 +512,22 @@ msgstr "Сокриј ги сите прозорци и фокусирај го
 msgid ""
 "If true, and the focus mode is either \"sloppy\" or \"mouse\" then the "
 "focused window will be automatically raised after a delay (the delay is "
-"specified by the auto_raise_delay key)."
+"specified by the auto_raise_delay key). This preference is poorly named, but "
+"kept for backwards compatibility. To try to be more clear (at least to the "
+"technically inclined), its meaning is \"automatically raise the window "
+"following a timeout which is triggered by non-grabbed mouse entry in sloppy "
+"or mouse focus modes\". It is unrelated to clicking behavior (i.e. this is "
+"not related to raise-on-click/orthogonal-raise). It is unrelated to entering "
+"a window during drag and drop (because that results in the application "
+"grabbing the mouse)"
 msgstr ""
-"Ако е точно, и фокус режимот е или \"слопи\"или\"глувче\" тогаш фокусираниот "
-"прозорец ќе биде автоматски кренат после одложување (одложувањето е "
-"специфицирано од авто_крени_одложи копчето)."
+"Ако е точно и режимот за фокусирање е \"sloppy\" или \"mouse\" тогаш "
+"фокусираниот прозорец ќе биде автоматски подигнат по застојот (застојот "
+"се одредува преку клучот auto_raise_delay). Оваа преференца носи несоодветно "
+"име но е задржана поради компатибилност со постари верзии. Да Ви биде појасно "
+"нејзиното значење е \"автоматско подигнување на прозорецот по истекот на времето\". "
+"Не е поврзано со однесувањето на кликнувањето. Не е поврзано со влегување во "
+"прозорец додека трае подигнување и спуштање"

 #: ../src/metacity.schemas.in.h:18
 msgid ""
@@ -1991,12 +2002,12 @@ msgstr ""
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "%d ставено во GConf копче %s е надвор од дострел 0 до %d\n"

-#: ../src/prefs.c:1589
+#: ../src/prefs.c:1595
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Грешка при поставката на број на работни простори %d: %s\n"

-#: ../src/prefs.c:1833
+#: ../src/prefs.c:1839
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -2005,23 +2016,22 @@ msgstr ""
 "\"%s\" пронајдено при конфигурирањето на базата не е валидна вредност за "
 "keybinding \"%s\"\n"

-#: ../src/prefs.c:2187
+#: ../src/prefs.c:2193
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
-msgstr ""
-"Грешка при поставката на имиња на работните  простори %d до \"%s\": %s\n"
+msgstr "Грешка при поставката на имиња на работните  простори %d до \"%s\": %s\n"

 #: ../src/resizepopup.c:126
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/screen.c:408
+#: ../src/screen.c:403
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Екран %d на приказ '%s' е невалиден\n"

-#: ../src/screen.c:424
+#: ../src/screen.c:419
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -2030,88 +2040,85 @@ msgstr ""
 "Екран %d на приказ \"%s\" веќе има менџер на прозорци; пробај со --преклопи "
 "опција да го преклопиш моменталниот менаџер на прозорци.\n"

-#: ../src/screen.c:448
+#: ../src/screen.c:443
 #, c-format
-msgid ""
-"Could not acquire window manager selection on screen %d display \"%s\"\n"
-msgstr ""
-"Не можам да обезбедам менаџер на прозорци на екранот %d прикажи \"%s\"\n"
+msgid "Could not acquire window manager selection on screen %d display \"%s\"\n"
+msgstr "Не можам да обезбедам менаџер на прозорци на екранот %d прикажи \"%s\"\n"

-#: ../src/screen.c:506
+#: ../src/screen.c:501
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Екран %d на приказ \"%s\" веќе има менаџер на прозорец\n"

-#: ../src/screen.c:716
+#: ../src/screen.c:712
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Не можам да отпуштам екран %d на приказ \"%s\"\n"

-#: ../src/session.c:884 ../src/session.c:891
+#: ../src/session.c:844 ../src/session.c:851
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Не можам да креирам директориум '%s': %s\n"

-#: ../src/session.c:901
+#: ../src/session.c:861
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Не можам да отворам сесија на датотеката  '%s' за пишување: %s\n"

-#: ../src/session.c:1053
+#: ../src/session.c:1013
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Грешка при пишувањето на датотека од сесијата '%s': %s\n"

-#: ../src/session.c:1058
+#: ../src/session.c:1018
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Грешка при затворање на датотека од сесијата '%s': %s\n"

-#: ../src/session.c:1133
+#: ../src/session.c:1093
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Не успеав да ја прочитам снимената датотека од сесијата %s: %s\n"

-#: ../src/session.c:1168
+#: ../src/session.c:1128
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Не успеав да ја парсирам снимената датотека од сесијата: %s\n"

-#: ../src/session.c:1217
+#: ../src/session.c:1177
 msgid "<metacity_session> attribute seen but we already have the session ID"
-msgstr ""
-"<metacity_session> атрибутот е виден но веќе го имаме ID-от на сесијата"
+msgstr "<metacity_session> атрибутот е виден но веќе го имаме ID-от на сесијата"

-#: ../src/session.c:1230
+#: ../src/session.c:1190
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Непознат атрибут %s на <metacity_session> елемент"

-#: ../src/session.c:1247
+#: ../src/session.c:1207
 msgid "nested <window> tag"
 msgstr "вгнездена <window> ознака"

-#: ../src/session.c:1305 ../src/session.c:1337
+#: ../src/session.c:1265 ../src/session.c:1297
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Непознат атрибут %s на <window> елемент."

-#: ../src/session.c:1409
+#: ../src/session.c:1369
 #, c-format
 msgid "Unknown attribute %s on <maximized> element"
 msgstr "Непознат атрибут %s на <maximized> елемент"

-#: ../src/session.c:1469
+#: ../src/session.c:1429
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Непознат атрибут %s на <geometry> елемент"

-#: ../src/session.c:1489
+#: ../src/session.c:1449
 #, c-format
 msgid "Unknown element %s"
 msgstr "Непознат елемент %s"

-#: ../src/session.c:1961
+#: ../src/session.c:1921
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -2268,8 +2275,7 @@ msgstr "Нема вредност атрибутот на елементот <%s

 #: ../src/theme-parser.c:1320 ../src/theme-parser.c:1334
 #: ../src/theme-parser.c:1393
-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 ""
 "Не можам да одредам истовремено ширина на копче/висина на копче и степен на "
 "зголемување за копчињата"
@@ -2542,8 +2548,7 @@ msgstr ""
 #: ../src/theme-parser.c:3464
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
-msgstr ""
-"Стилот веќе беше специфициран за состојба %s промени големина %s фокус %s"
+msgstr "Стилот веќе беше специфициран за состојба %s промени големина %s фокус %s"

 #: ../src/theme-parser.c:3475 ../src/theme-parser.c:3486
 #: ../src/theme-parser.c:3497
@@ -2578,15 +2583,12 @@ msgstr ""
 #: ../src/theme-parser.c:3659
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
-msgstr ""
-"Најнадворешните елементи во темата мора да бидат <metacity_theme> не <%s>"
+msgstr "Најнадворешните елементи во темата мора да бидат <metacity_theme> не <%s>"

 #: ../src/theme-parser.c:3679
 #, c-format
-msgid ""
-"Element <%s> is not allowed inside a name/author/date/description element"
-msgstr ""
-"Елемент <%s> не е дозволено внатрешно име/автор/датум/опис на елементот"
+msgid "Element <%s> is not allowed inside a name/author/date/description element"
+msgstr "Елемент <%s> не е дозволено внатрешно име/автор/датум/опис на елементот"

 #: ../src/theme-parser.c:3684
 #, c-format
@@ -2595,8 +2597,7 @@ msgstr "Елемент <%s> не е дозволен во <constant> елеме

 #: ../src/theme-parser.c:3696
 #, c-format
-msgid ""
-"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
+msgid "Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "Елемент <%s> не е дозволен во дистанца/граница/однос на аспект елемент"

 #: ../src/theme-parser.c:3718
@@ -2943,10 +2944,8 @@ msgstr "Alpha вредност \"%s\" во блендираните бои не

 #: ../src/theme.c:1105
 #, c-format
-msgid ""
-"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
-msgstr ""
-"Засенет формат е \"shade/base_color/factor\", \"%s\" не го собира форматот"
+msgid "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr "Засенет формат е \"shade/base_color/factor\", \"%s\" не го собира форматот"

 #: ../src/theme.c:1116
 #, c-format
@@ -2980,8 +2979,7 @@ msgstr ""
 #: ../src/theme.c:1458
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
-msgstr ""
-"Координираниот израз содржи цели броеви '%s' кои не може да бидат разложени"
+msgstr "Координираниот израз содржи цели броеви '%s' кои не може да бидат разложени"

 #: ../src/theme.c:1525
 #, c-format
@@ -3001,18 +2999,15 @@ msgid "Coordinate expression results in division by zero"
 msgstr "Координираниот израз даде резултати поделени со нула"

 #: ../src/theme.c:1777
-msgid ""
-"Coordinate expression tries to use mod operator on a floating-point number"
+msgid "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "Координираниот израз пробува да користи оператор на режим на лебдечките "
 "поинт броеви"

 #: ../src/theme.c:1834
 #, c-format
-msgid ""
-"Coordinate expression has an operator \"%s\" where an operand was expected"
-msgstr ""
-"Координираниот израз има оператор \"%s\" каде што беше очекуван операнд"
+msgid "Coordinate expression has an operator \"%s\" where an operand was expected"
+msgstr "Координираниот израз има оператор \"%s\" каде што беше очекуван операнд"

 #: ../src/theme.c:1843
 msgid "Coordinate expression had an operand where an operator was expected"
@@ -3072,8 +3067,7 @@ msgstr ""

 #: ../src/theme.c:4363 ../src/theme.c:4395
 #, c-format
-msgid ""
-"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgid "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Недостасува <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever"
 "\"/>"
@@ -3109,8 +3103,7 @@ msgstr ""

 #: ../src/theme.c:5041 ../src/theme.c:5103
 #, c-format
-msgid ""
-"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgid "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "Корисничко дефинирана константа мора да започнува со прва голема буква, \"%s"
 "\" не"
@@ -3120,44 +3113,44 @@ msgstr ""
 msgid "Constant \"%s\" has already been defined"
 msgstr "Константата \"%s\" веќе беше дефинирана"

-#: ../src/util.c:93
+#: ../src/util.c:95
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Не успеав да го отворам дневникот на дебагирање: %s\n"

-#: ../src/util.c:103
+#: ../src/util.c:105
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Не успеав да fdopen() дневник датотеката %s: %s\n"

-#: ../src/util.c:109
+#: ../src/util.c:111
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Отворив дневник датотека %s\n"

-#: ../src/util.c:203
+#: ../src/util.c:219
 msgid "Window manager: "
 msgstr "Менаџер на прозорци"

-#: ../src/util.c:349
+#: ../src/util.c:365
 msgid "Bug in window manager: "
 msgstr "Бубачка во менаџерот на прозорци"

-#: ../src/util.c:378
+#: ../src/util.c:394
 msgid "Window manager warning: "
 msgstr "Предупредување од менаџерот на прозорци:"

-#: ../src/util.c:402
+#: ../src/util.c:418
 msgid "Window manager error: "
 msgstr "Грешка од менаџерот на прозорци:"

-#: ../src/window-props.c:162
+#: ../src/window-props.c:165
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Апликацијата намести лажно _NET_WM_PID %ld\n"

 #. first time through
-#: ../src/window.c:5205
+#: ../src/window.c:5238
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -3173,7 +3166,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/window.c:5876
+#: ../src/window.c:5878
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -3204,8 +3197,8 @@ msgstr "Својство %s на прозорец 0x%lx содржи невал

 #: ../src/xprops.c:482
 #, c-format
-msgid ""
-"Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
+msgid "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 msgstr ""
 "Својствата %s на прозорецот 0x%lx содржи невалиден UTF-8 за предмет %d во "
 "листата\n"
+
--- a/po/vi.po
+++ b/po/vi.po
--- a/rationales.txt
+++ b/rationales.txt
@@ -60,3 +60,5 @@ moving/resizing (constraints): http://bugzilla.gnome.org/show_bug.cgi?id=155458
             window placement: http://bugzilla.gnome.org/show_bug.cgi?id=155460
   logout/system-monitor keys: http://bugzilla.gnome.org/show_bug.cgi?id=155462
                modal dialogs: http://bugzilla.gnome.org/show_bug.cgi?id=164841
+     multi-head sans xinerama: http://bugzilla.gnome.org/show_bug.cgi?id=324772
+                     xinerama: http://bugzilla.gnome.org/show_bug.cgi?id=324773
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -336,8 +336,8 @@ paint_screen (MetaCompositor *compositor,

      r.x = 0;
      r.y = 0;
-      r.width = screen->width;
-      r.height = screen->height;
+      r.width = screen->rect.width;
+      r.height = screen->rect.height;
      
      region = XFixesCreateRegion (xdisplay, &r, 1);
    }
@@ -351,8 +351,8 @@ paint_screen (MetaCompositor *compositor,
    }

  buffer_pixmap = XCreatePixmap (xdisplay, screen->xroot,
-                                 screen->width,
-                                 screen->height,
+                                 screen->rect.width,
+                                 screen->rect.height,
                                 DefaultDepth (xdisplay,
                                               screen->number));

@@ -360,7 +360,7 @@ paint_screen (MetaCompositor *compositor,
  XSetForeground (xdisplay, gc, WhitePixel (xdisplay, screen->number));
  XFixesSetGCClipRegion (xdisplay, gc, 0, 0, region);
  XFillRectangle (xdisplay, buffer_pixmap, gc, 0, 0,
-                  screen->width, screen->height);
+                  screen->rect.width, screen->rect.height);
  
  format = XRenderFindVisualFormat (xdisplay,
                                    DefaultVisual (xdisplay,
@@ -473,7 +473,7 @@ paint_screen (MetaCompositor *compositor,
  XRenderComposite (xdisplay, PictOpSrc, buffer_picture, None,
                    screen->root_picture,
                    0, 0, 0, 0, 0, 0,
-                    screen->width, screen->height);
+                    screen->rect.width, screen->rect.height);
  
  XFixesDestroyRegion (xdisplay, region);
  XFreePixmap (xdisplay, buffer_pixmap);
@@ -782,8 +782,8 @@ process_expose (MetaCompositor     *compositor,

  r.x = 0;
  r.y = 0;
-  r.width = screen->width;
-  r.height = screen->height;
+  r.width = screen->rect.width;
+  r.height = screen->rect.height;
  region = XFixesCreateRegion (compositor->display->xdisplay, &r, 1);
  
  merge_and_destroy_damage_region (compositor, screen, region);
@@ -1288,8 +1288,8 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
  /* Damage the whole screen */
  r.x = 0;
  r.y = 0;
-  r.width = screen->width;
-  r.height = screen->height;
+  r.width = screen->rect.width;
+  r.height = screen->rect.height;

  merge_and_destroy_damage_region (compositor,
                                   screen,
--- a/src/delete.c
+++ b/src/delete.c
@@ -248,7 +248,7 @@ io_from_ping_dialog (GIOChannel   *channel,
  if (condition & G_IO_IN)
    {
      char *str;
-      int len;
+      unsigned int len;
      GError *err;

      /* Go ahead and block for all data from child */
--- a/src/display.c
+++ b/src/display.c
@@ -461,7 +461,6 @@ meta_display_open (const char *name)
   * created in screen_new
   */
  display->leader_window = None;
-  display->no_focus_window = None;

  display->xinerama_cache_invalidated = TRUE;

@@ -712,7 +711,10 @@ meta_display_open (const char *name)
     * as it is the most recent timestamp.
     */
    if (focus == None || focus == PointerRoot)
-      meta_display_focus_the_no_focus_window (display, timestamp);
+      /* Just focus the no_focus_window on the first screen */
+      meta_display_focus_the_no_focus_window (display,
+                                              display->screens->data,
+                                              timestamp);
    else
      {
        MetaWindow * window;
@@ -720,7 +722,10 @@ meta_display_open (const char *name)
        if (window)
          meta_display_set_input_focus_window (display, window, FALSE, timestamp);
        else
-          meta_display_focus_the_no_focus_window (display, timestamp);
+          /* Just focus the no_focus_window on the first screen */
+          meta_display_focus_the_no_focus_window (display,
+                                                  display->screens->data,
+                                                  timestamp);
      }

    meta_error_trap_pop (display, FALSE);
@@ -1870,6 +1875,7 @@ event_callback (XEvent   *event,
                                  "Unsetting focus from %s due to LeaveNotify\n",
                                  window->desc);
                      meta_display_focus_the_no_focus_window (display, 
+                                                              window->screen,
                                                              event->xcrossing.time);
                    }
                  if (window->type != META_WINDOW_DOCK &&
@@ -1901,7 +1907,8 @@ event_callback (XEvent   *event,
        {
          meta_window_notify_focus (window, event);
        }
-      else if (event->xany.window == display->no_focus_window)
+      else if (meta_display_xwindow_is_a_no_focus_window (display,
+                                                          event->xany.window))
        {
          meta_topic (META_DEBUG_FOCUS,
                      "Focus %s event received on no_focus_window 0x%lx "
@@ -2991,6 +2998,24 @@ meta_display_unregister_x_window (MetaDisplay *display,
  remove_pending_pings_for_window (display, xwindow);
 }

+gboolean
+meta_display_xwindow_is_a_no_focus_window (MetaDisplay *display,
+                                           Window xwindow)
+{
+  gboolean is_a_no_focus_window = FALSE;
+  GSList *temp = display->screens;
+  while (temp != NULL) {
+    MetaScreen *screen = temp->data;
+    if (screen->no_focus_window == xwindow) {
+      is_a_no_focus_window = TRUE;
+      break;
+    }
+    temp = temp->next;
+  }
+
+  return is_a_no_focus_window;
+}
+
 Cursor
 meta_display_create_x_cursor (MetaDisplay *display,
                              MetaCursor cursor)
@@ -4821,13 +4846,14 @@ meta_display_set_input_focus_window (MetaDisplay *display,

 void
 meta_display_focus_the_no_focus_window (MetaDisplay *display, 
+                                        MetaScreen  *screen,
                                        Time         timestamp)
 {
  if (timestamp_too_old (display, NULL, &timestamp))
    return;

  XSetInputFocus (display->xdisplay,
-                  display->no_focus_window,
+                  screen->no_focus_window,
                  RevertToPointerRoot,
                  timestamp);
  display->expected_focus_window = NULL;
--- a/src/display.h
+++ b/src/display.h
@@ -216,11 +216,6 @@ struct _MetaDisplay
                              XErrorEvent *error);  
  int server_grab_count;

-  /* This window holds the focus when we don't want to focus
-   * any actual clients
-   */
-  Window no_focus_window;
-  
  /* for double click */
  Time last_button_time;
  Window last_button_xwindow;
@@ -413,6 +408,9 @@ void        meta_display_register_x_window   (MetaDisplay *display,
                                              MetaWindow  *window);
 void        meta_display_unregister_x_window (MetaDisplay *display,
                                              Window       xwindow);
+/* Return whether the xwindow is a no focus window for any of the screens */
+gboolean    meta_display_xwindow_is_a_no_focus_window (MetaDisplay *display,
+                                                       Window xwindow);

 GSList*     meta_display_list_windows        (MetaDisplay *display);

@@ -539,6 +537,7 @@ void meta_display_set_input_focus_window   (MetaDisplay *display,
 * same as meta_display_set_input_focus_window
 */
 void meta_display_focus_the_no_focus_window (MetaDisplay *display, 
+                                             MetaScreen  *screen,
                                             Time         timestamp);

 void meta_display_queue_autoraise_callback  (MetaDisplay *display,
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -1451,11 +1451,15 @@ primary_modifier_still_pressed (MetaDisplay *display,
  int x, y, root_x, root_y;
  Window root, child;
  guint mask;
+  MetaScreen *random_screen;
+  Window      random_xwindow;
  
  primary_modifier = get_primary_modifier (display, entire_binding_mask);
  
+  random_screen = display->screens->data;
+  random_xwindow = random_screen->no_focus_window;
  XQueryPointer (display->xdisplay,
-                 display->no_focus_window, /* some random window */
+                 random_xwindow, /* some random window */
                 &root, &child,
                 &root_x, &root_y,
                 &x, &y,
--- a/src/screen.c
+++ b/src/screen.c
@@ -577,16 +577,14 @@ meta_screen_new (MetaDisplay *display,
  reload_xinerama_infos (screen);
  
  meta_screen_set_cursor (screen, META_CURSOR_DEFAULT);
-  
-  if (display->no_focus_window == None)
-    {
-      display->no_focus_window = meta_create_offscreen_window (display->xdisplay,
-                                                               screen->xroot);

-      XSelectInput (display->xdisplay, display->no_focus_window,
-                    FocusChangeMask | KeyPressMask | KeyReleaseMask);
-      XMapWindow (display->xdisplay, display->no_focus_window);
-    }
+  /* Handle creating a no_focus_window for this screen */  
+  screen->no_focus_window = meta_create_offscreen_window (display->xdisplay,
+                                                          screen->xroot);
+  XSelectInput (display->xdisplay, screen->no_focus_window,
+                FocusChangeMask | KeyPressMask | KeyReleaseMask);
+  XMapWindow (display->xdisplay, screen->no_focus_window);
+  /* Done with no_focus_window stuff */
  
  set_wm_icon_size_hint (screen);
  
--- a/src/screen.h
+++ b/src/screen.h
@@ -72,6 +72,11 @@ struct _MetaScreen
  
  MetaWorkspace *active_workspace;

+  /* This window holds the focus when we don't want to focus
+   * any actual clients
+   */
+  Window no_focus_window;
+  
  GList *workspaces;

  MetaStack *stack;
--- a/src/tabpopup.c
+++ b/src/tabpopup.c
@@ -208,11 +208,11 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries,
          gchar *tmp;
          if (entries[i].hidden)
            {
-              tmp = g_strdup_printf ("[%s]", entries[i].title);
+              tmp = g_markup_printf_escaped ("[%s]", entries[i].title);
            }
          else 
            {
-              tmp = g_strdup (entries[i].title);
+              tmp = g_markup_printf_escaped ("%s", entries[i].title);
            }
          
          if (entries[i].demands_attention) 
--- a/src/window.c
+++ b/src/window.c
@@ -241,7 +241,7 @@ meta_window_new_with_attrs (MetaDisplay       *display,
  
  meta_verbose ("Attempting to manage 0x%lx\n", xwindow);

-  if (xwindow == display->no_focus_window)
+  if (meta_display_xwindow_is_a_no_focus_window (display, xwindow))
    {
      meta_verbose ("Not managing no_focus_window 0x%lx\n",
                    xwindow);
@@ -1763,7 +1763,7 @@ meta_window_show (MetaWindow *window)
                      "ancestor.\n",
                      window->display->focus_window->desc, window->desc);

-          meta_display_focus_the_no_focus_window (window->display, meta_display_get_current_time_roundtrip (window->display));
+          meta_display_focus_the_no_focus_window (window->display, window->screen, meta_display_get_current_time_roundtrip (window->display));
        }
      else
        {
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -925,6 +925,7 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
                      "Setting focus to no_focus_window, since no valid "
                      "window to focus found.\n");
          meta_display_focus_the_no_focus_window (workspace->screen->display,
+                                                  workspace->screen,
                                                  timestamp);
        }
    }
@@ -1014,6 +1015,7 @@ focus_ancestor_or_mru_window (MetaWorkspace *workspace,
    {
      meta_topic (META_DEBUG_FOCUS, "No MRU window to focus found; focusing no_focus_window.\n");
      meta_display_focus_the_no_focus_window (workspace->screen->display,
+                                              workspace->screen,
                                              timestamp);
    }
 }
Author	SHA1	Message	Date
Elijah Newren	be86740b3d	2.13.8 release 2006-01-02 Elijah Newren <newren@gmail.com> * NEWS: 2.13.8 release	2006-01-02 17:59:18 +00:00
Ilkka Tuohela	d4771cd9cf	Updated Finnish translation	2005-12-30 14:03:29 +00:00
Clytie Siddall	a59f14adbc	vi.po: Updated Vietnamese translation.	2005-12-30 07:49:05 +00:00
Elijah Newren	703f58cdf7	Make the workspace switcher work with dual-head (non-xinerama) setups. 2005-12-27 Elijah Newren <newren@gmail.com> Make the workspace switcher work with dual-head (non-xinerama) setups. Fixes #319423. * src/display.c (meta_display_open, event_callback, meta_display_focus_the_no_focus_window): * src/display.h (struct MetaDisplay, meta_display_focus_the_no_focus_window): * src/keybindings.c (primary_modifier_still_pressed): * src/screen.c (meta_screen_new): * src/screen.h (struct MetaScreen): * src/window.c (meta_window_new_with_attrs, meta_window_show): * src/workspace.c (meta_workspace_focus_default_window): Replace display->no_focus_window with a no_focus_window for each screen. * src/display.[ch] (meta_display_xwindow_is_a_no_focus_window, event_callback): * src/window.c (meta_window_new_with_attrs): New utility function, meta_display_xwindow_is_a_no_focus_window(), for checking if the given xwindow is a no_focus_window for one of the screens.	2005-12-28 06:24:30 +00:00
Elijah Newren	5e9f20e94c	since the title is going to be treated as markup, escape it. Fixes 2005-12-27 Elijah Newren <newren@gmail.com> * src/tabpopup.c (meta_ui_tab_popup_new): since the title is going to be treated as markup, escape it. Fixes #324846.	2005-12-27 16:40:47 +00:00
Kang Jeong-Hee	a710235e86	ko.po updated	2005-12-25 14:27:11 +00:00
Elijah Newren	53cba6ed37	Oops, I only meant to commit the changes to rationales.txt in the last commit	2005-12-22 07:08:38 +00:00
Elijah Newren	7e821f37fd	Add xinerama and multi-head tracker bugs	2005-12-22 06:18:38 +00:00
Arangel Angov	830baad257	Macedonian Translation update <arangela@cvs.gnome.org>	2005-12-18 23:17:08 +00:00
Kang Jeong-Hee	6a9242b192	compile with compositor enabled	2005-12-14 12:47:35 +00:00
Elijah Newren	013c8b82db	post-release version bump to 2.13.8 2005-12-12 Elijah Newren <newren@gmail.com> * configure.in: post-release version bump to 2.13.8	2005-12-12 18:44:32 +00:00