2.9.3 releaseGNOME_CONTROL_CENTER_2_9_3

66 files changed, 28874 insertions, 21578 deletions

diff --git a/po/af.po b/po/af.po
index 5e2bd0287..9524fcb10 100644
--- a/po/af.po
+++ b/po/af.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.6-branch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-03-30 17:02+0200\n"
 "Last-Translator: Zuza Software Foundation <info@translate.org.za>\n"
 "Language-Team: Afrikaans <translate-discuss-af@lists.sourceforge.net>\n"
@@ -61,11 +61,11 @@ msgstr "_Op-skerm sleutelbord"
 msgid "_Screenreader"
 msgstr "_Skermleser"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Helpende Tegnologie Ondersteuning"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 "Aktiveer ondersteuning vir GNOME helpende tegnologieë tydens aanmelding"
@@ -120,13 +120,13 @@ msgstr "Trek Kenmerk-instellingslêer in"
 msgid "_Import"
 msgstr "_Intrek"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Sleutelbord"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Stel jou sleutelbord-toeganklikheidsvoorkeure in"
 
@@ -341,11 +341,11 @@ msgstr "pixels/sekonde"
 msgid "seconds"
 msgstr "sekondes"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Verander jou werkarea agtergrond-instellings"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Werkarea agtergrond"
 
@@ -425,6 +425,13 @@ msgstr "Voeg Muurpapiere by"
 msgid "No Wallpaper"
 msgstr "Geen Muurpapier"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -637,105 +644,15 @@ msgstr "Kies asb. 'n beeld."
 msgid "_Select"
 msgstr "_Kies"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Voorkeur Toepassings"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Kies asb. jou verstek-toepassings"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M Text Browser"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx Text Browser"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links Text Browser"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome Terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Standard XTerminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Spesifiseer asb. 'n naam en 'n opdrag vir hierdie redigeerder."
@@ -745,20 +662,23 @@ msgid "Add..."
 msgstr "Voeg by..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "D_oelgemaakte Redigeerder"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Doelgemaak"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "D_oelgemaakte Posleser:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Doelgemaak"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "D_oelgemaakte Terminaal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "D_oelgemaakte Webblaaier:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Hierdie toepassing kan _veelvuldige lêers open"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -805,6 +725,16 @@ msgid "Mail Reader"
 msgstr "Posleser"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Loop in _Terminaal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Loop in _Terminaal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -812,93 +742,168 @@ msgstr ""
 "Kies die vensterbestuurder wat jy wil hê.  Jy sal toepas moet druk, die "
 "towerstaf moet swaai, en 'n towerdans moet uitvoer sodat dit kan werk."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Laai in T_erminaal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminaal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Teksredigeerder"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Hierdie toepassing kan _URI'e open"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Hierdie toepassing kan _veelvuldige lêers open"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Hierdie toepassing moet in 'n _dop laat loop word"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Verstaan _Netscape-afstandbeheer"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Gebruik hierdie _redigeerder om tekslêers te open in die lêerbestuurder"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Webblaaier"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Vensterbestuurder"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Op_drag:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Eienskappe..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Kies 'n Posleser:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Kies"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Verstek Webblaaier"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+msgid "Mozilla"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M Text Browser"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx Text Browser"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links Text Browser"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Kies 'n Terminaal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Kies 'n Webblaaier:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Kies 'n Redigeerder:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Toeganklikheid"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Verstek Terminaal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminaal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Standard XTerminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Toeganklikheidsinstellings"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Gevorderde"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Gevorderde-instellings"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Verander skermresolusie"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Skermresolusie"
 
@@ -991,7 +996,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Is jy seker dat jy hierdie inskrywing permanent wil skrap?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Beskrywing"
 
@@ -999,17 +1004,27 @@ msgstr "Beskrywing"
 msgid "Extensions"
 msgstr "Uitbreidings"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Lêertipes en Programme"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Spesifiseer watter programme gebruik word om elke lêertipe te open en te "
 "bekyk"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Lêertipes en programme"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Spesifiseer watter programme gebruik word om elke tipe lêer te open en te "
+"bekyk"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Aksies"
@@ -1100,6 +1115,7 @@ msgid "_Protocol:"
 msgstr "_Protokol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Verwyder"
 
@@ -1107,16 +1123,6 @@ msgstr "_Verwyder"
 msgid "_Viewer component:"
 msgstr "_Kyker komponent:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Lêertipes en programme"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Spesifiseer watter programme gebruik word om elke tipe lêer te open en te "
-"bekyk"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Redigeer lêer-kategorie"
@@ -1298,14 +1304,15 @@ msgid "Electronic mail transmission"
 msgstr "Elektroniese-postransmissie"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome-dokumentasie"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Lettertipe"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Kies lettertipes vir die werkarea"
 
@@ -1516,29 +1523,29 @@ msgid "The type of accelerator."
 msgstr "Die tipe versneller."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Buite werking gestel"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Onbekende Aksie>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Werkarea"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Klank"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Vensterbestuur"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1547,27 +1554,27 @@ msgstr ""
 "Die kortpad \"%s\" word reeds gebruik vir:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Fout met instelling van nuwe versnel-konfigurasie databasis: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Fout met uitwerkingstelling van versnel in konfigurasie databasis: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Aksie"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Kortpad"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Sleutelbordkortpaaie"
 
@@ -1578,26 +1585,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "Tik 'n nuwe versneller, of druk Backspace om skoon te maak"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Wys kortpadsleutel toe aan opdragte"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Onbekende Wyser"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Model"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "XKB-sleutelbord-uitleg"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1769,10 +1760,35 @@ msgstr "_Werkinterval duur:"
 msgid "minutes"
 msgstr "minute"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Onbekende Wyser"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Model"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "XKB-sleutelbord-uitleg"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Stel jou sleutelbordvoorkeure in"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Stel jou muisvoorkeure in"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Onbekende Wyser"
@@ -1937,20 +1953,21 @@ msgstr "_Drumpel:"
 msgid "_Timeout:"
 msgstr "_Uitteltyd:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Muis"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Stel jou muisvoorkeure in"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Netwerk instaner"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Netwerkinstaan-voorkeure"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1996,8 +2013,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP-instaan:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Netwerk-instaankonfigurasie"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Netwerkinstaan-voorkeure"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2038,7 +2056,7 @@ msgstr "_Wagwoord:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Veilige HTTP-instaan:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Aktiveer klank en assosieer klank met gebeure"
 
@@ -2096,15 +2114,26 @@ msgstr ""
 "jou \"Theme Preferences\" dialoog verkeerd geïnstalleer was, of jy het nog "
 "nie die \"gnome-themes\" pakket geïnstalleer nie."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Geen temalêer-lokaliteit gespesifiseer om te installeer nie"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Die gespesifiseerde temalêer-lokaliteit is ongeldig"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2139,12 +2168,12 @@ msgstr "Tema-naam moet aanwesig wees"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Kies temas vir verskillende dele van die werkarea"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2259,11 +2288,11 @@ msgstr "_Tema naam:"
 msgid "theme selection tree"
 msgstr "tema seleksie-boom"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Doelmaak die voorkoms van die nutsbalke en kieslysbalke in toepassings"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Kieslyste & Nutsbalke"
 
@@ -2332,7 +2361,6 @@ msgid "_Edit"
 msgstr "_Redigeer"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Lêer"
 
@@ -2360,6 +2388,14 @@ msgstr "_Stop"
 msgid "_Save"
 msgstr "_Stoor"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2371,23 +2407,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Kontrole"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hiper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (of \"Windows logo\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2431,14 +2467,35 @@ msgstr "_Lig geselekteerde vensters op na interval"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Kies vensters wanneer die muis oor hulle beweeg"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Venster-eienskappe"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Windows"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME-beheersentrum"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Werkarea agtergrond-voorkeure"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Filters"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Die GNOME-konfigurasienutsgoed"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2473,88 +2530,6 @@ msgstr "Beheersentrum-kieslys"
 msgid "View as Control Center"
 msgstr "Gnome-beheersentrum : %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME-beheersentrum: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Uitleg"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Uitleg om te gebruik vir die bekyk van die C-miniprogramte"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "C-miniprogramgids-voorwerp"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "C-miniprogramgids wat hierdie aansig bekyk"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "vertaler _krediete"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME-beheersentrum"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "werkarea-eienskapbestuurder."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Gnome-beheersentrum : %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Filters"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "Gnome-beheersentrum : %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Gebruik dop selfs wanneer Nautilus loop."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Aangaande hierdie toepassing"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Oorskou van die beheersentrum"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Aangaande"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Inhoud"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Help"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Die GNOME-konfigurasienutsgoed"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Gebruik dop selfs wanneer Nautilus loop."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volume"
@@ -2663,7 +2638,7 @@ msgstr ""
 "Fout terwyl probeer is om (%s)\n"
 " te laat loopwat gekoppel is aan sleutel (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2689,7 +2664,7 @@ msgstr ""
 "- Die resultate van <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/"
 "xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2701,22 +2676,22 @@ msgstr ""
 "Probeer om 'n eenvoudiger konfigurasie of gebruik van 'n nuwer weergawe van "
 "XFree sagteware."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Skerm %d Instellings\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2778,8 +2753,8 @@ msgstr "_Moenie weer hierdie boodskap wys nie"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Kon nie klanklêer %s laai as voorbeeld %s nie"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Kan nie gebruiker se tuisgids vasstel nie"
 
@@ -2828,11 +2803,11 @@ msgstr "Skerm"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Skerm waarop BGApplier moet teken"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Die klanklêer vir hierdie gebeurtenis bestaan nie."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2842,32 +2817,32 @@ msgstr ""
 "Jy mag dalk gnome-audio-pakket\n"
 " wil installeer vir 'n stel van verstek klanke."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Die lêer %s is nie 'n geldige wav-lêer nie"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Klanklêer"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Klanke:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Klank _lêer:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Kies Klanklêer"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Speel"
 
@@ -3144,28 +3119,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"XKB-instellings in gconf gaan binnekort vervang word (van die "
-"stelselkonfigurasie)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB-sleutelbord-uitleg"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB-sleutelbord-model"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB-opsies"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Sleutelbord _model:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB-sleutelbord-uitleg"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Sleutelbord _model:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Sleutelbordkortpaaie"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "XKB-instellings in gconf sal oorheers vanaf die stelsel ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"XKB-instellings in gconf gaan binnekort vervang word (van die "
+"stelselkonfigurasie)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB-sleutelbord-uitleg"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB-sleutelbord-model"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Vertraag onderbreking"
@@ -3243,46 +3266,14 @@ msgstr ""
 "deur regs te kliek op jou paneel, kies dan 'Voeg by paneel -> Nutsfunkies -> "
 "Notifikasie area'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Naam:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Styl:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tipe:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Grootte:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Weergawe:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Kopiereg:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Beskrywing:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Stel in as 'n Toepassings-lettertipe"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Lettertipe-konteks kieslys items"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Kies asb. jou verstek-toepassings"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3358,33 +3349,47 @@ msgstr "Om TrueType-lettertipes te duimnaelskets of nie"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Om Type1-lettertipes te duimnaelskets of nie"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fabriek vir die fontilus-kontekskieslys"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus-kontekskieslys"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Naam:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus-kontekskieslys-fabriek"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Styl:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Nautilus-kontekskieslys inskrywings vir lettertipes"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tipe:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Stel in as 'n Toepassings-lettertipe"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Grootte:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Weergawe:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Tema-eienskappe inhoud bekyk komponent"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Kopiereg:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Beskrywing:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus-tema-eienskappe aansig"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME-beheersentrum"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3415,27 +3420,18 @@ msgstr "_Pas lettertipe toe"
 msgid "Themes"
 msgstr "Temas"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Beheertema"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Vensteromlysting-tema"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikoontema"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI huidiglik vertoon"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Indien waar, sal geïnstalleerde temas geduimnaelskets wees."
@@ -3473,6 +3469,152 @@ msgstr "Om geïnstalleerde temas te duimnaelskets of nie"
 msgid "Whether to thumbnail themes"
 msgstr "Om temas te duimnaelskets of nie"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Pas lettertipe toe"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Terugstel na ver_stek"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome Terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "D_oelgemaakte Redigeerder"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "D_oelgemaakte Posleser:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "D_oelgemaakte Terminaal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "D_oelgemaakte Webblaaier:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Laai in T_erminaal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Hierdie toepassing kan _URI'e open"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Hierdie toepassing moet in 'n _dop laat loop word"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Kies 'n Posleser:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Kies 'n Terminaal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Kies 'n Webblaaier:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Kies 'n Redigeerder:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Toeganklikheid"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Toeganklikheidsinstellings"
+
+#~ msgid "Advanced"
+#~ msgstr "Gevorderde"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Gevorderde-instellings"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Netwerk-instaankonfigurasie"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME-beheersentrum: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Uitleg"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Uitleg om te gebruik vir die bekyk van die C-miniprogramte"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "C-miniprogramgids-voorwerp"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "C-miniprogramgids wat hierdie aansig bekyk"
+
+#~ msgid "translator_credits"
+#~ msgstr "vertaler _krediete"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "werkarea-eienskapbestuurder."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Gnome-beheersentrum : %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "Gnome-beheersentrum : %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Gebruik dop selfs wanneer Nautilus loop."
+
+#~ msgid "About this application"
+#~ msgstr "Aangaande hierdie toepassing"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Oorskou van die beheersentrum"
+
+#~ msgid "_About"
+#~ msgstr "_Aangaande"
+
+#~ msgid "_Contents"
+#~ msgstr "_Inhoud"
+
+#~ msgid "_Help"
+#~ msgstr "_Help"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Gebruik dop selfs wanneer Nautilus loop."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB-opsies"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Lettertipe-konteks kieslys items"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fabriek vir die fontilus-kontekskieslys"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus-kontekskieslys"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus-kontekskieslys-fabriek"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Nautilus-kontekskieslys inskrywings vir lettertipes"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Tema-eienskappe inhoud bekyk komponent"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus-tema-eienskappe aansig"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI huidiglik vertoon"
+
 #~ msgid "GNOME Default"
 #~ msgstr "GNOME-verstek"
 
diff --git a/po/am.po b/po/am.po
index d248fa0dc..fac37ab5c 100644
--- a/po/am.po
+++ b/po/am.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2003-02-03 10:16+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -61,11 +61,11 @@ msgstr ""
 msgid "_Screenreader"
 msgstr "እስክሪን"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr ""
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 
@@ -109,13 +109,13 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "የፊደል ሠሌዳ"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr ""
 
@@ -322,11 +322,11 @@ msgstr ""
 msgid "seconds"
 msgstr "ሴኮንዶች"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr ""
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 #, fuzzy
 msgid "Desktop Background"
 msgstr "መደብ"
@@ -415,6 +415,13 @@ msgstr ""
 msgid "No Wallpaper"
 msgstr ""
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -605,112 +612,15 @@ msgstr ""
 msgid "_Select"
 msgstr "አጥፉ"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr ""
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-#, fuzzy
-msgid "W3M Text Browser"
-msgstr "የዌብ መቃኛ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-#, fuzzy
-msgid "Lynx Text Browser"
-msgstr "የዌብ መቃኛ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-#, fuzzy
-msgid "Links Text Browser"
-msgstr "የዌብ መቃኛ"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-#, fuzzy
-msgid "Evolution Mail Reader"
-msgstr "የተለመደው የመረጃ መቃኛ፦ (_U)"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-#, fuzzy
-msgid "Gnome Terminal"
-msgstr "ተርሚናል"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-#, fuzzy
-msgid "Standard XTerminal"
-msgstr "በተርሚናል ውስጥ ጀምር (_E)"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-#, fuzzy
-msgid "ETerm"
-msgstr "ተርሚናል"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr ""
@@ -720,21 +630,21 @@ msgid "Add..."
 msgstr "ጨምር..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "የተለመደው የጽሑፍ ማቀናጃ (_U)"
+#, fuzzy
+msgid "C_ustom"
+msgstr "_የተለየ፦"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-#, fuzzy
-msgid "C_ustom Mail Reader:"
-msgstr "የተለመደው የመረጃ መቃኛ፦ (_U)"
+msgid "C_ustom:"
+msgstr "_የተለየ፦"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "የተለመደው ተርሚናል፦ (_U)"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "የተለመደው የዌብ መቃኛ፦ (_U)"
+msgid "Can open multiple _files"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -782,97 +692,187 @@ msgid "Mail Reader"
 msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "በተርሚናሉ ውስጥ አስኪድ (_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "በተርሚናሉ ውስጥ አስኪድ (_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "በተርሚናል ውስጥ ጀምር (_E)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "ተርሚናል"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "የጽሑፍ ማቀናጃ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "የዌብ መቃኛ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "መስኮቱን መቆጣጠሪያ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_ትእዛዝ፦"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "ስም፦ (_N)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "ምርጫዎች... (_P)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "አጥፉ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "የነበረው የዌብ መቃኛ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
 msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
 msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+msgid "Mozilla"
 msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "ጠለቅ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "ጠለቅ ምርጫዎች"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+#, fuzzy
+msgid "W3M Text Browser"
+msgstr "የዌብ መቃኛ"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+#, fuzzy
+msgid "Lynx Text Browser"
+msgstr "የዌብ መቃኛ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+#, fuzzy
+msgid "Links Text Browser"
+msgstr "የዌብ መቃኛ"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+#, fuzzy
+msgid "Evolution Mail Reader"
+msgstr "የተለመደው የመረጃ መቃኛ፦ (_U)"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "የነበረው ተርሚናል"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "ተርሚናል"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+#, fuzzy
+msgid "Standard XTerminal"
+msgstr "በተርሚናል ውስጥ ጀምር (_E)"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "ምድብ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+#, fuzzy
+msgid "ETerm"
+msgstr "ተርሚናል"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr ""
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr ""
 
@@ -960,7 +960,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "መግለጫ"
 
@@ -968,15 +968,23 @@ msgstr "መግለጫ"
 msgid "Extensions"
 msgstr ""
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr ""
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr ""
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "ትግባሮች"
@@ -1068,6 +1076,7 @@ msgid "_Protocol:"
 msgstr ""
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "አስወግድ (_R)"
 
@@ -1075,14 +1084,6 @@ msgstr "አስወግድ (_R)"
 msgid "_Viewer component:"
 msgstr ""
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr ""
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr ""
@@ -1260,14 +1261,14 @@ msgid "Electronic mail transmission"
 msgstr ""
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+msgid "GNOME documentation"
 msgstr ""
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "የፊደል ቅርጽ"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr ""
 
@@ -1470,55 +1471,55 @@ msgid "The type of accelerator."
 msgstr ""
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "የተበላሸ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<ያልታወቀ ትግባር>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "ሠሌዳ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "ድምፅ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "የመስኮት ጉባኤ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
 " \"%s\"\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "ትግባር"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "አቋራጭ"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "የፊደል ሠሌዳው አቋራጭ"
 
@@ -1528,28 +1529,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr ""
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr ""
-"<b>ያልታወቀ ጠቋሚ</b>\n"
-"%s"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "ሞዴል"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "የፊደል ሠሌዳው አቋራጭ"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1724,10 +1707,38 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr ""
+"<b>ያልታወቀ ጠቋሚ</b>\n"
+"%s"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "ሞዴል"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "የፊደል ሠሌዳው አቋራጭ"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr ""
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "ሜኑና ቱልባር ምርጫዎች"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "ሜኑና ቱልባር ምርጫዎች"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 #, fuzzy
 msgid "Unknown Cursor"
@@ -1898,21 +1909,22 @@ msgstr ""
 msgid "_Timeout:"
 msgstr ""
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr ""
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr ""
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr ""
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
-msgstr ""
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
+msgstr "ሜኑና ቱልባር ምርጫዎች"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
 msgid "      "
@@ -1955,8 +1967,9 @@ msgid "H_TTP proxy:"
 msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr ""
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "የመደቡ ምርጫዎች"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -1995,7 +2008,7 @@ msgstr "ሚስጢራዊ _ቃል፦"
 msgid "_Secure HTTP proxy:"
 msgstr ""
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr ""
 
@@ -2050,15 +2063,26 @@ msgid ""
 "installed the \"gnome-themes\" package."
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2088,12 +2112,12 @@ msgstr ""
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "ጭብጥ"
 
@@ -2212,11 +2236,11 @@ msgstr "የ_ጭብጥ ስም፦"
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "ሜኑዎች እና ቱልባሮች"
 
@@ -2291,7 +2315,6 @@ msgid "_Edit"
 msgstr "_አስተካክል"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_ፋይል"
 
@@ -2319,6 +2342,14 @@ msgstr "_ውጣ"
 msgid "_Save"
 msgstr "_አስቀምጥ"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2327,23 +2358,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr ""
 
@@ -2385,14 +2416,35 @@ msgstr ""
 msgid "_Select windows when the mouse moves over them"
 msgstr ""
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "የመስኮት ምርጫዎች"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "መስኮቶች"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr ""
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "ሜኑና ቱልባር ምርጫዎች"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "አጣራዎች"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr ""
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2425,87 +2477,6 @@ msgstr ""
 msgid "View as Control Center"
 msgstr "የተለመደው ጭብጥ"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "እቅድ"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "ዘግዕዝ Frontier Foundation"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr ""
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr ""
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "አጣራዎች"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "የተለመደው ጭብጥ"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr ""
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "ስለዚህ ፕሮግራም"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr ""
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "ስለ... (_A)"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "ይዞታዎች... (_C)"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_መረጃ"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr ""
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr ""
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr ""
@@ -2601,7 +2572,7 @@ msgid ""
 "which is linked to the key (%s)"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2616,7 +2587,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2624,22 +2595,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "ጠለቅ ምርጫዎች"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2690,8 +2661,8 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr ""
 
@@ -2738,45 +2709,45 @@ msgstr "እስክሪን"
 msgid "Screen on which BGApplier is to draw"
 msgstr ""
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr ""
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
 "for a set of default sounds."
 msgstr ""
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr ""
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr ""
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 #, fuzzy
 msgid "Sound File"
 msgstr "ድምፅ"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 #, fuzzy
 msgid "_Sounds:"
 msgstr "ድምፆች (_S)"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr ""
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr ""
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "አጫውት (_P)"
 
@@ -3038,29 +3009,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "የፊደል ሠሌዳ"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
 #, fuzzy
-msgid "XKB keyboard layout"
+msgid "Keyboard layout"
 msgstr "የፊደል ሠሌዳው አቋራጭ"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
 #, fuzzy
-msgid "XKB keyboard model"
+msgid "Keyboard model"
 msgstr "የፊደል ሠሌዳ"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
 #, fuzzy
-msgid "XKB options"
-msgstr "ትግባሮች"
+msgid "Keyboard options"
+msgstr "የፊደል ሠሌዳው አቋራጭ"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "የፊደል ሠሌዳው አቋራጭ"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "የፊደል ሠሌዳ"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr ""
@@ -3134,45 +3148,12 @@ msgid ""
 "Notification area'."
 msgstr ""
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "The quick brown fox jumps over the lazy dog. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "ስም፦"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "ዓይነት፦"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "ዓይነት፦"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "መጠን፦"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "ዝርያ፦"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "የቅጂው መብት፦"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "መግለጫ፦"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+msgid "Sets the default application font"
 msgstr ""
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
@@ -3241,32 +3222,45 @@ msgstr ""
 msgid "Whether to thumbnail Type1 fonts"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "The quick brown fox jumps over the lazy dog. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "ስም፦"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "ዓይነት፦"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "ዓይነት፦"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "መጠን፦"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "ዝርያ፦"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "የቅጂው መብት፦"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "መግለጫ፦"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
 msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+msgid "GNOME Font Viewer"
 msgstr ""
 
 #: vfs-methods/themus/apply-font.glade.h:1
@@ -3297,30 +3291,21 @@ msgstr "_የመጠቀሚያ ፕሮግራሞች የፊደል ቅርጽ፦"
 msgid "Themes"
 msgstr "ጭብጥ"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 #, fuzzy
 msgid "Control theme"
 msgstr "የተለመደው ጭብጥ"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 #, fuzzy
 msgid "Window border theme"
 msgstr "የመስኮት ወሰን"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 #, fuzzy
 msgid "Icon theme"
 msgstr "የተለመደው ጭብጥ"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr ""
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr ""
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3354,6 +3339,72 @@ msgstr ""
 msgid "Whether to thumbnail themes"
 msgstr ""
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr ""
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "ጭብጥን _አስገባ..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+msgid "Sets the default theme"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Gnome Terminal"
+#~ msgstr "ተርሚናል"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "የተለመደው የጽሑፍ ማቀናጃ (_U)"
+
+#, fuzzy
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "የተለመደው የመረጃ መቃኛ፦ (_U)"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "የተለመደው ተርሚናል፦ (_U)"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "የተለመደው የዌብ መቃኛ፦ (_U)"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "በተርሚናል ውስጥ ጀምር (_E)"
+
+#~ msgid "Advanced"
+#~ msgstr "ጠለቅ"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "ጠለቅ ምርጫዎች"
+
+#~ msgid "Layout"
+#~ msgstr "እቅድ"
+
+#~ msgid "translator_credits"
+#~ msgstr "ዘግዕዝ Frontier Foundation"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "የተለመደው ጭብጥ"
+
+#~ msgid "About this application"
+#~ msgstr "ስለዚህ ፕሮግራም"
+
+#~ msgid "_About"
+#~ msgstr "ስለ... (_A)"
+
+#~ msgid "_Contents"
+#~ msgstr "ይዞታዎች... (_C)"
+
+#~ msgid "_Help"
+#~ msgstr "_መረጃ"
+
+#, fuzzy
+#~ msgid "XKB options"
+#~ msgstr "ትግባሮች"
+
 #~ msgid "De_tails..."
 #~ msgstr "ዝርዝሮች... (_T)"
 
@@ -3453,10 +3504,6 @@ msgstr ""
 #~ msgstr "መደበኛ የሆነውን የፋይል አመራረጥ በመጠቀም ሸሯቅብን ማግኘት አይቻልም"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "ሜኑና ቱልባር ምርጫዎች"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "ጠለቅ ምርጫዎች"
 
@@ -3485,18 +3532,10 @@ msgstr ""
 #~ msgstr "የተለመደው ጭብጥ"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "ሜኑና ቱልባር ምርጫዎች"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "_መግለጫ፦"
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "ሜኑና ቱልባር ምርጫዎች"
-
-#, fuzzy
 #~ msgid "radiobutton1"
 #~ msgstr "ሬዲዮ ቁልፍ 1"
 
@@ -3542,13 +3581,6 @@ msgstr ""
 #~ msgid "Quit"
 #~ msgstr "_ውጣ"
 
-#, fuzzy
-#~ msgid "Apply theme..."
-#~ msgstr "ጭብጥን _አስገባ..."
-
-#~ msgid "C_ustom:"
-#~ msgstr "_የተለየ፦"
-
 #~ msgid "_Off"
 #~ msgstr "_አጥፋ"
 
diff --git a/po/ar.po b/po/ar.po
index 12e06ee66..7549437e1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-04 17:38+0300\n"
 "Last-Translator: Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -68,11 +68,11 @@ msgstr "_لوحة مفاتيح الشاشة"
 msgid "_Screenreader"
 msgstr "قارء ال_شاشة"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "دعم التكنولوجيا المعينة"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "تفعيل الدعم للتكنولوجيات المعينة عند التسجيل"
 
@@ -123,13 +123,13 @@ msgstr "استيراد ملف تعيينات الميزة"
 msgid "_Import"
 msgstr "إ_ستيراد"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "لوحة المفاتيح"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "اضبط خيارات الإعانة للوحة مفاتيحك"
 
@@ -340,11 +340,11 @@ msgstr "بكسل/ثانية"
 msgid "seconds"
 msgstr "ثوان"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "تغيير تعيينات خلفيّة سطح مكتبك"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "خلفية سطح المكتب"
 
@@ -423,6 +423,13 @@ msgstr "إضافة صور للمكتب"
 msgid "No Wallpaper"
 msgstr "لا صور على المكتب"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -624,105 +631,15 @@ msgstr "الرجاء اختيار صورة."
 msgid "_Select"
 msgstr "إنت_قاء"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "التطبيقات المفضّلة"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "اختر تطبيقاتك الإفتراضية"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "ابيفني"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "كاليون"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "انكومباس"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "فايربيرد/فايرفُكس"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "موزلا/نتسكايب6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "نتسكايب كميونكايتر"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "كنكرور"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "متصفّح نصّي W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "متصفح Lynx النصي للإنترنت "
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "متصفّح النصوص لـ Link"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "قارئ البريد افوليوشن"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "بلزا"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "كمايل"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "موزلا مايل"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "مت"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "شاشة جنوم الطرفية"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "شاشة X الطرفيّة القياسيّة"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "الرجاء تحديد اسم و أمر لهذا المحرر."
@@ -732,20 +649,23 @@ msgid "Add..."
 msgstr "إضافة..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "المحرر الخا_ص"
+#, fuzzy
+msgid "C_ustom"
+msgstr "خاص"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "قارئ البريد ال_خاص:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "خاص"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "الشاشة الطرفيِّة ال_خاصة:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "متصفح الانترنت الخا_ص:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "يستطيع هذا التطبيق فتح ملفات مت_عددة"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -792,6 +712,16 @@ msgid "Mail Reader"
 msgstr "قارء البريد"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "تشغيل في ال_شاشة الطرفية"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "تشغيل في ال_شاشة الطرفية"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -799,92 +729,168 @@ msgstr ""
 "اختر مدير النوافذ الذي تريد. إنك بحاجة لنقر زر التطبيق و التلويح بالعصا "
 "السحرية ثم القيام برقصة سحرية ليعمل."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "ابدأ في _شاشة الطرفية"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "شاشة طرفية"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "محرّر نصوص"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "يستطيع هذا التطبيق فتح ال_عناوين"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "يستطيع هذا التطبيق فتح ملفات مت_عددة"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "يتطلب هذا التطبيق تشغيله في _هيكل"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "يفهم التحكّم عن بعد ل_نتسكايب"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "استخدم هذا ال_محرّر لفتح الملفات النصية في مدير الملفات"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "متصفح الإنترنت"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "مدير النوافذ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "أ_مر:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "الا_سم:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "ال_خصائص..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "ا_ختيار قارء بريد:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "إنت_قاء"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "ا_ختيار شاشة طرفية:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "متصفح الانترنت الافتراضي"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "ا_ختيار متصفّح إنترنت:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "ابيفني"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "ا_ختيار محرر:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "كاليون"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "الإعانة"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "انكومباس"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "تعيينات الإعانة"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "فايربيرد/فايرفُكس"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "متقدّم"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "تعيينات متقدّمة"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "موزلا مايل"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "نتسكايب كميونكايتر"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "كنكرور"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "متصفّح نصّي W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "متصفح Lynx النصي للإنترنت "
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "متصفّح النصوص لـ Link"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "قارئ البريد افوليوشن"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "بلزا"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "كمايل"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "موزلا مايل"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "مت"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "الشاشة الطرفية الافتراضية"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "شاشة طرفية"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "شاشة X الطرفيّة القياسيّة"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "تغيير استبانة الشاشة"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "استبانة الشاشة"
 
@@ -981,7 +987,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "هل أنت متأكّد من أنك تريد حذف هذه الخانة نهائيّا؟"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "الوصف"
 
@@ -989,15 +995,23 @@ msgstr "الوصف"
 msgid "Extensions"
 msgstr "امتدادات"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "أنواع الملفات و البرامج"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "تحديد البرامج التي يتم استخدامها لفتح أو عرض أي نوع ملف"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "أنواع الملفات و البرامج"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "تحديد البرامج التي ستسخدم لفتح أو عرض أي نوع ملف"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "أحداث"
@@ -1088,6 +1102,7 @@ msgid "_Protocol:"
 msgstr "ال_بروتوكول:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_حذف"
 
@@ -1095,14 +1110,6 @@ msgstr "_حذف"
 msgid "_Viewer component:"
 msgstr "مكوّن ال_عارض:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "أنواع الملفات و البرامج"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "تحديد البرامج التي ستسخدم لفتح أو عرض أي نوع ملف"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "تحرير فئة الملف"
@@ -1283,14 +1290,15 @@ msgid "Electronic mail transmission"
 msgstr "نقل البريد الإلكتروني"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "توثيق جنوم"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "الخط"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "اختيار خطوط لسطح المكتب"
 
@@ -1505,29 +1513,29 @@ msgid "The type of accelerator."
 msgstr "نوع مفتاح الاختصار."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "معطّل"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<حدث مجهول>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "سطح المكتب"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "صوت"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "إدارة النوافذ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1536,26 +1544,26 @@ msgstr ""
 "الإختصار \"%s\" مستخدم لـ:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "حدث خطأ أثناء ضبط مفتاح تعجيل جديد في قاعدة بيانات الإعدادات: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "خطأ عند إلغاء ضبط مفتاح الإختصار في قاعدة بيانات الإعدادات: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "حدث"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "مفتاح اختصار"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "اختصارات لوحة المفاتيح"
 
@@ -1567,23 +1575,10 @@ msgstr ""
 "لتحرير مفتاح اختصار فانقر السّطر المقابل و أدخل مسرّعاً جديداً أو اضغط مفتاح "
 "التّراجع للإخلاء."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "ربط مفاتيح اﻻختصار بالأوامر"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "مجهول"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "الطّرُز"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "معاينة تخطيط لوحة المفاتيح"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1749,10 +1744,32 @@ msgstr "مدة ال_عمل:"
 msgid "minutes"
 msgstr "دقائق"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "مجهول"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "الطّرُز"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "معاينة تخطيط لوحة المفاتيح"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "اضبط خصائص لوحة مفاتيحك"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "اضبط تفضيلات فأرتك"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "مؤشر مجهول"
@@ -1917,20 +1934,21 @@ msgstr "ال_عتبة:"
 msgid "_Timeout:"
 msgstr "_فترة الإستراحة:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "الفأرة"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "اضبط تفضيلات فأرتك"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "بروكسي الشبكة"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "تفضيلات بروكسي الشبكة"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1974,8 +1992,9 @@ msgid "H_TTP proxy:"
 msgstr "ب_روكسي HTTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "إعداد بروكسي الشبكة"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "تفضيلات بروكسي الشبكة"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2013,7 +2032,7 @@ msgstr "_كلمة السر:"
 msgid "_Secure HTTP proxy:"
 msgstr "بروكسي HTTP _آمن:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "تفعيل الصوت وربطه بالأحداث"
 
@@ -2070,15 +2089,26 @@ msgstr ""
 "لم يمكن ايجاد تيمات في نظامك.ربما يكون سبب ذلك تثبيت غير سليم لحوار "
 "\"تفضيلات التيمة\"، أو عدم تثبيتك لحزمة \"تيمات جنوم\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "لم يحدّد موقع ملف التيمة لتثبيتها"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "موقع ملف التيمة المحدّد لتثبيتها غير صحيح."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2110,12 +2140,12 @@ msgstr "يجب أن يكون اسم التيمة موجودا"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "هذه التّيمة موجودة أصلاً. هل تريد استبدالها؟"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "اختر تيمات لاجزاء عديدة من سطح المكتب"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "التيمة"
 
@@ -2227,11 +2257,11 @@ msgstr "اسم ال_تيمة:"
 msgid "theme selection tree"
 msgstr "شجرة إنتقاء التيمات"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "تخصيص مظهر أعمدة الأدوات و أعمدة القوائم في التطبيقات"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "أعمدة القوائم و أعمدة الأدوات"
 
@@ -2300,7 +2330,6 @@ msgid "_Edit"
 msgstr "_تحرير..."
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_ملف"
 
@@ -2328,6 +2357,14 @@ msgstr "_إنهاء"
 msgid "_Save"
 msgstr "_حفظ"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2339,23 +2376,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "القطعة"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "سوبر (أو \"شعار ونداوس\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "عام"
 
@@ -2395,14 +2432,34 @@ msgstr "_رفع النافذة المختارة بعد فاصل زمني"
 msgid "_Select windows when the mouse moves over them"
 msgstr "ا_نتقاء نوافذ عند تنقل الفأرة فوقها"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "خصائص النافذة"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "النوافذ"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "مركز تحكم جنوم"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "تفضيلات خلفية سطح المكتب"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "أخرى"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "أداة إعداد جنوم"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2437,87 +2494,6 @@ msgstr "مصنع قائمة الحالة لفنتيلوس"
 msgid "View as Control Center"
 msgstr "مركز تحكّم جنوم"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "مركز تحكم جنوم: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "التصميم"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "التصميم المستخدم لمشهد بريمجات التحكم الحالي"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "جسم دليل بريمج التحكم"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "دليل بريمج التحكم الذي يعرضه هذا المشهد"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"عرفات المديني، تونس <lumina@silverpen.de>عصام بيازيدي، الأردننور الدين أمين "
-"آغة، العربية السعوديةمحمد جمال، مصرسيد جعفر الموسوي، البحرين "
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "مركز تحكم جنوم"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "مدير خصائص سطح المكتب."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "مركز تحكم جنوم : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "أخرى"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "مركز تحكّم جنوم"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "استخدام نوتيلس إن كان يعمل."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "حول هذا التطبيق"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "نظرة عامة عن مركز التحكم"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_حول"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "ال_محتويات"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_مساعدة"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "أداة إعداد جنوم"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "استخدام هيكل حتى و إن كان نوتيلس يعمل."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "شدة الصوت"
@@ -2623,7 +2599,7 @@ msgstr ""
 "خطأ عند محاولة تشغيل(%s)\n"
 "المربوط بالمفتاح (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2648,7 +2624,7 @@ msgstr ""
 "-·نتيجة <b>xprop·-root·|·grep·XKB</b>\n"
 "-·نتيجة <b>gconftool-2·-R·/desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2659,7 +2635,7 @@ msgstr ""
 "توجد مشاكل معروفة مع إعدادات معقّدة لـ XKB.\n"
 "حاول إستعمال إعادادات أبسط أو أخذ إصدارة حديثة من برنامج XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2667,15 +2643,15 @@ msgstr ""
 "تختلف تعيينات لوحة مفاتيح نظام X عن تعيينات لوحة مفاتيح جنوم الحاليّة. أي "
 "المجموعتين تودّ استخدامها؟"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "استخدام تعيينات X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "استخادم تعيينات جنوم"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2739,8 +2715,8 @@ msgstr "لا _تظهر هذه الرسالة مرة أخرى"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "لم يمكن تحميل ملف الصوت %s كنموذج %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "لا يمكن تحديد الدليل المنزلي للمستخدم"
 
@@ -2788,11 +2764,11 @@ msgstr "الشاشة"
 msgid "Screen on which BGApplier is to draw"
 msgstr "الشاشة التي سيرسم عليها BGApplier"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "ملف الصوت لهذا الحدث غير موجود."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2802,32 +2778,32 @@ msgstr ""
 "قد يتوجب عليك تثبيت حزمة gnome-audio\n"
 "للحصول على مجموعة من الأصوات الإفتراضية."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "الملف %s·ليس ملف wav سليم"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "حدث"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "ملف صوت"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "الأ_صوات:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_ملف صوت:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "انتقي ملف صوت"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_عزف"
 
@@ -3086,26 +3062,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "ستنمقّ تعيينات XKB في gconf قريبا (من قبل إعدادات النظام)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "تصميم لوحة مفاتيح XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "نسق لوحة مفاتيح XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "خيارات XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "ن_سق لوحة المفاتيح:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "تصميم لوحة مفاتيح XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "ن_سق لوحة المفاتيح:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "اختصارات لوحة المفاتيح"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "ستنمّق تعيينات XKB·في gconf من النظام في أسرع زقت ممكن"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "ستنمقّ تعيينات XKB في gconf قريبا (من قبل إعدادات النظام)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "تصميم لوحة مفاتيح XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "نسق لوحة مفاتيح XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "تأجيل الإ_ستراحة"
@@ -3182,46 +3206,14 @@ msgstr ""
 "تبليغ على شريطك. يمكنك إضافتها بنقر يمينيّ على شريطك و أختيار 'إضافة للشريط -"
 "> أدوات ->مساحة التبليغ'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "أبجد هوز حطي كلمن سعفض قرشت ثخذ ضظغ 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "الاسم:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "الأسلوب:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "النوع:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "الحجم:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "الإصدارة:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "حقوق الطبع:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "ال_وصف:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "طريقة الاستخدام: %s ملف الخط\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "ضبط كخط التطبيقات"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "عناصر قائمة الحالة للخط"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "اختر تطبيقاتك الإفتراضية"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3289,33 +3281,47 @@ msgstr "فيما·إذا·ستنشأ·صور·مثاليّة·لخطوط·TrueTy
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "فيما·إذا·ستنشأ·صور·مثاليّة·لخطوط·Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "مصنع لقائمة الحالة لفنتيلوس"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "أبجد هوز حطي كلمن سعفض قرشت ثخذ ضظغ 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "قائمة الحالة لفنتيلوس"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "الاسم:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "مصنع قائمة الحالة لفنتيلوس"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "الأسلوب:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "خانات الخطوط لقائمة الحالة لنوتلس"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "النوع:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "ضبط كخط التطبيقات"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "الحجم:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "مكون عارض محتويات خصائص التيمات"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "الإصدارة:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "حقوق الطبع:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "ال_وصف:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "طريقة الاستخدام: %s ملف الخط\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "مشهد ثيموس لخصائص التيمة"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "مركز تحكم جنوم"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3343,27 +3349,18 @@ msgstr "تطبيق ال_خط"
 msgid "Themes"
 msgstr "التيمات"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "تيمة القطعة"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "تيمة حدود النافذة"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "تيمة الأيقونات"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "العنوان المعروض حاليا"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "أبجد هوز حطي"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "إذا ضبط لـ true فستنشأ صور مثاليّة عن الخطوط المثبّتة."
@@ -3396,3 +3393,149 @@ msgstr "فيما إذا يقع إنشاء صور مثالية عن التيما�
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "فيما إذا يقع إنشاء صور مثاليّة عن التيمات"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "أبجد هوز حطي"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "تطبيق ال_خط"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "إعادة الضبط للإ_فتراضات"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "موزلا/نتسكايب6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "شاشة جنوم الطرفية"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "المحرر الخا_ص"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "قارئ البريد ال_خاص:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "الشاشة الطرفيِّة ال_خاصة:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "متصفح الانترنت الخا_ص:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "ابدأ في _شاشة الطرفية"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "يستطيع هذا التطبيق فتح ال_عناوين"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "يتطلب هذا التطبيق تشغيله في _هيكل"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "ا_ختيار قارء بريد:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "ا_ختيار شاشة طرفية:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "ا_ختيار متصفّح إنترنت:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "ا_ختيار محرر:"
+
+#~ msgid "Accessibility"
+#~ msgstr "الإعانة"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "تعيينات الإعانة"
+
+#~ msgid "Advanced"
+#~ msgstr "متقدّم"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "تعيينات متقدّمة"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "إعداد بروكسي الشبكة"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "مركز تحكم جنوم: %s"
+
+#~ msgid "Layout"
+#~ msgstr "التصميم"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "التصميم المستخدم لمشهد بريمجات التحكم الحالي"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "جسم دليل بريمج التحكم"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "دليل بريمج التحكم الذي يعرضه هذا المشهد"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "عرفات المديني، تونس <lumina@silverpen.de>عصام بيازيدي، الأردننور الدين "
+#~ "أمين آغة، العربية السعوديةمحمد جمال، مصرسيد جعفر الموسوي، البحرين "
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "مدير خصائص سطح المكتب."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "مركز تحكم جنوم : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "مركز تحكّم جنوم"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "استخدام نوتيلس إن كان يعمل."
+
+#~ msgid "About this application"
+#~ msgstr "حول هذا التطبيق"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "نظرة عامة عن مركز التحكم"
+
+#~ msgid "_About"
+#~ msgstr "_حول"
+
+#~ msgid "_Contents"
+#~ msgstr "ال_محتويات"
+
+#~ msgid "_Help"
+#~ msgstr "_مساعدة"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "استخدام هيكل حتى و إن كان نوتيلس يعمل."
+
+#~ msgid "XKB options"
+#~ msgstr "خيارات XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "عناصر قائمة الحالة للخط"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "مصنع لقائمة الحالة لفنتيلوس"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "قائمة الحالة لفنتيلوس"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "مصنع قائمة الحالة لفنتيلوس"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "خانات الخطوط لقائمة الحالة لنوتلس"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "مكون عارض محتويات خصائص التيمات"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "مشهد ثيموس لخصائص التيمة"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "العنوان المعروض حاليا"
diff --git a/po/az.po b/po/az.po
index e549288bb..3e3951fe7 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-04 19:45+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -64,11 +64,11 @@ msgstr "_Ekran üstü klaviatura"
 msgid "_Screenreader"
 msgstr "_Ekran oxuyucusu"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Yardımçı Texnologiya Dəstəyi"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Girişdə GNOME yardımçı texnologiya dəstəyini fəallaşdır"
 
@@ -119,13 +119,13 @@ msgstr "Xassə Qurğuları Faylını İdxal Et"
 msgid "_Import"
 msgstr "_İdxal Et"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Klaviatura"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Klaviatura yetişmə qabiliyyəti qurğularınızı seçin"
 
@@ -340,11 +340,11 @@ msgstr "piksel/saniyə"
 msgid "seconds"
 msgstr "saniyə"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Masa Üstü Arxa Plan Qurğunuzu Dəyişdirin"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Masa Üstü Arxa Planı"
 
@@ -423,6 +423,13 @@ msgstr "Divar Kağızı Əlavə Et"
 msgid "No Wallpaper"
 msgstr "Divar Kağızı İşlətmə"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -626,105 +633,15 @@ msgstr "Xahiş edirik, bir rəsm seçin."
 msgid "_Select"
 msgstr "_Seç"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Ön Qurğulu Proqramlar"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Ön qurğulu proqramlarınızı seçin"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M Mətn Səyyahı"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx Mətn Səyyahı"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links Mətn Səyyahı"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution Poçt Oxuyucusu"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome Terminalı"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Standart XTerminalı"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Xahiş edirik, bu editor üçün bir ad və əmr girin."
@@ -734,20 +651,23 @@ msgid "Add..."
 msgstr "Əlavə Et..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_Xüsusi Editor"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Hazırkı"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "_Xüsusi Poçt Oxuyucusu:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Hazırkı"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "_Xüsusi Terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "_Xüsusi Veb Səyyahı:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Bu tə'minat _birdən çox faylları aça bilmir"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -794,6 +714,16 @@ msgid "Mail Reader"
 msgstr "Poçt Oxuyucusu"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "_Terminalda İcra Et"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "_Terminalda İcra Et"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -801,92 +731,168 @@ msgstr ""
 "İstədiyiniz pəncərə idarəçisini seçin. Bunun işləməsi üçün tətbiq et "
 "düyməsinə basdıqdan sonra, sehirli çubuğu oynadıb sehirli sözlər deməlisiniz."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Terminalda _Başlat"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Mətn Editoru"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Bu tə'minat _URI'ləri aça bilmir"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Bu tə'minat _birdən çox faylları aça bilmir"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Bu tə'minat _qabıqda icra edilməlidir"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "_Netscape Uzaq İdarəsini Başa Düşür"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Fayl idarəçisində mətn fayllarını açmaq üçün bu _editoru istifadə et"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Veb Səyyahı"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Pəncərə İdarəçisi"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Ə_mr:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Xüsusiyyətlər..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "Poçt Oxuyucusu _Seç:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Seç"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Terminalı Seçin:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Ön Qurğulu Veb Səyyahı"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Veb Səyyahını Seçin:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Editoru Seçin:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Yetişmə Qabiliyyəti"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Yetişmə Qabiliyyəti Qurğuları"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Ətraflı"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Ətraflı Qurğular"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M Mətn Səyyahı"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx Mətn Səyyahı"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links Mətn Səyyahı"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution Poçt Oxuyucusu"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Ön Qurğulu Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Standart XTerminalı"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Ekran həlleciliyini dəyişdir"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Ekran Həllediciliyi"
 
@@ -977,7 +983,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Bu qirişi həmişəlik silmək istəyirsiniz?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "İzahat"
 
@@ -985,17 +991,27 @@ msgstr "İzahat"
 msgid "Extensions"
 msgstr "Uzantılar"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Fayl Növləri və Proqramlar"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Fayl növlərinin hansı proqram ilə açılmasını ya da nümayiş edilməsini tə'yin "
 "edin"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Fayl növləri və Proqramlar"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Hər fayl növünün hansı proqram ilə açılmasını ya da nümayiş edilməsini "
+"tə'yin edin"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Gedişatlar"
@@ -1086,6 +1102,7 @@ msgid "_Protocol:"
 msgstr "_Protokol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Sil"
 
@@ -1093,16 +1110,6 @@ msgstr "_Sil"
 msgid "_Viewer component:"
 msgstr "_Nümayiç tərkib hissəsi:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Fayl növləri və Proqramlar"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Hər fayl növünün hansı proqram ilə açılmasını ya da nümayiş edilməsini "
-"tə'yin edin"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Fayl kateqoriyasında düzəlişlər et"
@@ -1284,14 +1291,15 @@ msgid "Electronic mail transmission"
 msgstr "Elektronik poçt transmissiyası"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome sənədləri"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Yazı Növü"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Masa üstü yazı növlərini seçin"
 
@@ -1500,29 +1508,29 @@ msgid "The type of accelerator."
 msgstr "Sürə'tləndirici növü."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Bağlı"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Namə'lum Gedişat>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Masa Üstü"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Səs"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Pəncərə İdarəsi"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1531,26 +1539,26 @@ msgstr ""
 "\"%s\" qısa yolu hazırda bu gedişat üçün istifadə edilir:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Qurğu mə'lumat bazasında yeni sür'ətləndirici tə'yin etmə xətası: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Qurğu mə'lumat bazasından sür'ətləndirici silmə xətası: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Gedişat"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Qısa Yol"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Klaviatura Qısa Yolları"
 
@@ -1562,23 +1570,10 @@ msgstr ""
 "Qısa yolu dəyişdirmək üçün uyğun sətirə tıqlayıb yeni sürətləndiricini "
 "yazın, ya da silmək üçün backspace düyməsinə basın."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Əmrlərə qısa yol düymələri tə'yin edin"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Naməlum"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modellər"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Klaviatura düzülüşü ön nümayişi"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1744,10 +1739,32 @@ msgstr "_İşin sürəkliyi:"
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Naməlum"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modellər"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Klaviatura düzülüşü ön nümayişi"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Klaviatura seçimlərinizi seçin"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Siçanınızın qurğularını seçin"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Namə'lum Kursor"
@@ -1912,20 +1929,21 @@ msgstr "_Aralıq:"
 msgid "_Timeout:"
 msgstr "_Gecikmə:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Siçan"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Siçanınızın qurğularını seçin"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Şəbəkə Vəkil Vericisi"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Şəbəkə vəkil qurğuları"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1969,8 +1987,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP vəkil vericisi:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Şəbəkə Proksisi Quraşdırması"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Şəbəkə vəkil qurğuları"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2008,7 +2027,7 @@ msgstr "_Şifrə:"
 msgid "_Secure HTTP proxy:"
 msgstr "_E'tibarlı HTTP vəkil vericisi:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Səsi fəallaşdır və hadisələrlə səsləri əlaqələndir"
 
@@ -2066,15 +2085,26 @@ msgstr ""
 "düzgün quraşdırılmadığına dəlalət edir, ya da \"gnome-themes\" paketini "
 "qurmamışsınız."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Qurulacaq örtük faylı mövqeyi bildirilmədi"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Qurulacaq örtük faylının mövqeyi hökmsüzdür"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2108,12 +2138,12 @@ msgstr "Örtük adı mövcud olmalıdır"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Örtük onsuzda mövcuddur. Onu əvəz etmək istəyirsiniz?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Masa üstünün müxtə'lif yerləri üçün örtüklər seç"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Örtük"
 
@@ -2227,11 +2257,11 @@ msgstr "Örtük _adı:"
 msgid "theme selection tree"
 msgstr "örtük seçki budağı"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Proqramlardakı vasitə və menyu çubuqlarının görünüşünü xüsusiləşdir"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menyular və Vasitə Çubuqları"
 
@@ -2300,7 +2330,6 @@ msgid "_Edit"
 msgstr "_Düzəlt"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fayl"
 
@@ -2328,6 +2357,14 @@ msgstr "Çı_x"
 msgid "_Save"
 msgstr "_Qeyd Et"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2339,23 +2376,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Windows"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2396,14 +2433,34 @@ msgstr "_Seçili pəncərələri müəyyən bir vaxt sonra qabağa gətir"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Siçanın oxu pəncərələrin üstünə gələndə onları seç"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Pəncərə Xassələri"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Pəncələr"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME İdarə Mərkəzi"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Masa Üstü Arxa Planı Seçimləri"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Digərləri"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "GNOME quraşdırma avadanlığı"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "İdarə Mərkəzi"
@@ -2432,90 +2489,6 @@ msgstr "İdarə Mərkəzi Komponenti Emalatxanası"
 msgid "View as Control Center"
 msgstr "İdarə Mərkəzi Olaraq Göstər"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME İdarə Mərkəzi: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Düzülüş"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Kappletin bi görünüşü üçün işlədiləcək düzülüş"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Kapplet cərgəsi cismi"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Nümayişin göstərdiyi kapplet cərgəsi"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Vasif İsmailoğlu <linuxaz@azerimail.net>\n"
-"Mətin Əmirov <metin@karegen.com>\n"
-"\n"
-"Tərcümə işləri üzrə yazışma siyahısı ünvanımız:\n"
-"<translation-team-az@lists.sourceforge.net>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME İdarə Mərkəzi"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Masa üstü seçimləri idarəçisi."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME İdarə Mərkəzi: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Digərləri"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Gnome İdarə Mərkəzi"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Nautilus fəaliyyətdə isə onu işlət."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Bu proqram haqqında"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "İdarə mərkəzinin icmalı"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Haqqında"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Məzmun"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Yardım"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "GNOME quraşdırma avadanlığı"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Nautilus fəaliyyətdə isə belə qabığı işlət"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Səs"
@@ -2622,7 +2595,7 @@ msgstr ""
 "(%2$s) düyməsinə bağlı olan\n"
 "(%1$s) icra edilməyə çalışırkən xəta yarandı"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2648,7 +2621,7 @@ msgstr ""
 "- <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>\n"
 "   əmrinin nəticəsini də yollayın."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2659,7 +2632,7 @@ msgstr ""
 "Qarışıq XKB qurğuları ilə əlaqəli bə'zi problemlər vardır.\n"
 "XFree tə'minatının daha yeni buraxılışını endirməyə çalışın."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2667,15 +2640,15 @@ msgstr ""
 "X sisteminin klaviatura quruluşu hazırkı GNOME klaviatura quruluşundan "
 "fərqlidir. Hansı dəstəni işlətmək istəyirsiniz?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "X qurğularını işlət"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "GNOME Qurğularını İşlət"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2740,8 +2713,8 @@ msgstr "_Bu ismarışı bir də göstərmə"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "%2$s şablonu olaraq %1$s səs faylı yüklənə bilmədi"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "İstifadəçinin ev cərgəsi müəyyən edilə bilmir"
 
@@ -2790,11 +2763,11 @@ msgstr "Ekran"
 msgid "Screen on which BGApplier is to draw"
 msgstr "BGApplier'in göstəriləcəyi ekran"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Bu səbəb üçün ayrılmış səs faylı yoxdur."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2804,32 +2777,32 @@ msgstr ""
 "Bəlkə də ön qurğulu səslər üçün gnome-audio paketini\n"
 " qurmamısınız."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "%s faylı hökmlü wav faylı deyil"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Hadisə"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Səs Faylı"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Səslər:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Səs _faylı:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Səs Faylını Seç"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "Ç_al"
 
@@ -3090,27 +3063,75 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Çox yaxında, gconf-dakı XKB qurğuları sisteminizdəkilərlə əvəz ediləcəkdir."
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB klaviatura düzülüşü"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB klaviatura modeli"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB seçimləri"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Klaviatura _modeli:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB klaviatura düzülüşü"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Klaviatura _modeli:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Klaviatura Qısa Yolları"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Gconf-dakı XKB qurğuları tezliklə sisteminkilərlə əvəz ediləcəkdir"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Çox yaxında, gconf-dakı XKB qurğuları sisteminizdəkilərlə əvəz ediləcəkdir."
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB klaviatura düzülüşü"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB klaviatura modeli"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "Fasiləni _tə'xirə sal"
@@ -3186,46 +3207,14 @@ msgstr ""
 "panelinizə sağ tıqlayıb 'Panelə Əlavə Et -> Tə'minatlar -> Bildiriş sahəsi' "
 "menyusunu seçin."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Sən! Bu gün Azərbaycan üçün nə etdin? 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Ad:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Tərz:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Növ:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Böyüklük:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Buraxılış:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Müəllif hüququ:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "İzahat:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "istifadə qaydası: %s yazı növü faylı\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Proqram Yazı Növü Olaraq Tə'yin Et"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Yazı növü məzmun menyusu üzvləri"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Ön qurğulu proqramlarınızı seçin"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3301,33 +3290,47 @@ msgstr "TrueType yazı növlərinin ön nümayişlərinin göstərilməsi"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Type1 yazı növlərinin ön nümayişlərinin göstərilməsi"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fontilus məzmun menyusu üçün e'malatxana"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Sən! Bu gün Azərbaycan üçün nə etdin? 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus məzmun menyusu"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Ad:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus məzmun menyusu e'malatxanası"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Tərz:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Yazı növləri üçün Nautils məzmun menyusu girişləri"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Növ:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Proqram Yazı Növü Olaraq Tə'yin Et"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Böyüklük:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Buraxılış:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Müəllif hüququ:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Örtük Xassələrinin məzmun nümaişi komponenti"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "İzahat:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus Örtük Xassələri nümaişi"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "istifadə qaydası: %s yazı növü faylı\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME İdarə Mərkəzi"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3358,27 +3361,18 @@ msgstr "Yazı növünü _tətbiq et"
 msgid "Themes"
 msgstr "Örtüklər"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Sınama örtüyü"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Pəncərə kənarı örtüyü"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Timsal örtüyü"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Hazırda göstərilən URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "True isə, quraşdırılmış örtüklərin nümaişləri göstəriləcək."
@@ -3414,3 +3408,152 @@ msgstr "Quraşdırılmış örtüklərin nümaişlərinin göstərilməsi"
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "Örtüklərin nümaişlərinin göstərilməsi"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Yazı növünü _tətbiq et"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Ön _qurğulara sıfırla"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome Terminalı"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_Xüsusi Editor"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "_Xüsusi Poçt Oxuyucusu:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "_Xüsusi Terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "_Xüsusi Veb Səyyahı:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Terminalda _Başlat"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Bu tə'minat _URI'ləri aça bilmir"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Bu tə'minat _qabıqda icra edilməlidir"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "Poçt Oxuyucusu _Seç:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Terminalı Seçin:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Veb Səyyahını Seçin:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Editoru Seçin:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Yetişmə Qabiliyyəti"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Yetişmə Qabiliyyəti Qurğuları"
+
+#~ msgid "Advanced"
+#~ msgstr "Ətraflı"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Ətraflı Qurğular"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Şəbəkə Proksisi Quraşdırması"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME İdarə Mərkəzi: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Düzülüş"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Kappletin bi görünüşü üçün işlədiləcək düzülüş"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Kapplet cərgəsi cismi"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Nümayişin göstərdiyi kapplet cərgəsi"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Vasif İsmailoğlu <linuxaz@azerimail.net>\n"
+#~ "Mətin Əmirov <metin@karegen.com>\n"
+#~ "\n"
+#~ "Tərcümə işləri üzrə yazışma siyahısı ünvanımız:\n"
+#~ "<translation-team-az@lists.sourceforge.net>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Masa üstü seçimləri idarəçisi."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME İdarə Mərkəzi: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Gnome İdarə Mərkəzi"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Nautilus fəaliyyətdə isə onu işlət."
+
+#~ msgid "About this application"
+#~ msgstr "Bu proqram haqqında"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "İdarə mərkəzinin icmalı"
+
+#~ msgid "_About"
+#~ msgstr "_Haqqında"
+
+#~ msgid "_Contents"
+#~ msgstr "_Məzmun"
+
+#~ msgid "_Help"
+#~ msgstr "_Yardım"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Nautilus fəaliyyətdə isə belə qabığı işlət"
+
+#~ msgid "XKB options"
+#~ msgstr "XKB seçimləri"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Yazı növü məzmun menyusu üzvləri"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fontilus məzmun menyusu üçün e'malatxana"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus məzmun menyusu"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus məzmun menyusu e'malatxanası"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Yazı növləri üçün Nautils məzmun menyusu girişləri"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Örtük Xassələrinin məzmun nümaişi komponenti"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus Örtük Xassələri nümaişi"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "Hazırda göstərilən URI"
diff --git a/po/be.po b/po/be.po
index 971d2c0d6..3bb9f92cc 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-03-08 13:28+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -61,11 +61,11 @@ msgstr "_Экранная клявіятура"
 msgid "_Screenreader"
 msgstr "_Чытальнік экрана"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Падтрыма тэхналёгіі садзеяньня"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Уключыць падтрымку для GNOME тэхналёгіі судзеяньня пад час уваходу"
 
@@ -118,13 +118,13 @@ msgstr "Імпартаваць файл усталёвак магчымасьц�
 msgid "_Import"
 msgstr "_Імпартаваць"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Клявіятура"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Усталёўвае перавагі даступнасьцяў клявіятуры"
 
@@ -341,11 +341,11 @@ msgstr "піксэляў/сэк"
 msgid "seconds"
 msgstr "сэкундаў"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Зьмена ўсталёвак тла стальца"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Тло стальца"
 
@@ -425,6 +425,13 @@ msgstr "Даданьне шпалер"
 msgid "No Wallpaper"
 msgstr "Без шпалер"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -633,105 +640,15 @@ msgstr "Калі ласка, выбярыце відарыс."
 msgid "_Select"
 msgstr "Вы_лучыць"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Пераважныя дастасаваньні"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Выбар Вашых дапомных дастасаваньняў"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Эпіфані"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Галіён"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Энкампас"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Мзіла/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Тэкставы вандроўнік W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Тэкставы вандроўнік Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Тэкставы вандроўнік Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Эвалюцыя"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Пошта Мазілы"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Тэрмінал GNOME"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Звычайны XTerminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Пазначце назву й каманду для гэтага рэдактара."
@@ -741,20 +658,22 @@ msgid "Add..."
 msgstr "Дадаць..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Рэдактар кар_ыстальніка"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Вы_значаецца карыстальнікам:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Ад_мысловы чатач пошты:"
+msgid "C_ustom:"
+msgstr "Вы_значаецца карыстальнікам:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Ад_мысловы тэрмінал:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Ад_мысловы вандроўнік павуціньня:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Гэтае дастасаваньне можа адчыняць н_екалькі файлаў"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -801,6 +720,16 @@ msgid "Mail Reader"
 msgstr "Чытач пошты"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Запуск у _тэрмінале"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Запуск у _тэрмінале"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -808,94 +737,170 @@ msgstr ""
 "Выбярыце кіраўнік вокнаў. Вам трэба націснуць \"Ужыць\", зрабіць некалькі па "
 "рукамі й станчыць рытуальны танец каб гэта запрацавала."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Запуск у _тэрмінале"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Тэрмінал"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Рэдактар тэкстаў"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Гэтае дастасаваньне можа адчыняць _URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Гэтае дастасаваньне можа адчыняць н_екалькі файлаў"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Гэтае дастасаваньне павінна быць запушчана ў _абалёнцы"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Разу_мее Netscape Remote Control"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Выкарыстоўваць гэты _рэдактар для адчыненьня тэкставых файлаў у кіраўніку "
 "файлаў"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Аглядальнік вэбу"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Мэнаджар вокнаў"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_Загад:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Уласьцівасьці..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Вылучыць чытача пошты:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "Вы_лучыць"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Дапомны вандроўнік павуціньня"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Эпіфані"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Галіён"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Энкампас"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Пошта Мазілы"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Тэкставы вандроўнік W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Тэкставы вандроўнік Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Тэкставы вандроўнік Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Эвалюцыя"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Пошта Мазілы"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Вылучыць тэрмінал:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Дапомны тэрмінал"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Вылучыць вандроўніка павуціньня:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Тэрмінал"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Выбраць рэдактар:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Звычайны XTerminal"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Зручнасьці"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Уласьцівасьці зручнасьцяў"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Адмысловае"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Адмысловыя ўсталяваньні"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Зьмяніць разрозьнене экрана"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Разрозьнене экрана"
 
@@ -991,7 +996,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Вы насамрэч жадаеце назаўжды выдаліць гэты запіс?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Апісаньне"
 
@@ -999,17 +1004,27 @@ msgstr "Апісаньне"
 msgid "Extensions"
 msgstr "Пашырэньні"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Тыпы файлаў і праграмы"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Вызначыць якія праграмы выкарыстоўваюцца для адкрыцьця й прагляду файлаў "
 "гэтага тыпа"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Тыпы файлаў і праграмы"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Пазначае якія праграмы выкарыстоўваюцца для адкрыцьця й прагляду файлаў "
+"гэтага тыпа"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Дзеяньні"
@@ -1100,6 +1115,7 @@ msgid "_Protocol:"
 msgstr "_Пратакол:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Прыбраць"
 
@@ -1107,16 +1123,6 @@ msgstr "_Прыбраць"
 msgid "_Viewer component:"
 msgstr "Кампанэнт праглядальніка:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Тыпы файлаў і праграмы"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Пазначае якія праграмы выкарыстоўваюцца для адкрыцьця й прагляду файлаў "
-"гэтага тыпа"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Рэдагаваньне катэгорыі файла"
@@ -1300,14 +1306,15 @@ msgid "Electronic mail transmission"
 msgstr "Перадача электронае пошты"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Дакумэнтацыя GNOME"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Шрыфт"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Усталяваць шрыфт для стальца"
 
@@ -1523,29 +1530,29 @@ msgid "The type of accelerator."
 msgstr "Увядзіце новы паскаральнік."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Выключана"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Невядомае дзеяньне>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Сталец"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Гук"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Кіраваньне вокнамі"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1554,27 +1561,27 @@ msgstr ""
 "Хуткія клявішы \"%s\" ужо ў выкарыстаньні для:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Памылка ўсталяваньня новага паскаральніка ў базе даньняў наладкі: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Памылка скасоўваньня ўсталяваньня паскаральніка ў базе даньняў наладкі: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Дзеяньне"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Хуткія клявішы"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Гарачыя клявішы клявіятуры"
 
@@ -1585,26 +1592,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "Увядзіце новы паскаральнік ці націсьніце \"Backspace\" для ачысткі"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Прызначае камандам хуткія клявішы"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Невядомы курсор"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Мадэля"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "XKB раскладка клявіятуры"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1776,10 +1767,36 @@ msgstr "Пра_цягласьць працы:"
 msgid "minutes"
 msgstr "хвіліны"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Невядомы курсор"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Мадэля"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "XKB раскладка клявіятуры"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Усталяваньне наладак вашае клявіятуры"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "Перавагі панэлі сродкаў і мэню"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Усталяваньне перавагаў для вашае мышы"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Невядомы курсор"
@@ -1944,20 +1961,21 @@ msgstr "_Парог:"
 msgid "_Timeout:"
 msgstr "_Час:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Мыш"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Усталяваньне перавагаў для вашае мышы"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Паўнамоцны паслужнік"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Перавагі для проксі"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2003,8 +2021,9 @@ msgid "H_TTP proxy:"
 msgstr "Паўнамоцны па _НТТР:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Наладка паўнамоцнага паслужніка"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Перавагі для проксі"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2045,7 +2064,7 @@ msgstr "Пар_оль:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Бястпечны НТТР проксі:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Уключэньне гукаў і атаесамленьне гукаў з падзеямі"
 
@@ -2103,15 +2122,26 @@ msgstr ""
 "ўсталяваны дыялёг \"Перавагі для тэмы\",  ці вы ня маеце ўсталяванага пакета "
 "\"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Не задана знаходжаньне файла тэмы для ўсталяваньня"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Знаходжаньне файла тэмы для ўсталяваньне нерэчаіснае"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2147,12 +2177,12 @@ msgstr "Мусіць прысутнічаць назва тэмы"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Усталяваньне тэмаў для розных частак стальца"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Тэма"
 
@@ -2265,12 +2295,12 @@ msgstr "Назва _тэмы:"
 msgid "theme selection tree"
 msgstr "дрэва вылучэньня тэмы"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 "Наладка вонкавага выгляду панэляў інструмэнта і панэляў мэню ў дастасаваньнях"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Мэню і панелі інструмэнта"
 
@@ -2339,7 +2369,6 @@ msgid "_Edit"
 msgstr "_Рэдагаваць"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Файл"
 
@@ -2367,6 +2396,14 @@ msgstr "_Выйсьці"
 msgid "_Save"
 msgstr "_Захаваць"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2379,23 +2416,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Кіраваньне"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Гіпэр"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Супэр (ці \"Лягатып Windows\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Мета"
 
@@ -2439,14 +2476,35 @@ msgstr "_Узьняць выбранае акно пасьля інтэрвал�
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Выбіраць вокны, калі указальнік мышы знахдзіцца па-над ім"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
-msgstr "Перавагі для акна"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
+msgstr "Канфіругаваньне ўласьцівасьцяў акна"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Вокны"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Цэнтар кіраваньня GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Уласьцівасьці сеткі"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Фільтры"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Сродак наладкі GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2481,90 +2539,6 @@ msgstr "Мэню Цэнтра кіраваньня"
 msgid "View as Control Center"
 msgstr "Цэнтар кіраваньня GNOME: %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Цэнтар кіраваньня GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Раскладка"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Разьмяшчэньне, якое выкарыстоўваецца для гэтага акна каплетаў"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Аб'ект каталёга каплета"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Каталёг капплетаў, які праглядаецца"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Віталь Хілько <dojlid@mova.org>, 2003\n"
-"Алесь Няхайчык <nab@mail.by>, 2003, 2004"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Цэнтар кіраваньня GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Мэнаджар уласьцівасьцяў стальца."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Цэнтар кіраваньня GNOME: %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Фільтры"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "Цэнтар кіраваньня GNOME: %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Выкарыстоўваць абалёнку, нават калі запушчаны Nautilus."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Пра гэтае дастасаваньне"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Інфармацыя пра Цэнтар кіраваньня"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Пра праграму"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Зьмест"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Дапамога"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Сродак наладкі GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Выкарыстоўваць абалёнку, нават калі запушчаны Nautilus."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Гучнасьць"
@@ -2674,7 +2648,7 @@ msgstr ""
 "Памылка пад час спробы запусьціць (%s),\n"
 "якая прывязана да клявішы (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2700,7 +2674,7 @@ msgstr ""
 "- Вынік выкананьня <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/"
 "xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2711,22 +2685,22 @@ msgstr ""
 "Існуе шэраг вядомых праблем ў наладцы XKB.\n"
 "Паспрабуйце скарыстаць больш простую наладку ці больш новую вэрсыю XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Усталёўкі %d экрана\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, fuzzy, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2791,8 +2765,8 @@ msgstr "_Ня адлюстроўваць гэтае паведамленьне �
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Ня атрымалася загрузіць гукавы файл %s у якасьці узору %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Немагчыма вызначыць хатнюю тэчку карыстальніка"
 
@@ -2841,11 +2815,11 @@ msgstr "Экран"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Экран дзе выводзіцца BGApplier"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Ня існуе файла гука для гэтае падзеі."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2855,32 +2829,32 @@ msgstr ""
 "Вам, здаецца, неабходна ўсталяваць скрутак\n"
 "gnome-audio."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Файл %s - гэта нерэчаісны wav файл"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Падзея"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Гукавы файл"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "Г_укі:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Гукавы _файл:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Вылучыце гукавы файл"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Граць"
 
@@ -3154,26 +3128,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "Вельмі хутка ўсталёўкі XKB будуць перазапісаныя з сыстэмнае наладкі"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB раскладка клявіятуры"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB мадэль клявіятуры"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB выбары"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Сыгнал клявіятуры _ўключаны"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB раскладка клявіятуры"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Мад_эль клявіятуры:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Уласьцівасьці клявіятуры"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Усталёўкі XKB у gconf будуць перапісаны з сыстэмы ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "Вельмі хутка ўсталёўкі XKB будуць перазапісаныя з сыстэмнае наладкі"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB раскладка клявіятуры"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB мадэль клявіятуры"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "Ад_класьці перапынак"
@@ -3252,46 +3274,14 @@ msgstr ""
 "вашае панэлі. Вы можаце дадаць яе націснуўшы правую кнопку мышы над панэляй "
 "і абраўшы \"Дадаць на панэлю -> Карыснасьці -> Прастора паведамленьняў\"."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Плыў па моры чамадан, у чамадане быў дыван... 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Назва:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Стыль:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Тып:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Памер:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Вэрсыя:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Аўтарскія правы:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Апісаньне:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Усталяваць як шрыфт дастасаваньня"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Элемэнты кантэкстнага мэню шрыфта"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Выбар Вашых дапомных дастасаваньняў"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3369,33 +3359,47 @@ msgstr "Ці ствараць мініяцюры шрыфтоў TrueType"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Ці ствараць мініяцюры шрыфтоў Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Вытворчасьць для кантэкстнага мэню \"Фанцілуса\""
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Плыў па моры чамадан, у чамадане быў дыван... 0123456789"
+
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Назва:"
+
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Стыль:"
+
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Тып:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Кантэкстнае мэню \"Фанцілуса\""
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Памер:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Вытворчасьць кантэкстнага мэню \"Фанцілуса\""
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Вэрсыя:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Элемэнт кантэкстнага мэню \"Наўцілуса\" для шрыфтоў"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Аўтарскія правы:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Усталяваць як шрыфт дастасаваньня"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Апісаньне:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Кампанэнт прагляду зьместу ўласьцівасьцяў тэмы"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus - праглядальнік уласьцівасьцяў тэмы"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Цэнтар кіраваньня GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3425,27 +3429,18 @@ msgstr "_Ужыць шрыфт"
 msgid "Themes"
 msgstr "Тэмы"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Тэма кіраваньня"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Тэма мяжы вакна"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Тэма значак"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI, які адлюстроўваецца ў бягучы моммант"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "Aa Bb Cc Аа Бб Вв"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Калі ісьціна, тады для ўсталяваных тэмаў будуць створаны мініятуры."
@@ -3480,6 +3475,157 @@ msgstr "Ці ствараць мініятуры ўсталяваных тэма
 msgid "Whether to thumbnail themes"
 msgstr "Ці ствараць мініятуры тэмаў"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "Aa Bb Cc Аа Бб Вв"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Усталяваць тэму..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Скінуць да дап_омнага значэньня"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Мзіла/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Тэрмінал GNOME"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Рэдактар кар_ыстальніка"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Ад_мысловы чатач пошты:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Ад_мысловы тэрмінал:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Ад_мысловы вандроўнік павуціньня:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Запуск у _тэрмінале"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Гэтае дастасаваньне можа адчыняць _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Гэтае дастасаваньне павінна быць запушчана ў _абалёнцы"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Вылучыць чытача пошты:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Вылучыць тэрмінал:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Вылучыць вандроўніка павуціньня:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Выбраць рэдактар:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Зручнасьці"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Уласьцівасьці зручнасьцяў"
+
+#~ msgid "Advanced"
+#~ msgstr "Адмысловае"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Адмысловыя ўсталяваньні"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Наладка паўнамоцнага паслужніка"
+
+#~ msgid "Window Properties"
+#~ msgstr "Перавагі для акна"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Цэнтар кіраваньня GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Раскладка"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Разьмяшчэньне, якое выкарыстоўваецца для гэтага акна каплетаў"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Аб'ект каталёга каплета"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Каталёг капплетаў, які праглядаецца"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Віталь Хілько <dojlid@mova.org>, 2003\n"
+#~ "Алесь Няхайчык <nab@mail.by>, 2003, 2004"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Мэнаджар уласьцівасьцяў стальца."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Цэнтар кіраваньня GNOME: %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "Цэнтар кіраваньня GNOME: %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Выкарыстоўваць абалёнку, нават калі запушчаны Nautilus."
+
+#~ msgid "About this application"
+#~ msgstr "Пра гэтае дастасаваньне"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Інфармацыя пра Цэнтар кіраваньня"
+
+#~ msgid "_About"
+#~ msgstr "_Пра праграму"
+
+#~ msgid "_Contents"
+#~ msgstr "_Зьмест"
+
+#~ msgid "_Help"
+#~ msgstr "_Дапамога"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Выкарыстоўваць абалёнку, нават калі запушчаны Nautilus."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB выбары"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Элемэнты кантэкстнага мэню шрыфта"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Вытворчасьць для кантэкстнага мэню \"Фанцілуса\""
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Кантэкстнае мэню \"Фанцілуса\""
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Вытворчасьць кантэкстнага мэню \"Фанцілуса\""
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Элемэнт кантэкстнага мэню \"Наўцілуса\" для шрыфтоў"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Кампанэнт прагляду зьместу ўласьцівасьцяў тэмы"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus - праглядальнік уласьцівасьцяў тэмы"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI, які адлюстроўваецца ў бягучы моммант"
+
 #~ msgid "De_tails..."
 #~ msgstr "Па_драбязнасьці..."
 
@@ -3695,10 +3841,6 @@ msgstr "Ці ствараць мініятуры тэмаў"
 #~ msgstr "_Шпалеры"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Уласьцівасьці сеткі"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "Адмысловыя ўсталяваньні"
 
@@ -3739,18 +3881,10 @@ msgstr "Ці ствараць мініятуры тэмаў"
 #~ msgstr "Тэма карыстальніка"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "Перавагі панэлі сродкаў і мэню"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "_Разрозьнене:"
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Усталяваньне перавагаў для вашае мышы"
-
-#, fuzzy
 #~ msgid "_Ignore system configuration"
 #~ msgstr "Наладка паўнамоцнага паслужніка"
 
@@ -3857,19 +3991,12 @@ msgstr "Ці ствараць мініятуры тэмаў"
 #~ msgstr "Файл для аднаўленьня"
 
 #, fuzzy
-#~ msgid "Apply theme..."
-#~ msgstr "_Усталяваць тэму..."
-
-#, fuzzy
 #~ msgid "Themus component"
 #~ msgstr "Кампанэнт праглядальніка:"
 
 #~ msgid "Bee_p"
 #~ msgstr "_Сыгнал"
 
-#~ msgid "C_ustom:"
-#~ msgstr "Вы_значаецца карыстальнікам:"
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "Клік пад час утрыманьня клявішы"
 
@@ -4060,9 +4187,6 @@ msgstr "Ці ствараць мініятуры тэмаў"
 #~ msgid "Configure window appearance"
 #~ msgstr "Канфігураваньне вонкавага выгляду вакна"
 
-#~ msgid "Configure window properties"
-#~ msgstr "Канфіругаваньне ўласьцівасьцяў акна"
-
 #~ msgid "Configure window manager configuration properties"
 #~ msgstr "Канфігураваньне ўласьцівасьцяў наладкі мэнаджару вокнаў"
 
@@ -4168,9 +4292,6 @@ msgstr "Ці ствараць мініятуры тэмаў"
 #~ msgid "Key_press makes sound"
 #~ msgstr "Пад час націску аднаўляецца _гук"
 
-#~ msgid "Keyboard bell _enabled"
-#~ msgstr "Сыгнал клявіятуры _ўключаны"
-
 #~ msgid "Keyboard bell _off"
 #~ msgstr "Сыгнал клявіятуры адкл_ючаны"
 
@@ -4222,9 +4343,6 @@ msgstr "Ці ствараць мініятуры тэмаў"
 #~ "Сыгнал  клявіятуры, вызначаны\n"
 #~ "_карыстальнікам:"
 
-#~ msgid "Keyboard Properties"
-#~ msgstr "Уласьцівасьці клявіятуры"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Канфігураваньне выкарыстаньня гуку ў GNOME"
 
diff --git a/po/bg.po b/po/bg.po
index 8e700b2c1..c4ea75157 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-12 18:45+0200\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-12 18:46+0200\n"
 "Last-Translator: Vladimir Petkov <vpetkov@i-space.org>\n"
 "Language-Team: Bulgarian GNOME translation team <dict@linux.zonebg.com>\n"
@@ -1930,7 +1930,8 @@ msgid "Network Proxy"
 msgstr "Мрежов сървър посредник"
 
 #: capplets/network/gnome-network-preferences.desktop.in.in.h:2
-msgid "Network proxy preferences"
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Настройки на мрежовия сървър посредник"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2424,7 +2425,8 @@ msgid "_Select windows when the mouse moves over them"
 msgstr "Избиране на прозорците, когато мишката преминава над тях"
 
 #: capplets/windows/window-properties.desktop.in.in.h:1
-msgid "Window Properties"
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Настройки на прозорците"
 
 #: capplets/windows/window-properties.desktop.in.in.h:2
@@ -3052,28 +3054,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Много скоро, XKB настройките в gconf ще бъдат презаписани (от системната "
-"конфигурация)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB клавиатурна подредба"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB клавиатурен модел"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB опции"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Модел на клавиатурата:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB клавиатурна подредба"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Модел на клавиатурата:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Бързи клавиши"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "XKB настройките в gconf ще бъдат презаписани от системата веднага!"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Много скоро, XKB настройките в gconf ще бъдат презаписани (от системната "
+"конфигурация)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB клавиатурна подредба"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB клавиатурен модел"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Отлагане на почивката"
@@ -3364,6 +3414,9 @@ msgstr "Прилагане на шрифт"
 msgid "Sets the default theme"
 msgstr "Връщане към поддразбиращите се настройки"
 
+#~ msgid "XKB options"
+#~ msgstr "XKB опции"
+
 #~ msgid "Mozilla/Netscape 6"
 #~ msgstr "Mozilla/Netscape 6"
 
diff --git a/po/bn.po b/po/bn.po
index 1c67417ec..69922b398 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gnome Control Center 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-08-29 20:00+0600\n"
 "Last-Translator: Progga <progga@BengaLinux.Org>\n"
 "Language-Team: Bangla <gnome-translation@BengaLinux.Org>\n"
@@ -61,11 +61,11 @@ msgstr "স্ক্রিনের উপরে স্থাপিত কীব
 msgid "_Screenreader"
 msgstr "স্ক্রিন-পাঠক (_প)"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "সহায়ক প্রযুক্তি"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "লগ-ইন-এর সময় গনোমের সহায়ক প্রযুক্তি চালু করো"
 
@@ -116,13 +116,13 @@ msgstr "বৈশিষ্ট্য সংরক্ষণকারী ফাই�
 msgid "_Import"
 msgstr "আমদানী (Import) (_আ)"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "কীবোর্ড"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "কীবোর্ড ব্যবহার সংক্রান্ত বৈশিষ্ট্যাবলী নির্ধারণ করুন"
 
@@ -336,11 +336,11 @@ msgstr "পিক্সেল/সেকেন্ড"
 msgid "seconds"
 msgstr "সেকেন্ড"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "আপনার ডেস্কটপের পটভূমির বৈশিষ্ট্য পরিবর্তন করুন"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "ডেস্কটপের পটভূমি"
 
@@ -421,6 +421,13 @@ msgstr "ওয়ালপেপার যোগ করো"
 msgid "No Wallpaper"
 msgstr "ওয়ালপেপার প্রয়োজন নেই"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -626,105 +633,15 @@ msgstr "অনুগ্রহপূর্বক একটি ছবি বেছ
 msgid "_Select"
 msgstr "বাছাই (_ব)"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "পছন্দের অ্যাপলিকেশন"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "যে অ্যাপলিকেশনটি ডিফল্ট হিসেবে ব্যবহার করতে চান তা বেছে নিন"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "এপিফানি"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "গ্যালিওন"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "এনকম্পাস"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "ফায়ারবার্ড/ফায়ারফক্স"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "মোজিলা/নেটস্কেপ ৬"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "নেটস্কেপ কমিউনিকেটর"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "কনকয়রার"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M টেক্সট ব্রাউজার"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "লিঙ্‌স (Lynx) টেক্সট ব্রাউজার"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "লিঙ্ক্‌স (Links) টেক্সট ব্রাউজার"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "ইভলুশন মেইল পাঠক"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "ব্যালসা"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "কে-মেইল"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "মোজিলা মেইল"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "মাট"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "গনোম টার্মিনাল"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "প্রমিত এক্স টার্মিনাল"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "এন-এক্সটার্ম"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "আর.এক্স.ভি.টি."
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ই-টার্ম"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "দয়া করে এই এডিটরটির জন্য একটি নাম ও একটি কমান্ড বলে দিন।"
@@ -734,20 +651,23 @@ msgid "Add..."
 msgstr "যোগ করো..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "স্বনির্বাচিত এডিটর (_ন)"
+#, fuzzy
+msgid "C_ustom"
+msgstr "স্বনির্বাচিত"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "স্বনির্বাচিত  মেইল পাঠক (_ন):"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "স্বনির্বাচিত"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "স্বনির্বাচিত টার্মিনাল (_ন):"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "স্বনির্বাচিত ওয়েব ব্রাউজার (_ন):"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "এই অ্যাপলিকেশনটি একাধিক ফাইল নিয়ে কাজ করতে পারে (_এ)"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -794,6 +714,16 @@ msgid "Mail Reader"
 msgstr "মেইল পাঠক"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "টার্মিনালে চালান (_ম)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "টার্মিনালে চালান (_ম)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -802,92 +732,168 @@ msgstr ""
 "চাইলে প্রথমে 'কার্যকর' চাপুন, তারপর জাদুর কাঠি নেড়ে নেড়ে জাদুনৃত্য করতে থাকুন। "
 "ধন্যবাদ।"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "টার্মিনালে চালাও (_ট)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "টার্মিনাল"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "টেক্সট এডিটর"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "এই অ্যাপলিকেশনটি ইউআরআই ব্যবহার করতে পারে (_ই)"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "এই অ্যাপলিকেশনটি একাধিক ফাইল নিয়ে কাজ করতে পারে (_এ)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "এই অ্যাপলিকেশনটি শেল থেকে চালাতে হয় (_শ)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "এটি নেটস্কেপ কর্তৃক ব্যবহৃত দূরনিয়ন্ত্রণ ব্যবস্থা বুঝতে পারে (_ন)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "ফাইল ম্যানেজার থেকে টেক্স্‌ট ফাইল পড়ার সময় এই এডিটরটি ব্যবহার করো (_ড)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "ওয়েব ব্রাউজার"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "উইন্ডো ম্যানেজার"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "কমান্ড (_ক):"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "নাম (_ন):"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "বৈশিষ্ট্যাবলী... (_ব)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "একটি মেইল পাঠক বেছে নিন (_ব):"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "বাছাই (_ব)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "একটি টার্মিনাল বেছে নিন (_ছ):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "ডিফল্ট ওয়েব ব্রাউজার"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "একটি ওয়েব  ব্রাউজার বেছে নিন (_চ):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "এপিফানি"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "একটি এডিটর বেছে নিন (_ত):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "গ্যালিওন"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "সহায়ক প্রযুক্তি"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "এনকম্পাস"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "সহায়ক প্রযুক্তির বৈশিষ্ট্যসমূহ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "ফায়ারবার্ড/ফায়ারফক্স"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "অগ্রসর"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "অগ্রসর বৈশিষ্ট্যাবলী"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "মোজিলা মেইল"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "নেটস্কেপ কমিউনিকেটর"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "কনকয়রার"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M টেক্সট ব্রাউজার"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "লিঙ্‌স (Lynx) টেক্সট ব্রাউজার"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "লিঙ্ক্‌স (Links) টেক্সট ব্রাউজার"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "ইভলুশন মেইল পাঠক"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "ব্যালসা"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "কে-মেইল"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "মোজিলা মেইল"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "মাট"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "ডিফল্ট টার্মিনাল"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "টার্মিনাল"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "প্রমিত এক্স টার্মিনাল"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "এন-এক্সটার্ম"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "আর.এক্স.ভি.টি."
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "এন-এক্সটার্ম"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ই-টার্ম"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "স্ক্রিনের রেজলুশন পরিবর্তন করুন"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "স্ক্রিনের রেজলুশন"
 
@@ -978,7 +984,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "আপনি কি এই এন্ট্রিটি স্থায়ীভাবে মোছার ব্যাপারে নিশ্চিত?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "বর্ণনা"
 
@@ -986,15 +992,23 @@ msgstr "বর্ণনা"
 msgid "Extensions"
 msgstr "বর্ধিতাংশ"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "ফাইলের ধরন ও বিভিন্ন প্রোগ্রাম"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "প্রত্যেক প্রকারের ফাইল ব্যবহারের জন্য কি প্রোগ্রাম ব্যবহৃত হবে তা নির্ধারণ করুন"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "ফাইলের ধরন ও বিভিন্ন প্রোগ্রাম"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "প্রত্যেক প্রকারের ফাইল ব্যবহারের জন্য কি প্রোগ্রাম ব্যবহত হবে তা নির্ধারণ করুন"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "কাজ"
@@ -1085,6 +1099,7 @@ msgid "_Protocol:"
 msgstr "প্রোটোকল (_ল):"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "সরিয়ে ফেলো (_য়)"
 
@@ -1092,14 +1107,6 @@ msgstr "সরিয়ে ফেলো (_য়)"
 msgid "_Viewer component:"
 msgstr "ভিউয়ার কম্পোনেন্ট (_ভ):"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "ফাইলের ধরন ও বিভিন্ন প্রোগ্রাম"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "প্রত্যেক প্রকারের ফাইল ব্যবহারের জন্য কি প্রোগ্রাম ব্যবহত হবে তা নির্ধারণ করুন"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "ফাইলের শ্রেণীবিভাগ সম্পাদন করো"
@@ -1283,14 +1290,15 @@ msgid "Electronic mail transmission"
 msgstr "ইলেকট্রনিক মেইল আদান-প্রদান"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "গনোমবিষয়ক তথ্যমালা"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "ফন্ট"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "ডেস্কটপের জন্য ফন্ট বেছে নিন"
 
@@ -1497,29 +1505,29 @@ msgid "The type of accelerator."
 msgstr "চটপট কী-এর (Key) ধরন।"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "নিষ্ক্রিয়"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Unknown Action>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "ডেস্কটপ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "শব্দ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "উইন্ডো ব্যবস্থাপনা"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1528,26 +1536,26 @@ msgstr ""
 "শর্টকাট \"%s\" এমুহূর্তে :\n"
 " \"%s\" এর জন্য ব্যবহৃত হচ্ছে\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "কনফিগারেশন ডাটাবেসের জন্য নতুন চটপট কী (Key) স্থাপনে সমস্যা হয়েছে: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "কনফিগারেশন ডাটাবেস থেকে চটপট কী (Key) সরিয়ে ফেলতে সমস্যা হয়েছে: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "কাজ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "শর্টকাট"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "কীবোর্ড শর্টকাট"
 
@@ -1559,23 +1567,10 @@ msgstr ""
 "কোন চটপট কী (Key) সম্পাদন করতে হলে, সংশ্লিষ্ট সারিতে ক্লিক করুন ও তারপর চটপট কী "
 "লিখুন, অথবা ব্যাকস্পেস চেপে মুছে ফেলুন।"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "বিভিন্ন কমান্ডের জন্য শর্টকাট নির্ধারণ করুন"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "অজ্ঞাত"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "মডেল"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "কীবোর্ড বিন্যাসের (Layout) প্রাকদর্শন"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1743,10 +1738,32 @@ msgstr "কাজ চলাকালীন বিরতির দৈর্ঘ্
 msgid "minutes"
 msgstr "মিনিট"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "অজ্ঞাত"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "মডেল"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "কীবোর্ড বিন্যাসের (Layout) প্রাকদর্শন"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "কীবোর্ড সম্পর্কিত পছন্দ নির্ধারণ করুন"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "মাউস সম্পর্কিত পছন্দ নির্ধারণ করুন"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "অজানা কার্সার"
@@ -1911,20 +1928,21 @@ msgstr "সীমা (_ম):"
 msgid "_Timeout:"
 msgstr "সময়সীমা (Timeout) (_স)"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "মাউস"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "মাউস সম্পর্কিত পছন্দ নির্ধারণ করুন"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "নেটওয়ার্ক প্রক্সি"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "নেটওয়ার্ক প্রক্সি সম্পর্কিত পছন্দ"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1968,8 +1986,9 @@ msgid "H_TTP proxy:"
 msgstr "এইচ.টি.টি.পি. প্রক্সি (_ট):"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "নেটওয়ার্ক প্রক্সি কনফিগারেশন"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "নেটওয়ার্ক প্রক্সি সম্পর্কিত পছন্দ"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2007,7 +2026,7 @@ msgstr "পাসওয়ার্ড (_প):"
 msgid "_Secure HTTP proxy:"
 msgstr "নিরাপদ এইচ.টি.টি.পি. প্রক্সি (_ন):"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "শব্দ সক্রিয় করো ও বিভিন্ন ইভেন্টের সাথে মিলিয়ে শব্দ নির্বাচন করো"
 
@@ -2066,15 +2085,26 @@ msgstr ""
 "সঠিকভাবে ইনস্টল করা হয় নি অথবা আপনি \"গনোম থিম\" নামের প্যাকেজটিই ইনস্টল করেন "
 "নি।"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "ইনস্টল করার জন্য কোন থিম ফাইলের অবস্থান উল্লেখ করা হয় নি"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "ইনস্টল করার জন্য থিম ফাইলের যে অবস্থান উল্লেখ করা হয়েছে তা ভুল"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2108,12 +2138,12 @@ msgstr "থিমের অবশ্যই একটি নাম থাকত�
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "থিমটি ইতিমধ্যেই বিদ্যমান।  আপনি কি এটিকে প্রতিস্থাপন করতে চান?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "ডেস্কটপের বিভিন্ন অংশের জন্য থিম বেছে নিন"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "থিম"
 
@@ -2225,11 +2255,11 @@ msgstr "থিমের নাম (_থ):"
 msgid "theme selection tree"
 msgstr "থিম বাছাইকরণ ট্রি (Tree)"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "এই অ্যাপলিকেশনের টুলবার ও মেনুবারের চেহারা পছন্দমত পরিবর্তন করুন"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "মেনু ও টুলবার"
 
@@ -2298,7 +2328,6 @@ msgid "_Edit"
 msgstr "সম্পাদন (_ম)"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "ফাইল (_ফ)"
 
@@ -2326,6 +2355,14 @@ msgstr "প্রস্থান (_প)"
 msgid "_Save"
 msgstr "সংরক্ষণ (_স)"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2338,23 +2375,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "নিয়ন্ত্রণ"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "হাইপার"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "সুপার (অথবা \"উইন্ডোস লোগো\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "মেটা"
 
@@ -2395,14 +2432,34 @@ msgstr "বাছাইকৃত উইন্ডোগুলোকে একট�
 msgid "_Select windows when the mouse moves over them"
 msgstr "কোন উইন্ডোর ওপর মাউস অবস্থান করলে তা সক্রিয় হয়ে উঠবে (_ক)"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "উইন্ডোর বৈশিষ্ট্যাবলী"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "উইন্ডো"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "গনোম নিয়ন্ত্রণ কেন্দ্র"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "ডেস্কটপের পটভূমি সংক্রান্ত পছন্দ"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "অন্যান্য"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "গনোম কনফিগারেশন প্রক্রিয়া"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "নিয়ন্ত্রণ কেন্দ্র"
@@ -2433,85 +2490,6 @@ msgstr "নিয়ন্ত্রণ কেন্দ্রের ভিউ ফ্
 msgid "View as Control Center"
 msgstr "নিয়ন্ত্রণ কেন্দ্র হিসেবে দেখাও"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "গনোম নিয়ন্ত্রণ কেন্দ্র: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "বিন্যাস"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "সিঅ্যাপলেটকে এভাবে দেখানোর জন্য যে বিন্যাস ব্যবহার করা হবে"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "সিঅ্যাপলেট ডিরেক্টরি অবজেক্ট"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "সিঅ্যাপলেট ডিরেক্টরির যে দৃশ্য এখন দেখা যাচ্ছে"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "অঙ্কুর প্রকল্পের পক্ষে, প্রজ্ঞা [abulfazl@juniv.edu]"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "গনোম নিয়ন্ত্রণ কেন্দ্র"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "ডেস্কটপের বৈশিষ্ট্য নির্ধারণী ম্যানেজার।"
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "গনোম নিয়ন্ত্রণ কেন্দ্র: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "অন্যান্য"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "গনোম নিয়ন্ত্রণ কেন্দ্র"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "এটি চলতে থাকলে নটিলাস ব্যবহার করো।"
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "অ্যাপলিকেশন পরিচিতি"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "নিয়ন্ত্রণ কেন্দ্রের সংক্ষিপ্ত বিবরণ"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "পরিচিতি (_প)"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "সূচি (_চ)"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "সহায়িকা (_স)"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "গনোম কনফিগারেশন প্রক্রিয়া"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "যদি নটিল্যাস চলতেও থাকে তবুও শেল ব্যবহার করো।"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "ভলিউম"
@@ -2620,7 +2598,7 @@ msgstr ""
 "কী (key) (%s) এর সাথে যুক্ত\n"
 "(%s) চালাতে সমস্যা হয়েছে"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2646,7 +2624,7 @@ msgstr ""
 "- <b>xprop -root | grep XKB</b> কমান্ডের ফলাফল\n"
 "- <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b> কমান্ডের ফলাফল"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2658,7 +2636,7 @@ msgstr ""
 "তাই চেষ্টা করুন সহজ ধরনের কনফিগারেশন ব্যবহার করতে অথবা এক্স-ফ্রী সফটওয়ারের "
 "অপেক্ষাকৃত নতুন সংস্করণ ব্যবহার করতে।"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2666,15 +2644,15 @@ msgstr ""
 "গনোম কীবোর্ডের বর্তমান বৈশিষ্ট্যের সাথে এক্স কীবোর্ডের বৈশিষ্ট্যের পার্থক্য রয়েছে।  এ "
 "অবস্থায় আপনি কোন কীবোর্ডটি ব্যবহার করতে চান?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "এক্স-এর বৈশিষ্ট্য ব্যবহার করো"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "গনোম-এর বৈশিষ্ট্য ব্যবহার করো"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2739,8 +2717,8 @@ msgstr "আর কখনো এই তথ্যটি দেখাবে না
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "নমুনা %s হিসেবে শব্দের ফাইল %s ব্যবহার করা যাচ্ছে না"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "ব্যবহারকারীর ব্যক্তিগত ডিরেক্টরি (Home) খুঁজে পাওয়া যাচ্ছে না"
 
@@ -2789,11 +2767,11 @@ msgstr "পর্দা"
 msgid "Screen on which BGApplier is to draw"
 msgstr "BGApplier যে পর্দার ওপর আঁকবে"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "এই ইভেন্টের জন্য বরাদ্দকৃত শব্দের ফাইলটি নেই।"
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2803,32 +2781,32 @@ msgstr ""
 "যদি ডিফল্ট শব্দের একটি সেট ব্যবহার করতে চান তবে\n"
 "গনোম-অডিও প্যাকেজটি ইনস্টল করতে পারেন।"
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "%s ফাইলটি কোন বৈধ ওয়েভ (Wav) ফাইল নয়"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "ইভেন্ট"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "শব্দের ফাইল"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "শব্দ (_শ):"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "শব্দের ফাইল (_ফ):"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "শব্দের ফাইলটি বেছে নিন"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "বাজাও (_জ)"
 
@@ -3094,30 +3072,78 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"অল্প কিছুক্ষণের মধ্যেই gconf-এর XKB সংক্রান্ত বৈশিষ্ট্যাবলী অগ্রাহ্য (Override) করা "
-"হবে (সিস্টেম কনফিগারেশন থেকে)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB কীবোর্ড বিন্যাস (Layout)"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB কীবোর্ড মডেল"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB অপশন"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "কীবোর্ডের মডেল (_ম):"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB কীবোর্ড বিন্যাস (Layout)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "কীবোর্ডের মডেল (_ম):"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "কীবোর্ড শর্টকাট"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "যত দ্রুত সম্ভব সিস্টেম থেকে gconf-এর XKB সংক্রান্ত বৈশিষ্ট্যাবলী অগ্রাহ্য (Override) "
 "করা হবে"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"অল্প কিছুক্ষণের মধ্যেই gconf-এর XKB সংক্রান্ত বৈশিষ্ট্যাবলী অগ্রাহ্য (Override) করা "
+"হবে (সিস্টেম কনফিগারেশন থেকে)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB কীবোর্ড বিন্যাস (Layout)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB কীবোর্ড মডেল"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "না না - অনেক কাজ বাকি - এখন বিরতি নেওয়া যাবে না (_ব)"
@@ -3193,46 +3219,14 @@ msgstr ""
 "প্যানেলে কোন বিজ্ঞপ্তিস্থল নেই। আপনি চাইলে প্যানেলে মাউসের ডান বাটন ক্লিক করে "
 "'প্যানেলে যোগ করো->ইউটিলিটি->বিজ্ঞপ্তিস্থল' থেকে সেটাকে যোগ করে নিতে পারেন।"
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "আবার আসিব ফিরে ধানসিড়িটির তীরে - এই বাংলায়। ১২৩৪৫৬৭৮৯০"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "নাম:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "বর্গ:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "ধরন:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "আয়তন:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "সংস্করণ:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "সত্ত্বাধিকার:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "বর্ণনা:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "ব্যবহারবিধি: %s ফন্টফাইল\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "অ্যাপলিকেশনে ব্যবহৃত ফন্ট"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "ফন্ট-কনটেক্সট-মেনুর জিনিষ"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "যে অ্যাপলিকেশনটি ডিফল্ট হিসেবে ব্যবহার করতে চান তা বেছে নিন"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3300,33 +3294,47 @@ msgstr "ট্রু টাইপ ফন্টের থাম্বনেইল
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "টাইপ-ওয়ান ফন্টের থাম্বনেইল বানানো হবে কিনা"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "ফন্টিলস কনটেক্সট মেনুর ফ্যাক্টরি"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "আবার আসিব ফিরে ধানসিড়িটির তীরে - এই বাংলায়। ১২৩৪৫৬৭৮৯০"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "ফন্টিলস কনটেক্সট মেনু"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "নাম:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "ফন্টিলস কনটেক্সট মেনু ফ্যাক্টরি"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "বর্গ:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "ফন্টের জন্য নটিলাস কনটেক্সট মেনু এনট্রি"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "ধরন:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "অ্যাপলিকেশনে ব্যবহৃত ফন্ট"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "আয়তন:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Theme Properties content view-এর কম্পোনেন্ট"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "সংস্করণ:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "সত্ত্বাধিকার:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "বর্ণনা:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "থিমাস Theme Properties view"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "ব্যবহারবিধি: %s ফন্টফাইল\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "গনোম নিয়ন্ত্রণ কেন্দ্র"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3356,27 +3364,18 @@ msgstr "ফন্ট সক্রিয় করো (_স)"
 msgid "Themes"
 msgstr "থিম"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "নিয়ন্ত্রণ থিম"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "উইন্ডো সীমানার থিম"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "আইকন থিম"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "বর্তমানে প্রদর্শিত ইউআরআই"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "কখগঘঙচছজ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "সত্য (true) হলে ইনস্টল করা থিম-কে থাম্বনেইল করা হবে।"
@@ -3409,3 +3408,148 @@ msgstr "ইনস্টল করা থিম থাম্বনেইল ক�
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "থিম থাম্বনেইল করা হবে কিনা"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "কখগঘঙচছজ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "ফন্ট সক্রিয় করো (_স)"
+
+# FIXME
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "ডিফল্ট-এ রিসেট করো"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "মোজিলা/নেটস্কেপ ৬"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "গনোম টার্মিনাল"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "স্বনির্বাচিত এডিটর (_ন)"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "স্বনির্বাচিত  মেইল পাঠক (_ন):"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "স্বনির্বাচিত টার্মিনাল (_ন):"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "স্বনির্বাচিত ওয়েব ব্রাউজার (_ন):"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "টার্মিনালে চালাও (_ট)"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "এই অ্যাপলিকেশনটি ইউআরআই ব্যবহার করতে পারে (_ই)"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "এই অ্যাপলিকেশনটি শেল থেকে চালাতে হয় (_শ)"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "একটি মেইল পাঠক বেছে নিন (_ব):"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "একটি টার্মিনাল বেছে নিন (_ছ):"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "একটি ওয়েব  ব্রাউজার বেছে নিন (_চ):"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "একটি এডিটর বেছে নিন (_ত):"
+
+#~ msgid "Accessibility"
+#~ msgstr "সহায়ক প্রযুক্তি"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "সহায়ক প্রযুক্তির বৈশিষ্ট্যসমূহ"
+
+#~ msgid "Advanced"
+#~ msgstr "অগ্রসর"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "অগ্রসর বৈশিষ্ট্যাবলী"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "নেটওয়ার্ক প্রক্সি কনফিগারেশন"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "গনোম নিয়ন্ত্রণ কেন্দ্র: %s"
+
+#~ msgid "Layout"
+#~ msgstr "বিন্যাস"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "সিঅ্যাপলেটকে এভাবে দেখানোর জন্য যে বিন্যাস ব্যবহার করা হবে"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "সিঅ্যাপলেট ডিরেক্টরি অবজেক্ট"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "সিঅ্যাপলেট ডিরেক্টরির যে দৃশ্য এখন দেখা যাচ্ছে"
+
+#~ msgid "translator_credits"
+#~ msgstr "অঙ্কুর প্রকল্পের পক্ষে, প্রজ্ঞা [abulfazl@juniv.edu]"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "ডেস্কটপের বৈশিষ্ট্য নির্ধারণী ম্যানেজার।"
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "গনোম নিয়ন্ত্রণ কেন্দ্র: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "গনোম নিয়ন্ত্রণ কেন্দ্র"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "এটি চলতে থাকলে নটিলাস ব্যবহার করো।"
+
+#~ msgid "About this application"
+#~ msgstr "অ্যাপলিকেশন পরিচিতি"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "নিয়ন্ত্রণ কেন্দ্রের সংক্ষিপ্ত বিবরণ"
+
+#~ msgid "_About"
+#~ msgstr "পরিচিতি (_প)"
+
+#~ msgid "_Contents"
+#~ msgstr "সূচি (_চ)"
+
+#~ msgid "_Help"
+#~ msgstr "সহায়িকা (_স)"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "যদি নটিল্যাস চলতেও থাকে তবুও শেল ব্যবহার করো।"
+
+#~ msgid "XKB options"
+#~ msgstr "XKB অপশন"
+
+#~ msgid "Font context menu items"
+#~ msgstr "ফন্ট-কনটেক্সট-মেনুর জিনিষ"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "ফন্টিলস কনটেক্সট মেনুর ফ্যাক্টরি"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "ফন্টিলস কনটেক্সট মেনু"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "ফন্টিলস কনটেক্সট মেনু ফ্যাক্টরি"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "ফন্টের জন্য নটিলাস কনটেক্সট মেনু এনট্রি"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Theme Properties content view-এর কম্পোনেন্ট"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "থিমাস Theme Properties view"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "বর্তমানে প্রদর্শিত ইউআরআই"
diff --git a/po/bs.po b/po/bs.po
index d8bccd424..c512a206b 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD.bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-07-31 15:15+0200\n"
 "Last-Translator: Kenan Hadžiavdić <kenan@bgnett.no>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -62,11 +62,11 @@ msgstr "_Tastatura na ekranu"
 msgid "_Screenreader"
 msgstr "_Čitač ekrana"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Podrška za pomoćnu tehnologiju"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Uključi podršku za GNOME pomoćnu tehnologiju pri prijavi"
 
@@ -117,13 +117,13 @@ msgstr "Uvezi datoteku s postavkama osobina"
 msgid "_Import"
 msgstr "_Uvezi"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tastatura"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Postavite opcije pristupačnosti tastature"
 
@@ -336,11 +336,11 @@ msgstr "piksli u sekundi"
 msgid "seconds"
 msgstr "sekundi"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Promijenite postavke pozadine vašeg desktopa"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Pozadina desktopa"
 
@@ -419,6 +419,13 @@ msgstr "Dodaj pozadinu"
 msgid "No Wallpaper"
 msgstr "Bez pozadine"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -631,105 +638,15 @@ msgstr "Molim izaberite sliku."
 msgid "_Select"
 msgstr "_Izaberi"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Povlaštene aplikacije"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Izaberite vaše uobičajene aplikacije"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M tekstualni preglednik"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx tekstualni preglednik"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links tekstualni preglednik"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution čitač email-a"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome Terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Standardni XTerminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Molim navedite ime i naredbu za ovaj editor."
@@ -739,20 +656,23 @@ msgid "Add..."
 msgstr "Dodaj..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_Vlastiti editor"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Vlastiti"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "_Vlastiti čitač email-a:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Vlastiti"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "_Vlastiti terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "_Vlastiti web preglednik:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Ova aplikacija može otvoriti _više datoteka"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -799,6 +719,16 @@ msgid "Mail Reader"
 msgstr "Čitač email-a"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Pokreni u _terminalu"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Pokreni u _terminalu"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -806,92 +736,168 @@ msgstr ""
 "Izaberite upravitelj prozora koji želite.  Da bi radio, moraćete pritisnuti "
 "primijeni, mahnuti čarobnim štapićem i zaplesati magični ples."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Pokreni u _Terminalu"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Editor teksta"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Ova aplikacija može otvoriti _URI-e"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Ova aplikacija može otvoriti _više datoteka"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Ova aplikacija se mora pokrenuti u _shellu"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Razumije _Netscape-ov daljinski upravljač"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Koristi ovaj _editor za otvaranje čistog teksta u upravitelju datoteka"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Web preglednik"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Upravitelj prozora"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_Naredba:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Osobine..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Izaberite čitač email-a:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Izaberi"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Uobičajeni web preglednik"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M tekstualni preglednik"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx tekstualni preglednik"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links tekstualni preglednik"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution čitač email-a"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Izaberite terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Izaberite web preglednik:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Izaberite editor:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Uobičajeni terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Standardni XTerminal"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Pristupačnost"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Postavke pristupačnosti"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Napredno"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Napredne postavke"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Promijeni rezoluciju ekrana"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Rezolucija ekrana"
 
@@ -985,7 +991,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Da li ste sigurni da želite trajno obrisati ovaj unos?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Opis"
 
@@ -993,17 +999,27 @@ msgstr "Opis"
 msgid "Extensions"
 msgstr "Proširenja"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Tipovi datoteka i programi"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Navedite koji se programi koriste za otvaranje ili pregled svake vrste "
 "datoteke"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Tipovi datoteka i programi"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Navedi koji će se programi koristiti za otvaranje ili pregled svake vrste "
+"datoteke"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Akcije"
@@ -1094,6 +1110,7 @@ msgid "_Protocol:"
 msgstr "_Protokol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -1101,16 +1118,6 @@ msgstr "_Ukloni"
 msgid "_Viewer component:"
 msgstr "Komponenta _preglednika:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Tipovi datoteka i programi"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Navedi koji će se programi koristiti za otvaranje ili pregled svake vrste "
-"datoteke"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Izmijeni kategoriju datoteke"
@@ -1292,14 +1299,15 @@ msgid "Electronic mail transmission"
 msgstr "Prijenos email-a"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome dokumentacija"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Font"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Izaberi fontove za desktop"
 
@@ -1510,29 +1518,29 @@ msgid "The type of accelerator."
 msgstr "Tip kratice."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Nepoznata akcija>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Desktop"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Zvuk"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Upravitelj prozora"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1541,27 +1549,27 @@ msgstr ""
 "Kratica \"%s\" se već koristi za:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Greška pri postavljanju nove kratice u bazi podataka s podešavanjima: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Greška pri brisanju kratice iz baze podataka s podešavanjima: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Akcija"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Kratica"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Kratice tastature"
 
@@ -1573,26 +1581,10 @@ msgstr ""
 "Da biste izmijenili kraticu, kliknite u odgovarajući red i unesite novu "
 "kraticu ili pritisnite tipku backspace da obrišete."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Dodijeli kratice naredbama"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Nepoznat kursor"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Model"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "XKB raspored tastature"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1764,10 +1756,35 @@ msgstr "_Radni period traje:"
 msgid "minutes"
 msgstr "minuta"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Nepoznat kursor"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Model"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "XKB raspored tastature"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Postavite vaše opcije za tastaturu"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Postavite opcije za miša"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Nepoznat kursor"
@@ -1932,20 +1949,21 @@ msgstr "_Prag:"
 msgid "_Timeout:"
 msgstr "_Istek vremena:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Miš"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Postavite opcije za miša"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Mrežni proxy"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Opcije za mrežni proxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1989,8 +2007,9 @@ msgid "H_TTP proxy:"
 msgstr "_HTTP proxy:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Podešavanje mrežnog proxy-a"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Opcije za mrežni proxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2028,7 +2047,7 @@ msgstr "_Šifra:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Siguran HTTP proxy:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Uključi zvuk i pridruži zvukove događajima"
 
@@ -2086,15 +2105,26 @@ msgstr ""
 "«Opcije tema» nije pravilno instaliran ili niste instalirali paket «gnome-"
 "themes»."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Nije navedeno mjesto gdje će datoteke tema biti instalirane"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Navedeno mjesto za instaliranje datoteka za teme je nevažeće"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2129,12 +2159,12 @@ msgstr "Ime teme mora biti upisano"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Tema već postoji. Želite li je zamijeniti?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Izaberite teme za različite dijelove desktopa"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2247,11 +2277,11 @@ msgstr "_Ime teme:"
 msgid "theme selection tree"
 msgstr "stablo za izbor teme"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Prilagodi izgled traka s alatima i menijima u aplikacijama"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Meniji & Alati"
 
@@ -2320,7 +2350,6 @@ msgid "_Edit"
 msgstr "_Izmijeni"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -2348,6 +2377,14 @@ msgstr "_Izađi"
 msgid "_Save"
 msgstr "_Snimi"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2359,23 +2396,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Kontrola"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (ili \"Windows tipka\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2416,14 +2453,34 @@ msgstr "_Podigni izabrane prozore nakon određenog perioda"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Izaberi prozore kada miš pređe preko njih"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Osobine prozora"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Prozori"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME Kontrolni centar"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Opcije pozadine desktopa"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Ostali"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "GNOME alat za podešavanje"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2458,85 +2515,6 @@ msgstr "Tvornica menija konteksta za fontilus"
 msgid "View as Control Center"
 msgstr "Gnome kontrolni centar"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME Kontrolni centar: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Raspored"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Raspored koji će se koristiti za ovaj prikaz korisničkih izbora"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Objekt kataloga korisničkog izbora"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Katalog korisničkog izbora koji se trenutno gleda"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Kenan Hadžiavdić<kenan@bgnett.no>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME Kontrolni centar"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Upravitelj osobina desktopa."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Gnome kontrolni centar : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Ostali"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Gnome kontrolni centar"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Koristi nautilus ako je pokrenut."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "O ovoj aplikaciji"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Pregled kontrolnog centra"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_O"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Sadržaj"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "GNOME alat za podešavanje"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Koristi shell čak i ako je Nautilus pokrenut."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Jačina zvuka"
@@ -2643,7 +2621,7 @@ msgstr ""
 "Greška pri pokušaju pokretanja (%s)\n"
 "koje je vezano za tipku (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2669,7 +2647,7 @@ msgstr ""
 "- Rezultat naredbe <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/"
 "xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2681,7 +2659,7 @@ msgstr ""
 "Pokušajte koristiti jednostavniju konfiguraciju ili uzmite noviju verziju "
 "XFree softvera."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2689,15 +2667,15 @@ msgstr ""
 "Postavke tastature sistema X se razlikuju od vaših trenutnih postavki "
 "tastature za GNOME. Koje postavke želite koristiti?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Koristi postavke za X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Koristi postavke za GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, fuzzy, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2761,8 +2739,8 @@ msgstr "_Nemoj više prikazivati ovu poruku"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nisam mogao učitati zvučnu datoteku %s kao uzorak %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Ne mogu odrediti početni direktorij korisnika"
 
@@ -2813,11 +2791,11 @@ msgstr "Ekran"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Ekran na koji će BGApplier crtati"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Zvučna datoteka za ovaj događaj ne postoji."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2827,32 +2805,32 @@ msgstr ""
 "Možete instalirati paket gnome-audio za skup\n"
 "uobičajenih zvukova."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Datoteka %s nije važeća wav datoteka"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Događaj"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Zvučna datoteka"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Zvukovi:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Zvučna _datoteka:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Izaberite zvučnu datoteku"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Sviraj"
 
@@ -3112,27 +3090,75 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Uskoro će XKB postavke u gconf-u biti prebrisane (iz podešavanja sistema)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB raspored tastature"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB model tastature"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB opcije"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Model tastature:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB raspored tastature"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Model tastature:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Kratice tastature"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "XKB postavke u gconf će biti prebrisane iz sistema ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Uskoro će XKB postavke u gconf-u biti prebrisane (iz podešavanja sistema)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB raspored tastature"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB model tastature"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Odgodi pauzu"
@@ -3210,47 +3236,14 @@ msgstr ""
 "desnim dugmetom miša na panel i biranjem 'Dodaj panelu -> Alati -> Zona za "
 "obavijesti'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-"A B C Č Ć D Dž Đ E F G H I J K L Lj M N Nj O P R S Š T U V Z Ž 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Ime:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stil:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tip:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Veličina:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Verzija:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Autorska prava:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Opis:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "upotreba: %s datoteka fonta\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Postavi kao font aplikacije"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Stavke menija konteksta fonta"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Izaberite vaše uobičajene aplikacije"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3324,33 +3317,48 @@ msgstr "Da li prikazati umanjeno TrueType fontove"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Da li prikazati umanjeno Type1 fontove"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Tvornica menija konteksta za fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr ""
+"A B C Č Ć D Dž Đ E F G H I J K L Lj M N Nj O P R S Š T U V Z Ž 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Meni konteksta za fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Ime:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Tvornica menija konteksta za fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stil:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Unosi Nautilus menija konteksta za fontove"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tip:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Postavi kao font aplikacije"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Veličina:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponenta za pregled sadržaja osobina teme"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Verzija:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus pregled osobina teme"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Autorska prava:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Opis:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "upotreba: %s datoteka fonta\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME Kontrolni centar"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3380,27 +3388,18 @@ msgstr "_Koristi font"
 msgid "Themes"
 msgstr "Teme"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Tema upravitelja"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Tema okvira prozora"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Tema ikona"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Trenutno prikazani URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCČĆĐŠŽ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Ako je postavljeno, onda će instalirane teme biti prikazane umanjenje."
@@ -3438,5 +3437,149 @@ msgstr "Da li umanjeno prikazati instalirane teme"
 msgid "Whether to thumbnail themes"
 msgstr "Da li umanjeno prikazati teme"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCČĆĐŠŽ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Koristi font"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Vrati na _uobičajeno"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome Terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_Vlastiti editor"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "_Vlastiti čitač email-a:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "_Vlastiti terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "_Vlastiti web preglednik:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Pokreni u _Terminalu"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Ova aplikacija može otvoriti _URI-e"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Ova aplikacija se mora pokrenuti u _shellu"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Izaberite čitač email-a:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Izaberite terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Izaberite web preglednik:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Izaberite editor:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Pristupačnost"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Postavke pristupačnosti"
+
+#~ msgid "Advanced"
+#~ msgstr "Napredno"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Napredne postavke"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Podešavanje mrežnog proxy-a"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME Kontrolni centar: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Raspored"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Raspored koji će se koristiti za ovaj prikaz korisničkih izbora"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Objekt kataloga korisničkog izbora"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Katalog korisničkog izbora koji se trenutno gleda"
+
+#~ msgid "translator_credits"
+#~ msgstr "Kenan Hadžiavdić<kenan@bgnett.no>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Upravitelj osobina desktopa."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Gnome kontrolni centar : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Gnome kontrolni centar"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Koristi nautilus ako je pokrenut."
+
+#~ msgid "About this application"
+#~ msgstr "O ovoj aplikaciji"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Pregled kontrolnog centra"
+
+#~ msgid "_About"
+#~ msgstr "_O"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sadržaj"
+
+#~ msgid "_Help"
+#~ msgstr "_Pomoć"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Koristi shell čak i ako je Nautilus pokrenut."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB opcije"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Stavke menija konteksta fonta"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Tvornica menija konteksta za fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Meni konteksta za fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Tvornica menija konteksta za fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Unosi Nautilus menija konteksta za fontove"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponenta za pregled sadržaja osobina teme"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus pregled osobina teme"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "Trenutno prikazani URI"
+
 #~ msgid "Layout Preview"
 #~ msgstr "Pregled rasporeda"
diff --git a/po/ca.po b/po/ca.po
index 20a622a96..d7a42d433 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.7.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-14 15:37+0100\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-11 13:44+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -2032,7 +2032,8 @@ msgid "Network Proxy"
 msgstr "Servidor intermediari de xarxa"
 
 #: capplets/network/gnome-network-preferences.desktop.in.in.h:2
-msgid "Network proxy preferences"
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Preferències del servidor intermediari de xarxa"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2544,8 +2545,9 @@ msgstr "_Selecciona les finestres quan el ratolí pasa per damunt"
 
 #
 #: capplets/windows/window-properties.desktop.in.in.h:1
-msgid "Window Properties"
-msgstr "Propietats de les finestres"
+#, fuzzy
+msgid "Set your window properties"
+msgstr "Configura les propietats de finestra"
 
 #
 #: capplets/windows/window-properties.desktop.in.in.h:2
@@ -3196,30 +3198,79 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Molt prompte, els paràmetres d'XKB emmagatzemats en gconf es sobreescriuran "
-"(des de la configuració del sistema)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Disposició de teclat XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Model de teclat XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
+#
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Opcions d'XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Timbre de teclat h_abilitat"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Disposició de teclat XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Model del teclat:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Propietats de Teclat"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "Els paràmetres d'XKB del gconf es sobreescriuran amb els del sistema només "
 "siga possible"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Molt prompte, els paràmetres d'XKB emmagatzemats en gconf es sobreescriuran "
+"(des de la configuració del sistema)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Disposició de teclat XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Model de teclat XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "A_jorna el descans"
@@ -3526,6 +3577,13 @@ msgstr "Aplica el tema"
 msgid "Sets the default theme"
 msgstr "Estableix el tema per defecte"
 
+#
+#~ msgid "Window Properties"
+#~ msgstr "Propietats de les finestres"
+
+#~ msgid "XKB options"
+#~ msgstr "Opcions d'XKB"
+
 #~ msgid "Mozilla/Netscape 6"
 #~ msgstr "Mozilla/Netscape 6"
 
@@ -4299,10 +4357,6 @@ msgstr "Estableix el tema per defecte"
 #~ msgstr "La _pressió d'una tecla produeix un so"
 
 #
-#~ msgid "Keyboard bell _enabled"
-#~ msgstr "Timbre de teclat h_abilitat"
-
-#
 #~ msgid "Keyboard bell _off"
 #~ msgstr "Timbre de teclat des_habilitat"
 
@@ -4402,10 +4456,6 @@ msgstr "Estableix el tema per defecte"
 #~ msgid "Configure window appearance"
 #~ msgstr "Configura l'aparença de finestra"
 
-#
-#~ msgid "Configure window properties"
-#~ msgstr "Configura les propietats de finestra"
-
 #~ msgid "Configure window manager configuration properties"
 #~ msgstr "Configura les propietats de configuració del gestor de finestres"
 
@@ -4445,9 +4495,6 @@ msgstr "Estableix el tema per defecte"
 #~ msgid "Associate keyboard shortcuts with panel actions"
 #~ msgstr "Associa dreceres de teclat amb accions de quadre"
 
-#~ msgid "Keyboard Properties"
-#~ msgstr "Propietats de Teclat"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Configura els sons del GNOME"
 
diff --git a/po/cs.po b/po/cs.po
index b1718f1f6..144357582 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-19 12:22+0100\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-19 12:55+0100\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -3054,7 +3054,9 @@ msgstr ""
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr "Soubor skriptů, které spustit, když je obnoven stav klávesnice. Užitečné pro znovunastavení úprav založených na xmodmap"
+msgstr ""
+"Soubor skriptů, které spustit, když je obnoven stav klávesnice. Užitečné pro "
+"znovunastavení úprav založených na xmodmap"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
 msgid "Default group, assigned on window creation"
@@ -3082,7 +3084,9 @@ msgstr "Možnosti klávesnice"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
 msgid "Keyboard settings in gconf will be overridden from the system ASAP"
-msgstr "Nastavení klávesnice v gconf budou co nejdříve nahrazena nastaveními v systému"
+msgstr ""
+"Nastavení klávesnice v gconf budou co nejdříve nahrazena nastaveními v "
+"systému"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
 msgid "Save/restore indicators together with layout groups"
@@ -3096,13 +3100,17 @@ msgstr "Zobrazovat názvy rozložení místo názvů skupin"
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr "Zobrazovat názvy rozložení místo názvů skupin (jen pro verze XFree, které podporují více rozložení)"
+msgstr ""
+"Zobrazovat názvy rozložení místo názvů skupin (jen pro verze XFree, které "
+"podporují více rozložení)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
 msgid ""
 "Very soon, keyboard settings in gconf will be overridden (from the system "
 "configuration)"
-msgstr "Velice brzo budou nastavení klávesnice v gconf ignorována (ve prospěch systémového nastavení)"
+msgstr ""
+"Velice brzo budou nastavení klávesnice v gconf ignorována (ve prospěch "
+"systémového nastavení)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
 msgid "keyboard layout"
diff --git a/po/cy.po b/po/cy.po
index 6355dc3d4..5b92b6284 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-12 04:51+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
@@ -73,11 +73,11 @@ msgstr "Bysellfwrdd _ar y Sgrîn"
 msgid "_Screenreader"
 msgstr "_Sgrînddarllenwr"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Cynhaliaeth Technoleg Cynorthwyol"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 "Galluogi cynhaliaeth ar gyfer technolegau cynorthwyol GNOME wrth fewngofnodi"
@@ -129,13 +129,13 @@ msgstr "Mewnforio Ffeil Gosodiadau Nodweddion"
 msgid "_Import"
 msgstr "_Mewnforio"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Bysellfwrdd"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Dewis eich hoffterau hygyrchedd bysellfwrdd"
 
@@ -348,11 +348,11 @@ msgstr "picseli yr eiliad"
 msgid "seconds"
 msgstr "eiliadau"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Newid gosodiadau eich Cefndir Penbwrdd"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Cefndir Penbwrdd"
 
@@ -431,6 +431,13 @@ msgstr "Ychwanegu Papur Wal"
 msgid "No Wallpaper"
 msgstr "Dim Papur Wal"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -636,105 +643,15 @@ msgstr "Dewiswch ddelwedd."
 msgid "_Select"
 msgstr "_Dewis"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Rhaglenni Amgen"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Dewisiwch eich rhaglenni rhagosodedig"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Y Porwr Gwe W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Y Porwr Gwe Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Y Porwr Gwe Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Y Darllenwr Ebost Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Ebost Mozilla"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Terfynell GNOME"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Terfynell Safonol X"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Penodi enw a gorchymyn i'r golygydd yma"
@@ -744,20 +661,22 @@ msgid "Add..."
 msgstr "Ychwanegu..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Goly_gydd Personol"
+#, fuzzy
+msgid "C_ustom"
+msgstr "A_ddasiedig:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Darllenwr Ebost _Addasiedig:"
+msgid "C_ustom:"
+msgstr "A_ddasiedig:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terfynell _Addasiedig:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Porwr Gwe _Addasiedig:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Medr y rhaglen yma agor _mwy nag un ffeil ar y pryd"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -804,6 +723,16 @@ msgid "Mail Reader"
 msgstr "Darllenwr Ebost"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Rhedeg yn _Nherfynell"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Rhedeg yn _Nherfynell"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -811,96 +740,172 @@ msgstr ""
 "Dewisiwch eich rheolwr ffenestri. Rhaid i chi wasgu \"Cymhwyso\", chwifio'r "
 "hudlath, a gwneud dawns hudol er mwyn iddo weithio."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Cychwyn mewn T_erfynell"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terfynell"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Golygydd Testun"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Medr y rhaglen yma agor _URIau"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Medr y rhaglen yma agor _mwy nag un ffeil ar y pryd"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Rhaid i'r rhaglen yma redeg mewn _plisgyn"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Deall _Netscape Remote Control"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Defnyddio'r _golygydd yma i agor ffeiliau testun y tu mewn i'r trefnydd "
 "ffeiliau"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Porwr Gwe"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Trefnydd Ffenestri"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_Gorchymyn:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Enw:"
 
 # msgid "_Name:"
 # msgstr "_Enw:"
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Priodweddau..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Dewiswch Ddarllenwr Ebost:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Dewis"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Porydd Wê Arferol"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Ebost Mozilla"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Dewiswch Terfynell:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "Dewisiwch _Borwr Gwe:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "Dewisiwch _Olygydd Testun:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Y Porwr Gwe W3M"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Hygyrchedd"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Y Porwr Gwe Lynx"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Gosodiadau Hygyrchedd"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Y Porwr Gwe Links"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Pellach"
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Y Darllenwr Ebost Evolution"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Gosodiadau Pellach"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Ebost Mozilla"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Terfynell Rhagosodedig"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terfynell"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Terfynell Safonol X"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Newid cydraniad y sgrîn"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Cydraniad y Sgrîn"
 
@@ -991,7 +996,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Ydych chi'n siwr eich bod am ddileu'r cofnod hwn yn barhaol?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Disgrifiad"
 
@@ -999,15 +1004,23 @@ msgstr "Disgrifiad"
 msgid "Extensions"
 msgstr "Estyniadau"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Mathau Ffeil a Rhaglenni"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "Penodi pa raglenni a ddefnyddir i agor neu olygu pob ffeil"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Math ffeil a rhaglenni"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "Penodi pa raglenni a ddefnyddir i agor neu weld pob math o ffeil"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Gweithredoedd"
@@ -1098,6 +1111,7 @@ msgid "_Protocol:"
 msgstr "_Protocol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Gwaredu:"
 
@@ -1105,14 +1119,6 @@ msgstr "_Gwaredu:"
 msgid "_Viewer component:"
 msgstr "_Cyfadran gwelydd:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Math ffeil a rhaglenni"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "Penodi pa raglenni a ddefnyddir i agor neu weld pob math o ffeil"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Golygu categori ffeil"
@@ -1294,14 +1300,15 @@ msgid "Electronic mail transmission"
 msgstr "Trosglwyddo Post Electronig"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Dogfennaeth Gnome"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Ffont"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Dewiswch ffontau ar gyfer y penbwrdd"
 
@@ -1508,29 +1515,29 @@ msgid "The type of accelerator."
 msgstr "Y math o gyflymydd."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Analluogwyd"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Gweithred Anhysbys>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Penbwrdd"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Sain"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Rheoli Ffenestri"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1539,26 +1546,26 @@ msgstr ""
 "Defnyddir y byrlwybr \"%s\" eisioes ar gyfer:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Gwall tra'n gosod cyflymydd newydd yn y cronfa cyfluniad: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Gwall tra'n dadosod cyflymydd yn y gronfa cyfluniad: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Gweithred"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Byrlwybr"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Llwybrau byr y Bysellfwrdd"
 
@@ -1570,23 +1577,10 @@ msgstr ""
 "I olygu bysell cyflymydd, cliciwch ar y rhes sy'n cyfateb a teipiwch "
 "gyflymydd newydd, neu gwasgwch ôlnod er mwyn clirio."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "_Neilltuo bysyll byrlwybr â gorchmynion"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Anhysbys"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modelau"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Rhagolwg cynllun bysellfwrdd"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1754,10 +1748,33 @@ msgstr "_Cyfnod gweithio yn para:"
 msgid "minutes"
 msgstr "munud"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modelau"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Rhagolwg cynllun bysellfwrdd"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Gosodwch eich hoffterau bysellfwrdd"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "Hoffterau Dewislen a Bar Offer"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Gosodwch eich hoffterau llygoden"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Cyrchydd Anhysbys"
@@ -1922,20 +1939,21 @@ msgstr "_Trothwy:"
 msgid "_Timeout:"
 msgstr "_Terfyn aros:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Llygoden"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Gosodwch eich hoffterau llygoden"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Dirprwy Rhwydwaith"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Hoffterau dirprwy rhwydwaith"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1979,8 +1997,9 @@ msgid "H_TTP proxy:"
 msgstr "Dirprwy _HTTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Cyfluniad Dirprwy Rhwydwaith"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Hoffterau dirprwy rhwydwaith"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2018,7 +2037,7 @@ msgstr "_Cyfrinair:"
 msgid "_Secure HTTP proxy:"
 msgstr "Dirprwy HTTP _Diogel:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Galluogi sain a cysylltu seiniau â digwyddiadau"
 
@@ -2076,15 +2095,26 @@ msgstr ""
 "deialog \"Hoffterau Thema\" wedi ei osod yn anghywir, neu nad ydych wedi "
 "gosod y pecyn \"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Ni chafodd lleoliad ffeil thema ei bennu ar gyfer ei osod"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Roedd y lleoliad ffeil thema a benodwyd i'w osod yn annilys"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2119,12 +2149,12 @@ msgstr "Rhaid bod enw thema yn bresennol"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Mae'r thema'n bodoli eisioes. A hoffech ei newid?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Dewiswch themâu i amryw rannau'r penbwrdd"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Thema"
 
@@ -2236,11 +2266,11 @@ msgstr "_Enw thema:"
 msgid "theme selection tree"
 msgstr "coeden dewis thema"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Addasu golwg bariau offer a bariau dewislenni mewn rhaglenni"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Dewislenni a Bariau Offer"
 
@@ -2309,7 +2339,6 @@ msgid "_Edit"
 msgstr "_Golygu"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Ffeil"
 
@@ -2337,6 +2366,14 @@ msgstr "_Gadael"
 msgid "_Save"
 msgstr "_Cadw"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2348,23 +2385,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Rheolaeth"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Goruwch (hyper)"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "S?per (neu \"Logo Ffenestri\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2406,14 +2443,34 @@ msgstr "_Codi ffenestri dewisiedig ar ôl cyfnod"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Dewis ffenestri pan fo'r llygoden yn symud drostynt"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Priodweddau Ffenestr"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Ffenestri"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Canolfan Reoli GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Hoffterau Bysellfwrdd"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Eraill"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Yr erfyn cyfluniad GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Canolfan Rheoli"
@@ -2442,91 +2499,6 @@ msgstr "Ffatri golwg y Ganolfan Rheoli"
 msgid "View as Control Center"
 msgstr "Gweld fel Canolfan Rheoli"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Canolfan Reoli GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Cyflwyniad"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Y cyllun i'w ddefnyddio ar gyfer yr olwg yma o'r c-rhaglennigion"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Gwrthrych gyfeiriadur c-rhaglennigion"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Cyfeiriadur c-rhaglennigion y gwyla'r olwg hon"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Owain Green,\n"
-"Gruffudd Williams,\n"
-"Steve Griffiths,\n"
-"\"Daniel\",\n"
-"Dafydd Harries <daf@parnassus.ath.cx>,\n"
-"Dafydd Tomos <l10n@da.fydd.org>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Canolfan Reoli GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Rheolwr priodweddau penbwrdd"
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Canolfan Reoli GNOME : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Eraill"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Canolfan Rheoli GNOME"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Defnyddio Nautilus os mae'n rhedeg."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Ynghylch y rhaglen hwn"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Arolwg o'r ganolfan reoli"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Ynghylch"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Cynnwys"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Cymorth"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Yr erfyn cyfluniad GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Defnyddio plisgyn, er rheda nautilus"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Lefel Sain"
@@ -2634,7 +2606,7 @@ msgstr ""
 "Gwall tra'n ceisio gweithredu (%s)\n"
 "sy'n rhwym i'r bysell (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2660,7 +2632,7 @@ msgstr ""
 "- Canlyniad gorchymyn <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/"
 "xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2672,7 +2644,7 @@ msgstr ""
 "Triwch ddefnyddio cyfluniad symlach neu ddefnyddio fersiwn mwy diweddar o "
 "feddalwedd XFree"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2680,15 +2652,15 @@ msgstr ""
 "Mae gosodiadau bysellfwrdd y system X yn wahanol i'ch gosodiadau bysellfwrdd "
 "GNOME cyfredol. Pa set hoffech ddefnyddio?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Defnyddio Gosodiadau X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Defnyddio Gosodiadau GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2753,8 +2725,8 @@ msgstr "_Peidiwch â dangos y neges yma eto"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Methwyd llwytho ffeil sain %s fel sampl %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Methwyd canfod cyfeiriadur cartre'r defnyddiwr"
 
@@ -2803,11 +2775,11 @@ msgstr "Sgrîn"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Sgrîn y dylai BGApplier ddarlunio arno"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Nid yw'r ffeil sain i'r digwyddiad yma'n bodoli."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2817,32 +2789,32 @@ msgstr ""
 "Efallai hoffech sefydlu y pecyn gnome-audio\n"
 "er mwyn gael set o seiniau rhagosodedig."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "NId yw'r ffeil %s yn ffeil WAV dilys"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Digwyddiad"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Ffeil Sain"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Seiniau:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Ffeil sain:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Dewiswch Ffeil Sain"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Chwarae"
 
@@ -3101,28 +3073,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Yn fuan iawn, caiff y gosodiadau XKB yn gconf eu dirymu (gan gyfluniad y "
-"system)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Cynllun Bysellfwrdd XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Model bysellfwrdd XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Opsiynnau XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Model bysellfwrdd"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Cynllun Bysellfwrdd XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Model bysellfwrdd"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Llwybrau byr y Bysellfwrdd"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Caiff osodiadau XKB yn gonf ei dirymu o'r system mor fuan a phosib"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Yn fuan iawn, caiff y gosodiadau XKB yn gconf eu dirymu (gan gyfluniad y "
+"system)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Cynllun Bysellfwrdd XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Model bysellfwrdd XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Gohirio'r saib"
@@ -3199,46 +3219,14 @@ msgstr ""
 "gan de-glicio ar eich panel a dewis 'Ychwanegu at y Panel -> Teclyn -> Man "
 "Hysbysu'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Parciais fy jac codi baw hud llawn d?r ger t? Mabon. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Enw:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Arddull:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Math:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Maint:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Fersiwn:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Hawlfraint:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Disgrifiad:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "defnydd: %s ffeil_ffont\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Gosod fel y Ffont Rhaglenni"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Eitemau dewislen cyd-destun ffont"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Dewisiwch eich rhaglenni rhagosodedig"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3314,33 +3302,47 @@ msgstr "A ddylid creu lluniau cryno o ffontiau TrueType"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "A ddylid creu lluniau cryno o ffontiau Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Ffatri ar gyfer y dewislen cyd-destun fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Parciais fy jac codi baw hud llawn d?r ger t? Mabon. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Dewislen cyd-destun fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Enw:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Ffatri deiwlen cyd-destun fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Arddull:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Eitemau dewislen cyd-destun Nautilus ar gyfer ffontiau"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Math:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Gosod fel y Ffont Rhaglenni"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Maint:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Fersiwn:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Hawlfraint:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Disgrifiad:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Cydran golwg cynnwys Priodweddau Thema"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "defnydd: %s ffeil_ffont\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Golwg Priodweddai Thema Themus"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Canolfan Reoli GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3370,27 +3372,18 @@ msgstr "_Cymhwyso'r ffont"
 msgid "Themes"
 msgstr "Themâu"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Thema rheoli"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Thema ymyl ffenestr"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Thema eiconau"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "y URI a ddangosir yn gyfredol"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Os yn wir, caiff lluniau cryno eu creu ar gyfer themâu sefydliedig."
@@ -3428,6 +3421,156 @@ msgstr "A ddylid creu lluniau cryno o themâu sefydliedig"
 msgid "Whether to thumbnail themes"
 msgstr "A ddylid creu lluniau cryno o themâu"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Cymhwyso'r ffont"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "_Ailosod i'r dewis rhagosodedig"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terfynell GNOME"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Goly_gydd Personol"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Darllenwr Ebost _Addasiedig:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terfynell _Addasiedig:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Porwr Gwe _Addasiedig:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Cychwyn mewn T_erfynell"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Medr y rhaglen yma agor _URIau"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Rhaid i'r rhaglen yma redeg mewn _plisgyn"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Dewiswch Ddarllenwr Ebost:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Dewiswch Terfynell:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "Dewisiwch _Borwr Gwe:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "Dewisiwch _Olygydd Testun:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Hygyrchedd"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Gosodiadau Hygyrchedd"
+
+#~ msgid "Advanced"
+#~ msgstr "Pellach"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Gosodiadau Pellach"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Cyfluniad Dirprwy Rhwydwaith"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Canolfan Reoli GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Cyflwyniad"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Y cyllun i'w ddefnyddio ar gyfer yr olwg yma o'r c-rhaglennigion"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Gwrthrych gyfeiriadur c-rhaglennigion"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Cyfeiriadur c-rhaglennigion y gwyla'r olwg hon"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Owain Green,\n"
+#~ "Gruffudd Williams,\n"
+#~ "Steve Griffiths,\n"
+#~ "\"Daniel\",\n"
+#~ "Dafydd Harries <daf@parnassus.ath.cx>,\n"
+#~ "Dafydd Tomos <l10n@da.fydd.org>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Rheolwr priodweddau penbwrdd"
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Canolfan Reoli GNOME : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Canolfan Rheoli GNOME"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Defnyddio Nautilus os mae'n rhedeg."
+
+#~ msgid "About this application"
+#~ msgstr "Ynghylch y rhaglen hwn"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Arolwg o'r ganolfan reoli"
+
+#~ msgid "_About"
+#~ msgstr "_Ynghylch"
+
+#~ msgid "_Contents"
+#~ msgstr "_Cynnwys"
+
+#~ msgid "_Help"
+#~ msgstr "_Cymorth"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Defnyddio plisgyn, er rheda nautilus"
+
+#~ msgid "XKB options"
+#~ msgstr "Opsiynnau XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Eitemau dewislen cyd-destun ffont"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Ffatri ar gyfer y dewislen cyd-destun fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Dewislen cyd-destun fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Ffatri deiwlen cyd-destun fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Eitemau dewislen cyd-destun Nautilus ar gyfer ffontiau"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Cydran golwg cynnwys Priodweddau Thema"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Golwg Priodweddai Thema Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "y URI a ddangosir yn gyfredol"
+
 #~ msgid "De_tails..."
 #~ msgstr "_Manylion..."
 
@@ -3633,10 +3776,6 @@ msgstr "A ddylid creu lluniau cryno o themâu"
 #~ msgstr "Methwyd canfod hbox, yn defnyddio dewisiad ffeil arferol"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Hoffterau Bysellfwrdd"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "Gosodiadau Pellach"
 
@@ -3673,18 +3812,10 @@ msgstr "A ddylid creu lluniau cryno o themâu"
 #~ msgstr "Thema Addasiedig"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "Hoffterau Dewislen a Bar Offer"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "_Cydraniad:"
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Gosodwch eich hoffterau llygoden"
-
-#, fuzzy
 #~ msgid "_Ignore system configuration"
 #~ msgstr "Cyfluniad Dirprwy Rhwydwaith"
 
@@ -3799,9 +3930,6 @@ msgstr "A ddylid creu lluniau cryno o themâu"
 #~ msgid "Bee_p"
 #~ msgstr "Blî_p"
 
-#~ msgid "C_ustom:"
-#~ msgstr "A_ddasiedig:"
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "Cli_c ar fysellwasg"
 
diff --git a/po/da.po b/po/da.po
index 0537e7766..1f4f705ee 100644
--- a/po/da.po
+++ b/po/da.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-30 12:22+0100\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-11-30 12:24+0100\n"
 "Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -434,6 +434,13 @@ msgstr "Tilføj baggrund"
 msgid "No Wallpaper"
 msgstr "Ingen baggrund"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -1939,7 +1946,8 @@ msgid "Network Proxy"
 msgstr "Netværksproxy"
 
 #: capplets/network/gnome-network-preferences.desktop.in.in.h:2
-msgid "Network proxy preferences"
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Indstillinger for netværksproxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1983,7 +1991,8 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP-proxy:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
+#, fuzzy
+msgid "Network Proxy Preferences"
 msgstr "Indstillinger for netværksproxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
@@ -2429,8 +2438,9 @@ msgid "_Select windows when the mouse moves over them"
 msgstr "_Vælg vinduer når musen bevæger sig over dem"
 
 #: capplets/windows/window-properties.desktop.in.in.h:1
-msgid "Window Properties"
-msgstr "Vinduesindstillinger"
+#, fuzzy
+msgid "Set your window properties"
+msgstr "Konfigurér egenskaber for bestemte vinduer"
 
 #: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
@@ -3056,30 +3066,78 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Meget snart vil XKB-indstillinger i GConf blive overskrevet (fra systemets "
-"konfiguration)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB-tastaturlayout"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB-tastaturmodel"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB-indstillinger"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Tastaturbip _aktiveret"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB-tastaturlayout"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Tastatur_model:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Indstillinger for tastatur"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "XKB-indstillinger i GConf vil blive overskrevet af systemet så snart som "
 "muligt"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Meget snart vil XKB-indstillinger i GConf blive overskrevet (fra systemets "
+"konfiguration)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB-tastaturlayout"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB-tastaturmodel"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Udsæt pause"
@@ -3243,39 +3301,39 @@ msgstr "Opret miniaturer for TrueType-skrifttyper"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Opret miniaturer for Type1-skrifttyper"
 
-#: vfs-methods/fontilus/font-view.c:126
+#: vfs-methods/fontilus/font-view.c:125
 msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 msgstr "Cølibatisk havfrue på brynjeklædt wc med plexiglas i zoo - 0123456789."
 
-#: vfs-methods/fontilus/font-view.c:286
+#: vfs-methods/fontilus/font-view.c:285
 msgid "Name:"
 msgstr "Navn:"
 
-#: vfs-methods/fontilus/font-view.c:289
+#: vfs-methods/fontilus/font-view.c:288
 msgid "Style:"
 msgstr "Stil: "
 
-#: vfs-methods/fontilus/font-view.c:298
+#: vfs-methods/fontilus/font-view.c:297
 msgid "Type:"
 msgstr "Type:"
 
-#: vfs-methods/fontilus/font-view.c:305
+#: vfs-methods/fontilus/font-view.c:304
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: vfs-methods/fontilus/font-view.c:349 vfs-methods/fontilus/font-view.c:362
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
 msgid "Version:"
 msgstr "Udgave:"
 
-#: vfs-methods/fontilus/font-view.c:353 vfs-methods/fontilus/font-view.c:364
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: vfs-methods/fontilus/font-view.c:357
+#: vfs-methods/fontilus/font-view.c:356
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: vfs-methods/fontilus/font-view.c:418
+#: vfs-methods/fontilus/font-view.c:417
 #, c-format
 msgid "usage: %s fontfile\n"
 msgstr "brug: %s skriftfil\n"
@@ -3376,6 +3434,15 @@ msgstr "Anvend tema"
 msgid "Sets the default theme"
 msgstr "Sætter standardtemaet"
 
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Indstillinger for netværksproxy"
+
+#~ msgid "Window Properties"
+#~ msgstr "Vinduesindstillinger"
+
+#~ msgid "XKB options"
+#~ msgstr "XKB-indstillinger"
+
 #~ msgid "Mozilla/Netscape 6"
 #~ msgstr "Mozilla/Netscape 6"
 
@@ -4423,9 +4490,6 @@ msgstr "Sætter standardtemaet"
 #~ msgid "Key_press makes sound"
 #~ msgstr "Udsend lyd ved taste_tryk"
 
-#~ msgid "Keyboard bell _enabled"
-#~ msgstr "Tastaturbip _aktiveret"
-
 #~ msgid "Keyboard bell _off"
 #~ msgstr "Tastaturbip _fra"
 
@@ -4523,9 +4587,6 @@ msgstr "Sætter standardtemaet"
 #~ msgid "Configure window appearance"
 #~ msgstr "Konfigurér vinduesudseendet"
 
-#~ msgid "Configure window properties"
-#~ msgstr "Konfigurér egenskaber for bestemte vinduer"
-
 #~ msgid "Configure window manager configuration properties"
 #~ msgstr "Konfigurér måden vindueshåndteringsindstillinger indstilles på"
 
@@ -4575,9 +4636,6 @@ msgstr "Sætter standardtemaet"
 #~ msgid "Associate keyboard shortcuts with panel actions"
 #~ msgstr "Bind tastaturgenveje til panelhandlinger"
 
-#~ msgid "Keyboard Properties"
-#~ msgstr "Indstillinger for tastatur"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Konfigurér brugen af lyd i Gnome"
 
diff --git a/po/de.po b/po/de.po
index b87865c5e..aa28f1ab7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,14 +14,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-19 17:17+0100\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-19 18:08+0100\n"
 "Last-Translator: Hendrik Brandt <heb@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:1
 msgid "<b>Applications</b>"
@@ -945,13 +945,19 @@ msgid "Options"
 msgstr "Optionen"
 
 #: capplets/display/main.c:580
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Testing the new settings. If you don't respond in %d second the previous "
 "settings will be restored."
+msgid_plural ""
 "Testing the new settings. If you don't respond in %d seconds the previous "
 "settings will be restored."
-msgstr ""
+msgstr[0] ""
+"Die neuen Einstellungen werden getestet. Falls Sie nicht innerhalb von %d "
+"Sekunde reagieren, werden die vorherigen Einstellungen wiederhergestellt.Die "
+"neuen Einstellungen werden getestet. Falls Sie nicht innerhalb von %d "
+"Sekunden reagieren, werden die vorherigen Einstellungen wiederhergestellt."
+msgstr[1] ""
 "Die neuen Einstellungen werden getestet. Falls Sie nicht innerhalb von %d "
 "Sekunde reagieren, werden die vorherigen Einstellungen wiederhergestellt.Die "
 "neuen Einstellungen werden getestet. Falls Sie nicht innerhalb von %d "
@@ -1455,38 +1461,50 @@ msgid "Font may be too large"
 msgstr "Schrift möglicherweise zu groß"
 
 #: capplets/font/main.c:507
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The font selected is %d point large, and may make it difficult to "
 "effectively use the computer.  It is recommended that you select a size "
 "smaller than %d."
+msgid_plural ""
 "The font selected is %d points large, and may make it difficult to "
 "effectively use the computer.  It is recommended that you select a size "
 "smaller than %d."
-msgstr ""
+msgstr[0] ""
 "Die gewählte Schrift ist %d Punkt groß und erschwert möglicherweise die "
 "effiziente Bedienung des Computers. Empfehlenswert wäre eine Schriftgröße "
-"von weniger als %d Punkt."
+"von weniger als %d Punkt.Die gewählte Schrift ist %d Punkt groß und "
+"erschwert möglicherweise die effiziente Bedienung des Computers. "
+"Empfehlenswert wäre eine Schriftgröße von weniger als %d Punkt."
+msgstr[1] ""
 "Die gewählte Schrift ist %d Punkt groß und erschwert möglicherweise die "
 "effiziente Bedienung des Computers. Empfehlenswert wäre eine Schriftgröße "
-"von weniger als %d Punkt."
+"von weniger als %d Punkt.Die gewählte Schrift ist %d Punkt groß und "
+"erschwert möglicherweise die effiziente Bedienung des Computers. "
+"Empfehlenswert wäre eine Schriftgröße von weniger als %d Punkt."
 
 #: capplets/font/main.c:514
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The font selected is %d point large, and may make it difficult to "
 "effectively use the computer.  It is recommended that you select a smaller "
 "sized font."
+msgid_plural ""
 "The font selected is %d points large, and may make it difficult to "
 "effectively use the computer.  It is recommended that you select a smaller "
 "sized font."
-msgstr ""
+msgstr[0] ""
 "Die gewählte Schrift ist %d Punkt groß und erschwert möglicherweise die "
 "effiziente Bedienung des Computers. Eine geringere Schriftgröße wäre "
-"empfehlenswert."
+"empfehlenswert.Die gewählte Schrift ist %d Punkt groß und erschwert "
+"möglicherweise die effiziente Bedienung des Computers. Eine geringere "
+"Schriftgröße wäre empfehlenswert."
+msgstr[1] ""
 "Die gewählte Schrift ist %d Punkt groß und erschwert möglicherweise die "
 "effiziente Bedienung des Computers. Eine geringere Schriftgröße wäre "
-"empfehlenswert."
+"empfehlenswert.Die gewählte Schrift ist %d Punkt groß und erschwert "
+"möglicherweise die effiziente Bedienung des Computers. Eine geringere "
+"Schriftgröße wäre empfehlenswert."
 
 #: capplets/keybindings/eggcellrendererkeys.c:21
 msgid "New accelerator..."
@@ -3096,8 +3114,9 @@ msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Eine Sammlung von Skripten, die jedesmal ausgeführt wenn der Tastaturstatus neu geladen wird. "
-"Nützlich um auf xmodmap basierende Einstellungen neu anzuwenden"
+"Eine Sammlung von Skripten, die jedesmal ausgeführt wenn der Tastaturstatus "
+"neu geladen wird. Nützlich um auf xmodmap basierende Einstellungen neu "
+"anzuwenden"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
 msgid "Default group, assigned on window creation"
@@ -3125,11 +3144,15 @@ msgstr "Tastaturoptionen"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
 msgid "Keyboard settings in gconf will be overridden from the system ASAP"
-msgstr "Tastatureinstellungen in GConf werden vom System so schnell wie möglich überschrieben"
+msgstr ""
+"Tastatureinstellungen in GConf werden vom System so schnell wie möglich "
+"überschrieben"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
 msgid "Save/restore indicators together with layout groups"
-msgstr "Speichern und Wiederherstellen von Indikatoren zusammen mit den Belegungsgruppen"
+msgstr ""
+"Speichern und Wiederherstellen von Indikatoren zusammen mit den "
+"Belegungsgruppen"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
 msgid "Show layout names instead of group names"
@@ -3140,8 +3163,8 @@ msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr ""
-"Name der Tastaturbelegungen anstatt der Gruppennamen anzeigen (verfügbar nur bei XFree-Versionen "
-"die unterschiedliche Tastaturbelegungen unterstützen)"
+"Name der Tastaturbelegungen anstatt der Gruppennamen anzeigen (verfügbar nur "
+"bei XFree-Versionen die unterschiedliche Tastaturbelegungen unterstützen)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
 msgid ""
@@ -3452,4 +3475,3 @@ msgstr "Thema an_wenden"
 #: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
 msgid "Sets the default theme"
 msgstr "Legt das Standardthema fest"
-
diff --git a/po/el.po b/po/el.po
index 50b78dec5..27edc9a2d 100644
--- a/po/el.po
+++ b/po/el.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-20 20:07+0000\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-20 20:22+0000\n"
 "Last-Translator: Simos Xenitellis <simos74@gmx.net>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -587,7 +587,8 @@ msgid "Change set"
 msgstr "Ορισμός αλλαγής"
 
 #: capplets/common/gconf-property-editor.c:184
-msgid "GConf change set containing data to be forwarded to the gconf client on apply"
+msgid ""
+"GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr ""
 "Ομάδα αλλαγών GConf που περιέχει δεδομένα και θα προωθηθεί στον πελάτη gconf "
 "κατα την εφαρμογή"
@@ -597,7 +598,8 @@ msgid "Conversion to widget callback"
 msgstr "Μετατροπή σε επανάκληση γραφικού συστατικού"
 
 #: capplets/common/gconf-property-editor.c:190
-msgid "Callback to be issued when data are to be converted from GConf to the widget"
+msgid ""
+"Callback to be issued when data are to be converted from GConf to the widget"
 msgstr ""
 "Επανάκληση που θα εκδοθεί όταν μετατραπούν δεδομένα από το  GConf στο "
 "γραφικό συστατικό"
@@ -607,7 +609,8 @@ msgid "Conversion from widget callback"
 msgstr "Μετατροπή από την επανάκληση γραφικού συστατικού"
 
 #: capplets/common/gconf-property-editor.c:196
-msgid "Callback to be issued when data are to be converted to GConf from the widget"
+msgid ""
+"Callback to be issued when data are to be converted to GConf from the widget"
 msgstr ""
 "Επανάκληση που θα εκδοθεί  όταν μετατραπούν δεδομένα από το γραφικό "
 "συστατικό στο  GConf"
@@ -1039,7 +1042,8 @@ msgstr "Τύποι αρχείων και προγράμματα"
 
 #: capplets/file-types/file-types.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each type of file"
-msgstr "Καθορισμός των προγραμμάτων που ανοίγουν ή εμφανίζουν κάθε είδος αρχείων"
+msgstr ""
+"Καθορισμός των προγραμμάτων που ανοίγουν ή εμφανίζουν κάθε είδος αρχείων"
 
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
@@ -1568,7 +1572,8 @@ msgstr ""
 #: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
-msgstr "Σφάλμα κατά τη ρύθμιση νέας συντόμευσης στη βάση δεδομένων ρυθμίσεων: %s\n"
+msgstr ""
+"Σφάλμα κατά τη ρύθμιση νέας συντόμευσης στη βάση δεδομένων ρυθμίσεων: %s\n"
 
 #: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
@@ -1615,7 +1620,8 @@ msgstr "_Προσβασιμότητα"
 #: capplets/keyboard/gnome-keyboard-properties.c:222
 #: capplets/sound/sound-properties-capplet.c:240
 #: capplets/sound/sound-properties-capplet.c:242
-msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
+msgid ""
+"Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr ""
 "Εφαρμογή μόνο των ρυθμίσεων και έξοδος (συμβατότητα μόνο; now handled by "
 "daemon)"
@@ -2147,7 +2153,8 @@ msgstr "Προσαρμοσμένο θέμα"
 
 #: capplets/theme-switcher/gnome-theme-manager.c:677
 msgid "You can save this theme by pressing the Save Theme button."
-msgstr "Μπορείτε να αποθηκεύσετε το θέμα πατώντας το κουμπί Αποθήκευση Θέματος."
+msgstr ""
+"Μπορείτε να αποθηκεύσετε το θέμα πατώντας το κουμπί Αποθήκευση Θέματος."
 
 #: capplets/theme-switcher/gnome-theme-manager.c:1455
 msgid ""
@@ -2194,7 +2201,8 @@ msgstr "_Τοποθεσία:"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 msgid "<span size=\"larger\" weight=\"bold\">Save Theme to Disk</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">Αποθήκευση Θέματος στο Δίσκο</span>"
+msgstr ""
+"<span size=\"larger\" weight=\"bold\">Αποθήκευση Θέματος στο Δίσκο</span>"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
 msgid "Apply _Background"
@@ -2214,7 +2222,8 @@ msgstr "Εικονίδια"
 
 #: capplets/theme-switcher/theme-properties.glade.h:7
 msgid "New themes can also be installed by dragging them into the window."
-msgstr "Νέα θέματα μπορούν να εγκατασταθούν και με το σύρσιμο τους πάνω στο παράθυρο."
+msgstr ""
+"Νέα θέματα μπορούν να εγκατασταθούν και με το σύρσιμο τους πάνω στο παράθυρο."
 
 # For lack of a better term...?  Anaklimakwsh ???
 #: capplets/theme-switcher/theme-properties.glade.h:8
@@ -2243,7 +2252,8 @@ msgstr "Λεπ_τομέρειες θέματος"
 
 #: capplets/theme-switcher/theme-properties.glade.h:14
 msgid "This theme does not suggest any particular font or background."
-msgstr "Αυτό το θέμα δεν προτείνει κανένα ιδιαίτερο παρασκήνιο ή γραμματοσειρά."
+msgstr ""
+"Αυτό το θέμα δεν προτείνει κανένα ιδιαίτερο παρασκήνιο ή γραμματοσειρά."
 
 #: capplets/theme-switcher/theme-properties.glade.h:15
 msgid "This theme suggests a background:"
@@ -2843,7 +2853,8 @@ msgstr "_Αναπαραγωγή"
 #: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
 msgid "Window manager \"%s\" has not registered a configuration tool\n"
-msgstr "Ο διαχειριστής παραθύρων \"%s\"  δεν έχει εγγράψει ένα εργαλείο ρυθμίσεων\n"
+msgstr ""
+"Ο διαχειριστής παραθύρων \"%s\"  δεν έχει εγγράψει ένα εργαλείο ρυθμίσεων\n"
 
 #: libwindow-settings/metacity-window-manager.c:378
 msgid "Maximize"
@@ -2854,7 +2865,8 @@ msgid "Roll up"
 msgstr "Δίπλωση πάνω"
 
 #: schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:1
-msgid "If true, the mime handlers for text/plain and text/* will be kept in sync"
+msgid ""
+"If true, the mime handlers for text/plain and text/* will be kept in sync"
 msgstr ""
 "Αν true, οι χειριστές mime για text/plain και text/* θα διατηρούνται "
 "συγχρονισμένοι"
@@ -3025,7 +3037,8 @@ msgstr "Συντόμευση αύξησης έντασης."
 
 #: schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:1
 msgid "Display a dialog when there are errors running XScreenSaver"
-msgstr "Προβολή διαλόγου όταν υπάρχουν σφάλματα κατά την εκτέλεση του XScreenSaver"
+msgstr ""
+"Προβολή διαλόγου όταν υπάρχουν σφάλματα κατά την εκτέλεση του XScreenSaver"
 
 #: schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:2
 msgid "Run XScreenSaver at login"
@@ -3056,7 +3069,8 @@ msgid "RGBA Order"
 msgstr "Σειρά RGBA"
 
 #: schemas/desktop_gnome_font_rendering.schemas.in.h:5
-msgid "Resolution used for converting font sizes to pixel sizes, in dots per inch"
+msgid ""
+"Resolution used for converting font sizes to pixel sizes, in dots per inch"
 msgstr ""
 "Ανάλυση που χρησιμοποείται για την μετατροπή μεγέθους γραμματοσειράς σε "
 "μέγεθος εικονοστοιχείων, σε κουκίδες ανά ίντσα"
@@ -3127,8 +3141,8 @@ msgstr "Επιλογές πληκτρολογίου"
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
 msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
-"Οι ρυθμίσεις στο gconf θα αντικατασταθούν από το σύστημα όσον το δυνατόν "
-"πιο σύντομα."
+"Οι ρυθμίσεις στο gconf θα αντικατασταθούν από το σύστημα όσον το δυνατόν πιο "
+"σύντομα."
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
 msgid "Save/restore indicators together with layout groups"
@@ -3149,8 +3163,8 @@ msgid ""
 "Very soon, keyboard settings in gconf will be overridden (from the system "
 "configuration)"
 msgstr ""
-"Πολύ σύντομα, οι ρυθμίσεις πληκτρολογίου στο gconf θα αντικατασταθούν (από τη ρύθμιση "
-"συστήματος)"
+"Πολύ σύντομα, οι ρυθμίσεις πληκτρολογίου στο gconf θα αντικατασταθούν (από "
+"τη ρύθμιση συστήματος)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
 msgid "keyboard layout"
@@ -3270,7 +3284,8 @@ msgstr ""
 "μικρογραφία."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:5
-msgid "Set this key to the command used to create thumbnails for OpenType fonts."
+msgid ""
+"Set this key to the command used to create thumbnails for OpenType fonts."
 msgstr ""
 "Ορισμός αυτού του κλειδιού για την εντολή που χρησιμοποιείται για την "
 "δημιουργία μικρογραφίας για γραμματοσειρές OpenType."
@@ -3282,7 +3297,8 @@ msgstr ""
 "δημιουργία μικρογραφίας για γραμματοσειρές PCF."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:7
-msgid "Set this key to the command used to create thumbnails for TrueType fonts."
+msgid ""
+"Set this key to the command used to create thumbnails for TrueType fonts."
 msgstr ""
 "Ορισμός αυτού του κλειδιού για την εντολή που χρησιμοποιείται για την "
 "δημιουργία μικρογραφίας για γραμματοσειρές TrueType."
@@ -3327,7 +3343,8 @@ msgstr "Αν θα εμφανίζονται σε μικρογραφία γραμ�
 
 #: vfs-methods/fontilus/font-view.c:125
 msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Και ο νους του σαν τον αχνό του λιβανιού στης Παναγιάς την όψη. 0123456789"
+msgstr ""
+"Και ο νους του σαν τον αχνό του λιβανιού στης Παναγιάς την όψη. 0123456789"
 
 #: vfs-methods/fontilus/font-view.c:285
 msgid "Name:"
@@ -3372,7 +3389,8 @@ msgstr " "
 
 #: vfs-methods/themus/apply-font.glade.h:2
 msgid "<span weight=\"bold\" size=\"larger\">Apply new font?</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Εφαρμογή νέας γραμματοσειράς;</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Εφαρμογή νέας γραμματοσειράς;</span>"
 
 #: vfs-methods/themus/apply-font.glade.h:3
 msgid "Do _not apply font"
@@ -3408,14 +3426,16 @@ msgstr "Θέμα εικονιδίου"
 
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
-msgstr "Αν ορισθεί σε true, τότε θα γίνεται προεπισκόπηση των εγκατεστημένων θεμάτων."
+msgstr ""
+"Αν ορισθεί σε true, τότε θα γίνεται προεπισκόπηση των εγκατεστημένων θεμάτων."
 
 #: vfs-methods/themus/themus.schemas.in.h:2
 msgid "If set to true, then themes will be thumbnailed."
 msgstr "Αν ορισθεί σε true, τότε θα γίνεται προεπισκόπηση των θεμάτων."
 
 #: vfs-methods/themus/themus.schemas.in.h:3
-msgid "Set this key to the command used to create thumbnails for installed themes."
+msgid ""
+"Set this key to the command used to create thumbnails for installed themes."
 msgstr ""
 "Ορισμός αυτού του κλειδιού στην εντολή που χρησιμοποιείται για την "
 "δημιουργία προεπισκόπησης για τα εγκατεστημένα θέματα."
@@ -3587,4 +3607,3 @@ msgstr "Καθορισμός εξορισμού θέματος"
 
 #~ msgid "URI currently displayed"
 #~ msgstr "URI που εμφανίζεται τώρα"
-
diff --git a/po/en_CA.po b/po/en_CA.po
index 227735615..a0c1254ad 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-19 05:33-0500\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-19 19:59-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: English/Canada <adamw@FreeBSD.org>\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index f454184ae..b9c5afd7a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-centre CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-13 21:35+0000\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-13 21:36+0100\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English/GB <en@li.org>\n"
@@ -26,8 +26,12 @@ msgid "<b>Support</b>"
 msgstr "<b>Support</b>"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:3
-msgid "<small><i><b>Note:</b> Changes to this setting will not take effect until you next log in.</i></small>"
-msgstr "<small><i><b>Note:</b> Changes to this setting will not take effect until you next log in.</i></small>"
+msgid ""
+"<small><i><b>Note:</b> Changes to this setting will not take effect until "
+"you next log in.</i></small>"
+msgstr ""
+"<small><i><b>Note:</b> Changes to this setting will not take effect until "
+"you next log in.</i></small>"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:4
 msgid "Assistive Technology Preferences"
@@ -66,16 +70,34 @@ msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Enable support for GNOME assistive technologies at login"
 
 #: capplets/accessibility/at-properties/main.c:60
-msgid "No Assistive Technology is available on your system.  The 'gok' package must be installed in order to get on-screen keyboard support, and the 'gnopernicus' package must be installed for screenreading and magnifying capabilities."
-msgstr "No Assistive Technology is available on your system.  The 'gok' package must be installed in order to get on-screen keyboard support, and the 'gnopernicus' package must be installed for screenreading and magnifying capabilities."
+msgid ""
+"No Assistive Technology is available on your system.  The 'gok' package must "
+"be installed in order to get on-screen keyboard support, and the "
+"'gnopernicus' package must be installed for screenreading and magnifying "
+"capabilities."
+msgstr ""
+"No Assistive Technology is available on your system.  The 'gok' package must "
+"be installed in order to get on-screen keyboard support, and the "
+"'gnopernicus' package must be installed for screenreading and magnifying "
+"capabilities."
 
 #: capplets/accessibility/at-properties/main.c:62
-msgid "Not all available assistive technologies are installed on your system.  The 'gok' package must be installed in order to get on-screen keyboard support."
-msgstr "Not all available assistive technologies are installed on your system.  The 'gok' package must be installed in order to get on-screen keyboard support."
+msgid ""
+"Not all available assistive technologies are installed on your system.  The "
+"'gok' package must be installed in order to get on-screen keyboard support."
+msgstr ""
+"Not all available assistive technologies are installed on your system.  The "
+"'gok' package must be installed in order to get on-screen keyboard support."
 
 #: capplets/accessibility/at-properties/main.c:64
-msgid "Not all available assistive technologies are installed on your system.  The 'gnopernicus' package must be installed for screenreading and magnifying capabilities."
-msgstr "Not all available assistive technologies are installed on your system.  The 'gnopernicus' package must be installed for screenreading and magnifying capabilities."
+msgid ""
+"Not all available assistive technologies are installed on your system.  The "
+"'gnopernicus' package must be installed for screenreading and magnifying "
+"capabilities."
+msgstr ""
+"Not all available assistive technologies are installed on your system.  The "
+"'gnopernicus' package must be installed for screenreading and magnifying "
+"capabilities."
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.c:241
 #, c-format
@@ -107,8 +129,12 @@ msgid "Set your keyboard accessibility preferences"
 msgstr "Set your keyboard accessibility preferences"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c:59
-msgid "This system does not seem to have the XKB extension.  The keyboard accessibility features will not operate without it."
-msgstr "This system does not seem to have the XKB extension.  The keyboard accessibility features will not operate without it."
+msgid ""
+"This system does not seem to have the XKB extension.  The keyboard "
+"accessibility features will not operate without it."
+msgstr ""
+"This system does not seem to have the XKB extension.  The keyboard "
+"accessibility features will not operate without it."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
 #: capplets/font/font-properties.glade.h:1
@@ -205,8 +231,12 @@ msgid "I_gnore duplicate keypresses within:"
 msgstr "I_gnore duplicate keypresses within:"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
-msgid "Ignore all subsequent presses of the SAME key if they happen within a user selectable period of time."
-msgstr "Ignore all subsequent presses of the SAME key if they happen within a user selectable period of time."
+msgid ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
+msgstr ""
+"Ignore all subsequent presses of the SAME key if they happen within a user "
+"selectable period of time."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
 msgid "Keyboard Accessibility Preferences (AccessX)"
@@ -225,12 +255,20 @@ msgid "Mouse _Preferences..."
 msgstr "Mouse _Preferences..."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "Only accept keys after they have been pressed and held for a user adjustable amount of time."
-msgstr "Only accept keys after they have been pressed and held for a user adjustable amount of time."
+msgid ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
+msgstr ""
+"Only accept keys after they have been pressed and held for a user adjustable "
+"amount of time."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid "Perform multiple simultaneous key press operations by pressing modifier keys in sequence."
-msgstr "Perform multiple simultaneous key press operations by pressing modifier keys in sequence."
+msgid ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
+msgstr ""
+"Perform multiple simultaneous key press operations by pressing modifier keys "
+"in sequence."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:28
@@ -392,18 +430,23 @@ msgstr[1] "pixels"
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
-"Without the GNOME settings manager running, some preferences may not take effect. This could indicate a problem with Bonobo, or a non-GNOME (e.g. KDE) settings manager may already be active and conflicting with the GNOME settings manager."
+"Without the GNOME settings manager running, some preferences may not take "
+"effect. This could indicate a problem with Bonobo, or a non-GNOME (e.g. KDE) "
+"settings manager may already be active and conflicting with the GNOME "
+"settings manager."
 msgstr ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
-"Without the GNOME settings manager running, some preferences may not take effect. This could indicate a problem with Bonobo, or a non-GNOME (e.g. KDE) settings manager may already be active and conflicting with the GNOME settings manager."
+"Without the GNOME settings manager running, some preferences may not take "
+"effect. This could indicate a problem with Bonobo, or a non-GNOME (e.g. KDE) "
+"settings manager may already be active and conflicting with the GNOME "
+"settings manager."
 
 #: capplets/common/capplet-stock-icons.c:94
 #, c-format
 msgid "Unable to load capplet stock icon '%s'\n"
 msgstr "Unable to load capplet stock icon '%s'\n"
 
-#: capplets/common/capplet-util.c:239
-#: capplets/common/capplet-util.c:241
+#: capplets/common/capplet-util.c:239 capplets/common/capplet-util.c:241
 msgid "Just apply settings and quit"
 msgstr "Just apply settings and quit"
 
@@ -506,24 +549,30 @@ msgid "Change set"
 msgstr "Change set"
 
 #: capplets/common/gconf-property-editor.c:184
-msgid "GConf change set containing data to be forwarded to the gconf client on apply"
-msgstr "GConf change set containing data to be forwarded to the gconf client on apply"
+msgid ""
+"GConf change set containing data to be forwarded to the gconf client on apply"
+msgstr ""
+"GConf change set containing data to be forwarded to the gconf client on apply"
 
 #: capplets/common/gconf-property-editor.c:189
 msgid "Conversion to widget callback"
 msgstr "Conversion to widget callback"
 
 #: capplets/common/gconf-property-editor.c:190
-msgid "Callback to be issued when data are to be converted from GConf to the widget"
-msgstr "Callback to be issued when data are to be converted from GConf to the widget"
+msgid ""
+"Callback to be issued when data are to be converted from GConf to the widget"
+msgstr ""
+"Callback to be issued when data are to be converted from GConf to the widget"
 
 #: capplets/common/gconf-property-editor.c:195
 msgid "Conversion from widget callback"
 msgstr "Conversion from widget callback"
 
 #: capplets/common/gconf-property-editor.c:196
-msgid "Callback to be issued when data are to be converted to GConf from the widget"
-msgstr "Callback to be issued when data are to be converted to GConf from the widget"
+msgid ""
+"Callback to be issued when data are to be converted to GConf from the widget"
+msgstr ""
+"Callback to be issued when data are to be converted to GConf from the widget"
 
 #: capplets/common/gconf-property-editor.c:201
 msgid "UI Control"
@@ -554,11 +603,13 @@ msgstr "Callback to be issued when property editor object data is to be freed"
 msgid ""
 "Couldn't find the file '%s'.\n"
 "\n"
-"Please make sure it exists and try again, or choose a different background picture."
+"Please make sure it exists and try again, or choose a different background "
+"picture."
 msgstr ""
 "Couldn't find the file '%s'.\n"
 "\n"
-"Please make sure it exists and try again, or choose a different background picture."
+"Please make sure it exists and try again, or choose a different background "
+"picture."
 
 #: capplets/common/gconf-property-editor.c:1551
 #, c-format
@@ -667,8 +718,12 @@ msgid "Run in a t_erminal"
 msgstr "Run in a t_erminal"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:21
-msgid "Select the window manager you want.  You will need to hit apply, wave the magic wand, and do a magic dance for it to work."
-msgstr "Select the window manager you want.  You will need to hit apply, wave the magic wand, and do a magic dance for it to work."
+msgid ""
+"Select the window manager you want.  You will need to hit apply, wave the "
+"magic wand, and do a magic dance for it to work."
+msgstr ""
+"Select the window manager you want.  You will need to hit apply, wave the "
+"magic wand, and do a magic dance for it to work."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
@@ -761,7 +816,9 @@ msgid "Links Text Browser"
 msgstr "Links Text Browser"
 
 #. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
 #. * in the list shown to the user
+#.
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:36
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:37
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:38
@@ -862,10 +919,18 @@ msgstr "Options"
 
 #: capplets/display/main.c:580
 #, c-format
-msgid "Testing the new settings. If you don't respond in %d second the previous settings will be restored."
-msgid_plural "Testing the new settings. If you don't respond in %d seconds the previous settings will be restored."
-msgstr[0] "Testing the new settings. If you don't respond in %d second the previous settings will be restored."
-msgstr[1] "Testing the new settings. If you don't respond in %d seconds the previous settings will be restored."
+msgid ""
+"Testing the new settings. If you don't respond in %d second the previous "
+"settings will be restored."
+msgid_plural ""
+"Testing the new settings. If you don't respond in %d seconds the previous "
+"settings will be restored."
+msgstr[0] ""
+"Testing the new settings. If you don't respond in %d second the previous "
+"settings will be restored."
+msgstr[1] ""
+"Testing the new settings. If you don't respond in %d seconds the previous "
+"settings will be restored."
 
 #: capplets/display/main.c:626
 msgid "Keep Resolution"
@@ -884,12 +949,20 @@ msgid "_Keep resolution"
 msgstr "_Keep resolution"
 
 #: capplets/display/main.c:806
-msgid "The X Server does not support the XRandR extension.  Runtime resolution changes to the display size are not available."
-msgstr "The X Server does not support the XRandR extension.  Runtime resolution changes to the display size are not available."
+msgid ""
+"The X Server does not support the XRandR extension.  Runtime resolution "
+"changes to the display size are not available."
+msgstr ""
+"The X Server does not support the XRandR extension.  Runtime resolution "
+"changes to the display size are not available."
 
 #: capplets/display/main.c:814
-msgid "The version of the XRandR extension is incompatible with this program. Runtime changes to the display size are not available."
-msgstr "The version of the XRandR extension is incompatible with this program. Runtime changes to the display size are not available."
+msgid ""
+"The version of the XRandR extension is incompatible with this program. "
+"Runtime changes to the display size are not available."
+msgstr ""
+"The version of the XRandR extension is incompatible with this program. "
+"Runtime changes to the display size are not available."
 
 #: capplets/file-types/file-types-capplet.c:158
 msgid "Are you sure you want to permanently delete this entry?"
@@ -1090,8 +1163,12 @@ msgstr "None"
 
 #: capplets/file-types/mime-edit-dialog.c:850
 #: capplets/file-types/mime-edit-dialog.c:864
-msgid "Please enter a valid MIME type.  It should be of the form class/type and may not contain any spaces."
-msgstr "Please enter a valid MIME type.  It should be of the form class/type and may not contain any spaces."
+msgid ""
+"Please enter a valid MIME type.  It should be of the form class/type and may "
+"not contain any spaces."
+msgstr ""
+"Please enter a valid MIME type.  It should be of the form class/type and may "
+"not contain any spaces."
 
 #: capplets/file-types/mime-edit-dialog.c:857
 msgid "A MIME type with that name already exists, overwrite?"
@@ -1160,8 +1237,12 @@ msgid "Please enter a protocol name."
 msgstr "Please enter a protocol name."
 
 #: capplets/file-types/service-edit-dialog.c:509
-msgid "Invalid protocol name. Please enter a protocol name without any spaces or punctuation."
-msgstr "Invalid protocol name. Please enter a protocol name without any spaces or punctuation."
+msgid ""
+"Invalid protocol name. Please enter a protocol name without any spaces or "
+"punctuation."
+msgstr ""
+"Invalid protocol name. Please enter a protocol name without any spaces or "
+"punctuation."
 
 #: capplets/file-types/service-edit-dialog.c:523
 msgid "There is already a protocol by that name."
@@ -1336,24 +1417,47 @@ msgstr "_Window title font:"
 msgid "dots per inch"
 msgstr "dots per inch"
 
-#: capplets/font/main.c:506
-#: capplets/font/main.c:513
+#: capplets/font/main.c:506 capplets/font/main.c:513
 msgid "Font may be too large"
 msgstr "Font may be too large"
 
 #: capplets/font/main.c:507
 #, c-format
-msgid "The font selected is %d point large, and may make it difficult to effectively use the computer.  It is recommended that you select a size smaller than %d."
-msgid_plural "The font selected is %d points large, and may make it difficult to effectively use the computer.  It is recommended that you select a size smaller than %d."
-msgstr[0] "The font selected is %d point large, and may make it difficult to effectively use the computer.  It is recommended that you select a size smaller than %d."
-msgstr[1] "The font selected is %d points large, and may make it difficult to effectively use the computer.  It is recommended that you select a size smaller than %d."
+msgid ""
+"The font selected is %d point large, and may make it difficult to "
+"effectively use the computer.  It is recommended that you select a size "
+"smaller than %d."
+msgid_plural ""
+"The font selected is %d points large, and may make it difficult to "
+"effectively use the computer.  It is recommended that you select a size "
+"smaller than %d."
+msgstr[0] ""
+"The font selected is %d point large, and may make it difficult to "
+"effectively use the computer.  It is recommended that you select a size "
+"smaller than %d."
+msgstr[1] ""
+"The font selected is %d points large, and may make it difficult to "
+"effectively use the computer.  It is recommended that you select a size "
+"smaller than %d."
 
 #: capplets/font/main.c:514
 #, c-format
-msgid "The font selected is %d point large, and may make it difficult to effectively use the computer.  It is recommended that you select a smaller sized font."
-msgid_plural "The font selected is %d points large, and may make it difficult to effectively use the computer.  It is recommended that you select a smaller sized font."
-msgstr[0] "The font selected is %d point large, and may make it difficult to effectively use the computer.  It is recommended that you select a smaller sized font."
-msgstr[1] "The font selected is %d points large, and may make it difficult to effectively use the computer.  It is recommended that you select a smaller sized font."
+msgid ""
+"The font selected is %d point large, and may make it difficult to "
+"effectively use the computer.  It is recommended that you select a smaller "
+"sized font."
+msgid_plural ""
+"The font selected is %d points large, and may make it difficult to "
+"effectively use the computer.  It is recommended that you select a smaller "
+"sized font."
+msgstr[0] ""
+"The font selected is %d point large, and may make it difficult to "
+"effectively use the computer.  It is recommended that you select a smaller "
+"sized font."
+msgstr[1] ""
+"The font selected is %d points large, and may make it difficult to "
+"effectively use the computer.  It is recommended that you select a smaller "
+"sized font."
 
 #: capplets/keybindings/eggcellrendererkeys.c:21
 msgid "New accelerator..."
@@ -1384,8 +1488,7 @@ msgstr "The type of accelerator."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
 #: capplets/keybindings/gnome-keybinding-properties.c:197
-#: libbackground/applier.c:757
-#: typing-break/drwright.c:473
+#: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Disabled"
 
@@ -1439,8 +1542,12 @@ msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:2
-msgid "To edit a shortcut key, click on the corresponding row and type a new accelerator, or press backspace to clear."
-msgstr "To edit a shortcut key, click on the corresponding row and type a new accelerator, or press backspace to clear."
+msgid ""
+"To edit a shortcut key, click on the corresponding row and type a new "
+"accelerator, or press backspace to clear."
+msgstr ""
+"To edit a shortcut key, click on the corresponding row and type a new "
+"accelerator, or press backspace to clear."
 
 #: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
@@ -1459,8 +1566,10 @@ msgstr "_Accessibility"
 #: capplets/keyboard/gnome-keyboard-properties.c:222
 #: capplets/sound/sound-properties-capplet.c:240
 #: capplets/sound/sound-properties-capplet.c:242
-msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
-msgstr "Just apply settings and quit (compatibility only; now handled by daemon)"
+msgid ""
+"Just apply settings and quit (compatibility only; now handled by daemon)"
+msgstr ""
+"Just apply settings and quit (compatibility only; now handled by daemon)"
 
 #: capplets/keyboard/gnome-keyboard-properties.c:226
 msgid "Start the page with the typing break settings showing"
@@ -1551,8 +1660,12 @@ msgid "Layouts"
 msgstr "Layouts"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:25
-msgid "Lock screen after a certain duration to help prevent repetitive keyboard use injuries"
-msgstr "Lock screen after a certain duration to help prevent repetitive keyboard use injuries"
+msgid ""
+"Lock screen after a certain duration to help prevent repetitive keyboard use "
+"injuries"
+msgstr ""
+"Lock screen after a certain duration to help prevent repetitive keyboard use "
+"injuries"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:26
 msgid "Microsoft Natural Keyboard"
@@ -1716,8 +1829,12 @@ msgid "<b>Speed</b>"
 msgstr "<b>Speed</b>"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:7
-msgid "<i><small><b>Note:</b> Changes to this setting will not take effect until you next log in.</small></i>"
-msgstr "<i><small><b>Note:</b> Changes to this setting will not take effect until you next log in.</small></i>"
+msgid ""
+"<i><small><b>Note:</b> Changes to this setting will not take effect until "
+"you next log in.</small></i>"
+msgstr ""
+"<i><small><b>Note:</b> Changes to this setting will not take effect until "
+"you next log in.</small></i>"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:8
 msgid "<i>Fast</i>"
@@ -1804,7 +1921,8 @@ msgid "Network Proxy"
 msgstr "Network Proxy"
 
 #: capplets/network/gnome-network-preferences.desktop.in.in.h:2
-msgid "Network proxy preferences"
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Network proxy preferences"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1936,8 +2054,14 @@ msgid "_Visual feedback:"
 msgstr "_Visual feedback:"
 
 #: capplets/theme-switcher/gnome-theme-details.c:372
-msgid "No themes could be found on your system.  This probably means that your \"Theme Preferences\" dialog was improperly installed, or you haven't installed the \"gnome-themes\" package."
-msgstr "No themes could be found on your system.  This probably means that your \"Theme Preferences\" dialogue was improperly installed, or you haven't installed the \"gnome-themes\" package."
+msgid ""
+"No themes could be found on your system.  This probably means that your "
+"\"Theme Preferences\" dialog was improperly installed, or you haven't "
+"installed the \"gnome-themes\" package."
+msgstr ""
+"No themes could be found on your system.  This probably means that your "
+"\"Theme Preferences\" dialogue was improperly installed, or you haven't "
+"installed the \"gnome-themes\" package."
 
 #: capplets/theme-switcher/gnome-theme-installer.c:104
 msgid "This theme is not in a supported format."
@@ -1962,8 +2086,12 @@ msgstr ""
 
 #: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
-msgid "%s is the path where the theme files will be installed. This can not be selected as the source location"
-msgstr "%s is the path where the theme files will be installed. This can not be selected as the source location"
+msgid ""
+"%s is the path where the theme files will be installed. This can not be "
+"selected as the source location"
+msgstr ""
+"%s is the path where the theme files will be installed. This can not be "
+"selected as the source location"
 
 #: capplets/theme-switcher/gnome-theme-manager.c:677
 msgid "Custom theme"
@@ -1974,8 +2102,14 @@ msgid "You can save this theme by pressing the Save Theme button."
 msgstr "You can save this theme by pressing the Save Theme button."
 
 #: capplets/theme-switcher/gnome-theme-manager.c:1455
-msgid "The default theme schemas could not be found on your system.  This means that you probably don't have metacity installed, or that your gconf is configured incorrectly."
-msgstr "The default theme schemas could not be found on your system.  This means that you probably don't have metacity installed, or that your gconf is configured incorrectly."
+msgid ""
+"The default theme schemas could not be found on your system.  This means "
+"that you probably don't have metacity installed, or that your gconf is "
+"configured incorrectly."
+msgstr ""
+"The default theme schemas could not be found on your system.  This means "
+"that you probably don't have metacity installed, or that your gconf is "
+"configured incorrectly."
 
 #: capplets/theme-switcher/gnome-theme-save.c:72
 msgid "Theme name must be present"
@@ -2278,7 +2412,8 @@ msgid "_Select windows when the mouse moves over them"
 msgstr "_Select windows when the mouse moves over them"
 
 #: capplets/windows/window-properties.desktop.in.in.h:1
-msgid "Window Properties"
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Window Properties"
 
 #: capplets/windows/window-properties.desktop.in.in.h:2
@@ -2344,8 +2479,12 @@ msgid "Slow Keys Alert"
 msgstr "Slow Keys Alert"
 
 #: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:412
-msgid "You just held down the Shift key for 8 seconds.  This is the shortcut for the Slow Keys feature, which affects the way your keyboard works."
-msgstr "You just held down the Shift key for 8 seconds.  This is the shortcut for the Slow Keys feature, which affects the way your keyboard works."
+msgid ""
+"You just held down the Shift key for 8 seconds.  This is the shortcut for "
+"the Slow Keys feature, which affects the way your keyboard works."
+msgstr ""
+"You just held down the Shift key for 8 seconds.  This is the shortcut for "
+"the Slow Keys feature, which affects the way your keyboard works."
 
 #: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:413
 msgid "Do you want to activate Slow Keys?"
@@ -2360,12 +2499,22 @@ msgid "Sticky Keys Alert"
 msgstr "Sticky Keys Alert"
 
 #: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:426
-msgid "You just pressed the Shift key 5 times in a row.  This is the shortcut for the Sticky Keys feature, which affects the way your keyboard works."
-msgstr "You just pressed the Shift key 5 times in a row.  This is the shortcut for the Sticky Keys feature, which affects the way your keyboard works."
+msgid ""
+"You just pressed the Shift key 5 times in a row.  This is the shortcut for "
+"the Sticky Keys feature, which affects the way your keyboard works."
+msgstr ""
+"You just pressed the Shift key 5 times in a row.  This is the shortcut for "
+"the Sticky Keys feature, which affects the way your keyboard works."
 
 #: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:427
-msgid "You just pressed two keys at once, or pressed the Shift key 5 times in a row.  This turns off the Sticky Keys feature, which affects the way your keyboard works."
-msgstr "You just pressed two keys at once, or pressed the Shift key 5 times in a row.  This turns off the Sticky Keys feature, which affects the way your keyboard works."
+msgid ""
+"You just pressed two keys at once, or pressed the Shift key 5 times in a "
+"row.  This turns off the Sticky Keys feature, which affects the way your "
+"keyboard works."
+msgstr ""
+"You just pressed two keys at once, or pressed the Shift key 5 times in a "
+"row.  This turns off the Sticky Keys feature, which affects the way your "
+"keyboard works."
 
 #: gnome-settings-daemon/gnome-settings-accessibility-keyboard.c:428
 msgid "Do you want to activate Sticky Keys?"
@@ -2452,15 +2601,20 @@ msgstr ""
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
-"Try using simpler configuration or taking more fresh version of XFree software."
+"Try using simpler configuration or taking more fresh version of XFree "
+"software."
 msgstr ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
 "Try using simpler configuration or a newer version of the XFree software."
 
 #: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
-msgid "The X system keyboard settings differ from your current GNOME keyboard settings.  Which set would you like to use?"
-msgstr "The X system keyboard settings differ from your current GNOME keyboard settings.  Which set would you like to use?"
+msgid ""
+"The X system keyboard settings differ from your current GNOME keyboard "
+"settings.  Which set would you like to use?"
+msgstr ""
+"The X system keyboard settings differ from your current GNOME keyboard "
+"settings.  Which set would you like to use?"
 
 #: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
@@ -2472,8 +2626,14 @@ msgstr "Use GNOME settings"
 
 #: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
-msgid "You have a keyboard remapping file (%s) in your home directory whose contents will now be ignored. You can use the keyboard preferences to restore them."
-msgstr "You have a keyboard remapping file (%s) in your home directory whose contents will now be ignored. You can use the keyboard preferences to restore them."
+msgid ""
+"You have a keyboard remapping file (%s) in your home directory whose "
+"contents will now be ignored. You can use the keyboard preferences to "
+"restore them."
+msgstr ""
+"You have a keyboard remapping file (%s) in your home directory whose "
+"contents will now be ignored. You can use the keyboard preferences to "
+"restore them."
 
 #: gnome-settings-daemon/gnome-settings-multimedia-keys.c:114
 #, c-format
@@ -2548,8 +2708,12 @@ msgid "Type"
 msgstr "Type"
 
 #: libbackground/applier.c:257
-msgid "Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW for preview"
-msgstr "Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW for preview"
+msgid ""
+"Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW "
+"for preview"
+msgstr ""
+"Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW "
+"for preview"
 
 #: libbackground/applier.c:264
 msgid "Preview Width"
@@ -2575,8 +2739,7 @@ msgstr "Screen"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Screen on which BGApplier is to draw"
 
-#: libsounds/sound-view.c:122
-#: libsounds/sound-view.c:147
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "The sound file for this event does not exist."
 
@@ -2633,8 +2796,10 @@ msgid "Roll up"
 msgstr "Roll up"
 
 #: schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:1
-msgid "If true, the mime handlers for text/plain and text/* will be kept in sync"
-msgstr "If true, the mime handlers for text/plain and text/* will be kept in sync"
+msgid ""
+"If true, the mime handlers for text/plain and text/* will be kept in sync"
+msgstr ""
+"If true, the mime handlers for text/plain and text/* will be kept in sync"
 
 #: schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:2
 msgid "Sync text/plain and text/* handlers"
@@ -2833,41 +2998,113 @@ msgid "RGBA Order"
 msgstr "RGBA Order"
 
 #: schemas/desktop_gnome_font_rendering.schemas.in.h:5
-msgid "Resolution used for converting font sizes to pixel sizes, in dots per inch"
-msgstr "Resolution used for converting font sizes to pixel sizes, in dots per inch"
+msgid ""
+"Resolution used for converting font sizes to pixel sizes, in dots per inch"
+msgstr ""
+"Resolution used for converting font sizes to pixel sizes, in dots per inch"
 
 #: schemas/desktop_gnome_font_rendering.schemas.in.h:6
-msgid "The order of subpixel elements on an LCD screen; only used when antialiasing is set to \"rgba\". Possible values are: \"rgb\" - red on left, most common. \"bgr\" - blue on left. \"vrgb\" - red on top. \"vbgr\" - red on bottom."
-msgstr "The order of subpixel elements on an LCD screen; only used when antialiasing is set to \"rgba\". Possible values are: \"rgb\" - red on left, most common. \"bgr\" - blue on left. \"vrgb\" - red on top. \"vbgr\" - red on bottom."
+msgid ""
+"The order of subpixel elements on an LCD screen; only used when antialiasing "
+"is set to \"rgba\". Possible values are: \"rgb\" - red on left, most common. "
+"\"bgr\" - blue on left. \"vrgb\" - red on top. \"vbgr\" - red on bottom."
+msgstr ""
+"The order of subpixel elements on an LCD screen; only used when antialiasing "
+"is set to \"rgba\". Possible values are: \"rgb\" - red on left, most common. "
+"\"bgr\" - blue on left. \"vrgb\" - red on top. \"vbgr\" - red on bottom."
 
 #: schemas/desktop_gnome_font_rendering.schemas.in.h:7
-msgid "The type of antialiasing to use when rendering fonts. Possible values are: \"none\" - no antialiasing. \"grayscale\" - standard grayscale antialiasing. \"rgba\" - subpixel antialiasing. (LCD screens only)."
-msgstr "The type of antialiasing to use when rendering fonts. Possible values are: \"none\" - no antialiasing. \"grayscale\" - standard grayscale antialiasing. \"rgba\" - subpixel antialiasing. (LCD screens only)."
+msgid ""
+"The type of antialiasing to use when rendering fonts. Possible values are: "
+"\"none\" - no antialiasing. \"grayscale\" - standard grayscale antialiasing. "
+"\"rgba\" - subpixel antialiasing. (LCD screens only)."
+msgstr ""
+"The type of antialiasing to use when rendering fonts. Possible values are: "
+"\"none\" - no antialiasing. \"grayscale\" - standard grayscale antialiasing. "
+"\"rgba\" - subpixel antialiasing. (LCD screens only)."
 
 #: schemas/desktop_gnome_font_rendering.schemas.in.h:8
-msgid "The type of hinting to use when rendering fonts. Possible values are: \"none\" - no hinting, \"slight\", \"medium\", and \"full\" - as much hinting as possible; may cause distortion of letter forms."
-msgstr "The type of hinting to use when rendering fonts. Possible values are: \"none\" - no hinting, \"slight\", \"medium\", and \"full\" - as much hinting as possible; may cause distortion of letter forms."
+msgid ""
+"The type of hinting to use when rendering fonts. Possible values are: \"none"
+"\" - no hinting, \"slight\", \"medium\", and \"full\" - as much hinting as "
+"possible; may cause distortion of letter forms."
+msgstr ""
+"The type of hinting to use when rendering fonts. Possible values are: \"none"
+"\" - no hinting, \"slight\", \"medium\", and \"full\" - as much hinting as "
+"possible; may cause distortion of letter forms."
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
-msgid "Very soon, XKB settings in gconf will be overridden (from the system configuration)"
-msgstr "Very soon, XKB settings in gconf will be overridden (from the system configuration)"
+msgid ""
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB keyboard layout"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB keyboard model"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB options"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Keyboard _model:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB keyboard layout"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Keyboard _model:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Keyboard Shortcuts"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "XKB settings in gconf will be overridden from the system ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Very soon, XKB settings in gconf will be overridden (from the system "
+"configuration)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB keyboard layout"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB keyboard model"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Postpone break"
@@ -2902,8 +3139,12 @@ msgstr "Less than one minute until the next break"
 
 #: typing-break/drwright.c:583
 #, c-format
-msgid "Unable to bring up the typing break properties dialog with the following error: %s"
-msgstr "Unable to bring up the typing break properties dialogue with the following error: %s"
+msgid ""
+"Unable to bring up the typing break properties dialog with the following "
+"error: %s"
+msgstr ""
+"Unable to bring up the typing break properties dialogue with the following "
+"error: %s"
 
 #: typing-break/drwright.c:631
 msgid "About GNOME Typing Monitor"
@@ -2930,8 +3171,16 @@ msgid "The typing monitor is already running."
 msgstr "The typing monitor is already running."
 
 #: typing-break/main.c:106
-msgid "The typing monitor uses the notification area to display information. You don't seem to have a notification area on your panel. You can add it by right-clicking on your panel and choose 'Add to panel -> Utilities -> Notification area'."
-msgstr "The typing monitor uses the notification area to display information. You don't seem to have a notification area on your panel. You can add it by right-clicking on your panel and choose 'Add to panel -> Utilities -> Notification area'."
+msgid ""
+"The typing monitor uses the notification area to display information. You "
+"don't seem to have a notification area on your panel. You can add it by "
+"right-clicking on your panel and choose 'Add to panel -> Utilities -> "
+"Notification area'."
+msgstr ""
+"The typing monitor uses the notification area to display information. You "
+"don't seem to have a notification area on your panel. You can add it by "
+"right-clicking on your panel and choose 'Add to panel -> Utilities -> "
+"Notification area'."
 
 #: vfs-methods/fontilus/fontilus-context-menu.c:132
 msgid "Set as Application Font"
@@ -2958,16 +3207,20 @@ msgid "If set to true, then Type1 fonts will be thumbnailed."
 msgstr "If set to true, then Type1 fonts will be thumbnailed."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:5
-msgid "Set this key to the command used to create thumbnails for OpenType fonts."
-msgstr "Set this key to the command used to create thumbnails for OpenType fonts."
+msgid ""
+"Set this key to the command used to create thumbnails for OpenType fonts."
+msgstr ""
+"Set this key to the command used to create thumbnails for OpenType fonts."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:6
 msgid "Set this key to the command used to create thumbnails for PCF fonts."
 msgstr "Set this key to the command used to create thumbnails for PCF fonts."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:7
-msgid "Set this key to the command used to create thumbnails for TrueType fonts."
-msgstr "Set this key to the command used to create thumbnails for TrueType fonts."
+msgid ""
+"Set this key to the command used to create thumbnails for TrueType fonts."
+msgstr ""
+"Set this key to the command used to create thumbnails for TrueType fonts."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:8
 msgid "Set this key to the command used to create thumbnails for Type1 fonts."
@@ -3025,13 +3278,11 @@ msgstr "Type:"
 msgid "Size:"
 msgstr "Size:"
 
-#: vfs-methods/fontilus/font-view.c:348
-#: vfs-methods/fontilus/font-view.c:361
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
 msgid "Version:"
 msgstr "Version:"
 
-#: vfs-methods/fontilus/font-view.c:352
-#: vfs-methods/fontilus/font-view.c:363
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
 msgid "Copyright:"
 msgstr "Copyright:"
 
@@ -3061,8 +3312,12 @@ msgid "Do _not apply font"
 msgstr "Do _not apply font"
 
 #: vfs-methods/themus/apply-font.glade.h:4
-msgid "The theme you have selected suggests a new font. A preview of the font is shown below."
-msgstr "The theme you have selected suggests a new font. A preview of the font is shown below."
+msgid ""
+"The theme you have selected suggests a new font. A preview of the font is "
+"shown below."
+msgstr ""
+"The theme you have selected suggests a new font. A preview of the font is "
+"shown below."
 
 #: vfs-methods/themus/apply-font.glade.h:5
 msgid "_Apply font"
@@ -3093,8 +3348,10 @@ msgid "If set to true, then themes will be thumbnailed."
 msgstr "If set to true, then themes will be thumbnailed."
 
 #: vfs-methods/themus/themus.schemas.in.h:3
-msgid "Set this key to the command used to create thumbnails for installed themes."
-msgstr "Set this key to the command used to create thumbnails for installed themes."
+msgid ""
+"Set this key to the command used to create thumbnails for installed themes."
+msgstr ""
+"Set this key to the command used to create thumbnails for installed themes."
 
 #: vfs-methods/themus/themus.schemas.in.h:4
 msgid "Set this key to the command used to create thumbnails for themes."
@@ -3129,3 +3386,5 @@ msgstr "Apply theme"
 msgid "Sets the default theme"
 msgstr "Sets the default theme"
 
+#~ msgid "XKB options"
+#~ msgstr "XKB options"
diff --git a/po/es.po b/po/es.po
index 195ea2863..8d51d37c2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-18 13:54+0100\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-18 14:01+0100\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -54,7 +54,8 @@ msgstr "Cerrar y de_sconectarse"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:6
 msgid "Start these assistive technologies every time you log in:"
-msgstr "Ejecutar estas tecnologías de asistencia cada vez que se inicie sesión:"
+msgstr ""
+"Ejecutar estas tecnologías de asistencia cada vez que se inicie sesión:"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:7
 msgid "_Enable assistive technologies"
@@ -115,7 +116,8 @@ msgstr ""
 #: capplets/accessibility/keyboard/accessibility-keyboard.c:241
 #, c-format
 msgid "There was an error launching the mouse preferences dialog: %s"
-msgstr "Ha ocurrido un error al ejecutar el diálogo de preferencias del ratón: %s"
+msgstr ""
+"Ha ocurrido un error al ejecutar el diálogo de preferencias del ratón: %s"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.c:337
 #: capplets/accessibility/keyboard/accessibility-keyboard.c:396
@@ -205,7 +207,8 @@ msgstr "Pitar si se _suelta la tecla"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 msgid "Beep when _features turned on or off from keyboard"
-msgstr "Pitar cuando se activen o desactiven las _características desde el teclado"
+msgstr ""
+"Pitar cuando se activen o desactiven las _características desde el teclado"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Beep when _modifier is pressed"
@@ -556,14 +559,16 @@ msgstr "Retorno de llamada"
 
 #: capplets/common/gconf-property-editor.c:178
 msgid "Issue this callback when the value associated with key gets changed"
-msgstr "Emitir este retorno de llamada cuando cambie el valor asociado con la tecla"
+msgstr ""
+"Emitir este retorno de llamada cuando cambie el valor asociado con la tecla"
 
 #: capplets/common/gconf-property-editor.c:183
 msgid "Change set"
 msgstr "Conjunto de cambios"
 
 #: capplets/common/gconf-property-editor.c:184
-msgid "GConf change set containing data to be forwarded to the gconf client on apply"
+msgid ""
+"GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr ""
 "Conjunto de cambios de gconf que contiene datos que deben remitirse al "
 "cliente de gconf cuando se apliquen"
@@ -573,7 +578,8 @@ msgid "Conversion to widget callback"
 msgstr "Retorno de llamada de conversión a widget"
 
 #: capplets/common/gconf-property-editor.c:190
-msgid "Callback to be issued when data are to be converted from GConf to the widget"
+msgid ""
+"Callback to be issued when data are to be converted from GConf to the widget"
 msgstr ""
 "Retorno de llamada que se debe emitir cuando se vayan a convertir datos de "
 "gconf al widget"
@@ -583,7 +589,8 @@ msgid "Conversion from widget callback"
 msgstr "Retorno de llamada de conversión de widget"
 
 #: capplets/common/gconf-property-editor.c:196
-msgid "Callback to be issued when data are to be converted to GConf from the widget"
+msgid ""
+"Callback to be issued when data are to be converted to GConf from the widget"
 msgstr ""
 "Retorno de llamada que se debe emitir cuando se vayan a convertir datos del "
 "widget a gconf"
@@ -602,7 +609,8 @@ msgstr "Datos de objeto del editor de propiedades"
 
 #: capplets/common/gconf-property-editor.c:218
 msgid "Custom data required by the specific property editor"
-msgstr "Datos personalizados requeridos por el editor de propiedades específico"
+msgstr ""
+"Datos personalizados requeridos por el editor de propiedades específico"
 
 #: capplets/common/gconf-property-editor.c:224
 msgid "Property editor data freeing callback"
@@ -1012,7 +1020,8 @@ msgstr "Tipos de archivo y programas"
 
 #: capplets/file-types/file-types.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each type of file"
-msgstr "Especificar qué programas son usados para abrir o ver cada tipo de archivo"
+msgstr ""
+"Especificar qué programas son usados para abrir o ver cada tipo de archivo"
 
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
@@ -1165,7 +1174,8 @@ msgstr "Es cuadro de diálogo de adición"
 
 #: capplets/file-types/mime-edit-dialog.c:271
 msgid "True if this dialog is for adding a MIME type"
-msgstr "Verdadero si la función del cuadro de diálogo permite añadir un tipo MIME"
+msgstr ""
+"Verdadero si la función del cuadro de diálogo permite añadir un tipo MIME"
 
 #: capplets/file-types/mime-edit-dialog.c:320
 msgid "Add File Type"
@@ -1546,7 +1556,8 @@ msgstr ""
 #: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
-msgstr "Error al borrar una combinación en la base de datos de configuración: %s\n"
+msgstr ""
+"Error al borrar una combinación en la base de datos de configuración: %s\n"
 
 #: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
@@ -1586,7 +1597,8 @@ msgstr "_Accesibilidad"
 #: capplets/keyboard/gnome-keyboard-properties.c:222
 #: capplets/sound/sound-properties-capplet.c:240
 #: capplets/sound/sound-properties-capplet.c:242
-msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
+msgid ""
+"Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr ""
 "Aplicar la configuración y salir (sólo por compatibilidad; gestionado ahora "
 "por un agente)"
@@ -1661,7 +1673,8 @@ msgstr "Duración del trabajo antes de forzar un descanso"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:19
 msgid "Key presses _repeat when key is held down"
-msgstr "La pulsaciones de teclas se _repiten cuando la tecla se mantiene pulsada"
+msgstr ""
+"La pulsaciones de teclas se _repiten cuando la tecla se mantiene pulsada"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:21
 msgid "Keyboard Preferences"
@@ -2165,7 +2178,8 @@ msgstr "_Ubicación:"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
 msgid "<span size=\"larger\" weight=\"bold\">Save Theme to Disk</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">Guardar el tema en el disco</span>"
+msgstr ""
+"<span size=\"larger\" weight=\"bold\">Guardar el tema en el disco</span>"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
 msgid "Apply _Background"
@@ -2185,7 +2199,8 @@ msgstr "Iconos"
 
 #: capplets/theme-switcher/theme-properties.glade.h:7
 msgid "New themes can also be installed by dragging them into the window."
-msgstr "Los temas nuevos pueden ser instalados arrastrándolos dentro de la ventana."
+msgstr ""
+"Los temas nuevos pueden ser instalados arrastrándolos dentro de la ventana."
 
 #: capplets/theme-switcher/theme-properties.glade.h:8
 msgid "Save Theme"
@@ -2561,12 +2576,14 @@ msgstr ""
 #: gnome-settings-daemon/gnome-settings-keybindings.c:207
 #, c-format
 msgid "Key Binding (%s) has its action defined multiple times\n"
-msgstr "La combinación de teclas (%s) tiene su acción definida múltiples veces\n"
+msgstr ""
+"La combinación de teclas (%s) tiene su acción definida múltiples veces\n"
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:220
 #, c-format
 msgid "Key Binding (%s) has its binding defined multiple times\n"
-msgstr "La combinación de teclas (%s) tiene su combinación definida múltiples veces\n"
+msgstr ""
+"La combinación de teclas (%s) tiene su combinación definida múltiples veces\n"
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:226
 #, c-format
@@ -2750,7 +2767,8 @@ msgstr "Ancho de la vista previa"
 
 #: libbackground/applier.c:265
 msgid "Width if applier is a preview: Defaults to 64."
-msgstr "Ancho si el aplicador es una previsualización: el valor predeterminado es 64."
+msgstr ""
+"Ancho si el aplicador es una previsualización: el valor predeterminado es 64."
 
 #: libbackground/applier.c:272
 msgid "Preview Height"
@@ -2758,7 +2776,8 @@ msgstr "Alto de la vista previa"
 
 #: libbackground/applier.c:273
 msgid "Height if applier is a preview: Defaults to 48."
-msgstr "Alto si el aplicador es una previsualización: el valor predeterminado es 48."
+msgstr ""
+"Alto si el aplicador es una previsualización: el valor predeterminado es 48."
 
 #: libbackground/applier.c:280
 msgid "Screen"
@@ -2827,7 +2846,8 @@ msgid "Roll up"
 msgstr "Enrollar"
 
 #: schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:1
-msgid "If true, the mime handlers for text/plain and text/* will be kept in sync"
+msgid ""
+"If true, the mime handlers for text/plain and text/* will be kept in sync"
 msgstr ""
 "Si es «true», los manejadores mime para text/plain y text/* se mantendrán "
 "sincronizados"
@@ -2998,7 +3018,8 @@ msgstr "Combinación de teclas para subir el volumen."
 
 #: schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:1
 msgid "Display a dialog when there are errors running XScreenSaver"
-msgstr "Mostrar una ventana cuando han ocurrido errores al ejecutar XScreenSaver"
+msgstr ""
+"Mostrar una ventana cuando han ocurrido errores al ejecutar XScreenSaver"
 
 #: schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:2
 msgid "Run XScreenSaver at login"
@@ -3029,7 +3050,8 @@ msgid "RGBA Order"
 msgstr "Orden RGBA"
 
 #: schemas/desktop_gnome_font_rendering.schemas.in.h:5
-msgid "Resolution used for converting font sizes to pixel sizes, in dots per inch"
+msgid ""
+"Resolution used for converting font sizes to pixel sizes, in dots per inch"
 msgstr ""
 "Resolución usada para convertir los tamaños de las tipografías a tamaños de "
 "píxeles, en puntos por pulgada"
@@ -3071,7 +3093,9 @@ msgstr ""
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr "Una colección de scripts para ejecutar cuando el estado del teclado se recarga. Útil para re-aplicar ajustes basados en xmodmap"
+msgstr ""
+"Una colección de scripts para ejecutar cuando el estado del teclado se "
+"recarga. Útil para re-aplicar ajustes basados en xmodmap"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
 msgid "Default group, assigned on window creation"
@@ -3100,8 +3124,8 @@ msgstr "Opciones del teclado"
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
 msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
-"Los ajustes del teclado en gconf será ignorados por sistema tan pronto como sea "
-"posible"
+"Los ajustes del teclado en gconf será ignorados por sistema tan pronto como "
+"sea posible"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
 msgid "Save/restore indicators together with layout groups"
@@ -3115,15 +3139,18 @@ msgstr "Mostrar los nombres de la distribución en vez de los nombres de grupo"
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr "Mostrar los nombres de la distribución en vez de los nombres de grupo (sólo para versiones de XFree que tengan soporta para distribuciones de teclado múltiples)"
+msgstr ""
+"Mostrar los nombres de la distribución en vez de los nombres de grupo (sólo "
+"para versiones de XFree que tengan soporta para distribuciones de teclado "
+"múltiples)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
 msgid ""
 "Very soon, keyboard settings in gconf will be overridden (from the system "
 "configuration)"
 msgstr ""
-"Pronto, los ajustes de teclados en gconf serán ignorados (de la configuración del "
-"sistema)"
+"Pronto, los ajustes de teclados en gconf serán ignorados (de la "
+"configuración del sistema)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
 msgid "keyboard layout"
@@ -3238,10 +3265,12 @@ msgstr ""
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:4
 msgid "If set to true, then Type1 fonts will be thumbnailed."
-msgstr "Si se pone a verdadero, entonces las tipografías Type1 serán miniaturizadas."
+msgstr ""
+"Si se pone a verdadero, entonces las tipografías Type1 serán miniaturizadas."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:5
-msgid "Set this key to the command used to create thumbnails for OpenType fonts."
+msgid ""
+"Set this key to the command used to create thumbnails for OpenType fonts."
 msgstr ""
 "Ponga en esta clave el comando usado para crear miniaturas para las "
 "tipografías OpenType."
@@ -3253,7 +3282,8 @@ msgstr ""
 "tipografías PCF."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:7
-msgid "Set this key to the command used to create thumbnails for TrueType fonts."
+msgid ""
+"Set this key to the command used to create thumbnails for TrueType fonts."
 msgstr ""
 "Ponga en esta clave el comando usado para crear miniaturas para las "
 "tipografías TrueType."
@@ -3389,10 +3419,12 @@ msgstr ""
 
 #: vfs-methods/themus/themus.schemas.in.h:2
 msgid "If set to true, then themes will be thumbnailed."
-msgstr "Si se establece como verdadero entonces los temas serán miniaturizados."
+msgstr ""
+"Si se establece como verdadero entonces los temas serán miniaturizados."
 
 #: vfs-methods/themus/themus.schemas.in.h:3
-msgid "Set this key to the command used to create thumbnails for installed themes."
+msgid ""
+"Set this key to the command used to create thumbnails for installed themes."
 msgstr ""
 "Defina esta clave con el comando utilizado para crear las miniaturas de los "
 "temas instalados."
@@ -3440,4 +3472,3 @@ msgstr "Establece el tema predeterminado"
 
 #~ msgid "XKB options"
 #~ msgstr "Opciones de XKB"
-
diff --git a/po/et.po b/po/et.po
index 41865974c..9b1b23ed4 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center 2.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2003-09-19 21:12+0300\n"
 "Last-Translator: Tõivo Leedjärv <toivo@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -61,11 +61,11 @@ msgstr ""
 msgid "_Screenreader"
 msgstr ""
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr ""
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 
@@ -109,13 +109,13 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Klaviatuur"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Määra klaviatuurikasutuse hõlbustamise sätted"
 
@@ -326,12 +326,12 @@ msgstr "pikslit/sek"
 msgid "seconds"
 msgstr "sekundit"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 #, fuzzy
 msgid "Change your Desktop Background settings"
 msgstr "Kohanda oma töölaua taust"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 #, fuzzy
 msgid "Desktop Background"
 msgstr "Taust"
@@ -425,6 +425,13 @@ msgstr "_Tapeet"
 msgid "No Wallpaper"
 msgstr "_Tapeet"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -623,106 +630,15 @@ msgstr "Palun vali pilt."
 msgid "_Select"
 msgstr "_Kustuta"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Eelistatud rakendused"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Vali vaikimisi kasutatavad rakendused"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-#, fuzzy
-msgid "W3M Text Browser"
-msgstr "Veebibrauser Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Veebibrauser Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Veebibrauser Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Meiliklient Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome'i terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Tavaline XTerminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Palun määra selle redaktori nimi ja käsk."
@@ -732,20 +648,22 @@ msgid "Add..."
 msgstr "Lisa..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_Oma redaktor"
+#, fuzzy
+msgid "C_ustom"
+msgstr "_Oma:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "_Oma meiliklient:"
+msgid "C_ustom:"
+msgstr "_Oma:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "_Oma terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "_Oma veebibrauser:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "See rakendus oskab _mitu faili korraga avada"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -792,6 +710,16 @@ msgid "Mail Reader"
 msgstr "Meiliklient"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Käivita t_erminalis"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Käivita t_erminalis"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -799,92 +727,168 @@ msgstr ""
 "Vali omale meelepärane aknahaldur.  Selleks, et see kõik ka töötaks, pead sa "
 "klõpsama nupul Rakenda, viibutama võlukepikest ja tantsima võlutantsu."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Käivita t_erminalis"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Tekstiredaktor"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "See rakendus oskab _URIsid avada"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "See rakendus oskab _mitu faili korraga avada"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "See rakendus töötab _terminalis"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Saab aru _Netscape Remote Control käskudest"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Kasuta seda _redaktorit failihalduris tekstifailide avamiseks"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Veebibrauser"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Aknahaldur"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_Käsk:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Omadused..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Vali meiliklient:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Kustuta"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Vaikimisi veebibrauser"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Vali terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Vali veebibrauser:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Vali redaktor:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+#, fuzzy
+msgid "W3M Text Browser"
+msgstr "Veebibrauser Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Veebibrauser Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Veebibrauser Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Meiliklient Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Hõlbustus"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Vaikimisi terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Tavaline XTerminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Hõlbustuse sätted"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Edasijõudnutele"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Põhjalikum häälestus"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Muuda ekraani eraldusvõimet"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Ekraani eraldusvõime"
 
@@ -973,7 +977,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Kirjeldus"
 
@@ -981,17 +985,27 @@ msgstr "Kirjeldus"
 msgid "Extensions"
 msgstr "Laiendused"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Failitüübid ja programmid"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Määra, milliseid programme kasutatakse erinevate failitüüpide avamiseks või "
 "vaatamiseks"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Failitüübid ja programmid"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Määra, milliseid programme kasutatakse erinevate failitüüpide avamiseks või "
+"vaatamiseks"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Tegevused"
@@ -1083,6 +1097,7 @@ msgid "_Protocol:"
 msgstr "_Protokoll:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Eemalda"
 
@@ -1090,16 +1105,6 @@ msgstr "_Eemalda"
 msgid "_Viewer component:"
 msgstr ""
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Failitüübid ja programmid"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Määra, milliseid programme kasutatakse erinevate failitüüpide avamiseks või "
-"vaatamiseks"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Muuda faili kategooriat"
@@ -1282,14 +1287,15 @@ msgid "Electronic mail transmission"
 msgstr ""
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome'i dokumentatsioon"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Kirjatüüp"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Vali töölaua kirjatüübid"
 
@@ -1494,55 +1500,55 @@ msgid "The type of accelerator."
 msgstr ""
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Välja lülitatud"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<tundmatu tegevus>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Töölaud"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Heli"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Akende haldus"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
 " \"%s\"\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Tegevus"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Kiirklahv"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Kiirklahvid"
 
@@ -1552,26 +1558,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr ""
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Tundmatu kursor"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Mudel"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "Kiirklahvid"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1746,10 +1736,36 @@ msgstr ""
 msgid "minutes"
 msgstr "minutit"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Tundmatu kursor"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Mudel"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "Kiirklahvid"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Klaviatuuri häälestus"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "Menüü- ja tööriistaribade häälestus"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Hiire häälestus"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Tundmatu kursor"
@@ -1914,20 +1930,21 @@ msgstr "_Lävi:"
 msgid "_Timeout:"
 msgstr ""
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Hiir"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Hiire häälestus"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Võrgu proksi"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Võrgu proksi häälestus"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1973,8 +1990,9 @@ msgid "H_TTP proxy:"
 msgstr "_HTTP proksi:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Võrguproksi häälestus"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Võrgu proksi häälestus"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2015,7 +2033,7 @@ msgstr "_Parool:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Turvalise HTTP proksi:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Luba heli ja seosta heli sündmustega"
 
@@ -2070,15 +2088,26 @@ msgid ""
 "installed the \"gnome-themes\" package."
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2108,12 +2137,12 @@ msgstr ""
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Vali teemad töölaua erinevatele osadele"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Teema"
 
@@ -2227,11 +2256,11 @@ msgstr "_Teema nimi:"
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menüüd ja tööriistaribad"
 
@@ -2300,7 +2329,6 @@ msgid "_Edit"
 msgstr "_Redaktor"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fail"
 
@@ -2328,6 +2356,14 @@ msgstr "_Lõpeta"
 msgid "_Save"
 msgstr "_Salvesta"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2336,23 +2372,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (ehk \"Windowsi logo\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2396,14 +2432,35 @@ msgstr "_Tõsta aktiveeritud aken esile"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Aktiveeri aknad, kui hiirekursor üle nende liigub"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Akna omadused"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Aknad"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME juhtpaneel"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Võrgu häälestus"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Filtrid"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "GNOME kasutajaliidese häälestusprogramm"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2438,90 +2495,6 @@ msgstr "Juhtpaneeli menüü"
 msgid "View as Control Center"
 msgstr "Gnome juhtpaneel : %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME juhtpaneel: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Paigutus"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Tõlge eesti keelde:\n"
-"       Tõivo Leedjärv <toivo@linux.ee>, 2002, 2003."
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME juhtpaneel"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Töölaua omaduste haldur."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Gnome juhtpaneel : %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Filtrid"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "Gnome juhtpaneel : %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Kasuta kesta isegi siis, kui nautilus töötab."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Info rakenduse kohta"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Juhtpaneeli ülevaade"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Info"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Sisukord"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Abi"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "GNOME kasutajaliidese häälestusprogramm"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Kasuta kesta isegi siis, kui nautilus töötab."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 #, fuzzy
 msgid "Volume"
@@ -2624,7 +2597,7 @@ msgid ""
 "which is linked to the key (%s)"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2639,7 +2612,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2647,22 +2620,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Ekraani %d häälestus\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2718,8 +2691,8 @@ msgstr "_Ära näita seda teadet uuesti"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr ""
 
@@ -2766,43 +2739,43 @@ msgstr "Ekraan"
 msgid "Screen on which BGApplier is to draw"
 msgstr ""
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr ""
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
 "for a set of default sounds."
 msgstr ""
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr ""
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Sündmus"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Helifail"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Helid:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Heli_fail:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Vali helifail"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Mängi"
 
@@ -3068,29 +3041,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Klaviatuuri kell"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
 #, fuzzy
-msgid "XKB keyboard layout"
+msgid "Keyboard layout"
 msgstr "Kiirklahvid"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
 #, fuzzy
-msgid "XKB keyboard model"
+msgid "Keyboard model"
 msgstr "Klaviatuuri kell"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
 #, fuzzy
-msgid "XKB options"
-msgstr "Tegevused"
+msgid "Keyboard options"
+msgstr "Kiirklahvid"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Kiirklahvid"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Klaviatuuri kell"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr ""
@@ -3162,46 +3178,15 @@ msgid ""
 "Notification area'."
 msgstr ""
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nimi:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Laad:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tüüp:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Suurus:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versioon:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Kirjeldus:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+#, fuzzy
+msgid "Set as Application Font"
+msgstr "_Rakenduste kirjatüüp:"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Vali vaikimisi kasutatavad rakendused"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3269,36 +3254,48 @@ msgstr ""
 msgid "Whether to thumbnail Type1 fonts"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-#, fuzzy
-msgid "Fontilus context menu"
-msgstr "Juhtpaneeli menüü"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nimi:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Laad:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tüüp:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-#, fuzzy
-msgid "Set as Application Font"
-msgstr "_Rakenduste kirjatüüp:"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Suurus:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versioon:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
 msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Kirjeldus:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
 msgstr ""
 
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME juhtpaneel"
+
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
 msgstr " "
@@ -3325,29 +3322,19 @@ msgstr "_Rakenda kirjatüüp"
 msgid "Themes"
 msgstr "Teemad"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 #, fuzzy
 msgid "Control theme"
 msgstr "Oma teema"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Akna äärise teema"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikoonide teema"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-#, fuzzy
-msgid "URI currently displayed"
-msgstr "URI, kuhu hetkel edastatakse"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr ""
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3381,6 +3368,130 @@ msgstr ""
 msgid "Whether to thumbnail themes"
 msgstr ""
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr ""
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Lisa teema..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Kasuta vanemkategooria _vaikeväärtusi"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome'i terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_Oma redaktor"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "_Oma meiliklient:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "_Oma terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "_Oma veebibrauser:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Käivita t_erminalis"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "See rakendus oskab _URIsid avada"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "See rakendus töötab _terminalis"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Vali meiliklient:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Vali terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Vali veebibrauser:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Vali redaktor:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Hõlbustus"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Hõlbustuse sätted"
+
+#~ msgid "Advanced"
+#~ msgstr "Edasijõudnutele"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Põhjalikum häälestus"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Võrguproksi häälestus"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME juhtpaneel: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Paigutus"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Tõlge eesti keelde:\n"
+#~ "       Tõivo Leedjärv <toivo@linux.ee>, 2002, 2003."
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Töölaua omaduste haldur."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Gnome juhtpaneel : %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "Gnome juhtpaneel : %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Kasuta kesta isegi siis, kui nautilus töötab."
+
+#~ msgid "About this application"
+#~ msgstr "Info rakenduse kohta"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Juhtpaneeli ülevaade"
+
+#~ msgid "_About"
+#~ msgstr "_Info"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sisukord"
+
+#~ msgid "_Help"
+#~ msgstr "_Abi"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Kasuta kesta isegi siis, kui nautilus töötab."
+
+#, fuzzy
+#~ msgid "XKB options"
+#~ msgstr "Tegevused"
+
+#, fuzzy
+#~ msgid "Fontilus context menu"
+#~ msgstr "Juhtpaneeli menüü"
+
+#, fuzzy
+#~ msgid "URI currently displayed"
+#~ msgstr "URI, kuhu hetkel edastatakse"
+
 #~ msgid "De_tails..."
 #~ msgstr "_Täpsemalt..."
 
@@ -3549,10 +3660,6 @@ msgstr ""
 #~ msgstr "_Tapeet"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Võrgu häälestus"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "Põhjalikum häälestus"
 
@@ -3585,18 +3692,10 @@ msgstr ""
 #~ msgstr "Oma teema"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "Menüü- ja tööriistaribade häälestus"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "_Eraldusvõime:"
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Hiire häälestus"
-
-#, fuzzy
 #~ msgid "_Ignore system configuration"
 #~ msgstr "Võrguproksi häälestus"
 
@@ -3689,16 +3788,9 @@ msgstr ""
 #~ msgid "Quit"
 #~ msgstr "_Lõpeta"
 
-#, fuzzy
-#~ msgid "Apply theme..."
-#~ msgstr "_Lisa teema..."
-
 #~ msgid "Bee_p"
 #~ msgstr "_Piiks"
 
-#~ msgid "C_ustom:"
-#~ msgstr "_Oma:"
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "_Plõks klahvivajutusel"
 
diff --git a/po/eu.po b/po/eu.po
index 549a82b3b..434194dca 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-04-14 12:50+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -63,11 +63,11 @@ msgstr "_Pantailako teklatua"
 msgid "_Screenreader"
 msgstr "P_antaila-irakurlea"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Laguntza-teknologiaren laguntza"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Gaitu GNOMEren laguntza-teknologiaren laguntza saioa hastean"
 
@@ -122,13 +122,13 @@ msgstr "Inportatu ezaugarrien ezarpen-fitxategia"
 msgid "_Import"
 msgstr "_Inportatu"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Teklatua"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Ezarri zure teklatuaren erabilerraztasun-hobespenak"
 
@@ -342,11 +342,11 @@ msgstr "pixel/segundo"
 msgid "seconds"
 msgstr "segundo"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Aldatu mahaigainaren atzeko planoaren ezarpenak"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Mahaigaineko atzeko planoa"
 
@@ -426,6 +426,13 @@ msgstr "Gehitu irudiak"
 msgid "No Wallpaper"
 msgstr "Irudirik ez"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -634,105 +641,15 @@ msgstr "Hautatu irudi bat."
 msgid "_Select"
 msgstr "_Hautatu"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Hobetsitako aplikazioak"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Hautatu zure aplikazio lehenetsiak"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M testu-arakatzailea"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx testu-arakatzailea"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links testu-arakatzailea"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution posta-irakurlea"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla posta"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome terminala"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Xterminal estandarra"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Zehaztu editore honentzako izena eta komandoa."
@@ -742,20 +659,23 @@ msgid "Add..."
 msgstr "Gehitu..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Editore per_tsonalizatua"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Pertsonalizatua"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Posta-irakurle pert_sonalizatua:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Pertsonalizatua"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terminal pe_rtsonalizatua:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Web arakatzaile pertso_nalizatua:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Aplikazio honek fit_xategi bat baino gehiago ireki ditzake"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -802,6 +722,16 @@ msgid "Mail Reader"
 msgstr "Posta-irakurlea"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Exekutatu _terminalean"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Exekutatu _terminalean"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -809,93 +739,169 @@ msgstr ""
 "Hautatu nahi duzun leiho-kudeatzailea.  Aplikatu sakatu behar duzu, makila "
 "magikoa astindu eta dantza magikoa egin funtzionatzeko."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Hasi _terminalean"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminala"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Testu-editorea"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Aplikazio honek _URIak ireki ditzake"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Aplikazio honek fit_xategi bat baino gehiago ireki ditzake"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Aplikazio hau she_ll batean exekutatu behar da"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "_Netscaperen urruneko kontrola ulertzen du"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Erabili editor_e hau fitxategi-kudeatzaileko testu-fitxategiak irekitzeko"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Web arakatzailea"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Leiho-kudeatzailea"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Ko_mandoa:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Propietateak..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Hautatu posta-irakurlea:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Hautatu"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Web arakatzaile lehenetsia"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "Ha_utatu terminala:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "Hatutatu _web arakatzailea:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "H_autatu editorea:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Erabilerraztasuna"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Erabilerraztasun-ezarpenak"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Aurreratua"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla posta"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Ezarpen aurreratuak"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M testu-arakatzailea"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx testu-arakatzailea"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links testu-arakatzailea"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution posta-irakurlea"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla posta"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Terminal lehenetsia"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminala"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Xterminal estandarra"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Aldatu pantailaren bereizmena"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Pantailaren bereizmena"
 
@@ -988,7 +994,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Ziur zaude sarrera hau betirako ezabatzea nahi duzula?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Azalpena"
 
@@ -996,17 +1002,27 @@ msgstr "Azalpena"
 msgid "Extensions"
 msgstr "Luzapenak"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Fitxategi-motak eta programak"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Fitxategi-mota bakoitza ireki edo ikusteko zein programa erabiliko diren "
 "zehazten du"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Fitxategi-motak eta programak"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Fitxategi-mota bakoitza ireki edo ikusteko zein programa erabiliko diren "
+"zehazten du"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Ekintzak"
@@ -1097,6 +1113,7 @@ msgid "_Protocol:"
 msgstr "_Protokoloa:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Kendu"
 
@@ -1104,16 +1121,6 @@ msgstr "_Kendu"
 msgid "_Viewer component:"
 msgstr "_Ikustailearen osagaia:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Fitxategi-motak eta programak"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Fitxategi-mota bakoitza ireki edo ikusteko zein programa erabiliko diren "
-"zehazten du"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Editatu fitxategi-kategoria"
@@ -1295,14 +1302,15 @@ msgid "Electronic mail transmission"
 msgstr "Posta elektronikoaren transmisioa"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome-ren dokumentazioa"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Letra-tipoa"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Hautatu letra-tipoak mahaigainerako"
 
@@ -1502,29 +1510,29 @@ msgid "The type of accelerator."
 msgstr "Bizkortzaile-mota."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Desgaituta"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Ekintza ezezaguna>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Mahaigaina"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Soinua"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Leiho-kudeaketa"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1533,30 +1541,30 @@ msgstr ""
 "\"%s\" lasterbidea erabilita dago honetarako:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Errorea gertatu da konfigurazioko datu-basean bizkortzaile berria ezartzean: "
 "%s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Errorea gertatu da konfigurazioko datu-basean bizkortzailearen ezarpena "
 "kentzean: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Ekintza"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Lasterbidea"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Laster-teklak"
 
@@ -1569,26 +1577,10 @@ msgstr ""
 "Tekla bizkortzaile bat editatzeko, egin klik dagokion errenkadan eta idatzi "
 "beste bizkortzaile bat edo sakatu atzera tekla garbitzeko"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Esleitu laster-teklak komandoei"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Kurtsore ezezaguna"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Modeloa"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "XKB teklatu-diseinua"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1761,10 +1753,35 @@ msgstr "_Lanaren etenak iraupen hau du:"
 msgid "minutes"
 msgstr "minutu"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Kurtsore ezezaguna"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Modeloa"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "XKB teklatu-diseinua"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Ezarri zure teklatuaren hobespenak"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Ezarri zure saguaren hobespenak"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Kurtsore ezezaguna"
@@ -1929,20 +1946,21 @@ msgstr "_Muga:"
 msgid "_Timeout:"
 msgstr "_Denbora-muga:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Sagua"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Ezarri zure saguaren hobespenak"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Sareko proxy-a"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Sareko proxy-aren hobespenak"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1988,8 +2006,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP proxy-a:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Sareko proxy-konfigurazioa"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Sareko proxy-aren hobespenak"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2030,7 +2049,7 @@ msgstr "_Pasahitza:"
 msgid "_Secure HTTP proxy:"
 msgstr "HTTP prox_y segurua:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Gaitu soinua eta erlazionatu soinuak gertaerekin"
 
@@ -2088,15 +2107,26 @@ msgstr ""
 "\"Gai-hobespenak\" elkarrizketa-koadroa ez dagoela ondo instalatuta, edo ez "
 "duzula \"gnome-gaiak\" paketea instalatu."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Ez da gaia-fitxategiaren kokalekurik zehaztu instalatzeko"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Gaia-fitxategiaren kokalekua baliogabea da instalatzeko"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2129,12 +2159,12 @@ msgstr "Gaiaren izenak agertu egin behar du"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Hautatu gaiak mahaigaineko hainbat alderentzat"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Gaia"
 
@@ -2247,11 +2277,11 @@ msgstr "_Gaiaren izena:"
 msgid "theme selection tree"
 msgstr "gai-hautapenaren zuhaitza"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Pertsonalizatu aplikazioetako tresna-barren eta menu-barren itxura "
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menuak eta tresna-barrak"
 
@@ -2320,7 +2350,6 @@ msgid "_Edit"
 msgstr "_Editatu"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fitxategia"
 
@@ -2348,6 +2377,14 @@ msgstr "Ir_ten"
 msgid "_Save"
 msgstr "_Gorde"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2359,23 +2396,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Kontrol"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt "
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hiper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (edo \"Windows-en logotipoa\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2420,14 +2457,35 @@ msgstr "_Goratu hautatutako leihoak tarte baten ondoren"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Hautatu leihoak sagua gainetik mugitzean"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Leihoaren propietateak"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Leihoak"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOMEren kontrol-zentroa"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Mahaigaineko atzeko planoaren hobespenak"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Iragazkiak"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "GNOMEren konfigurazio-tresna"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2462,90 +2520,6 @@ msgstr "Kontrol Zentroaren menua"
 msgid "View as Control Center"
 msgstr "Gnome-ren kontrol-zentroa: %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOMEren kontrol-zentroa: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Diseinua"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Capplet-en ikuspegi honetarako erabili beharreko diseinua"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Capplet direktorioko objektua"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Ikuspegi hau ikusten ari den Capplet direktorioa"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Hizkuntza Politikarako Sailburuordetza \n"
-"(<hizkpol@ej-gv.es>)"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOMEren kontrol-zentroa"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Mahaigaineko propietateen kudeatzailea."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Gnome-ren kontrol-zentroa: %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Iragazkiak"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "Gnome-ren kontrol-zentroa: %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Erabili shell nautilus exekutatzen egon arren."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Aplikazio honi buruz"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Kontrol-zentroaren informazio orokorra"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "Honi _buruz"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Edukia"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "La_guntza"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "GNOMEren konfigurazio-tresna"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Erabili shell nautilus exekutatzen egon arren."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Bolumena"
@@ -2645,7 +2619,7 @@ msgstr ""
 "Errorea gertatu da (%s) exekutatzen saiatzean\n"
 "eta hori (%s) teklari lotuta dago"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2660,7 +2634,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2668,22 +2642,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Pantailaren %d ezarpenak\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2745,8 +2719,8 @@ msgstr "_Ez erakutsi mezu hau aurrerantzean"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Ezin izan da %s soinu-fitxategia %s adibide gisa kargatu"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Ezin da erabiltzailearen etxeko direktorioa zehaztu"
 
@@ -2795,11 +2769,11 @@ msgstr "Pantaila"
 msgid "Screen on which BGApplier is to draw"
 msgstr "BGApplier zein pantailatan marraztu behar den"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Gertaera honek ez du soinu-fitxategirik."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2809,32 +2783,32 @@ msgstr ""
 "Gnome-audio paketea instalatzea komeni zaizu\n"
 "soinu lehenetsien sorta bat izateko."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "%s fitxategia ez da baliozko wav fitxategia"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Gertaera"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Soinu-fitxategia"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Soinuak:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Soinu-fi_txategia:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Hautatu soinu-fitxategia"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Erreproduzitu"
 
@@ -3109,26 +3083,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB teklatu-diseinua"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB teklatu modeloa"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB aukerak"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Teklatu _modeloa:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB teklatu-diseinua"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Teklatu _modeloa:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Laster-teklak"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB teklatu-diseinua"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB teklatu modeloa"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Atzeratu atsedena"
@@ -3206,48 +3226,14 @@ msgstr ""
 "Area gehitzeko, egin klik eskuineko botoiarekin panelean eta aukeratu "
 "'Gehitu panelera -> Utilitateak-> Jakinarazpen-eremua'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-"I�ki Gorrotxategiren familia jatorrak ez ditu probatu nahi Quebec-eko vodka "
-"eta whiskya. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Izena:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Estiloa:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Mota:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Tamaina:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Bertsioa:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright-a:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Azalpena:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Ezarri letra-tipoaren aplikazio gisa"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Letra-tipoen testuinguruko menu-elementuak"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Hautatu zure aplikazio lehenetsiak"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3326,33 +3312,49 @@ msgstr "TrueType letra-tipoak koadro txikian bistaratuko diren ala ez"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Type1 letra-tipoak koadro txikian bistaratuko diren ala ez"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fontilus laster-menuaren fabrika"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr ""
+"I�ki Gorrotxategiren familia jatorrak ez ditu probatu nahi Quebec-eko vodka "
+"eta whiskya. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus laster-menua"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Izena:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus laster-menuaren fabrika"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Estiloa:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Nautilus laster-menuko sarrerak letra-tipoentzat"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Mota:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Ezarri letra-tipoaren aplikazio gisa"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Tamaina:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Bertsioa:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Gai-propietateen edukia ikusteko osagaia"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright-a:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus gai-propietateen ikuspegia"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Azalpena:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOMEren kontrol-zentroa"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3383,27 +3385,18 @@ msgstr "_Aplikatu letra-tipoa"
 msgid "Themes"
 msgstr "Gaiak"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Kontrol-gaia"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Leiho-ertzaren gaia"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikonoen gaia"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI unean bistaratuta"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3441,6 +3434,154 @@ msgstr "Instalatutako gaiak koadro txikian bistaratuko diren ala ez"
 msgid "Whether to thumbnail themes"
 msgstr "Gaiak koadro txikian bistaratuko diren ala ez"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Aplikatu letra-tipoa"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Berrasieratu lehenespenera"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome terminala"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Editore per_tsonalizatua"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Posta-irakurle pert_sonalizatua:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terminal pe_rtsonalizatua:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Web arakatzaile pertso_nalizatua:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Hasi _terminalean"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Aplikazio honek _URIak ireki ditzake"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Aplikazio hau she_ll batean exekutatu behar da"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Hautatu posta-irakurlea:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "Ha_utatu terminala:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "Hatutatu _web arakatzailea:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "H_autatu editorea:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Erabilerraztasuna"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Erabilerraztasun-ezarpenak"
+
+#~ msgid "Advanced"
+#~ msgstr "Aurreratua"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Ezarpen aurreratuak"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Sareko proxy-konfigurazioa"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOMEren kontrol-zentroa: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Diseinua"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Capplet-en ikuspegi honetarako erabili beharreko diseinua"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Capplet direktorioko objektua"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Ikuspegi hau ikusten ari den Capplet direktorioa"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Hizkuntza Politikarako Sailburuordetza \n"
+#~ "(<hizkpol@ej-gv.es>)"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Mahaigaineko propietateen kudeatzailea."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Gnome-ren kontrol-zentroa: %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "Gnome-ren kontrol-zentroa: %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Erabili shell nautilus exekutatzen egon arren."
+
+#~ msgid "About this application"
+#~ msgstr "Aplikazio honi buruz"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Kontrol-zentroaren informazio orokorra"
+
+#~ msgid "_About"
+#~ msgstr "Honi _buruz"
+
+#~ msgid "_Contents"
+#~ msgstr "_Edukia"
+
+#~ msgid "_Help"
+#~ msgstr "La_guntza"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Erabili shell nautilus exekutatzen egon arren."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB aukerak"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Letra-tipoen testuinguruko menu-elementuak"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fontilus laster-menuaren fabrika"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus laster-menua"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus laster-menuaren fabrika"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Nautilus laster-menuko sarrerak letra-tipoentzat"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Gai-propietateen edukia ikusteko osagaia"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus gai-propietateen ikuspegia"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI unean bistaratuta"
+
 #~ msgid "GNOME Default"
 #~ msgstr "GNOME lehenetsia"
 
diff --git a/po/fa.po b/po/fa.po
index 8b0458337..646058c22 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2003-03-10 14:28+0330\n"
 "Last-Translator: Roozbeh Pournader <roozbeh@sharif.edu>\n"
 "Language-Team: Persian <farsi@lists.sharif.edu>\n"
@@ -59,11 +59,11 @@ msgstr ""
 msgid "_Screenreader"
 msgstr "صفحه‌نمایش"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr ""
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 
@@ -108,13 +108,13 @@ msgstr "وارد کردن تنظیمات امکان..."
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "صفحه‌کلید"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr ""
 
@@ -325,12 +325,12 @@ msgstr ""
 msgid "seconds"
 msgstr "ثانیه"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 #, fuzzy
 msgid "Change your Desktop Background settings"
 msgstr "سفارشی‌سازی پس‌زمینه‌ی رومیزی"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 #, fuzzy
 msgid "Desktop Background"
 msgstr "پس‌زمینه"
@@ -420,6 +420,13 @@ msgstr "کاغذ دیواری"
 msgid "No Wallpaper"
 msgstr "کاغذ دیواری"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -610,112 +617,15 @@ msgstr "لطفاً یک تصویر انتخاب کنید."
 msgid "_Select"
 msgstr "حذف"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr ""
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "انتخاب برنامه‌ی پیش‌فرض"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-#, fuzzy
-msgid "W3M Text Browser"
-msgstr "مرورگر وب"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-#, fuzzy
-msgid "Lynx Text Browser"
-msgstr "مرورگر وب"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-#, fuzzy
-msgid "Links Text Browser"
-msgstr "مرورگر وب"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-#, fuzzy
-msgid "Evolution Mail Reader"
-msgstr "مدیر پنجره‌ی پیش‌فرض"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-#, fuzzy
-msgid "Gnome Terminal"
-msgstr "پایانه"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-#, fuzzy
-msgid "Standard XTerminal"
-msgstr "آغاز در پایانه"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-#, fuzzy
-msgid "ETerm"
-msgstr "پایانه"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr ""
@@ -725,19 +635,21 @@ msgid "Add..."
 msgstr "اضافه کردن..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr ""
+#, fuzzy
+msgid "C_ustom"
+msgstr "تنظیمی"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr ""
+#, fuzzy
+msgid "C_ustom:"
+msgstr "تنظیمی"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
+msgid "Can open _URIs"
 msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
+msgid "Can open multiple _files"
 msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
@@ -786,98 +698,187 @@ msgid "Mail Reader"
 msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "اجرا در پایانه"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "اجرا در پایانه"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "آغاز در پایانه"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "پایانه"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "ویرایشگر متن"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "مرورگر وب"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "مدیر پنجره‌ها"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "دستور:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "نام:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "مشخصه‌ها..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
 #, fuzzy
-msgid "_Select a Mail Reader:"
-msgstr "انتخاب مرورگری برای راهنماها:"
+msgid "_Select:"
+msgstr "حذف"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "انتخاب پایانه:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "مرورگر وب پیش‌فرض"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "انتخاب مرورگر وب:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "انتخاب ویرایشگر:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
 msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
 msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "پیش‌رفته"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "تنظیمات پیش‌رفته"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+msgid "Mozilla"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+#, fuzzy
+msgid "W3M Text Browser"
+msgstr "مرورگر وب"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+#, fuzzy
+msgid "Lynx Text Browser"
+msgstr "مرورگر وب"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+#, fuzzy
+msgid "Links Text Browser"
+msgstr "مرورگر وب"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+#, fuzzy
+msgid "Evolution Mail Reader"
+msgstr "مدیر پنجره‌ی پیش‌فرض"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "پایانه‌ی پیش‌فرض"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "پایانه"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+#, fuzzy
+msgid "Standard XTerminal"
+msgstr "آغاز در پایانه"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "پایانه"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+#, fuzzy
+msgid "ETerm"
+msgstr "پایانه"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr ""
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr ""
 
@@ -965,7 +966,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "توصیف"
 
@@ -973,15 +974,23 @@ msgstr "توصیف"
 msgid "Extensions"
 msgstr ""
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr ""
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr ""
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr ""
@@ -1073,6 +1082,7 @@ msgid "_Protocol:"
 msgstr "قرارداد:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "حذف"
 
@@ -1080,14 +1090,6 @@ msgstr "حذف"
 msgid "_Viewer component:"
 msgstr ""
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr ""
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr ""
@@ -1265,14 +1267,15 @@ msgid "Electronic mail transmission"
 msgstr ""
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "مستندات گنوم"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "قلم"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "انتخاب قلم برای رومیزی"
 
@@ -1476,55 +1479,55 @@ msgid "The type of accelerator."
 msgstr "نوع شتاب‌ده."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "از کار افتاده"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "رومیزی"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "صدا"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "مدیریت پنجره"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
 " \"%s\"\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "عمل"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr ""
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "میان‌برهای صفحه‌کلید"
 
@@ -1534,25 +1537,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr ""
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr ""
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "مدل"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "میان‌برهای صفحه‌کلید"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1728,10 +1716,35 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr ""
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "مدل"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "میان‌برهای صفحه‌کلید"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "تنظیم ترجیحات صفحه‌کلید"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "ترجیحات منو و نوار ابزار"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "تنظیم ترجیحات ماوس"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr ""
@@ -1900,22 +1913,23 @@ msgstr "آستانه:"
 msgid "_Timeout:"
 msgstr ""
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr ""
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "تنظیم ترجیحات ماوس"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 #, fuzzy
 msgid "Network Proxy"
 msgstr "تنظیمات وکیل شبکه"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
-msgstr ""
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
+msgstr "تنظیم ترجیحات صفحه‌کلید"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
 msgid "      "
@@ -1961,7 +1975,8 @@ msgid "H_TTP proxy:"
 msgstr "وکیل HTTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
+#, fuzzy
+msgid "Network Proxy Preferences"
 msgstr "تنظیمات وکیل شبکه"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
@@ -2002,7 +2017,7 @@ msgstr "گذرواژه:"
 msgid "_Secure HTTP proxy:"
 msgstr "وکیل HTTP امن:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr ""
 
@@ -2057,15 +2072,26 @@ msgid ""
 "installed the \"gnome-themes\" package."
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2095,12 +2121,12 @@ msgstr "نام تم باید حاضر باشد"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "تم"
 
@@ -2226,11 +2252,11 @@ msgstr "نام تم:"
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr ""
 
@@ -2304,7 +2330,6 @@ msgid "_Edit"
 msgstr "ویرایش"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "پرونده"
 
@@ -2332,6 +2357,14 @@ msgstr "خروج"
 msgid "_Save"
 msgstr "ذخیره"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2340,23 +2373,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "کنترل"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr ""
 
@@ -2398,14 +2431,34 @@ msgstr ""
 msgid "_Select windows when the mouse moves over them"
 msgstr ""
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "مشخصات پنجره"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr ""
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "مرکز کنترل گنوم"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "ترجیحات صفحه‌کلید"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr ""
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "ابزار پیکربندی گنوم"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2440,86 +2493,6 @@ msgstr "منوی مرکز کنترل"
 msgid "View as Control Center"
 msgstr "مرکز کنترل گنوم : %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "مرکز کنترل گنوم: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "صفحه‌بندی"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "ترجمه‌ی: روزبه پورنادر"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "مرکز کنترل گنوم"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "مدیر مشخصات رومیزی."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "مرکز کنترل گنوم : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr ""
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "مرکز کنترل گنوم : %s"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr ""
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "درباره‌ی این برنامه"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr ""
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "درباره"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "محتویات"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "راهنما"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "ابزار پیکربندی گنوم"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr ""
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 #, fuzzy
 msgid "Volume"
@@ -2616,7 +2589,7 @@ msgid ""
 "which is linked to the key (%s)"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2631,7 +2604,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2639,22 +2612,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "تنظیمات پیش‌رفته"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2705,8 +2678,8 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr ""
 
@@ -2753,47 +2726,47 @@ msgstr "صفحه‌نمایش"
 msgid "Screen on which BGApplier is to draw"
 msgstr ""
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr ""
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
 "for a set of default sounds."
 msgstr ""
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr ""
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "رویداد"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 #, fuzzy
 msgid "Sound File"
 msgstr "صدا"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 #, fuzzy
 msgid "_Sounds:"
 msgstr "صدا"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 #, fuzzy
 msgid "Sound _file:"
 msgstr "انتخاب پرونده‌ی صدا"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 #, fuzzy
 msgid "Select Sound File"
 msgstr "انتخاب پرونده‌ی صدا"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "پخش"
 
@@ -3058,29 +3031,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
 #, fuzzy
-msgid "XKB keyboard layout"
+msgid "Keyboard Update Handlers"
+msgstr "زنگ صفحه‌کلید"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
+#, fuzzy
+msgid "Keyboard layout"
 msgstr "میان‌برهای صفحه‌کلید"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
 #, fuzzy
-msgid "XKB keyboard model"
+msgid "Keyboard model"
 msgstr "زنگ صفحه‌کلید"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
 #, fuzzy
-msgid "XKB options"
-msgstr "عمل"
+msgid "Keyboard options"
+msgstr "میان‌برهای صفحه‌کلید"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "میان‌برهای صفحه‌کلید"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "زنگ صفحه‌کلید"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr ""
@@ -3154,47 +3170,14 @@ msgid ""
 "Notification area'."
 msgstr ""
 
-#: vfs-methods/fontilus/font-view.c:102
-#, fuzzy
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "متن آزمایشی ۰۱۲۳۴۵۶۷۸۹"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "نام:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "سبک:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "نوع:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "اندازه:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "نسخه:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "حق نسخه‌برداری:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "توصیف:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "تنظیم به‌عنوان قلم برنامه‌ها"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "موارد منوی موقعیتی قلم"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "انتخاب برنامه‌ی پیش‌فرض"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 #, fuzzy
@@ -3265,34 +3248,49 @@ msgstr ""
 msgid "Whether to thumbnail Type1 fonts"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "کارخانه‌ی منوی موقعیتی فونتیلوس"
+#: vfs-methods/fontilus/font-view.c:125
+#, fuzzy
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "متن آزمایشی ۰۱۲۳۴۵۶۷۸۹"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "منوی موقعیتی فونتیلوس"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "نام:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "کارخانه‌ی منوی موقعیتی فونتیلوس"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "سبک:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "مداخل منوی موقعیتی ناتیلوس برای قلم‌ها"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "نوع:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "تنظیم به‌عنوان قلم برنامه‌ها"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "اندازه:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "نسخه:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "حق نسخه‌برداری:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "توصیف:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
 msgstr ""
 
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "مرکز کنترل گنوم"
+
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
 msgstr ""
@@ -3321,30 +3319,21 @@ msgstr "اعمال قلم"
 msgid "Themes"
 msgstr "تم"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 #, fuzzy
 msgid "Control theme"
 msgstr "تم تنظیمی"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 #, fuzzy
 msgid "Window border theme"
 msgstr "حاشیه‌ی پنجره"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 #, fuzzy
 msgid "Icon theme"
 msgstr "تم تنظیمی"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr ""
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr ""
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3378,6 +3367,99 @@ msgstr ""
 msgid "Whether to thumbnail themes"
 msgstr ""
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr ""
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "نصب تم..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+msgid "Sets the default theme"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Gnome Terminal"
+#~ msgstr "پایانه"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "آغاز در پایانه"
+
+#, fuzzy
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "انتخاب مرورگری برای راهنماها:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "انتخاب پایانه:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "انتخاب مرورگر وب:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "انتخاب ویرایشگر:"
+
+#~ msgid "Advanced"
+#~ msgstr "پیش‌رفته"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "تنظیمات پیش‌رفته"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "تنظیمات وکیل شبکه"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "مرکز کنترل گنوم: %s"
+
+#~ msgid "Layout"
+#~ msgstr "صفحه‌بندی"
+
+#~ msgid "translator_credits"
+#~ msgstr "ترجمه‌ی: روزبه پورنادر"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "مدیر مشخصات رومیزی."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "مرکز کنترل گنوم : %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "مرکز کنترل گنوم : %s"
+
+#~ msgid "About this application"
+#~ msgstr "درباره‌ی این برنامه"
+
+#~ msgid "_About"
+#~ msgstr "درباره"
+
+#~ msgid "_Contents"
+#~ msgstr "محتویات"
+
+#~ msgid "_Help"
+#~ msgstr "راهنما"
+
+#, fuzzy
+#~ msgid "XKB options"
+#~ msgstr "عمل"
+
+#~ msgid "Font context menu items"
+#~ msgstr "موارد منوی موقعیتی قلم"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "کارخانه‌ی منوی موقعیتی فونتیلوس"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "منوی موقعیتی فونتیلوس"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "کارخانه‌ی منوی موقعیتی فونتیلوس"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "مداخل منوی موقعیتی ناتیلوس برای قلم‌ها"
+
 #~ msgid "_Desktop shortcuts:"
 #~ msgstr "میان‌برهای رومیزی:"
 
@@ -3457,10 +3539,6 @@ msgstr ""
 #~ msgstr "کاغذ دیواری"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "ترجیحات صفحه‌کلید"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "تنظیمات پیش‌رفته"
 
@@ -3493,18 +3571,10 @@ msgstr ""
 #~ msgstr "تم تنظیمی"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "ترجیحات منو و نوار ابزار"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "توصیف:"
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "تنظیم ترجیحات ماوس"
-
-#, fuzzy
 #~ msgid "_Ignore system configuration"
 #~ msgstr "تنظیمات وکیل شبکه"
 
@@ -3560,10 +3630,6 @@ msgstr ""
 #~ msgid "Quit"
 #~ msgstr "خروج"
 
-#, fuzzy
-#~ msgid "Apply theme..."
-#~ msgstr "نصب تم..."
-
 #~ msgid "Repeat Keys"
 #~ msgstr "تکرار کلیدها"
 
diff --git a/po/fi.po b/po/fi.po
index 7809f033b..7557201e5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.99.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-09 22:09+0300\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
@@ -68,11 +68,11 @@ msgstr "_Ruudulla näkyvä näppäimistö"
 msgid "_Screenreader"
 msgstr "_Näytön luku"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Esteettömyysohjelmatuki"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Ota käyttöön tuki Gnomen esteettömyysohjelmille sisään kirjauduttaessa"
 
@@ -124,13 +124,13 @@ msgstr "Tuo ominaisuuksien asetustiedosto"
 msgid "_Import"
 msgstr "_Tuo"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Näppäimistö"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Muuta näppäimistön esteettömyysasetuksia"
 
@@ -345,11 +345,11 @@ msgstr "kuvapistettä/s"
 msgid "seconds"
 msgstr "sekuntia"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Muuta työpöydän taustan asetuksia"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Työpöydän tausta"
 
@@ -428,6 +428,13 @@ msgstr "Lisää tausta"
 msgid "No Wallpaper"
 msgstr "Ei taustaa"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -634,105 +641,15 @@ msgstr "Valitse kuva"
 msgid "_Select"
 msgstr "_Valittu"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Oletussovellukset"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Valitse oletusohjelmasi"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/Firefox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla tai Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M, WWW-tekstiselain"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx, WWW-tekstiselain"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links, WWW-tekstiselain"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution-postiohjelma"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnomen pääte"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Tavallinen X-pääte"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Anna tämän editorin nimi ja komento."
@@ -742,20 +659,23 @@ msgid "Add..."
 msgstr "Lisää..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "M_uu editori:"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Muu"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "M_uu postiohjelma:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Muu"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "M_uu pääte:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "M_uu WWW-selain:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Tämä sovellus voi _avata useita tiedostoja"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -802,6 +722,16 @@ msgid "Mail Reader"
 msgstr "Sähköpostiohjelma"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Käynnistä _päätteessä"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Käynnistä _päätteessä"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -810,92 +740,168 @@ msgstr ""
 "painiketta, heiluttaa taikasauvaa ja tanssia sadetanssi saadaksesi sen "
 "toimimaan."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Käynnistä _päätteessä"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Pääte"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Tekstieditori"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Tämä sovellus voi avata _URI:eja"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Tämä sovellus voi _avata useita tiedostoja"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Käynnistä tämä sovellus _päätteessä"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Ymmärtää _Netscapen ohjauskomentoja"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Avaa tekstitiedostot tällä _editorilla tiedostonhallinnassa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "WWW-selain"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Ikkunointiohjelma"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Ko_mento:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Valitse postiohjelma:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Valittu"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Oletusarvoinen WWW-selain"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/Firefox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M, WWW-tekstiselain"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx, WWW-tekstiselain"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links, WWW-tekstiselain"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution-postiohjelma"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Valitse pääte:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Valitse WWW-selain:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Valitse editori:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Esteettömyys"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Esteettömyysasetukset"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Lisäasetukset"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Oletusarvoinen pääte"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Lisäasetukset"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Pääte"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Tavallinen X-pääte"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Muuta näytön tarkkuutta"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Näytön tarkkuus"
 
@@ -986,7 +992,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Haluatko varmasti poistaa tämän kohdan pysyvästi?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -994,15 +1000,23 @@ msgstr "Kuvaus"
 msgid "Extensions"
 msgstr "Tiedostopäätteet"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Tiedostotyypit ja ohjelmat"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "Määrittele, millä ohjelmilla tiedostot avautuvat tai näkyvät"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Tiedostotyypit ja ohjelmat"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "Määrittele, millä ohjelmilla tiedostot avautuvat tai näkyvät"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Toiminnot"
@@ -1093,6 +1107,7 @@ msgid "_Protocol:"
 msgstr "P_rotokolla:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -1100,14 +1115,6 @@ msgstr "_Poista"
 msgid "_Viewer component:"
 msgstr "_Katselinkomponentti:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Tiedostotyypit ja ohjelmat"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "Määrittele, millä ohjelmilla tiedostot avautuvat tai näkyvät"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Muokkaa tiedostoluokkaa"
@@ -1289,14 +1296,15 @@ msgid "Electronic mail transmission"
 msgstr "Sähköpostin välitys"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnomen ohjeet"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Kirjasinlajit"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Valitse työpöydän kirjasinlajit"
 
@@ -1501,29 +1509,29 @@ msgid "The type of accelerator."
 msgstr "Pikanäppäimen tyyppi."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Ei käytössä"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Tuntematon toiminto>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Työpöytä"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Ääni"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Ikkunointi"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1532,26 +1540,26 @@ msgstr ""
 "Pikanäppäimeen \"%s\" on jo kytketty toiminto\n"
 "\"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Virhe uuden pikanäppäimen asetustietokantaan asettamisessa: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Virhe pikanäppäimen asetustietokannasta poistamisessa: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Toiminto"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Pikanäppäin"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Pikanäppäimet"
 
@@ -1563,23 +1571,10 @@ msgstr ""
 "Pikanäppäintä voi muokata napsauttamalla sen riviä ja näppäilemällä uusi "
 "näppäinyhdistelmä. Askepalauttimen painaminen tyhjentää pikanäppäimen."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Liitä pikanäppäimiä komentoihin"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Mallit"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Näppäimistöasettelun esikatselu"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1747,10 +1742,31 @@ msgstr "T_yöskentelyaika kestää:"
 msgid "minutes"
 msgstr "minuuttia"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Mallit"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Näppäimistöasettelun esikatselu"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Muuta näppäimistöasetuksia"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr "Kieli ja kulttuuri"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+msgid "Set your language and culture preferences"
+msgstr "Muuta kieli- ja kulttuuriasetuksia"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Tuntematon osoitin"
@@ -1915,20 +1931,21 @@ msgstr "_Kynnys:"
 msgid "_Timeout:"
 msgstr "_Aikaraja:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Hiiri"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Muuta hiiriasetuksia"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Välipalvelin"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Välipalvelinasetukset"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1972,7 +1989,8 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP-välityspalvelin:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
+#, fuzzy
+msgid "Network Proxy Preferences"
 msgstr "Välipalvelinasetukset"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
@@ -2011,7 +2029,7 @@ msgstr "_Salasana:"
 msgid "_Secure HTTP proxy:"
 msgstr "Tu_rva-HTTP-välipalvelin:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Ota äänet käyttöön ja liitä niitä tapahtumiin"
 
@@ -2069,15 +2087,26 @@ msgstr ""
 "asetusikkuna on asennettu väärin, tai että \"gnome-themes\"-pakettia ei ole "
 "asennettu."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Asennettavan teematiedoston sijaintia ei annettu"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Annettu asennettavan teematiedoston sijainti on virheellinen"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2112,12 +2141,12 @@ msgstr "Teeman nimi täytyy olla olemassa"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Teema on jo olemassa. Haluatko korvata sen?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Valitse työpöydän eri osien teemat"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Teema"
 
@@ -2229,11 +2258,11 @@ msgstr "Teeman _nimi:"
 msgid "theme selection tree"
 msgstr "teeman valintapuu"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Muokkaa sovelmien työkalupalkkien ja valikkojen ulkoasua"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Valikko- ja työkalupalkit"
 
@@ -2302,7 +2331,6 @@ msgid "_Edit"
 msgstr "_Muokkaa"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -2330,6 +2358,14 @@ msgstr "_Lopeta"
 msgid "_Save"
 msgstr "_Tallenna"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2341,23 +2377,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (tai \"Windows-logo\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Asetusohjelma"
 
@@ -2397,14 +2433,34 @@ msgstr "_Nosta valitut ikkunat tietyn ajan kuluttua"
 msgid "_Select windows when the mouse moves over them"
 msgstr "V_alitse ikkunat, kun hiiri liikkuu niiden päälle"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Ikkunan ominaisuudet"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Ikkunat"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Gnomen hallintakeskus"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Työpöydän taustan asetukset"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Muut"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Gnomen hallintatyökalu"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Hallintakeskus"
@@ -2433,89 +2489,6 @@ msgstr "Hallintakeskuksen näkymätehdas"
 msgid "View as Control Center"
 msgstr "Näytä hallintakeskuksena"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Gnomen hallintakeskus: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Asettelu"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Tämän hallintasovelmien näkymän asettelu"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Hallintasovelmien kansio-olio"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Tämän näkymän näyttämä hallintasovelmien kansio"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Pauli Virtanen, 2000-2004\n"
-"Mikko Rauhala <mjr@iki.fi>, -2000\n"
-"\n"
-"http://gnome-fi.org/"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Gnomen hallintakeskus"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Työpöydän asetusten hallinta."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Gnomen hallintakeskus : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Muut"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Gnomen hallintakeskus"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Käytä Nautilusta, jos se on käynnissä."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Tietoja tästä sovelluksesta"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Hallintakeskuksen yleiskatsaus"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Tietoja"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Sisältö"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Ohje"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Gnomen hallintatyökalu"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Käytä omaa ikkunaa vaikka Nautilus olisi käynnissä"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Äänenvoimakkuus"
@@ -2623,7 +2596,7 @@ msgstr ""
 "Näppäimeen (%2$s) kytketyn toiminnon\n"
 "(%1$s) suorittaminen epäonnistui."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2650,7 +2623,7 @@ msgstr ""
 "- Komennon <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b> "
 "tuloste"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2663,7 +2636,7 @@ msgstr ""
 "ohjelmiston\n"
 "version hankkimista."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2671,15 +2644,15 @@ msgstr ""
 "X-järjestelmän näppäimistöasetukset eroavat nykyisistä Gnome-työpöydän "
 "asetuksista. Kumpia asetuksia haluat käyttää?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Käytä X:n asetuksia"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Käytä Gnomen asetuksia"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2743,8 +2716,8 @@ msgstr "_Älä näytä tätä viestiä uudestaan"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Äänitiedoston %s latautuminen ääneksi %s epäonnistui"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Virhe käyttäjän kotikansion määrittämisessä"
 
@@ -2793,11 +2766,11 @@ msgstr "Näyttö"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Näyttö, jolle BGApplier piirtää"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Tämän tapahtuman äänitiedostoa ei ole."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2807,32 +2780,32 @@ msgstr ""
 "Saatat haluta asentaa gnome-audio-paketin,\n"
 "joka sisältää valikoiman oletusääniä."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Tiedosto %s ei ole kelvollinen WAV-tiedosto"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Äänitiedosto"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Äänet:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Ääni_tiedosto:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Valitse äänitiedosto"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Soita"
 
@@ -3091,28 +3064,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Hyvin pian XKB-asetukset GConfissa jäävät tarpeettomiksi (ne siirtyvät "
-"järjestelmäasetuksiin)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB-näppäimistöasettelu"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB-näppäimistömalli"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB-valinnat"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Näppäimistö_malli"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB-näppäimistöasettelu"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Näppäimistö_malli"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Pikanäppäimet"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "XKB-asetukset GConfissa tehdään tarpeettomiksi mahdollisimman nopeasti"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Hyvin pian XKB-asetukset GConfissa jäävät tarpeettomiksi (ne siirtyvät "
+"järjestelmäasetuksiin)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB-näppäimistöasettelu"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB-näppäimistömalli"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Lykkää taukoa"
@@ -3190,46 +3211,14 @@ msgstr ""
 "oikealla painikkeella ja valitse \"Lisää paneeliin -> Ohjelma -> Ilmoitusalue"
 "\"."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Abcdefghijklmnopqrsštuvwxyzåäö. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nimi:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Tyyli:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tyyppi:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Koko:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versio:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Tekijänoikeus:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Kuvaus:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "käyttö: %s kirjasinlajitiedosto\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Vaihda sovellusten kirjasimeksi"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Kirjasinten kontekstivalikkokohdat"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Valitse oletusohjelmasi"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3300,33 +3289,47 @@ msgstr "Luodaanko TrueType-kirjasimista pienoiskuvat"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Luodaanko Type1-kirjasimista pienoiskuvat"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Tehdas Fontilus-kontekstivalikoille"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Abcdefghijklmnopqrsštuvwxyzåäö. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontiluksen kontekstivalikko"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nimi:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus-kontekstivalikkotehdas"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Tyyli:"
+
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tyyppi:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Kirjasinten kontekstivalikon kohdat Nautiluksessa"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Koko:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Vaihda sovellusten kirjasimeksi"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versio:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Teeman ominaisuusnäkymäkomponentti"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Tekijänoikeus:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Kuvaus:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "käyttö: %s kirjasinlajitiedosto\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus - Teeman ominaisuusnäkymä"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Gnomen hallintakeskus"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3356,27 +3359,18 @@ msgstr "Käytä _kirjasinta"
 msgid "Themes"
 msgstr "Teemat"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Säädinteema"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Ikkunoiden reunojen teema"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Kuvaketeema"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Nyt näkyvä URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFGÅÄÖ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Jos tosi, joka asennetulle teemalle luodaan pienoiskuva."
@@ -3411,6 +3405,154 @@ msgstr "Luodaanko asennetuille teemoille pienoiskuvat"
 msgid "Whether to thumbnail themes"
 msgstr "Luodaanko teemoille pienoiskuvat"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFGÅÄÖ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Käytä _kirjasinta"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Palauta _oletusarvot"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla tai Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnomen pääte"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "M_uu editori:"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "M_uu postiohjelma:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "M_uu pääte:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "M_uu WWW-selain:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Käynnistä _päätteessä"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Tämä sovellus voi avata _URI:eja"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Käynnistä tämä sovellus _päätteessä"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Valitse postiohjelma:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Valitse pääte:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Valitse WWW-selain:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Valitse editori:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Esteettömyys"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Esteettömyysasetukset"
+
+#~ msgid "Advanced"
+#~ msgstr "Lisäasetukset"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Lisäasetukset"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Välipalvelinasetukset"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Gnomen hallintakeskus: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Asettelu"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Tämän hallintasovelmien näkymän asettelu"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Hallintasovelmien kansio-olio"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Tämän näkymän näyttämä hallintasovelmien kansio"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Pauli Virtanen, 2000-2004\n"
+#~ "Mikko Rauhala <mjr@iki.fi>, -2000\n"
+#~ "\n"
+#~ "http://gnome-fi.org/"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Työpöydän asetusten hallinta."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Gnomen hallintakeskus : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Gnomen hallintakeskus"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Käytä Nautilusta, jos se on käynnissä."
+
+#~ msgid "About this application"
+#~ msgstr "Tietoja tästä sovelluksesta"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Hallintakeskuksen yleiskatsaus"
+
+#~ msgid "_About"
+#~ msgstr "_Tietoja"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sisältö"
+
+#~ msgid "_Help"
+#~ msgstr "_Ohje"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Käytä omaa ikkunaa vaikka Nautilus olisi käynnissä"
+
+#~ msgid "XKB options"
+#~ msgstr "XKB-valinnat"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Kirjasinten kontekstivalikkokohdat"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Tehdas Fontilus-kontekstivalikoille"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontiluksen kontekstivalikko"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus-kontekstivalikkotehdas"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Kirjasinten kontekstivalikon kohdat Nautiluksessa"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Teeman ominaisuusnäkymäkomponentti"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus - Teeman ominaisuusnäkymä"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "Nyt näkyvä URI"
+
 #~ msgid "Sawfish window manager"
 #~ msgstr "Sawfish-ikkunointiohjelma"
 
@@ -3622,9 +3764,6 @@ msgstr "Luodaanko teemoille pienoiskuvat"
 #~ msgid "Desktop Wallpaper"
 #~ msgstr "Työpöydän tausta"
 
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Työpöydän taustan asetukset"
-
 #~ msgid "Show"
 #~ msgstr "Näytä"
 
@@ -3730,12 +3869,6 @@ msgstr "Luodaanko teemoille pienoiskuvat"
 #~ msgid "_Region:"
 #~ msgstr "_Alue:"
 
-#~ msgid "Language and Culture"
-#~ msgstr "Kieli ja kulttuuri"
-
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Muuta kieli- ja kulttuuriasetuksia"
-
 #~ msgid "Behavior"
 #~ msgstr "Toiminta"
 
diff --git a/po/fr.po b/po/fr.po
index 451d55248..6633788d4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center 2.8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-10-10 20:33+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -68,11 +68,11 @@ msgstr "_Clavier visuel"
 msgid "_Screenreader"
 msgstr "_Lecteur d'écran"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Aides techniques"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Permet d'activer les utilitaires d'accessibilité au démarrage de GNOME"
 
@@ -128,13 +128,13 @@ msgstr "Importer le fichier de réglages des fonctionnalités"
 msgid "_Import"
 msgstr "_Importer"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Règle les paramètres d'accessibilité de votre clavier"
 
@@ -347,11 +347,11 @@ msgstr "pixels/seconde"
 msgid "seconds"
 msgstr "secondes"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Modifi les réglages de l'arrière-plan de votre bureau"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Arrière-plan du bureau"
 
@@ -430,6 +430,13 @@ msgstr "Ajouter un papier peint"
 msgid "No Wallpaper"
 msgstr "Aucun papier peint"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -643,105 +650,15 @@ msgstr "Veuillez sélectionner une image."
 msgid "_Select"
 msgstr "_Sélectionner"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Applications préférées"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Sélectionne vos applications par défaut"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Navigateur texte W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Navigateur texte Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Navigateur texte Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Lecteur de courrier Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Terminal Gnome"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "XTerminal standard"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Veuillez spécifier un nom et une commande pour cette éditeur."
@@ -751,20 +668,23 @@ msgid "Add..."
 msgstr "Ajouter..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Éditeur _personnalisé :"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Personnalisé"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Lecteur de courrier _personnalisé :"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Personnalisé"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terminal _personnalisé :"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Navigateur Web _personnalisé :"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Cette application peut ouvrir _plusieurs fichiers"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -811,6 +731,16 @@ msgid "Mail Reader"
 msgstr "Lecteur de courrier"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "_Lancer dans un terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "_Lancer dans un terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -818,94 +748,170 @@ msgstr ""
 "Sélectionner le gestionnaire de fenêtres que vous désirez.  Vous devrez "
 "cliquez « Appliquer » pour le mettre en marche."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Lancer dans un _terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Éditeur de texte"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Cette application peut ouvrir des _URIs"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Cette application peut ouvrir _plusieurs fichiers"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Cette application doit être lancée en _ligne de commande"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Répond au contrôle à distance de _Netscape"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "_Utiliser cet éditeur pour ouvrir les fichiers texte dans le gestionnaire de "
 "fichiers"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Navigateur Web"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Gestionnaire de fenêtres"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_Commande :"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Propriétés..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Sélectionnez un lecteur de courrier :"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Sélectionner"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Sélectionnez un terminal :"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Navigateur Web par défaut"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Sélectionnez un navigateur Web :"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Sélectionnez un éditeur :"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Accessibilité"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Paramètres d'accessibilité"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Navigateur texte W3M"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Préférences avancées"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Navigateur texte Lynx"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Réglages avancés"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Navigateur texte Links"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Lecteur de courrier Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Terminal par défaut"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "XTerminal standard"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Changer la résolution de l'écran"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Résolution de l'écran"
 
@@ -996,7 +1002,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Êtes-vous sûr de vouloir supprimer définitivement cette entrée ?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Description"
 
@@ -1004,17 +1010,27 @@ msgstr "Description"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Types de fichiers et programmes"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Spécifie quels programmes sont utilisés pour ouvrir ou visionner chaque type "
 "de fichier"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Types de fichiers et programmes"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Spécifie quels programmes sont utilisés pour ouvrir ou visionner chaque type "
+"de fichier"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Actions"
@@ -1105,6 +1121,7 @@ msgid "_Protocol:"
 msgstr "_Protocole :"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Enlever"
 
@@ -1112,16 +1129,6 @@ msgstr "_Enlever"
 msgid "_Viewer component:"
 msgstr "Composant de _visualisation :"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Types de fichiers et programmes"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Spécifie quels programmes sont utilisés pour ouvrir ou visionner chaque type "
-"de fichier"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Éditer la catégorie du fichier"
@@ -1303,14 +1310,15 @@ msgid "Electronic mail transmission"
 msgstr "Transmission par courrier électronique"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Documentation GNOME"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Police"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Sélectionne les polices pour le bureau"
 
@@ -1519,29 +1527,29 @@ msgid "The type of accelerator."
 msgstr "Le type du raccourci clavier."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Action inconnue>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Bureau"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Son"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Gestion des fenêtres"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1550,30 +1558,30 @@ msgstr ""
 "Le raccourci clavier « %s » est déjà utilisé pour :\n"
 " « %s »\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Erreur lors de la définition du nouveau raccourci clavier dans la base de "
 "données de configuration : %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Erreur lors de la suppression du raccourci clavier de la base de données de "
 "configuration : %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Action"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Raccourci clavier"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
@@ -1585,23 +1593,10 @@ msgstr ""
 "Pour modifier un raccourci, cliquez sur la ligne correspondante et saisissez "
 "un nouveau raccourci, ou pressez « Backspace » pour l'effacer."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Affecte des raccourcis clavier aux commandes"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modèles"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Aperçu de l'agencement clavier"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1769,10 +1764,32 @@ msgstr "Intervalle de _travail se termine :"
 msgid "minutes"
 msgstr "minutes"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modèles"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Aperçu de l'agencement clavier"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Règle les paramètres de votre clavier"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Règle les paramètres de votre souris"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Curseur inconnu"
@@ -1937,20 +1954,21 @@ msgstr "_Réactivité :"
 msgid "_Timeout:"
 msgstr "_Délai :"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Souris"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Règle les paramètres de votre souris"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Proxy réseau"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Règle votre proxy réseau"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1994,8 +2012,9 @@ msgid "H_TTP proxy:"
 msgstr "Proxy _HTTP :"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Configuration du proxy réseau"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Règle votre proxy réseau"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2033,7 +2052,7 @@ msgstr "_Mot de passe :"
 msgid "_Secure HTTP proxy:"
 msgstr "Proxy HTTP _sécurisé :"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Active le son et permet d'associer des sons à certains événements"
 
@@ -2091,15 +2110,26 @@ msgstr ""
 "probablement que votre boîte de dialogue « Préférences du thème » a été mal "
 "installé, ou que vous n'avez pas installé le paquet « gnome-thèmes »."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Aucun emplacement de fichier de thème spécifié à installer"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "L'emplacement du fichier de thème à installer n'est pas valide"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2136,12 +2166,12 @@ msgstr "Le nom du thème doit être indiqué"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Le thème existe déjà. Voulez-vous le remplacer ?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Sélectionne les thèmes pour les diverses parties du bureau"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Thème"
 
@@ -2256,13 +2286,13 @@ msgstr "Nom du _thème :"
 msgid "theme selection tree"
 msgstr "arborescence de sélection de thèmes"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 "Personnalise l'apparence des barres d'outils et des menus dans les "
 "applications"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menus & barres d'outils"
 
@@ -2331,7 +2361,6 @@ msgid "_Edit"
 msgstr "_Édition"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fichier"
 
@@ -2359,6 +2388,14 @@ msgstr "_Quitter"
 msgid "_Save"
 msgstr "_Enregistrer"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2371,23 +2408,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Contrôle"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (ou « logo fenêtre »)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2429,14 +2466,34 @@ msgstr "_Mettre en avant la fenêtre sélectionnée après un intervalle"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Sélectionner la fenêtre lorsque la souris est au-dessus"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Règle le comportement des fenêtres"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Fenêtres"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Centre de contrôle GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Préférences de l'arrière-plan du bureau"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Autres"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Outil de configuration de GNOME."
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Centre de contrôle"
@@ -2465,92 +2522,6 @@ msgstr "Fabrique de vue du centre de contrôle"
 msgid "View as Control Center"
 msgstr "Voir en tant que centre de contrôle"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Centre de contrôle GNOME : %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Agencement"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Mise en page à utiliser pour cette vue des capplets"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Répertoire d'objet capplet"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Répertoire de capplets que cette vue présente"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Mainteneur :\n"
-"Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
-"\n"
-"Contributeurs :\n"
-"Christophe Fergeau <teuf@users.sourceforge.net>\n"
-"Mathieu Gauthier-Pilote <mathieu.g.p@videotron.ca>\n"
-"Sébastien Oustric <sebastien.oustric@laposte.net>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Centre de contrôle GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Gestionnaire des propriétés du bureau."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Centre de contrôle GNOME : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Autres"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Centre de contrôle GNOME"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Utiliser Nautilus si il est en cours de fonctionnement."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "À propos de cette application"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Aperçu du centre de contrôle"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "À _propos"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Sommaire"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Aide"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Outil de configuration de GNOME."
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Utiliser le shell même si Nautilus est en marche."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volume"
@@ -2659,7 +2630,7 @@ msgstr ""
 "Erreur lors de l'essai d'exécution de (%s)\n"
 "qui est lié à la clé (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2685,7 +2656,7 @@ msgstr ""
 "- Le résultat de <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</"
 "b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2697,7 +2668,7 @@ msgstr ""
 "Essayez d'utiliser une configuration plus simple ou utilisez une version "
 "plus récente de XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2705,15 +2676,15 @@ msgstr ""
 "Les réglages du clavier du système X diffèrent des réglages actuels du "
 "clavier GNOME. Quels réglages voulez-vous utiliser ?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Utiliser les réglages de X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Utiliser les réglages de GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2779,8 +2750,8 @@ msgstr "_Ne plus jamais afficher ce message"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Impossible de charger le fichier %s comme échantillon %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Impossible de déterminer le dossier personnel de l'utilisateur"
 
@@ -2829,11 +2800,11 @@ msgstr "Écran"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Écran sur lequel BGApplier doit dessiner"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Le fichier son défini pour cet événement n'existe pas."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2843,32 +2814,32 @@ msgstr ""
 "Vous devriez installer le paquet gnome-audio afin de\n"
 "disposer d'un jeu de sons par défaut."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Le fichier %s n'est pas un fichier wave valide"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Événement"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Fichier son"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Sons :"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Fichier son :"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Sélectionnez le fichier son"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Jouer"
 
@@ -3134,30 +3105,78 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Bientôt, les réglages XKB dans gconf seront écrasés (depuis la configuration "
-"du système)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Agencement clavier XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Modèle de clavier XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Options XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Modèle du clavier :"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Agencement clavier XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Modèle du clavier :"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Raccourcis clavier"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "Les réglages XKB dans gconf seront bientôt écrasés par les réglages du "
 "système"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Bientôt, les réglages XKB dans gconf seront écrasés (depuis la configuration "
+"du système)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Agencement clavier XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Modèle de clavier XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Reporter la pause"
@@ -3236,47 +3255,14 @@ msgstr ""
 "votre tableau de bord et en choisissant « Ajouter au tableau de bord -> "
 "Utilitaires -> Zone de notification »."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-"Portez ce vieux whisky au juge blond qui fume. 0123456789. àâçèéêëîïôùûüæœ."
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nom :"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Style :"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Type :"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Taille :"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Version :"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright :"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Description :"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "usage : %s fichierpolice\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Définir comme police d'applications"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Éléments du menu contextuel de police"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Sélectionne vos applications par défaut"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3352,33 +3338,48 @@ msgstr "(Dés)active les vignettes pour les polices TrueType"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "(Dés)active les vignettes pour les polices Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fabrique pour le menu contextuel de fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr ""
+"Portez ce vieux whisky au juge blond qui fume. 0123456789. àâçèéêëîïôùûüæœ."
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Menu contextuel de fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nom :"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fabrique de menu contextuel de fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Style :"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Éntrées de menu contextuel Nautilus pour les polices"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Type :"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Définir comme police d'applications"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Taille :"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Version :"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright :"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Description :"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Composant d'affichage du contenu des propriétés de thèmes"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "usage : %s fichierpolice\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Vue des propriétés de thèmes Themus"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Centre de contrôle GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3409,27 +3410,18 @@ msgstr "A_ppliquer la police"
 msgid "Themes"
 msgstr "Thèmes"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Thème des contrôles"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Thème des bordures de fenêtres"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Thème d'icônes"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI actuellement affiché"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Si c'est mis à vrai, alors les thèmes installés auront une vignette."
@@ -3463,3 +3455,154 @@ msgstr "Doit-on faire des vignettes pour les thèmes installés ?"
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "Doit-on faire des vignettes pour les thèmes ?"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "A_ppliquer la police"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "_Réinitialiser aux valeurs par défaut"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminal Gnome"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Éditeur _personnalisé :"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Lecteur de courrier _personnalisé :"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terminal _personnalisé :"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Navigateur Web _personnalisé :"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Lancer dans un _terminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Cette application peut ouvrir des _URIs"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Cette application doit être lancée en _ligne de commande"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Sélectionnez un lecteur de courrier :"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Sélectionnez un terminal :"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Sélectionnez un navigateur Web :"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Sélectionnez un éditeur :"
+
+#~ msgid "Accessibility"
+#~ msgstr "Accessibilité"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Paramètres d'accessibilité"
+
+#~ msgid "Advanced"
+#~ msgstr "Préférences avancées"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Réglages avancés"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Configuration du proxy réseau"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Centre de contrôle GNOME : %s"
+
+#~ msgid "Layout"
+#~ msgstr "Agencement"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Mise en page à utiliser pour cette vue des capplets"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Répertoire d'objet capplet"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Répertoire de capplets que cette vue présente"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Mainteneur :\n"
+#~ "Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
+#~ "\n"
+#~ "Contributeurs :\n"
+#~ "Christophe Fergeau <teuf@users.sourceforge.net>\n"
+#~ "Mathieu Gauthier-Pilote <mathieu.g.p@videotron.ca>\n"
+#~ "Sébastien Oustric <sebastien.oustric@laposte.net>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Gestionnaire des propriétés du bureau."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Centre de contrôle GNOME : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Centre de contrôle GNOME"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Utiliser Nautilus si il est en cours de fonctionnement."
+
+#~ msgid "About this application"
+#~ msgstr "À propos de cette application"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Aperçu du centre de contrôle"
+
+#~ msgid "_About"
+#~ msgstr "À _propos"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sommaire"
+
+#~ msgid "_Help"
+#~ msgstr "_Aide"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Utiliser le shell même si Nautilus est en marche."
+
+#~ msgid "XKB options"
+#~ msgstr "Options XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Éléments du menu contextuel de police"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fabrique pour le menu contextuel de fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menu contextuel de fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fabrique de menu contextuel de fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Éntrées de menu contextuel Nautilus pour les polices"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Composant d'affichage du contenu des propriétés de thèmes"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Vue des propriétés de thèmes Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI actuellement affiché"
diff --git a/po/ga.po b/po/ga.po
index c827ea23b..687c6fa6b 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib HEAD \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-03-21 21:46+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@debian.org>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -57,11 +57,11 @@ msgstr ""
 msgid "_Screenreader"
 msgstr "Léitheoir-_Scáthlán"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr ""
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 
@@ -105,13 +105,13 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Miarchlar"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr ""
 
@@ -316,11 +316,11 @@ msgstr "pixels/soicind"
 msgid "seconds"
 msgstr "soicind"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr ""
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Cúlra na Deasc"
 
@@ -400,6 +400,13 @@ msgstr "Suimigh Paipéir balla"
 msgid "No Wallpaper"
 msgstr "Paipiar balla"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -590,105 +597,15 @@ msgstr ""
 msgid "_Select"
 msgstr "Dealaigh"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr ""
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Amharcóir Teacs 'W3M'"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Amharcóir Teacs 'Lynx'"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Amharcóir Teacs 'Links'"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Post Mozilla"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Terminéal Gnome"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "XTerminéal Caighdeánach"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr ""
@@ -698,20 +615,22 @@ msgid "Add..."
 msgstr "Suim..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Eagathóir _Féindheanamh"
+#, fuzzy
+msgid "C_ustom"
+msgstr "_Saincheaptha:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr ""
+msgid "C_ustom:"
+msgstr "_Saincheaptha:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Teirminéal _Féindheanamh:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr ""
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Tá an feidhmchlár seo in an _cupla comhad a oscaile ag an am ceanna"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -758,98 +677,182 @@ msgid "Mail Reader"
 msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Rith i _Terminéal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Rith i _Terminéal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Tosaigh i Therminéal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminéal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Eagathóir Téasc"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Tá an feidhmchlár seo in an _URIs a oscailte"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Tá an feidhmchlár seo in an _cupla comhad a oscaile ag an am ceanna"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Caithfidh an feidhmchlár seo righ i _sliogán"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Bainit trial as an _eagartóir chun oscailte comhad téasc sa bainsteoir comhad"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Bainisteoir Fhuinneoga"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "O_rdú:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "Ai_nm:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Ábaltachtaí..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "Dealaigh"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+msgid "Debian Sensible Browser"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Roghnaigh Terminéal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "Roghnaigh Eagartóir:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Post Mozilla"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Amharcóir Teacs 'W3M'"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Amharcóir Teacs 'Lynx'"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Amharcóir Teacs 'Links'"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
 msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
 msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Réamhíocaíocht"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Post Mozilla"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Suíomh ag na Réamhíocaíocht"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "An Terminéal atá Loiceadh"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminéal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "XTerminéal Caighdeánach"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr ""
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr ""
 
@@ -932,7 +935,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Tuarascail"
 
@@ -940,15 +943,23 @@ msgstr "Tuarascail"
 msgid "Extensions"
 msgstr ""
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr ""
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr ""
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Gníomharta"
@@ -1039,6 +1050,7 @@ msgid "_Protocol:"
 msgstr ""
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "Sc_ríos"
 
@@ -1046,14 +1058,6 @@ msgstr "Sc_ríos"
 msgid "_Viewer component:"
 msgstr ""
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr ""
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr ""
@@ -1231,14 +1235,15 @@ msgid "Electronic mail transmission"
 msgstr ""
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Doiciméad le haighaidh GNOME"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Clófhoireann"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Roghnaigh na clófhoireann le haighaidh an deasc"
 
@@ -1435,55 +1440,55 @@ msgid "The type of accelerator."
 msgstr ""
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Míchumasach"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Deasc"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Glóir"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
 " \"%s\"\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr ""
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr ""
 
@@ -1493,24 +1498,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr ""
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr ""
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Samhail"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr ""
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1678,10 +1669,33 @@ msgstr ""
 msgid "minutes"
 msgstr "noimeáid"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr ""
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Samhail"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr ""
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Roghnaigh do álbachtaí miarchlár"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Roghnaigh do álbachtaí luchóg"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr ""
@@ -1844,21 +1858,22 @@ msgstr "_Tairseach:"
 msgid "_Timeout:"
 msgstr ""
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Luchóg"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Roghnaigh do álbachtaí luchóg"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Ionadóir Lín"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
-msgstr ""
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
+msgstr "Roghnaigh do álbachtaí miarchlár"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
 msgid "      "
@@ -1903,8 +1918,9 @@ msgid "H_TTP proxy:"
 msgstr "Ionadóir  _HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr ""
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Ionadóir Lín"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -1945,7 +1961,7 @@ msgstr "_Passfhocal:"
 msgid "_Secure HTTP proxy:"
 msgstr "Ionadaí _HTTP Daingeanach"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr ""
 
@@ -2000,15 +2016,26 @@ msgid ""
 "installed the \"gnome-themes\" package."
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2038,12 +2065,12 @@ msgstr ""
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Téma"
 
@@ -2159,11 +2186,11 @@ msgstr ""
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Róghchlaranna & Uirlischláranna"
 
@@ -2233,7 +2260,6 @@ msgid "_Edit"
 msgstr "_Eagar"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Comhad"
 
@@ -2261,6 +2287,14 @@ msgstr "_Ealu"
 msgid "_Save"
 msgstr "_Sábháil"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2269,23 +2303,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Smacht"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (nó \"Siombail Fhuinneoga\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2328,14 +2362,35 @@ msgstr ""
 msgid "_Select windows when the mouse moves over them"
 msgstr ""
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Álbachtaí Fuinneog"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Fuinneoga"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr ""
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Roghnachais na Paipéir balla"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "na Scagaire"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr ""
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2369,87 +2424,6 @@ msgstr ""
 msgid "View as Control Center"
 msgstr "téama an smacht"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Scéim"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Pól Ó Dubhthaigh (dubhthach@frink.nuigalway.ie)"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr ""
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr ""
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "na Scagaire"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "téama an smacht"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr ""
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Faoi an Cláir seo"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr ""
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Faoi"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr ""
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "Cab_hair"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr ""
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr ""
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Lánu"
@@ -2545,7 +2519,7 @@ msgid ""
 "which is linked to the key (%s)"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2560,7 +2534,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2568,22 +2542,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Roghnachais Scáileáin %d\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2634,8 +2608,8 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr ""
 
@@ -2682,43 +2656,43 @@ msgstr "Scáthlán"
 msgid "Screen on which BGApplier is to draw"
 msgstr ""
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr ""
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
 "for a set of default sounds."
 msgstr ""
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr ""
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Tuairim"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Comhad Glóir"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Glóireanna:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Comhad Glóir:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Roghnaigh Comhad Glóir"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Cas"
 
@@ -2971,26 +2945,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
+msgid "Default group, assigned on window creation"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
+msgid "Keep and manage separate group per window"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Roghnachais XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Modéil  Miarchlar:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Miarchlar"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Modéil  Miarchlar:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Roghnachais XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Miarchlar"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "_Modéil  Miarchlar:"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr ""
@@ -3062,45 +3082,12 @@ msgid ""
 "Notification area'."
 msgstr ""
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Ainm:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stíl:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Saghas:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Meid:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Leagan:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Cóipcheart"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Tuarascail:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+msgid "Sets the default application font"
 msgstr ""
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
@@ -3169,33 +3156,46 @@ msgstr ""
 msgid "Whether to thumbnail Type1 fonts"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Ainm:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stíl:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Saghas:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Meid:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "comhpháirt le haighaidh feicaint ar eilimint na téama"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Leagan:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Radharc eilimint na téama do Themus"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Cóipcheart"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Tuarascail:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+msgid "GNOME Font Viewer"
+msgstr ""
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3223,27 +3223,18 @@ msgstr ""
 msgid "Themes"
 msgstr "Téamaí"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "téama an smacht"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "téama le haighaidh taobh an fuinneog"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "téama le haighaidh dealbh"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI ar taispeant"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "AÁBCEÉFGHIÍ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Mar bhfuil sé fíor, bheidh na Téamaí feice mar ionga do ordóg"
@@ -3283,6 +3274,81 @@ msgstr "Cé acu na Téamaí a bhfuil insealbhach a chuir mar<b>ionga do ordóg</
 msgid "Whether to thumbnail themes"
 msgstr "Cé acu na Téamaí a chuir mar<b>ionga do ordóg</b>"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "AÁBCEÉFGHIÍ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Cuir i bhfeidhm _Clófhoireann"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+msgid "Sets the default theme"
+msgstr ""
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminéal Gnome"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Eagathóir _Féindheanamh"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Teirminéal _Féindheanamh:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Tosaigh i Therminéal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Tá an feidhmchlár seo in an _URIs a oscailte"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Caithfidh an feidhmchlár seo righ i _sliogán"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Roghnaigh Terminéal:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "Roghnaigh Eagartóir:"
+
+#~ msgid "Advanced"
+#~ msgstr "Réamhíocaíocht"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Suíomh ag na Réamhíocaíocht"
+
+#~ msgid "Layout"
+#~ msgstr "Scéim"
+
+#~ msgid "translator_credits"
+#~ msgstr "Pól Ó Dubhthaigh (dubhthach@frink.nuigalway.ie)"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "téama an smacht"
+
+#~ msgid "About this application"
+#~ msgstr "Faoi an Cláir seo"
+
+#~ msgid "_About"
+#~ msgstr "_Faoi"
+
+#~ msgid "_Help"
+#~ msgstr "Cab_hair"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "comhpháirt le haighaidh feicaint ar eilimint na téama"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Radharc eilimint na téama do Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI ar taispeant"
+
 #~ msgid "Sawfish window manager"
 #~ msgstr "Bainsteoir fhuinneoga do ainm Sawfish"
 
@@ -3391,9 +3457,6 @@ msgstr "Cé acu na Téamaí a chuir mar<b>ionga do ordóg</b>"
 #~ msgid "Desktop Wallpaper"
 #~ msgstr "Paipiar balla"
 
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Roghnachais na Paipéir balla"
-
 #~ msgid "Language"
 #~ msgstr "Teanga"
 
@@ -3458,9 +3521,6 @@ msgstr "Cé acu na Téamaí a chuir mar<b>ionga do ordóg</b>"
 #~ msgid "Quit"
 #~ msgstr "Ealu as"
 
-#~ msgid "C_ustom:"
-#~ msgstr "_Saincheaptha:"
-
 #, fuzzy
 #~ msgid "Clic_k on keypress"
 #~ msgstr "Cniog ar eochair"
diff --git a/po/gl.po b/po/gl.po
index 896a86469..27ccd6a85 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center (Gnome 2.0.0) 1.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2002-06-20 12:53+0200\n"
 "Last-Translator: Xabi García <xabigf@gmx.net>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -61,11 +61,11 @@ msgstr ""
 msgid "_Screenreader"
 msgstr ""
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr ""
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 
@@ -109,13 +109,13 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 #, fuzzy
 msgid "Set your keyboard accessibility preferences"
 msgstr "Propiedades de accesibilidade do teclado"
@@ -356,12 +356,12 @@ msgstr "píxels/segundo"
 msgid "seconds"
 msgstr "segundos"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 #, fuzzy
 msgid "Change your Desktop Background settings"
 msgstr "Cambia-lo fondo"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 #, fuzzy
 msgid "Desktop Background"
 msgstr "Fondo"
@@ -453,6 +453,13 @@ msgstr "Papel _tapiz"
 msgid "No Wallpaper"
 msgstr "Papel _tapiz"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -662,113 +669,16 @@ msgstr "Por favor, seleccione unha imaxe."
 msgid "_Select"
 msgstr "Borrar"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Aplicacións preferidas"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 #, fuzzy
 msgid "Select your default applications"
 msgstr "Escolle-la fonte para as aplicacións"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-#, fuzzy
-msgid "W3M Text Browser"
-msgstr "Navegador"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-#, fuzzy
-msgid "Lynx Text Browser"
-msgstr "Navegador"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-#, fuzzy
-msgid "Links Text Browser"
-msgstr "Navegador"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-#, fuzzy
-msgid "Evolution Mail Reader"
-msgstr "_Visualizador de axuda personalizado:"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-#, fuzzy
-msgid "Gnome Terminal"
-msgstr "Terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-#, fuzzy
-msgid "Standard XTerminal"
-msgstr "Iniciar nunha _terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-#, fuzzy
-msgid "ETerm"
-msgstr "Terminal"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Especificar un nome e un comando para este editor."
@@ -778,21 +688,23 @@ msgid "Add..."
 msgstr "Engadir..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_Editor personalizado"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Personalizado"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
 #, fuzzy
-msgid "C_ustom Mail Reader:"
-msgstr "_Visualizador de axuda personalizado:"
+msgid "C_ustom:"
+msgstr "Personalizado"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "_Terminal personalizada"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "_Navegador personalizado:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Esta aplicación pode abrir mú_ltiples ficheiros"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -840,6 +752,16 @@ msgid "Mail Reader"
 msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Iniciar nunha _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Iniciar nunha _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -848,93 +770,172 @@ msgstr ""
 "de aplicar, axita-la variña máxica e efectuar unha danza máxica para que "
 "funcione correctamente."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Iniciar nunha _terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Editor de texto"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Esta aplicación pode abrir _URIs"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Esta aplicación pode abrir mú_ltiples ficheiros"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Esta aplicación precisa ser executada nunha _shell"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Comprende-lo control remoto de N_etscape"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Usar este _editor para abrir ficheiros de texto no xestor de ficheiros"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Navegador"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Xestor de fiestras"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Co_mando:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "N_ome:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
 #, fuzzy
-msgid "_Select a Mail Reader:"
-msgstr "_Seleccionar un explorador de axuda:"
+msgid "_Select:"
+msgstr "Borrar"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Seleccionar unha terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Navegador por defecto"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Seleccionar un navegador:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Seleccionar un editor:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Accesibilidade"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Configuracións de accesibilidade"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Avanzado"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+msgid "Mozilla"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Configuración avanzada"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr ""
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+#, fuzzy
+msgid "W3M Text Browser"
+msgstr "Navegador"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+#, fuzzy
+msgid "Lynx Text Browser"
+msgstr "Navegador"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+#, fuzzy
+msgid "Links Text Browser"
+msgstr "Navegador"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+#, fuzzy
+msgid "Evolution Mail Reader"
+msgstr "_Visualizador de axuda personalizado:"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Terminal por defecto"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+#, fuzzy
+msgid "Standard XTerminal"
+msgstr "Iniciar nunha _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "Categoría"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+#, fuzzy
+msgid "ETerm"
+msgstr "Terminal"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr ""
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr ""
 
@@ -1022,7 +1023,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Descrición"
 
@@ -1030,17 +1031,29 @@ msgstr "Descrición"
 msgid "Extensions"
 msgstr "Extensións"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Tipos de ficheiros e programas"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Especificar qué programas empregaranse para abrir ou visualizar cada tipo de "
 "ficheiro"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+#, fuzzy
+msgid "File types and programs"
+msgstr "Tipos de ficheiros e programas"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+#, fuzzy
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Especificar qué programas empregaranse para abrir ou visualizar cada tipo de "
+"ficheiro"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Accións"
@@ -1147,6 +1160,7 @@ msgid "_Protocol:"
 msgstr "Nome do _Protocolo"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Borrar"
 
@@ -1155,18 +1169,6 @@ msgstr "_Borrar"
 msgid "_Viewer component:"
 msgstr "Compoñente de visualización"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-#, fuzzy
-msgid "File types and programs"
-msgstr "Tipos de ficheiros e programas"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-#, fuzzy
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Especificar qué programas empregaranse para abrir ou visualizar cada tipo de "
-"ficheiro"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Edita-la categoría dos ficheiros"
@@ -1348,14 +1350,15 @@ msgid "Electronic mail transmission"
 msgstr "Transmisión de correo electrónico"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Documentación de Gnome"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Fonte"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 #, fuzzy
 msgid "Select fonts for the desktop"
 msgstr "Escolle-la fonte para os iconos do escritorio"
@@ -1569,57 +1572,57 @@ msgid "The type of accelerator."
 msgstr "Teclee un novo acelerador"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Inhabilitado"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Acción descoñecida>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Son"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Administración das fiestras"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
 " \"%s\"\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Erro na posta dun novo acelerador na base de datos da configuración: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, fuzzy, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Erro na posta dun novo acelerador na base de datos da configuración: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Acción"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Combinación de teclas"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Combinacións de teclado"
 
@@ -1630,28 +1633,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "Teclee un novo acelerador, ou prema o retroceso para borralo"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr ""
-"<b>Punteiro descoñecido</b>\n"
-"%s"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Modelo"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "Combinacións de teclado"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, fuzzy, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1834,11 +1819,39 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr ""
+"<b>Punteiro descoñecido</b>\n"
+"%s"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Modelo"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "Combinacións de teclado"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 #, fuzzy
 msgid "Set your keyboard preferences"
 msgstr "Preferencias do teclado"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "Preferencias do menú e da barra de ferramentas"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Preferencias do rato"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 #, fuzzy
 msgid "Unknown Cursor"
@@ -2029,23 +2042,23 @@ msgstr "_Umbral"
 msgid "_Timeout:"
 msgstr ""
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Rato"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 #, fuzzy
 msgid "Set your mouse preferences"
 msgstr "Preferencias do rato"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 #, fuzzy
 msgid "Network Proxy"
 msgstr "Rede"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
 #, fuzzy
-msgid "Network proxy preferences"
+msgid "Set your network proxy preferences"
 msgstr "Preferencias da rede"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2094,7 +2107,7 @@ msgstr "_Empregar proxy HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
 #, fuzzy
-msgid "Network Proxy Configuration"
+msgid "Network Proxy Preferences"
 msgstr "Preferencias da rede"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
@@ -2139,7 +2152,7 @@ msgstr "_Contrasinal:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Empregar proxy HTTP"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 #, fuzzy
 msgid "Enable sound and associate sounds with events"
 msgstr "Habilita-los eventos de son do xestor de fiestras"
@@ -2197,15 +2210,26 @@ msgid ""
 "installed the \"gnome-themes\" package."
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2236,13 +2260,13 @@ msgstr ""
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 #, fuzzy
 msgid "Select themes for various parts of the desktop"
 msgstr "Escolle-la fonte para os iconos do escritorio"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2374,11 +2398,11 @@ msgstr "_Nome de usuario:"
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 #, fuzzy
 msgid "Menus & Toolbars"
 msgstr "Barra de ferramentas"
@@ -2458,7 +2482,6 @@ msgid "_Edit"
 msgstr "_Editar..."
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -2490,6 +2513,14 @@ msgstr ""
 msgid "_Save"
 msgstr "Esca_lado"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2498,25 +2529,25 @@ msgid ""
 "%s"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 #, fuzzy
 msgid "Control"
 msgstr "Control da interface de usuario"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 #, fuzzy
 msgid "Hyper"
 msgstr "Tipo"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2561,14 +2592,35 @@ msgstr ""
 msgid "_Select windows when the mouse moves over them"
 msgstr "Seleccionar as fiestras cando o rato se mova sobre elas"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
-msgstr "Propiedades das fiestras"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
+msgstr "Configurar propiedades das fiestras"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Fiestras"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Centro de Control de GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Preferencias da rede"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "_Ficheiro"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "A ferramenta de configuración de GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2603,90 +2655,6 @@ msgstr "Menú do centro de control"
 msgid "View as Control Center"
 msgstr "Centro de Control de Gnome : %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Centro de control de GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Deseño"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Diseño a empregar nesta vista dos capplets"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Obxecto directorio de capplets"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Directorio de capplets que se amosa nesta visualización"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Xabi García <xabigf@gmx.net>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Centro de Control de GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Xestor de propiedades do escritorio."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Centro de Control de Gnome : %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "_Ficheiro"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "Centro de Control de Gnome : %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Emprega-la shell anque se esté a executar Nautilus."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Acerca de esta aplicación"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Vista xeral do centro de control"
-
-#: control-center/gnomecc-ui.xml.h:3
-#, fuzzy
-msgid "_About"
-msgstr "_Acerca de..."
-
-#: control-center/gnomecc-ui.xml.h:4
-#, fuzzy
-msgid "_Contents"
-msgstr "_Contidos"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Axuda"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "A ferramenta de configuración de GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Emprega-la shell anque se esté a executar Nautilus."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 #, fuzzy
 msgid "Volume"
@@ -2789,7 +2757,7 @@ msgstr ""
 "Erro no intento de executar (%s)\n"
 "o cal está ligado á tecla (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2804,7 +2772,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2812,22 +2780,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Configuración avanzada"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2883,8 +2851,8 @@ msgstr "_Non amosar esta mensaxe outra vez"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Non se puido carga-lo ficheiro de son %s como evento de %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr ""
 
@@ -2934,11 +2902,11 @@ msgstr ""
 msgid "Screen on which BGApplier is to draw"
 msgstr ""
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "O ficheiro de son para este evento non existe."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2948,36 +2916,36 @@ msgstr ""
 "Deberíase instala-lo paquete gnome-audio\n"
 "para dispoñer dos sonidos predeterminados."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr ""
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Evento"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 #, fuzzy
 msgid "Sound File"
 msgstr "Son"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 #, fuzzy
 msgid "_Sounds:"
 msgstr "_Sons"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 #, fuzzy
 msgid "Sound _file:"
 msgstr "Seleccionar ficheiro de son"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 #, fuzzy
 msgid "Select Sound File"
 msgstr "Seleccionar ficheiro de son"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Reproducir"
 
@@ -3246,29 +3214,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Habilitar son de teclado"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
 #, fuzzy
-msgid "XKB keyboard layout"
+msgid "Keyboard layout"
 msgstr "Combinacións de teclado"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
 #, fuzzy
-msgid "XKB keyboard model"
+msgid "Keyboard model"
 msgstr "Son do teclado"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
 #, fuzzy
-msgid "XKB options"
-msgstr "Accións"
+msgid "Keyboard options"
+msgstr "Propiedades do teclado"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Combinacións de teclado"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Son do teclado"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr ""
@@ -3342,49 +3353,15 @@ msgid ""
 "Notification area'."
 msgstr ""
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:253
-#, fuzzy
-msgid "Name:"
-msgstr "N_ome:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:265
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
 #, fuzzy
-msgid "Type:"
-msgstr "Tipo"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr ""
+msgid "Set as Application Font"
+msgstr "Fonte estándar de _aplicación"
 
-#: vfs-methods/fontilus/font-view.c:324
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
 #, fuzzy
-msgid "Description:"
-msgstr "_Descrición"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
-
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr ""
+msgid "Sets the default application font"
+msgstr "Escolle-la fonte para as aplicacións"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3452,36 +3429,50 @@ msgstr ""
 msgid "Whether to thumbnail Type1 fonts"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
+#: vfs-methods/fontilus/font-view.c:285
 #, fuzzy
-msgid "Fontilus context menu"
-msgstr "Menú do centro de control"
+msgid "Name:"
+msgstr "N_ome:"
+
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr ""
+
+#: vfs-methods/fontilus/font-view.c:297
+#, fuzzy
+msgid "Type:"
+msgstr "Tipo"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr ""
+
+#: vfs-methods/fontilus/font-view.c:356
 #, fuzzy
-msgid "Set as Application Font"
-msgstr "Fonte estándar de _aplicación"
+msgid "Description:"
+msgstr "_Descrición"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
 msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
 #, fuzzy
-msgid "Themus Theme Properties view"
-msgstr "Propiedades do rato"
+msgid "GNOME Font Viewer"
+msgstr "Centro de Control de GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3511,31 +3502,21 @@ msgstr "Aplicar agora"
 msgid "Themes"
 msgstr "Tema"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 #, fuzzy
 msgid "Control theme"
 msgstr "Tema do Punteiro"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 #, fuzzy
 msgid "Window border theme"
 msgstr "Apariencia do borde da fiestra"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 #, fuzzy
 msgid "Icon theme"
 msgstr "Tema do Punteiro"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-#, fuzzy
-msgid "URI currently displayed"
-msgstr "Transferindo actualmente para a URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr ""
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3569,6 +3550,147 @@ msgstr ""
 msgid "Whether to thumbnail themes"
 msgstr ""
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr ""
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Instalar novo tema..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Empregar valores por _defecto da categoría"
+
+#, fuzzy
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_Editor personalizado"
+
+#, fuzzy
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "_Visualizador de axuda personalizado:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "_Terminal personalizada"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "_Navegador personalizado:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Iniciar nunha _terminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Esta aplicación pode abrir _URIs"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Esta aplicación precisa ser executada nunha _shell"
+
+#, fuzzy
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Seleccionar un explorador de axuda:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Seleccionar unha terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Seleccionar un navegador:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Seleccionar un editor:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Accesibilidade"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Configuracións de accesibilidade"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzado"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Configuración avanzada"
+
+#, fuzzy
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Preferencias da rede"
+
+#~ msgid "Window Properties"
+#~ msgstr "Propiedades das fiestras"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Centro de control de GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Deseño"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Diseño a empregar nesta vista dos capplets"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Obxecto directorio de capplets"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Directorio de capplets que se amosa nesta visualización"
+
+#~ msgid "translator_credits"
+#~ msgstr "Xabi García <xabigf@gmx.net>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Xestor de propiedades do escritorio."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Centro de Control de Gnome : %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "Centro de Control de Gnome : %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Emprega-la shell anque se esté a executar Nautilus."
+
+#~ msgid "About this application"
+#~ msgstr "Acerca de esta aplicación"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Vista xeral do centro de control"
+
+#, fuzzy
+#~ msgid "_About"
+#~ msgstr "_Acerca de..."
+
+#, fuzzy
+#~ msgid "_Contents"
+#~ msgstr "_Contidos"
+
+#~ msgid "_Help"
+#~ msgstr "_Axuda"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Emprega-la shell anque se esté a executar Nautilus."
+
+#, fuzzy
+#~ msgid "XKB options"
+#~ msgstr "Accións"
+
+#, fuzzy
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menú do centro de control"
+
+#, fuzzy
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Propiedades do rato"
+
+#, fuzzy
+#~ msgid "URI currently displayed"
+#~ msgstr "Transferindo actualmente para a URI"
+
 #~ msgid ""
 #~ "Unable to find any keyboard themes.  This means your GTK+ installation "
 #~ "has been incompletely installed."
@@ -3777,10 +3899,6 @@ msgstr ""
 #~ msgstr "Papel _tapiz"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Preferencias da rede"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "Configuración avanzada"
 
@@ -3821,17 +3939,9 @@ msgstr ""
 #~ msgstr "Tema do Punteiro"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "Preferencias do menú e da barra de ferramentas"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "_Descrición"
 
-#, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Preferencias do rato"
-
 #~ msgid "Background"
 #~ msgstr "Fondo"
 
@@ -3942,18 +4052,10 @@ msgstr ""
 #~ msgstr "Ficheiro a reproducir"
 
 #, fuzzy
-#~ msgid "Apply theme..."
-#~ msgstr "_Instalar novo tema..."
-
-#, fuzzy
 #~ msgid "Themus component"
 #~ msgstr "Compoñente de visualización"
 
 #, fuzzy
-#~ msgid "C_ustom:"
-#~ msgstr "Personalizado"
-
-#, fuzzy
 #~ msgid "Repeat Keys"
 #~ msgstr "Velocidade de repetición"
 
@@ -4138,9 +4240,6 @@ msgstr ""
 #~ msgid "Configure window appearance"
 #~ msgstr "Configurar apariencia das fiestras"
 
-#~ msgid "Configure window properties"
-#~ msgstr "Configurar propiedades das fiestras"
-
 #~ msgid "Configure window manager configuration properties"
 #~ msgstr "Configura-las propiedades de configuración do xestor de fiestras"
 
@@ -4233,9 +4332,6 @@ msgstr ""
 #~ msgid "Key_press makes sound"
 #~ msgstr "As premas de _teclas producen son"
 
-#~ msgid "Keyboard bell _enabled"
-#~ msgstr "_Habilitar son de teclado"
-
 #~ msgid "Keyboard bell _off"
 #~ msgstr "_Desactivar son do teclado"
 
@@ -4286,9 +4382,6 @@ msgstr ""
 #~ msgid "_Custom keyboard bell:"
 #~ msgstr "_Son de teclado personalizado:"
 
-#~ msgid "Keyboard Properties"
-#~ msgstr "Propiedades do teclado"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Configura-lo uso do son de GNOME"
 
diff --git a/po/gu.po b/po/gu.po
index 0905d2e2c..5e841a903 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-10-14 09:49+0530\n"
 "Last-Translator: Ankit Patel <ankit@redhat.com>\n"
 "Language-Team: Gujarati\n"
@@ -66,11 +66,11 @@ msgstr "સ્ક્રીન પરનું કીબોર્ડ (_O)"
 msgid "_Screenreader"
 msgstr "સ્ક્રીન વાંચક (_S)"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "સહાયક તકનીકીનો આધાર"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "પ્રવેશ વખતે જીનોમ સહાયક તકનીકીઓનો આધાર સક્રિય કરો"
 
@@ -121,13 +121,13 @@ msgstr "લાક્ષણિકતા સુયોજના માટેની
 msgid "_Import"
 msgstr "આયાત (_I)"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "કીબોર્ડ"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "કીબાેર્ડની સુલભતા માટેની પસંદગીઓ સુયોજિત કરો"
 
@@ -339,11 +339,11 @@ msgstr "બિંદુઓ/સેકન્ડ"
 msgid "seconds"
 msgstr "સેકન્ડ"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "તમારા ડેસ્કટોપના પાશ્વ ભાગના સુયોજનો બદલો"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "ડેસ્કટોપનો પાશ્વ ભાગ"
 
@@ -428,6 +428,13 @@ msgstr "વોલપેપર ઉમેરો"
 msgid "No Wallpaper"
 msgstr "વોલપેપર નથી"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -629,105 +636,15 @@ msgstr "મહેરબાની કરીને ચિત્ર પસંદ �
 msgid "_Select"
 msgstr "પસંદ કરો (_S)"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "પસંદિત કાર્યક્રમો"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "તમારા મૂળભુત કાર્યક્રમો પસંદ કરો"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "એપીફની"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "ગેલિયન"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "ઘેરવુ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "ફાયરબર્ડ/ફાયરફોક્સ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "મોઝિલ્લા/નેટસ્કેપ ૬"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "નેટસ્કેપ કમ્યુનિકેટર"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "કોન્કર"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M લખાણ બ્રાઉઝર"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "લિંક્ષ લખાણ બ્રાઉઝર"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "કડીઓનું લખાણ બ્રાઉઝર"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "ઈવોલ્યુશન મેઈલ વાંચનાર"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "બાલ્સા"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "કેમેઈલ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "મોઝિલ્લા મેઈલ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "મટ્ટ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "જીનોમ ટર્મિનલ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "પ્રમાણભૂત એક્સટર્મિનલ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "મહેરબાની કરીને આ સંપાદક માટે નામ અને આદેશ સ્પષ્ટ કરો."
@@ -736,21 +653,32 @@ msgstr "મહેરબાની કરીને આ સંપાદક મા�
 msgid "Add..."
 msgstr "ઉમેરો..."
 
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# libgnomeprint/gpa/gpa-media.c:241
+# #-#-#-#-#  libgnomeprint.gnome-2-2.hi.po (libgnomeprint VERSION)  #-#-#-#-#
+# libgnomeprint/gpa/gpa-media.c:241
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "કસ્ટમ સંપાદક (_u)"
+#, fuzzy
+msgid "C_ustom"
+msgstr "કસ્ટમ"
 
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# libgnomeprint/gpa/gpa-media.c:241
+# #-#-#-#-#  libgnomeprint.gnome-2-2.hi.po (libgnomeprint VERSION)  #-#-#-#-#
+# libgnomeprint/gpa/gpa-media.c:241
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "કસ્ટમ મેઈલ વાંચનાર (_u):"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "કસ્ટમ"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "કસ્ટમ ટર્મિનલ (_u):"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "કસ્ટમ વેબ બ્રાઉઝર (_u):"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "આ કાર્યક્રમ ઘણીબધી ફાઈલો ખોલી શકે છે (_m)"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -797,6 +725,16 @@ msgid "Mail Reader"
 msgstr "મેઈલ વાંચનાર"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "ટર્મિનલમાં ચાલુ કરો (_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "ટર્મિનલમાં ચાલુ કરો (_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -804,95 +742,168 @@ msgstr ""
 "જે વિન્ડો સંચાલકની તમને જરુર હોય તે પસંદ કરો. તમારે આને અમલમાં મુકવુ પડશે, જાદુની લાકડી "
 "ફેરવવી પડશે, જાદુઈ નૃત્ય કરવું પડશે કે જેથી તે કામ કરે."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "ટર્મિનલમાં ચાલુ કરો (_e)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "ટર્મિનલ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "લખાણ સંપાદક"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "આ કાર્યક્રમ _URI ખોલી શકે છે"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "આ કાર્યક્રમ ઘણીબધી ફાઈલો ખોલી શકે છે (_m)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "આ કાર્યક્રમને શેલમાં ચાલુ કરવું જરુરી છે (_s)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "નેટસ્કેપ દૂર નિયંત્રણને સમજે છે (_N)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "ફાઈલ સંચાલકમાં લખાણની ફાઈલો ખોલવા માટે આ સંપાદકનો ઉપયોગ કરો (_e)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "વેબ બ્રાઉઝર"
 
 # gnome-session/splash.c:71
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "વિન્ડો સંચાલક"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "આદેશ (_m):"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "નામ (_N):"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "ગુણધર્મો (_P)..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "મેઈલ વાંચનાર પસંદ કરો (_S):"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "પસંદ કરો (_S)"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+msgid "Debian Sensible Browser"
+msgstr "ડેબિયન સંવેદનશીલ બ્રાઉઝર"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "એપીફની"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "ગેલિયન"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "ઘેરવુ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "ટર્મિનલ પસંદ કરો (_S):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "ફાયરબર્ડ/ફાયરફોક્સ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "વેબ બ્રાઉઝર પસંદ કરો (_S):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+#, fuzzy
+msgid "Firefox"
+msgstr "ફાયરફોક્સ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "સંપાદક પસંદ કરો (_S):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "મોઝિલ્લા મેઈલ"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "સુલભતા"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "નેટસ્કેપ કમ્યુનિકેટર"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "સુલભતા સુયોજનાઓ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "કોન્કર"
 
-# #-#-#-#-#  gnome-desktop.gnome-2-2.hi.po (gnome-desktop VERSION)  #-#-#-#-#
-# libgnome-desktop/gnome-ditem-edit.c:776
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "ઉન્નત"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M લખાણ બ્રાઉઝર"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "લિંક્ષ લખાણ બ્રાઉઝર"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "ઉન્નત સુયોજનાઓ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "કડીઓનું લખાણ બ્રાઉઝર"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "ઈવોલ્યુશન મેઈલ વાંચનાર"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "બાલ્સા"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "કેમેઈલ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "મોઝિલ્લા મેઈલ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "મટ્ટ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+msgid "Debian Terminal Emulator"
+msgstr "ડેબિયન ટર્મિનલ ઈમ્યુલેટર"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "ટર્મિનલ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "પ્રમાણભૂત એક્સટર્મિનલ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "સ્ક્રીન રીઝોલ્યુશન બદલો"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "સ્ક્રીન રીઝોલ્યુશન"
 
@@ -983,7 +994,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "શુ તમે ખરેખર આ પ્રવેશને કાયમ માટે કાઢી નાખવા માંગો છો?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "વર્ણન"
 
@@ -991,15 +1002,23 @@ msgstr "વર્ણન"
 msgid "Extensions"
 msgstr "જોડાણો"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "ફાઈલનાં પ્રકારો અને કાર્યક્રમો"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "સ્પષ્ટ કરો કે કયા કાર્યક્રમો દરેક ફાઈલને ખોલવા અથવા પ્રકાર જોવા માટે વપરાય છે"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "ફાઈલ પ્રકારો અને કાર્યક્રમો"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "સ્પષ્ટ કરો કે કયા કાર્યક્રમો દરેક ફાઈલને ખોલવા અને પ્રકાર જોવા માટે વપરાય છે"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "ક્રિયાઓ"
@@ -1090,6 +1109,7 @@ msgid "_Protocol:"
 msgstr "પ્રોટોકોલ (_P):"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "દૂર કરો (_R)"
 
@@ -1097,14 +1117,6 @@ msgstr "દૂર કરો (_R)"
 msgid "_Viewer component:"
 msgstr "જોવા માટેનો ભાગ (_V):"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "ફાઈલ પ્રકારો અને કાર્યક્રમો"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "સ્પષ્ટ કરો કે કયા કાર્યક્રમો દરેક ફાઈલને ખોલવા અને પ્રકાર જોવા માટે વપરાય છે"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "ફાઈલના વર્ગમાં ફેરફાર કરો"
@@ -1292,18 +1304,19 @@ msgid "Electronic mail transmission"
 msgstr "ઈલેક્ટ્રોનિક મેઈલ સ્થળાંતર"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "જીનોમ દસ્તાવેજ"
 
 # #-#-#-#-#  libgnomecanvas.gnome-2-2.hi.po (libgnomecanvas)  #-#-#-#-#
 # libgnomecanvas/gnome-canvas-text.c:238
 # #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-#
 # libgnomeui/gnome-font-picker.c:184 libgnomeui/gnome-font-picker.c:979
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "ફોન્ટ"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "ડેસ્કટોપ માટે ફોન્ટ પસંદ કરો"
 
@@ -1512,34 +1525,34 @@ msgstr "પ્રવેગનો પ્રકાર."
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gtk/gtkinputdialog.c:238
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "નિષ્ક્રિય"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "&lt;Unknown Action&gt;"
 
 # #-#-#-#-#  gnome-panel.gnome-2-2.hi.po (gnome-panel 2.2)  #-#-#-#-#
 # gnome-session/splash.c:72
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "ડેસ્કટોપ"
 
 # #-#-#-#-#  gnome-icon-theme.gnome-2-2.hi.po (gnome-icon theme 2.2)  #-#-#-#-#
 # 48x48/emblems/emblem-sound.icon.in.h:1
 # 48x48/emblems/emblem-sound.icon.in.h:1
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "ધ્વનિ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "વિન્ડોની વ્યવસ્થા"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1548,28 +1561,28 @@ msgstr ""
 "આ ટુંકાણ \"%s\" પહેલેથી જ:\n"
 " \"%s\" માટે વપરાયેલ છે\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "રુપરેખાંકન ડેટાબેઝમાં નવી પ્રવેગક સુયોજીત કરવામાં ભૂલ :%s \n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "રુપરેખાંકન ડેટાબેઝમાં નવી પ્રવેગક સુયોજીત કરવામાં ભૂલ :%s \n"
 
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/logout.c:266
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "ક્રિયા"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "ટુંકાણ"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "કીબોર્ડ ટુંકાણો"
 
@@ -1581,25 +1594,10 @@ msgstr ""
 "ટુકાણ કીમાં ફેરફાર કરવા માટે, તેને લાગતી હરોળ પર ક્લિક કરો અને નવી પ્રવેગી કી લખો, "
 "અથવા સાફ કરવા માટે બેકસ્પેસ કી દબાવો."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "આદેશો માટે ટુંકાણ કી સુયોજીત કરો"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "અજ્ઞાત"
-
-# libgnomeprintui/gpaui/add-printer-dialog.c:83
-# libgnomeprintui/gpaui/config-dialog.c:83
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "મોડેલો"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "કીબોર્ડ દેખાવનું પૂર્વદર્શન"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1766,10 +1764,34 @@ msgstr "ચાલુ કાર્ય સમયાંતરો (_W):"
 msgid "minutes"
 msgstr "મિનિટો"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "અજ્ઞાત"
+
+# libgnomeprintui/gpaui/add-printer-dialog.c:83
+# libgnomeprintui/gpaui/config-dialog.c:83
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "મોડેલો"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "કીબોર્ડ દેખાવનું પૂર્વદર્શન"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "તમારા કીબાેર્ડની પસંદગીઓ ગોઠવો"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "તમારા માઉસની પસંદગીઓ ગોઠવો"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "અજાણ્યુ કર્સર"
@@ -1934,20 +1956,21 @@ msgstr "થ્રેશોલ્ડ (_T):"
 msgid "_Timeout:"
 msgstr "સમય સમાપ્ત (_T):"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "માઉસ"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "તમારા માઉસની પસંદગીઓ ગોઠવો"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "નેટવર્ક પ્રોક્સી"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "નેટવર્ક પ્રોક્સીની પસંદગીઓ"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1991,8 +2014,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP પ્રોક્સી:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "નેટવર્ક પ્રોક્સીની રુપરેખા"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "નેટવર્ક પ્રોક્સીની પસંદગીઓ"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2032,7 +2056,7 @@ msgstr "પાસવર્ડ (_P):"
 msgid "_Secure HTTP proxy:"
 msgstr "સુરક્ષિત HTTP પ્રોક્સી (_S):"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "અવાજને સક્રિય કરો અને અવાજ સાથે ઘટનાઓ સંકળો"
 
@@ -2089,15 +2113,26 @@ msgstr ""
 "તમારી સિસ્ટમમાં કોઈ થીમ મળી નહિં. કદાચ એનો અર્થ એ હોઈ શકે કે \"થીમની પસંદગીઓ\" સંવાદ "
 "અયોગ્ય રીતે સ્થાપિત થયો હશે, અથવા તમે \"જીનોમ થીમ\" પેકેજ સ્થાપિત કર્યો નથી."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "સ્થાપન કરવા માટે કોઈ થીમ ફાઈલની જગ્યા સ્પષ્ટ થઈ નથી"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "સ્થાપન કરવા માટે કોઈ થીમ ફાઈલની જગ્યા માન્ય નથી"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2130,12 +2165,12 @@ msgstr "થીમનું નામ હોવું જ જોઈએ"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "થીમ પહેલાથી જ હાજર છે. શું તમે એને બદલવા માંગો છો?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "ડેસ્કટોપનાં ભિન્ન ભાગો માટે થીમ પસંદ કરો"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "થીમ"
 
@@ -2247,11 +2282,11 @@ msgstr "થીમનું નામ (_T):"
 msgid "theme selection tree"
 msgstr "થીમની પસંદગી માટેનુ ટ્રી"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "કાર્યક્રમોમાં સાધનપટ્ટી અને મેનુ-દર્શકપટ્ટીનો દેખાવ પોતાની જાતે સુયોજીત કરો"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "મેનુઓ & સાધનપટ્ટીઓ"
 
@@ -2332,7 +2367,6 @@ msgstr "ફેરફાર (_E)"
 # libgnomeui/gnome-app-helper.c:82 libgnomeui/gnome-app-helper.h:513
 # test-gnome/testgnome.xml.h:5
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "ફાઈલ (_F)"
 
@@ -2366,6 +2400,14 @@ msgstr "બહાર નીકળો (_Q)"
 msgid "_Save"
 msgstr "સંગ્રહો (_S)"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2377,23 +2419,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "નિયંત્રણ"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "ઓલ્ટ"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "હાયપર"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "સુપર (અથવા \"વિન્ડોનો લોગો\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "મેટા"
 
@@ -2433,14 +2475,34 @@ msgstr "એક સમયાંતર પછી પસંદ થયેલી વ�
 msgid "_Select windows when the mouse moves over them"
 msgstr "જ્યારે માઉસ વિન્ડોની ઉપર જાય ત્યારે તેને પસંદ કરો (_S)"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "વિન્ડોના ગુણધર્મો"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "વિન્ડો"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "જીનોમ નિયંત્રણ કેન્દ્ર"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "ડેસ્કટોપના પાશ્વ ભાગની પસંદગીઓ"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "અન્ય"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "જીનોમ રુપરેખાનું સાધન"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "નિયંત્રક કેન્દ્ર"
@@ -2469,93 +2531,6 @@ msgstr "નિયંત્રક કેન્દ્ર દર્શક કાર
 msgid "View as Control Center"
 msgstr "નિયંત્રણ કેન્દ્ર તરીકે જુઓ"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "જીનોમ નિયંત્રણ કેન્દ્ર: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "દેખાવ"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "કેપ્લેટના આ દર્શન માટે દેખાવનો ઉપયોગ કરો"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "કેપ્લેટ ડિરેક્ટરી આેબ્જેક્ટ"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "કેપ્લેટ ડિરેક્ટરી કે જે આ દર્શન બતાવે છે"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"નીરવ <nirav@magnet-i.com>\n"
-"અંકિત <ankit644@linux.net>\n"
-"અંકુર <ankur_surti@linux.net>\n"
-"અતિત <shahatit_84@linux.net>\n"
-"ભાવિન <bhavinshah@linux.net>\n"
-"કાર્તિક <kartik_mistry@linux.net>\n"
-"ખુશ્બુ <khushbu_hi21@yahoo.co.in>\n"
-"શ્વેતા <sweta2782@yahoo.co.in>."
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "જીનોમ નિયંત્રણ કેન્દ્ર"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "ડેસ્કટોપ ગુણધર્મ સંચાલક."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "જીનોમ નિયંત્રણ કેન્દ્ર : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "અન્ય"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "જીનોમ નિયંત્રણ કેન્દ્ર"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "નોટિલસ ચાલતું હોય તોપણ તેને વાપરો."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "આ કાર્યક્રમ વિશે"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "નિયંત્રણ કેન્દ્રની જાણકારી"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "વિશે (_A)"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "વિષયસૂચિ (_C)"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "મદદ (_H)"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "જીનોમ રુપરેખાનું સાધન"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "નોટિલસ ચાલતું હોય તો પણ શેલ વાપરો."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "અવાજનું પ્રમાણ"
@@ -2661,7 +2636,7 @@ msgstr ""
 "(%s) ને ચલાવવાના પ્રયત્નમાં ભૂલ થઈ\n"
 "કે જે કી (%s) સાથે સંકળાયેલ છે"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2686,7 +2661,7 @@ msgstr ""
 "- <b>xprop -root | grep XKB</b> નું પરિણામ\n"
 "- <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b> નું પરિણામ"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2698,7 +2673,7 @@ msgstr ""
 "સરળ રુપરેખાઓ વાપરવાનું પસંદ કરો અથવા XFree સોફ્ટવેરની એકદમ નવી આવૃત્તિ વાપરવાનું ચાલુ "
 "કરો."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2706,15 +2681,15 @@ msgstr ""
 "X સિસ્ટમ કીબોર્ડ સુયોજનો તમારા વર્તમાન GNOME કીબોર્ડ સુયોજનોથી અલગ પડે છે. તમે કયું "
 "વાપરવા માંગો છો?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "X સુયોજનો વાપરો"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "GNOME સુયોજનો વાપરો"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2778,8 +2753,8 @@ msgstr "આ સંદેશો ફરીથી બતાવશો નહિં (
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "અવાજ ફાઈલ %s ને નમૂના %s ની જેમ લાવી શકાયું નહિં"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "વપરાશકર્તાની મુખ્ય ડિરેક્ટરી નક્કી કરી શકાઈ નહિં"
 
@@ -2828,11 +2803,11 @@ msgstr "સ્ક્રીન"
 msgid "Screen on which BGApplier is to draw"
 msgstr "સ્ક્રીન કે જેના ઉપર BGApplier લઈ જવાનું છે"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "આ ઘટના માટે ધ્વનિ ફાઈલ ઉપ્લબ્ધ નથી."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2842,32 +2817,32 @@ msgstr ""
 "મૂળભુત ધ્વનિનાં સમૂહો માટે તમારે\n"
 "જીનોમ-ધ્વનિ પેકેજ સ્થાપિત કરવું પડશે."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "ફાઈલ %s એ યોગ્ય વેવ ફાઈલ નથી"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "ઘટના"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "ધ્વનિ ફાઈલ"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "ધ્વનિઓ (_S):"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "ધ્વનિ ફાઈલ (_f):"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "ધ્વનિ ફાઈલ પસંદ કરો"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "વગાડો (_P)"
 
@@ -3124,26 +3099,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "હમણાં જ, જીકોન્ફના XKB સુયોજનો પર ફરીથી લખી શકાશે (સિસ્ટમની રુપરેખામાંથી)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB કીબોર્ડ દેખાવ"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB કીબોર્ડ મોડેલ"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB વિકલ્પો"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "કીબોર્ડ મોડેલ (_m):"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB કીબોર્ડ દેખાવ"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "કીબોર્ડ મોડેલ (_m):"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "કીબોર્ડ ટુંકાણો"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "સ્સ્ટમ ASAP માંથી જીકોન્ફમાં XKB સુયોજનો પર ફરીથી લખી શકાશે"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "હમણાં જ, જીકોન્ફના XKB સુયોજનો પર ફરીથી લખી શકાશે (સિસ્ટમની રુપરેખામાંથી)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB કીબોર્ડ દેખાવ"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB કીબોર્ડ મોડેલ"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "વિરામ મુલતવી રાખો (_P)"
@@ -3218,46 +3241,14 @@ msgstr ""
 "પાસેતમારી પેનલ પર નોંધણીનો વિસ્તાર નથી. તમે તને પેનલ પર જમણું ક્લિક કરી અને 'પેનલમાં ઉમેરો "
 "-> સાધનો -> નોંધણીનો વિસ્તાર' ઉમેરી શકો છો."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "આઈઊએઔકખગઘઙચછજઝતથદધનટઠડઢણપફબભમયરલવશષસહ ૦૧૨૩૪૫૬૭૮૯"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "નામ:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "શૈલી:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "પ્રકાર:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "માપ:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "આવૃત્તિ:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "મદ્રણાધિકાર:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "વર્ણન:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "વપરાશ: %s ફોન્ટફાઈલ\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "કાર્યક્રમનાં ફોન્ટ તરીકે સુયોજીત કરો (_A)"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "ફોન્ટનાં સંદર્ભમાં વસ્તુની યાદી"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "તમારા મૂળભુત કાર્યક્રમો પસંદ કરો"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3325,33 +3316,47 @@ msgstr "ટ્રુ ટાઈપ ફોન્ટને મોટાં ચિ�
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "ટાઈપ૧ ફોન્ટને મોટાં ચિહ્નો બનાવવા છે કે નહિ"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "ફોન્ટીલસનાં સંદર્ભમાં યાદીનું કારખાનું"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "આઈઊએઔકખગઘઙચછજઝતથદધનટઠડઢણપફબભમયરલવશષસહ ૦૧૨૩૪૫૬૭૮૯"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "ફોન્ટીલસનાં સંદર્ભમાં યાદી"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "નામ:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "ફોન્ટીલસનાં સંદર્ભમાં યાદીનું કારખાનું"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "શૈલી:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "ફોન્ટ માટે નોટિલસનાં સંદર્ભમાં યાદીમાં પ્રવેશ "
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "પ્રકાર:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "કાર્યક્રમનાં ફોન્ટ તરીકે સુયોજીત કરો (_A)"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "માપ:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "આવૃત્તિ:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "મદ્રણાધિકાર:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "થીમનાં ગુણધર્મો જોવા માટેનું સાધન"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "વર્ણન:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "વપરાશ: %s ફોન્ટફાઈલ\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "થીમસ થીમનાં ગુણધર્મો જૂઓ"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "જીનોમ નિયંત્રણ કેન્દ્ર"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3379,27 +3384,18 @@ msgstr "ફોન્ટને અમલમાં મૂકો (_A)"
 msgid "Themes"
 msgstr "થીમો"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "નિયંત્રણ થીમ"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "વિન્ડો કિનારીની થીમ"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "ચિહ્નની થીમ"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI અત્યારે દેખાય છે"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "અઈઉઓકગતદચજટડરસહ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "જો સુયોજીત હોય, તો સ્થાપિત થીમ મોટાં ચિહ્ન રુપે દર્શાવાશે."
@@ -3433,11 +3429,156 @@ msgstr "સ્થાપિત થીમ માટે મોટાં ચિહ�
 msgid "Whether to thumbnail themes"
 msgstr "થીમ માટે મોટાં ચિહ્નો બનાવવા કે નહિ નક્કી કરો"
 
-#~ msgid "Debian Sensible Browser"
-#~ msgstr "ડેબિયન સંવેદનશીલ બ્રાઉઝર"
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "અઈઉઓકગતદચજટડરસહ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "ફોન્ટને અમલમાં મૂકો (_A)"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "મૂળભુતોમાં ફરીથી સુયોજિત કરો (_f)"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "મોઝિલ્લા/નેટસ્કેપ ૬"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "જીનોમ ટર્મિનલ"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "કસ્ટમ સંપાદક (_u)"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "કસ્ટમ મેઈલ વાંચનાર (_u):"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "કસ્ટમ ટર્મિનલ (_u):"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "કસ્ટમ વેબ બ્રાઉઝર (_u):"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "ટર્મિનલમાં ચાલુ કરો (_e)"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "આ કાર્યક્રમ _URI ખોલી શકે છે"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "આ કાર્યક્રમને શેલમાં ચાલુ કરવું જરુરી છે (_s)"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "મેઈલ વાંચનાર પસંદ કરો (_S):"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "ટર્મિનલ પસંદ કરો (_S):"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "વેબ બ્રાઉઝર પસંદ કરો (_S):"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "સંપાદક પસંદ કરો (_S):"
+
+#~ msgid "Accessibility"
+#~ msgstr "સુલભતા"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "સુલભતા સુયોજનાઓ"
+
+# #-#-#-#-#  gnome-desktop.gnome-2-2.hi.po (gnome-desktop VERSION)  #-#-#-#-#
+# libgnome-desktop/gnome-ditem-edit.c:776
+#~ msgid "Advanced"
+#~ msgstr "ઉન્નત"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "ઉન્નત સુયોજનાઓ"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "નેટવર્ક પ્રોક્સીની રુપરેખા"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "જીનોમ નિયંત્રણ કેન્દ્ર: %s"
+
+#~ msgid "Layout"
+#~ msgstr "દેખાવ"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "કેપ્લેટના આ દર્શન માટે દેખાવનો ઉપયોગ કરો"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "કેપ્લેટ ડિરેક્ટરી આેબ્જેક્ટ"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "કેપ્લેટ ડિરેક્ટરી કે જે આ દર્શન બતાવે છે"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "નીરવ <nirav@magnet-i.com>\n"
+#~ "અંકિત <ankit644@linux.net>\n"
+#~ "અંકુર <ankur_surti@linux.net>\n"
+#~ "અતિત <shahatit_84@linux.net>\n"
+#~ "ભાવિન <bhavinshah@linux.net>\n"
+#~ "કાર્તિક <kartik_mistry@linux.net>\n"
+#~ "ખુશ્બુ <khushbu_hi21@yahoo.co.in>\n"
+#~ "શ્વેતા <sweta2782@yahoo.co.in>."
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "ડેસ્કટોપ ગુણધર્મ સંચાલક."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "જીનોમ નિયંત્રણ કેન્દ્ર : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "જીનોમ નિયંત્રણ કેન્દ્ર"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "નોટિલસ ચાલતું હોય તોપણ તેને વાપરો."
+
+#~ msgid "About this application"
+#~ msgstr "આ કાર્યક્રમ વિશે"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "નિયંત્રણ કેન્દ્રની જાણકારી"
+
+#~ msgid "_About"
+#~ msgstr "વિશે (_A)"
+
+#~ msgid "_Contents"
+#~ msgstr "વિષયસૂચિ (_C)"
+
+#~ msgid "_Help"
+#~ msgstr "મદદ (_H)"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "નોટિલસ ચાલતું હોય તો પણ શેલ વાપરો."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB વિકલ્પો"
+
+#~ msgid "Font context menu items"
+#~ msgstr "ફોન્ટનાં સંદર્ભમાં વસ્તુની યાદી"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "ફોન્ટીલસનાં સંદર્ભમાં યાદીનું કારખાનું"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "ફોન્ટીલસનાં સંદર્ભમાં યાદી"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "ફોન્ટીલસનાં સંદર્ભમાં યાદીનું કારખાનું"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "ફોન્ટ માટે નોટિલસનાં સંદર્ભમાં યાદીમાં પ્રવેશ "
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "થીમનાં ગુણધર્મો જોવા માટેનું સાધન"
 
-#~ msgid "FireFox"
-#~ msgstr "ફાયરફોક્સ"
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "થીમસ થીમનાં ગુણધર્મો જૂઓ"
 
-#~ msgid "Debian Terminal Emulator"
-#~ msgstr "ડેબિયન ટર્મિનલ ઈમ્યુલેટર"
+#~ msgid "URI currently displayed"
+#~ msgstr "URI અત્યારે દેખાય છે"
diff --git a/po/he.po b/po/he.po
index ae712142e..9e7ab482b 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2003-08-09 14:07+0300\n"
 "Last-Translator: Gil 'Dolfin' Osher <dolfin@rpg.org.il>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -61,11 +61,11 @@ msgstr "מקלדת _על המסך"
 msgid "_Screenreader"
 msgstr "_מקריא מסך"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "תמיכת טכנולוגיות מסייעות"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "אפשר תמיכה לטכנולוגיות המסייעות של GNOME בהתחברות"
 
@@ -116,13 +116,13 @@ msgstr "ייבא קובץ הגדרות מאפיינים"
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "מקלדת"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "קבע את העדפות נגישות המקלדת שלך"
 
@@ -330,12 +330,12 @@ msgstr "פיקסלים/שניה"
 msgid "seconds"
 msgstr "שניות"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 #, fuzzy
 msgid "Change your Desktop Background settings"
 msgstr "התאם אישית את רקע שולחן העבודה"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 #, fuzzy
 msgid "Desktop Background"
 msgstr "רקע"
@@ -429,6 +429,13 @@ msgstr "_טפט"
 msgid "No Wallpaper"
 msgstr "_טפט"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -630,106 +637,15 @@ msgstr "אנא בחר תמונה."
 msgid "_Select"
 msgstr "_מחק"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "יישומים מועדפים"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "בחר את יישומי ברירת המחדל שלך"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "אפיפני"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "גלאון"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "מוזילה/נטסקייפ 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "נטסקייפ קומיוניקייטור"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-#, fuzzy
-msgid "W3M Text Browser"
-msgstr "דפדפן הטקסט Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "דפדפן הטקסט Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "דפדפן הטקסט Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "קורא הדואר Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "בלזה"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "דואר מוזילה"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "מסוף Gnome"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "מסוף X רגיל"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "אנא ציין שם ופקודה לעורך זה."
@@ -739,20 +655,22 @@ msgid "Add..."
 msgstr "הוסף..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "עורך מותאם _אישית"
+#, fuzzy
+msgid "C_ustom"
+msgstr "_מותאם אישית:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "קורא דואר מותאם _אישית:"
+msgid "C_ustom:"
+msgstr "_מותאם אישית:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "מסוף מותאם _אישית:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "דפדפן מותאם _אישית:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "יישום זה יכול לפתוח _מספר קבצים"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -799,6 +717,16 @@ msgid "Mail Reader"
 msgstr "קורא דואר"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "הרץ ב_מסוף"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "הרץ ב_מסוף"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -806,92 +734,168 @@ msgstr ""
 "בחר את מנהל החלונות שאתה רוצה.  תצטרך ללחוץ על החלף לנפנף בשרביט הקסם, "
 "ולעשות את ריקוד הקסם כדי שזה יעבוד."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "הפעל ב_מסוף"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "מסוף"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "עורך טקסט"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "יישום זה יכול לפתוח _כתובות"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "יישום זה יכול לפתוח _מספר קבצים"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "יישום זה צריך לרוץ _במעטפת"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "מבין את השלט הרחוק של _Netscape"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "השתמש ב_עורך זה כדי לפתוח קבצי טקסט במנהל הקבצים"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "דפדפן אינטרנט"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "מנהל חלונות"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_פקודה:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_שם:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_מאפיינים..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_בחר קורא דואר:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_מחק"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "דפדפן אינטרנט ברירת מחדל"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_בחר מסוף:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "אפיפני"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_בחר דפדפן אינטרנט:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "גלאון"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_בחר עורך:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "דואר מוזילה"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "נטסקייפ קומיוניקייטור"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+#, fuzzy
+msgid "W3M Text Browser"
+msgstr "דפדפן הטקסט Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "דפדפן הטקסט Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "דפדפן הטקסט Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "קורא הדואר Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "בלזה"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "דואר מוזילה"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "נגישות"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "מסוף ברירת מחדל"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "מסוף"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "הגדרות נגישות"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "מסוף X רגיל"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "מתקדם"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "הגדרות מתקדמות"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "שנה את רזולוציית המסך"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "רזולוציית מסך"
 
@@ -982,7 +986,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "תיאור"
 
@@ -990,15 +994,23 @@ msgstr "תיאור"
 msgid "Extensions"
 msgstr "סיומות"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "סוגי קבצים ותוכניות"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "ציין תוכניות המשתמשות לפתיחה וצפייה של סוגי קבצים"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "סוגי קבצים ותוכניות"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "ציין אילו תוכניות משתמשות לפתיחה או צפייה בכל אחד מסוגי הקבצים"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "פעולות"
@@ -1090,6 +1102,7 @@ msgid "_Protocol:"
 msgstr "_פרוטוקול:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "ה_סר"
 
@@ -1097,14 +1110,6 @@ msgstr "ה_סר"
 msgid "_Viewer component:"
 msgstr "רכיב _מציג:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "סוגי קבצים ותוכניות"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "ציין אילו תוכניות משתמשות לפתיחה או צפייה בכל אחד מסוגי הקבצים"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "ערוך קטגוריית קובץ"
@@ -1285,14 +1290,15 @@ msgid "Electronic mail transmission"
 msgstr "העברת דואר אלקטרונית"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "תיעוד Gnome"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "גופן"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "בחר גופן לשולחן העבודה"
 
@@ -1497,55 +1503,55 @@ msgid "The type of accelerator."
 msgstr "סוג הקיצור."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "כבוי"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<פעולה לא ידועה>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "שולחן עבודה"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "קול"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "ניהול חלון"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
 " \"%s\"\n"
 msgstr "קיצור הדרך \"%s\" כבר משמש ל:  \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "שגיאה בקביעת קיצור חדש במסד נתוני ההגדרות: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, fuzzy, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "שגיאה בקביעת קיצור חדש במסד נתוני ההגדרות: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "פעולה"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "קיצור"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "קיצורי מקלדת"
 
@@ -1556,26 +1562,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "הזן קיצור חדש, או לחץ על מקש החזרה לניקוי"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "שייך מקשי קיצור לפקודות"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "סמן לא ידוע"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "מודל"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "קיצורי מקלדת"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1750,10 +1740,36 @@ msgstr "זמן ה_עבודה נמשך:"
 msgid "minutes"
 msgstr "דקות"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "סמן לא ידוע"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "מודל"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "קיצורי מקלדת"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "קבע את העדפות המקלדת שלך"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "העדפות תפריט וסרגל כלים"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "קבע את העדפות העכבר שלך"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "סמן לא ידוע"
@@ -1918,20 +1934,21 @@ msgstr "_סף:"
 msgid "_Timeout:"
 msgstr "_פרק זמן:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "עכבר"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "קבע את העדפות העכבר שלך"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "מתווך רשת"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "העדפות מתווך רשת"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1977,8 +1994,9 @@ msgid "H_TTP proxy:"
 msgstr "מתווך H_TTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "הגדרות מתווך רשת"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "העדפות מתווך רשת"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2019,7 +2037,7 @@ msgstr "_סיסמה:"
 msgid "_Secure HTTP proxy:"
 msgstr "מתווך HTTP מ_אובטח"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "אפשר קולות ושייך קולות לאירועים"
 
@@ -2076,15 +2094,26 @@ msgstr ""
 "לא נמצאו ערכות נושא על המערכת שלך.  זה כנראה אומר שתיבת דו-שיח \"העדפות ערכת "
 "נושא\" שלך לא הותקנה כראוי, או שלא התקנת את חבילת \"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2117,12 +2146,12 @@ msgstr "ערכת הנושא חייבת להיות בנמצא"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "בחר ערכת נושא לחלקים שונים של שולחן העבודה"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "ערכת נושא"
 
@@ -2236,11 +2265,11 @@ msgstr "שם _ערכת הנושא:"
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "התאם אישית את המראה של סרגלי כלים ותפריטים ביישומים"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "תפריטים וסרגלי כלים"
 
@@ -2309,7 +2338,6 @@ msgid "_Edit"
 msgstr "_עריכה"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_קובץ"
 
@@ -2337,6 +2365,14 @@ msgstr "_יציאה"
 msgid "_Save"
 msgstr "_שמור"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2348,23 +2384,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "היפר"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "סופר (או \"סמל חלונות\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "מטא"
 
@@ -2407,14 +2443,35 @@ msgstr "ה_עלה חלונות נבחרים לאחר השהייה זו"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_בחר חלונות כאשר הסמן זז מעליהם"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "מאפייני חלונות"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "חלונות"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "לוח הבקרה של GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "העדפות רשת"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "מסננים"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "כלי ההגדרה של GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2449,93 +2506,6 @@ msgstr "תפריט לוח הבקרה"
 msgid "View as Control Center"
 msgstr "לוח הבקרה של Gnome : %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "לוח הבקרה של GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "סידור"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "סידור לשימוש בתצוגה זו של יישומוני הבקרה"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "אובייקט ספריית יישומוני הבקרה"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "ספריית יישומון הבקרה אשר תצוגה זו מראה"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"גיל אשר\n"
-"dolfin@rpg.org.il\n"
-"\n"
-"פרויקט linBrew\n"
-"http://linbrew.sourceforge.net"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "לוח הבקרה של GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "מאפייני מנהל שולחן העבודה."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "לוח הבקרה של Gnome : %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "מסננים"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "לוח הבקרה של Gnome : %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "השתמש במעטפת אפילו אם נאוטילוס פועל"
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "אודות יישום זה"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "סקירה כללית של לוח הבקרה"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_אודות"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_תכנים"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_עזרה"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "כלי ההגדרה של GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "השתמש במעטפת אפילו אם נאוטילוס פועל"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 #, fuzzy
 msgid "Volume"
@@ -2640,7 +2610,7 @@ msgstr ""
 "שגיאה בזמן ניסיון הרצת (%s)\n"
 "המקושר למקש (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2655,7 +2625,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2663,22 +2633,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "הגדרות מסך %d\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2734,8 +2704,8 @@ msgstr "_אל תציג הודעה זו שוב"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "לא ניתן לטעון את קובץ הקול %s כדוגמה %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "לא יכול לזהות את ספריית הבית של המשתמש"
 
@@ -2784,11 +2754,11 @@ msgstr "מסך"
 msgid "Screen on which BGApplier is to draw"
 msgstr "מסך בו יש BGApplier לציור"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "הקול לאירוע זה אינו קיים."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2798,32 +2768,32 @@ msgstr ""
 "תרצה להתקין את חבילת gnome-audio\n"
 "לערכת קולות ברירת-מחדל."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "הקובץ %s איננו קובץ wav תקני"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "אירוע"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "קובץ קול"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_קולות:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_קובץ קול:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "בחר קובץ קול"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_נגן"
 
@@ -3099,29 +3069,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "פעמון מקלדת"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
 #, fuzzy
-msgid "XKB keyboard layout"
+msgid "Keyboard layout"
 msgstr "קיצורי מקלדת"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
 #, fuzzy
-msgid "XKB keyboard model"
+msgid "Keyboard model"
 msgstr "פעמון מקלדת"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
 #, fuzzy
-msgid "XKB options"
-msgstr "אפשרויות"
+msgid "Keyboard options"
+msgstr "קיצורי מקלדת"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "קיצורי מקלדת"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "פעמון מקלדת"
+
 #: typing-break/drw-break-window.c:209
 #, fuzzy
 msgid "_Postpone break"
@@ -3197,46 +3210,14 @@ msgstr ""
 "הודעות על הלוח שלך. אתה יכול להוסיף אותו על-ידי לחיצה ימנית על הלוח ובחירת "
 "'הוסף ללוח-> תוכניות שירות -> אזור הודעות'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "לך אל הנמלה עצל ראה דרכיה וחכם. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "שם:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "סגנון:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "סוג:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "גודל:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "גירסה:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "זכויות יוצרים:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "תיאור:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "קבע כגופן יישום"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "פרטי תפריט לתכני הגופן"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "בחר את יישומי ברירת המחדל שלך"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3304,33 +3285,47 @@ msgstr "האם ליצור תמונה ממוזערת לגופני TrueType"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "האם ליצור תמונה ממוזערת לגופני Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "יצרן לתפריט תכני גופנטילוס"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "לך אל הנמלה עצל ראה דרכיה וחכם. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "תפריט תכני גופנטילוס"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "שם:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "יצרן תפריט תכני גופנטילוס"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "סגנון:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "ערכי תפריט התוכן של נאוטילוס לגופנים"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "סוג:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "קבע כגופן יישום"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "גודל:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "גירסה:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "רכיב תצוגת תוכן של מאפייני ערכת נושא"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "זכויות יוצרים:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "תצוגת מאפייני ערכת נושא"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "תיאור:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "לוח הבקרה של GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3358,27 +3353,18 @@ msgstr "_החל גופן"
 msgid "Themes"
 msgstr "ערכות נושא"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "ערכת נושא לפקדים"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "ערכת נושא למסגרת החלון"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "ערכת נושא לסמלים"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "הכתובת המוצגת כרגע"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG אבגדהוז"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "אם נקבע כאמת, אזי לערכות הנושא המותקנות ייווצרו דוגמיות."
@@ -3412,6 +3398,158 @@ msgstr "האם ליצור דוגמיות לערכות נושא מותקנות"
 msgid "Whether to thumbnail themes"
 msgstr "האם ליצור דוגמיות לערכות נושא"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG אבגדהוז"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "החל ערכת נושא..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "השתמש בקטגוריית הורה כ_ברירת מחדל"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "מוזילה/נטסקייפ 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "מסוף Gnome"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "עורך מותאם _אישית"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "קורא דואר מותאם _אישית:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "מסוף מותאם _אישית:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "דפדפן מותאם _אישית:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "הפעל ב_מסוף"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "יישום זה יכול לפתוח _כתובות"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "יישום זה צריך לרוץ _במעטפת"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_בחר קורא דואר:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_בחר מסוף:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_בחר דפדפן אינטרנט:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_בחר עורך:"
+
+#~ msgid "Accessibility"
+#~ msgstr "נגישות"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "הגדרות נגישות"
+
+#~ msgid "Advanced"
+#~ msgstr "מתקדם"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "הגדרות מתקדמות"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "הגדרות מתווך רשת"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "לוח הבקרה של GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "סידור"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "סידור לשימוש בתצוגה זו של יישומוני הבקרה"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "אובייקט ספריית יישומוני הבקרה"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "ספריית יישומון הבקרה אשר תצוגה זו מראה"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "גיל אשר\n"
+#~ "dolfin@rpg.org.il\n"
+#~ "\n"
+#~ "פרויקט linBrew\n"
+#~ "http://linbrew.sourceforge.net"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "מאפייני מנהל שולחן העבודה."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "לוח הבקרה של Gnome : %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "לוח הבקרה של Gnome : %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "השתמש במעטפת אפילו אם נאוטילוס פועל"
+
+#~ msgid "About this application"
+#~ msgstr "אודות יישום זה"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "סקירה כללית של לוח הבקרה"
+
+#~ msgid "_About"
+#~ msgstr "_אודות"
+
+#~ msgid "_Contents"
+#~ msgstr "_תכנים"
+
+#~ msgid "_Help"
+#~ msgstr "_עזרה"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "השתמש במעטפת אפילו אם נאוטילוס פועל"
+
+#, fuzzy
+#~ msgid "XKB options"
+#~ msgstr "אפשרויות"
+
+#~ msgid "Font context menu items"
+#~ msgstr "פרטי תפריט לתכני הגופן"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "יצרן לתפריט תכני גופנטילוס"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "תפריט תכני גופנטילוס"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "יצרן תפריט תכני גופנטילוס"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "ערכי תפריט התוכן של נאוטילוס לגופנים"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "רכיב תצוגת תוכן של מאפייני ערכת נושא"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "תצוגת מאפייני ערכת נושא"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "הכתובת המוצגת כרגע"
+
 #~ msgid "De_tails..."
 #~ msgstr "פ_רטים..."
 
@@ -3618,10 +3756,6 @@ msgstr "האם ליצור דוגמיות לערכות נושא"
 #~ msgstr "_טפט"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "העדפות רשת"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "הגדרות מתקדמות"
 
@@ -3658,18 +3792,10 @@ msgstr "האם ליצור דוגמיות לערכות נושא"
 #~ msgstr "ערכת נושא מותאמת אישית"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "העדפות תפריט וסרגל כלים"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "_רזולוצייה:"
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "קבע את העדפות העכבר שלך"
-
-#, fuzzy
 #~ msgid "_Ignore system configuration"
 #~ msgstr "הגדרות מתווך רשת"
 
@@ -3745,9 +3871,6 @@ msgstr "האם ליצור דוגמיות לערכות נושא"
 #~ msgid "Quit"
 #~ msgstr "צא"
 
-#~ msgid "Apply theme..."
-#~ msgstr "החל ערכת נושא..."
-
 #~ msgid "Themus component"
 #~ msgstr "רכיב ערכת נושא"
 
@@ -3805,9 +3928,6 @@ msgstr "האם ליצור דוגמיות לערכות נושא"
 #~ msgid "Bee_p"
 #~ msgstr "_צפצוף"
 
-#~ msgid "C_ustom:"
-#~ msgstr "_מותאם אישית:"
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "ל_חץ בלחיצת מקש"
 
diff --git a/po/hi.po b/po/hi.po
index 1265269bc..5b18196e1 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD.hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-07-18 14:22+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -60,11 +60,11 @@ msgstr "स्क्रीन कुंजीपटल (_O)"
 msgid "_Screenreader"
 msgstr "स्क्रीनपाठक (_S)"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "सहायक तकनालॉज़ी समर्थन"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "गनोम सहायक तकनालॉज़ी हेतु समर्थन को लॉगइन पर सक्षम करें"
 
@@ -108,13 +108,13 @@ msgstr "विशेषता विन्यास फ़ाइल आयात
 msgid "_Import"
 msgstr "आयात करें (_I)"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "कुंजीपटल"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "अपने कुंजी पटल की एक्सेसिबिलिटी वरीयताएँ नियत करें"
 
@@ -329,11 +329,11 @@ msgstr "पिक्सल्स/सेकण्ड"
 msgid "seconds"
 msgstr "सेकण्ड्स"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "अपने डेस्कटॉप पृष्ठभूमि विन्यास को बदलें"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "डेस्कटॉप पृष्ठभूमि"
 
@@ -419,6 +419,13 @@ msgstr "वालपेपर जोड़ें"
 msgid "No Wallpaper"
 msgstr "वालपेपर नहीं"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -619,108 +626,15 @@ msgstr "कृपया कोई छवि चुनें."
 msgid "_Select"
 msgstr "चुनें (_S)"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "पसन्दीदा अनुप्रयोग"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "अपने डिफ़ॉल्ट अनुप्रयोग चुनें"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "एपीफेनी"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "गेलियन"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "एनकम्पास"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "फ़ायरफॉक्स/फ़ायरबर्ड"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "मोज़िला/नेटस्केप 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "नेटस्केप कम्यूनिकेटर"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "कॉन्क्वेरर"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "डबल्यू3एम पाठ ब्राउज़र"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "लायंक्स पाठ ब्राउज़र"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "लिंक्स पाठ ब्राउज़र"
-
-#  The code in gnome-default-applications-properties.c makes sure
-#  * there is only one (the first entry in this list) Evolution entry
-#  * in the list shown to the user
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "एवॉल्यूशन डाक पाठक"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "बाल्सा"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "के-मेल"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "मोज़िला मेल"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "मट"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "गनोम टर्मिनल"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "मानक एक्स-टर्मिनल"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "एनएक्स-टर्म"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "आरएक्सवीटी"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ई-टर्म"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "कृपया इस संपादक हेतु नाम और कमांड निश्चित करें"
@@ -729,21 +643,32 @@ msgstr "कृपया इस संपादक हेतु नाम और
 msgid "Add..."
 msgstr "जोड़ें...."
 
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# libgnomeprint/gpa/gpa-media.c:241
+# #-#-#-#-#  libgnomeprint.gnome-2-2.hi.po (libgnomeprint VERSION)  #-#-#-#-#
+# libgnomeprint/gpa/gpa-media.c:241
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "अनुकूलित संपादक (_u)"
+#, fuzzy
+msgid "C_ustom"
+msgstr "अनुकूलन"
 
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# libgnomeprint/gpa/gpa-media.c:241
+# #-#-#-#-#  libgnomeprint.gnome-2-2.hi.po (libgnomeprint VERSION)  #-#-#-#-#
+# libgnomeprint/gpa/gpa-media.c:241
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "अनुकूलित डाक पाठक: (_u)"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "अनुकूलन"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "अनुकूलित टर्मिनल: (_u)"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "अनुकूलित वेब ब्राउज़र: (_u)"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "यह अनुप्रयोग बहुसंख्य फ़ाइलें खोल सकता है (_m)"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -790,6 +715,16 @@ msgid "Mail Reader"
 msgstr "डाक पाठक"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "टर्मिनल में चलाएँ (_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "टर्मिनल में चलाएँ (_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -797,95 +732,172 @@ msgstr ""
 "जो विंडो प्रबंधक आप चाहते हैं, वह चुनें. आपको इसे लागू करें बटन दबाना होगा, जादू की छड़ी "
 "घुमानी होगी और जादुई नृत्य करना होगा ताकि यह कार्य करे."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "टर्मिनल में प्रारंभ करें (_e)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "टर्मिनल "
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "पाठ संपादक"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "यह अनुप्रयोग यूआरआई खोल सकता है (_U)"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "यह अनुप्रयोग बहुसंख्य फ़ाइलें खोल सकता है (_m)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "इस अनुप्रयोग को शैल में चलाना आवश्यक है (_s)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "नेटस्केप दूर नियंत्रण को समझता है (_N)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "फ़ाइल प्रबंधक में पाठ फ़ाइलें खोलने हेतु इस संपादक का उपयोग करें (_e)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "वेब ब्राउज़र"
 
 # gnome-session/splash.c:71
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "विंडो प्रबंधक"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "कमांड: (_m)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "नाम: (_N)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "गुण... (_P)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "डाक पाठक चुनें: (_S)"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "चुनें (_S)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "टर्मिनल चुनें: (_S)"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "डिफ़ॉल्ट वेब ब्राउज़र"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "वेब ब्राउज़र चुनें: (_S)"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "एपीफेनी"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "संपादक चुनें: (_S)"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "गेलियन"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "एक्सेसिबिलिटी"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "एनकम्पास"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "एक्सेसिबिलिटी विन्यास"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "फ़ायरफॉक्स/फ़ायरबर्ड"
 
-# #-#-#-#-#  gnome-desktop.gnome-2-2.hi.po (gnome-desktop VERSION)  #-#-#-#-#
-# libgnome-desktop/gnome-ditem-edit.c:776
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "उन्नत"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "उन्नत विन्यास"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "मोज़िला मेल"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "नेटस्केप कम्यूनिकेटर"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "कॉन्क्वेरर"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "डबल्यू3एम पाठ ब्राउज़र"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "लायंक्स पाठ ब्राउज़र"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "लिंक्स पाठ ब्राउज़र"
+
+#  The code in gnome-default-applications-properties.c makes sure
+#  * there is only one (the first entry in this list) Evolution entry
+#  * in the list shown to the user
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "एवॉल्यूशन डाक पाठक"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "बाल्सा"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "के-मेल"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "मोज़िला मेल"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "मट"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "डिफ़ॉल्ट टर्मिनल"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "टर्मिनल "
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "मानक एक्स-टर्मिनल"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "एनएक्स-टर्म"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "आरएक्सवीटी"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "एनएक्स-टर्म"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ई-टर्म"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "स्क्रीन रेज़ोल्यूशन बदलें"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "स्क्रीन रेज़ोल्यूशन"
 
@@ -968,7 +980,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "क्या आप सुनिश्चित हैं कि इस प्रविष्टि को स्थायी तौर से मिटाना चाहते हैं?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "वर्णन"
 
@@ -976,15 +988,24 @@ msgstr "वर्णन"
 msgid "Extensions"
 msgstr "एक्सटेंशन्स"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "फ़ाइल का प्रकार एवं प्रोग्राम्स"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "निर्दिष्ट करें कि प्रत्येक फ़ाइल प्रकार को देखने हेतु किन प्रोग्राम का उपयोग करें"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "फ़ाइल प्रकार तथा प्रोग्राम्स"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"निर्दिष्ट करें कि प्रत्येक प्रकार के फ़ाइल को खोलने या देखने हेतु कौन से प्रोग्राम उपयोग करें"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "क्रियाएँ"
@@ -1075,6 +1096,7 @@ msgid "_Protocol:"
 msgstr "प्रोटोकॉलः (_P)"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "मिटाएँ (_R)"
 
@@ -1082,15 +1104,6 @@ msgstr "मिटाएँ (_R)"
 msgid "_Viewer component:"
 msgstr "प्रदर्शक अवयवः (_V)"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "फ़ाइल प्रकार तथा प्रोग्राम्स"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"निर्दिष्ट करें कि प्रत्येक प्रकार के फ़ाइल को खोलने या देखने हेतु कौन से प्रोग्राम उपयोग करें"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "फ़ाइल वर्ग संपादित करें"
@@ -1277,18 +1290,19 @@ msgid "Electronic mail transmission"
 msgstr "इलेक्ट्रानिक मेल स्थानांतरण"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "गनोम दस्तावेज़"
 
 # #-#-#-#-#  libgnomecanvas.gnome-2-2.hi.po (libgnomecanvas)  #-#-#-#-#
 # libgnomecanvas/gnome-canvas-text.c:238
 # #-#-#-#-#  libgnomeui.gnome-2-2.hi.po (libgnomeui HEAD)  #-#-#-#-#
 # libgnomeui/gnome-font-picker.c:184 libgnomeui/gnome-font-picker.c:979
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "फ़ॉन्ट"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "डेस्कटॉप हेतु फ़ॉन्ट चुनें"
 
@@ -1489,34 +1503,34 @@ msgstr "त्वरक प्रकार"
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gtk/gtkinputdialog.c:238
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "अक्षम"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<अज्ञात क्रिया>"
 
 # #-#-#-#-#  gnome-panel.gnome-2-2.hi.po (gnome-panel 2.2)  #-#-#-#-#
 # gnome-session/splash.c:72
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "डेस्कटॉप"
 
 # #-#-#-#-#  gnome-icon-theme.gnome-2-2.hi.po (gnome-icon theme 2.2)  #-#-#-#-#
 # 48x48/emblems/emblem-sound.icon.in.h:1
 # 48x48/emblems/emblem-sound.icon.in.h:1
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "ध्वनि"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "विंडो प्रबंधन"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1525,28 +1539,28 @@ msgstr ""
 "यह शार्टकट \"%s\" पहले से ही:\n"
 " \"%s\" हेतु प्रयुक्त है\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "कॉन्फ़िगरेशन डेटाबेस में नया त्वरक तय करने में त्रुटि %s  हुई.\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "कानफिगुरेशन डेटाबेस में नया त्वरक अविन्यासित करने में त्रुटि:  %s  हुई.\n"
 
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/logout.c:266
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "कार्य"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "शार्टकट"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "कुंजीपटल शार्टकट"
 
@@ -1558,28 +1572,10 @@ msgstr ""
 "किसी शॉर्टकट कुंजी को संपादित करने हेतु, सम्बन्धित पंक्ति में क्लिक करें तथा नया त्वरक टाइप "
 "करें या साफ करने हेतु बैक स्पेस दबाएँ."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "कमांड हेतु शार्टकट कुंजियाँ नियत करें"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "अज्ञात संकेतक"
-
-# libgnomeprintui/gpaui/add-printer-dialog.c:83
-# libgnomeprintui/gpaui/config-dialog.c:83
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "मॉडल"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "एक्सकेबी कुंजीपटल अभिन्यास"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1750,10 +1746,37 @@ msgstr "कार्य अंतराल टिकता है:"
 msgid "minutes"
 msgstr "मिनट्स"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "अज्ञात संकेतक"
+
+# libgnomeprintui/gpaui/add-printer-dialog.c:83
+# libgnomeprintui/gpaui/config-dialog.c:83
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "मॉडल"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "एक्सकेबी कुंजीपटल अभिन्यास"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "कुंजी पटल की वरीयताएँ नियत करें"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "अपने माउस की वरीयताएँ नियत करें"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "अज्ञात संकेतक"
@@ -1918,20 +1941,21 @@ msgstr "देहलीज़:  (_T)"
 msgid "_Timeout:"
 msgstr "टाइमआउट (_T):"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "माउस"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "अपने माउस की वरीयताएँ नियत करें"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "नेटवर्क प्रॉक्सी"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "नेटवर्क प्रॉक्सी वरीयताएँ"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1975,8 +1999,9 @@ msgid "H_TTP proxy:"
 msgstr "एचटीटीपी प्रॉक्सी:ः (_H)"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "नेटवर्क प्रॉक्सी कॉन्फ़िगरेशन"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "नेटवर्क प्रॉक्सी वरीयताएँ"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2017,7 +2042,7 @@ msgstr "पासवर्ड: (_P)"
 msgid "_Secure HTTP proxy:"
 msgstr "सुरक्षित एचटीटीपी प्रॉक्सी:ः (_S)"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "ध्वनि एवम् धटनाओं के साथ सम्बद्ध ध्वनियाँ सक्षम करें"
 
@@ -2074,15 +2099,26 @@ msgstr ""
 "आपके तंत्र में कोई प्रसंग नहीं मिला. शायद इसका मतलब है कि \"प्रसंग वरीयताएँ \" वार्ता गलत "
 "संस्थापित हैं, या आपने \" गनोम प्रसंग\" पैकेज संस्थापित नहीं किया है."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "संस्थापित करने हेतु कोई प्रसंग फ़ाइल स्थान निर्दिष्ट नहीं किया है"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "संस्थापित करने हेतु प्रसंग फ़ाइल निर्दिष्ट किया है वह अवैध है"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2112,12 +2148,12 @@ msgstr "प्रसंग नाम मौज़ूद होना ही च�
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "डेस्कटॉप के विभिन्न भाग हेतु प्रसंग चुनें"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "प्रसंग"
 
@@ -2230,11 +2266,11 @@ msgstr "प्रसंग नामः (_T)"
 msgid "theme selection tree"
 msgstr "प्रसंग चयन ट्री"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "अनुप्रयोगों के उपकरण-पट्टी और मेनू-पट्टी की दिखावट अनुकूलित करें"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "मेनू एवम् उपकरण-पट्टी"
 
@@ -2320,7 +2356,6 @@ msgstr "संपादन (_E)"
 # libgnomeui/gnome-app-helper.c:82 libgnomeui/gnome-app-helper.h:513
 # test-gnome/testgnome.xml.h:5
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "फ़ाइल (_F)"
 
@@ -2354,6 +2389,14 @@ msgstr "बाहर (_Q)"
 msgid "_Save"
 msgstr "सहेजें (_S)"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2365,23 +2408,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "कंट्रोल"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "आल्ट"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "हाइपर"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "सुपर (या \"विंडोज़ लोगो\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "मेटा"
 
@@ -2421,14 +2464,34 @@ msgstr "एक अन्तराल के बाद चुने गए वि
 msgid "_Select windows when the mouse moves over them"
 msgstr "जब माउस विंडोज़ पर घूमेगा तो उन्हें चुनें (_S)"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "विंडो गुण"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "विंडोज़"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "गनोम नियंत्रण केंद्र"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "डेस्कटॉप पृष्ठभूमि वरीयताएँ"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "अन्य"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "गनोम कॉन्फ़िगरेशन उपकरण"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2463,85 +2526,6 @@ msgstr "फ़ॉन्टिलस कॉन्टेक्स्ट मेन�
 msgid "View as Control Center"
 msgstr "गनोम नियंत्रण केंद्र"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "गनोम नियंत्रण केंद्र: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "अभिन्यास"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "केप्लेट के इस दृश्य हेतु उपयोग में अभिन्यास"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "केप्लेट डिरेक्ट्री ऑब्जेक्ट"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "केप्लेट डिरेक्ट्री जो यह दृश्य दिखा रहा है"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "रविशंकर श्रीवास्तव <raviratlami@yahoo.com>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "गनोम नियंत्रण केंद्र"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "डेस्कटॉप गुण प्रबंधक."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "गनोम नियंत्रण केंद्र: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "अन्य"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "गनोम नियंत्रण केंद्र"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "नॉटिलस चल रहा हो तो इसका उपयोग करें"
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "इस अनुप्रयोग के बारे में"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "नियंत्रण केंद्र के बारे में मुख्य बातें"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "के बारे में (_A)"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "विषय सूची (_C)"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "मदद (_H)"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "गनोम कॉन्फ़िगरेशन उपकरण"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "नॉटिलस चल रहा हो तब भी शैल उपयोग करें."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "आवाज निर्धारक"
@@ -2641,7 +2625,7 @@ msgstr ""
 "(%s) को चलाने की कोशिश में त्रुटि हुई\n"
 "जो कुंजी (%s) से लिंक्ड है"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2656,7 +2640,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2664,21 +2648,21 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "एक्स विन्यास उपयोग करें"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "गनोम विन्यास उपयोग करें"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2740,8 +2724,8 @@ msgstr "इस संदेश को फिर कभी नहीं दिख
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "ध्वनि फ़ाइल %s को नमूना %s  की तरह लोड नहीं कर सका"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "उपयोगकर्ता का घर डिरेक्ट्री निर्धारित नहीं कर सका"
 
@@ -2790,11 +2774,11 @@ msgstr "स्क्रीन"
 msgid "Screen on which BGApplier is to draw"
 msgstr "वह स्क्रीन जहाँ बीजी-एप्लायर जहां आरेखित करेगा"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "इस घटना हेतु ध्वनि फ़ाइल मौज़ूद नहीं है"
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2804,32 +2788,32 @@ msgstr ""
 "डिफ़ॉल्ट ध्वनि समूह हेतु \n"
 "आप गनोम ऑडियो पैकेज संस्थापित करना चाहेंगे."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "फ़ाइल %s कोई वैध वेव फ़ाइल नहीं है"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "घटना:"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "ध्वनि फ़ाइल"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "ध्वनियाँ (_S):"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "ध्वनि फ़ाइल:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "ध्वनि फ़ाइल चुनें"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "बजाएँ (_P)"
 
@@ -3086,26 +3070,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "बहुत जल्दी, जी-कॉन्फ़ में एक्सकेबी विन्यास ओवरराइड हो जाएँगे (तंत्र कॉन्फ़िगरेशन से)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "एक्सकेबी कुंजीपटल अभिन्यास"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "एक्सकेबी कुंजीपटल मॉडल"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "एक्सकेबी विकल्प"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "कुंजीपटल मॉडलः (_m)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "एक्सकेबी कुंजीपटल अभिन्यास"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "कुंजीपटल मॉडलः (_m)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "कुंजीपटल शार्टकट"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "तंत्र से जितना संभव हो जल्दी ही, जी-कॉन्फ़ में एक्सकेबी विन्यास ओवरराइड हो जाएँगे "
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "बहुत जल्दी, जी-कॉन्फ़ में एक्सकेबी विन्यास ओवरराइड हो जाएँगे (तंत्र कॉन्फ़िगरेशन से)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "एक्सकेबी कुंजीपटल अभिन्यास"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "एक्सकेबी कुंजीपटल मॉडल"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "ब्रेक स्थगित करें (_P)"
@@ -3178,46 +3210,14 @@ msgid ""
 "Notification area'."
 msgstr ""
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "सारे जहाँ से अच्छा हिंदोस्ताँ हमारा०१२३४५६७८९"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "नाम:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "शैली:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "प्रकार:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "आकार:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "संस्करण:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "सर्वाधिकार:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "विवरण:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "उपयोग: %s फ़ॉन्ट-फ़ाइल\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "अनुप्रयोग फ़ॉन्ट के रूप में नियत करें"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "फ़ॉन्ट कॉन्टेक्स्ट मेनू आइटम्स"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "अपने डिफ़ॉल्ट अनुप्रयोग चुनें"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3285,33 +3285,47 @@ msgstr "क्या ट्रू टाइप फ़ॉन्ट्स की �
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "क्या टाइप 1 फ़ॉन्ट्स की लघु छवि बनाएँ"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "फ़ॉन्टिलस कॉन्टेक्स्ट मेनू हेतु फैक्ट्री"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "सारे जहाँ से अच्छा हिंदोस्ताँ हमारा०१२३४५६७८९"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "फ़ॉन्टिलस कॉन्टेक्स्ट मेनू"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "नाम:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "फ़ॉन्टिलस कॉन्टेक्स्ट मेनू फैक्ट्री"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "शैली:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "फ़ॉन्ट्स हेतु नॉटिलस कॉन्टेक्स्ट मेनू प्रविष्टि"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "प्रकार:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "अनुप्रयोग फ़ॉन्ट के रूप में नियत करें"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "आकार:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "प्रसंग गुण निर्देशिका दृश्य अवयव"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "संस्करण:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "सर्वाधिकार:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "थेम्स प्रसंग गुण दृश्य"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "विवरण:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "उपयोग: %s फ़ॉन्ट-फ़ाइल\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "गनोम नियंत्रण केंद्र"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3340,28 +3354,18 @@ msgstr "फ़ॉन्ट लागू करें (_A)"
 msgid "Themes"
 msgstr "प्रसंग"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "नियंत्रण प्रसंग"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "विंडो किनारा प्रसंग"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "चिह्न प्रसंग"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "यूआरआई वर्तमान में दर्शित"
-
-#  translators: you may want to include non-western chars here
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "अबसदइफ़ग"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "यदि सत्य पर नियत किया जाता है, तो संस्थापित प्रसंगों की लघु छवि बनाई जाएगी."
@@ -3396,6 +3400,153 @@ msgstr "क्या संस्थापित प्रसंगों की
 msgid "Whether to thumbnail themes"
 msgstr "क्या प्रसंग की लघु छवि बनाएँ"
 
+#  translators: you may want to include non-western chars here
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "अबसदइफ़ग"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "फ़ॉन्ट लागू करें (_A)"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "डिफ़ॉल्ट में रीसेट करें (_f)"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "मोज़िला/नेटस्केप 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "गनोम टर्मिनल"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "अनुकूलित संपादक (_u)"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "अनुकूलित डाक पाठक: (_u)"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "अनुकूलित टर्मिनल: (_u)"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "अनुकूलित वेब ब्राउज़र: (_u)"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "टर्मिनल में प्रारंभ करें (_e)"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "यह अनुप्रयोग यूआरआई खोल सकता है (_U)"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "इस अनुप्रयोग को शैल में चलाना आवश्यक है (_s)"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "डाक पाठक चुनें: (_S)"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "टर्मिनल चुनें: (_S)"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "वेब ब्राउज़र चुनें: (_S)"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "संपादक चुनें: (_S)"
+
+#~ msgid "Accessibility"
+#~ msgstr "एक्सेसिबिलिटी"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "एक्सेसिबिलिटी विन्यास"
+
+# #-#-#-#-#  gnome-desktop.gnome-2-2.hi.po (gnome-desktop VERSION)  #-#-#-#-#
+# libgnome-desktop/gnome-ditem-edit.c:776
+#~ msgid "Advanced"
+#~ msgstr "उन्नत"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "उन्नत विन्यास"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "नेटवर्क प्रॉक्सी कॉन्फ़िगरेशन"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "गनोम नियंत्रण केंद्र: %s"
+
+#~ msgid "Layout"
+#~ msgstr "अभिन्यास"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "केप्लेट के इस दृश्य हेतु उपयोग में अभिन्यास"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "केप्लेट डिरेक्ट्री ऑब्जेक्ट"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "केप्लेट डिरेक्ट्री जो यह दृश्य दिखा रहा है"
+
+#~ msgid "translator_credits"
+#~ msgstr "रविशंकर श्रीवास्तव <raviratlami@yahoo.com>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "डेस्कटॉप गुण प्रबंधक."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "गनोम नियंत्रण केंद्र: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "गनोम नियंत्रण केंद्र"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "नॉटिलस चल रहा हो तो इसका उपयोग करें"
+
+#~ msgid "About this application"
+#~ msgstr "इस अनुप्रयोग के बारे में"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "नियंत्रण केंद्र के बारे में मुख्य बातें"
+
+#~ msgid "_About"
+#~ msgstr "के बारे में (_A)"
+
+#~ msgid "_Contents"
+#~ msgstr "विषय सूची (_C)"
+
+#~ msgid "_Help"
+#~ msgstr "मदद (_H)"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "नॉटिलस चल रहा हो तब भी शैल उपयोग करें."
+
+#~ msgid "XKB options"
+#~ msgstr "एक्सकेबी विकल्प"
+
+#~ msgid "Font context menu items"
+#~ msgstr "फ़ॉन्ट कॉन्टेक्स्ट मेनू आइटम्स"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "फ़ॉन्टिलस कॉन्टेक्स्ट मेनू हेतु फैक्ट्री"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "फ़ॉन्टिलस कॉन्टेक्स्ट मेनू"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "फ़ॉन्टिलस कॉन्टेक्स्ट मेनू फैक्ट्री"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "फ़ॉन्ट्स हेतु नॉटिलस कॉन्टेक्स्ट मेनू प्रविष्टि"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "प्रसंग गुण निर्देशिका दृश्य अवयव"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "थेम्स प्रसंग गुण दृश्य"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "यूआरआई वर्तमान में दर्शित"
+
 #, fuzzy
 #~ msgid "Layout Preview"
 #~ msgstr "अभिन्यास"
diff --git a/po/hr.po b/po/hr.po
index 2d1631a9d..29bd6d63d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-03-29 18:54+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -60,11 +60,11 @@ msgstr "_Tipkovnica na zaslonu"
 msgid "_Screenreader"
 msgstr "_Čitač zaslona"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Podrška za tehnologiju podrške"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Omogući podršku za GNOME pomoćne tehnologije kod prijavljivanja"
 
@@ -116,13 +116,13 @@ msgstr "Datoteka za uvoz postavki svojstava"
 msgid "_Import"
 msgstr "_Uvezi"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tipkovnica"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Podešavanje postavki pristupačnosti tipkovnice"
 
@@ -338,11 +338,11 @@ msgstr "točaka/sekundi"
 msgid "seconds"
 msgstr "sekunde"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Mijenja postavke vaše pozadine radne površine"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Boja pozadine radne površine"
 
@@ -422,6 +422,13 @@ msgstr "Dodaj slike za pozadinu"
 msgid "No Wallpaper"
 msgstr "Nema pozadinske slike"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -628,105 +635,15 @@ msgstr "Molim odaberite sliku."
 msgid "_Select"
 msgstr "_Označi"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Programi"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Terminalski programi"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Prosvjećenje"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Obuhvaćanje"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M tekstualni preglednik"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx tekstualni preglednik"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links tekstualni preglednik"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution progam za čitanje pošte"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla pošta"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt "
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome Terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Standardni XTerminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Molim navedite ime i naredbu za ovaj uređivač."
@@ -736,20 +653,23 @@ msgid "Add..."
 msgstr "Dodaj..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Izabrani uređivač"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Prilagođeno"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Izabrani čitač pošte:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Prilagođeno"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Izabrani terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Izabrani web preglednik:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Ova aplikacija može otvoriti _više datoteka"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -796,6 +716,16 @@ msgid "Mail Reader"
 msgstr "Čitač pošte"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Pokreni u _terminalu"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Pokreni u _terminalu"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -803,94 +733,170 @@ msgstr ""
 "Odaberite željeni upravitelj prozora. Trebati ćete pritisnuti primjeni, "
 "mahnuti magičnim štapićem i otplesati čarobni ples da bi to uspjelo."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Start in T_erminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Uređivač teksta"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Ova aplikacija može otvoriti _URI-e"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Ova aplikacija može otvoriti _više datoteka"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Ova aplikacija mora biti pokrenuta u _ljusci"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Razumije _Netscape udaljenu kontrolu"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Koristi ovaj _uređivač za otvaranje tekstualnih datoteka u upravitelju "
 "datotekama"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Web preglednik"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Upravitelj prozora"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Naredba:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Postavke..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Odabir čitača pošte:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Označi"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Odabir terminala:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Uobičajeni web preglednik"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "Odabir web preglednika:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Prosvjećenje"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Odabir uređivača:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Pristupačnost"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Obuhvaćanje"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla pošta"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M tekstualni preglednik"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx tekstualni preglednik"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links tekstualni preglednik"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution progam za čitanje pošte"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla pošta"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt "
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Uobičajeni terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Standardni XTerminal"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Postavke pristupačnosti"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "&Napredno"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Napredne mogućnosti"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Promijeni rezoluciju zaslona"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Razlučivost zaslona"
 
@@ -986,7 +992,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Sigurni ste da želite nepovratno obrisati ovaj unos?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Opis"
 
@@ -994,16 +1000,25 @@ msgstr "Opis"
 msgid "Extensions"
 msgstr "Nastavci"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Jednostavan paint program"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Odredi koji programi se koriste za otvaranje ili pregled svakog tipa datoteke"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Tipovi datoteka i programa"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Odredi koji programi se koriste za otvaranje ili pregled svakog tipa datoteke"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Akcije"
@@ -1094,6 +1109,7 @@ msgid "_Protocol:"
 msgstr "Protokol"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -1101,15 +1117,6 @@ msgstr "_Ukloni"
 msgid "_Viewer component:"
 msgstr "_Komponenta pregleda:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Tipovi datoteka i programa"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Odredi koji programi se koriste za otvaranje ili pregled svakog tipa datoteke"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Uređivanje kategorije datoteke"
@@ -1291,14 +1298,15 @@ msgid "Electronic mail transmission"
 msgstr "Prijenos elektroničke pošte"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome dokumentacija"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Pismo"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Aplikacije za pravljenje snimaka radne površine"
 
@@ -1510,29 +1518,29 @@ msgid "The type of accelerator."
 msgstr "Vrsta akceleratora."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Nepoznata akcija>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Radna površina"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Zvuk"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Upravljanje prozorima"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1541,27 +1549,27 @@ msgstr ""
 "Kratica \"%s\" se već koristi za:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Greška pri postavljanju novog akceleratora u konfiguracijskoj bazi: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Greška pri micanju akceleratora u bazi konfiguracija: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Akcija"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Kratica"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Kratice tipkovnice"
 
@@ -1572,26 +1580,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "Unesi novi akcelerator, ili pritisni Backspace za brisanje"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Pridruživanje kratica tipaka naredbama"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Nepoznati pokazivač"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Model"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "Izgled tipkovnice XKB-a"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1763,10 +1755,35 @@ msgstr "_Razdoblje rada traje:"
 msgid "minutes"
 msgstr "minute"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Nepoznati pokazivač"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Model"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "Izgled tipkovnice XKB-a"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Podešavanje postavki tipkovnice"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Podešavanje postavki miša"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Nepoznati pokazivač"
@@ -1931,20 +1948,21 @@ msgstr "_Prag:"
 msgid "_Timeout:"
 msgstr "_Istek vremena:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Miš"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Podešavanje postavki miša"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Mrežni proxy"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Postavke mrežnog proxyja"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1990,7 +2008,8 @@ msgid "H_TTP proxy:"
 msgstr "HTTP proxy:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
+#, fuzzy
+msgid "Network Proxy Preferences"
 msgstr "Postavke mrežnog proxyja"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
@@ -2032,7 +2051,7 @@ msgstr "_Lozinka:"
 msgid "_Secure HTTP proxy:"
 msgstr "Sigurni HTTP proxy:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Omogući zvuk i poveži ga sa događajima"
 
@@ -2090,15 +2109,26 @@ msgstr ""
 "\"Postavke tema\" neispravno instaliran, ili da niste instalirali paket "
 "\"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Nije određeno mjesto gdje će datoteke za teme biti instalirane"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Nije ispravno mjesto gdje će datoteke za teme biti instalirane"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2132,12 +2162,12 @@ msgstr "Ime teme mora biti prisutno"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Aplikacije za pravljenje snimaka radne površine"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2250,11 +2280,11 @@ msgstr "_Ime teme:"
 msgid "theme selection tree"
 msgstr "stablo za odabir tema"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Prilagodi izgled trake s alatima i trake s menijima u aplikacijama"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Izbornici i trake s alatima"
 
@@ -2323,7 +2353,6 @@ msgid "_Edit"
 msgstr "_Uredi"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -2351,6 +2380,14 @@ msgstr "_Završi"
 msgid "_Save"
 msgstr "_Spremi"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2363,23 +2400,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hiper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (ili \"Windows logo\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2422,14 +2459,35 @@ msgstr "_Podigni odabrane prozore nakon intervala"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Odaberi prozor kada se miš pomakne preko njega"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Svojstva prozora"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Windows"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME kontrolni centar"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Postavke pozadine radne površine"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Filteri"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Alat za podešavanje GNOME-a"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2464,88 +2522,6 @@ msgstr "Izbornik Control Centra"
 msgid "View as Control Center"
 msgstr "GNOME kontrolni centar : %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME kontrolni centar: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Izgled"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Razmještaj koji treba koristiti za ovaj pogled cappleta"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Capplet direktorij objekt"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Capplet direktorij koji ovaj pogled koristi"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "lokalizacija@linux.hr"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME kontrolni centar"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Upravitelj svojstvima radne površine."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME kontrolni centar : %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Filteri"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "GNOME kontrolni centar : %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Koristi ljusku čak i ako je nautilus pokrenut."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "O ovoj aplikaciji"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Pregled kontolnog centra"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_O"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Sadržaj"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Alat za podešavanje GNOME-a"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Koristi ljusku čak i ako je nautilus pokrenut."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Razina Zvuka"
@@ -2652,7 +2628,7 @@ msgstr ""
 "Greška prilikom pokušaja pokretanja (%s)\n"
 "koji je povezan na tipku (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2677,7 +2653,7 @@ msgstr ""
 "- rezultat <b>xprop -root | grep XKB</b>\n"
 "- rezultat <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2689,22 +2665,22 @@ msgstr ""
 "Pokušajte koristiti jednostavnije postavke ili uzmite noviju inačicu "
 "programske podrške za XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Postavke zaslona %d\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, fuzzy, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2768,8 +2744,8 @@ msgstr "_Ne prikazuj više ovu poruku"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Ne mogu učitati zvučnu datoteku %s kao uzorak %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Ne mogu odrediti home direktorij korisnika"
 
@@ -2818,11 +2794,11 @@ msgstr "Zaslon"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Zaslona na kojem se iscrtava BGApplier"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Zvučna datoteka za ovaj događaj ne postoji"
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2832,32 +2808,32 @@ msgstr ""
 "Možda bi trebali instalirati gnome-audio paket\n"
 "za skup uobičajenih zvukova."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Datotekć %s nije valjana wav datoteka"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Događaj"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Datoteka sa zvukom"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "Zvukovi:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Datotekć sa zvukom:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Odabir zvučne datoteke"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Sviraj"
 
@@ -3132,28 +3108,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Uskoro, XKB postavke u gconfu će biti prebrisane (od strane sustavske "
-"konfiguracije)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Izgled tipkovnice XKB-a"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Model tipkovnice XKB-a"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Mogućnosti XKB-a"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Model tipkovnice:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Izgled tipkovnice XKB-a"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Model tipkovnice:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Kratice tipkovnice"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Postavke XKB-a će biti prepisane sustavskim postavkama"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Uskoro, XKB postavke u gconfu će biti prebrisane (od strane sustavske "
+"konfiguracije)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Izgled tipkovnice XKB-a"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Model tipkovnice XKB-a"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Odgodi prekid"
@@ -3231,46 +3255,14 @@ msgstr ""
 "da nemate područje za dojave na vašoj ploči. Možete ga dodati desnim klikom "
 "na ploču i odabirom 'Dodaj na ploču -> Pomoćni programi -> Područje dojave'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Brza smeđa lisica preskače lijenog psa. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Ime:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stil:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tip:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Veličina:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Inačica:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Autorska prava:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Opis:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Postavi pismo aplikacije"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Stavke kontekstnog izbornika pisama"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Terminalski programi"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3346,33 +3338,47 @@ msgstr "Treba li umanjenim sličicama prikazati TrueType pisma"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Treba li umanjenim sličicama prikazati Type1 pisma"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Tvornica fontilus kontekstnog izbornika"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Brza smeđa lisica preskače lijenog psa. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus kontekstualni izbornik"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Ime:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Tvornica Fontilus kontekstnog izbornika "
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stil:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Kontekstni zapisi Nautilus izbornika za pisma"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tip:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Postavi pismo aplikacije"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Veličina:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Inačica:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponenta za prikaz sadržaja svojstava teme"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Autorska prava:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Prikaz svojstava Themus teme"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Opis:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME kontrolni centar"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3401,27 +3407,18 @@ msgstr "Primijeni pismo"
 msgid "Themes"
 msgstr "Teme"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Control tema"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Tema obruba prozora"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Tema sličica"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Trenutno prikazana adresa"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Ako je postavljeno na uključeno, instalirane teme će biti umanjene."
@@ -3459,6 +3456,152 @@ msgstr "Treba li umanjenim sličicama prikazati instalirane teme"
 msgid "Whether to thumbnail themes"
 msgstr "Treba li umanjenim sličicama prikazati teme"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Primijeni pismo"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Postavi na uob_ičajeno"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome Terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Izabrani uređivač"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Izabrani čitač pošte:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Izabrani terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Izabrani web preglednik:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Start in T_erminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Ova aplikacija može otvoriti _URI-e"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Ova aplikacija mora biti pokrenuta u _ljusci"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Odabir čitača pošte:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Odabir terminala:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "Odabir web preglednika:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Odabir uređivača:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Pristupačnost"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Postavke pristupačnosti"
+
+#~ msgid "Advanced"
+#~ msgstr "&Napredno"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Napredne mogućnosti"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Postavke mrežnog proxyja"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME kontrolni centar: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Izgled"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Razmještaj koji treba koristiti za ovaj pogled cappleta"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Capplet direktorij objekt"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Capplet direktorij koji ovaj pogled koristi"
+
+#~ msgid "translator_credits"
+#~ msgstr "lokalizacija@linux.hr"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Upravitelj svojstvima radne površine."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME kontrolni centar : %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "GNOME kontrolni centar : %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Koristi ljusku čak i ako je nautilus pokrenut."
+
+#~ msgid "About this application"
+#~ msgstr "O ovoj aplikaciji"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Pregled kontolnog centra"
+
+#~ msgid "_About"
+#~ msgstr "_O"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sadržaj"
+
+#~ msgid "_Help"
+#~ msgstr "_Pomoć"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Koristi ljusku čak i ako je nautilus pokrenut."
+
+#~ msgid "XKB options"
+#~ msgstr "Mogućnosti XKB-a"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Stavke kontekstnog izbornika pisama"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Tvornica fontilus kontekstnog izbornika"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus kontekstualni izbornik"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Tvornica Fontilus kontekstnog izbornika "
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Kontekstni zapisi Nautilus izbornika za pisma"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponenta za prikaz sadržaja svojstava teme"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Prikaz svojstava Themus teme"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "Trenutno prikazana adresa"
+
 #~ msgid "GNOME Default"
 #~ msgstr "GNOME uobičajeno"
 
diff --git a/po/hu.po b/po/hu.po
index d9d0209ff..4fc9977ff 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-12 12:27+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -66,11 +66,11 @@ msgstr "_Billentyűzet a képernyőn"
 msgid "_Screenreader"
 msgstr "_Képernyőfelolvasó"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Kisegítő lehetőségek támogatása"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "GNOME kisegítő lehetőségek engedélyezése belépéskor"
 
@@ -122,13 +122,13 @@ msgstr "Szolgáltatások beállításainak betöltése fájlból"
 msgid "_Import"
 msgstr "_Importálás"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Billentyűzet"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Billentyűzet kisegítő lehetőségeinek beállításai"
 
@@ -342,11 +342,11 @@ msgstr "képpont/másodperc"
 msgid "seconds"
 msgstr "másodperc"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Háttérbeállítások megváltoztatása"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Munkaasztal háttere"
 
@@ -425,6 +425,13 @@ msgstr "Háttér hozzáadása"
 msgid "No Wallpaper"
 msgstr "Nincs háttérkép"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -629,105 +636,15 @@ msgstr "Válasszon egy képet."
 msgid "_Select"
 msgstr "_Kijelölés"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Alapértelmezett alkalmazások"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Alapértelmezett alkalmazások kiválasztása"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M szöveges webböngésző"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx szöveges webböngésző"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links szöveges webböngésző"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "GNOME Terminál"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Szabványos X-terminál"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Adjon meg egy nevet és parancsot ehhez a szerkesztőhöz."
@@ -737,20 +654,23 @@ msgid "Add..."
 msgstr "Hozzáadás..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_Egyéni szerkesztő"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Egyéni"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "_Egyéni levelezőprogram:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Egyéni"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "_Egyéni terminál:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "_Egyéni webböngésző:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "A program meg tud nyitni _több fájlt"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -797,6 +717,16 @@ msgid "Mail Reader"
 msgstr "Levelezőprogram"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "_Futtatás terminálban"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "_Futtatás terminálban"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -805,93 +735,169 @@ msgstr ""
 "gombra, suhintson egyet a varázspálcájával, vagy táncoljon egy varázstáncot, "
 "hogy működjön."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Indítás t_erminálban"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminál"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Szövegszerkesztő"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "A program meg tud nyitni _URI-kat"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "A program meg tud nyitni _több fájlt"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "A programot _héjból kell futtatni"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Elfogadja a _Netscape Remote Control-t"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Használja ezt a _szerkesztőt a szövegfájlok megnyitásához a fájlkezelőben"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Webböngésző"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Ablakkezelő"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_Parancs:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Név:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Tulajdonságok..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Levelezőprogram kiválasztása:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Kijelölés"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Terminál kiválasztása:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Alapértelmezett webböngésző"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "Webböngésző _kiválasztása:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Szerkesztő kiválasztása:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Kisegítő lehetőségek"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Kisegítő lehetőségek beállításai"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M szöveges webböngésző"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx szöveges webböngésző"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links szöveges webböngésző"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Alapértelmezett terminál"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminál"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Szabványos X-terminál"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Haladó"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Haladó beállítások"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Képernyő felbontásának megváltoztatása"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Képernyő felbontása"
 
@@ -982,7 +988,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Biztos, hogy véglegesen törölni akarja ezt a bejegyzést?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Leírás"
 
@@ -990,17 +996,27 @@ msgstr "Leírás"
 msgid "Extensions"
 msgstr "Kiterjesztések"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Fájltípusok és programok"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Az egyes fájltípusok megtekintéséhez vagy megnyitásához használt programok "
 "megadása"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Fájltípusok és programok"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Az egyes fájltípusok megtekintéséhez vagy megnyitásához használt programok "
+"megadása"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Műveletek"
@@ -1091,6 +1107,7 @@ msgid "_Protocol:"
 msgstr "_Protokoll:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
@@ -1098,16 +1115,6 @@ msgstr "_Eltávolítás"
 msgid "_Viewer component:"
 msgstr "_Nézőkomponens:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Fájltípusok és programok"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Az egyes fájltípusok megtekintéséhez vagy megnyitásához használt programok "
-"megadása"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Fájlkategória szerkesztése"
@@ -1289,14 +1296,15 @@ msgid "Electronic mail transmission"
 msgstr "Elektronikus levélküldés"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "GNOME-dokumentáció"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Betűkészlet"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Az asztalon levő ikonok betűkészletének beállítása"
 
@@ -1501,29 +1509,29 @@ msgid "The type of accelerator."
 msgstr "A gyorsbillentyű típusa."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Tiltva"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Ismeretlen művelet>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Munkaasztal"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Hang"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Ablakkezelés"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1532,29 +1540,29 @@ msgstr ""
 "A(z) \"%s\" gyorsbillentyű már le van foglalva erre:\n"
 "\"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Hiba történt az új gyorsbillentyű beállításánál a konfigurációs "
 "adatbázisban: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Hiba történt a gyorsbillentyű törlésénél a konfigurációs adatbázisban: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Művelet"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Gyorsbillentyű"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Gyorsbillentyűk"
 
@@ -1566,23 +1574,10 @@ msgstr ""
 "Gyorsbillentyű szerkesztéséhez kattintson a megfelelő sorra és nyomja le az "
 "új gyorsbillentyűt, vagy nyomja meg a Backspace billentyűt a törléshez."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Gyorsbillentyűk parancsokhoz rendelése"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modellek"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Billentyűzetkiosztás előnézete"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1752,10 +1747,32 @@ msgstr "_Munka időtartama:"
 msgid "minutes"
 msgstr "perc"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modellek"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Billentyűzetkiosztás előnézete"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Billentyűzet beállításai"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Egér beállításai"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Ismeretlen kurzor"
@@ -1920,20 +1937,21 @@ msgstr "_Küszöbszint:"
 msgid "_Timeout:"
 msgstr "_Időtúllépés:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Egér"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Egér beállításai"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Hálózati proxy"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Hálózati proxy beállításai"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1977,8 +1995,9 @@ msgid "H_TTP proxy:"
 msgstr "_HTTP-proxy:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Hálózati proxy tulajdonságai"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Hálózati proxy beállításai"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2016,7 +2035,7 @@ msgstr "_Jelszó:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Biztonságos HTTP-proxy:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Hangok engedélyezése és eseményekhez rendelése"
 
@@ -2074,15 +2093,26 @@ msgstr ""
 "beállításai\" párbeszédablak nem lett megfelelően telepítve, vagy nem "
 "telepítette a \"gnome-themes\" csomagot."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Nincs megadva a témafájl elérési útvonala a telepítéshez"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "A telepítendő témafájl megadott helye érvénytelen"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2117,12 +2147,12 @@ msgstr "A témanévnek jelen kell lennie"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "A téma már létezik. Le szeretné cserélni?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Az asztal különböző részeihez témák kiválasztása"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Téma"
 
@@ -2234,11 +2264,11 @@ msgstr "_Téma neve:"
 msgid "theme selection tree"
 msgstr "Témakiválasztó fa"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Eszköztárak és menüsorok megjelenítésének beállítása"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menük és eszköztárak"
 
@@ -2307,7 +2337,6 @@ msgid "_Edit"
 msgstr "S_zerkesztés"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fájl"
 
@@ -2335,6 +2364,14 @@ msgstr "_Kilépés"
 msgid "_Save"
 msgstr "M_entés"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2347,23 +2384,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (vagy \"Windows logó\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2405,14 +2442,34 @@ msgstr "_Kijelölt ablakok előtérbe hozásának késleltetése"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Ablakok kiválasztása, ha az egér föléjük ér"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Az ablak tulajdonságai"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Ablakok"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME Vezérlőpult"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "A munkaasztal hátterének beállításai"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Egyéb"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "A GNOME beállítóeszköze"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Vezérlőpult"
@@ -2442,92 +2499,6 @@ msgstr "Vezérlőpult-nézet factory"
 msgid "View as Control Center"
 msgstr "Megtekintés vezérlőpultként"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME Vezérlőpult: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Kiosztás"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "A capplet-ek megtekintéséhez használt elrendezés"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Capplet könyvtárobjektum"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Capplet könyvtár, amit ez a nézet jelenít meg"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Bán Szabolcs <shooby@gnome.hu>\n"
-"Doma Péter <zelin@pointernet.hu>\n"
-"Dvornik László <dvornik@gnome.hu>\n"
-"Kelemen Gábor <kelemeng@gnome.hu>\n"
-"Kovács Emese <emese@gnome.hu>\n"
-"Sári Gábor <saga@gnome.hu>\n"
-"Tímár András <timar@gnome.hu>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME Vezérlőpult"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Munkaasztal tulajdonságkezelője."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME Vezérlőpult: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Egyéb"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "GNOME Vezérlőpult"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "A Nautilus használata, ha az fut."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Az alkalmazás névjegye"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "A vezérlőpult áttekintése"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Névjegy"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Tartalom"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Súgó"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "A GNOME beállítóeszköze"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Használja a héjat, még ha a Nautilus fut is."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Hangerő"
@@ -2637,7 +2608,7 @@ msgstr ""
 "Hiba (%s) futtatása közben\n"
 "ami ehhez a billentyűhöz van kapcsolva: (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2662,7 +2633,7 @@ msgstr ""
 "- <b>xprop -root | grep XKB</b> eredményét\n"
 "- <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b> eredményét"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2673,7 +2644,7 @@ msgstr ""
 "Ismert problémák vannak bonyolult XKB beállításokkal. Próbálkozzon "
 "egyszerűbb beállításokkal vagy az XFree program frissítésével."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2681,15 +2652,15 @@ msgstr ""
 "Az X rendszerbillentyűzet beállításai különböznek a GNOME "
 "billentyűzetbeállításaitól. Melyiket szeretné használni?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "X-beállítások használata"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "GNOME-beállítások használata"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2754,8 +2725,8 @@ msgstr "_Ne mutassa ezt többé"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nem sikerült betölteni a(z) %s fájlt a(z) %s hangmintához"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Nem lehet meghatározni a felhasználó saját könyvtárát"
 
@@ -2805,11 +2776,11 @@ msgstr "Képernyő"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Az a képernyő, amelyre a BGApplier rajzolhat"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "A hangfájl ehhez az eseményhez nem létezik."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2819,32 +2790,32 @@ msgstr ""
 "A gnome-audio csomagot fel kell telepítenie ahhoz,\n"
 "hogy az alapértelmezett hangokat hallja."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "A(z) %s fájl nem egy érvényes wav fájl"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Esemény"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Hangfájl"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Hangok:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Hang_fájl:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Hangfájl kiválasztása"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Lejátszás"
 
@@ -3104,31 +3075,79 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Hamarosan az XKB beállítások felül lesznek bírálva (a rendszer "
-"beállításaiból)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB billentyűzet kiosztás"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB billentyűzetmodell"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB beállítások"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Billentyűzet_modell:"
 
-# FIXME ASAP micsoda?
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB billentyűzet kiosztás"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Billentyűzet_modell:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Gyorsbillentyűk"
+
+# FIXME ASAP micsoda?
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "Amint lehetséges a gconf XKB beállításai felülíródnak a rendszer "
 "beállításaival"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Hamarosan az XKB beállítások felül lesznek bírálva (a rendszer "
+"beállításaiból)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB billentyűzet kiosztás"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB billentyűzetmodell"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Szünet elhalasztása"
@@ -3207,46 +3226,14 @@ msgstr ""
 "Hozzáadhatja a helyi menü 'Hozzáadás -> Eszközök -> Figyelmeztetési terület' "
 "pontjával."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Árvíztűrő tükörfúrógép. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Név:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stílus:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Típus:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Méret:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Verzió:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Leírás:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "használat: %s betűkészletfájl\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Alkalmazás betűkészletének beállítása"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Betűkészlet helyi menü elemei"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Alapértelmezett alkalmazások kiválasztása"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3323,35 +3310,47 @@ msgstr "Be legyen-e kapcsolva a TrueType betűkészletek előnézete"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Be legyen-e kapcsolva a Type1 betűkészletek előnézete"
 
-# FIXME factory
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Factory a fontilus helyi menüjéhez"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Árvíztűrő tükörfúrógép. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus helyi menü"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Név:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus helyi menü factory"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stílus:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Nautilus helyi menü bejegyzések betűkészletekhez"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Típus:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Alkalmazás betűkészletének beállítása"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Méret:"
 
-# FIXME
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Téma tulajdonságai tartalomnézet-komponens"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Verzió:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Leírás:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus tématulajdonságok nézet"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "használat: %s betűkészletfájl\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME Vezérlőpult"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3382,27 +3381,18 @@ msgstr "_Betűkészlet alkalmazása"
 msgid "Themes"
 msgstr "Témák"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Vezérlőelem-téma"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Ablakkerettéma"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikontéma"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "A jelenleg megjelenített URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ÁÉÍÓŐÚŰ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Ha be van állítva, a telepített témák előnézete megjelenik."
@@ -3439,3 +3429,156 @@ msgstr "Be legyen-e kapcsolva a telepített témák előnézete"
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "Be legyen-e kapcsolva a témák előnézete"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ÁÉÍÓŐÚŰ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Betűkészlet alkalmazása"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Visszaállítás az _alapértelmezettre"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "GNOME Terminál"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_Egyéni szerkesztő"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "_Egyéni levelezőprogram:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "_Egyéni terminál:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "_Egyéni webböngésző:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Indítás t_erminálban"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "A program meg tud nyitni _URI-kat"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "A programot _héjból kell futtatni"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Levelezőprogram kiválasztása:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Terminál kiválasztása:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "Webböngésző _kiválasztása:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Szerkesztő kiválasztása:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Kisegítő lehetőségek"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Kisegítő lehetőségek beállításai"
+
+#~ msgid "Advanced"
+#~ msgstr "Haladó"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Haladó beállítások"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Hálózati proxy tulajdonságai"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME Vezérlőpult: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Kiosztás"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "A capplet-ek megtekintéséhez használt elrendezés"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Capplet könyvtárobjektum"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Capplet könyvtár, amit ez a nézet jelenít meg"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Bán Szabolcs <shooby@gnome.hu>\n"
+#~ "Doma Péter <zelin@pointernet.hu>\n"
+#~ "Dvornik László <dvornik@gnome.hu>\n"
+#~ "Kelemen Gábor <kelemeng@gnome.hu>\n"
+#~ "Kovács Emese <emese@gnome.hu>\n"
+#~ "Sári Gábor <saga@gnome.hu>\n"
+#~ "Tímár András <timar@gnome.hu>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Munkaasztal tulajdonságkezelője."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME Vezérlőpult: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "GNOME Vezérlőpult"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "A Nautilus használata, ha az fut."
+
+#~ msgid "About this application"
+#~ msgstr "Az alkalmazás névjegye"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "A vezérlőpult áttekintése"
+
+#~ msgid "_About"
+#~ msgstr "_Névjegy"
+
+#~ msgid "_Contents"
+#~ msgstr "_Tartalom"
+
+#~ msgid "_Help"
+#~ msgstr "_Súgó"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Használja a héjat, még ha a Nautilus fut is."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB beállítások"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Betűkészlet helyi menü elemei"
+
+# FIXME factory
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Factory a fontilus helyi menüjéhez"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus helyi menü"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus helyi menü factory"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Nautilus helyi menü bejegyzések betűkészletekhez"
+
+# FIXME
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Téma tulajdonságai tartalomnézet-komponens"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus tématulajdonságok nézet"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "A jelenleg megjelenített URI"
diff --git a/po/id.po b/po/id.po
index 76fc9cae5..6ecfdf176 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-26 07:45+0700\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-10-26 00:01+0700\n"
 "Last-Translator: Mohammad DAMT <mdamt@bisnisweb.com>\n"
 "Language-Team: Indonesia <l10n@gnome.linux.or.id>\n"
@@ -60,11 +60,11 @@ msgstr "Keyb_oard Layar"
 msgid "_Screenreader"
 msgstr "Pembaca _Layar"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Dukungan Teknologi Bantuan"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Aktifkan dukungan teknologi asistif GNOME saat login"
 
@@ -118,13 +118,13 @@ msgstr "Ambil Berkas Seting Fitur"
 msgid "_Import"
 msgstr "_Impor"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Keyboard"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Atur aksesibilitas keyboard"
 
@@ -334,11 +334,11 @@ msgstr "piksel/detik"
 msgid "seconds"
 msgstr "detik"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Atur Gambar Latar Desktop"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Gambar Latar Desktop"
 
@@ -417,6 +417,13 @@ msgstr "Tambah Gambar Hiasan"
 msgid "No Wallpaper"
 msgstr "Tanpa Gambar"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -622,15 +629,148 @@ msgstr "Silakan pilih sebuah gambar."
 msgid "_Select"
 msgstr "_Pilih"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Aplikasi Pilihan"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Silakan pilih aplikasi utama"
 
+#: capplets/default-applications/gnome-default-applications-properties.c:123
+msgid "Please specify a name and a command for this editor."
+msgstr "Silakan masukkan nama dan perintah penyunting ini."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:2
+msgid "Add..."
+msgstr "Tambah..."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:3
+#, fuzzy
+msgid "C_ustom"
+msgstr "Lainnya"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:4
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Lainnya"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:5
+msgid "Can open _URIs"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:6
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Aplikasi ini dapat _membuka banyak file"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:7
+msgid "Co_mmand:"
+msgstr "Peri_ntah:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:8
+msgid "Custom Editor Properties"
+msgstr "Rincian Penyunting Lainnya"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:9
+msgid "Default Mail Reader"
+msgstr "Pembaca Email Utama"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:10
+msgid "Default Terminal"
+msgstr "Terminal Utama"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:11
+msgid "Default Text Editor"
+msgstr "Penyunting Teks Utama"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:12
+msgid "Default Web Browser"
+msgstr "Penjelajah Web Utama"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:13
+msgid "Default Window Manager"
+msgstr "Pengatur Jendela Utama"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:14
+msgid "Delete"
+msgstr "Hapus"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:15
+msgid "E_xec Flag:"
+msgstr "Tanda E_ksekusi:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:16
+msgid "Edit..."
+msgstr "Ubah..."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:17
+msgid "Mail Reader"
+msgstr "Pembaca Email"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Jalankan dalam _Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Jalankan dalam _Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+msgid ""
+"Select the window manager you want.  You will need to hit apply, wave the "
+"magic wand, and do a magic dance for it to work."
+msgstr ""
+"Pilih pengatur jendela yang Anda ingin gunakan. Silakan klik tombol Terapkan "
+"untuk mengaktifkannya."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+msgid "Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
+msgid "Text Editor"
+msgstr "Penyunting Teks"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:24
+msgid "Understands _Netscape Remote Control"
+msgstr "Paham protokol _Netscape Remote Control"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
+msgid "Use this _editor to open text files in the file manager"
+msgstr ""
+"Gunakan program ini untuk m_enyunting berkas teks dalam pengatur berkas"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
+msgid "Web Browser"
+msgstr "Penjelajah Web"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+msgid "Window Manager"
+msgstr "Pengatur Jendela"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Peri_ntah:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/file-types/file-types-properties.glade.h:23
+msgid "_Name:"
+msgstr "_Nama:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+msgid "_Properties..."
+msgstr "_Pengaturan..."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Pilih"
+
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:9
 msgid "Debian Sensible Browser"
 msgstr "Penjelajah Sensible Debian"
@@ -648,7 +788,8 @@ msgid "Encompass"
 msgstr "Encompass"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-msgid "Firebird/FireFox"
+#, fuzzy
+msgid "Firebird"
 msgstr "Firebird/FireFox"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:14
@@ -657,8 +798,9 @@ msgstr "Firefox"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:15
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:17
 msgid "Netscape Communicator"
@@ -739,169 +881,11 @@ msgstr "aterm"
 msgid "ETerm"
 msgstr "ETerm"
 
-#: capplets/default-applications/gnome-default-applications-properties.c:123
-msgid "Please specify a name and a command for this editor."
-msgstr "Silakan masukkan nama dan perintah penyunting ini."
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:2
-msgid "Add..."
-msgstr "Tambah..."
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Peny_unting Lainnya"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Pembaca Email L_ainnya:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terminal _Lainnya:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Penjelajah Web _Lainnya:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:7
-msgid "Co_mmand:"
-msgstr "Peri_ntah:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:8
-msgid "Custom Editor Properties"
-msgstr "Rincian Penyunting Lainnya"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:9
-msgid "Default Mail Reader"
-msgstr "Pembaca Email Utama"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:10
-msgid "Default Terminal"
-msgstr "Terminal Utama"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:11
-msgid "Default Text Editor"
-msgstr "Penyunting Teks Utama"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:12
-msgid "Default Web Browser"
-msgstr "Penjelajah Web Utama"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:13
-msgid "Default Window Manager"
-msgstr "Pengatur Jendela Utama"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:14
-msgid "Delete"
-msgstr "Hapus"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:15
-msgid "E_xec Flag:"
-msgstr "Tanda E_ksekusi:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:16
-msgid "Edit..."
-msgstr "Ubah..."
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:17
-msgid "Mail Reader"
-msgstr "Pembaca Email"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:19
-msgid ""
-"Select the window manager you want.  You will need to hit apply, wave the "
-"magic wand, and do a magic dance for it to work."
-msgstr ""
-"Pilih pengatur jendela yang Anda ingin gunakan. Silakan klik tombol Terapkan "
-"untuk mengaktifkannya."
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Jalankan dalam T_erminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
-msgid "Terminal"
-msgstr "Terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
-msgid "Text Editor"
-msgstr "Penyunting Teks"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Aplikasi ini dapat membuka _URI"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Aplikasi ini dapat _membuka banyak file"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Aplikasi ini harus dijalankan dalam _shell"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
-msgid "Understands _Netscape Remote Control"
-msgstr "Paham protokol _Netscape Remote Control"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
-msgid "Use this _editor to open text files in the file manager"
-msgstr ""
-"Gunakan program ini untuk m_enyunting berkas teks dalam pengatur berkas"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
-msgid "Web Browser"
-msgstr "Penjelajah Web"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
-msgid "Window Manager"
-msgstr "Pengatur Jendela"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
-#: capplets/file-types/file-types-properties.glade.h:23
-msgid "_Name:"
-msgstr "_Nama:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
-msgid "_Properties..."
-msgstr "_Pengaturan..."
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Pilih Pembaca Email:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Pilih Terminal:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Pilih Penjelajah Web:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Pilih Penyunting"
-
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Aksesibilitas"
-
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Pengaturan Aksesibilitas"
-
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Rinci"
-
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Pengaturan Rinci"
-
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Ubah resolusi layar"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Resolusi Layar"
 
@@ -989,7 +973,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Apakah Anda yakin ingin menghapus data ini?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Keterangan"
 
@@ -997,17 +981,26 @@ msgstr "Keterangan"
 msgid "Extensions"
 msgstr "Ekstensi"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Jenis Berkas dan Program"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Tentukan program mana yang akan digunakan untuk membuka tiap-tiap jenis "
 "berkas"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Jenis berkas dan program"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Tentikan program yang akan digunakan untuk membuka tiap-tiap jenis berkas"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Tindakan"
@@ -1098,6 +1091,7 @@ msgid "_Protocol:"
 msgstr "_Protokol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Hapus"
 
@@ -1105,15 +1099,6 @@ msgstr "_Hapus"
 msgid "_Viewer component:"
 msgstr "Komponen _pembuka:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Jenis berkas dan program"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Tentikan program yang akan digunakan untuk membuka tiap-tiap jenis berkas"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Ubah kategori berkas"
@@ -1298,11 +1283,11 @@ msgstr "Pengiriman surat elektronik"
 msgid "GNOME documentation"
 msgstr "Dokumentasi GNOME"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Jenis Huruf"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Pilih huruf yang dipakai pada desktop"
 
@@ -1513,7 +1498,7 @@ msgid "Desktop"
 msgstr "Desktop"
 
 #: capplets/keybindings/gnome-keybinding-properties.c:559
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Suara"
 
@@ -1551,7 +1536,7 @@ msgid "Shortcut"
 msgstr "Tombol Singkat"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Tombol Singkat"
 
@@ -1564,23 +1549,10 @@ msgstr ""
 "dan tekan tombol yang ingin digunakan sebagai tombol singkat atau tekan "
 "tombol backspace untuk membatalkan."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Pasang tombol singkat untuk perintah tertentu"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Tidak diketahui"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Model"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
-msgid "Keyboard layout preview"
-msgstr "Contoh layout keyboard"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1748,10 +1720,32 @@ msgstr "Lama _waktu kerja:"
 msgid "minutes"
 msgstr "menit"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Tidak diketahui"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Model"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Contoh layout keyboard"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Atur keyboard Anda"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Atur mouse Anda"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Kursor Tidak Diketahui"
@@ -1916,20 +1910,21 @@ msgstr "_Derajat:"
 msgid "_Timeout:"
 msgstr "Waktu _timeout:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Mouse"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Atur mouse Anda"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Proksi Jaringan"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Pengaturan proksi jaringan"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1973,8 +1968,9 @@ msgid "H_TTP proxy:"
 msgstr "Proksi H_TTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Konfigurasi Proksi Jaringan"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Pengaturan proksi jaringan"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2012,7 +2008,7 @@ msgstr "Kata _Sandi:"
 msgid "_Secure HTTP proxy:"
 msgstr "Proksi HTTP _Secure:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Bunyikan suara dan asosiasikan dengan kejadian tertentu"
 
@@ -2070,15 +2066,26 @@ msgstr ""
 "dialog \"Pengaturan Tema\" tidak dipasang dengan benar atau Anda belum "
 "memasang paket \"gnome-themes\" pada komputer ini."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Lokasi berkas tema yang ingin dipasang tidak tersedia"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Lokasi berkas tema yang dipilih tidak benar"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2113,12 +2120,12 @@ msgstr "Nama tema harus ada"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Tema sudah ada sebelumnya. Ingin diganti saja?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Pilih tema untuk desktop"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2230,11 +2237,11 @@ msgstr "Nama _tema:"
 msgid "theme selection tree"
 msgstr "pohon pilihan tema"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Atur penampakan kotak tombol dan batang menu pada aplikasi"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menu & Kotak Tombol"
 
@@ -2303,7 +2310,6 @@ msgid "_Edit"
 msgstr "_Ubah"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Berkas"
 
@@ -2331,6 +2337,14 @@ msgstr "_Keluar"
 msgid "_Save"
 msgstr "_Simpan"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2400,14 +2414,34 @@ msgstr "_Angkat jendela terpilih setelah jeda waktu tertentu"
 msgid "_Select windows when the mouse moves over them"
 msgstr "P_ilih jendela saat mouse berada di atasnya"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Pengaturan Jendela"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Jendela"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Pusat Kontrol GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Pengaturan Gambar Latar Desktop"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Lainnya"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Program pengatur sistem GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Pusat Kontrol"
@@ -2436,43 +2470,6 @@ msgstr "Factory tampilan Pusat Kontrol"
 msgid "View as Control Center"
 msgstr "Tampilkan dalam bentuk Pusat Kontrol"
 
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Lainnya"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Pusat Kontrol GNOME"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Gunakan nautilus bila sedang jalan."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Informasi mengenai aplikasi ini"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Sekilas mengenai pusat kontrol"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "Keter_angan Program"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "Daftar _Isi"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "Ba_ntuan"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Program pengatur sistem GNOME"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volume"
@@ -2581,7 +2578,7 @@ msgstr ""
 "Error saat menjalankan (%s)\n"
 "kebetulan ini terhubung ke tombol (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2607,7 +2604,7 @@ msgstr ""
 "- Hasil keluaran perintah <b>gconftool-2 -R /desktop/gnome/peripherals/"
 "keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2619,7 +2616,7 @@ msgstr ""
 "Cobalah gunakan konfigurasi yang lebih ringkas atau gunakan versi XFree yang "
 "lebih baru."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2627,15 +2624,15 @@ msgstr ""
 "Pengaturan keyboard sistem X berbeda dengan pengaturan keyboard GNOME yang "
 "sedang aktif. Konfigurasi apa yang ingin Anda gunakan?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Gunakan pengaturan X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Gunakan pengaturan GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2700,8 +2697,8 @@ msgstr "_Jangan tampilkan pesan ini lagi"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Berkas suara %s untuk sampel %s tidak dapat dibuka"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Direktori rumah pemilik tidak dapat ditentukan"
 
@@ -2751,11 +2748,11 @@ msgstr "Layar"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Layar tempat BGApplier digambar"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Berkas suara yang dipasangkan pada kejadian ini tidak tersedia."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2765,32 +2762,32 @@ msgstr ""
 "Silakan pasang dulu paket gnome-audio untuk memperoleh\n"
 "berkas-berkas suara bawaan."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Berkas %s bukanlah berkas wave yang benar"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Kejadian"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Berkas Suara"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Suara:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Berkas suara:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Pilih Berkas Suara"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Putar"
 
@@ -3051,28 +3048,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Sebentar lagi pengaturan XKB dari gconf akan dialihkan dari konfigurasi "
-"sistem"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Layout Keyboad XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Model Keyboard XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Pengaturan XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Model keyboard:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Layout Keyboad XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Model keyboard:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Tombol Singkat"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Pengaturan XKB pada gconf akan dialihkan dari sistem ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Sebentar lagi pengaturan XKB dari gconf akan dialihkan dari konfigurasi "
+"sistem"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Layout Keyboad XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Model Keyboard XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "Nanti _Saja"
@@ -3149,46 +3194,14 @@ msgstr ""
 "dulu area notifikasi ke panel dengan cara mengklik kanan pada panel dan "
 "pilih 'Tambahkan ke panel -> Program Bantu -> Area Notifikasi'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Walau macet vw pak faizal dikejar taxi sang buqhory. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nama:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Gaya:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tipe:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Ukuran:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versi:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Hak Cipta:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Keterangan:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "cara pakai: %s berkasfont\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Jadikan sebagai font yang digunakan oleh semua Aplikasi"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Item menu konteks font"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Silakan pilih aplikasi utama"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3266,33 +3279,47 @@ msgstr ""
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Menentukan apakah ingin membuat contoh huruf untuk huruf jenis Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Factory untuk menu konteks fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Walau macet vw pak faizal dikejar taxi sang buqhory. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Menu konteks Fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nama:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Factory menu konteks Fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Gaya:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Entri menu konteks Nautilus untuk font"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tipe:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Jadikan sebagai font yang digunakan oleh semua Aplikasi"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Ukuran:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponen tampilan isi Pengaturan Tema"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versi:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Tampilan Pengaturan Tema Themus"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Hak Cipta:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Keterangan:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "cara pakai: %s berkasfont\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Pusat Kontrol GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3322,27 +3349,18 @@ msgstr "_Aktifkan huruf"
 msgid "Themes"
 msgstr "Tema"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Tema kontrol"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Tema bingkai jendela"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Tema ikon"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI yang tampil sekarang"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Jika diset, semua tema terpasang akan disiapkan ukuran kecilnya."
@@ -3383,6 +3401,117 @@ msgstr "Menentukan apakah ingin  membuat contoh tampilan tema terpasang."
 msgid "Whether to thumbnail themes"
 msgstr "Menentukan apakah ingin  membuat contoh tampilan tema."
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Aktifkan huruf"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "_Kembalikan ke awal"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Peny_unting Lainnya"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Pembaca Email L_ainnya:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terminal _Lainnya:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Penjelajah Web _Lainnya:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Jalankan dalam T_erminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Aplikasi ini dapat membuka _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Aplikasi ini harus dijalankan dalam _shell"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Pilih Pembaca Email:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Pilih Terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Pilih Penjelajah Web:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Pilih Penyunting"
+
+#~ msgid "Accessibility"
+#~ msgstr "Aksesibilitas"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Pengaturan Aksesibilitas"
+
+#~ msgid "Advanced"
+#~ msgstr "Rinci"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Pengaturan Rinci"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Konfigurasi Proksi Jaringan"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Gunakan nautilus bila sedang jalan."
+
+#~ msgid "About this application"
+#~ msgstr "Informasi mengenai aplikasi ini"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Sekilas mengenai pusat kontrol"
+
+#~ msgid "_About"
+#~ msgstr "Keter_angan Program"
+
+#~ msgid "_Contents"
+#~ msgstr "Daftar _Isi"
+
+#~ msgid "_Help"
+#~ msgstr "Ba_ntuan"
+
+#~ msgid "XKB options"
+#~ msgstr "Pengaturan XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Item menu konteks font"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Factory untuk menu konteks fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menu konteks Fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Factory menu konteks Fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Entri menu konteks Nautilus untuk font"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponen tampilan isi Pengaturan Tema"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Tampilan Pengaturan Tema Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI yang tampil sekarang"
+
 #~ msgid "Gnome Terminal"
 #~ msgstr "Gnome Terminal"
 
diff --git a/po/is.po b/po/is.po
index 22a058a18..00c93ef1f 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gnome Control Center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-04-03 22:38-0000\n"
 "Last-Translator: Samel Jn Gunnarsson <sammi@techattack.nu>\n"
 "Language-Team: Icelandic <gnome@techattack.nu>\n"
@@ -59,11 +59,11 @@ msgstr "L_yklaborð á skjá"
 msgid "_Screenreader"
 msgstr "_Skjálesari"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Stuðningur við stoðtækni"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Virkja stuðning við GNOME-stoðtækni við innritun"
 
@@ -114,13 +114,13 @@ msgstr "Flytja inn þáttastillingarskrá"
 msgid "_Import"
 msgstr "Flytja _inn"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Lyklaborð"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Skilgreina lyklaborðsaðgengi"
 
@@ -333,12 +333,12 @@ msgstr "pixlar/sekúndu"
 msgid "seconds"
 msgstr "sekúndur"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 #, fuzzy
 msgid "Change your Desktop Background settings"
 msgstr "Breyta skjáborðsbakgrunni"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 #, fuzzy
 msgid "Desktop Background"
 msgstr "Bakgrunnur"
@@ -430,6 +430,13 @@ msgstr "Bæta við skjáborðsmynd"
 msgid "No Wallpaper"
 msgstr "Engin skjáborðsmynd"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -633,106 +640,15 @@ msgstr "Veldu mynd."
 msgid "_Select"
 msgstr "_Velja"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Valin forrit"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Veldu sjálfgefin forrit"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-#, fuzzy
-msgid "W3M Text Browser"
-msgstr "Lynx textavafri"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx textavafri"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links textavafri"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution póstforrit"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome Stjórnborð"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Staðlað XStjórnborð"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Skilgreindu nafn og skipun fyrir þennan ritil."
@@ -742,20 +658,23 @@ msgid "Add..."
 msgstr "Bæta við..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "S_kilgreindur ritill"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Skilgreina"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "S_kilgreint póstforrit:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Skilgreina"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "S_kilgreint skel:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "S_kilgreindur vafri:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Þetta forrit getur opnað _fleiri skrár"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -802,6 +721,16 @@ msgid "Mail Reader"
 msgstr "Póstforrit"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Keyra í s_tjórnborði:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Keyra í s_tjórnborði:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -809,92 +738,169 @@ msgstr ""
 "Veldu gluggastjóra. Þú verður að smella á nota, sveifla töfrasprotanum og "
 "dansa hringdans til að það virki."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Ræsa í sk_el"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Skel"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Textaritill"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Þetta forrit getur opnað URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Þetta forrit getur opnað _fleiri skrár"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Þetta forrit þarf að keyra í _skel"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Skilur _Netscape fjarstýringu"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Nota þennan _ritil til að opna textaskrár í skráarstjóra."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Vafri"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Gluggastjóri"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Skipu_n:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nafn:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Eiginleikar..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Veldu póstforrit:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Velja"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Veldu stjórnborð:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Sjálfgefinn vafri"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Veldu vafra:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Veldu textaritil"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Aðgengi"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Aðgengisstillingar"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Háþróað"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Háþróaðar stillingar"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+#, fuzzy
+msgid "W3M Text Browser"
+msgstr "Lynx textavafri"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx textavafri"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links textavafri"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution póstforrit"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Sjálfgefið stjórnborð"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Skel"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Staðlað XStjórnborð"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Breyta skjáupplausn"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Skjáupplausn"
 
@@ -984,7 +990,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Ertu viss um að þú viljir endanlega eyða þessari færslu?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Lýsing"
 
@@ -992,15 +998,24 @@ msgstr "Lýsing"
 msgid "Extensions"
 msgstr "Viðbætur"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Skráartegundir og forrit"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "Skilgreindu hvaða forrit opnar eða skoðar hverja skráartegund."
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Skráartegundir og forrit"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Skilgreina hvaða forrit á að nota til að opna eða skoða hverja skráartegund"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Aðgerðir"
@@ -1091,6 +1106,7 @@ msgid "_Protocol:"
 msgstr "Samski_ptastaðall:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "Fja_rlægja:"
 
@@ -1098,15 +1114,6 @@ msgstr "Fja_rlægja:"
 msgid "_Viewer component:"
 msgstr "_Sjá:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Skráartegundir og forrit"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Skilgreina hvaða forrit á að nota til að opna eða skoða hverja skráartegund"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Breyta skráarflokkun"
@@ -1290,14 +1297,15 @@ msgid "Electronic mail transmission"
 msgstr "Flutningur á tölvupósti"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome-handbækur"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Letur"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Veldu skjáborðsletur"
 
@@ -1499,29 +1507,29 @@ msgid "The type of accelerator."
 msgstr "Tegund flýtilykils."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Óvirkt"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Óþekkt aðgerð>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Skjáborð"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Hljóð"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Gluggastjórnun"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1530,26 +1538,26 @@ msgstr ""
 "Flýtivísunin \"%s\" er þegar notuð fyrir:\n"
 "\"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Villa við skilgreiningu nýs flýtilykils í stillingagrunni: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, fuzzy, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Villa við skilgreiningu nýs flýtilykils í stillingagrunni: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Aðgerð"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Flýtivísun"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Flýtilyklar"
 
@@ -1561,26 +1569,10 @@ msgid ""
 msgstr ""
 "Sláðu á nýjan flýtilykil, eða ýttu á \"til baka\"-lykilinn til að hreinsa"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Tengja flýtilykla við skipanir"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Óþekktur bendill"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Líkan"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "Flýtilyklar"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1757,10 +1749,35 @@ msgstr "_Vinnutími varir:"
 msgid "minutes"
 msgstr "mínútur"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Óþekktur bendill"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Líkan"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "Flýtilyklar"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Stilltu lyklaborðið"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Stilltu músina"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Óþekktur bendill"
@@ -1925,20 +1942,21 @@ msgstr "_Þröskuldur:"
 msgid "_Timeout:"
 msgstr "_Tímamörk:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Mús"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Stilltu músina"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Netsel"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Netselsstillingar"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1984,7 +2002,8 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP sel:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
+#, fuzzy
+msgid "Network Proxy Preferences"
 msgstr "Netselsstillingar"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
@@ -2026,7 +2045,7 @@ msgstr "_Lykilorð:"
 msgid "_Secure HTTP proxy:"
 msgstr "Ö_ruggt HTTP sel:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Virkja hljóð og tengja hljóð við atvik"
 
@@ -2084,15 +2103,26 @@ msgstr ""
 "valglugginn var ekki rétt uppsettur, eða að þú hefur ekki sett upp \"gnome-"
 "themes\" pakkann."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2124,12 +2154,12 @@ msgstr "Þemanafn verður að vera til staðar."
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Veldu þemu fyrir ýmsa hluta skjáborðsins"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Þema"
 
@@ -2244,11 +2274,11 @@ msgstr "_Nafn þema:"
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Breyta útliti tækjastiku og valmynda í forritum."
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Valblöð og tækjastikur"
 
@@ -2317,7 +2347,6 @@ msgid "_Edit"
 msgstr "Sýs_l"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Skrá"
 
@@ -2345,6 +2374,14 @@ msgstr "_Hætta"
 msgid "_Save"
 msgstr "_Vista"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2356,23 +2393,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Ofur"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Yfir (eða \"Windows lógó\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Lýsigögn"
 
@@ -2416,14 +2453,35 @@ msgstr "_Hækkar valda glugga eftir ákveðinn tíma"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Velur glugga þegar músin fer yfir þá"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Eiginleikar glugga"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Gluggar"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME-stjórnstöð"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Bakgrunnsstillingar"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Síur"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "GNOME stillingatækið"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2458,88 +2516,6 @@ msgstr "Fontilus samhengisvalssmiðja"
 msgid "View as Control Center"
 msgstr "Gnome-stjórnstöð: %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME stjórnstöð: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Umbrot"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Umbrot fyrir þessa sýn á capplett-in"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Capplet efnisskrárhlutur"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Capplet efnisskrá sem þessi sjá sýnir"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Áki G. Karlsson  <aki at akademia dot is>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME-stjórnstöð"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Skjáborðseiginleikastjóri."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Gnome-stjórnstöð: %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Síur"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "Gnome-stjórnstöð: %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Nota skel, jafnvel þótt Nautilus sé í gangi."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Um þetta forrit"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Yfirlit yfir stjórnstöðina"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Um"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Innihald"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Hjálp"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "GNOME stillingatækið"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Nota skel, jafnvel þótt Nautilus sé í gangi."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Hljóðstyrkur"
@@ -2643,7 +2619,7 @@ msgstr ""
 "Villa við keyrslu (%s)\n"
 "sem er tengt við lykilinn (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2658,7 +2634,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2666,22 +2642,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Skjástillingar %d\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2737,8 +2713,8 @@ msgstr "_Ekki sýna þessi skilaboð framar"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Mér tókst ekki að hlaða inn hljóðskrána %s sem dæmi %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Tekst ekki að ákvarða heimasvæði notanda"
 
@@ -2787,11 +2763,11 @@ msgstr "Skjár"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Skjár sem BGApplier á að teikna á"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Hljóðskrá þessa atviks er ekki til."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2801,32 +2777,32 @@ msgstr ""
 "Þú vilt kannski setja upp gnome-audio pakkann\n"
 "til að fá safn sjálfgefinna hljóða."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Skráin %s er ekki gild wav skrá"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Atvik"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Hljóðskrá"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Hljóð:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Hljóð_skrá:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Veldu hljóðskrá"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "S_pila"
 
@@ -3097,29 +3073,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Lyklaborð"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
 #, fuzzy
-msgid "XKB keyboard layout"
+msgid "Keyboard layout"
 msgstr "Flýtilyklar"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
 #, fuzzy
-msgid "XKB keyboard model"
+msgid "Keyboard model"
 msgstr "Lyklaborð"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
 #, fuzzy
-msgid "XKB options"
-msgstr "Valkostir"
+msgid "Keyboard options"
+msgstr "Flýtilyklar"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Flýtilyklar"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Lyklaborð"
+
 #: typing-break/drw-break-window.c:209
 #, fuzzy
 msgid "_Postpone break"
@@ -3197,46 +3216,14 @@ msgstr ""
 "með því að hægri-smella á stjórnstikuna og velja 'Bæta við stiku -> "
 "Hjálparforrit -> Skilaboðaskjóða'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "The quick brown fox jumps over the lazy dog. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nafn:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stíll:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tegund:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Stærð:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Útgáfa:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Höfundarréttur:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Lýsing:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Gera að forritsletri"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Samhengisvalsatriði fyrir letur"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Veldu sjálfgefin forrit"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3310,33 +3297,47 @@ msgstr "Á að smámynda TrueType letur"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Á að smámynda Type1 letur"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Smiðja fyrir fontilus samhengisval"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "The quick brown fox jumps over the lazy dog. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus samhengisval"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nafn:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus samhengisvalssmiðja"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stíll:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Nautilus samhengisvalsfærslur fyrir letur"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tegund:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Gera að forritsletri"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Stærð:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Sjá fyrir innihald þemaeiginleika"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Útgáfa:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Höfundarréttur:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus-sjá fyrir þemaeiginleika"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Lýsing:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME-stjórnstöð"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3366,28 +3367,18 @@ msgstr "Virkj_a letur"
 msgid "Themes"
 msgstr "Þemu"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Stjórnþema"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Gluggakarmsþema"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Táknmyndaþema"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI sem sýnt er"
-
-#  translators: you may want to include non-western chars here
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Ef satt verða uppsett þemu smámynduð"
@@ -3423,6 +3414,154 @@ msgstr "Á að smámynda uppsett þemu"
 msgid "Whether to thumbnail themes"
 msgstr "Á að smámynda þemu"
 
+#  translators: you may want to include non-western chars here
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Virkj_a letur"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Nota sjálfgefinn flokk foreldris"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome Stjórnborð"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "S_kilgreindur ritill"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "S_kilgreint póstforrit:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "S_kilgreint skel:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "S_kilgreindur vafri:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Ræsa í sk_el"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Þetta forrit getur opnað URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Þetta forrit þarf að keyra í _skel"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Veldu póstforrit:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Veldu stjórnborð:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Veldu vafra:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Veldu textaritil"
+
+#~ msgid "Accessibility"
+#~ msgstr "Aðgengi"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Aðgengisstillingar"
+
+#~ msgid "Advanced"
+#~ msgstr "Háþróað"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Háþróaðar stillingar"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Netselsstillingar"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME stjórnstöð: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Umbrot"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Umbrot fyrir þessa sýn á capplett-in"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Capplet efnisskrárhlutur"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Capplet efnisskrá sem þessi sjá sýnir"
+
+#~ msgid "translator_credits"
+#~ msgstr "Áki G. Karlsson  <aki at akademia dot is>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Skjáborðseiginleikastjóri."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Gnome-stjórnstöð: %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "Gnome-stjórnstöð: %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Nota skel, jafnvel þótt Nautilus sé í gangi."
+
+#~ msgid "About this application"
+#~ msgstr "Um þetta forrit"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Yfirlit yfir stjórnstöðina"
+
+#~ msgid "_About"
+#~ msgstr "_Um"
+
+#~ msgid "_Contents"
+#~ msgstr "_Innihald"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjálp"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Nota skel, jafnvel þótt Nautilus sé í gangi."
+
+#, fuzzy
+#~ msgid "XKB options"
+#~ msgstr "Valkostir"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Samhengisvalsatriði fyrir letur"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Smiðja fyrir fontilus samhengisval"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus samhengisval"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus samhengisvalssmiðja"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Nautilus samhengisvalsfærslur fyrir letur"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Sjá fyrir innihald þemaeiginleika"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus-sjá fyrir þemaeiginleika"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI sem sýnt er"
+
 #~ msgid "GNOME Default"
 #~ msgstr "GNOME-sjálfgefið"
 
diff --git a/po/it.po b/po/it.po
index 0eb84d80d..e13a404dd 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-11 01:56+0200\n"
 "Last-Translator: Alessio Dessì <alkex@inwind.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -63,11 +63,11 @@ msgstr "Tastiera a sc_hermo"
 msgid "_Screenreader"
 msgstr "_Lettore schermo"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Supporto della tecnologia di aiuto"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Abilita il supporto per le tecnologie di aiuto di GNOME al login"
 
@@ -123,13 +123,13 @@ msgstr "Importa file di impostazioni delle caratteristiche"
 msgid "_Import"
 msgstr "_Importa"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tastiera"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Imposta le preferenze per l'accesso facilitato della tastiera"
 
@@ -346,11 +346,11 @@ msgstr "pixel/secondo"
 msgid "seconds"
 msgstr "secondi"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Modifica le impostazioni dello sfondo del desktop"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Sfondo del desktop"
 
@@ -430,6 +430,13 @@ msgstr "Aggiungi sfondo"
 msgid "No Wallpaper"
 msgstr "Nessuno sfondo"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -641,105 +648,15 @@ msgstr "Selezionare un'immagine."
 msgid "_Select"
 msgstr "_Seleziona"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Applicazioni preferite"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Seleziona le applicazioni predefinite"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/Firefox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Browser testuale W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Browser testuale Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Browser testuale Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Client di posta Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Terminale di GNOME"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Terminale X standard"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Specificare un nome ed un comando per questo editor."
@@ -749,20 +666,23 @@ msgid "Add..."
 msgstr "Aggiungi..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Editor personali_zzato"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Personalizzato"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Client di posta personali_zzato:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Personalizzato"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terminale personali_zzato:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Browser Web personali_zzato:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Questa applicazione può aprire più file per _volta"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -809,6 +729,16 @@ msgid "Mail Reader"
 msgstr "Client di posta"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Eseguire nel _terminale"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Eseguire nel _terminale"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -817,92 +747,168 @@ msgstr ""
 "la bacchetta magica ed infine eseguire una danza propiziatoria per farlo "
 "funzionare."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Avvia nel t_erminale"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminale"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Editor di testo"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Questa applicazione può aprire degli _URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Questa applicazione può aprire più file per _volta"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Questa applicazione richiede di essere eseguira in una _shell"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Supporta il controllo remoto di _Netscape"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Usare questo _editor per aprire i file di testo dal file manager"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Browser Web"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Window manager"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "co_mando:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Selezionare un client di posta:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Seleziona"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Selezionare un terminale:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Browser Web predefinito"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Selezionare un browser Web:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Selezionare un editor:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Accessibilità"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Impostazioni accessibilità"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/Firefox"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Avanzate"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Impostazioni avanzate"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Browser testuale W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Browser testuale Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Browser testuale Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Client di posta Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Terminale predefinito"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminale"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Terminale X standard"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Cambia la risoluzione dello schermo"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Risoluzione dello schermo"
 
@@ -997,7 +1003,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Si è sicuri di voler cancellare definitivamente questa voce?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Descrizione"
 
@@ -1005,16 +1011,25 @@ msgstr "Descrizione"
 msgid "Extensions"
 msgstr "Estensioni"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Tipi di file e programmi"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Specifica i programmi usati per aprire o visualizzare ciascun tipo di file"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Tipi di file e programmi"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Specifica i programmi usati per aprire o visualizzare ciascun tipo di file"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Azioni"
@@ -1105,6 +1120,7 @@ msgid "_Protocol:"
 msgstr "_Protocollo:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Rimuovi"
 
@@ -1112,15 +1128,6 @@ msgstr "_Rimuovi"
 msgid "_Viewer component:"
 msgstr "Componente _visualizzatore:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Tipi di file e programmi"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Specifica i programmi usati per aprire o visualizzare ciascun tipo di file"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Modifica categorie file"
@@ -1302,14 +1309,15 @@ msgid "Electronic mail transmission"
 msgstr "Trasmissione posta elettronica"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Documentazione GNOME"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Tipi di carattere"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Seleziona i tipi di carattere per l'ambiente grafico"
 
@@ -1527,29 +1535,29 @@ msgid "The type of accelerator."
 msgstr "Il tipo di acceleratore."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Azione sconociuta>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Desktop"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Audio"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Gestione finestre"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1558,29 +1566,29 @@ msgstr ""
 "La scorciatoia «%s» è già in uso per:\n"
 " «%s»\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Errore nell'impostare in nuovo acceleratore nel database di configurazione: %"
 "s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Errore nell'azzerare l'acceleratore nel database di configurazione: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Azione"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Scorciatoia"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"
 
@@ -1592,23 +1600,10 @@ msgstr ""
 "Per modificare un tasto scorciatoia cliccare sulla riga corrispondente e "
 "digitare il nuovo acceleratore o premere «Backspace» per cancellarlo."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Assegna dei tasti scorciatoia a dei comandi"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modelli"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Anteprima della disposizione della tastiera"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1777,10 +1772,32 @@ msgstr "Intervallo di _lavoro:"
 msgid "minutes"
 msgstr "minuti"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modelli"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Anteprima della disposizione della tastiera"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Imposta le preferenze della tastiera"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Imposta le preferenze del mouse"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Puntatore sconosciuto"
@@ -1945,20 +1962,21 @@ msgstr "_Soglia:"
 msgid "_Timeout:"
 msgstr "Du_rata massima:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Mouse"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Imposta le preferenze del mouse"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Proxy di rete"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Preferenze del proxy di rete"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2002,8 +2020,9 @@ msgid "H_TTP proxy:"
 msgstr "Proxy _HTTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Configurazione proxy di rete"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Preferenze del proxy di rete"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2041,7 +2060,7 @@ msgstr "_Password:"
 msgid "_Secure HTTP proxy:"
 msgstr "Proxy _secure HTTP:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Abilita l'audio e associa suoni ad eventi"
 
@@ -2100,15 +2119,26 @@ msgstr ""
 "dialogo «Preferenze del tema» è stato installato in modo non corretto, "
 "oppure che non è installato il pacchetto «gnome-themes»."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Non è stata fornita la posizione del file del tema da installare"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "La posizione del file del tema da installare fornita non è valida"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2142,12 +2172,12 @@ msgstr "Deve essere fornito il nome del tema"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Il tema è già presente. Procedere con la sostituzione?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Seleziona temi per vari elementi dell'ambiente grafico"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2259,13 +2289,13 @@ msgstr "Nome del _tema:"
 msgid "theme selection tree"
 msgstr "albero di selezione del tema"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 "Personalizza l'aspetto delle barre degli strumenti e dei menu delle "
 "applicazioni"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Barre menu e strumenti"
 
@@ -2334,7 +2364,6 @@ msgid "_Edit"
 msgstr "_Modifica"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_File"
 
@@ -2362,6 +2391,14 @@ msgstr "_Esci"
 msgid "_Save"
 msgstr "_Salva"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2374,23 +2411,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (o «Logo Windows»)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2431,14 +2468,34 @@ msgstr "_Portare in primo piano le finestre selezionate dopo un intervallo"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Selezionare le finestre quando il mouse si muove sopra di loro"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Proprietà delle finestre"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Finestre"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Centro di controllo GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Preferenze dello sfondo del desktop"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Altri"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Strumento di configurazione per GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Centro di controllo"
@@ -2467,88 +2524,6 @@ msgstr "Produttore di viste del centro di controllo"
 msgid "View as Control Center"
 msgstr "Vedi come centro di controllo"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Centro di controllo GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Aspetto"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Aspetto da usare con questa vista delle capplet"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Oggetto per la cartella delle capplet"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Cartella delle capplet mostrata nella vista"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Alessio Dessí <alkex@inwind.it>\n"
-"Luca Ferretti <elle.uca@infinito.it>\n"
-"Christopher R. Gabriel <cgabriel@it.gnome.org>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Centro di controllo GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Gestore delle proprietà dell'ambiente grafico."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Centro di controllo GNOME: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Altri"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Centro di controllo di GNOME"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Usare nautilus se è in esecuzione."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Informazioni su questa applicazione"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Panoramica del centro di controllo"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "I_nformazioni"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Sommario"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "A_iuto"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Strumento di configurazione per GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Usa la shell anche se nautilus è in esecuzione."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volume"
@@ -2657,7 +2632,7 @@ msgstr ""
 "Errore nel tentativo di eseguire (%s)\n"
 "che è associata al tasto (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2683,7 +2658,7 @@ msgstr ""
 "- <b>xprop -root | grep XKB</b>\n"
 "- <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2695,7 +2670,7 @@ msgstr ""
 "Provare con una configurazione più semplice o utilizzando una versione più "
 "recente del software XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2703,15 +2678,15 @@ msgstr ""
 "Le impostazioni della tastiera del sistema grafico X differiscono dalle "
 "impostazioni attuali di GNOME. Quali impostazioni si vogliono usare?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Usare le impostazioni di X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Usare le impostazioni di GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, fuzzy, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2776,8 +2751,8 @@ msgstr "_Non mostrare questo messaggio in futuro"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Impossibile caricare il file audio «%s» come campione «%s»"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Impossibile determinare la directory home dell'utente"
 
@@ -2826,11 +2801,11 @@ msgstr "Schermo"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Schermo su cui deve disegnare il BGApplier"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Il file audio per questo evento non esiste."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2840,32 +2815,32 @@ msgstr ""
 "Si dovrebbe installare il pacchetto gnome-audio\n"
 "per avere un set di suoni preimpostati."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Il file %s non è un file wav valido"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Evento"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "File audio"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Suoni:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_File audio:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Selezione file audio"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "S_uona"
 
@@ -3129,29 +3104,77 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Prossimamente, le impostazioni di XKB in GConf saranno sovrascritte (dalla "
-"configurazione di sistema)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Disposizione di XKB per la tastiera"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Modello XKB per la tastiera"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Opzioni XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Modello di tastiera:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Disposizione di XKB per la tastiera"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Modello di tastiera:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Scorciatoie da tastiera"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "Quanto prima le impostazioni XKB in GConf saranno sovrascritte dal sistema"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Prossimamente, le impostazioni di XKB in GConf saranno sovrascritte (dalla "
+"configurazione di sistema)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Disposizione di XKB per la tastiera"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Modello XKB per la tastiera"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Posponi pausa"
@@ -3230,46 +3253,14 @@ msgstr ""
 "sul pannello e scegliendo «Aggiungi al pannello -> Utilità -> Area di "
 "notifica»."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Quel fez sghembo copre davanti. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nome:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stile:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tipo:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Dimensione:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versione:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Descrizione:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "uso: %s file_del_carattere\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Imposta come carattere predefinito"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Elementi del menu contestuale dei caratteri"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Seleziona le applicazioni predefinite"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3345,33 +3336,47 @@ msgstr "Creazione provini per caratteri TrueType"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Creazione provini per caratteri Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fabbrica del menu contestuale di fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Quel fez sghembo copre davanti. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Menu contestuale di fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nome:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fabbrica menu contestuale di fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stile:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Voci di menu contestuale di Nautilus per i caratteri"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tipo:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Imposta come carattere predefinito"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Dimensione:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versione:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Componente per la vista delle proprietà del tema"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Descrizione:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Vista themus delle proprietà del tema"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "uso: %s file_del_carattere\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Centro di controllo GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3403,27 +3408,18 @@ msgstr "_Applica carattere"
 msgid "Themes"
 msgstr "Temi"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Tema dei controlli"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Bordo finestra"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Tema delle icone"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI correntemente visualizzata"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "àòùèéìÈÒÀÙÉÌ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3460,3 +3456,150 @@ msgstr "Indica se generare le miniature dei temi installati"
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "Indica se generare le miniature dei temi"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "àòùèéìÈÒÀÙÉÌ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Applica carattere"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Ri_pristina le impostazioni predefinite"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminale di GNOME"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Editor personali_zzato"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Client di posta personali_zzato:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terminale personali_zzato:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Browser Web personali_zzato:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Avvia nel t_erminale"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Questa applicazione può aprire degli _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Questa applicazione richiede di essere eseguira in una _shell"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Selezionare un client di posta:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Selezionare un terminale:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Selezionare un browser Web:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Selezionare un editor:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Accessibilità"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Impostazioni accessibilità"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzate"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Impostazioni avanzate"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Configurazione proxy di rete"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Centro di controllo GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Aspetto"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Aspetto da usare con questa vista delle capplet"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Oggetto per la cartella delle capplet"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Cartella delle capplet mostrata nella vista"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Alessio Dessí <alkex@inwind.it>\n"
+#~ "Luca Ferretti <elle.uca@infinito.it>\n"
+#~ "Christopher R. Gabriel <cgabriel@it.gnome.org>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Gestore delle proprietà dell'ambiente grafico."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Centro di controllo GNOME: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Centro di controllo di GNOME"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Usare nautilus se è in esecuzione."
+
+#~ msgid "About this application"
+#~ msgstr "Informazioni su questa applicazione"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Panoramica del centro di controllo"
+
+#~ msgid "_About"
+#~ msgstr "I_nformazioni"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sommario"
+
+#~ msgid "_Help"
+#~ msgstr "A_iuto"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Usa la shell anche se nautilus è in esecuzione."
+
+#~ msgid "XKB options"
+#~ msgstr "Opzioni XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Elementi del menu contestuale dei caratteri"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fabbrica del menu contestuale di fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menu contestuale di fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fabbrica menu contestuale di fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Voci di menu contestuale di Nautilus per i caratteri"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Componente per la vista delle proprietà del tema"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Vista themus delle proprietà del tema"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI correntemente visualizzata"
diff --git a/po/ja.po b/po/ja.po
index 57c0dfee3..b730b9fc8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-06 10:31+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -64,11 +64,11 @@ msgstr "オンスクリーン・キーボード(_O)"
 msgid "_Screenreader"
 msgstr "スクリーン・リーダ(_S)"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "支援技術のサポート"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "起動時に GNOME 支援技術のサポートを有効にします"
 
@@ -122,13 +122,13 @@ msgstr "機能設定ファイルの取り込み"
 msgid "_Import"
 msgstr "インポート(_I)"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "キーボード"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "キーボードの操作性を設定します"
 
@@ -340,11 +340,11 @@ msgstr "ピクセル数/秒"
 msgid "seconds"
 msgstr "秒"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "デスクトップの背景を変更します"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "デスクトップの背景"
 
@@ -423,6 +423,13 @@ msgstr "壁紙の追加"
 msgid "No Wallpaper"
 msgstr "壁紙なし"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -627,105 +634,15 @@ msgstr "画像を一つ選択して下さい。"
 msgid "_Select"
 msgstr "選択(_S)"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "お気に入りのアプリ"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "デフォルトで使用するアプリを設定します"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M テキスト・ブラウザ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx テキスト・ブラウザ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links テキスト・ブラウザ"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution メール・リーダ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla メール"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "GNOME 端末"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "標準 X 端末"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "このエディタの名前とコマンドを指定して下さい。"
@@ -735,20 +652,23 @@ msgid "Add..."
 msgstr "追加..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "他のエディタ(_U)"
+#, fuzzy
+msgid "C_ustom"
+msgstr "カスタム"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "他のメール・リーダ(_U):"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "カスタム"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "他の端末(_U):"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "他のブラウザ(_U):"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "複数のファイルを開けるようにする(_M)"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -795,6 +715,16 @@ msgid "Mail Reader"
 msgstr "メール・リーダ"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "端末内で起動する(_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "端末内で起動する(_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -803,92 +733,168 @@ msgstr ""
 "させるには、魔法の杖を振って魔法のダンスを踊るように適用ボタンをクリックして"
 "下さい。"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "端末内で起動する(_E)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "端末"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "テキスト・エディタ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "複数の URI を開けるようにする(_U)"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "複数のファイルを開けるようにする(_M)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "SHELL の中で実行する必要がある(_S)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Netscape のリモート制御を有効にする(_N)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "このエディタをファイル・マネージャで使用する(_E)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "ウェブ・ブラウザ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "ウィンドウ・マネージャ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "コマンド(_M):"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "名前(_N):"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "メール・リーダの選択(_S):"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "選択(_S)"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "デフォルトのウェブ・ブラウザ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla メール"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M テキスト・ブラウザ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx テキスト・ブラウザ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links テキスト・ブラウザ"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution メール・リーダ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla メール"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "端末の選択(_S):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "デフォルトの端末"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "ウェブ・ブラウザの選択(_S):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "端末"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "エディタの選択(_S):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "標準 X 端末"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "アクセシビリティ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "操作性の設定を行います"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "拡張設定"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "拡張設定を行います"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "画面の解像度を変更します"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "画面の解像度"
 
@@ -976,7 +982,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "このエントリを完全に削除してもよろしいですか？"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "説明"
 
@@ -984,15 +990,23 @@ msgstr "説明"
 msgid "Extensions"
 msgstr "拡張子"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "ファイルの関連づけ"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "ファイルの種類に応じて使用するプログラムを定義します"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "ファイルの関連づけ"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "ファイルの種類に応じて使用するプログラムを定義します"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "アクション"
@@ -1083,6 +1097,7 @@ msgid "_Protocol:"
 msgstr "プロトコル(_P):"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "削除(_R)"
 
@@ -1090,14 +1105,6 @@ msgstr "削除(_R)"
 msgid "_Viewer component:"
 msgstr "表示コンポーネント(_V):"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "ファイルの関連づけ"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "ファイルの種類に応じて使用するプログラムを定義します"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "ファイルのカテゴリの編集"
@@ -1279,14 +1286,15 @@ msgid "Electronic mail transmission"
 msgstr "電子メール送信"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "GNOME ドキュメント"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "フォント"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "デスクトップで使用するフォントを選択します"
 
@@ -1484,29 +1492,29 @@ msgid "The type of accelerator."
 msgstr "アクセラレータの種類です"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "無効"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<不明な操作>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "デスクトップ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "サウンド"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "ウィンドウ管理"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1515,26 +1523,26 @@ msgstr ""
 "このショートカット \"%s\" は既に登録されています:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "新しいアクセラレータを設定データベース書き込む際にエラー: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "設定データベースのアクセラレータの設定を解除する際にエラー: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "操作"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "ショートカット"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "キーボード・ショートカット"
 
@@ -1546,23 +1554,10 @@ msgstr ""
 "キーボード・ショートカットを編集する場合は、対応する行をクリックして新しいア"
 "クセラレータ・キーを押下して下さい ([BS] キー: 取り消す)"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "コマンドにショートカット・キーを割り当てます"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "不明"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "モデル"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "キーボード・レイアウトのプレビュー"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1726,10 +1721,32 @@ msgstr "一休みの警告を出すまでの時間(_W):"
 msgid "minutes"
 msgstr "分"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "不明"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "モデル"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "キーボード・レイアウトのプレビュー"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "キーボードの設定を行います"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "マウスの設定を行います"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "不明なカーソル"
@@ -1894,20 +1911,21 @@ msgstr "しきい値(_T):"
 msgid "_Timeout:"
 msgstr "間隔(_T):"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "マウス"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "マウスの設定を行います"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "ネットワークのプロキシ"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "お使いのネットワークのプロキシを設定します"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1951,8 +1969,9 @@ msgid "H_TTP proxy:"
 msgstr "HTTP プロキシ(_T):"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "ネットワーク・プロキシの設定"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "お使いのネットワークのプロキシを設定します"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -1990,7 +2009,7 @@ msgstr "パスワード(_P):"
 msgid "_Secure HTTP proxy:"
 msgstr "SSL プロキシ(_S):"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "効果音とイベントに対応する効果音を有効にします"
 
@@ -2048,15 +2067,26 @@ msgstr ""
 "アログを正しくインストールしていないか、あるいは \"gnome-themes\" パッケージ"
 "をインストールしていないことが原因かもしれません。"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "インストールするテーマ・ファイルのパス名が指定されていません"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "インストールするテーマ・ファイルのパス名が不正です"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2093,12 +2123,12 @@ msgstr "テーマの名前を指定して下さい"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "テーマは既に存在ます。置き換えてもよろしいですか？"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "デスクトップのさまざまな部分に使用するテーマを選択します"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "テーマ"
 
@@ -2214,11 +2244,11 @@ msgstr "テーマの名前(_T):"
 msgid "theme selection tree"
 msgstr "テーマ選択ツリー"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "アプリのツールバーとメニューバーの外観をカスタマイズします"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "メニューとツールバー"
 
@@ -2287,7 +2317,6 @@ msgid "_Edit"
 msgstr "編集(_E)"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "ファイル(_F)"
 
@@ -2315,6 +2344,14 @@ msgstr "終了(_Q)"
 msgid "_Save"
 msgstr "保存(_S)"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2326,23 +2363,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "[CTRL] キー"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "[ALT] キー"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "[Hyper] キー"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "スーパー (または \"ウィンドウのロゴ\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "メタ"
 
@@ -2382,14 +2419,34 @@ msgstr "マウスが移動したウィンドウを前面に出す(_R)"
 msgid "_Select windows when the mouse moves over them"
 msgstr "マウスが移動したウィンドウを選択する(_S)"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "ウィンドウのプロパティを設定します"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "ウィンドウ"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME コントロール・センター"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "デスクトップの背景の設定"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "その他"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "デスクトップの各種設定を行います"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "コントロール・センター"
@@ -2418,92 +2475,6 @@ msgstr "コントロール・センターのビュー・ファクトリ"
 msgid "View as Control Center"
 msgstr "コントロール・センター表示"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME コントロール・センター: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "レイアウト"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "各 Capplet を表示するのに使用するレイアウトです"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Capplet ディレクトリ・オブジェクト"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "このビューを表示する Capplet のディレクトリです"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"相花 毅 <aihana@gnome.gr.jp>\n"
-"KAMAGASAKO Masatoshi <emerald@gnome.gr.jp>\n"
-"Akira TAGOH <tagoh@gnome.gr.jp>\n"
-"Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>\n"
-"Yukihiro Nakai <Nakai@abricot.co.jp>\n"
-"Eiichiro ITANI <emu@ceres.dti.ne.jp>\n"
-"日本GNOMEユーザー会 <http://www.gnome.gr.jp>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME コントロール・センター"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "ディスクトップ・プロパティのマネージャです"
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME コントロール・センター : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "その他"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "GNOME コントロール・センター"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Nautilus を起動していたら利用する"
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "このアプリについて"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "コントロール・センターの概要"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "情報(_A)"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "目次(_C)"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "デスクトップの各種設定を行います"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Nautilus が起動していたら Shell を使用する"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "音量"
@@ -2610,7 +2581,7 @@ msgstr ""
 "(%s) を実行する際にエラーが発生しました。\n"
 "これはキー (%s) にリンクしています。"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2635,7 +2606,7 @@ msgstr ""
 "- <b>xprop -root | grep XKB</b> の出力\n"
 "- <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b> の出力"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2647,7 +2618,7 @@ msgstr ""
 "簡単な設定を使用するか、または最新版の XFree ソフトウェアを使用してみて下さ"
 "い。"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2655,15 +2626,15 @@ msgstr ""
 "X-Window システムのキーボード設定が、現在お使いの GNOME キーボード設定と異な"
 "ります。どちらの設定を利用しますか？"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "X の設定を使う"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "GNOME の設定を使う"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2728,8 +2699,8 @@ msgstr "次回からこのメッセージを表示しない(_D)"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "効果音ファイル %s をサンプル %s で読み込めませんでした"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "ユーザのホームディレクトリを確定できません"
 
@@ -2779,11 +2750,11 @@ msgstr "画面"
 msgid "Screen on which BGApplier is to draw"
 msgstr "BGApplier が描画するスクリーンです"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "このイベントに対する効果音ファイルが存在しません。"
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2793,32 +2764,32 @@ msgstr ""
 "デフォルトの効果音を利用するために gnome-audio パッケージを\n"
 "インストールする必要があるかもしれません。"
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "ファイル %s は正しい WAV ファイルではありません"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "イベント"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "ファイル"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "効果音(_S)"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "効果音のファイル(_F):"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "効果音のファイルの選択"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "演奏(_P)"
 
@@ -3075,26 +3046,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "一瞬で GConf 内の XKB 設定 (システムの設定) が上書きされます"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB キーボード・レイアウト"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB キーボードの型式"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB オプション"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "キーボードの型式(_M):"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB キーボード・レイアウト"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "キーボードの型式(_M):"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "キーボード・ショートカット"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "XKB 設定 (システム設定) をすぐに上書きする必要があるかどうか"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "一瞬で GConf 内の XKB 設定 (システムの設定) が上書きされます"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB キーボード・レイアウト"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB キーボードの型式"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "中断を延長する(_P)"
@@ -3171,46 +3190,14 @@ msgstr ""
 "して [パネルに追加] -> [ユーティリティ] -> [通知スペース] を選択すると起動さ"
 "れます。"
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "いろはにほへと ちりぬるをわか 零壱弐三四伍"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "フォント名:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "スタイル:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "種類:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "サイズ:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "バージョン:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "ライセンス:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "詳細:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "用法: %s フォントファイル\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "アプリのフォントにセットする"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "フォント・コンテキスト・メニューのアイテム"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "デフォルトで使用するアプリを設定します"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3285,33 +3272,47 @@ msgstr "TrueType フォントをサムネイル表示するかどうか"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Type1 フォントをサムネイル表示するかどうか"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "fontilus コンテキスト・メニュー用ファクトリ"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "いろはにほへと ちりぬるをわか 零壱弐三四伍"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus コンテキスト・メニュー"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "フォント名:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus コンテキスト・メニュー・ファクトリ"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "スタイル:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "フォント表示の Nautilus コンテキスト・メニュー"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "種類:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "アプリのフォントにセットする"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "サイズ:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "バージョン:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "ライセンス:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "テーマ・プロパティ内容表示コンポーネント"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "詳細:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "themes テーマ・プロパティ・ビュー"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "用法: %s フォントファイル\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME コントロール・センター"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3342,27 +3343,18 @@ msgstr "フォントの適用(_A)"
 msgid "Themes"
 msgstr "Themus"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "コントロールのテーマ"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "ウィンドウ枠のテーマ"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "アイコンのテーマ"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "現在表示している URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3398,3 +3390,154 @@ msgstr "インストールされたテーマをサムネイル表示するか否
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "テーマをサムネイル表示するか否か"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "フォントの適用(_A)"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "デフォルト値にリセット(_F)"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "GNOME 端末"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "他のエディタ(_U)"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "他のメール・リーダ(_U):"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "他の端末(_U):"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "他のブラウザ(_U):"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "端末内で起動する(_E)"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "複数の URI を開けるようにする(_U)"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "SHELL の中で実行する必要がある(_S)"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "メール・リーダの選択(_S):"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "端末の選択(_S):"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "ウェブ・ブラウザの選択(_S):"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "エディタの選択(_S):"
+
+#~ msgid "Accessibility"
+#~ msgstr "アクセシビリティ"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "操作性の設定を行います"
+
+#~ msgid "Advanced"
+#~ msgstr "拡張設定"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "拡張設定を行います"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "ネットワーク・プロキシの設定"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME コントロール・センター: %s"
+
+#~ msgid "Layout"
+#~ msgstr "レイアウト"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "各 Capplet を表示するのに使用するレイアウトです"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Capplet ディレクトリ・オブジェクト"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "このビューを表示する Capplet のディレクトリです"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "相花 毅 <aihana@gnome.gr.jp>\n"
+#~ "KAMAGASAKO Masatoshi <emerald@gnome.gr.jp>\n"
+#~ "Akira TAGOH <tagoh@gnome.gr.jp>\n"
+#~ "Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>\n"
+#~ "Yukihiro Nakai <Nakai@abricot.co.jp>\n"
+#~ "Eiichiro ITANI <emu@ceres.dti.ne.jp>\n"
+#~ "日本GNOMEユーザー会 <http://www.gnome.gr.jp>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "ディスクトップ・プロパティのマネージャです"
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME コントロール・センター : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "GNOME コントロール・センター"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Nautilus を起動していたら利用する"
+
+#~ msgid "About this application"
+#~ msgstr "このアプリについて"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "コントロール・センターの概要"
+
+#~ msgid "_About"
+#~ msgstr "情報(_A)"
+
+#~ msgid "_Contents"
+#~ msgstr "目次(_C)"
+
+#~ msgid "_Help"
+#~ msgstr "ヘルプ(_H)"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Nautilus が起動していたら Shell を使用する"
+
+#~ msgid "XKB options"
+#~ msgstr "XKB オプション"
+
+#~ msgid "Font context menu items"
+#~ msgstr "フォント・コンテキスト・メニューのアイテム"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "fontilus コンテキスト・メニュー用ファクトリ"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus コンテキスト・メニュー"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus コンテキスト・メニュー・ファクトリ"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "フォント表示の Nautilus コンテキスト・メニュー"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "テーマ・プロパティ内容表示コンポーネント"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "themes テーマ・プロパティ・ビュー"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "現在表示している URI"
diff --git a/po/ko.po b/po/ko.po
index 35468b2f8..a7e7fc066 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-10-06 13:01+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
@@ -58,11 +58,11 @@ msgstr "화면 키보드(_O)"
 msgid "_Screenreader"
 msgstr "화면 읽기 프로그램(_S)"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "보조 기술 지원"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "로그인할 때 그놈 보조 기술 기능을 사용합니다."
 
@@ -113,13 +113,13 @@ msgstr "기능 설정 파일 가져오기"
 msgid "_Import"
 msgstr "가져오기(_I)"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "키보드"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "키보드 접근성 기능 기본 설정을 설정합니다"
 
@@ -328,11 +328,11 @@ msgstr "픽셀/초"
 msgid "seconds"
 msgstr "초"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "데스크탑 바탕 설정을 바꿉니다"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "데스크탑 바탕"
 
@@ -411,6 +411,13 @@ msgstr "바탕 무늬 더하기"
 msgid "No Wallpaper"
 msgstr "바탕 무늬 없음"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -612,105 +619,15 @@ msgstr "그림을 선택하십시오."
 msgid "_Select"
 msgstr "선택(_S)"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "기본 프로그램"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "기본 프로그램을 선택하십시오"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M 텍스트 브라우저"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx 텍스트 브라우저"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links 텍스트 브라우저"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution 메일 읽기 프로그램"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "모질라 메일"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "그놈 터미널"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "표준 X터미널"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "이 편집기의 이름과 명령을 지정하십시오."
@@ -720,20 +637,23 @@ msgid "Add..."
 msgstr "더하기..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "사용자 설정 편집기(_U)"
+#, fuzzy
+msgid "C_ustom"
+msgstr "사용자 설정"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "사용자 설정 메일 읽기 프로그램(_U):"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "사용자 설정"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "사용자 설정 터미널(_U):"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "사용자 설정 웹 브라우저(_U):"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "이 응용프로그램은 여러 파일을 열 수 있습니다(_M)"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -779,8 +699,18 @@ msgstr "편집..."
 msgid "Mail Reader"
 msgstr "메일 읽기 프로그램"
 
-# humor
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "터미널에서 시작(_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "터미널에서 시작(_T)"
+
+# humor
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -788,92 +718,168 @@ msgstr ""
 "사용하고 싶은 창 관리자를 선택하십시오.  창 관리자를 바꾸게 하려면 적용을 누"
 "르고, 마법 지팡이를 휘두른 다음, 마법의 춤을 추십시오."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "터미널에서 시작(_E)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "터미널"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "텍스트 편집기"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "이 응용프로그램은 URI를 열 수 있습니다(_U)"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "이 응용프로그램은 여러 파일을 열 수 있습니다(_M)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "이 응용프로그램은 쉘에서 실행하여야 합니다(_S)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "넷스케이프 원격 조종 받아들이기(_N)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "파일 관리자에서 텍스트 파일을 열 때 이 편집기를 사용합니다(_E)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "웹 브라우저"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "창 관리자"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "명령(_M):"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "이름(_N):"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "등록 정보(_P)..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "메일 읽기 프로그램 선택(_S):"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "선택(_S)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "터미널 선택(_S):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "기본 웹 브라우저"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "웹 브라우저 선택(_S):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "편집기 선택(_S):"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "접근성 기능"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "접근성 기능 설정"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "고급"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "고급 설정"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "모질라 메일"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M 텍스트 브라우저"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx 텍스트 브라우저"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links 텍스트 브라우저"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution 메일 읽기 프로그램"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "모질라 메일"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "기본 터미널"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "터미널"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "표준 X터미널"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "화면 해상도 바꾸기"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "화면 해상도"
 
@@ -961,7 +967,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "정말로 이 항목을 영구히 지우시겠습니까?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "설명"
 
@@ -969,15 +975,23 @@ msgstr "설명"
 msgid "Extensions"
 msgstr "확장자"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "파일 형식과 프로그램"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "각 파일 형식을 열거나 볼 때 사용되는 프로그램을 지정합니다"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "파일 형식과 프로그램"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "각 파일 형식을 열거나 볼 때 사용되는 프로그램을 지정합니다"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "동작"
@@ -1068,6 +1082,7 @@ msgid "_Protocol:"
 msgstr "프로토콜(_P):"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "지우기(_R)"
 
@@ -1075,14 +1090,6 @@ msgstr "지우기(_R)"
 msgid "_Viewer component:"
 msgstr "보여주기 컴포넌트(_V):"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "파일 형식과 프로그램"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "각 파일 형식을 열거나 볼 때 사용되는 프로그램을 지정합니다"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "파일 분류 편집"
@@ -1264,14 +1271,15 @@ msgid "Electronic mail transmission"
 msgstr "전자 메일 전송"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "그놈 문서"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "글꼴"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "바탕 화면의 글꼴을 설정합니다"
 
@@ -1468,29 +1476,29 @@ msgid "The type of accelerator."
 msgstr "바로 가기 키의 형식."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "사용 않음"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<알 수 없는 동작>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "바탕 화면"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "소리"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "창 관리"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1499,26 +1507,26 @@ msgstr ""
 "바로 가기 키 \"%s\"(은)는 \"%s\"에서\n"
 "쓰고 있습니다\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "설정 데이터 베이스에서 새로운 단축키 설정 오류: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "설정 데이터 베이스에서 단축키 설정 해제하는 데 오류: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "동작"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "바로 가기"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "키보드 바로 가기"
 
@@ -1530,23 +1538,10 @@ msgstr ""
 "바로 가기를 편집하려면, 해당 줄에 클릭하고 새 바로 가기 키를 누르십시오. 지우"
 "려면 백스페이스를 누르십시오."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "명령어에 단축 키를 지정합니다"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "알 수 없음"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "모델"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "키보드 배치 미리 보기"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1711,10 +1706,32 @@ msgstr "작업 시간 지속(_W):"
 msgid "minutes"
 msgstr "분"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "모델"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "키보드 배치 미리 보기"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "키보드 등록 정보를 설정합니다"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "마우스 기본 설정을 설정합니다"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "알 수 없는 커서"
@@ -1879,20 +1896,21 @@ msgstr "임계값(_T):"
 msgid "_Timeout:"
 msgstr "타임아웃(_T):"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "마우스"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "마우스 기본 설정을 설정합니다"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "네트워크 프록시"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "네트워크 프록시 기본 설정"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1936,8 +1954,9 @@ msgid "H_TTP proxy:"
 msgstr "HTTP 프록시(_T):"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "네트워크 프록시 설정"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "네트워크 프록시 기본 설정"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -1975,7 +1994,7 @@ msgstr "열쇠글(_P):"
 msgid "_Secure HTTP proxy:"
 msgstr "보안 HTTP 프록시(_S):"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "사운드를 사용하고 사운드를 이벤트와 연결합니다"
 
@@ -2032,15 +2051,26 @@ msgstr ""
 "시스템에서 테마를 찾을 수 없습니다. \"테마 기본 설정\" 대화상자가 잘못 설치되"
 "었거나 \"gnome-themes\"꾸러미가 설치 되지 않았을 것입니다."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "테마를 파일을 설치할 위치를 지정하지 않았습니다"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "테마를 파일을 설치하라고 지정한 위치가 올바르지 않습니다"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2074,12 +2104,12 @@ msgstr "테마 이름이 없습니다"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "테마가 벌써 있습니다. 바꾸시겠습니까?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "바탕 화면의 여러 곳에 쓰일 테마를 선택합니다"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "테마"
 
@@ -2191,11 +2221,11 @@ msgstr "테마 이름(_T):"
 msgid "theme selection tree"
 msgstr "테마 선택 트리"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "프로그램의 도구 모음과 메뉴 모음의 모양을 사용자 설정합니다"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "메뉴와 도구 모음"
 
@@ -2264,7 +2294,6 @@ msgid "_Edit"
 msgstr "편집(_E)"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "파일(_F)"
 
@@ -2292,6 +2321,14 @@ msgstr "끝내기(_Q)"
 msgid "_Save"
 msgstr "저장(_S)"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2303,23 +2340,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (윈도우 키)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2359,14 +2396,34 @@ msgstr "창을 띄우기 전에 지연(_R)"
 msgid "_Select windows when the mouse moves over them"
 msgstr "창 위에 마우스가 지나가면 그 창을 선택(_S)"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "창 등록 정보"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "창"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "그놈 제어판"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "바탕 화면 기본 설정"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "기타"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "그놈 설정 도구"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "제어판"
@@ -2395,87 +2452,6 @@ msgstr "제어판 보기 팩토리"
 msgid "View as Control Center"
 msgstr "그놈 제어판으로 보기"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "그놈 제어판: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "키 배치"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "capplets의 뷰에 사용할 키 배치"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "capplet 디렉토리 객체"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "이 뷰가 보여주는 capplet 디렉토리"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"류창우 <cwryu@debian.org>, 2002-2004\n"
-"차영호 <ganadist@mizi.com>, 2003"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "그놈 제어판"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "바탕 화면 등록 정보 관리자."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "그놈 제어판 : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "기타"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "그놈 제어판"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "노틸러스가 실행이면 노틸러스 사용."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "프로그램 정보"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "제어판의 대략보기"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "정보(_A)"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "차례(_C)"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "도움말(_H)"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "그놈 설정 도구"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "노틸러스 실행 중에도 쉘 사용."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "볼륨"
@@ -2582,7 +2558,7 @@ msgstr ""
 "실행하는 데 (%s) 오류가 발생했습니다\n"
 "(%s) 키와 연결되어 있습니다"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2607,7 +2583,7 @@ msgstr ""
 "- <b>xprop -root | grep XKB</b>의 결과\n"
 "- <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>의 결과"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2619,7 +2595,7 @@ msgstr ""
 "좀 더 간단한 설정을 사용하거나 더 최신 버전의 XFree 소프트웨어를 사용하십시"
 "오."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2627,15 +2603,15 @@ msgstr ""
 "X 시스템 키보드 설정이 현재 그놈 키보드 설정과 다릅니다.  어느 설정을 사용하"
 "시겠습니까?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "X 설정 사용"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "그놈 설정 사용"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2699,8 +2675,8 @@ msgstr "이 메세지를 다시 표시하지 않기(_D)"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "사운드 파일 %s을(를) 샘플 %s(으)로 읽어들일 수 없습니다"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "사용자의 홈 디렉토리를 알 수가 없습니다"
 
@@ -2749,11 +2725,11 @@ msgstr "화면"
 msgid "Screen on which BGApplier is to draw"
 msgstr "BGApplier가 그려지는 화면"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "이 상황에 대한 사운드 파일이 존재하지 않습니다."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2763,32 +2739,32 @@ msgstr ""
 "기본 사운드 파일을 설치하려면 gnome-audio 패키지를\n"
 "설치해야 합니다."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "%s 파일은 올바른 WAV 파일이 아닙니다"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "상황"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "소리 파일"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "사운드(_S):"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "사운드 파일(_F):"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "소리 파일 선택"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "재생(_P)"
 
@@ -3044,26 +3020,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "곧, gconf의 XKB 설정을 (시스템 설정에서) 바꿉니다."
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB 키보드 배치"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB 키보드 모델"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB 옵션"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "키보드 모델(_M):"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB 키보드 배치"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "키보드 모델(_M):"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "키보드 바로 가기"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "GConf의 XKB 설정을 가능한한 빨리 다시 지정합니다"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "곧, gconf의 XKB 설정을 (시스템 설정에서) 바꿉니다."
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB 키보드 배치"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB 키보드 모델"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "휴식 시간 미루기(_P)"
@@ -3138,46 +3162,14 @@ msgstr ""
 "없습니다. 패널에 오른쪽 클릭을 해서 '패널에 더하기 -> 유틸리티 -> 알림 영"
 "역'을 선택하면 알림 영역을 더할 수 있습니다."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "무궁화 꽃이 피었습니다. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "이름:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "모양:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "형식:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "크기:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "버전:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "저작권:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "설명:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "사용법: %s 글꼴파일\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "프로그램 글꼴로 설정"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "글꼴 컨텍스트 메뉴 항목"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "기본 프로그램을 선택하십시오"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3245,33 +3237,47 @@ msgstr "트루타입 글꼴을 미리보기"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Type1 글꼴을 미리보기"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "폰틸러스 컨텍스트 메뉴에 대한 팩토리"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "무궁화 꽃이 피었습니다. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "폰틸러스 컨텍스트 메뉴"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "이름:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "폰틸러스 컨텍스트 메뉴 팩토리"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "모양:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "글꼴에 대한 노틸러스 컨텍스트 메뉴 항목"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "형식:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "프로그램 글꼴로 설정"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "크기:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "버전:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "저작권:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "테마 등록 정보 내용 보기 컴포넌트"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "설명:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus 테마 등록 정보 보기"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "사용법: %s 글꼴파일\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "그놈 제어판"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3301,27 +3307,18 @@ msgstr "글꼴 적용(_A)"
 msgid "Themes"
 msgstr "테마"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "컨트롤 테마"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "창 가장자리 테마"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "아이콘 테마"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "현재 보이는 URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABC가나다"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "참이면 설치된 테마의 미리보기를 만듭니다."
@@ -3354,3 +3351,149 @@ msgstr "설치된 테마를 미리보기"
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "테마를 미리보기"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABC가나다"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "글꼴 적용(_A)"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "기본값으로 리셋(_F)"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "그놈 터미널"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "사용자 설정 편집기(_U)"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "사용자 설정 메일 읽기 프로그램(_U):"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "사용자 설정 터미널(_U):"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "사용자 설정 웹 브라우저(_U):"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "터미널에서 시작(_E)"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "이 응용프로그램은 URI를 열 수 있습니다(_U)"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "이 응용프로그램은 쉘에서 실행하여야 합니다(_S)"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "메일 읽기 프로그램 선택(_S):"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "터미널 선택(_S):"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "웹 브라우저 선택(_S):"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "편집기 선택(_S):"
+
+#~ msgid "Accessibility"
+#~ msgstr "접근성 기능"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "접근성 기능 설정"
+
+#~ msgid "Advanced"
+#~ msgstr "고급"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "고급 설정"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "네트워크 프록시 설정"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "그놈 제어판: %s"
+
+#~ msgid "Layout"
+#~ msgstr "키 배치"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "capplets의 뷰에 사용할 키 배치"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "capplet 디렉토리 객체"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "이 뷰가 보여주는 capplet 디렉토리"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "류창우 <cwryu@debian.org>, 2002-2004\n"
+#~ "차영호 <ganadist@mizi.com>, 2003"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "바탕 화면 등록 정보 관리자."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "그놈 제어판 : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "그놈 제어판"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "노틸러스가 실행이면 노틸러스 사용."
+
+#~ msgid "About this application"
+#~ msgstr "프로그램 정보"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "제어판의 대략보기"
+
+#~ msgid "_About"
+#~ msgstr "정보(_A)"
+
+#~ msgid "_Contents"
+#~ msgstr "차례(_C)"
+
+#~ msgid "_Help"
+#~ msgstr "도움말(_H)"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "노틸러스 실행 중에도 쉘 사용."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB 옵션"
+
+#~ msgid "Font context menu items"
+#~ msgstr "글꼴 컨텍스트 메뉴 항목"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "폰틸러스 컨텍스트 메뉴에 대한 팩토리"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "폰틸러스 컨텍스트 메뉴"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "폰틸러스 컨텍스트 메뉴 팩토리"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "글꼴에 대한 노틸러스 컨텍스트 메뉴 항목"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "테마 등록 정보 내용 보기 컴포넌트"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus 테마 등록 정보 보기"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "현재 보이는 URI"
diff --git a/po/lt.po b/po/lt.po
index 8b91de53b..11f8d7db3 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-03 18:40+0200\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-03 18:41+0200\n"
 "Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\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%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:1
 msgid "<b>Applications</b>"
@@ -421,6 +422,13 @@ msgstr "Pridėti darbastalio paveikslėlį"
 msgid "No Wallpaper"
 msgstr "Nėra darbastalio paveikslėlio"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -1928,7 +1936,8 @@ msgid "Network Proxy"
 msgstr "Tarpinė tinklo stotis"
 
 #: capplets/network/gnome-network-preferences.desktop.in.in.h:2
-msgid "Network proxy preferences"
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Tarpinės tinklo stoties nustatymai"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2420,7 +2429,8 @@ msgid "_Select windows when the mouse moves over them"
 msgstr "_Pasirinkti langus pelei praeinant virš jų"
 
 #: capplets/windows/window-properties.desktop.in.in.h:1
-msgid "Window Properties"
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Langų savybės"
 
 #: capplets/windows/window-properties.desktop.in.in.h:2
@@ -3045,29 +3055,77 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Labai greitai, XKB nustatymai esantys gconf bus perrašyti (iš sistemos "
-"konfigūracijos)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB klaviatūros išdėstymas"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB klaviatūros modelis"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB nustatymai"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Klaviatūros _modelis:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB klaviatūros išdėstymas"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Klaviatūros _modelis:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Klavišų susiejimai"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "XKB nustatymai esantys gconf bus perrašyti iš sistemos kiek įmanoma greičiau"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Labai greitai, XKB nustatymai esantys gconf bus perrašyti (iš sistemos "
+"konfigūracijos)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB klaviatūros išdėstymas"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB klaviatūros modelis"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Atidėti pertraukėlę"
@@ -3236,39 +3294,39 @@ msgstr "Ar rodyti TrueType šriftų mažus paveiksliukus"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Ar rodyti Type1 šriftų mažus paveiksliukus"
 
-#: vfs-methods/fontilus/font-view.c:126
+#: vfs-methods/fontilus/font-view.c:125
 msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 msgstr "Greita ruda lapė peršoka per tingų šunį. 0123456789"
 
-#: vfs-methods/fontilus/font-view.c:286
+#: vfs-methods/fontilus/font-view.c:285
 msgid "Name:"
 msgstr "Pavadinimas:"
 
-#: vfs-methods/fontilus/font-view.c:289
+#: vfs-methods/fontilus/font-view.c:288
 msgid "Style:"
 msgstr "Stilius:"
 
-#: vfs-methods/fontilus/font-view.c:298
+#: vfs-methods/fontilus/font-view.c:297
 msgid "Type:"
 msgstr "Tipas:"
 
-#: vfs-methods/fontilus/font-view.c:305
+#: vfs-methods/fontilus/font-view.c:304
 msgid "Size:"
 msgstr "Dydis:"
 
-#: vfs-methods/fontilus/font-view.c:349 vfs-methods/fontilus/font-view.c:362
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
 msgid "Version:"
 msgstr "Versija:"
 
-#: vfs-methods/fontilus/font-view.c:353 vfs-methods/fontilus/font-view.c:364
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
 msgid "Copyright:"
 msgstr "Autorinės Teisės:"
 
-#: vfs-methods/fontilus/font-view.c:357
+#: vfs-methods/fontilus/font-view.c:356
 msgid "Description:"
 msgstr "Aprašymas:"
 
-#: vfs-methods/fontilus/font-view.c:418
+#: vfs-methods/fontilus/font-view.c:417
 #, c-format
 msgid "usage: %s fontfile\n"
 msgstr "naudojimas: %s šrifto byla\n"
@@ -3370,5 +3428,8 @@ msgstr "Pritaikyti temą"
 msgid "Sets the default theme"
 msgstr "Atstato į įprastą temą"
 
+#~ msgid "XKB options"
+#~ msgstr "XKB nustatymai"
+
 #~ msgid "Network Proxy Configuration"
 #~ msgstr "Tarpinės tinklo stoties konfigūravimas"
diff --git a/po/lv.po b/po/lv.po
index 015008dbd..04122d1fc 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2003-01-21 15:44+0200\n"
 "Last-Translator: Artis Trops <hornet@navigator.lv>\n"
 "Language-Team: Latvian <ll10nt@os.lv>\n"
@@ -60,11 +60,11 @@ msgstr ""
 msgid "_Screenreader"
 msgstr "Ekrāns"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr ""
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 
@@ -109,13 +109,13 @@ msgstr "_Importēt Iespēju Uzstādījumus..."
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tastatūra"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Uzstādīt jūsu tastatūras pieejamības preferences"
 
@@ -337,12 +337,12 @@ msgstr "pikseļi/sekunde"
 msgid "seconds"
 msgstr "sekundes"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 #, fuzzy
 msgid "Change your Desktop Background settings"
 msgstr "Mainiet jūsu darbavirsmas fonu"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 #, fuzzy
 msgid "Desktop Background"
 msgstr "Fons"
@@ -436,6 +436,13 @@ msgstr "_Tapete"
 msgid "No Wallpaper"
 msgstr "_Tapete"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -643,112 +650,15 @@ msgstr "Lūdzu izvēlieties attēlu."
 msgid "_Select"
 msgstr "_atsviests"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Ieteiktās Aplikācijas"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Izvēlieties jūsu noklusētās aplikācijas"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-#, fuzzy
-msgid "W3M Text Browser"
-msgstr "Tīmekļa Pārlūks"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-#, fuzzy
-msgid "Lynx Text Browser"
-msgstr "Tīmekļa Pārlūks"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-#, fuzzy
-msgid "Links Text Browser"
-msgstr "Tīmekļa Pārlūks"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-#, fuzzy
-msgid "Evolution Mail Reader"
-msgstr "_Palīdzības Pārlūks pēc izvēles:"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-#, fuzzy
-msgid "Gnome Terminal"
-msgstr "Terminālis"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-#, fuzzy
-msgid "Standard XTerminal"
-msgstr "Palaist T_erminālī"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-#, fuzzy
-msgid "ETerm"
-msgstr "Terminālis"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Lūdzu norādiet redaktora nosaukumu un komandu."
@@ -758,21 +668,22 @@ msgid "Add..."
 msgstr "Pievienot..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_Redaktors pēc izvēles:"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Pēc Iz_vēles:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-#, fuzzy
-msgid "C_ustom Mail Reader:"
-msgstr "_Palīdzības Pārlūks pēc izvēles:"
+msgid "C_ustom:"
+msgstr "Pēc Iz_vēles:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "_Terminālis pēc izvēles:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Tī_mekļa Pārlūks pēc izvēles:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Šī aplikācija var atvērt _vairākus failus"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -820,6 +731,16 @@ msgid "Mail Reader"
 msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Palaist _Terminālī"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Palaist _Terminālī"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -828,93 +749,172 @@ msgstr ""
 "'attiecināt', pavicināt maģisko lakatiņu un padejot maģisko deju, lai tas "
 "strādātu."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Palaist T_erminālī"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminālis"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Teksta Redaktors"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Šī aplikācija var atvērt _URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Šī aplikācija var atvērt _vairākus failus"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Šī aplikācijai ir jāstrādā komandrindā"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Saprot _Netscape Attālināto Kontroli"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Lietot šo _redaktoru lai atvērtu teksta failus failu pārvaldniekā"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Tīmekļa Pārlūks"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Logu Pārvaldnieks"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Ko_manda:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nosaukums:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Rekvizīti..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
 #, fuzzy
-msgid "_Select a Mail Reader:"
-msgstr "Izvē_lieties Palīdzības Pārlūku:"
+msgid "_Select:"
+msgstr "_atsviests"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Izvēlēties Termināli:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Noklusētais Tīmekļa Pārlūks"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "Izvēlētie_s Tīmekļa Pārlūku:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "Iz_vēlēties Redaktoru:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Pieejamība"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Pieejamības Uzstādījumi"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Paplašināti"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+msgid "Mozilla"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Paplašinātie Uzstādījumi"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+#, fuzzy
+msgid "W3M Text Browser"
+msgstr "Tīmekļa Pārlūks"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+#, fuzzy
+msgid "Lynx Text Browser"
+msgstr "Tīmekļa Pārlūks"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+#, fuzzy
+msgid "Links Text Browser"
+msgstr "Tīmekļa Pārlūks"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+#, fuzzy
+msgid "Evolution Mail Reader"
+msgstr "_Palīdzības Pārlūks pēc izvēles:"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Noklusētais Terminālis"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminālis"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+#, fuzzy
+msgid "Standard XTerminal"
+msgstr "Palaist T_erminālī"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "Kategorija"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+#, fuzzy
+msgid "ETerm"
+msgstr "Terminālis"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr ""
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr ""
 
@@ -1002,7 +1002,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Apraksts"
 
@@ -1010,17 +1010,27 @@ msgstr "Apraksts"
 msgid "Extensions"
 msgstr "Paplašinājumi"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Failu Tipi un Programmas"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Norādīt kuras programmas tiek izmantotas, lai atvērtu vai skatītos katru "
 "faila tipu"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Failu tipi un programmas"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Norādiet, kuras programmas tiek izmantotas, lai atvērtu vai skatītu katru "
+"faila tipu"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Darbības"
@@ -1112,6 +1122,7 @@ msgid "_Protocol:"
 msgstr "_Protokols:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Izņemt"
 
@@ -1119,16 +1130,6 @@ msgstr "_Izņemt"
 msgid "_Viewer component:"
 msgstr "_Skatītāja komponents:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Failu tipi un programmas"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Norādiet, kuras programmas tiek izmantotas, lai atvērtu vai skatītu katru "
-"faila tipu"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Rediģēt faila kategoriju"
@@ -1311,14 +1312,15 @@ msgid "Electronic mail transmission"
 msgstr "Elektroniskā pasta pārraide"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome dokumentācija"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Fonts"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Izvēlēties fontus darbavirsmai"
 
@@ -1525,29 +1527,29 @@ msgid "The type of accelerator."
 msgstr "Paātrinātāja tips."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Deaktivizēts"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Nezināma Darbība>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Darba virsma"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Skaņa"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Logu Pārvaldīšana"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1556,26 +1558,26 @@ msgstr ""
 "Saiīsne \"%s\" jau tiek lietota priekš:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Kļūda uzstādot jaunu paātrinātāju konfigurācijas datubāzē: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, fuzzy, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Kļūda uzstādot jaunu paātrinātāju konfigurācijas datubāzē: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Darbība"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Saīsne"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Tastatūras Saīsnes"
 
@@ -1586,28 +1588,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "Ievadiet jaunu paātrinātāju vai nospiediet Atpakaļatkāpi, lai attīrītu"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Nozīmēt komandas saīsņu taustiņiem"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr ""
-"<b>Nezināms Kursors</b>\n"
-"%s"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Modelis"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "Tastatūras Saīsnes"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1788,10 +1772,38 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr ""
+"<b>Nezināms Kursors</b>\n"
+"%s"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Modelis"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "Tastatūras Saīsnes"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Uzstādiet jūsu tastatūras preferences"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "Izvēlnes un Rīkjoslas Preferences"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Uzstādīt jūsu peles preferences"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 #, fuzzy
 msgid "Unknown Cursor"
@@ -1982,21 +1994,22 @@ msgstr "_Slieksnis:"
 msgid "_Timeout:"
 msgstr ""
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Pele"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Uzstādīt jūsu peles preferences"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 #, fuzzy
 msgid "Network Proxy"
 msgstr "Tīkla starpserveris"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Tīkla starpservera preferences"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2043,8 +2056,9 @@ msgid "H_TTP proxy:"
 msgstr "_HTTP starpserveris:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Tīkla Starpservera Konfigurācija"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Tīkla starpservera preferences"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2085,7 +2099,7 @@ msgstr "Pa_role:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Drošais HTTP starpserveris:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Aktivizēt skaņu un sasaistīt skaņas ar notikumiem"
 
@@ -2143,15 +2157,26 @@ msgstr ""
 "\"Tēmas Preferences\" dialogs netika pienācīgi uzinstalēts, vai jums nav "
 "instalēta \"gnome-themes\" pakotne."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2181,12 +2206,12 @@ msgstr "Jābūt tēmas nosaukumam"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Izvēlieties tēmas dažādām darbavirsmas daļām"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tēma"
 
@@ -2321,11 +2346,11 @@ msgstr "_Tēmas nosaukums:"
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Mainīt rīkjoslu un izvēļņjoslu parādīšanos aplikācijās"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Izvēlnes un Rīkjoslas"
 
@@ -2401,7 +2426,6 @@ msgid "_Edit"
 msgstr "_Rediģēt"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fails"
 
@@ -2429,6 +2453,14 @@ msgstr "_Iziet"
 msgid "_Save"
 msgstr "_Saglabāt"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2440,23 +2472,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Kontrole"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hiper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (vai \"Windows logo\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2500,14 +2532,35 @@ msgstr "_Pacelt izvēlēto logu pēc intervāla"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Izvēlēties logus, kad peles kursors pārvietojas pār tiem"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Loga Rekvizīti"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Logi"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME Kontroles Centrs"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Tastatūras Preferences"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Filtri"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "GNOME konfigurācijas rīks"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2542,90 +2595,6 @@ msgstr "Kontroles Centra Izvēlne"
 msgid "View as Control Center"
 msgstr "GNOME Kontroles Centrs : %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME Kontroles Centrs: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Izkārtojums"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Izkārtokjums, kādu lietot šim kapletu skatam"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Kapleta direktorija objekts"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Kapleta direktorija, ko skata šis skats"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Pēteris Krišjānis <peteris.krisjanis@os.lv>\n"
-"Atris Trops <hornet@navigator.lv>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME Kontroles Centrs"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Darba virsmas rekvizītu pārvaldnieks."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME Kontroles Centrs : %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Filtri"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "GNOME Kontroles Centrs : %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Lietot komandrindu ja pat nautilus strādā."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Par šo aplikāciju"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Kontroles centra pārskats"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Par"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Saturs"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Palīdzība"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "GNOME konfigurācijas rīks"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Lietot komandrindu ja pat nautilus strādā."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 #, fuzzy
 msgid "Volume"
@@ -2726,7 +2695,7 @@ msgstr ""
 "Kļūda, mēģinot palaist (%s)\n"
 "kurš ir saistīts ar atslēgu (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2741,7 +2710,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2749,22 +2718,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Paplašinātie Uzstādījumi"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2820,8 +2789,8 @@ msgstr "_Nerādīt šo ziņojumu vēlreiz"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nevarēju ielādēt skaņas failu %s kā paraugu %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr ""
 
@@ -2871,11 +2840,11 @@ msgstr "Ekrāns"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Ekrāns, uz kura jāzīmē BGApplier"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Skaņas fails šim notikumam neeksistē."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2885,36 +2854,36 @@ msgstr ""
 "Jūs varētu gribēt uzstādīt gnome-audio pakotni,\n"
 "kas satur kopu ar noklusētajām skaņām."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr ""
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Notikums"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 #, fuzzy
 msgid "Sound File"
 msgstr "Skaņa"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 #, fuzzy
 msgid "_Sounds:"
 msgstr "_Skaņas"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 #, fuzzy
 msgid "Sound _file:"
 msgstr "Izvēlieties skaņas failu"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 #, fuzzy
 msgid "Select Sound File"
 msgstr "Izvēlieties skaņas failu"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Atskaņot"
 
@@ -3192,29 +3161,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
 #, fuzzy
-msgid "XKB keyboard layout"
+msgid "Keyboard Update Handlers"
+msgstr "Tastatūras Zvans"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
+#, fuzzy
+msgid "Keyboard layout"
 msgstr "Tastatūras Saīsnes"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
 #, fuzzy
-msgid "XKB keyboard model"
+msgid "Keyboard model"
 msgstr "Tastatūras Zvans"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
 #, fuzzy
-msgid "XKB options"
-msgstr "Darbības"
+msgid "Keyboard options"
+msgstr "Tastatūras Saīsnes"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Tastatūras Saīsnes"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Tastatūras Zvans"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr ""
@@ -3288,47 +3300,14 @@ msgid ""
 "Notification area'."
 msgstr ""
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-"Glāžšķūņa rūķīši jautri dziedādami čiepj koncertflīģeļa vāku. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nosaukums:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stils:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tips:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Izmērs:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versija:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Autortiesības:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Apraksts:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Iestatīt kā Aplikācijas Fontu"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Fonta konteksta izvēlnes priekšmeti"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Izvēlieties jūsu noklusētās aplikācijas"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3404,33 +3383,48 @@ msgstr "Vai sīkattēlot TrueType fontus"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Vai sīkattēlot Type1 fontus"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Ražotne fontilus konteksa izvēlnei"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr ""
+"Glāžšķūņa rūķīši jautri dziedādami čiepj koncertflīģeļa vāku. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus konteksta izvēlne"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nosaukums:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus konteksta izvēlnes ražotne"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stils:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Nautilus konteksta ieraksti fontiem"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tips:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Iestatīt kā Aplikācijas Fontu"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Izmērs:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Tēmas Rekvizītu satura skata komponents"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versija:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus Tēmas Rekvizītu skats"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Autortiesības:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Apraksts:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME Kontroles Centrs"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3459,27 +3453,18 @@ msgstr "Pielietot F_ontu"
 msgid "Themes"
 msgstr "Tēmas"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Kontroles tēma"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Loga robežas tēma"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikonas tēma"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Pašlaik parāditais URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr ""
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Ja iestatīts uz true, tad instalētās tēmas tiks sīkattēlotas."
@@ -3516,6 +3501,155 @@ msgstr "Vai sīkattēlot instalētās tēmas"
 msgid "Whether to thumbnail themes"
 msgstr "Vai sīkattēlot tēmas"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr ""
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Instalēt tēmu..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Lietot pamatkategorijas _noklusējumus"
+
+#, fuzzy
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminālis"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_Redaktors pēc izvēles:"
+
+#, fuzzy
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "_Palīdzības Pārlūks pēc izvēles:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "_Terminālis pēc izvēles:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Tī_mekļa Pārlūks pēc izvēles:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Palaist T_erminālī"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Šī aplikācija var atvērt _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Šī aplikācijai ir jāstrādā komandrindā"
+
+#, fuzzy
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "Izvē_lieties Palīdzības Pārlūku:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Izvēlēties Termināli:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "Izvēlētie_s Tīmekļa Pārlūku:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "Iz_vēlēties Redaktoru:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Pieejamība"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Pieejamības Uzstādījumi"
+
+#~ msgid "Advanced"
+#~ msgstr "Paplašināti"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Paplašinātie Uzstādījumi"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Tīkla Starpservera Konfigurācija"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME Kontroles Centrs: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Izkārtojums"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Izkārtokjums, kādu lietot šim kapletu skatam"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Kapleta direktorija objekts"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Kapleta direktorija, ko skata šis skats"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Pēteris Krišjānis <peteris.krisjanis@os.lv>\n"
+#~ "Atris Trops <hornet@navigator.lv>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Darba virsmas rekvizītu pārvaldnieks."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME Kontroles Centrs : %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "GNOME Kontroles Centrs : %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Lietot komandrindu ja pat nautilus strādā."
+
+#~ msgid "About this application"
+#~ msgstr "Par šo aplikāciju"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Kontroles centra pārskats"
+
+#~ msgid "_About"
+#~ msgstr "_Par"
+
+#~ msgid "_Contents"
+#~ msgstr "_Saturs"
+
+#~ msgid "_Help"
+#~ msgstr "_Palīdzība"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Lietot komandrindu ja pat nautilus strādā."
+
+#, fuzzy
+#~ msgid "XKB options"
+#~ msgstr "Darbības"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Fonta konteksta izvēlnes priekšmeti"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Ražotne fontilus konteksa izvēlnei"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus konteksta izvēlne"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus konteksta izvēlnes ražotne"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Nautilus konteksta ieraksti fontiem"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Tēmas Rekvizītu satura skata komponents"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus Tēmas Rekvizītu skats"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "Pašlaik parāditais URI"
+
 #~ msgid "De_tails..."
 #~ msgstr "De_taļas..."
 
@@ -3731,10 +3865,6 @@ msgstr "Vai sīkattēlot tēmas"
 #~ msgstr "_Tapete"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Tastatūras Preferences"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "Paplašinātie Uzstādījumi"
 
@@ -3771,18 +3901,10 @@ msgstr "Vai sīkattēlot tēmas"
 #~ msgstr "Pašizvēles tēma"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "Izvēlnes un Rīkjoslas Preferences"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "A_praksts:"
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Uzstādīt jūsu peles preferences"
-
-#, fuzzy
 #~ msgid "_Ignore system configuration"
 #~ msgstr "Tīkla Starpservera Konfigurācija"
 
@@ -3890,19 +4012,12 @@ msgstr "Vai sīkattēlot tēmas"
 #~ msgstr "_Iziet"
 
 #, fuzzy
-#~ msgid "Apply theme..."
-#~ msgstr "_Instalēt tēmu..."
-
-#, fuzzy
 #~ msgid "Themus component"
 #~ msgstr "_Skatītāja komponents:"
 
 #~ msgid "Bee_p"
 #~ msgstr "Pī_kstēt"
 
-#~ msgid "C_ustom:"
-#~ msgstr "Pēc Iz_vēles:"
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "_Klikšķēt pie taustiņnospiešanas"
 
diff --git a/po/mk.po b/po/mk.po
index 5992dbb7b..c154ad008 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-18 03:06+0200\n"
 "Last-Translator: Tomislav Markovski <herrera@users.sourceforge.net>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -70,11 +70,11 @@ msgstr "_Екранска тастатура"
 msgid "_Screenreader"
 msgstr "_Читач од екран"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Поддршка за помошни технологии"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Овозможи поддршка за помошнаите технологии на Гном кај најавувањето"
 
@@ -127,13 +127,13 @@ msgstr "Увези ја датотеката со подесувањата за
 msgid "_Import"
 msgstr "_Увези"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Тастатура"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Избери твои парметри за пристапност на тастатура"
 
@@ -346,11 +346,11 @@ msgstr "пиксели/секунда"
 msgid "seconds"
 msgstr "секунди"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Променете ги подесувањата за Вашата позадина"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Позадина на работната околина"
 
@@ -429,6 +429,13 @@ msgstr "Додади позадина"
 msgid "No Wallpaper"
 msgstr "Без позадина"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -640,105 +647,15 @@ msgstr "Одбери слика."
 msgid "_Select"
 msgstr "_Одберете"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Преферирани апликации"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Изберете ги Вашите стандардни апликации"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M текстуален прелистувач"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx текстуален-веб прелистувач"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links текстуален-веб прелистувач"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution читач за е-пошта"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome Terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Стандарден XTerminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Изберете име и команда за овој уредувач."
@@ -748,20 +665,23 @@ msgid "Add..."
 msgstr "Додај..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "С_опствен уредувач"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Сопствен"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "С_опствен читач за е-пошта"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Сопствен"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "С_опствен терминал:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "С_опствен веб прелистувач"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Оваа апликација може да отвора _повеќе датотеки"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -808,6 +728,16 @@ msgid "Mail Reader"
 msgstr "Читач за е-пошта"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Изврши во _терминал"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Изврши во _терминал"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -815,94 +745,170 @@ msgstr ""
 "Избери менаџер што го сакаш. Ќе треба да стиснеш примени, да мавнеш со "
 "магично стапче и да играш магичен танц за да проработи."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Подигни во т_ерминал"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Терминал"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Уредувач за текст"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Оваа апликација може да отвора _URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Оваа апликација може да отвора _повеќе датотеки"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Оваа апликација трреба да се изврши во _школка"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Разбира _Netscape далечинска контрола"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Користи го овој _уредувач да отвориш текстуални датотеки во менаџерот на "
 "датотеки"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Веб прелистувач"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Менаџер на прозорци"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Ко_манда:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Име:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Својства..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Избери читач за е-пошта:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Одберете"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Стандарден веб прелистувач"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M текстуален прелистувач"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx текстуален-веб прелистувач"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links текстуален-веб прелистувач"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution читач за е-пошта"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Избери терминал:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Избери веб прелистувач:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Избери уредувач:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Пристапност"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Подесувања на пристапноста"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Стандарден терминал"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Напредно"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Терминал"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Напредни подесувања"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Стандарден XTerminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Промени ја резолуцијата на екранот"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Резолуција на екранот"
 
@@ -996,7 +1002,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Дали сте сигурни дека сакате перманентно да го избришете овој запис?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Опис"
 
@@ -1004,17 +1010,27 @@ msgstr "Опис"
 msgid "Extensions"
 msgstr "Наставки"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Видови на датотеки и програми"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Одберете кои програми се користат да ги отворат или прикажат сите типови "
 "датотеки"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Видови на Датотеки и Програми"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Избери кои програми се користат да ги отворат или прикажат сите типови "
+"датотеки"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Дејствија"
@@ -1105,6 +1121,7 @@ msgid "_Protocol:"
 msgstr "_Протокол:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Отстрани"
 
@@ -1112,16 +1129,6 @@ msgstr "_Отстрани"
 msgid "_Viewer component:"
 msgstr "_Компоненти на прегледувачот:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Видови на Датотеки и Програми"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Избери кои програми се користат да ги отворат или прикажат сите типови "
-"датотеки"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Уреди категорија на датотека"
@@ -1302,14 +1309,15 @@ msgid "Electronic mail transmission"
 msgstr "Електронски пренос на пошта"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome документација"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Фонт"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Одберете фонт за работната околина"
 
@@ -1518,29 +1526,29 @@ msgid "The type of accelerator."
 msgstr "Тип на забрзувач."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Оневозможено"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Непозната Акција>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Десктоп"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Звук"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Менаџмент на прозорци"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1549,29 +1557,29 @@ msgstr ""
 "Кратенката \"%s\" веќе се користи за \n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Грешка при подесување на новиот забрзувач во базата за конфигурирање на "
 "податоци%s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Грешка при подесување на забрзувачот во базата за конфигурирација: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Дејствие"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Кратенка"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Кратенки за тастатурата"
 
@@ -1583,23 +1591,10 @@ msgstr ""
 "За да ги уредите кратенките, кликнете на саканиот ред и искуцајте ново копче "
 "за забрзување или пак притиснете backspace за да го исчистите."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Додели кратенки за команди"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Непознато"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Модели"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Преглед на изгледот на тастатурата"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1767,10 +1762,32 @@ msgstr "Интервалот на работа трае:"
 msgid "minutes"
 msgstr "минути"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Непознато"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Модели"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Преглед на изгледот на тастатурата"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Подесете ги Вашите параметри за тастатурата"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Подесете ги параметрите за глушецот"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Непознат курсор"
@@ -1935,20 +1952,21 @@ msgstr "_Threshold:"
 msgid "_Timeout:"
 msgstr "_Тајмаут:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Глушец"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Подесете ги параметрите за глушецот"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Мрежен прокси"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Параметри на мрежен прокси"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1992,8 +2010,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP прокси:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Конфигурација на мрежен прокси"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Параметри на мрежен прокси"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2031,7 +2050,7 @@ msgstr "_Лозинка:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Безбеден HTTP прокси:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Вклучи звуци и асоцирај звуци со настани"
 
@@ -2089,15 +2108,26 @@ msgstr ""
 "\"Параметри на теми\" не е правилно инсталирани, или не сте го инсталирале "
 "\"gnome-themes\" пакетот."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Не е одредена локација за тема за датотеката да биде инсталирана"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Локазијата за инсталација на датотеката е невалидна"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2132,12 +2162,12 @@ msgstr "Името на темата мора да е присутно"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Темата веќе постои. Дали сакате да ја замените?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Одберете теми за разни делови на работната околина"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Тема"
 
@@ -2250,11 +2280,11 @@ msgstr "_Име на тема:"
 msgid "theme selection tree"
 msgstr "дрво за избор на тема"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Прилагодете го изгледот на лентите со алатки и менијата во апликациите"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Мени и ленти со алатки"
 
@@ -2323,7 +2353,6 @@ msgid "_Edit"
 msgstr "_Уреди"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Датотека"
 
@@ -2351,6 +2380,14 @@ msgstr "_Излез"
 msgid "_Save"
 msgstr "_Зачувај"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2363,23 +2400,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Контрола"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Хипер"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Супер (или \"Виндоуз лого\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Мета"
 
@@ -2421,14 +2458,34 @@ msgstr "_Подигни ги избраните прозорци после не
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Избери прозорци кога глушецот поминува преку нив"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Својства на прозорецот"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Прозорци"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Контролен центар на Гном"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Параметри за позадината"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Други"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Алатка за конфигурирање на Гном"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Контролен центар"
@@ -2457,93 +2514,6 @@ msgstr "Фабрика за поглед на контролниот цента�
 msgid "View as Control Center"
 msgstr "Поглед како контролен центар"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Контролен центар на Гном: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Изглед"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Изглед за користење на овој преглед нa capplets"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Capplet oбјект директориум"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Capplet директориум кој го гледа овој поглед"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Aleksandar Savic <savica@mt.net.mk>, 2003\n"
-"Jovan Kostovski <chombium@freemail.com.mk>, 2003.\n"
-"Arangel Angov <ufo@linux.net.mk>, 2003,2004.\n"
-"Ivan Stojmirov <stojmir@linux.net.mk>, 2003.\n"
-"\n"
-"\n"
-"Sloboden softver Makedonija\n"
-"http://www.slobodensoftver.org.mk"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Контролен центар на Гном"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Менаџер за својства на десктопот."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Контролен центар на Гном: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Други"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Контролен центар на Гном: %s"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Употерби го наутилус ако е веќе извршен."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "За оваа апликација"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Преглед на контролниот центар"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_За"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Содржина"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Помош"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Алатка за конфигурирање на Гном"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Користи школка дури и ако наутилус е веќе извршен."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Јачина:"
@@ -2655,7 +2625,7 @@ msgstr ""
 "Грешка при обидување да се вклучи (%s)\n"
 "кое е поврзано со копчето (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2680,7 +2650,7 @@ msgstr ""
 "- Резултатот од <b>xprop -root | grep XKB</b>\n"
 "- Резултатот од <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2692,7 +2662,7 @@ msgstr ""
 "Пробајте да користите поедноставна конфигурација или пак да преземете некоја "
 "посвежа верзија на XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2700,15 +2670,15 @@ msgstr ""
 "Подесувањата за тастатурата во X системот се разликуваат од Вашите тековни "
 "подесувања за тастатурата во Гном.  Кои подесувања сакате да ги користите?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Користи подесувања од X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Користи подесувања од Гном"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2773,8 +2743,8 @@ msgstr "_Не ја прикажувај повторно оваа порака"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Не може да се вчита звучната датотека %s како на пример %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Не може да се утврди домашниот директориум на корисникот"
 
@@ -2823,11 +2793,11 @@ msgstr "Екран"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Екран на кој BGApllier ќе црта"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Звучната датотека за овој настан не постои."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2837,32 +2807,32 @@ msgstr ""
 "Можеби сакате да го инсталирате gnome-audio пакетот\n"
 "за сет на стандардни звуци."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Датотеката %s не е валидна wav датотека"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Настан"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Звучна датотека"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "Звуци:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Звучна _датотека:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Избери звучна датотека"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Свири"
 
@@ -3124,30 +3094,78 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Наскоро, XKB подесувањата во gconf ќе бидат заменети (од системската "
-"конфигурација)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB изглед на тастаурата"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB модел на тастатурата"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Опции за XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Модел на тастатура:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB изглед на тастаурата"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Модел на тастатура:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Кратенки за тастатурата"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "XKB подесувањата во gconf ќе бидат заменети од страна на системот што е "
 "можно побрзо"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Наскоро, XKB подесувањата во gconf ќе бидат заменети (од системската "
+"конфигурација)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB изглед на тастаурата"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB модел на тастатурата"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "Одложи пауза"
@@ -3226,46 +3244,14 @@ msgstr ""
 "Можете да ја додадете со десен клик на вапиот панел и со избирање на 'Додади "
 "панел'->'Алатки'->'Област за известување'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "АБВГДЃЕЖЗЅИЈКЛЉМНЊОПРСТЌУФХЦЧЏШ абвгдѓежзѕијклљмнњопрстќуфхцчџш"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Име:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Стил:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Тип:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Големина:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Верзија:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Опис:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "употреба: %s фонт датотека\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Подеси фонт за апликација:"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Предмети со контекст мени за фонт"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Изберете ги Вашите стандардни апликации"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3344,33 +3330,47 @@ msgstr "Дали да има мал приказ на TrueType фонтовит�
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Дали да има мал приказ на Type1 фонтовите"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Фабрика за fontilus контекст менито"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "АБВГДЃЕЖЗЅИЈКЛЉМНЊОПРСТЌУФХЦЧЏШ абвгдѓежзѕијклљмнњопрстќуфхцчџш"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Фонт мени"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Име:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus контекст мени фабрика"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Стил:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Nautilus контекст мени записи за фонтови"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Тип:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Подеси фонт за апликација:"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Големина:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Верзија:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Опис:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Приказ на својствата на тематa"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "употреба: %s фонт датотека\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Преглед на својствата на Themus темата"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Контролен центар на Гном"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3400,27 +3400,18 @@ msgstr "_Примени фонт"
 msgid "Themes"
 msgstr "Теми"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Тема"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Тема со граница на прозорецот"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Тема со икони"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI моментално прикажување"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "АБВГДЃЕЖ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Ако е точно подесено, тогаш инсталираните теми ќе имаат мал приказ."
@@ -3457,3 +3448,155 @@ msgstr "Каде да има мал приказ на инсталираните
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "Каде да има мал приказ на темите"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "АБВГДЃЕЖ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Примени фонт"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Ресетирај на стандардни"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome Terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "С_опствен уредувач"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "С_опствен читач за е-пошта"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "С_опствен терминал:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "С_опствен веб прелистувач"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Подигни во т_ерминал"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Оваа апликација може да отвора _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Оваа апликација трреба да се изврши во _школка"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Избери читач за е-пошта:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Избери терминал:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Избери веб прелистувач:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Избери уредувач:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Пристапност"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Подесувања на пристапноста"
+
+#~ msgid "Advanced"
+#~ msgstr "Напредно"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Напредни подесувања"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Конфигурација на мрежен прокси"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Контролен центар на Гном: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Изглед"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Изглед за користење на овој преглед нa capplets"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Capplet oбјект директориум"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Capplet директориум кој го гледа овој поглед"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Aleksandar Savic <savica@mt.net.mk>, 2003\n"
+#~ "Jovan Kostovski <chombium@freemail.com.mk>, 2003.\n"
+#~ "Arangel Angov <ufo@linux.net.mk>, 2003,2004.\n"
+#~ "Ivan Stojmirov <stojmir@linux.net.mk>, 2003.\n"
+#~ "\n"
+#~ "\n"
+#~ "Sloboden softver Makedonija\n"
+#~ "http://www.slobodensoftver.org.mk"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Менаџер за својства на десктопот."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Контролен центар на Гном: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Контролен центар на Гном: %s"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Употерби го наутилус ако е веќе извршен."
+
+#~ msgid "About this application"
+#~ msgstr "За оваа апликација"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Преглед на контролниот центар"
+
+#~ msgid "_About"
+#~ msgstr "_За"
+
+#~ msgid "_Contents"
+#~ msgstr "_Содржина"
+
+#~ msgid "_Help"
+#~ msgstr "_Помош"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Користи школка дури и ако наутилус е веќе извршен."
+
+#~ msgid "XKB options"
+#~ msgstr "Опции за XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Предмети со контекст мени за фонт"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Фабрика за fontilus контекст менито"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Фонт мени"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus контекст мени фабрика"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Nautilus контекст мени записи за фонтови"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Приказ на својствата на тематa"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Преглед на својствата на Themus темата"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI моментално прикажување"
diff --git a/po/ml.po b/po/ml.po
index 4d41191b0..400b7d508 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:gnome-control-center.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2003-07-05 10:29+0530\n"
 "Last-Translator: FSF-India <locale@gnu.org.in>\n"
 "Language-Team: Malayalam <locale@gnu.org.in>\n"
@@ -59,11 +59,11 @@ msgstr ""
 msgid "_Screenreader"
 msgstr "തിരച്ചിത്രം"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr ""
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 
@@ -110,13 +110,13 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "കീബോര്‍ഡ്"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr ""
 
@@ -324,12 +324,12 @@ msgstr "പിക്സല്‍സ്/സെക്കന്റ്"
 msgid "seconds"
 msgstr "സെക്കന്റ്സ്"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 #, fuzzy
 msgid "Change your Desktop Background settings"
 msgstr "പണിയിട പശ്ചാത്തലം ഇഷ്ടമുള്ളതുപോലെ സജ്ജീകരിക്കുക"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 #, fuzzy
 msgid "Desktop Background"
 msgstr "പശ്ചാത്തലം"
@@ -422,6 +422,13 @@ msgstr "ചുവ‍ര്ച്ചിത്രം"
 msgid "No Wallpaper"
 msgstr "ചുവ‍ര്ച്ചിത്രം"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -616,112 +623,16 @@ msgstr "ദയവായ് ഒരു ചിത്രം തെരഞ്ഞെട
 msgid "_Select"
 msgstr "തള്ളിക്കളഞ്ഞു"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "പരിഗണിച്ച പ്രയോഗങ്ങള്"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 #, fuzzy
 msgid "Select your default applications"
 msgstr "ഈ പ്രയോഗത്തിന‍് സഹായം ലഭിക്കുക"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-#, fuzzy
-msgid "W3M Text Browser"
-msgstr "സഹായ ബ്രൌസ‍ര്"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-#, fuzzy
-msgid "Lynx Text Browser"
-msgstr "സഹായ ബ്രൌസ‍ര്"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-#, fuzzy
-msgid "Links Text Browser"
-msgstr "സഹായ ബ്രൌസ‍ര്"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-#, fuzzy
-msgid "Gnome Terminal"
-msgstr "ടെ‍ര്മിനല്"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-#, fuzzy
-msgid "Standard XTerminal"
-msgstr "കല്പ്പനാസ്ഥാനത്ത് തുടങ്ങുക"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-#, fuzzy
-msgid "ETerm"
-msgstr "ടെ‍ര്മിനല്"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr ""
@@ -732,23 +643,20 @@ msgstr "ചേര്ക്കുക..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
 #, fuzzy
-msgid "C_ustom Editor"
-msgstr "സജ്ജീകാരകന്‍"
+msgid "C_ustom"
+msgstr "യഥേഷ്ടം:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-#, fuzzy
-msgid "C_ustom Mail Reader:"
-msgstr "സഹായ ബ്രൌസ‍ര്"
+msgid "C_ustom:"
+msgstr "യഥേഷ്ടം:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-#, fuzzy
-msgid "C_ustom Terminal:"
-msgstr "മൂകാഗ്രം"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-#, fuzzy
-msgid "C_ustom Web Browser:"
-msgstr "ഗാലിയന്‌ അന്വേഷണോപാധി"
+msgid "Can open multiple _files"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -800,106 +708,187 @@ msgid "Mail Reader"
 msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "കല്പ്പനാസ്ഥാനത്ത് പ്രവ‍ര്ത്തിക്കുക"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "കല്പ്പനാസ്ഥാനത്ത് പ്രവ‍ര്ത്തിക്കുക"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "കല്പ്പനാസ്ഥാനത്ത് തുടങ്ങുക"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "ടെ‍ര്മിനല്"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "രചന ചിട്ടപ്പെടുത്തല്‌ ഉപാധി"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-#, fuzzy
-msgid "This application can open _URIs"
-msgstr "പ്രയോഗ ഐ ഡി നാമം"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-#, fuzzy
-msgid "This application needs to be run in a _shell"
-msgstr "നാമാവലിയില് നിന്നും ഒരു പ്രയോഗം പ്രവ‍ര്ത്തിക്കാനായി തിരഞ്ഞെടുക്കുക"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 #, fuzzy
 msgid "Web Browser"
 msgstr "സഹായ ബ്രൌസ‍ര്"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "ജാലക പാലകന്‌"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "നിര്‍ദ്ദേശം:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "പേര‍്:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "ഗുണഗണങ്ങള്...‌"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "തള്ളിക്കളഞ്ഞു"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "ഗാലിയന്‌ അന്വേഷണോപാധി"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+msgid "Mozilla"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
 #, fuzzy
-msgid "_Select a Mail Reader:"
+msgid "W3M Text Browser"
 msgstr "സഹായ ബ്രൌസ‍ര്"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
 #, fuzzy
-msgid "_Select a Terminal:"
-msgstr "ചിഹ്നം തിരഞ്ഞെടുക്കുക:"
+msgid "Lynx Text Browser"
+msgstr "സഹായ ബ്രൌസ‍ര്"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
 #, fuzzy
-msgid "_Select a Web Browser:"
-msgstr "ഗാലിയന്‌ അന്വേഷണോപാധി"
+msgid "Links Text Browser"
+msgstr "സഹായ ബ്രൌസ‍ര്"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
 #, fuzzy
-msgid "_Select an Editor:"
-msgstr "ചിഹ്നം തിരഞ്ഞെടുക്കുക:"
+msgid "Debian Terminal Emulator"
+msgstr "സ്വതേയുള്ള കല്പ്പനാസ്ഥാനം"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
 #, fuzzy
-msgid "Accessibility"
-msgstr "ഉപയോഗക്ഷമത"
+msgid "GNOME Terminal"
+msgstr "ടെ‍ര്മിനല്"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
 #, fuzzy
-msgid "Accessibility Settings"
-msgstr "ഉപയോഗക്ഷമത"
+msgid "Standard XTerminal"
+msgstr "കല്പ്പനാസ്ഥാനത്ത് തുടങ്ങുക"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "പുരോഗമിച്ച"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "ഉന്നതതല സജ്ജീകരണങ്ങള്"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "വിഭാഗങ്ങള്"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+#, fuzzy
+msgid "ETerm"
+msgstr "ടെ‍ര്മിനല്"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr ""
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr ""
 
@@ -984,7 +973,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "വിവരണം"
 
@@ -993,15 +982,24 @@ msgstr "വിവരണം"
 msgid "Extensions"
 msgstr "വിപുലീകരണം"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "രചനാ തരങ്ങളും നിര്‍ദ്ദേശ-സംഹിതകളും"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+#, fuzzy
+msgid "File types and programs"
+msgstr "രചനാ തരങ്ങളും നിര്‍ദ്ദേശ-സംഹിതകളും"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "പ്ര‌വ‍ര്ത്തനം"
@@ -1100,6 +1098,7 @@ msgid "_Protocol:"
 msgstr "പ്രോട്ടോകോള്:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "നീക്കുക"
 
@@ -1108,15 +1107,6 @@ msgstr "നീക്കുക"
 msgid "_Viewer component:"
 msgstr "ഫയല് റോളര് ഘടകം"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-#, fuzzy
-msgid "File types and programs"
-msgstr "രചനാ തരങ്ങളും നിര്‍ദ്ദേശ-സംഹിതകളും"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr ""
@@ -1306,14 +1296,15 @@ msgid "Electronic mail transmission"
 msgstr "ഇലക‍്ട്രോണിക് മെയില്"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "ഗ്നോം സഹായഗ്രന്ഥം"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "അക്ഷരരൂപം"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 #, fuzzy
 msgid "Select fonts for the desktop"
 msgstr "സമയം പട്ടികയില് നിന്ന് തെരഞ്ഞെടുക്കുക"
@@ -1521,55 +1512,55 @@ msgid "The type of accelerator."
 msgstr "വേഗവ‌ര്ദ്ധിനിയുടെ തരം"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "അപ്രാപ്യം"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<അറിയാത്ത പ്ര‌വൃത്തി‌>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "പണിയിടം"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "ശബ്ദം"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "ജാലക പാലകന്‌"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
 " \"%s\"\n"
 msgstr "\"%s\" എന്ന കുറുക്കുവഴി ഇപ്പോള്‍ തന്നെ \"%s\" ന‌് വേണ്ടി ഉപയോഗിച്ചിട്ടുണ്ട്\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "പ്ര‌വ‍ര്ത്തനം"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "കുറക്കുവഴി"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "കീബോര്‍ഡ് കുറക്കുവഴികള്"
 
@@ -1580,28 +1571,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "പുതിയ വേഗവ‌ര്ദ്ധിനി കീ നല്‍കുക, അല്ലെങ്കില്‍ Backspace അമ‌ര്‍ത്തി ശൂന്യമാക്കുക"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "നിര്‍ദ്ദേങ്ങള്‍ക്ക് കുറക്കുവഴികള് നല്‍കുക"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr ""
-"<b>അറിയാത്ത സ്ഥാനസൂചി</b>\n"
-"%s"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "രീതി"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "കീബോര്‍ഡ് കുറക്കുവഴികള്"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, fuzzy, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1780,10 +1753,38 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr ""
+"<b>അറിയാത്ത സ്ഥാനസൂചി</b>\n"
+"%s"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "രീതി"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "കീബോര്‍ഡ് കുറക്കുവഴികള്"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "കീബോര്‍ഡ് മുന്ഗണനകള് സജ്ജീകരിക്കുക"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "പട്ടികയുടെയും ഉപകരണപ്പട്ടയുടെയും മുന്ഗണനകള്"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "മൌസ് മുന്‌ഗണനകള് രേഖപ്പെടുത്തുക"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 #, fuzzy
 msgid "Unknown Cursor"
@@ -1956,20 +1957,21 @@ msgstr "ചവറ്റുകുട്ട:"
 msgid "_Timeout:"
 msgstr ""
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "മൌസ്"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "മൌസ് മുന്‌ഗണനകള് രേഖപ്പെടുത്തുക"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr ""
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "വലക്കെട്ട് പകരക്കാരന്റെ‌ മുന്‌ഗണനകള്"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2021,8 +2023,8 @@ msgstr "HTTP പകരക്കാരന്‍"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
 #, fuzzy
-msgid "Network Proxy Configuration"
-msgstr "അനുരൂപമാക്കല്‍"
+msgid "Network Proxy Preferences"
+msgstr "വലക്കെട്ട് പകരക്കാരന്റെ‌ മുന്‌ഗണനകള്"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 #, fuzzy
@@ -2065,7 +2067,7 @@ msgstr "അടയാളവാക്ക്:"
 msgid "_Secure HTTP proxy:"
 msgstr "HTTP പകരക്കാരന്‍"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr ""
 
@@ -2122,15 +2124,26 @@ msgid ""
 "installed the \"gnome-themes\" package."
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2160,12 +2173,12 @@ msgstr "രംഗവിധാനത്തിന‌് പേര‌് ഉണ്�
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "രംഗവിധാനം"
 
@@ -2279,11 +2292,11 @@ msgstr "രംഗവിധാനം നാമം:"
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "പട്ടികകളും ഉപകരണങ്ങളും"
 
@@ -2359,7 +2372,6 @@ msgid "_Edit"
 msgstr "ചിട്ട"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "ശേഖരം"
 
@@ -2387,6 +2399,14 @@ msgstr "പുറത്ത് കടക്കുക"
 msgid "_Save"
 msgstr "സംരംക്ഷിക്കുക"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2395,23 +2415,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2454,14 +2474,35 @@ msgstr "തെരഞ്ഞെടുത്ത ജാലകള് ഒരിടവ�
 msgid "_Select windows when the mouse moves over them"
 msgstr ""
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "ജാലക പ്രവ‍ര്ത്തിക്കുക"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "ജാലകങ്ങള്"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "കീബോര്‍ഡ് മുന്ഗണനകള്"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "നാരിഴ"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "ഗ്നോം അനുരൂപമാക്കുന്ന ഉപകരണം"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2496,87 +2537,6 @@ msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം"
 msgid "View as Control Center"
 msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം: %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം : %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "കെട്ടുംമട്ടും"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "എഫ്.എസ്.എഫ് - ഇന്ത്യ <gnu@gnu.org.in>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "പണിയിട ഗുണഗണ പാലകന്."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം: %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "നാരിഴ"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം: %s"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr ""
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "ഈ പ്രയോഗത്തെക്കുറിച്ച്"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "നിന്ത്രണ കേന്ദ്രത്തിന്റെ അവലോകനം"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "കുറിപ്പ്"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "ഉള്ളടക്കം"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "സഹായം"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "ഗ്നോം അനുരൂപമാക്കുന്ന ഉപകരണം"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr ""
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 #, fuzzy
 msgid "Volume"
@@ -2674,7 +2634,7 @@ msgid ""
 "which is linked to the key (%s)"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2689,7 +2649,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2697,21 +2657,21 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2763,8 +2723,8 @@ msgstr "ഈ സംവാദം വീണ്ടും കാണിക്കുക
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr ""
 
@@ -2811,48 +2771,48 @@ msgstr "തിരച്ചിത്രം"
 msgid "Screen on which BGApplier is to draw"
 msgstr ""
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 #, fuzzy
 msgid "The sound file for this event does not exist."
 msgstr "നല്കിയിരിക്കുന്ന രചന നിലനില്ക്കുന്നില്ല."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
 "for a set of default sounds."
 msgstr ""
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr ""
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "സംഭവം"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 #, fuzzy
 msgid "Sound File"
 msgstr "ശബ്ദം"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 #, fuzzy
 msgid "_Sounds:"
 msgstr "ശബ്ദങ്ങള്"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 #, fuzzy
 msgid "Sound _file:"
 msgstr "ശബ്ദരചന തെരഞ്ഞെടുക്കുക"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 #, fuzzy
 msgid "Select Sound File"
 msgstr "ശബ്ദരചന തെരഞ്ഞെടുക്കുക"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "കേള്പ്പിക്കുക"
 
@@ -3121,29 +3081,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "കീബോര്‍ഡ് ബെല്‍"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
 #, fuzzy
-msgid "XKB keyboard layout"
+msgid "Keyboard layout"
 msgstr "കീബോര്‍ഡ് കുറക്കുവഴികള്"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
 #, fuzzy
-msgid "XKB keyboard model"
+msgid "Keyboard model"
 msgstr "കീബോര്‍ഡ് ബെല്‍"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
 #, fuzzy
-msgid "XKB options"
-msgstr "ബദലുകള്‌"
+msgid "Keyboard options"
+msgstr "കീബോര്‍ഡ് കുറക്കുവഴികള്"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "കീബോര്‍ഡ് കുറക്കുവഴികള്"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "കീബോര്‍ഡ് ബെല്‍"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr ""
@@ -3217,46 +3220,14 @@ msgid ""
 "Notification area'."
 msgstr ""
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "നാമം:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "തരം:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "വലിപ്പം:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "വിവരണം"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "ഈ പ്രയോഗത്തിന‍് സഹായം ലഭിക്കുക"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3324,34 +3295,48 @@ msgstr ""
 msgid "Whether to thumbnail Type1 fonts"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "നാമം:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "തരം:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "വലിപ്പം:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
 msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
 msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "വിവരണം"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
 msgstr ""
 
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം"
+
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
 msgstr ""
@@ -3379,27 +3364,18 @@ msgstr "അക്ഷരരുപം പ്രയോഗത്തില്‍വ�
 msgid "Themes"
 msgstr "പ്രമേയങ്ങള്"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr ""
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr ""
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr ""
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI കാലിക പ്രദ‍ര്ശനം"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr ""
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3433,6 +3409,127 @@ msgstr ""
 msgid "Whether to thumbnail themes"
 msgstr ""
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr ""
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "അക്ഷരരുപം പ്രയോഗത്തില്‍വരുത്തുക"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "സ്വതേയുള്ളതുപോലെയാക്കുക"
+
+#, fuzzy
+#~ msgid "Gnome Terminal"
+#~ msgstr "ടെ‍ര്മിനല്"
+
+#, fuzzy
+#~ msgid "C_ustom Editor"
+#~ msgstr "സജ്ജീകാരകന്‍"
+
+#, fuzzy
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "സഹായ ബ്രൌസ‍ര്"
+
+#, fuzzy
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "മൂകാഗ്രം"
+
+#, fuzzy
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "ഗാലിയന്‌ അന്വേഷണോപാധി"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "കല്പ്പനാസ്ഥാനത്ത് തുടങ്ങുക"
+
+#, fuzzy
+#~ msgid "This application can open _URIs"
+#~ msgstr "പ്രയോഗ ഐ ഡി നാമം"
+
+#, fuzzy
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "നാമാവലിയില് നിന്നും ഒരു പ്രയോഗം പ്രവ‍ര്ത്തിക്കാനായി തിരഞ്ഞെടുക്കുക"
+
+#, fuzzy
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "സഹായ ബ്രൌസ‍ര്"
+
+#, fuzzy
+#~ msgid "_Select a Terminal:"
+#~ msgstr "ചിഹ്നം തിരഞ്ഞെടുക്കുക:"
+
+#, fuzzy
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "ഗാലിയന്‌ അന്വേഷണോപാധി"
+
+#, fuzzy
+#~ msgid "_Select an Editor:"
+#~ msgstr "ചിഹ്നം തിരഞ്ഞെടുക്കുക:"
+
+#, fuzzy
+#~ msgid "Accessibility"
+#~ msgstr "ഉപയോഗക്ഷമത"
+
+#, fuzzy
+#~ msgid "Accessibility Settings"
+#~ msgstr "ഉപയോഗക്ഷമത"
+
+#~ msgid "Advanced"
+#~ msgstr "പുരോഗമിച്ച"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "ഉന്നതതല സജ്ജീകരണങ്ങള്"
+
+#, fuzzy
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "അനുരൂപമാക്കല്‍"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം : %s"
+
+#~ msgid "Layout"
+#~ msgstr "കെട്ടുംമട്ടും"
+
+#~ msgid "translator_credits"
+#~ msgstr "എഫ്.എസ്.എഫ് - ഇന്ത്യ <gnu@gnu.org.in>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "പണിയിട ഗുണഗണ പാലകന്."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം: %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "ഗ്നോം നിന്ത്രണ കേന്ദ്രം: %s"
+
+#~ msgid "About this application"
+#~ msgstr "ഈ പ്രയോഗത്തെക്കുറിച്ച്"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "നിന്ത്രണ കേന്ദ്രത്തിന്റെ അവലോകനം"
+
+#~ msgid "_About"
+#~ msgstr "കുറിപ്പ്"
+
+#~ msgid "_Contents"
+#~ msgstr "ഉള്ളടക്കം"
+
+#~ msgid "_Help"
+#~ msgstr "സഹായം"
+
+#, fuzzy
+#~ msgid "XKB options"
+#~ msgstr "ബദലുകള്‌"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI കാലിക പ്രദ‍ര്ശനം"
+
 #~ msgid "_Desktop shortcuts:"
 #~ msgstr "പണിയിട കുറക്കുവഴികള്:"
 
@@ -3591,10 +3688,6 @@ msgstr ""
 #~ msgstr "ചുവ‍ര്ച്ചിത്രം"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "കീബോര്‍ഡ് മുന്ഗണനകള്"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "ഉന്നതതല സജ്ജീകരണങ്ങള്"
 
@@ -3623,18 +3716,10 @@ msgstr ""
 #~ msgstr "ഇഷ്ട രംഗവിധാനം"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "പട്ടികയുടെയും ഉപകരണപ്പട്ടയുടെയും മുന്ഗണനകള്"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "വിവരണം:"
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "മൌസ് മുന്‌ഗണനകള് രേഖപ്പെടുത്തുക"
-
-#, fuzzy
 #~ msgid "_Ignore system configuration"
 #~ msgstr "അനുരൂപമാക്കല്‍"
 
@@ -3665,9 +3750,6 @@ msgstr ""
 #~ msgid "Default Help Browser"
 #~ msgstr "സഹായ ബ്രൌസ‍ര്"
 
-#~ msgid "C_ustom:"
-#~ msgstr "യഥേഷ്ടം:"
-
 #, fuzzy
 #~ msgid "_Off"
 #~ msgstr "അണയ്ക്കുക"
diff --git a/po/mn.po b/po/mn.po
index bfa7b8478..7b84dc129 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-03-10 16:54+0100\n"
 "Last-Translator: Sanlig Badral <badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -62,11 +62,11 @@ msgstr "_Дэлгэц дээрх гар"
 msgid "_Screenreader"
 msgstr "_Дэлгэц уншигч"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Туслах технолгийн дэмжилт"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Нэвтрэлтэд ГНОМЕ-н туслах технолгуудын дэмжилтийг нээх"
 
@@ -117,13 +117,13 @@ msgstr "Ажиллагааны тохируулгыг _импортлох"
 msgid "_Import"
 msgstr "_Оруулж ирэх"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Гар"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Гарын хялбар хандалтын тохируулга хийх"
 
@@ -336,11 +336,11 @@ msgstr "Цэгүүд/Секунд"
 msgid "seconds"
 msgstr "Секундүүд"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Ажлын тавцанын дэвсгэрийн тохиргоог өөрчилөх"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Ажлын тавцангийн дэвсгэр"
 
@@ -420,6 +420,13 @@ msgstr "Туурга цаас нэмэх"
 msgid "No Wallpaper"
 msgstr "Туурга цаасгүй"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -628,105 +635,15 @@ msgstr "Та нэгэн зураг сонгоно уу."
 msgid "_Select"
 msgstr "_Сонгох"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Эрхэмлэсэн х.программууд"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Та өөрийн стандарт х.программыг сонгоно уу"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Эпифани"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Галеон"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Энкомпасс"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Файрбөрд/ФайрФокс"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Мозилла/Нэтскапе 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Нэтскапе Коммуникатор"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Конкюрор"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M текст хөтөч"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Линкс Текст хөтлөгч"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Зүүн текст хөтлөгч"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Эволушон Майл Реадер"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Балса"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "КМайл"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Мозилла Майл"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Мутт"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "ГномеТерминал"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Стандарт КСТерминал"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "НКСтерм"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "РКСВТ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ЭТерм"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Энэ боловсруулагчийн хувьд нэр ба тушаалыг өгнө үү."
@@ -736,20 +653,23 @@ msgid "Add..."
 msgstr "Нэмэх..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Х_эрэглэгч тод. боловсруулагч"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Хэвшмэл"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Х_эрэглэгч тод. майл уншигч:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Хэвшмэл"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Х_эрэглэгч тод. Терминал:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Х_эрэглэгч тод. Вэб хөтлөгч:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Энэ х.программ _олон файл нээж чадна"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -796,6 +716,16 @@ msgid "Mail Reader"
 msgstr "Майл уншигч"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "_Терминалд ажиллуулах"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "_Терминалд ажиллуулах"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -803,92 +733,168 @@ msgstr ""
 "Та хүссэн цонхны менежерээ сонгоно уу. Та »Хэрэглэх« -г дарах ба "
 "ажиллахадхамгийн сайн нь гэж итгэх хэрэгтэй."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "_Терминалд ажиллуулах"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Терминал"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Текст боловсруулагч"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Энэ х.программ _URI -ууд нээж болно"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Энэ х.программ _олон файл нээж чадна"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Энэ х.программ _тушаалын мөрөнд (shell) ажиллах ёстой"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "»_Netscape Remote Control« ойлгох"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Энэ _боловсруулагчийг файл менежер дотор текст файл нээхэд хэрэглэх"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Вэб хөтлөгч"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Цонхны менежер"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Т_ушаал:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Нэр:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Онцлогууд..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "Майл уншигч _сонгох:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Сонгох"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Стандарт вэб хөтлөгч"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Эпифани"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Галеон"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Энкомпасс"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Файрбөрд/ФайрФокс"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Мозилла Майл"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Нэтскапе Коммуникатор"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Конкюрор"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M текст хөтөч"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Линкс Текст хөтлөгч"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Зүүн текст хөтлөгч"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Эволушон Майл Реадер"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Балса"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "КМайл"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "Терминал _сонгох:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "Вэб хөтлөгч _сонгох:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Мозилла Майл"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "Боловсруулагч _сонгох:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Мутт"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Хялбарчилал"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Стандарт терминал"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Хялбарчилалын тохируулга"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Терминал"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Өргөтгөсөн"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Стандарт КСТерминал"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Өргөтгөсөн тохируулга"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "НКСтерм"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "РКСВТ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "НКСтерм"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ЭТерм"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Дэлгэцийн нарийвчилал өөрчилөх"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Дэлгэцийн нарийвчилал"
 
@@ -983,7 +989,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Та энэ объектыг бүрмөсөн устгахдаа итгэлтэй байна уу?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Тодорхойлолт"
 
@@ -991,17 +997,27 @@ msgstr "Тодорхойлолт"
 msgid "Extensions"
 msgstr "Өргөтгөл"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Файлын төрөл ба программууд"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Та ямар программ тухайн төрлийн файлуудыг нээх эсвэл харахад хэрэглэхээ "
 "сонгоно уу."
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Файлын төрөл ба программууд"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Энд та тухайн файлын төрөлийг харах эсвэл нээхэд ямар программ хэрэглэхээ "
+"тогтооно уу"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Үйлдлүүд"
@@ -1092,6 +1108,7 @@ msgid "_Protocol:"
 msgstr "_Протоколл:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Устгах"
 
@@ -1099,16 +1116,6 @@ msgstr "_Устгах"
 msgid "_Viewer component:"
 msgstr "_Харагч бүрэлдхүүн:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Файлын төрөл ба программууд"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Энд та тухайн файлын төрөлийг харах эсвэл нээхэд ямар программ хэрэглэхээ "
-"тогтооно уу"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Файлын зэрэглэлийг засварлах"
@@ -1291,14 +1298,15 @@ msgid "Electronic mail transmission"
 msgstr "Электрон мэдээ дамжуулал (Э-Захиа)"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "GNOME-баримтжуулалт"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Бичиг"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Ажлын тавцанын бичгийг сонгох"
 
@@ -1517,29 +1525,29 @@ msgid "The type of accelerator."
 msgstr "Товчилуурын хослолын төрөл"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Хаагдсан"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Тодорхойгүй үйлдэл>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Ажлын тавцан"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Аудио"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Цонхны зохион байгуулалт"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1549,29 +1557,29 @@ msgstr ""
 " »%s« -д\n"
 "хэрэглэгджээ.\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Тохируулгын өгөгдлийн баазад шинэ товчилуурын хослолыг хадгалах үед алдаа "
 "гарлаа: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Тохируулгын өгөгдлийн баазаас товчилуурын хослолыг устгах үедгарлаа: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Үйлдэл"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Товчилуурын хослол"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Товчилуурын хослол"
 
@@ -1584,26 +1592,10 @@ msgstr ""
 "Та шинэ товчилуурын хослол өгнө үү, устгахын тулд Backspace-товчилуурыг "
 "дарна уу"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Тушаалуудад товчилуурын хослол оноох"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Тодорхойгүй түүчээ"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Модел"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "XKB гарын байрлал"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1773,10 +1765,35 @@ msgstr "_Ажлын интервал үргэлжилэх:"
 msgid "minutes"
 msgstr "Минут"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Тодорхойгүй түүчээ"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Модел"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "XKB гарын байрлал"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Өөрийн гарын тохируулга тогтоох"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Хулганы тохируулга хийх"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Тодорхойгүй түүчээ"
@@ -1941,20 +1958,21 @@ msgstr "_Хязгаар:"
 msgid "_Timeout:"
 msgstr "_Завсар:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Хулгана"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Хулганы тохируулга хийх"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Сүлжээ-итгэмжилэгч"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Сүлжээ-итгэмжилэгчийн тохируулга"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2000,8 +2018,9 @@ msgid "H_TTP proxy:"
 msgstr "_HTTP-итгэмжилэгч:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Сүлжээний итгэмжилэгчийн тохируулга"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Сүлжээ-итгэмжилэгчийн тохируулга"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2042,7 +2061,7 @@ msgstr "_Нууц үг:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Найдвартай HTTP-итгэмжилэгч:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Чимээг идэвхижүүлж үйлдлүүдтэй холбох"
 
@@ -2099,15 +2118,26 @@ msgstr ""
 "Таны системд загвар олдсонгүй. Энэ нь магад таны »Загвар тохируулга« эсвэл "
 "»gnome-themes« пакет зөв суугаагүй гэсэн үг."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Суулгах хэлбэр файлын байрлал алга"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Суулгах хэлбэр файлын байрлал хүчингүй"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2142,12 +2172,12 @@ msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
 # CHECK
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Ажлын тавцанын янз бүрийн хэсгүүдийн хувьд загвар тогтоох"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Загвар"
 
@@ -2261,11 +2291,11 @@ msgstr "Хэл_бэрийн нэр:"
 msgid "theme selection tree"
 msgstr "Загвар сонголтын мод"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Х.программийн багажны ба цэсний самбарын харагдалтыг тохируулах"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Цэс ба багажны самбар"
 
@@ -2334,7 +2364,6 @@ msgid "_Edit"
 msgstr "_Боловсруулах"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Файл"
 
@@ -2362,6 +2391,14 @@ msgstr "_Дуусгах"
 msgid "_Save"
 msgstr "Ха_дгалах"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2374,23 +2411,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Контрол"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Супер (Виндовс-товчилуур)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Мита"
 
@@ -2433,14 +2470,35 @@ msgstr "Идэвхижсэн цонх тодорхой хугацааны дар
 msgid "_Select windows when the mouse moves over them"
 msgstr "Хулганыг цонхон дээгүүр хөдөлгөхөд түүнийг _идэвхижүүлэх"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Цонхны тохируулга"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Цонх"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME-удирдах төв"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Ажлын тавцангийн дэвсгэрийн тохируулгууд"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Шүүлтүүр"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "GNOME-тохируулгын хэрэгсэл"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2475,90 +2533,6 @@ msgstr "Удирдах төвийн цэс"
 msgid "View as Control Center"
 msgstr "GNOME-удирдах төв : %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME-Удирдах төв: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Үзэмж"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Энэ Capplets -ын харагдалтад хэрэглэх үзэмж"
-
-# CHECK
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Лавлах объектын тохируулга диалог"
-
-# CHECK
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Тохируулга диалог-Лавлахыг энэ харагдалтаар харах"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Санлигийн Бадрал<badral@chinggis.com>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME-удирдах төв"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Ажлын тавцанын онцлог зохион байгуулагч."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME-удирдах төв : %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Шүүлтүүр"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "GNOME-удирдах төв : %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Nautilus ажиллаж байгаа ч Shell хэрэглэх."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Энэ программын тухай"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Удирдах төвийн тойм"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Тухай"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "А_гуулга"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Тусламж"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "GNOME-тохируулгын хэрэгсэл"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Nautilus ажиллаж байгаа ч Shell хэрэглэх."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Чангаруулалт:"
@@ -2664,7 +2638,7 @@ msgstr ""
 "(%s) -г ажиллуулж байхад алдаа ба\n"
 "тэр нь товчилуур (%s) -т холбогдсон"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2689,7 +2663,7 @@ msgstr ""
 "- <b>xprop -root | grep XKB</b>-н үр дүн\n"
 "- <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>-н үр дүн"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2701,22 +2675,22 @@ msgstr ""
 "Энгийн тохиргоо эсвэл хэрэглэх эсвэл XFree-н илүү шинэ хувилбар хэрэглэхийг "
 "оролдоно уу."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "%d дэлгэцийн тохиргоо\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, fuzzy, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2780,8 +2754,8 @@ msgstr "_Энэ мэдээг дахин бүү харуул"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr " %s дууны файл %s жишээгээр ачаалагдсангүй"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Хэрэглэгийн гэр лавлахыг илрүүлж чадсангүй"
 
@@ -2830,11 +2804,11 @@ msgstr "Дэлгэц"
 msgid "Screen on which BGApplier is to draw"
 msgstr "BGApplier зурагдах ёстой дэлгэц"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Энэ үйлдийн хувьд тогтоосон дууны файл алга."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2844,32 +2818,32 @@ msgstr ""
 "Та стандарт дуугаар авахыг хүсэж байвал \n"
 "»gnome-audio« пакетыг суулгана уу."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "%s файл хүчингүй wav файл байна"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Үйлдэл"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Аудио файл"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Дуунууд:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Дууны _файл:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Дууны файл сонгоно уу"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Тоглуулах"
 
@@ -3143,26 +3117,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "Тун удахгүй XKB тохиргоо gconf руу орж ирнэ (системийн тохиргооноос)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB гарын байрлал"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB гарын загвар"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB сонголтууд"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Гарын _загвар:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB гарын байрлал"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Гарын _загвар:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Товчилуурын хослол"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "ASAP системээс gconf дахь XKB тохиргоог дарах уу"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "Тун удахгүй XKB тохиргоо gconf руу орж ирнэ (системийн тохиргооноос)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB гарын байрлал"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB гарын загвар"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "Завсарлага _зөөх"
@@ -3239,46 +3261,14 @@ msgstr ""
 "дээр очиж хулганы баруун товшуураар »Самбар луу нэмэх -> Хэрэгсэл -> "
 "Сонордуулга муж« -г сонгож нэмж болно."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Чихний чимэг болсон аялгуу сайхан монгол хэл. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Нэр:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Загвар:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Төрөл:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Хэмжээ:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Хувилбар:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Зохиогчийн эрх:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Тодорхойлолт:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Хэрэглээний бичгээр хэрэглэх"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Бичгийн хам цэсийн элементүүд"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Та өөрийн стандарт х.программыг сонгоно уу"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3353,33 +3343,47 @@ msgstr "TrueType-бичгүүдийг бяцхан зураг загварээр
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Type1-бичгүүдийг бяцхан зураг загварээр харуулах эсэх?"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fontilus -д зориулсан хам цэсийн үйлдвэр"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Чихний чимэг болсон аялгуу сайхан монгол хэл. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus-хам цэс"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Нэр:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus-хам цэсийн үйлдвэр"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Загвар:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Nautilus-хам цэсийн бичлэгүүдийн бичгүүд"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Төрөл:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Хэрэглээний бичгээр хэрэглэх"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Хэмжээ:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Хувилбар:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Агуулга харуулалтын бүрэлдэхүүний загварын шинж чанар"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Зохиогчийн эрх:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Загварийн тодруулга харуулах Themus загвар"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Тодорхойлолт:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME-удирдах төв"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3409,27 +3413,18 @@ msgstr "_Бичгийг хэрэглэх"
 msgid "Themes"
 msgstr "Загвар"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Цонхны агуулгын загвар"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Цонхны хүрээний загвар"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Эмблемийн загвар"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Одоогоор URI харагдаж байна"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "СБЖЭӨҮЯ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Хэрвээ утга үнэн бол суулгасан загварууд мини харагдана."
@@ -3464,6 +3459,154 @@ msgstr "Суулгасан загваруудыг мини харах эсэх"
 msgid "Whether to thumbnail themes"
 msgstr "Загваруудыг мини харах эсэх"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "СБЖЭӨҮЯ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Бичгийг хэрэглэх"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "_Стандартыг сэргээх"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Мозилла/Нэтскапе 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "ГномеТерминал"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Х_эрэглэгч тод. боловсруулагч"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Х_эрэглэгч тод. майл уншигч:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Х_эрэглэгч тод. Терминал:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Х_эрэглэгч тод. Вэб хөтлөгч:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "_Терминалд ажиллуулах"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Энэ х.программ _URI -ууд нээж болно"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Энэ х.программ _тушаалын мөрөнд (shell) ажиллах ёстой"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "Майл уншигч _сонгох:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "Терминал _сонгох:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "Вэб хөтлөгч _сонгох:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "Боловсруулагч _сонгох:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Хялбарчилал"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Хялбарчилалын тохируулга"
+
+#~ msgid "Advanced"
+#~ msgstr "Өргөтгөсөн"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Өргөтгөсөн тохируулга"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Сүлжээний итгэмжилэгчийн тохируулга"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME-Удирдах төв: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Үзэмж"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Энэ Capplets -ын харагдалтад хэрэглэх үзэмж"
+
+# CHECK
+#~ msgid "Capplet directory object"
+#~ msgstr "Лавлах объектын тохируулга диалог"
+
+# CHECK
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Тохируулга диалог-Лавлахыг энэ харагдалтаар харах"
+
+#~ msgid "translator_credits"
+#~ msgstr "Санлигийн Бадрал<badral@chinggis.com>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Ажлын тавцанын онцлог зохион байгуулагч."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME-удирдах төв : %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "GNOME-удирдах төв : %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Nautilus ажиллаж байгаа ч Shell хэрэглэх."
+
+#~ msgid "About this application"
+#~ msgstr "Энэ программын тухай"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Удирдах төвийн тойм"
+
+#~ msgid "_About"
+#~ msgstr "_Тухай"
+
+#~ msgid "_Contents"
+#~ msgstr "А_гуулга"
+
+#~ msgid "_Help"
+#~ msgstr "_Тусламж"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Nautilus ажиллаж байгаа ч Shell хэрэглэх."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB сонголтууд"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Бичгийн хам цэсийн элементүүд"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fontilus -д зориулсан хам цэсийн үйлдвэр"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus-хам цэс"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus-хам цэсийн үйлдвэр"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Nautilus-хам цэсийн бичлэгүүдийн бичгүүд"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Агуулга харуулалтын бүрэлдэхүүний загварын шинж чанар"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Загварийн тодруулга харуулах Themus загвар"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "Одоогоор URI харагдаж байна"
+
 #~ msgid "GNOME Default"
 #~ msgstr "ГНОМЕ стандарт"
 
diff --git a/po/ms.po b/po/ms.po
index 921e0fa40..923bb31a4 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-02-23 12:12+0730\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@my-penguin.org>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sourceforge.org>\n"
@@ -57,11 +57,11 @@ msgstr "Papan kekunci pada-_skrin"
 msgid "_Screenreader"
 msgstr "Pembaca _skrin"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Sokongan Teknologi Pertolongan"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Hidupkan sokongan bagi teknologi pertolongan GNOME pasa logmasuk"
 
@@ -108,13 +108,13 @@ msgstr "Import Fail Tetapan Keupayaan"
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Papan Kekunci"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Tetapkan ciri-ciri Kebolehcapaian Papan Kekunci"
 
@@ -323,11 +323,11 @@ msgstr "piksel/saat"
 msgid "seconds"
 msgstr "saat"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Tukar tetapan latar belakang desktop anda"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Latar Belakang Desktop"
 
@@ -408,6 +408,13 @@ msgstr "Tambah Kertas Dinding"
 msgid "No Wallpaper"
 msgstr "Tiada Kertas Dinding"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 # lom
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
@@ -619,105 +626,15 @@ msgstr "Sila pilih satu imej."
 msgid "_Select"
 msgstr "di_lepaskan"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Aplikasi Digemari"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Pilih aplikasi default anda"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Pelungsur Teks W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Pelungsur Teks Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Pelungsur Teks Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Pembaca Emel Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mel Mozilla"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Terminal GNOME"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "XTerminal Piawai"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Sila nyatakan nama dan arahan bagi editor ini."
@@ -727,20 +644,23 @@ msgid "Add..."
 msgstr "Tambah..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Editor _Sendiri"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Tersendiri"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Pembaca Emel _Sendiri:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Tersendiri"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terminal _Sendiri:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Pelayar Web _Sendiri:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Aplikasi ini boleh membuka perl_bagai fail"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -787,6 +707,16 @@ msgid "Mail Reader"
 msgstr "Pembaca Mel"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Laksana di _Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Laksana di _Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -794,93 +724,168 @@ msgstr ""
 "Pilih pengurus tetingkap yang anda mahu.  Anda dikehendaki menekan apply, "
 "goyangkan kayu silap mata, dan lakukan tarian silap mata untuk menjayakannya"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Bermula dalam T_erminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Editor Teks"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Aplikasi ini boleh membuka _URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Aplikasi ini boleh membuka perl_bagai fail"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Aplikasi ini perlu dilaksanakan pada _shell"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Memahami Kawalan Remote _Netscape"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Guna _editor ini untuk membuka fail teks pada pengurus fail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Pelayar Web"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Pengurus Tetingkap"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_Arahan:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Ciri-ciri..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Pilih Pembaca Emel:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "di_lepaskan"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Pilih Terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Pelayar Web Derfault"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Pilih Pelayar Web:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Pilih Editor:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-# cadangan lenny/kleo
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Kebolehcapaian"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mel Mozilla"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Pelungsur Teks W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Pelungsur Teks Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Pelungsur Teks Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Pembaca Emel Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mel Mozilla"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Terminal Default"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "XTerminal Piawai"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Tetapan Kebolehcapaian"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Lanjutan"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Tetapan Lanjutan"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Tukar resolusi skrin"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Resolusi Skrin"
 
@@ -969,7 +974,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Huraian"
 
@@ -977,15 +982,24 @@ msgstr "Huraian"
 msgid "Extensions"
 msgstr "Penghujungan"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Jenis Fail dan Program"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "Nyatakan program manadigunakan untuk membuka/melihat setiap jenis fail"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Jenis fail dan program"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Nyatakan program mana digunakan untuk membuka atau melihat setiap jenis fail"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Aksi"
@@ -1076,6 +1090,7 @@ msgid "_Protocol:"
 msgstr "_Protokol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Buang"
 
@@ -1083,15 +1098,6 @@ msgstr "_Buang"
 msgid "_Viewer component:"
 msgstr "Komponen _Pelihat"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Jenis fail dan program"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Nyatakan program mana digunakan untuk membuka atau melihat setiap jenis fail"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Edit ketegori fail"
@@ -1272,14 +1278,15 @@ msgid "Electronic mail transmission"
 msgstr "Penghantaran mel elektronik"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Dokumentasi Gnome"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Font"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Pilih font bagi desktop"
 
@@ -1478,29 +1485,29 @@ msgid "The type of accelerator."
 msgstr "Jenis pemecut ."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Dimatikan"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Aksi Tidak diketahui>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Desktop"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Bunyi"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Pengurusan Tetingkap"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1509,26 +1516,26 @@ msgstr ""
 "Pintasan  \"%s\" telah digunakan oleh:\n"
 "\"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Ralat menetapkan pemecut baru pada pangkalandata konfigurasi: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Ralat membuang tetapan pemecut  pada pangkalandata konfigurasi: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Aksi"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Pintasan"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Pintasan Papan Kekunci"
 
@@ -1539,26 +1546,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "Taip pemecut baru, atau tekan Backspace untuk terangkan"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Umpuk kekunci pintasan pada arahan"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Kursor tidak diketahui"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Model"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "Susunatur papan kekunci XKB"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1730,10 +1721,35 @@ msgstr "_Selangmasa kerja bertahan"
 msgid "minutes"
 msgstr "minit"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Kursor tidak diketahui"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Model"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "Susunatur papan kekunci XKB"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Tetapkan keutamaan papan kekunci"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Tetapkan keutamaan tetikus"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Kursor tidak diketahui"
@@ -1898,20 +1914,21 @@ msgstr "_Treshold:"
 msgid "_Timeout:"
 msgstr "_Hadmasa:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Tetikus"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Tetapkan keutamaan tetikus"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Proksi Rangkaian"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Keutamaan proksi rangkaian"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1957,8 +1974,9 @@ msgid "H_TTP proxy:"
 msgstr "Proksi H_TTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Konfigurasi Proksi Rangkaian"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Keutamaan proksi rangkaian"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -1999,7 +2017,7 @@ msgstr "_Katalaluan:"
 msgid "_Secure HTTP proxy:"
 msgstr "Proksi HTTP _Selamat:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Hidupkan bunyi dan bunyi dikaitkan dengan acara"
 
@@ -2057,15 +2075,26 @@ msgstr ""
 "\"  anda tak dipasang dengan betul. atau anda tak memasang pakej \"gnome-"
 "themes\""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Tiada lokasi fail tema dinyatakan untuk dipasang"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Lokasi fail tema yg dinyatakan untuk dipasang adalah tak sah"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2097,12 +2126,12 @@ msgstr "Nama tema mesti ada"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "PIlih tema bagi pelbagai bahagian pada dekstop"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2215,11 +2244,11 @@ msgstr "Nama _Tema: "
 msgid "theme selection tree"
 msgstr "Pepohon pemilihan tema"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Personalisasi penampilan toolbar dan bar menu pada aplikasi"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menu & Toolbar"
 
@@ -2288,7 +2317,6 @@ msgid "_Edit"
 msgstr "_Edit"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fail"
 
@@ -2316,6 +2344,14 @@ msgstr "_Keluar"
 msgid "_Save"
 msgstr "_Simpan"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2327,23 +2363,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Kawalan"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hiper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (atau \"Logo Windows\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2387,14 +2423,35 @@ msgstr "_Angkat tetingkap dipilih selepas satu selangmasa"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Pilih tetingkap bila tetikus di atasnya"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Ciri-ciri Tetingkap"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Tetingkap"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Pusat Kawalan GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Keutamaan Latar Belakang"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Tapisan"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Radas Konfigurasi GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2429,88 +2486,6 @@ msgstr "Menu Pusat Kawalan "
 msgid "View as Control Center"
 msgstr "Pusat Kawalan Gnome : %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Pusat Kawalan GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Susunatur"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Susunatur yang akan digunakan untuk melihat kaplet ini"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Objek direktori kaplet"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Direktori kaplet yang paparan ini lihat"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr " boh nama khai, boh nama sebol lagi siapa ek ?"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Pusat Kawalan GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Pengurus ciri-ciri desktop"
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Pusat Kawalan Gnome : %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Tapisan"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "Pusat Kawalan Gnome : %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Guna shell walaupun semasa nautilus terlaksana."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Perihal aplikasi ini"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Gambaran pusat kawalan"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Perihal"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Kandungan"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Bantuan"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Radas Konfigurasi GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Guna shell walaupun semasa nautilus terlaksana."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volum"
@@ -2611,7 +2586,7 @@ msgstr ""
 "Ralat bila cuba melaksanakan (%s)\n"
 "dimana ianya dipautkan ke kekunci (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2626,7 +2601,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2638,22 +2613,22 @@ msgstr ""
 "Sila cuba menggunakan konfigurasi ringkas atau dapatkan versi terkini "
 "perisian XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Tetapan Skrin %d\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2713,8 +2688,8 @@ msgstr "_Jangan papar mesej ini lagi"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Tak dapat memuatkan fail bunyi %s sebagai contoh %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Tak dapat menentukan direktori rumah pengguna"
 
@@ -2764,11 +2739,11 @@ msgstr "Skrin"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Skrin dimana BGAplier akan lukis"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Fail bunyi untuk acara ini tidak wujud."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2778,32 +2753,32 @@ msgstr ""
 "Anda juga boleh pasang pakej gnome-audio\n"
 "untuk menetapkan bunyi default."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Fail %s adalah fail wav yang tidak sah"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Acara"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Fail Bunyi"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Bunyi:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Fail bunyi:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Pilih Fail Bunyi"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Main"
 
@@ -3066,26 +3041,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Susunatur papan kekunci XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Model papan kekunci XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Opsyen XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Model papan kekunci:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Susunatur papan kekunci XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Model papan kekunci:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Pintasan Papan Kekunci"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
+msgstr "Tetapan XKB pada gconf akan ditindih drpd sistem secepat mungkin"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
 msgstr "Tetapan XKB pada gconf akan ditindih drpd sistem secepat mungkin"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Susunatur papan kekunci XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Model papan kekunci XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Tangguh rehat"
@@ -3158,46 +3181,14 @@ msgid ""
 "Notification area'."
 msgstr ""
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Seekor arnab memakan kangkung bersama tiong. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nama:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Gaya:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Jenis:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Saiz:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versi:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "hakcipta:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Keterangan:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Tetapkan sebagai Font Aplikasi"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Item menu konteks font"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Pilih aplikasi default anda"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3265,33 +3256,47 @@ msgstr ""
 msgid "Whether to thumbnail Type1 fonts"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Kilang bagi menu konteks nautilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Seekor arnab memakan kangkung bersama tiong. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Menu konteks Fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nama:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Kilang menu konteks Fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Gaya:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Kemasukan menu konteks Nautilus bagi font"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Jenis:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Tetapkan sebagai Font Aplikasi"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Saiz:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versi:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponen paparan kandungan Ciri-ciri Tema"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "hakcipta:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Paparan Ciri-ciri Tema Themus"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Keterangan:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Pusat Kawalan GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3320,27 +3325,18 @@ msgstr "Ter_apkan font"
 msgid "Themes"
 msgstr "Tema"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Tema Kawalan"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Tema sempadan tetingkap"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Tema ikon"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI yang dipaparkan"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Jika ditetapkan, tema dipasang akan di'thumbnail'kan."
@@ -3378,6 +3374,153 @@ msgstr "Samada untuk meng'thumbnail'kan tema dipasang"
 msgid "Whether to thumbnail themes"
 msgstr "Samada untuk meng'thumbnail'kan tema"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Ter_apkan font"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Ulangtetap ke de_fault"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminal GNOME"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Editor _Sendiri"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Pembaca Emel _Sendiri:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terminal _Sendiri:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Pelayar Web _Sendiri:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Bermula dalam T_erminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Aplikasi ini boleh membuka _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Aplikasi ini perlu dilaksanakan pada _shell"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Pilih Pembaca Emel:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Pilih Terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Pilih Pelayar Web:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Pilih Editor:"
+
+# cadangan lenny/kleo
+#~ msgid "Accessibility"
+#~ msgstr "Kebolehcapaian"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Tetapan Kebolehcapaian"
+
+#~ msgid "Advanced"
+#~ msgstr "Lanjutan"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Tetapan Lanjutan"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Konfigurasi Proksi Rangkaian"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Pusat Kawalan GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Susunatur"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Susunatur yang akan digunakan untuk melihat kaplet ini"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Objek direktori kaplet"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Direktori kaplet yang paparan ini lihat"
+
+#~ msgid "translator_credits"
+#~ msgstr " boh nama khai, boh nama sebol lagi siapa ek ?"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Pengurus ciri-ciri desktop"
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Pusat Kawalan Gnome : %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "Pusat Kawalan Gnome : %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Guna shell walaupun semasa nautilus terlaksana."
+
+#~ msgid "About this application"
+#~ msgstr "Perihal aplikasi ini"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Gambaran pusat kawalan"
+
+#~ msgid "_About"
+#~ msgstr "_Perihal"
+
+#~ msgid "_Contents"
+#~ msgstr "_Kandungan"
+
+#~ msgid "_Help"
+#~ msgstr "_Bantuan"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Guna shell walaupun semasa nautilus terlaksana."
+
+#~ msgid "XKB options"
+#~ msgstr "Opsyen XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Item menu konteks font"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Kilang bagi menu konteks nautilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menu konteks Fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Kilang menu konteks Fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Kemasukan menu konteks Nautilus bagi font"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponen paparan kandungan Ciri-ciri Tema"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Paparan Ciri-ciri Tema Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI yang dipaparkan"
+
 #~ msgid "GNOME Default"
 #~ msgstr "Default GNOME"
 
diff --git a/po/nb.po b/po/nb.po
index f32de973d..7fbe928e5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-05 23:01+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -59,11 +59,11 @@ msgstr "_Tastatur på skjermen"
 msgid "_Screenreader"
 msgstr "_Skjermleser"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Støtte for hjelpefunksjoner"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Aktiver støtte for GNOME hjelpefunksjoner ved pålogging"
 
@@ -114,13 +114,13 @@ msgstr "Importer fil med innstillinger for funksjoner"
 msgid "_Import"
 msgstr "_Importer"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Brukervalg for tilgjengelighet for tastatur"
 
@@ -332,11 +332,11 @@ msgstr "piksler per sekund"
 msgid "seconds"
 msgstr "sekunder"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Endre dine innstillinger for skrivebordsbakgrunn"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Skrivebordsbakgrunn"
 
@@ -415,6 +415,13 @@ msgstr "Legg til bakgrunn"
 msgid "No Wallpaper"
 msgstr "Ingen bakgrunn"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -626,105 +633,15 @@ msgstr "Vennligst velg et bilde."
 msgid "_Select"
 msgstr "_Velg"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Foretrukne applikasjoner"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Velg dine forvalgte applikasjoner"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M tekstbasert nettleser"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx tekstbasert nettleser"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links tekstbasert nettleser"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution e-postleser"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla e-post"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "GNOME terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Standard XTerminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr ""
@@ -735,20 +652,23 @@ msgid "Add..."
 msgstr "Legg til..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "E_gendefinert redigeringsprogram:"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Egendefinert"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "E_gendefinert e-postleser:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Egendefinert"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "E_gendefinert terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "E_gendefinert nettleser:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Denne applikasjonen kan åpne _flere filer"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -795,6 +715,16 @@ msgid "Mail Reader"
 msgstr "E-postleser"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Kjør i _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Kjør i _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -802,93 +732,169 @@ msgstr ""
 "Velg vindushåndtereren du ønsker. Du må velge «Bruk», vifte med den magiske "
 "staven, og utføre den magiske dansen for at dette skal virke."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Start i t_erminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Tekstredigerer"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Denne applikasjonen kan åpne _URIer"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Denne applikasjonen kan åpne _flere filer"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Denne applikasjonen må kjøre i et _skall"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Forstår _Netscape Remote Control"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Bruk dette r_edigeringsprogrammet til å åpne tekstfiler fra filhåndtereren"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Nettleser"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Vindushåndterer"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Ko_mmando:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "E_genskaper..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Velg en e-postleser:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Velg"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Velg en terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Standard nettleser"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Velg en nettleser:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Velg en tekstredigerer:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Tilgjengelighet"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Innstillinger for tilgjengelighet"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Avansert"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Avanserte innstillinger"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla e-post"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M tekstbasert nettleser"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx tekstbasert nettleser"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links tekstbasert nettleser"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution e-postleser"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla e-post"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Forvalgt terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Standard XTerminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Endre oppløsning for skjermen"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Skjermoppløsning"
 
@@ -979,7 +985,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Er du sikker på at du vil slette denne oppføringen permanent?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -987,16 +993,26 @@ msgstr "Beskrivelse"
 msgid "Extensions"
 msgstr "Filtyper"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Filtyper og programmer"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Oppgi hvilke programmer som skal brukes for å åpne eller vise hver filtype"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Filtyper og programmer"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Spesifiser hvilke programmer som skal brukes for å åpne eller vise hver "
+"filtype"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Handlinger"
@@ -1087,6 +1103,7 @@ msgid "_Protocol:"
 msgstr "_Protokoll:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -1094,16 +1111,6 @@ msgstr "Fje_rn"
 msgid "_Viewer component:"
 msgstr "_Visningskomponent:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Filtyper og programmer"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Spesifiser hvilke programmer som skal brukes for å åpne eller vise hver "
-"filtype"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Rediger filkategori"
@@ -1285,14 +1292,15 @@ msgid "Electronic mail transmission"
 msgstr "Overføring av elektronisk post"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "GNOME dokumentasjon"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Skrift"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Velg skrifter for skrivebordet"
 
@@ -1496,29 +1504,29 @@ msgid "The type of accelerator."
 msgstr "Type hurtigtast."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Slått av"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Ukjent handling>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Lyd"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Vindushåndtering"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1527,26 +1535,26 @@ msgstr ""
 "Snarveien «%s» er allerede brukt for:\n"
 " «%s»\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Feil under setting av ny snarvei i konfigurasjonsdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Feil under fjerning av snarveitast i konfigurasjonsdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Handling"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Snarvei"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarveier"
 
@@ -1558,23 +1566,10 @@ msgstr ""
 "Klikk på tilhørende rad og skriv inn en ny hurtigtast eller trykk slett for "
 "å fjerne."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Tilegn snarveitaster til kommandoer"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modeller"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Forhåndsvisning av tastaturutforming"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1742,10 +1737,31 @@ msgstr "_Arbeidsintervallet varer:"
 msgid "minutes"
 msgstr "minutter"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modeller"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Forhåndsvisning av tastaturutforming"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Sett dine brukervalg for tastatur"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr "Språk og kultur"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+msgid "Set your language and culture preferences"
+msgstr "Sett dine brukervalg for språk og kultur"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Ukjent markør"
@@ -1910,20 +1926,21 @@ msgstr "_Terskel:"
 msgid "_Timeout:"
 msgstr "_Tidsavbrudd:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Mus"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Sett dine brukervalg for mus"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Nettverksproxy"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Brukervalg for nettverksproxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1967,8 +1984,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP-proxy:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Konfigurasjon av nettverksproxy"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Brukervalg for nettverksproxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2006,7 +2024,7 @@ msgstr "_Passord:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Aktiver lyd og tilegn lyder til hendelser"
 
@@ -2064,15 +2082,26 @@ msgstr ""
 "«Brukervalg for tema» ikke er korrekt installert, eller at du ikke har "
 "installert pakken «gnome-themes»."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Ingen lokasjon oppgitt for installasjon av temafil"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Ugyldig lokasjon for installasjon av temafil"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2106,12 +2135,12 @@ msgstr "Navn på tema må være oppgitt"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Temaet eksisterer allerede. Vil du erstatte det?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Velg tema for forskjellige deler av skrivebordet"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2223,11 +2252,11 @@ msgstr "_Temanavn:"
 msgid "theme selection tree"
 msgstr "tre for temavalg"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Tilpass utseendet på verktøylinjer og menylinjer i applikasjoner"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menyer og verktøylinjer"
 
@@ -2296,7 +2325,6 @@ msgid "_Edit"
 msgstr "R_ediger"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fil"
 
@@ -2324,6 +2352,14 @@ msgstr "A_vslutt"
 msgid "_Save"
 msgstr "_Lagre"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2335,23 +2371,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Kontroll"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (eller «Windows-tast»)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2391,14 +2427,34 @@ msgstr "_Hev valgte vinduer etter en pause"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Aktiver vinduer når musen beveger seg over dem"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Egenskaper for vindu"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Vinduer"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME Kontrollsenter"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Brukervalg for bakgrunn"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Andre"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Konfigurasjonsverktøy for GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Kontrollsenter"
@@ -2427,85 +2483,6 @@ msgstr "Fabrikk for kontrollsenter-visning"
 msgid "View as Control Center"
 msgstr "Vis som kontrollsenter"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME Kontrollsenter: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Utseende"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Utseende som skal brukes for denne visningen av brukervalg"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Katalogobjekt for brukervalg"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Brukervalg-katalog som denne visningen viser"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Kjartan Maraas <kmaraas@gnome.org>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME Kontrollsenter"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Håndtering av egenskaper for skrivebord."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME Kontrollsenter: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Andre"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "GNOME kontrollsenter"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Bruk nautilus hvis den kjører."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Om denne applikasjonen"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Oversikt over kontrollsenteret"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Om"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Innhold"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Konfigurasjonsverktøy for GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Bruk skall selv om nautilus kjører."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volum"
@@ -2613,7 +2590,7 @@ msgstr ""
 "Feil under forsøk på å kjøre (%s)\n"
 "som er bundet til tast (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2638,7 +2615,7 @@ msgstr ""
 "- utskrift av <b>xprop -root | grep XKB</b>\n"
 "- utskrift av <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2650,7 +2627,7 @@ msgstr ""
 "Prøv å bruke enklere konfigurasjoner eller en nyere versjon av XFree-"
 "programvaren."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2658,15 +2635,15 @@ msgstr ""
 "Tastaturinnstilling for X er forskjellig fra innstillingene i GNOME. Hvilket "
 "sett vil du bruke?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Bruk innstillinger fra X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Bruk innstillinger fra GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2731,8 +2708,8 @@ msgstr "_Ikke vis denne meldingen igjen"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Kunne ikke laste lydfil %s som sample %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Kan ikke bestemme brukers hjemmekatalog"
 
@@ -2781,11 +2758,11 @@ msgstr "Skjerm"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Skjerm hvor BGApplier skal tegne"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Lydfilen for denne hendelsen eksisterer ikke."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2795,32 +2772,32 @@ msgstr ""
 "Du må kanskje installere gnome-audio pakken\n"
 "for å få et forvalgt sett med lyder."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Filen %s er ikke en gyldig wav-fil"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Hendelse"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Lydfil"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Lyder:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Lyd_fil:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Velg lydfil"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "S_pill"
 
@@ -3080,27 +3057,75 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Snart vil XKB-innstillinger i gconf bli overstyrt (fra systemkonfigurasjonen)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB-tastaturutforming"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB tastaturmodell"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB-alternativer"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Tastatur_modell:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB-tastaturutforming"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Tastatur_modell:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Tastatursnarveier"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "XKB-innstillinger i gconf overstyres fra systemet ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Snart vil XKB-innstillinger i gconf bli overstyrt (fra systemkonfigurasjonen)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB-tastaturutforming"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB tastaturmodell"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Utsett pause"
@@ -3176,46 +3201,14 @@ msgstr ""
 "høyreklikke på panelet og velge «Legg til på panelet -> Verktøy -> "
 "Varslingsområde»."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Den raske brune reven hopper over den late hunden. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Navn:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stil:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Type:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Størrelse:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versjon:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Opphavsrett:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "bruk: %s skriftfil\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Sett som skrift for applikasjoner"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Oppføringer i skriftens kontekstmeny"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Velg dine forvalgte applikasjoner"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3291,33 +3284,47 @@ msgstr "Om det skal vises miniatyrer av TrueType-skrifter"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Om det skal vises miniatyrer av Type1-skrifter"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Factory for fontilus kontekstmeny"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Den raske brune reven hopper over den late hunden. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus kontekstmeny"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Navn:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Factory for fontilus kontekstmeny"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stil:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Kontekstmenyoppføringer for skrifter i Nautilus"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Type:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Sett som skrift for applikasjoner"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Størrelse:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versjon:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Opphavsrett:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponent for innholdsvisning for temaegenskaper"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "bruk: %s skriftfil\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus visning for egenskaper for tema"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME Kontrollsenter"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3347,27 +3354,18 @@ msgstr "Bruk _skrift"
 msgid "Themes"
 msgstr "Tema"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Kontroller tema"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Tema for vinduskant"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikontema"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI som vises nå"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDÆØÅ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3405,6 +3403,150 @@ msgstr "Om miniatyrer for installerte tema skal brukes"
 msgid "Whether to thumbnail themes"
 msgstr "Om miniatyrer for tema skal brukes"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDÆØÅ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Bruk _skrift"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Sett tilbake til _utgangsverdier"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "GNOME terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "E_gendefinert redigeringsprogram:"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "E_gendefinert e-postleser:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "E_gendefinert terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "E_gendefinert nettleser:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Start i t_erminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Denne applikasjonen kan åpne _URIer"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Denne applikasjonen må kjøre i et _skall"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Velg en e-postleser:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Velg en terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Velg en nettleser:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Velg en tekstredigerer:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Tilgjengelighet"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Innstillinger for tilgjengelighet"
+
+#~ msgid "Advanced"
+#~ msgstr "Avansert"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Avanserte innstillinger"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Konfigurasjon av nettverksproxy"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME Kontrollsenter: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Utseende"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Utseende som skal brukes for denne visningen av brukervalg"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Katalogobjekt for brukervalg"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Brukervalg-katalog som denne visningen viser"
+
+#~ msgid "translator_credits"
+#~ msgstr "Kjartan Maraas <kmaraas@gnome.org>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Håndtering av egenskaper for skrivebord."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME Kontrollsenter: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "GNOME kontrollsenter"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Bruk nautilus hvis den kjører."
+
+#~ msgid "About this application"
+#~ msgstr "Om denne applikasjonen"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Oversikt over kontrollsenteret"
+
+#~ msgid "_About"
+#~ msgstr "_Om"
+
+#~ msgid "_Contents"
+#~ msgstr "_Innhold"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjelp"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Bruk skall selv om nautilus kjører."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB-alternativer"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Oppføringer i skriftens kontekstmeny"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Factory for fontilus kontekstmeny"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus kontekstmeny"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Factory for fontilus kontekstmeny"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Kontekstmenyoppføringer for skrifter i Nautilus"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponent for innholdsvisning for temaegenskaper"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus visning for egenskaper for tema"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI som vises nå"
+
 #~ msgid "Failed to open file '%s': %s"
 #~ msgstr "Kunne ikke åpne fil «%s»: %s"
 
@@ -3604,9 +3746,6 @@ msgstr "Om miniatyrer for tema skal brukes"
 #~ msgid "Desktop Wallpaper"
 #~ msgstr "Skrivebordsbakgrunn"
 
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Brukervalg for bakgrunn"
-
 #~ msgid "Show"
 #~ msgstr "Vis"
 
@@ -3711,9 +3850,3 @@ msgstr "Om miniatyrer for tema skal brukes"
 
 #~ msgid "_Region:"
 #~ msgstr "_Region:"
-
-#~ msgid "Language and Culture"
-#~ msgstr "Språk og kultur"
-
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Sett dine brukervalg for språk og kultur"
diff --git a/po/nl.po b/po/nl.po
index 692b054e6..b372e63bf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-05 22:46+0100\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-06 01:22+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -436,6 +436,13 @@ msgstr "Achtergrond toevoegen"
 msgid "No Wallpaper"
 msgstr "Geen achtergrond"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -1953,7 +1960,8 @@ msgid "Network Proxy"
 msgstr "Netwerk-proxy"
 
 #: capplets/network/gnome-network-preferences.desktop.in.in.h:2
-msgid "Network proxy preferences"
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Netwerkproxy-voorkeuren"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2112,8 +2120,8 @@ msgid ""
 "Insufficient permissions to install the theme in:\n"
 "%s"
 msgstr ""
-"Rechten ontoereikend om het thema te installeren in:\n "
-"%s"
+"Rechten ontoereikend om het thema te installeren in:\n"
+" %s"
 
 #: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
@@ -2448,7 +2456,8 @@ msgid "_Select windows when the mouse moves over them"
 msgstr "Vensters _selecteren wanneer de muis eroverheen beweegt"
 
 #: capplets/windows/window-properties.desktop.in.in.h:1
-msgid "Window Properties"
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Venstereigenschappen"
 
 #: capplets/windows/window-properties.desktop.in.in.h:2
@@ -3085,30 +3094,78 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Zeer binnenkort worden XKB instellingen in gconf tenietgedaan (vanuit de "
-"systeemconfiguratie)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB-toetsenbordindeling"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB-toetsenbordmodel"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB-opties"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Toetsenbord_model:"
 
-# ASAP zeer binnenkort
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB-toetsenbordindeling"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Toetsenbord_model:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Sneltoetsen"
+
+# ASAP zeer binnenkort
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "XKB-instellingen in gconf zullen z.s.m. worden tenietgedaan door het systeem"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Zeer binnenkort worden XKB instellingen in gconf tenietgedaan (vanuit de "
+"systeemconfiguratie)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB-toetsenbordindeling"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB-toetsenbordmodel"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Pauze uitstellen"
@@ -3269,39 +3326,39 @@ msgstr "Of TrueType-lettertypes een miniatuur moeten krijgen"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Of Type1-lettertypes een miniatuur moeten krijgen"
 
-#: vfs-methods/fontilus/font-view.c:126
+#: vfs-methods/fontilus/font-view.c:125
 msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 msgstr "Pa's wijze lynx bezag vroom het fikse aquaduct. 0123456789"
 
-#: vfs-methods/fontilus/font-view.c:286
+#: vfs-methods/fontilus/font-view.c:285
 msgid "Name:"
 msgstr "Naam:"
 
-#: vfs-methods/fontilus/font-view.c:289
+#: vfs-methods/fontilus/font-view.c:288
 msgid "Style:"
 msgstr "Stijl:"
 
-#: vfs-methods/fontilus/font-view.c:298
+#: vfs-methods/fontilus/font-view.c:297
 msgid "Type:"
 msgstr "Type:"
 
-#: vfs-methods/fontilus/font-view.c:305
+#: vfs-methods/fontilus/font-view.c:304
 msgid "Size:"
 msgstr "Grootte:"
 
-#: vfs-methods/fontilus/font-view.c:349 vfs-methods/fontilus/font-view.c:362
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
 msgid "Version:"
 msgstr "Versie:"
 
-#: vfs-methods/fontilus/font-view.c:353 vfs-methods/fontilus/font-view.c:364
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: vfs-methods/fontilus/font-view.c:357
+#: vfs-methods/fontilus/font-view.c:356
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: vfs-methods/fontilus/font-view.c:418
+#: vfs-methods/fontilus/font-view.c:417
 #, c-format
 msgid "usage: %s fontfile\n"
 msgstr "gebruik: %s lettertypebestand\n"
@@ -3400,6 +3457,9 @@ msgstr "Thema toepassen"
 msgid "Sets the default theme"
 msgstr "Stelt het standaardthema in"
 
+#~ msgid "XKB options"
+#~ msgstr "XKB-opties"
+
 #~ msgid "Mozilla/Netscape 6"
 #~ msgstr "Mozilla/Netscape 6"
 
diff --git a/po/nn.po b/po/nn.po
index 5e138a69c..1489989f4 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-08-31 10:03+0000\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -62,11 +62,11 @@ msgstr "_Tastatur på skjermen"
 msgid "_Screenreader"
 msgstr "_Skjermlesar"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Støtte for hjelpefunksjonar"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 "Slå på støtte for GNOME sine hjelpefunksjonar for handicappa når du loggar "
@@ -120,13 +120,13 @@ msgstr "Importer innstillingar for hjelpefunksjonar"
 msgid "_Import"
 msgstr "_Importer"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Still inn hjelpefunksjonar for tastaturet"
 
@@ -342,11 +342,11 @@ msgstr "pikslar per sekund"
 msgid "seconds"
 msgstr "sekund"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Endra bakgrunnsinnstillingane på skrivebordet ditt"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Skrivebordsbakgrunn"
 
@@ -425,6 +425,13 @@ msgstr "Legg til bakgrunn"
 msgid "No Wallpaper"
 msgstr "Ikkje noko bakgrunn"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -635,106 +642,15 @@ msgstr "Vel eit bilete."
 msgid "_Select"
 msgstr "_Vel"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Foretrukne program"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Vel standardprogramma dine"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-# TRN: Dette er då eit program.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/Firefox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M tekst-nettlesar"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx tekst-nettlesar"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links tekst-nettlesar"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution e-postlesar"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla e-post"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "GNOME-terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Standard X-terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr ""
@@ -746,20 +662,23 @@ msgid "Add..."
 msgstr "Legg til ..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_Sjølvvald redigeringsprogram"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Eigendefinert"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "S_jølvvald e-postlesar:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Eigendefinert"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Sj_ølvvald terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Sjø_lvvald nettlesar:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Dette programmet kan opna _fleire filer på ein gong"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -806,6 +725,16 @@ msgid "Mail Reader"
 msgstr "E-postlesar"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Køyr i _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Køyr i _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -813,93 +742,170 @@ msgstr ""
 "Vel den vindaugshandsamaren du vil ha. Du må klikka på «Bruk», vifta med "
 "tryllestaven og dansa ein magisk dans for at det skal virka."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Køyr i t_erminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Tekstredigeringsprogram"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Dette programmet kan opna _URI-ar"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Dette programmet kan opna _fleire filer på ein gong"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Dette programmet må køyrast i eit _skal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Skjønar _Netscape Remote Control"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Bruk dette r_edigeringsprogrammet til å opna tekstfiler i filhandsamaren"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Nettlesar"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Vindaugshandsamar"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Ko_mmando:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "Ei_genskapar ..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Vel ein e-post-lesar:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Vel"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Standard nettlesar"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+# TRN: Dette er då eit program.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/Firefox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla e-post"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M tekst-nettlesar"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx tekst-nettlesar"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links tekst-nettlesar"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution e-postlesar"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Vel ein terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Vel ein nettlesar:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Vel eit tekstredigeringsprogram:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Tilgjenge"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla e-post"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Tilgjengeinnstillingar"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Avansert"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Standardterminal"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Avanserte innstillingar"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Standard X-terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Endra skjermoppløysing"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Skjermoppløysing"
 
@@ -990,7 +996,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Er du sikker på at du vil sletta denne oppføringa for godt?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Skildring"
 
@@ -998,15 +1004,25 @@ msgstr "Skildring"
 msgid "Extensions"
 msgstr "Filtypar"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Filtyper og program"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "Oppgje kva program som skal brukast til å opna eller visa kvar filtype"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Filtypar og program"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Spesifisér kva for program som skal brukast til å opna eller visa kvar "
+"filtype"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Handlingar"
@@ -1097,6 +1113,7 @@ msgid "_Protocol:"
 msgstr "_Protokoll:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -1104,16 +1121,6 @@ msgstr "Fje_rn"
 msgid "_Viewer component:"
 msgstr "_Visarkomponent:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Filtypar og program"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Spesifisér kva for program som skal brukast til å opna eller visa kvar "
-"filtype"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Rediger filkategoriar"
@@ -1294,14 +1301,15 @@ msgid "Electronic mail transmission"
 msgstr "Eletronisk-post overføring"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "GNOME-dokumentasjon"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Skrifttype"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Vel skrifttypane som skal brukast på skrivebordet"
 
@@ -1505,29 +1513,29 @@ msgid "The type of accelerator."
 msgstr "Typen snøggtast."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Av"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Ukjent handling>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Lyd"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Handsaming av vindauge"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1536,26 +1544,26 @@ msgstr ""
 "Snøggtasten «%s» er allereie brukt til:\n"
 " «%s»\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Feil ved lagring av ny snøggtast i oppsettdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Feil ved fjerning av snøggtast frå oppsettdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Handling"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Snarveg"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Snøggtastar"
 
@@ -1568,23 +1576,10 @@ msgstr ""
 "trykker den nye snøggtasten. Du kan også trykka Backspace for å sletta "
 "snøggtasten."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Tileigna snøggtastar til kommandoar"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Ukjend"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modellar"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Førehandsvising av tastaturoppsett"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1752,10 +1747,32 @@ msgstr "_Arbeidsøkta varar:"
 msgid "minutes"
 msgstr "minutt"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Ukjend"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modellar"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Førehandsvising av tastaturoppsett"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Still inn brukarvala dine for tastaturet"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Still inn brukarvala dine for musa"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Ukjent peikar"
@@ -1923,20 +1940,21 @@ msgstr "_Dørstokk:"
 msgid "_Timeout:"
 msgstr "_Tidsgrense:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Mus"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Still inn brukarvala dine for musa"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Mellomtenar i nettverket"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Eigenskapar for mellomtenar i nettverket"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1980,8 +1998,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP-mellomtenar:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Oppsett av mellomtenar"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Eigenskapar for mellomtenar i nettverket"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2019,7 +2038,7 @@ msgstr "_Passord:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Trygg HTTP-mellomtenar:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Slå på lydar og kopla lydar til hendingar"
 
@@ -2078,15 +2097,26 @@ msgstr ""
 "ikkje var ordentleg installert, eller at du ikkje har installert «gnome-"
 "themes»-pakken."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Ikkje oppgjeve nokon adresser til draktfiler som skal installerast"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Adressa til draktfila som skal installerast er ugyldig"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2120,12 +2150,12 @@ msgstr "Drakta må ha eit namn"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Drakta finst frå før. Vil du erstatta henne?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Vel drakter for ymse deler av skrivebordet"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Drakt"
 
@@ -2238,11 +2268,11 @@ msgstr "Namn på drak_ta:"
 msgid "theme selection tree"
 msgstr "Draktveljartre"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Tilpass utsjånaden til verktøylinjer og menylinjer i programma"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menyar og verktøylinjer"
 
@@ -2311,7 +2341,6 @@ msgid "_Edit"
 msgstr "R_ediger"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fil"
 
@@ -2339,6 +2368,14 @@ msgstr "_Avslutt"
 msgid "_Save"
 msgstr "_Lagra"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2350,23 +2387,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Ctrl"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (eller «Windows-tast»)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2408,14 +2445,34 @@ msgstr "_Løft opp valde vindauge etter ei tid"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Vel vindauge når musa går over dei"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Vindaugseigenskapar"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Vindauge"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME Kontrollsenter"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Brukarval for bakgrunn"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Andre"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Oppsettsverktøy for GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Kontrollsenter"
@@ -2444,87 +2501,6 @@ msgstr "Kontrollsentervisingsfabrikk"
 msgid "View as Control Center"
 msgstr "Vis som kontrollsenter"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME Kontrollsenter: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Formgjeving"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Utsjånad som skal brukast på denne framsyninga av brukarvala"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Capplet katalogobjekt"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Brukarval-katalog som denne framsyninga viser"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
-"Roy-Magne Mo <rmo@sunnmore.net>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME Kontrollsenter"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Skrivebordeigenskapshanderar."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME kontrollsenter: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Andre"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "GNOME kontrollsenter"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Bruk Nautilus viss han køyrer."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Om dette programmet"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Oversyn over kontrollsenteret"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Om"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Innhald"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Oppsettsverktøy for GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Bruk skal sjølv om Nautilus køyrer."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Lydstyrke"
@@ -2631,7 +2607,7 @@ msgstr ""
 "Feil i freistnad på å køyra «%s»\n"
 "som er bunde til tasten «%s»"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2656,7 +2632,7 @@ msgstr ""
 "- Resultatet av <b>xprop -root | grep XKB</b>\n"
 "- Resultatet av <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2667,7 +2643,7 @@ msgstr ""
 "Det er kjente problem med innfløkte XKB-oppsett.\n"
 "Prøv å bruka eit enklare oppsett eller ein nyare versjon av XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2675,15 +2651,15 @@ msgstr ""
 "Tastaturinnstillingane i X er ikkje like tastaturinnstillingane i GNOME. Kva "
 "for ei innstilling vil du bruka?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Bruk X-innstillingar"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Bruk GNOME-innstillingar"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, fuzzy, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2748,8 +2724,8 @@ msgstr "_Ikkje vis denne meldinga igjen."
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Klarte ikkje å lasta lydfila «%s» som sample «%s»"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Kan ikkje avgjera heimekatalogen til brukaren"
 
@@ -2799,11 +2775,11 @@ msgstr "Skjerm"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Skjermen BGApplier skal teikna på"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Lydfila for denne hendinga finst ikkje."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2813,32 +2789,32 @@ msgstr ""
 "Legg inn pakka «gnome-audio» dersom du vil\n"
 "ha eit sett med standardlydar."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Fila «%s» er ikkje ei gyldig wav-fil"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Hending"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Lydfil"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Lydar:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Lyd_fil:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Vel lydfil"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "S_pel"
 
@@ -3099,27 +3075,75 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Snart vil XKB-innstillingar i GConf verta overstyrte frå systemoppsettet"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB-tastaturoppsett"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB-tastaturmodell"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB-alternativ"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Tastatur_modell:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB-tastaturoppsett"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Tastatur_modell:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Snøggtastar"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr " XKB-innstillingar i GConf vil verta overstyrte frå systemet ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Snart vil XKB-innstillingar i GConf verta overstyrte frå systemoppsettet"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB-tastaturoppsett"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB-tastaturmodell"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Utsett pause"
@@ -3197,46 +3221,14 @@ msgstr ""
 "til eit ved å høgreklikka på panelet og velja «Legg til på panelet -> "
 "Verktøy -> Varslingsområde»."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "abcdefghijklmnopqrstuvwxyzæøå 1234567890"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Namn:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stil:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Type:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Storleik:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versjon:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Opphavsrett:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Skildring:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "bruk: %s skrifttypefil\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Bruk denne skrifttypen i programma"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Oppføringar i kontekstmenyen til skrifta"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Vel standardprogramma dine"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3310,33 +3302,47 @@ msgstr "Om det skal lagast miniatyrar av TrueType-skrifttypar"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Om det skal lagast miniatyrar av Type1-skrifttypar"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fabrikk for kontekstmenyen i Fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "abcdefghijklmnopqrstuvwxyzæøå 1234567890"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Kontekstmeny for Fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Namn:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fabrikk for kontekstmenyen i Fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stil:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Kontekstmenyoppføringar for skrifttypar i Nautilus"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Type:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Bruk denne skrifttypen i programma"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Storleik:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versjon:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Opphavsrett:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponent for innhaldsframvising i drakteigenskapane"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Skildring:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus framvising av eigenskapar ved drakta"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "bruk: %s skrifttypefil\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME Kontrollsenter"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3367,27 +3373,18 @@ msgid "Themes"
 msgstr "Drakter"
 
 # TRN: Dette er drakta i arbeidsflata, altså GTK-delen av programmet.
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Drakta i programområdet"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Drakt på vindaugsrammene"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikondrakt"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI som vert vist no"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDÆØÅ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Dersom sann, vert det laga miniatyrar av installerte drakter."
@@ -3424,3 +3421,149 @@ msgstr "Om det skal lagast miniatyrar av installerte drakter"
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "Om det skal lagast miniatyrar av drakter"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDÆØÅ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Bruk _skrifttypen"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Gå tilbake til _standardverdiane"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "GNOME-terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_Sjølvvald redigeringsprogram"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "S_jølvvald e-postlesar:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Sj_ølvvald terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Sjø_lvvald nettlesar:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Køyr i t_erminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Dette programmet kan opna _URI-ar"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Dette programmet må køyrast i eit _skal"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Vel ein e-post-lesar:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Vel ein terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Vel ein nettlesar:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Vel eit tekstredigeringsprogram:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Tilgjenge"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Tilgjengeinnstillingar"
+
+#~ msgid "Advanced"
+#~ msgstr "Avansert"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Avanserte innstillingar"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Oppsett av mellomtenar"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME Kontrollsenter: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Formgjeving"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Utsjånad som skal brukast på denne framsyninga av brukarvala"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Capplet katalogobjekt"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Brukarval-katalog som denne framsyninga viser"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
+#~ "Roy-Magne Mo <rmo@sunnmore.net>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Skrivebordeigenskapshanderar."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME kontrollsenter: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "GNOME kontrollsenter"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Bruk Nautilus viss han køyrer."
+
+#~ msgid "About this application"
+#~ msgstr "Om dette programmet"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Oversyn over kontrollsenteret"
+
+#~ msgid "_About"
+#~ msgstr "_Om"
+
+#~ msgid "_Contents"
+#~ msgstr "_Innhald"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjelp"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Bruk skal sjølv om Nautilus køyrer."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB-alternativ"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Oppføringar i kontekstmenyen til skrifta"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fabrikk for kontekstmenyen i Fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Kontekstmeny for Fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fabrikk for kontekstmenyen i Fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Kontekstmenyoppføringar for skrifttypar i Nautilus"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponent for innhaldsframvising i drakteigenskapane"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus framvising av eigenskapar ved drakta"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI som vert vist no"
diff --git a/po/no.po b/po/no.po
index f32de973d..7fbe928e5 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-05 23:01+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -59,11 +59,11 @@ msgstr "_Tastatur på skjermen"
 msgid "_Screenreader"
 msgstr "_Skjermleser"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Støtte for hjelpefunksjoner"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Aktiver støtte for GNOME hjelpefunksjoner ved pålogging"
 
@@ -114,13 +114,13 @@ msgstr "Importer fil med innstillinger for funksjoner"
 msgid "_Import"
 msgstr "_Importer"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Brukervalg for tilgjengelighet for tastatur"
 
@@ -332,11 +332,11 @@ msgstr "piksler per sekund"
 msgid "seconds"
 msgstr "sekunder"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Endre dine innstillinger for skrivebordsbakgrunn"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Skrivebordsbakgrunn"
 
@@ -415,6 +415,13 @@ msgstr "Legg til bakgrunn"
 msgid "No Wallpaper"
 msgstr "Ingen bakgrunn"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -626,105 +633,15 @@ msgstr "Vennligst velg et bilde."
 msgid "_Select"
 msgstr "_Velg"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Foretrukne applikasjoner"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Velg dine forvalgte applikasjoner"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M tekstbasert nettleser"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx tekstbasert nettleser"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links tekstbasert nettleser"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution e-postleser"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla e-post"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "GNOME terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Standard XTerminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr ""
@@ -735,20 +652,23 @@ msgid "Add..."
 msgstr "Legg til..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "E_gendefinert redigeringsprogram:"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Egendefinert"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "E_gendefinert e-postleser:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Egendefinert"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "E_gendefinert terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "E_gendefinert nettleser:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Denne applikasjonen kan åpne _flere filer"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -795,6 +715,16 @@ msgid "Mail Reader"
 msgstr "E-postleser"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Kjør i _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Kjør i _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -802,93 +732,169 @@ msgstr ""
 "Velg vindushåndtereren du ønsker. Du må velge «Bruk», vifte med den magiske "
 "staven, og utføre den magiske dansen for at dette skal virke."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Start i t_erminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Tekstredigerer"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Denne applikasjonen kan åpne _URIer"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Denne applikasjonen kan åpne _flere filer"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Denne applikasjonen må kjøre i et _skall"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Forstår _Netscape Remote Control"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Bruk dette r_edigeringsprogrammet til å åpne tekstfiler fra filhåndtereren"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Nettleser"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Vindushåndterer"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Ko_mmando:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "E_genskaper..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Velg en e-postleser:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Velg"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Velg en terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Standard nettleser"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Velg en nettleser:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Velg en tekstredigerer:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Tilgjengelighet"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Innstillinger for tilgjengelighet"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Avansert"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Avanserte innstillinger"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla e-post"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M tekstbasert nettleser"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx tekstbasert nettleser"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links tekstbasert nettleser"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution e-postleser"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla e-post"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Forvalgt terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Standard XTerminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Endre oppløsning for skjermen"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Skjermoppløsning"
 
@@ -979,7 +985,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Er du sikker på at du vil slette denne oppføringen permanent?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -987,16 +993,26 @@ msgstr "Beskrivelse"
 msgid "Extensions"
 msgstr "Filtyper"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Filtyper og programmer"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Oppgi hvilke programmer som skal brukes for å åpne eller vise hver filtype"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Filtyper og programmer"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Spesifiser hvilke programmer som skal brukes for å åpne eller vise hver "
+"filtype"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Handlinger"
@@ -1087,6 +1103,7 @@ msgid "_Protocol:"
 msgstr "_Protokoll:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -1094,16 +1111,6 @@ msgstr "Fje_rn"
 msgid "_Viewer component:"
 msgstr "_Visningskomponent:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Filtyper og programmer"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Spesifiser hvilke programmer som skal brukes for å åpne eller vise hver "
-"filtype"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Rediger filkategori"
@@ -1285,14 +1292,15 @@ msgid "Electronic mail transmission"
 msgstr "Overføring av elektronisk post"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "GNOME dokumentasjon"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Skrift"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Velg skrifter for skrivebordet"
 
@@ -1496,29 +1504,29 @@ msgid "The type of accelerator."
 msgstr "Type hurtigtast."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Slått av"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Ukjent handling>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Lyd"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Vindushåndtering"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1527,26 +1535,26 @@ msgstr ""
 "Snarveien «%s» er allerede brukt for:\n"
 " «%s»\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Feil under setting av ny snarvei i konfigurasjonsdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Feil under fjerning av snarveitast i konfigurasjonsdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Handling"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Snarvei"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarveier"
 
@@ -1558,23 +1566,10 @@ msgstr ""
 "Klikk på tilhørende rad og skriv inn en ny hurtigtast eller trykk slett for "
 "å fjerne."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Tilegn snarveitaster til kommandoer"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modeller"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Forhåndsvisning av tastaturutforming"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1742,10 +1737,31 @@ msgstr "_Arbeidsintervallet varer:"
 msgid "minutes"
 msgstr "minutter"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modeller"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Forhåndsvisning av tastaturutforming"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Sett dine brukervalg for tastatur"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr "Språk og kultur"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+msgid "Set your language and culture preferences"
+msgstr "Sett dine brukervalg for språk og kultur"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Ukjent markør"
@@ -1910,20 +1926,21 @@ msgstr "_Terskel:"
 msgid "_Timeout:"
 msgstr "_Tidsavbrudd:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Mus"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Sett dine brukervalg for mus"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Nettverksproxy"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Brukervalg for nettverksproxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1967,8 +1984,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP-proxy:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Konfigurasjon av nettverksproxy"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Brukervalg for nettverksproxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2006,7 +2024,7 @@ msgstr "_Passord:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Sikker HTTP-proxy:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Aktiver lyd og tilegn lyder til hendelser"
 
@@ -2064,15 +2082,26 @@ msgstr ""
 "«Brukervalg for tema» ikke er korrekt installert, eller at du ikke har "
 "installert pakken «gnome-themes»."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Ingen lokasjon oppgitt for installasjon av temafil"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Ugyldig lokasjon for installasjon av temafil"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2106,12 +2135,12 @@ msgstr "Navn på tema må være oppgitt"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Temaet eksisterer allerede. Vil du erstatte det?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Velg tema for forskjellige deler av skrivebordet"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2223,11 +2252,11 @@ msgstr "_Temanavn:"
 msgid "theme selection tree"
 msgstr "tre for temavalg"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Tilpass utseendet på verktøylinjer og menylinjer i applikasjoner"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menyer og verktøylinjer"
 
@@ -2296,7 +2325,6 @@ msgid "_Edit"
 msgstr "R_ediger"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fil"
 
@@ -2324,6 +2352,14 @@ msgstr "A_vslutt"
 msgid "_Save"
 msgstr "_Lagre"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2335,23 +2371,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Kontroll"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (eller «Windows-tast»)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2391,14 +2427,34 @@ msgstr "_Hev valgte vinduer etter en pause"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Aktiver vinduer når musen beveger seg over dem"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Egenskaper for vindu"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Vinduer"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME Kontrollsenter"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Brukervalg for bakgrunn"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Andre"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Konfigurasjonsverktøy for GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Kontrollsenter"
@@ -2427,85 +2483,6 @@ msgstr "Fabrikk for kontrollsenter-visning"
 msgid "View as Control Center"
 msgstr "Vis som kontrollsenter"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME Kontrollsenter: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Utseende"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Utseende som skal brukes for denne visningen av brukervalg"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Katalogobjekt for brukervalg"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Brukervalg-katalog som denne visningen viser"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Kjartan Maraas <kmaraas@gnome.org>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME Kontrollsenter"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Håndtering av egenskaper for skrivebord."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME Kontrollsenter: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Andre"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "GNOME kontrollsenter"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Bruk nautilus hvis den kjører."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Om denne applikasjonen"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Oversikt over kontrollsenteret"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Om"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Innhold"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Hjelp"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Konfigurasjonsverktøy for GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Bruk skall selv om nautilus kjører."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volum"
@@ -2613,7 +2590,7 @@ msgstr ""
 "Feil under forsøk på å kjøre (%s)\n"
 "som er bundet til tast (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2638,7 +2615,7 @@ msgstr ""
 "- utskrift av <b>xprop -root | grep XKB</b>\n"
 "- utskrift av <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2650,7 +2627,7 @@ msgstr ""
 "Prøv å bruke enklere konfigurasjoner eller en nyere versjon av XFree-"
 "programvaren."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2658,15 +2635,15 @@ msgstr ""
 "Tastaturinnstilling for X er forskjellig fra innstillingene i GNOME. Hvilket "
 "sett vil du bruke?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Bruk innstillinger fra X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Bruk innstillinger fra GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2731,8 +2708,8 @@ msgstr "_Ikke vis denne meldingen igjen"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Kunne ikke laste lydfil %s som sample %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Kan ikke bestemme brukers hjemmekatalog"
 
@@ -2781,11 +2758,11 @@ msgstr "Skjerm"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Skjerm hvor BGApplier skal tegne"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Lydfilen for denne hendelsen eksisterer ikke."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2795,32 +2772,32 @@ msgstr ""
 "Du må kanskje installere gnome-audio pakken\n"
 "for å få et forvalgt sett med lyder."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Filen %s er ikke en gyldig wav-fil"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Hendelse"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Lydfil"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Lyder:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Lyd_fil:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Velg lydfil"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "S_pill"
 
@@ -3080,27 +3057,75 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Snart vil XKB-innstillinger i gconf bli overstyrt (fra systemkonfigurasjonen)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB-tastaturutforming"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB tastaturmodell"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB-alternativer"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Tastatur_modell:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB-tastaturutforming"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Tastatur_modell:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Tastatursnarveier"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "XKB-innstillinger i gconf overstyres fra systemet ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Snart vil XKB-innstillinger i gconf bli overstyrt (fra systemkonfigurasjonen)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB-tastaturutforming"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB tastaturmodell"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Utsett pause"
@@ -3176,46 +3201,14 @@ msgstr ""
 "høyreklikke på panelet og velge «Legg til på panelet -> Verktøy -> "
 "Varslingsområde»."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Den raske brune reven hopper over den late hunden. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Navn:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stil:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Type:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Størrelse:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versjon:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Opphavsrett:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "bruk: %s skriftfil\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Sett som skrift for applikasjoner"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Oppføringer i skriftens kontekstmeny"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Velg dine forvalgte applikasjoner"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3291,33 +3284,47 @@ msgstr "Om det skal vises miniatyrer av TrueType-skrifter"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Om det skal vises miniatyrer av Type1-skrifter"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Factory for fontilus kontekstmeny"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Den raske brune reven hopper over den late hunden. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus kontekstmeny"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Navn:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Factory for fontilus kontekstmeny"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stil:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Kontekstmenyoppføringer for skrifter i Nautilus"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Type:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Sett som skrift for applikasjoner"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Størrelse:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versjon:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Opphavsrett:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponent for innholdsvisning for temaegenskaper"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "bruk: %s skriftfil\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus visning for egenskaper for tema"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME Kontrollsenter"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3347,27 +3354,18 @@ msgstr "Bruk _skrift"
 msgid "Themes"
 msgstr "Tema"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Kontroller tema"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Tema for vinduskant"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikontema"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI som vises nå"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDÆØÅ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3405,6 +3403,150 @@ msgstr "Om miniatyrer for installerte tema skal brukes"
 msgid "Whether to thumbnail themes"
 msgstr "Om miniatyrer for tema skal brukes"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDÆØÅ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Bruk _skrift"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Sett tilbake til _utgangsverdier"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "GNOME terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "E_gendefinert redigeringsprogram:"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "E_gendefinert e-postleser:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "E_gendefinert terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "E_gendefinert nettleser:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Start i t_erminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Denne applikasjonen kan åpne _URIer"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Denne applikasjonen må kjøre i et _skall"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Velg en e-postleser:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Velg en terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Velg en nettleser:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Velg en tekstredigerer:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Tilgjengelighet"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Innstillinger for tilgjengelighet"
+
+#~ msgid "Advanced"
+#~ msgstr "Avansert"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Avanserte innstillinger"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Konfigurasjon av nettverksproxy"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME Kontrollsenter: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Utseende"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Utseende som skal brukes for denne visningen av brukervalg"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Katalogobjekt for brukervalg"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Brukervalg-katalog som denne visningen viser"
+
+#~ msgid "translator_credits"
+#~ msgstr "Kjartan Maraas <kmaraas@gnome.org>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Håndtering av egenskaper for skrivebord."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME Kontrollsenter: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "GNOME kontrollsenter"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Bruk nautilus hvis den kjører."
+
+#~ msgid "About this application"
+#~ msgstr "Om denne applikasjonen"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Oversikt over kontrollsenteret"
+
+#~ msgid "_About"
+#~ msgstr "_Om"
+
+#~ msgid "_Contents"
+#~ msgstr "_Innhold"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjelp"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Bruk skall selv om nautilus kjører."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB-alternativer"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Oppføringer i skriftens kontekstmeny"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Factory for fontilus kontekstmeny"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus kontekstmeny"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Factory for fontilus kontekstmeny"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Kontekstmenyoppføringer for skrifter i Nautilus"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponent for innholdsvisning for temaegenskaper"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus visning for egenskaper for tema"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI som vises nå"
+
 #~ msgid "Failed to open file '%s': %s"
 #~ msgstr "Kunne ikke åpne fil «%s»: %s"
 
@@ -3604,9 +3746,6 @@ msgstr "Om miniatyrer for tema skal brukes"
 #~ msgid "Desktop Wallpaper"
 #~ msgstr "Skrivebordsbakgrunn"
 
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Brukervalg for bakgrunn"
-
 #~ msgid "Show"
 #~ msgstr "Vis"
 
@@ -3711,9 +3850,3 @@ msgstr "Om miniatyrer for tema skal brukes"
 
 #~ msgid "_Region:"
 #~ msgstr "_Region:"
-
-#~ msgid "Language and Culture"
-#~ msgstr "Språk og kultur"
-
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Sett dine brukervalg for språk og kultur"
diff --git a/po/nso.po b/po/nso.po
index adf95208a..f9a05a9a0 100644
--- a/po/nso.po
+++ b/po/nso.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-29 22:46+0200\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-11-27 17:02+0200\n"
 "Last-Translator: Zuza Software Foundation <info@translate.org.za>\n"
 "Language-Team: Northern Sotho <translate-discuss-nso@lists.sourceforge.net>\n"
@@ -429,6 +429,13 @@ msgstr "Oketša Pampiri ya leboteng"
 msgid "No Wallpaper"
 msgstr "Ga go na Pampiri ya leboteng"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -794,7 +801,8 @@ msgid "Encompass"
 msgstr "Fihlelela"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-msgid "Firebird/FireFox"
+#, fuzzy
+msgid "Firebird"
 msgstr "Firebird/FireFox"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:14
@@ -803,8 +811,9 @@ msgstr "Firefox"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:15
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
+#, fuzzy
+msgid "Mozilla"
+msgstr "Poso ya Mozilla"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:17
 msgid "Netscape Communicator"
@@ -1952,7 +1961,8 @@ msgid "Network Proxy"
 msgstr "Kemedi ya Neteweke"
 
 #: capplets/network/gnome-network-preferences.desktop.in.in.h:2
-msgid "Network proxy preferences"
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Tše ratwago tša kemedi ya neteweke"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1996,8 +2006,9 @@ msgid "H_TTP proxy:"
 msgstr "K_emedi ya PFSK:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Go Fetola Sebopego ga Kemedi ya Neteweke"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Tše ratwago tša kemedi ya neteweke"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2445,7 +2456,8 @@ msgid "_Select windows when the mouse moves over them"
 msgstr "_Kgetha mafesetere ge legotlwana le sepela ka godimo ga wona"
 
 #: capplets/windows/window-properties.desktop.in.in.h:1
-msgid "Window Properties"
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Dipharologantšho tša Lefesetere"
 
 #: capplets/windows/window-properties.desktop.in.in.h:2
@@ -3093,29 +3105,77 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Kgauswinyane, dipeakanyo tša XKB go gconf di tla beelwa ka thoko (go "
-"fetolweng sebopego ga tshepedišo)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Go bea ga boroto ya dinotlelo ya XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Mohlala wa boroto ya dinotlelo ya XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Dikgetho tša XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Mohlala wa _boroto ya dinotlelo:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Go bea ga boroto ya dinotlelo ya XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Mohlala wa _boroto ya dinotlelo:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Dikgaoletšo tša Boroto ya Dinotlelo"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "Dipeakanyo tša XKB go gconf di tla beelwa ka thoko tshepedišong ya ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Kgauswinyane, dipeakanyo tša XKB go gconf di tla beelwa ka thoko (go "
+"fetolweng sebopego ga tshepedišo)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Go bea ga boroto ya dinotlelo ya XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Mohlala wa boroto ya dinotlelo ya XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "Šu_thiša go khutša"
@@ -3283,39 +3343,39 @@ msgstr "Ge eba go swanetše go khutsofatšwe difonto tša Mohuta wa Therešo"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Ge eba go swanetše go khutsofatšwe difonto tša Mohuta wa 1"
 
-#: vfs-methods/fontilus/font-view.c:126
+#: vfs-methods/fontilus/font-view.c:125
 msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 msgstr "Phukubjwe e tsotho ya lebelo e fofela mpsha e tšwafago. 0123456789"
 
-#: vfs-methods/fontilus/font-view.c:286
+#: vfs-methods/fontilus/font-view.c:285
 msgid "Name:"
 msgstr "Leina:"
 
-#: vfs-methods/fontilus/font-view.c:289
+#: vfs-methods/fontilus/font-view.c:288
 msgid "Style:"
 msgstr "Setaele:"
 
-#: vfs-methods/fontilus/font-view.c:298
+#: vfs-methods/fontilus/font-view.c:297
 msgid "Type:"
 msgstr "Mohuta:"
 
-#: vfs-methods/fontilus/font-view.c:305
+#: vfs-methods/fontilus/font-view.c:304
 msgid "Size:"
 msgstr "Boglo:"
 
-#: vfs-methods/fontilus/font-view.c:349 vfs-methods/fontilus/font-view.c:362
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
 msgid "Version:"
 msgstr "Kgatišo:"
 
-#: vfs-methods/fontilus/font-view.c:353 vfs-methods/fontilus/font-view.c:364
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
 msgid "Copyright:"
 msgstr "Tokelo ya ngwalollo:"
 
-#: vfs-methods/fontilus/font-view.c:357
+#: vfs-methods/fontilus/font-view.c:356
 msgid "Description:"
 msgstr "Tlhaloso:"
 
-#: vfs-methods/fontilus/font-view.c:418
+#: vfs-methods/fontilus/font-view.c:417
 #, c-format
 msgid "usage: %s fontfile\n"
 msgstr "tirišo: %s faele ya fonto\n"
@@ -3420,6 +3480,15 @@ msgstr "_Diriša fonto"
 msgid "Sets the default theme"
 msgstr "Beakanya di_tlhaelelo ka leswa"
 
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Go Fetola Sebopego ga Kemedi ya Neteweke"
+
+#~ msgid "XKB options"
+#~ msgstr "Dikgetho tša XKB"
+
 #~ msgid "Gnome Terminal"
 #~ msgstr "Kgokagano ya Dithapo ya Gnome"
 
diff --git a/po/pa.po b/po/pa.po
index 8dfb3bba4..9a147223f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD.pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-13 10:50+0530\n"
 "Last-Translator: Amanpreet Singh Alam <aalam@redhat.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
@@ -68,11 +68,11 @@ msgstr "_ਪਰਦੇ ਤੇ ਕੀ-ਬੋਰਡ"
 msgid "_Screenreader"
 msgstr "_ਪਰਦਾ-ਪੜਨਵਾਲਾ"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "ਅਸਿਸਟਿਵ ਟਕਨਾਲੋਜੀ ਸਹਾਇਤਾ"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "ਗਨੋਮ ਅਸਿਸਟਿਵ ਟਕਨਾਲੋਜੀ ਲਈ ਸਹਾਇਤਾ ਦਾਖਲੇ ਸਮੇ ਯੋਗ ਕਰੋ"
 
@@ -123,13 +123,13 @@ msgstr "ਫੀਚਰ ਨਿਰਧਾਰਨ ਫਾਇਲ ਲਿਆਉ"
 msgid "_Import"
 msgstr "_ਨਿਰਯਾਤ"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "ਕੀ-ਬੋਰਡ"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "ਆਪਣੀਆਂ ਕੀ-ਬੋਰਡ ਸੁਲਭਤਾ ਪਸੰਦ ਨੂੰ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
@@ -336,11 +336,11 @@ msgstr "ਪਿਕਸਲ /ਸਕਿੰਟ"
 msgid "seconds"
 msgstr "ਸਕਿੰਟ"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "ਆਪਣੇ ਵਿਹੜੇ ਦੀ ਪਿੱਠਭੂਮੀ ਦਾ ਨਿਰਧਾਰਨ ਤਬਦੀਲ ਕਰੋ"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "ਵਿਹੜੇ ਦੀ ਪਿੱਠਭੂਮੀ"
 
@@ -419,6 +419,13 @@ msgstr "ਤਸਵੀਰਾਂ ਜੋੜੋ"
 msgid "No Wallpaper"
 msgstr "ਤਸਵੀਰ ਨਹੀ"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -620,105 +627,15 @@ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਚਿੱਤਰ ਚੁਣੋ।"
 msgid "_Select"
 msgstr "_ਚੁਣੋ"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "ਪਸੰਦੀਦਾ ਕਾਰਜ"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "ਆਪਣੇ ਮੂਲ ਕਾਰਜ ਚੁਣੋ"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "ਇਪੀਫਨਸੀ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "ਗਲੇਓਨ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "ਇੰਕੰਪਾਸ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "ਫਾਇਰਬਰਡ/ਫਾਇਰਫਾਕਸ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "ਮੌਜੀਲਾ/ਨੈਟਸਕੇਪ 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "ਨੈਟਸਕੈਪ ਕਮਨਿਊਕੇਟਰ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "ਕੰਨਕਿਊਰਰ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M ਟੈਕਸਟ ਬਰਾਊਜ਼ਰ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "ਲੀਨਸ ਟੈਕਸਟ ਬਰਾਊਜ਼ਰ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "ਲਿੰਕ ਟੈਕਸਟ ਬਰਾਊਜ਼ਰ"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "ਈਵੂਲੇਸ਼ਨ ਮੇਲ ਰੀਡਰ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "ਬਾਲਸਾ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "ਕੇ-ਮੇਲ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "ਮੌਜੀਲਾ ਪੱਤਰ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "ਮੂਟ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "ਗਨੋਮ ਟਰਮੀਨਲ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "ਮਿਆਰੀ X-ਟਰਮੀਨਲ"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "ਇਸ ਸੋਧਕ ਲਈ ਨਾਂ ਅਤੇ ਕਮਾਂਡ ਨਿਰਧਾਰਿਤ ਕਰੋ"
@@ -728,20 +645,23 @@ msgid "Add..."
 msgstr "ਜੋੜੋ..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_ਸੰਪਾਦਕ ਪਸੰਦ"
+#, fuzzy
+msgid "C_ustom"
+msgstr "ਪਸੰਦ"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "ਮੇਲ ਰੀਡਰ ਪਸੰਦਃ"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "ਪਸੰਦ"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "ਟਰਮੀਨਲ ਪਸੰਦਃ"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "ਵੈਬ ਬਰਾਊਜਰ ਪਸੰਦਃ"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "ਇਹ ਕਾਰਜ _ਬਹੁ ਫਾਇਲ ਖੋਲ ਸਕਦਾ ਹੈ"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -788,97 +708,183 @@ msgid "Mail Reader"
 msgstr "ਮੇਲ ਰੀਡਰ"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
-msgid ""
-"Select the window manager you want.  You will need to hit apply, wave the "
-"magic wand, and do a magic dance for it to work."
-msgstr "ਜੋ ਝਰੋਖਾ ਪ੍ਰਬੰਧਕ  ਤੁਸੀ ਚਾਹੁੰਦੇ ਹੋ, ਨੂੰ ਚੁਣੋ। ਤੁਸੀ ਲਾਗੂ ਨੂੰ ਦਬਾਉ"
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "_ਟਰਮੀਨਲ ਵਿੱਚ ਚਲਾਉ"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
+#, fuzzy
+msgid "Run in a t_erminal"
 msgstr "_ਟਰਮੀਨਲ ਵਿੱਚ ਚਲਾਉ"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+msgid ""
+"Select the window manager you want.  You will need to hit apply, wave the "
+"magic wand, and do a magic dance for it to work."
+msgstr "ਜੋ ਝਰੋਖਾ ਪ੍ਰਬੰਧਕ  ਤੁਸੀ ਚਾਹੁੰਦੇ ਹੋ, ਨੂੰ ਚੁਣੋ। ਤੁਸੀ ਲਾਗੂ ਨੂੰ ਦਬਾਉ"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "ਟਰਮੀਨਲ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "ਪਾਠ ਸੰਪਾਦਕ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "ਇਹ ਕਾਰਜ _URIs ਖੋਲ ਸਕਦਾ ਹੈ"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "ਇਹ ਕਾਰਜ _ਬਹੁ ਫਾਇਲ ਖੋਲ ਸਕਦਾ ਹੈ"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "ਇਹ ਕਾਰਜ ਨੂੰ ਸੈਲ ਵਿੱਚ ਚਲਾਉਣ ਦੀ ਜ਼ਰੂਰਤ ਹੈ"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "ਸਮਝੋ _ਨੈਟਸਕੇਪ ਰਿਮੋਟ ਕੰਟਰੋਲ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "ਫਾਇਲ ਪ੍ਰਬੰਧਕ ਵਿੱਚ ਪਾਠ ਫਾਇਲ ਖੋਲਣ ਲਈ ਇਹ ਸੋਧਕ ਵਰਤੋ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "ਵੈਬ ਬਰਾਊਜ਼ਰ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "ਝਰੋਖਾ ਪ੍ਰਬੰਧਕ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_ਕਮਾਂਡਃ"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_ਨਾਂਃ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_ਵਿਸ਼ੇਸਤਾ...."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "ਮੇਲ ਰੀਡਰ _ਚੁਣੋਃ"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_ਚੁਣੋ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "ਟਰਮੀਨਲ _ਚੁਣੋਃ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "ਮੂਲ ਵੈੱਬ ਬਰਾਊਜ਼ਰ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "ਵੈਬ ਬਰਾਊਜ਼ਰ _ਚੁਣੋਃ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "ਇਪੀਫਨਸੀ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "ਸੰਪਾਦਕ _ਚੁਣੋਃ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "ਗਲੇਓਨ"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "ਸੁਲੱਭਤਾ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "ਇੰਕੰਪਾਸ"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "ਸੁਲੱਭਤਾ ਨਿਰਧਾਰਨ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "ਫਾਇਰਬਰਡ/ਫਾਇਰਫਾਕਸ"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "ਤਕਨੀਕੀ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "ਤਕਨੀਕੀ ਨਿਰਧਾਰਨ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "ਮੌਜੀਲਾ ਪੱਤਰ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "ਨੈਟਸਕੈਪ ਕਮਨਿਊਕੇਟਰ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "ਕੰਨਕਿਊਰਰ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M ਟੈਕਸਟ ਬਰਾਊਜ਼ਰ"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "ਲੀਨਸ ਟੈਕਸਟ ਬਰਾਊਜ਼ਰ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "ਲਿੰਕ ਟੈਕਸਟ ਬਰਾਊਜ਼ਰ"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "ਈਵੂਲੇਸ਼ਨ ਮੇਲ ਰੀਡਰ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "ਬਾਲਸਾ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "ਕੇ-ਮੇਲ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "ਮੌਜੀਲਾ ਪੱਤਰ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "ਮੂਟ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "ਮੂਲ਼ ਟਰਮੀਨਲ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "ਟਰਮੀਨਲ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "ਮਿਆਰੀ X-ਟਰਮੀਨਲ"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "ਪਰਦੇ ਦਾ ਰੈਜੋਲੇਸ਼ਨ"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "ਪਰਦੇ ਦਾ ਰੈਜੋਲੇਸ਼ਨ"
 
@@ -969,7 +975,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "ਕੀ ਤੁਸੀ ਯਕਨੀਨ ਹੀ ਇਸ ਇੰਦਰਾਜ਼ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟ ਦੇਣਾ ਚਾਹੁੰਦਟ ਹੋ ?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "ਵੇਰਵਾ"
 
@@ -977,15 +983,23 @@ msgstr "ਵੇਰਵਾ"
 msgid "Extensions"
 msgstr "ਐਕਸ਼ਟੇਸ਼ਨ"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "ਫਾਇਲ ਦੀ ਕਿਸਮ ਤੇ ਕਾਰਜ"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "ਨਿਰਧਾਰਿਤ ਕਰੋ ਕਿ ਹਰੇਕ ਫਾਇਲ ਨੂੰ ਕਿਸ ਕਾਰਜ ਨਾਲ ਖੋਲਿਆ ਜਾਂ ਵੇਖਿਆ ਜਾਵੇ|"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "ਫਾਇਲ ਕਿਸਮ ਤੇ ਕਾਰਜ"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "ਨਿਰਧਾਰਿਤ ਕਰੋ ਕਿ ਹਰੇਕ ਫਾਇਲ ਨੂੰ ਕਿਸ ਕਾਰਜ ਨਾਲ ਖੋਲਿਆ ਜਾਂ ਵੇਖਿਆ ਜਾਵੇ|"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "ਕਾਰਵਾਈਆਂ"
@@ -1076,6 +1090,7 @@ msgid "_Protocol:"
 msgstr "_ਪਰੋਟੋਕੋਲਃ"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_ਹਟਾਉ"
 
@@ -1083,14 +1098,6 @@ msgstr "_ਹਟਾਉ"
 msgid "_Viewer component:"
 msgstr "_ਦਰਸ਼ਕ ਹਿੱਸੇਃ"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "ਫਾਇਲ ਕਿਸਮ ਤੇ ਕਾਰਜ"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "ਨਿਰਧਾਰਿਤ ਕਰੋ ਕਿ ਹਰੇਕ ਫਾਇਲ ਨੂੰ ਕਿਸ ਕਾਰਜ ਨਾਲ ਖੋਲਿਆ ਜਾਂ ਵੇਖਿਆ ਜਾਵੇ|"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "ਫਾਇਲ ਸ਼ਰੇਣੀ ਦੀ ਸੋਧ"
@@ -1271,14 +1278,15 @@ msgid "Electronic mail transmission"
 msgstr "ਇਲਕਰੋਨਿਕ ਮੇਲ ਟਰਾਂਸਮਿਸ਼ਨ"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "ਗਨੋਮ ਦਸਤਾਵੇਜ਼"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "ਫੋਟ"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "ਵਿਹੜੇ ਲਈ ਫੋਟ ਚੁਣੋ"
 
@@ -1481,29 +1489,29 @@ msgid "The type of accelerator."
 msgstr "ਪ੍ਰਵੇਸ਼ਕ ਦੀ ਕਿਸਮ"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "ਅਯੋਗ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<ਅਣਪਛਾਤੀ ਕਾਰਵਾਈ>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "ਵਿਹੜਾ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "ਆਵਾਜ਼"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "ਝਰੋਖਾ ਪ੍ਰਬੰਧਨ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1512,26 +1520,26 @@ msgstr ""
 "ਸ਼ਾਰਟਕੱਟ \"%s\" ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "ਗਲਤੀ, ਸੰਰਚਨਾ ਡੈਟਾਬੇਸ ਵਿੱਚ ਨਵਾਂ ਪ੍ਰਵੇਸ਼ਕ ਨਿਰਧਾਰਿਤ ਕਰਨ ਵਿੱਚ: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "ਗਲਤੀ, ਸੰਰਚਨਾ ਡੈਟਾਬੇਸ ਵਿੱਚ ਨਵਾਂ ਪ੍ਰਵੇਸ਼ਕ ਅਣ-ਨਿਰਧਾਰਿਤ ਕਰਨ ਵਿੱਚ: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "ਕਾਰਵਾਈ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "ਸ਼ਾਰਟਕੱਟ"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
 
@@ -1543,23 +1551,10 @@ msgstr ""
 "ਸ਼ਾਰਟਕੱਟ ਕੀ ਸੋਧਣ ਲਈ, ਅਨੁਸਾਰੀ ਕਤਾਰ ਤੇ ਕਲਿੱਕ ਕਰੋ ਅਤੇ ਨਵਾਂ ਪ੍ਰਵੇਸ਼ਕ ਕੀ ਦਿਉ ਜਾਂ ਬੈਕਸਪੇਸ ਸਾਫ ਕਰਨ "
 "ਲਈ ਵਰਤੋਂ।"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "ਕਮਾਂਡਾਂ ਨੂੰ ਸ਼ਾਰਟਕੱਟ ਮੁਹੱਈਆ ਕਰੋਃ"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "ਅਣਜਾਣਾ"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "ਮਾਡਲ"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "ਕੀ-ਬੋਰਡ ਖਾਕਾ ਦਰਿਸ਼"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1723,10 +1718,32 @@ msgstr "_ਕੰਮ ਕਰਨ ਦਾ ਅੰਤਰਾਲਃ"
 msgid "minutes"
 msgstr "ਮਿੰਟ"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "ਅਣਜਾਣਾ"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "ਮਾਡਲ"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "ਕੀ-ਬੋਰਡ ਖਾਕਾ ਦਰਿਸ਼"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "ਆਪਣੇ ਕੀ-ਬੋਰਡ ਦੀ ਪਸੰਦ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "ਆਪਣੇ ਮਾਊਸ ਦੀ ਪਸੰਦ ਨਿਰਧਾਰਿਤ ਕਰੋ"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "ਅਣਪਛਾਤੀ ਕਰਸਰ"
@@ -1891,20 +1908,21 @@ msgstr "_ਨਿਰਧਾਰਨਃ"
 msgid "_Timeout:"
 msgstr "_ਸਮਾਂਃ"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "ਮਾਊਸ"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "ਆਪਣੇ ਮਾਊਸ ਦੀ ਪਸੰਦ ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "ਨੈੱਟਵਰਕ ਪਰਾਕਸੀ"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "ਨੈੱਟਵਰਕ ਪਰਾਕਸੀ ਪਸੰਦ"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1948,8 +1966,9 @@ msgid "H_TTP proxy:"
 msgstr "HT_TP ਪਰਾਕਸੀ:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "ਨੈੱਟਵਰਕ ਪਰਾਕਸੀ ਸੰਰਚਨਾ"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "ਨੈੱਟਵਰਕ ਪਰਾਕਸੀ ਪਸੰਦ"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -1987,7 +2006,7 @@ msgstr "_ਗੁਪਤ-ਕੋਡਃ"
 msgid "_Secure HTTP proxy:"
 msgstr "_ਸੁਰਖਿਅਤ HTTP ਪਰਾਕਸੀ:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "ਆਵਾਜ਼ ਅਤੇ ਘਟਨਾਵਾਂ ਨਾਲ ਸੰਬੰਧ ਆਵਾਜ਼ ਨੂੰ ਯੋਗ ਕਰੋ"
 
@@ -2044,15 +2063,26 @@ msgstr ""
 "ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਸਰੂਪ ਉਪਲੱਬਧ ਨਹੀ ਹੈ| ਇਸ ਦਾ ਮਤਲਬ ਇਹ ਹੈ ਕਿ ਤੁਹਾਡਾ \"ਸਰੂਪ ਪਸੰਦ\" ਤਖਤੀ ਠੀਕ "
 "ਤਰਾਂ ਇੰਸਟਾਲ ਨਹੀ ਹੈ, ਜਾਂ ਤੁਸੀ \"ਗਨੋਮ-ਸਰੂਪ\" ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੀ ਨਹੀ ਕੀਤਾ ਹੈ|"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਕੋਈ ਸਰੂਪ ਫਾਇਲ ਦੀ ਸਥਿਤੀ ਨਿਰਧਾਰਿਤ ਨਹੀ ਕੀਤੀ ਗਈ ਹੈ"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਨਿਰਧਾਰਿਤ ਸਰੂਪ ਫਾਇਲ ਦੀ ਸਥਿਤੀ ਠੀਕ ਨਹੀ ਹੈ"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2084,12 +2114,12 @@ msgstr "ਸਰੂਪ ਨਾਂ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "ਸਰੂਪ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "ਵਿਹੜੇ ਦੇ ਵੱਖ-ਵੱਖ ਹਿੱਸਿਆ ਲਈ ਸਰੂਪ ਚੁਣੋ"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "ਸਰੂਪ"
 
@@ -2201,11 +2231,11 @@ msgstr "ਸਰੂਪ _ਨਾਂਃ"
 msgid "theme selection tree"
 msgstr "ਸਰੂਪ ਚੋਣ ਲੜੀ"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "ਕਾਰਜਾਂ ਵਿੱਚ ਸੰਦਖਾਨਾ ਤੇ ਮੇਨੂ-ਪੱਟੀ ਦੀ ਸੋਧ ਕਰੋ"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "ਮੇਨੂ ਤੇ ਸੰਦਖਾਨਾ"
 
@@ -2274,7 +2304,6 @@ msgid "_Edit"
 msgstr "_ਸੋਧ"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_ਫਾਇਲ"
 
@@ -2302,6 +2331,14 @@ msgstr "_ਬਾਹਰ"
 msgid "_Save"
 msgstr "_ਸੰਭਾਲੋ"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2313,23 +2350,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "ਕੰਟਰੋਲ"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "ਆਲਟ(Alt)"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "ਹਾਇਪਰ(Hyper)"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "ਸੁਪਰ (ਜਾਂ \"ਝਰੋਖਾ ਲੋਗੋ\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "ਮੀਟਾ"
 
@@ -2369,14 +2406,34 @@ msgstr "ਇੱਕ ਅੰਤਰਾਲ ਮਗਰੋ ਚੁਣਿਆ ਝਰੋਖ�
 msgid "_Select windows when the mouse moves over them"
 msgstr "ਝਰੋਖਾ ਚੁਣੋ, ਜਦੋ ਕਿ ਮਾਊਸ ਇਸ ਉਪੱਰ _ਹੋਵੇ"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "ਝਰੋਖਾ ਵਿਸ਼ੇਸਤਾ"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "ਝਰੋਖਾ"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "ਵਿਹੜੇ ਦੀ ਪਿੱਠਭੂਮੀ ਦੀ ਪਸੰਦ"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "ਹੋਰ"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "ਗਨੋਮ ਸੰਰਚਨਾ ਸੰਦ"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "ਕੰਟਰੋਲ ਕੇਂਦਰ"
@@ -2405,87 +2462,6 @@ msgstr "ਕੰਟਰੋਲ ਕੇਂਦਰ"
 msgid "View as Control Center"
 msgstr "ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਾਂਗ ਦਰਿਸ਼"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "ਖਾਕਾ"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "ਕੈਪਲਿਟ ਦੇ ਦਰਿਸ਼ ਦੇ ਵਰਤਣ ਲਈ ਖਾਕਾ"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "ਕੈਪਲਿਟ ਡਾਇਕਰੈਕਟਰੀ ਇਕਾਈ"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "ਕੈਪਲਿਟ ਡਾਇਕਰੈਕਟਰੀ, ਜੋ ਕਿ ਇਹ ਦਰਿਸ਼ ਵੇਖਾ ਰਿਹਾ ਹੈ"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ <amanpreetalam@yahoo.com> \n"
-"ਜਸਵਿੰਦਰ ਸਿੰਘ ਫੂਲੇਵਾਲਾ <jaswinderlinux@netscape.net"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "ਵਿਹੜਾ ਵਿਸ਼ੇਸਤਾ ਪ੍ਰਬੰਧਕ।"
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "ਹੋਰ"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "ਭਾਵੇ ਕਿ ਨਟਾਲਿਸ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ, ਇਹ ਹੀ ਵਰਤੋਂ|"
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "ਇਸ ਕਾਰਜ ਬਾਰੇ"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "ਕੰਟਰੋਲ ਕੇਂਦਰ ਦੀ ਉਪੱਰੀ ਝਲਕ"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_ਇਸ ਬਾਰੇ"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_ਭਾਗ"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_ਸਹਾਇਤਾ"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "ਗਨੋਮ ਸੰਰਚਨਾ ਸੰਦ"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "ਸ਼ੈਲ ਹੀ ਵਰਤੋ, ਭਾਵੇ ਕਿ ਨਟਾਲਿਸ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ|"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "ਵਾਲੀਅਮ"
@@ -2591,7 +2567,7 @@ msgstr ""
 "ਗਲਤੀ ਜਡੋ ਕਿ ਚਲਾਉਣ (%s) ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ\n"
 "ਜੋ ਕਿ ਕੀ(%s) ਨਾਲ ਸੰਬੰਧ ਹੈ"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2616,7 +2592,7 @@ msgstr ""
 "- ਨਤੀਜਾ<b>xprop -root | grep XKB</b>\n"
 "- ਨਤੀਜਾ <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2627,22 +2603,22 @@ msgstr ""
 "ਜਟਿਲ XKB ਸੰਰਚਨਾ ਵਿੱਚ ਜਾਣੀ-ਪਛਾਣੀਆ ਮੁਸ਼ਕਿਲ ਹਨ|\n"
 "ਸਧਾਰਨ ਸੰਰਚਨਾ ਵਰਤੋ ਜਾਂ XFree  ਦਾ ਹੋਰ ਨਵਾਂ ਵਰਜਨ ਲੈਕੇ ਕੋਸ਼ਿਸ ਕਰੋ|"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 "X ਸਿਸਟਮ ਕੀ-ਬੋਰਡ ਵਿਵਸਥਾ ਗਨੋਮ ਕੀ-ਬੋਰਡ ਵਿਵਸਥਾ ਤੋਂ ਵੱਖਰੀ ਹੈ। ਤੁਸੀਂ ਕਿਸ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "X ਵਿਵਸਥਾ ਵਰਤੋਂ"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "ਗਨੋਮ ਵਿਵਸਥਾ ਵਰਤੋਂ"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2706,8 +2682,8 @@ msgstr "_ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਉ"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "ਧੁਨੀ ਫਾਇਲ %s ਨੂੰ ਨਮੂਨੇ %s ਦੁ ਤੌਰ ਤੇ ਲੋਡ ਨਹੀ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "ਉਪਭੋਗਤਾ ਦੀ ਸਥਾਨਿਕ ਡਾਇਕਰੈਕਟਰੀ ਨਹੀ ਜਾਣੀ ਜਾ ਸਕੀ ਹੈ"
 
@@ -2756,11 +2732,11 @@ msgstr "ਪਰਦਾ"
 msgid "Screen on which BGApplier is to draw"
 msgstr "ਪਰਦਾ, ਜਿਸ ਉਪੱਰ BGApplier ਨੂੰ ਉਲੀਕਣਾ ਹੈ"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "ਇਸ ਘਟਨਾ ਲਈ ਧੁਨੀ ਫਾਇਲ ਉਪਲੱਬਧ ਨਹੀ ਹੈ।"
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2770,32 +2746,32 @@ msgstr ""
 "ਤੁਸੀ ਗਨੋਮ-ਆਡੀਓ ਪੈਕੇਜ ਨੂੰ ਮੂਲ ਫਾਇਲ ਲਈ\n"
 "ਇੰਸਟਾਲ ਕਰਨਾ ਚਾਹੋਗੇ।"
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "ਫਾਇਲ %s ਇੱਕ ਠੀਕ ਵੇਵ(wav) ਫਾਇਲ ਨਹੀ ਹੈ"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "ਘਟਨਾ"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "ਧੁਨੀ ਫਾਇਲ"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_ਧੁਨੀਃ"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "ਧੁਨੀ _ਫਾਇਲਃ"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "ਧੁਨੀ ਫਾਇਲ ਚੁਣੋ"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_ਚਲਾਉ"
 
@@ -3049,27 +3025,75 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"ਬੜੀ ਛੇਤੀ, ਜੀ-ਕਾਨਫ ਵਿੱਚ XKB ਨਿਰਧਾਰਨ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ (ਸਿਸਟਮ ਦੀ ਸੰਰਚਨਾ ਵਿੱਚੋ)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB ਕੀ-ਬੋਰਡ ਖਾਕਾ"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB ਕੀ-ਬੋਰਡ ਮਾਡਲ"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB ਚੋਣ"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "ਕੀ-ਬੋਰਡ ਮਾਡਲਃ"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB ਕੀ-ਬੋਰਡ ਖਾਕਾ"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "ਕੀ-ਬੋਰਡ ਮਾਡਲਃ"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "ਜੀ-ਕਾਨਫ ਵਿੱਚ XKB ਨਿਰਧਾਰਨ ਨੂੰ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ ਸਿਸਟਮ ASAP ਨਾਲ"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"ਬੜੀ ਛੇਤੀ, ਜੀ-ਕਾਨਫ ਵਿੱਚ XKB ਨਿਰਧਾਰਨ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ (ਸਿਸਟਮ ਦੀ ਸੰਰਚਨਾ ਵਿੱਚੋ)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB ਕੀ-ਬੋਰਡ ਖਾਕਾ"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB ਕੀ-ਬੋਰਡ ਮਾਡਲ"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "ਅੰਤਰਾਲ ਨੂੰ ਮੁਲਤਵੀ ਕਰੋ"
@@ -3144,46 +3168,14 @@ msgstr ""
 "ਹੈ ਹੀ ਨਹੀ| ਤੁਸੀ ਇਸ ਨੂੰ ਪੈਨਲ ਤੇ ਸੱਜਾ ਬਟਨ ਦਬਾਕੇ ਅਤੇ 'ਪੈਨਲ ਵਿੱਚ ਜੋੜੋ -> ਸਹੂਲਤਾਂ-> ਟਿੱਪਣੀ-ਖੇਤਰ' "
 "ਨਾਲ ਇਸ ਨੂੰ ਲਿਆ ਸਕਦੇ ਹੋ|"
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "ੳਅੲਸਹਕਖਗਘਚਛਜਝਙਟਠਡਢਞਤਥਦਧਨਪਫਬਭਮਯਰਲਵੜਸ਼ਖ਼ਗ਼ਜ਼ਲ਼ਫ਼| ੦੧੨੩੪੫੬੭੮੯"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "ਨਾਂਃ"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "ਸ਼ੈਲੀਃ"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "ਕਿਸਮਃ"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "ਅਕਾਰਃ"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "ਵਰਜਨਃ"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "ਹੱਕ ਰਾਖਵੇ ਹਨਃ"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "ਵੇਰਵਾਃ"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "ਵਰਤੋਂ: %s fontfile\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "ਕਾਰਜ ਫੋਟ ਨਿਰਧਾਰਤ ਕਰੋ"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "ਫੋਟ ਪ੍ਰਸੰਗ ਮੇਨੂ ਇਕਾਈਆਂ"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "ਆਪਣੇ ਮੂਲ ਕਾਰਜ ਚੁਣੋ"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3251,33 +3243,47 @@ msgstr "ਕੀ ਫੋਟ ਟਰੂ-ਟਾਈਪ(TrueType) ਨੂੰ ਥੰਬਨ
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "ਕੀ ਫੋਟ ਟਾਈਪ ੧(Type1) ਨੂੰ ਥੰਬਨੇਲ ਕਰਨਾ ਹੈ"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "ਫੋਟੀਲਸ ਪ੍ਰਸੰਗ ਮੇਨੂ ਲਈ ਫੈਕਟਰੀ"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "ੳਅੲਸਹਕਖਗਘਚਛਜਝਙਟਠਡਢਞਤਥਦਧਨਪਫਬਭਮਯਰਲਵੜਸ਼ਖ਼ਗ਼ਜ਼ਲ਼ਫ਼| ੦੧੨੩੪੫੬੭੮੯"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "ਫੋਟੀਲਸ ਪ੍ਰਸੰਗ ਮੇਨੂ"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "ਨਾਂਃ"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "ਫੋਟੀਲਸ ਪ੍ਰਸੰਗ ਮੇਨੂ ਫੈਕਟਰੀ"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "ਸ਼ੈਲੀਃ"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "ਨਟਾਲਿਸ ਪ੍ਰਸੰਗ ਮੇਨੂ ਇੰਦਰਾਜ ਲਈ ਫੋਟ"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "ਕਿਸਮਃ"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "ਕਾਰਜ ਫੋਟ ਨਿਰਧਾਰਤ ਕਰੋ"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "ਅਕਾਰਃ"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "ਵਰਜਨਃ"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "ਹੱਕ ਰਾਖਵੇ ਹਨਃ"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "ਸਰੂਪ ਵਿਸ਼ੇਸਤਾ ਭਾਗ ਦਰਿਸ਼ ਹਿੱਸਾ"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "ਵੇਰਵਾਃ"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "ਥੰਮ ਸਰੂਪ ਵਿਸ਼ੇਸਤਾ ਦਰਿਸ਼"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "ਵਰਤੋਂ: %s fontfile\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3305,27 +3311,18 @@ msgstr "ਫੋਟ ਲਾਗੂ ਕਰੋ"
 msgid "Themes"
 msgstr "ਸਰੂਪ"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "ਕੰਟਰੋਲ ਸਰੂਪ"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "ਝਰੋਖਾ ਹਾਸ਼ੀਆ ਸਰੂਪ"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "ਆਈਕਾਨ ਸਰੂਪ"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "ਮੌਜੂਦਾ ਦਿੱਸ ਰਿਹਾ URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "ਜੇਕਰ ਸੱਚ ਹੈ ਤਾਂ, ਇੰਸਟਾਲ ਸਰੂਪ ਥੰਬਨੇਲ ਬਣ ਜਾਣਗੇ|"
@@ -3358,3 +3355,149 @@ msgstr "ਕੀ ਇੰਸਟਾਲ ਸਰੂਪ ਨੂੰ ਥੰਬਨੇਲ ਕ�
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "ਕੀ ਸਰੂਪ ਨੂੰ ਥੰਬਨੇਲ ਕਰਨਾ ਹੈ"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "ਫੋਟ ਲਾਗੂ ਕਰੋ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "ਮੂਲ ਮੁੜ ਨਿਰਧਾਰਿਤ ਕਰੋ"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "ਮੌਜੀਲਾ/ਨੈਟਸਕੇਪ 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "ਗਨੋਮ ਟਰਮੀਨਲ"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_ਸੰਪਾਦਕ ਪਸੰਦ"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "ਮੇਲ ਰੀਡਰ ਪਸੰਦਃ"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "ਟਰਮੀਨਲ ਪਸੰਦਃ"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "ਵੈਬ ਬਰਾਊਜਰ ਪਸੰਦਃ"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "_ਟਰਮੀਨਲ ਵਿੱਚ ਚਲਾਉ"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "ਇਹ ਕਾਰਜ _URIs ਖੋਲ ਸਕਦਾ ਹੈ"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "ਇਹ ਕਾਰਜ ਨੂੰ ਸੈਲ ਵਿੱਚ ਚਲਾਉਣ ਦੀ ਜ਼ਰੂਰਤ ਹੈ"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "ਮੇਲ ਰੀਡਰ _ਚੁਣੋਃ"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "ਟਰਮੀਨਲ _ਚੁਣੋਃ"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "ਵੈਬ ਬਰਾਊਜ਼ਰ _ਚੁਣੋਃ"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "ਸੰਪਾਦਕ _ਚੁਣੋਃ"
+
+#~ msgid "Accessibility"
+#~ msgstr "ਸੁਲੱਭਤਾ"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "ਸੁਲੱਭਤਾ ਨਿਰਧਾਰਨ"
+
+#~ msgid "Advanced"
+#~ msgstr "ਤਕਨੀਕੀ"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "ਤਕਨੀਕੀ ਨਿਰਧਾਰਨ"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "ਨੈੱਟਵਰਕ ਪਰਾਕਸੀ ਸੰਰਚਨਾ"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ: %s"
+
+#~ msgid "Layout"
+#~ msgstr "ਖਾਕਾ"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "ਕੈਪਲਿਟ ਦੇ ਦਰਿਸ਼ ਦੇ ਵਰਤਣ ਲਈ ਖਾਕਾ"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "ਕੈਪਲਿਟ ਡਾਇਕਰੈਕਟਰੀ ਇਕਾਈ"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "ਕੈਪਲਿਟ ਡਾਇਕਰੈਕਟਰੀ, ਜੋ ਕਿ ਇਹ ਦਰਿਸ਼ ਵੇਖਾ ਰਿਹਾ ਹੈ"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ <amanpreetalam@yahoo.com> \n"
+#~ "ਜਸਵਿੰਦਰ ਸਿੰਘ ਫੂਲੇਵਾਲਾ <jaswinderlinux@netscape.net"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "ਵਿਹੜਾ ਵਿਸ਼ੇਸਤਾ ਪ੍ਰਬੰਧਕ।"
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "ਭਾਵੇ ਕਿ ਨਟਾਲਿਸ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ, ਇਹ ਹੀ ਵਰਤੋਂ|"
+
+#~ msgid "About this application"
+#~ msgstr "ਇਸ ਕਾਰਜ ਬਾਰੇ"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "ਕੰਟਰੋਲ ਕੇਂਦਰ ਦੀ ਉਪੱਰੀ ਝਲਕ"
+
+#~ msgid "_About"
+#~ msgstr "_ਇਸ ਬਾਰੇ"
+
+#~ msgid "_Contents"
+#~ msgstr "_ਭਾਗ"
+
+#~ msgid "_Help"
+#~ msgstr "_ਸਹਾਇਤਾ"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "ਸ਼ੈਲ ਹੀ ਵਰਤੋ, ਭਾਵੇ ਕਿ ਨਟਾਲਿਸ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ|"
+
+#~ msgid "XKB options"
+#~ msgstr "XKB ਚੋਣ"
+
+#~ msgid "Font context menu items"
+#~ msgstr "ਫੋਟ ਪ੍ਰਸੰਗ ਮੇਨੂ ਇਕਾਈਆਂ"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "ਫੋਟੀਲਸ ਪ੍ਰਸੰਗ ਮੇਨੂ ਲਈ ਫੈਕਟਰੀ"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "ਫੋਟੀਲਸ ਪ੍ਰਸੰਗ ਮੇਨੂ"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "ਫੋਟੀਲਸ ਪ੍ਰਸੰਗ ਮੇਨੂ ਫੈਕਟਰੀ"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "ਨਟਾਲਿਸ ਪ੍ਰਸੰਗ ਮੇਨੂ ਇੰਦਰਾਜ ਲਈ ਫੋਟ"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "ਸਰੂਪ ਵਿਸ਼ੇਸਤਾ ਭਾਗ ਦਰਿਸ਼ ਹਿੱਸਾ"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "ਥੰਮ ਸਰੂਪ ਵਿਸ਼ੇਸਤਾ ਦਰਿਸ਼"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "ਮੌਜੂਦਾ ਦਿੱਸ ਰਿਹਾ URI"
diff --git a/po/pl.po b/po/pl.po
index ad20198c4..f90041293 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-08-03 14:22+0200\n"
 "Last-Translator: Gnome PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -64,11 +64,11 @@ msgstr "Klawiatura ekran_owa"
 msgid "_Screenreader"
 msgstr "Czy_tnik ekranowy"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Obsługa technologii wspierających"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Włączenie obsługi dla technologii wspierających GNOME przy logowaniu"
 
@@ -122,13 +122,13 @@ msgstr "Zaimportowanie pliku ustawienia właściwości"
 msgid "_Import"
 msgstr "_Zaimportuj"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Klawiatura"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Ustawienia dostępności klawiatury"
 
@@ -345,11 +345,11 @@ msgstr "pikseli/sekundę"
 msgid "seconds"
 msgstr "sekund"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Zmiana ustawień tła pulpitu"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Tło pulpitu"
 
@@ -429,6 +429,13 @@ msgstr "Dodawanie tapety"
 msgid "No Wallpaper"
 msgstr "Bez tapety"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -631,105 +638,15 @@ msgstr "Wybór obrazu tła"
 msgid "_Select"
 msgstr "_Wybierz"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Preferowane aplikacje"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Wybór domyślnych aplikacji"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Przeglądarka tekstowa W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Przeglądarka tekstowa Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Przeglądarka tekstowa Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Czytnik poczty Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Poczta Mozilli"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Terminal GNOME"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Standardowy XTerminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXTerm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Wprowadź nazwę edytora i uruchamiające go polecenie."
@@ -739,20 +656,23 @@ msgid "Add..."
 msgstr "Dodaj..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Wła_sny edytor:"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Dowolny"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "_Dowolny czytnik poczty:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Dowolny"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "_Dowolny terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "_Dowolna przeglądarka WWW:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Aplikacja potrafi otwierać _wielu plików"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -799,6 +719,16 @@ msgid "Mail Reader"
 msgstr "Czytnik poczty"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Uruchamianie w t_erminalu"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Uruchamianie w t_erminalu"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -806,94 +736,169 @@ msgstr ""
 "Wybierz menedżera okien, z którego chcesz korzystać. Aby ustawienie weszło w "
 "życie, wciśnij Zastosuj."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Uruchamianie w t_erminalu"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Edytor tekstu"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Aplikacja potrafi otwierać _URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Aplikacja potrafi otwierać _wielu plików"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Aplikacja musi być uruchamiana z poziomu powłoki"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Obsługa protokołu zdalnego sterowania przeglądarek _Netscape"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Używanie tego _edytora przy otwieraniu plików tekstowych przez menedżera "
 "plików"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Przeglądarka WWW"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Menedżer okien"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_Polecenie:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Ustawienia..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Wybór czytnika poczty z listy:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Wybierz"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+msgid "Debian Sensible Browser"
+msgstr "Inteligentna przeglądarka Debiana"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+#, fuzzy
+msgid "Firefox"
+msgstr "FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Poczta Mozilli"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Przeglądarka tekstowa W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Przeglądarka tekstowa Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Przeglądarka tekstowa Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Czytnik poczty Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Poczta Mozilli"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "Wybór terminala z _listy:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+msgid "Debian Terminal Emulator"
+msgstr "Emulator terminala Debiana"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "Wybór przeglądarki WWW z _listy:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "Wybór edytora z _listy:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Standardowy XTerminal"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Dostępność"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXTerm"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Ustawienia dostępności"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Zaawansowane"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXTerm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Zaawansowane ustawienia"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Zmiana rozdzielczości ekranu"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Rozdzielczość ekranu"
 
@@ -987,7 +992,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Czy na pewno chcesz trwale usunąć ten wpis?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Opis"
 
@@ -995,17 +1000,27 @@ msgstr "Opis"
 msgid "Extensions"
 msgstr "Rozszerzenia"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Typy plików i programy"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Konfiguracja programów używanych do otwierania i wyświetlania różnych typów "
 "plików"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Typy plików i programy"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Konfiguracja programów używanych do otwierania i wyświetlania różnych typów "
+"plików"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Czynności"
@@ -1096,6 +1111,7 @@ msgid "_Protocol:"
 msgstr "Nazwa pr_otokołu:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Usuń"
 
@@ -1103,16 +1119,6 @@ msgstr "_Usuń"
 msgid "_Viewer component:"
 msgstr "_Komponent przeglądarki:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Typy plików i programy"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Konfiguracja programów używanych do otwierania i wyświetlania różnych typów "
-"plików"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Modyfikacja kategorii pliku"
@@ -1294,14 +1300,15 @@ msgid "Electronic mail transmission"
 msgstr "Przesyłanie poczty elektronicznej"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Dokumentacja GNOME"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Czcionki"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Wybór czcionek używanych w środowisku"
 
@@ -1521,29 +1528,29 @@ msgid "The type of accelerator."
 msgstr "Tryb akceleratora."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Nieaktywny"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Nieznana czynność>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Biurko"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Zarządzanie oknami"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1552,29 +1559,29 @@ msgstr ""
 "Skrót \"%s\" jest już wykorzystywany na:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Przy ustawianiu nowego akceleratora w bazie danych konfiguracji wystąpił "
 "błąd: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Przy czyszczeniu akceleratora w bazie danych konfiguracji wystąpił błąd: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Czynność"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Skrót"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Skróty klawiszowe"
 
@@ -1586,23 +1593,10 @@ msgstr ""
 "Aby zmodyfikować klawisz skrótu, kliknij na odpowiednim wierszu i podaj nowy "
 "akcelerator, lub przyciśnij klawisz backspace aby wyczyścić obecny."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Powiązania skrótów klawiszowych z poleceniami"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modele"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Podgląd układu klawiatury"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1769,10 +1763,32 @@ msgstr "Długość czasu p_racy:"
 msgid "minutes"
 msgstr "minut"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modele"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Podgląd układu klawiatury"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Ustawienia klawiatury"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Ustawienia myszy"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Nieznany wskaźnik"
@@ -1937,20 +1953,21 @@ msgstr "Prz_esunięcie progowe:"
 msgid "_Timeout:"
 msgstr "_Opóźnienie:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Mysz"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Ustawienia myszy"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Pośrednik sieciowy"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Ustawienia pośrednika sieciowego"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1994,7 +2011,8 @@ msgid "H_TTP proxy:"
 msgstr "Pośrednik _HTTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
+#, fuzzy
+msgid "Network Proxy Preferences"
 msgstr "Ustawienia pośrednika sieciowego"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
@@ -2034,7 +2052,7 @@ msgstr "_Hasło:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Bezpieczny pośrednik HTTP:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Wykorzystanie dźwięku i powiązania dźwięków ze zdarzeniami"
 
@@ -2092,15 +2110,26 @@ msgstr ""
 "\"Ustawiania motywu\" są niepoprawnie zainstalowane, lub nie zainstalowano "
 "pakietu \"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Nie podano położenia pliku motywu do instalacji"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Podane położenie pliku motywu do instalcji jest nieprawidłowe"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2134,12 +2163,12 @@ msgstr "Motyw musi mieć nazwę"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Motyw już istnieje. Czy chcesz go zastapić?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Wybór motywów różnych części środowiska"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Motyw"
 
@@ -2252,11 +2281,11 @@ msgstr "_Nazwa motywu:"
 msgid "theme selection tree"
 msgstr "drzewo wyboru motywu"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Dopasowanie wyglądu pasków narzędziowych i pasków menu w aplikacjach"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Paski menu i narzędziowe"
 
@@ -2325,7 +2354,6 @@ msgid "_Edit"
 msgstr "_Edycja"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Plik"
 
@@ -2353,6 +2381,14 @@ msgstr "Za_kończ"
 msgid "_Save"
 msgstr "_Zapisz"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2364,23 +2400,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (lub \"klawisz Windows\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2422,14 +2458,34 @@ msgstr "_Wysunięcie zaznaczonego okna po upływie czasu"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Zaznaczanie okna po umieszczeniu wskaźnika nad jego obszarem"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Ustawienia okien"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Okna"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Centrum Sterowania GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Ustawienia tła pulpitu"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Inne"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Narzędzie konfiguracyjne GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Centrum sterowania"
@@ -2458,85 +2514,6 @@ msgstr "Generator widoku centrum sterowania"
 msgid "View as Control Center"
 msgstr "Wyświetlanie jako centrum sterowania"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Centrum Sterowania GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Układ"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Układ używany dla tego widoku apletów centrum sterowania"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Obiekt katalogu apletów centrum sterowania"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Katalog apletów centrum sterowania wyświetlany przez ten obiekt"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "GNOME PL Team <translators@gnome.pl>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Centrum Sterowania GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Menedżer właściwości środowiska."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Centrum Sterowania GNOME : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Inne"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Centrum Sterowania GNOME"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Wykorzystuje nautilusa jeśli jest uruchomiony."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Informacje o aplikacji"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Podsumowanie Panelu Sterowania"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Informacje o"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Zawartość"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "Pomo_c"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Narzędzie konfiguracyjne GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Wykorzystuje powłokę, nawet jeśli uruchomiony jest Nautilus."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Głośność"
@@ -2645,7 +2622,7 @@ msgstr ""
 "Wystąpił błąd przy próbie uruchomienia programu (%s)\n"
 "który jest powiązany z kluczem (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2670,7 +2647,7 @@ msgstr ""
 "- Wynik polecenia <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</"
 "b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2681,7 +2658,7 @@ msgstr ""
 "Znane są problemy ze skomplikowanymi konfiguracjami XKB.\n"
 "Spróbuj użyć prostszej konfiguracji lub weź świeższą wersję XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2689,15 +2666,15 @@ msgstr ""
 "Ustawienia klawiatury X różnią się od bieżących ustawień klawiatury GNOME. "
 "Których ustawień chcesz użyć?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Ustawinia X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Ustawienia GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2763,8 +2740,8 @@ msgstr "_Nie wyświetlaj więcej tego komunikatu"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nie można wczytać pliku dźwiękowego %s jako próbki %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Nie można określić domowego katalogu użytkownika"
 
@@ -2817,11 +2794,11 @@ msgstr "Ekran"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Okno, na którym ma być rysowany BGApplier"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Plik dźwiękowy powiązany z tym zdarzeniem nie istnieje."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2831,32 +2808,32 @@ msgstr ""
 "Zestaw domyślnych dźwięków dostępny jest w\n"
 "pakiecie gnome-audio."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Plik %s nie jest poprawnym plikiem wav"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Plik dźwiękowy"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Dźwięki:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "P_lik dźwiękowy:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Wybór pliku dźwiękowego"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Odtwórz"
 
@@ -3120,29 +3097,77 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Niedługo, ustawienia XKB w gconf będą nadpisane (z konfiguracji systemu)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Układ klawiatury XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Model klawiatury XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Opcje XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Model klawiatury:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Układ klawiatury XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Model klawiatury:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Skróty klawiszowe"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "Ustawienia XKB w gconf będą nadpisane przez system najszybciej jak to tylko "
 "możliwe"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Niedługo, ustawienia XKB w gconf będą nadpisane (z konfiguracji systemu)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Układ klawiatury XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Model klawiatury XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "O_droczenie przerwy"
@@ -3220,46 +3245,14 @@ msgstr ""
 "go dodać klikając prawym przyciskiem myszy na panelu a następnie wybierając "
 "\"Dodaj do panelu -> Narzędzia -> Obszar powiadamiania\"."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Pchnąć w tę łódź jeża lub osiem skrzyń fig. ĄĆĘŁŃÓŚŹŻ 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nazwa:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Styl:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Typ:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Rozmiar:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Wersja:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Opis:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "użycie: %s plikczcionki\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Ustaw jako czcionkę aplikacji"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Elementy menu kontekstowego czcionki"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Wybór domyślnych aplikacji"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3335,33 +3328,47 @@ msgstr "Określa, czy należy tworzyć miniaturki dla czcionek TrueType"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Określa, czy należy tworzyć miniaturki dla czcionek Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Generator menu kontekstowego programu Fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Pchnąć w tę łódź jeża lub osiem skrzyń fig. ĄĆĘŁŃÓŚŹŻ 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Menu kontekstowe programu Fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nazwa:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Generator menu kontekstowego programu Fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Styl:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Wpisy menu kontekstowego dla czcionek w programie Nautilus"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Typ:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Ustaw jako czcionkę aplikacji"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Rozmiar:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Wersja:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponent widoku zawartości z ustawieniami motywu"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Opis:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Widok ustawień motywu programu Themus"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "użycie: %s plikczcionki\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Centrum Sterowania GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3389,27 +3396,18 @@ msgstr "Zastosuj _czcionkę"
 msgid "Themes"
 msgstr "Motywy"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Motyw kontrolny"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Motyw krawędzi okna"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Motyw ikony"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Aktualnie wyświetlany URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "aąbcćdeęfghi AĄBCĆDEĘFGHI"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Określa, czy powinny być tworzone miniaturki zainstalowanych motywów."
@@ -3447,14 +3445,149 @@ msgstr "Tworzenie miniaturek zainstalowanych motywów"
 msgid "Whether to thumbnail themes"
 msgstr "Tworzenie miniaturek motywów"
 
-#~ msgid "Debian Sensible Browser"
-#~ msgstr "Inteligentna przeglądarka Debiana"
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "aąbcćdeęfghi AĄBCĆDEĘFGHI"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Zastosuj _czcionkę"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "P_rzywrócenie wartości domyślnych"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminal GNOME"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Wła_sny edytor:"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "_Dowolny czytnik poczty:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "_Dowolny terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "_Dowolna przeglądarka WWW:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Uruchamianie w t_erminalu"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Aplikacja potrafi otwierać _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Aplikacja musi być uruchamiana z poziomu powłoki"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Wybór czytnika poczty z listy:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "Wybór terminala z _listy:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "Wybór przeglądarki WWW z _listy:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "Wybór edytora z _listy:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Dostępność"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Ustawienia dostępności"
+
+#~ msgid "Advanced"
+#~ msgstr "Zaawansowane"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Zaawansowane ustawienia"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Ustawienia pośrednika sieciowego"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Centrum Sterowania GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Układ"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Układ używany dla tego widoku apletów centrum sterowania"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Obiekt katalogu apletów centrum sterowania"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Katalog apletów centrum sterowania wyświetlany przez ten obiekt"
+
+#~ msgid "translator_credits"
+#~ msgstr "GNOME PL Team <translators@gnome.pl>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Menedżer właściwości środowiska."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Centrum Sterowania GNOME : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Centrum Sterowania GNOME"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Wykorzystuje nautilusa jeśli jest uruchomiony."
+
+#~ msgid "About this application"
+#~ msgstr "Informacje o aplikacji"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Podsumowanie Panelu Sterowania"
+
+#~ msgid "_About"
+#~ msgstr "_Informacje o"
+
+#~ msgid "_Contents"
+#~ msgstr "_Zawartość"
+
+#~ msgid "_Help"
+#~ msgstr "Pomo_c"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Wykorzystuje powłokę, nawet jeśli uruchomiony jest Nautilus."
+
+#~ msgid "XKB options"
+#~ msgstr "Opcje XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Elementy menu kontekstowego czcionki"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Generator menu kontekstowego programu Fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menu kontekstowe programu Fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Generator menu kontekstowego programu Fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Wpisy menu kontekstowego dla czcionek w programie Nautilus"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponent widoku zawartości z ustawieniami motywu"
 
-#~ msgid "FireFox"
-#~ msgstr "FireFox"
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Widok ustawień motywu programu Themus"
 
-#~ msgid "Debian Terminal Emulator"
-#~ msgstr "Emulator terminala Debiana"
+#~ msgid "URI currently displayed"
+#~ msgstr "Aktualnie wyświetlany URI"
 
 #~ msgid "GNOME Default"
 #~ msgstr "Domyślne GNOME"
diff --git a/po/pt.po b/po/pt.po
index be5b045af..b75f9df52 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-06 02:50+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -61,11 +61,11 @@ msgstr "Teclado No _Ecrã"
 msgid "_Screenreader"
 msgstr "_Locutor de Ecrã"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Suporte para Tecnologias Assistivas"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Activar suporte para tecnologias assistivas GNOME ao iniciar sessão"
 
@@ -119,13 +119,13 @@ msgstr "Importar Ficheiro de Configuração de Funcionalidades"
 msgid "_Import"
 msgstr "_Importar"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Defina as suas preferências de acessibilidade do teclado"
 
@@ -340,11 +340,11 @@ msgstr "pixels/segundo"
 msgid "seconds"
 msgstr "segundos"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Altere a definição de Fundo da sua Área de Trabalho"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Fundo da Área de Trabalho"
 
@@ -423,6 +423,13 @@ msgstr "Adicionar Papel de Parede"
 msgid "No Wallpaper"
 msgstr "Sem Papel de Parede"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -628,105 +635,15 @@ msgstr "Seleccione uma imagem."
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Aplicações Preferidas"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Seleccione as suas aplicações por omissão"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Navegador Web em Texto W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Navegador Web em Texto Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Navegador Web em Texto Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Leitor de Correio Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Consola Gnome"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "XTerminal Standard"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Especifique um nome e um comando para este editor."
@@ -736,20 +653,23 @@ msgid "Add..."
 msgstr "Adicionar..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Editor Personali_zado"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Personalizado"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Leitor de Correio Personali_zado:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Personalizado"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Consola Personali_zada:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Navegador Web Personali_zado:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Esta aplicação pode abrir _múltiplos ficheiros"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -796,6 +716,16 @@ msgid "Mail Reader"
 msgstr "Leitor de Correio"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Execu_tar na Consola"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Execu_tar na Consola"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -803,93 +733,169 @@ msgstr ""
 "Seleccione o gestor de janelas que deseja.  Terá de primir aplicar, agitar a "
 "varinha mágica, e fazer uma dança mágica para que funcione."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Iniciar na Cons_ola"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Consola"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Editor de Texto"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Esta aplicação pode abrir _URIs"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Esta aplicação pode abrir _múltiplos ficheiros"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Esta aplicação tem de ser executada numa con_sola"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Compreende Controlo Remoto _Netscape"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Utilize este _editor para abrir ficheiros de texto no gestor de ficheiros"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Navegador Web"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Gestor de Janelas"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Co_mando:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Seleccione um Leitor de Correio:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Seleccionar"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Navegador Web Por Omissão"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Navegador Web em Texto W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Navegador Web em Texto Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Navegador Web em Texto Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Leitor de Correio Evolution"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Seleccione uma Consola:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Seleccione um Navegador Web:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Seleccione um Editor:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Acessibilidade"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Configurações de Acessibilidade"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Avançado"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Consola Por Omissão"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Configurações Avançadas"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Consola"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "XTerminal Standard"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Alterar resolução de ecrã"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Resolução de Ecrã"
 
@@ -980,7 +986,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Tem a certeza que deseja remover definitivamente esta entrada?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Descrição"
 
@@ -988,17 +994,27 @@ msgstr "Descrição"
 msgid "Extensions"
 msgstr "Extensões"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Tipos de Ficheiros e Aplicações"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Especifique que aplicações são utilizadas para abrir ou visualizar cada tipo "
 "de ficheiro"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Tipos de ficheiros e aplicações"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Especifique que aplicações utilizar para abrir ou visualizar cada tipo de "
+"ficheiro"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Acções"
@@ -1089,6 +1105,7 @@ msgid "_Protocol:"
 msgstr "_Protocolo:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -1096,16 +1113,6 @@ msgstr "_Remover"
 msgid "_Viewer component:"
 msgstr "Componente de _visualização:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Tipos de ficheiros e aplicações"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Especifique que aplicações utilizar para abrir ou visualizar cada tipo de "
-"ficheiro"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Editar categoria de ficheiro"
@@ -1287,14 +1294,15 @@ msgid "Electronic mail transmission"
 msgstr "Transmissão de correio electrónico"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Documentação Gnome"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Fonte"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Seleccionar fontes para o ambiente de trabalho"
 
@@ -1499,29 +1507,29 @@ msgid "The type of accelerator."
 msgstr "O tipo de atalho."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Inactivo"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Acção Desconhecida>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Ambiente de Trabalho"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Som"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Gestão de Janelas"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1530,27 +1538,27 @@ msgstr ""
 "O atalho \"%s\" já está em utilização para:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Erro ao definir novo atalho na base de dados de configuração: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Erro ao remover definição de atalho na base de dados de configuração: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Acção"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Atalho"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de Teclado"
 
@@ -1562,23 +1570,10 @@ msgstr ""
 "Para editar um atalho, clique na linha correspondente e introduza um novo "
 "atalho, ou prima backspace para limpar."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Associar atalhos de teclado a comandos"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modelos"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Antevisão da disposição de teclado"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1747,10 +1742,32 @@ msgstr "_Período de trabalho dura:"
 msgid "minutes"
 msgstr "minutos"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modelos"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Antevisão da disposição de teclado"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Defina as suas preferências de teclado"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "Preferências de Idioma e Cultura"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+msgid "Set your language and culture preferences"
+msgstr "Defina o seu idioma e preferências de cultura"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Cursor Desconhecido"
@@ -1915,20 +1932,21 @@ msgstr "_Tolerância:"
 msgid "_Timeout:"
 msgstr "E_xpiração:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Rato"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Defina as suas preferências do rato"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Proxy de Rede"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Preferências da proxy de rede"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1972,8 +1990,9 @@ msgid "H_TTP proxy:"
 msgstr "Proxy H_TTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Configuração da Proxy de Rede"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Preferências da proxy de rede"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2011,7 +2030,7 @@ msgstr "Se_nha:"
 msgid "_Secure HTTP proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Activar sons e associar sons a eventos"
 
@@ -2069,15 +2088,26 @@ msgstr ""
 "o seu diálogo \"Preferências de Temas\" foi incorrectamente instalado ou que "
 "não instalou o pacote \"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Não foi especificada a localização de ficheiro de tema a instalar"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "A localização de ficheiro de tema a instalar é inválida"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2112,12 +2142,12 @@ msgstr "Tem de existir o nome do tema"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "O tema já existe. Deseja substituí-lo?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Seleccione temas para várias partes do ambiente de trabalho"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2229,12 +2259,12 @@ msgstr "Nome do _tema:"
 msgid "theme selection tree"
 msgstr "árvore de selecção de temas"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 "Personalize a aparência das barras de ferramentas e menus nas aplicações"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menus & Barras de Ferramentas"
 
@@ -2303,7 +2333,6 @@ msgid "_Edit"
 msgstr "_Editar"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -2331,6 +2360,14 @@ msgstr "_Sair"
 msgid "_Save"
 msgstr "_Gravar"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2343,23 +2380,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Controlo"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (ou \"logotipo Windows\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2400,14 +2437,34 @@ msgstr "Eleva_r janelas seleccionadas após um intervalo"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Seleccionar janelas quando o rato se move sobre elas"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Propriedades de Janela"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Janelas"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Centro de Controlo GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Preferências do Papel de Parede da Área de Trabalho"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Outros"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "A ferramenta de configuração GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Centro de Controlo"
@@ -2436,85 +2493,6 @@ msgstr "Fábrica de vista do Centro de Controlo"
 msgid "View as Control Center"
 msgstr "Ver como Centro de Controlo"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Centro de Controlo GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Disposição"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Disposição a utilizar para esta vista das capplets"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Objecto de directório de capplet"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Directório de capplet que esta vista apresenta"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Duarte Loreto <happyguy_pt@hotmail.com>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Centro de Controlo GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Gestor de propriedades do ambiente de trabalho."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Centro de Controlo Gnome : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Outros"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Centro de Controlo Gnome"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Utilizar o nautilus se este estiver em execução."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Sobre esta aplicação"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Resumo do centro controlo"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Sobre"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Conteúdo"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Ajuda"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "A ferramenta de configuração GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Utilizar consola mesmo que o nautilus esteja em execução."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volume"
@@ -2623,7 +2601,7 @@ msgstr ""
 "Erro ao tentar executar (%s)\n"
 "que está associado à tecla (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2649,7 +2627,7 @@ msgstr ""
 "- O resultado de <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</"
 "b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2661,7 +2639,7 @@ msgstr ""
 "Tente utilizar uma configuração mais simples ou utilizar uma versão mais "
 "recente do XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2669,15 +2647,15 @@ msgstr ""
 "As definições de teclado do sistema X diferem das definições de teclado "
 "GNOME actuais.  Que definições deseja utilizar?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Utilizar as definições X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Utilizar as definições do GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2742,8 +2720,8 @@ msgstr "_Não apresentar novamente esta mensagem"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Incapaz de ler ficheiro de som %s como amostra %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Incapaz de determinar directório pessoal do utilizador"
 
@@ -2793,11 +2771,11 @@ msgstr "Ecrã"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Ecrã onde deverá ser desenhado o BGApplier"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "O ficheiro de som para este evento não existe."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2807,32 +2785,32 @@ msgstr ""
 "Poderá desejar instalar o pacote gnome-audio que contêm\n"
 "um conjunto de sons por omissão."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "O ficheiro %s não é um ficheiro wav válido"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Evento"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Ficheiro de Som"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Sons:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Ficheiro de som:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Seleccione um Ficheiro de Som"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Reproduzir"
 
@@ -3093,30 +3071,78 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Brevemente, as definições XKB no gconf serão sobrepostas (pelas da "
-"configuração do sistema)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Disposição de teclado XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Modelo de teclado XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Opções XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Modelo do teclado:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Disposição de teclado XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Modelo do teclado:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Atalhos de Teclado"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "As definições XKB no gconf serão sobrepostas pelas do sistema LOGO QUE "
 "POSSÍVEL"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Brevemente, as definições XKB no gconf serão sobrepostas (pelas da "
+"configuração do sistema)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Disposição de teclado XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Modelo de teclado XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Adiar intervalo"
@@ -3194,46 +3220,14 @@ msgstr ""
 "adicioná-la clicando com o botão direito do rato e seleccionando 'Adicionar "
 "ao painel -> Utilitários -> Área de notificação'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "abcçdefghijklmnopqrstuvwxyz. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nome:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Estilo:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tipo:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Tamanho:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versão:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Descrição:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "utilização: %s ficheiro-fontes\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Definir como Fonte da Aplicação"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Itens do menu de contexto de fonte"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Seleccione as suas aplicações por omissão"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3308,33 +3302,47 @@ msgstr "Gerar ou não amostras de fontes TrueType"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Gerar ou não amostras de fontes Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fábrica para o menu de contexto fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "abcçdefghijklmnopqrstuvwxyz. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Menu de contexto fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nome:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fábrica de menu de contexto fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Estilo:"
+
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tipo:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Entradas de menu de contexto nautilus para fontes"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Tamanho:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Definir como Fonte da Aplicação"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versão:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Componente de vista de conteúdo de Propriedades de Tema"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Descrição:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "utilização: %s ficheiro-fontes\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Vista Themus de Propriedades do Tema"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Centro de Controlo GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3364,27 +3372,18 @@ msgstr "_Aplicar fonte"
 msgid "Themes"
 msgstr "Temas"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Tema de controlos"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Tema de margens de janela"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Tema de ícones"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI actualmente apresentado"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Se verdadeiro, temas instalados serão amostrados."
@@ -3421,6 +3420,150 @@ msgstr "Se amostrar ou não temas instalados"
 msgid "Whether to thumbnail themes"
 msgstr "Se amostrar ou não temas"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Aplicar fonte"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Repor valores por _omissão"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Consola Gnome"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Editor Personali_zado"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Leitor de Correio Personali_zado:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Consola Personali_zada:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Navegador Web Personali_zado:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Iniciar na Cons_ola"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Esta aplicação pode abrir _URIs"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Esta aplicação tem de ser executada numa con_sola"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Seleccione um Leitor de Correio:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Seleccione uma Consola:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Seleccione um Navegador Web:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Seleccione um Editor:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Acessibilidade"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Configurações de Acessibilidade"
+
+#~ msgid "Advanced"
+#~ msgstr "Avançado"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Configurações Avançadas"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Configuração da Proxy de Rede"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Centro de Controlo GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Disposição"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Disposição a utilizar para esta vista das capplets"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Objecto de directório de capplet"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Directório de capplet que esta vista apresenta"
+
+#~ msgid "translator_credits"
+#~ msgstr "Duarte Loreto <happyguy_pt@hotmail.com>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Gestor de propriedades do ambiente de trabalho."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Centro de Controlo Gnome : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Centro de Controlo Gnome"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Utilizar o nautilus se este estiver em execução."
+
+#~ msgid "About this application"
+#~ msgstr "Sobre esta aplicação"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Resumo do centro controlo"
+
+#~ msgid "_About"
+#~ msgstr "_Sobre"
+
+#~ msgid "_Contents"
+#~ msgstr "_Conteúdo"
+
+#~ msgid "_Help"
+#~ msgstr "_Ajuda"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Utilizar consola mesmo que o nautilus esteja em execução."
+
+#~ msgid "XKB options"
+#~ msgstr "Opções XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Itens do menu de contexto de fonte"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fábrica para o menu de contexto fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menu de contexto fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fábrica de menu de contexto fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Entradas de menu de contexto nautilus para fontes"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Componente de vista de conteúdo de Propriedades de Tema"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Vista Themus de Propriedades do Tema"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI actualmente apresentado"
+
 #~ msgid "GNOME Default"
 #~ msgstr "Omissão GNOME"
 
@@ -3633,9 +3776,6 @@ msgstr "Se amostrar ou não temas"
 #~ msgstr ""
 #~ "Incapaz de encontrar uma hbox, a utilizar selecção normal de ficheiro"
 
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Preferências do Papel de Parede da Área de Trabalho"
-
 #~ msgid "Advanced Layout Options"
 #~ msgstr "Opções Avançadas de Disposição"
 
@@ -3663,15 +3803,9 @@ msgstr "Se amostrar ou não temas"
 #~ msgid "Customize _times..."
 #~ msgstr "Personalizar _horas..."
 
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "Preferências de Idioma e Cultura"
-
 #~ msgid "_Region:"
 #~ msgstr "_Região:"
 
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Defina o seu idioma e preferências de cultura"
-
 #~ msgid ""
 #~ "Error activating XKB configuration.\n"
 #~ "Probably internal X server problem.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5d9f321fb..a7679154b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-05 12:05-0300\n"
 "Last-Translator: Guilherme de S. Pastore <gpastore@colband.com.br>\n"
 "Language-Team: Brasilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -67,11 +67,11 @@ msgstr "Teclado _em tela"
 msgid "_Screenreader"
 msgstr "_Leitor de tela"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Suporte a Tecnologia Assistiva"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Ativar suporte para tecnologias assistivas do GNOME no login"
 
@@ -124,13 +124,13 @@ msgstr "Importar Arquivo de Configurações das Funções"
 msgid "_Import"
 msgstr "_Importar"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Defina suas preferências de acessibilidade ao teclado"
 
@@ -343,11 +343,11 @@ msgstr "pixels/segundo"
 msgid "seconds"
 msgstr "segundos"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Personalizar o plano de fundo da sua área de trabalho"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Plano de fundo"
 
@@ -426,6 +426,13 @@ msgstr "Adicionar papel de parede"
 msgid "No Wallpaper"
 msgstr "Sem papel de parede"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -639,105 +646,15 @@ msgstr "Selecione uma imagem."
 msgid "_Select"
 msgstr "_Selecionar"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Aplicações Preferenciais"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Selecione suas aplicações padrão"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Navegador Texto W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Navegador Texto Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Navegador Texto Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Leitor de E-mail Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Terminal Gnome"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "XTerminal Padrão"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Por favor entre um nome e um comando para este editor."
@@ -747,20 +664,23 @@ msgid "Add..."
 msgstr "Adicionar..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_Editor Personalizado"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Personalizado"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "_Leitor de E-Mail Personalizado:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Personalizado"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "_Terminal Personalizado:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "_Navegador Web Personalizado:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Esta aplicação pode abrir _múltiplos arquivos"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -807,6 +727,16 @@ msgid "Mail Reader"
 msgstr "Leitor de E-Mail"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Executar em um T_erminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Executar em um T_erminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -815,92 +745,168 @@ msgstr ""
 "botão Aplicar, sacudir sua varinha de condão e experimentar uns passos de "
 "alguma dança mágica para que ele funcione."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Executar em um T_erminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Editor de Textos"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Esta aplicação pode abrir _URIs"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Esta aplicação pode abrir _múltiplos arquivos"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Esta aplicação precisa ser executada em um _terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Compreende o Controle Remoto do _Netscape"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Usar este _editor para abrir arquivos texto no gerenciador de arquivos"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Navegador Web"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Gerenciador de Janelas"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Co_mando:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Propriedades.."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Selecione um Leitor de E-Mail:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Selecionar"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Navegador Web Padrão"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Navegador Texto W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Navegador Texto Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Navegador Texto Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Leitor de E-mail Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Selecione um Terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Terminal Padrão"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Selecione um Navegador Web:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Selecionar um Editor:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "XTerminal Padrão"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Acessibilidade"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Configurações de Acessibilidade"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Avançado"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Configurações Avançadas"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Mudar a resolução da tela"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Resolução de Tela"
 
@@ -991,7 +997,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Tem certeza que deseja apagar essa entrada?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Descrição"
 
@@ -999,16 +1005,25 @@ msgstr "Descrição"
 msgid "Extensions"
 msgstr "Extensões"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Programas e Tipos de Arquivo"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Especifique quais programas são usados para abrir ou ver cada tipo de arquivo"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Programas e tipos de arquivo"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Especifique quais programas são usados para abrir ou ver cada tipo de arquivo"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Ações"
@@ -1099,6 +1114,7 @@ msgid "_Protocol:"
 msgstr "_Protocolo:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -1106,15 +1122,6 @@ msgstr "_Remover"
 msgid "_Viewer component:"
 msgstr "Componente de _visualização:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Programas e tipos de arquivo"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Especifique quais programas são usados para abrir ou ver cada tipo de arquivo"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Editar categoria de arquivo"
@@ -1298,14 +1305,15 @@ msgid "Electronic mail transmission"
 msgstr "Transmissão por correio eletrônico"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Documentação do Gnome"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Fonte"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Selecionar fontes para o desktop"
 
@@ -1512,29 +1520,29 @@ msgid "The type of accelerator."
 msgstr "O tipo de atalho."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Desativado"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Ação Desconhecida>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Desktop"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Som"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Gerenciamento de Janelas"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1543,26 +1551,26 @@ msgstr ""
 "O atalho \"%s\" já está sendo usando por:\n"
 "\"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Erro definindo novo atalho na base de dados de configuração: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Erro definindo novo atalho na base de dados de configuração: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Ação"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Atalho"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de Teclado"
 
@@ -1574,23 +1582,10 @@ msgstr ""
 "Para editar um atalho, clique na linha correspondente e digite um "
 "novoatalho, ou pressione backspace para limpar."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Designar teclas de atalhos a comandos"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modelos"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Prévia do layout de teclado"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1758,10 +1753,32 @@ msgstr "Intervalo de _trabalho dura:"
 msgid "minutes"
 msgstr "minutos"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modelos"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Prévia do layout de teclado"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Definir suas preferências de teclado"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Definir suas preferências de mouse"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Cursor desconhecido"
@@ -1927,20 +1944,21 @@ msgstr "_Limiar:"
 msgid "_Timeout:"
 msgstr "_Tempo limite:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Mouse"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Definir suas preferências de mouse"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Proxy da Rede"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Preferências do proxy da rede"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1984,8 +2002,9 @@ msgid "H_TTP proxy:"
 msgstr "Proxy H_TTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Configuração do Proxy da Rede"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Preferências do proxy da rede"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2023,7 +2042,7 @@ msgstr "_Senha:"
 msgid "_Secure HTTP proxy:"
 msgstr "Proxy HTTP _Seguro:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Ativar o som e associar os sons aos eventos"
 
@@ -2081,15 +2100,26 @@ msgstr ""
 "seu diálogo \"Preferência de Temas\" foi instalado de maneira imprópria, ou "
 "que o pacote \"gnome-themes\" não está instalado."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Nenhuma localização de temas foi especificada para a instalação"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "A localização de temas especificada é inválida"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2125,12 +2155,12 @@ msgstr "O nome do tema deve estar presente"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "O tema já existe. Você deseja substituí-lo?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Selecionar temas para várias partes do desktop"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2243,12 +2273,12 @@ msgstr "Nome do _tema:"
 msgid "theme selection tree"
 msgstr "Árvore de seleção de temas"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 "Personalizar a aparência das barras de ferramentas e de menu das aplicações"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menus e Barras de Ferramentas"
 
@@ -2317,7 +2347,6 @@ msgid "_Edit"
 msgstr "_Editar"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Arquivo"
 
@@ -2345,6 +2374,14 @@ msgstr "_Sair"
 msgid "_Save"
 msgstr "_Salvar"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2357,23 +2394,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Controle"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (ou \"logotipo do Windows\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2415,14 +2452,34 @@ msgstr "_Levantar janelas selecionadas depois de um intervalo"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Selecionar janelas quando o mouse passar por cima delas"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Propriedades de Janela"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Janelas"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Centro de Controle do GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Preferências do plano de fundo"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Outros"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Ferramenta de configuração do GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Centro de Controle"
@@ -2451,94 +2508,6 @@ msgstr "Fábrica de visualização do Centro de Controle"
 msgid "View as Control Center"
 msgstr "Ver como Centro de Controle"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Centro de Controle do GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Layout"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Layout a ser usado para esta visualização dos miniaplicativos em C"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Objeto de diretório de miniaplicativos em C"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "O diretório de miniaplicativos em C exibido nesta visualização"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Ivan Passos <ivan@cyclades.com>\n"
-"Sandro Nunes Henrique <sandro@conectiva.com.br>\n"
-"Gustavo Noronha Silva <kov@debian.org>\n"
-"Gustavo Maciel Dias Vieira <gustavo@sagui.org>\n"
-"Sun Microsystems\n"
-"Tiago Cardoso Menezes <zion@via-rs.net>\n"
-"Evandro Fernandes Giovanini <evandrofg@ig.com.br>\n"
-"Guilherme de S. Pastore <gpastore@colband.com.br>\n"
-"Alex Camacho Castilho <gnomebr@uol.com.br>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Centro de Controle do GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Gerenciador de propriedades da área de trabalho."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Centro de Controle do GNOME: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Outros"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Centro de Controle do GNOME"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Usa o nautilus se ele estiver sendo executado."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Sobre esta aplicação"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Visão geral da central de controle"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Sobre"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Conteúdo"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "Aj_uda"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Ferramenta de configuração do GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Usar o shell mesmo que o nautilus esteja em execução."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volume"
@@ -2647,7 +2616,7 @@ msgstr ""
 "Erro ao tentar executar (%s)\n"
 "que está ligado à tecla (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2673,7 +2642,7 @@ msgstr ""
 "- O resultado de <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</"
 "b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2684,7 +2653,7 @@ msgstr ""
 "Existe problemas conhecidos com a configuração complexa do XKB. \n"
 "Tente usar uma configuração simples ou pegue uma versão mais nova do XFree ."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2692,15 +2661,15 @@ msgstr ""
 "As configurações de teclado do X diferem das suas configurações de "
 "tecladoatuais no GNOME.  Quais você gostaria de usar?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Usar configurações do X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Usar as configurações do GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2765,8 +2734,8 @@ msgstr "_Não mostrar esta mensagem novamente"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Não foi possível carregar o arquivo de som %s como exemplo %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Não foi possível determinar o diretório pessoal do usuário"
 
@@ -2815,11 +2784,11 @@ msgstr "Tela"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Tela em que o BGApplier deve desenhar"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "O arquivo de som deste evento não existe."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2829,32 +2798,32 @@ msgstr ""
 "Você poderá instalar o pacote de áudio do gnome\n"
 "para obter um conjunto de sons padrão."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "O arquivo %s não é um arquivo wav válido"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Evento"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Arquivo de Som"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Sons:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Arquivo de Som:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Selecionar Arquivo de Som"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "Re_produzir"
 
@@ -3116,28 +3085,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Em breve suas configurações XKB serão sobrescritas (pelas configurações do\n"
-"sistema)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB layout de teclado"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB modelo do teclado"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB opções"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Modelo de _teclado:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB layout de teclado"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Modelo de _teclado:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Atalhos de Teclado"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Configurações XKB do gconf serão sobrescritas pelo sistema ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Em breve suas configurações XKB serão sobrescritas (pelas configurações do\n"
+"sistema)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB layout de teclado"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB modelo do teclado"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "Adiar intervalo"
@@ -3215,46 +3232,14 @@ msgstr ""
 "pode adicionar uma clicando no painel com o botão direito e selecionando "
 "'Adicionar ao Painel -> Utilitários -> Área de Notificação'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Gazeta publica hoje breve anúncio de faxina na quermesse. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nome:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Estilo:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tipo:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Tamanho:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versão:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Descrição:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "uso: %s fontfile\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Define como Fonte das Aplicações"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Itens do menu de contexto de fontes"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Selecione suas aplicações padrão"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3329,33 +3314,47 @@ msgstr "Se devem ser geradas miniaturas para fontes TrueType"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Se devem ser geradas miniaturas para fontes Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fábrica para o menu de contexto fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Gazeta publica hoje breve anúncio de faxina na quermesse. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Menu de contexto fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nome:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fábrica de menus de contexto fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Estilo:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Entradas Nautilus do menu de contexto para fontes"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tipo:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Define como Fonte das Aplicações"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Tamanho:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Propriedades de Tema do componente de visualização de conteúdo"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versão:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Descrição:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Vista de Propriedades de Tema Themus"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "uso: %s fontfile\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Centro de Controle do GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3385,27 +3384,18 @@ msgstr "_Aplicar Fonte"
 msgid "Themes"
 msgstr "Temas"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Tema de controle"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Tema de borda da janela"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Tema de ícone"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI mostrada atualmente"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3443,6 +3433,159 @@ msgstr "Se os temas instalados devem ser miniaturizados"
 msgid "Whether to thumbnail themes"
 msgstr "Se os temas devem ser miniaturizados"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Aplicar Fonte"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Restaurar configurações"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminal Gnome"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_Editor Personalizado"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "_Leitor de E-Mail Personalizado:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "_Terminal Personalizado:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "_Navegador Web Personalizado:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Executar em um T_erminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Esta aplicação pode abrir _URIs"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Esta aplicação precisa ser executada em um _terminal"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Selecione um Leitor de E-Mail:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Selecione um Terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Selecione um Navegador Web:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Selecionar um Editor:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Acessibilidade"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Configurações de Acessibilidade"
+
+#~ msgid "Advanced"
+#~ msgstr "Avançado"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Configurações Avançadas"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Configuração do Proxy da Rede"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Centro de Controle do GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Layout"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Layout a ser usado para esta visualização dos miniaplicativos em C"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Objeto de diretório de miniaplicativos em C"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "O diretório de miniaplicativos em C exibido nesta visualização"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Ivan Passos <ivan@cyclades.com>\n"
+#~ "Sandro Nunes Henrique <sandro@conectiva.com.br>\n"
+#~ "Gustavo Noronha Silva <kov@debian.org>\n"
+#~ "Gustavo Maciel Dias Vieira <gustavo@sagui.org>\n"
+#~ "Sun Microsystems\n"
+#~ "Tiago Cardoso Menezes <zion@via-rs.net>\n"
+#~ "Evandro Fernandes Giovanini <evandrofg@ig.com.br>\n"
+#~ "Guilherme de S. Pastore <gpastore@colband.com.br>\n"
+#~ "Alex Camacho Castilho <gnomebr@uol.com.br>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Gerenciador de propriedades da área de trabalho."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Centro de Controle do GNOME: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Centro de Controle do GNOME"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Usa o nautilus se ele estiver sendo executado."
+
+#~ msgid "About this application"
+#~ msgstr "Sobre esta aplicação"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Visão geral da central de controle"
+
+#~ msgid "_About"
+#~ msgstr "_Sobre"
+
+#~ msgid "_Contents"
+#~ msgstr "_Conteúdo"
+
+#~ msgid "_Help"
+#~ msgstr "Aj_uda"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Usar o shell mesmo que o nautilus esteja em execução."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB opções"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Itens do menu de contexto de fontes"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fábrica para o menu de contexto fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menu de contexto fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fábrica de menus de contexto fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Entradas Nautilus do menu de contexto para fontes"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Propriedades de Tema do componente de visualização de conteúdo"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Vista de Propriedades de Tema Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI mostrada atualmente"
+
 #~ msgid "GNOME Default"
 #~ msgstr "Padrão do GNOME"
 
diff --git a/po/ro.po b/po/ro.po
index 1f5639076..aa6247177 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-05 00:10+0300\n"
 "Last-Translator: Mişu Moldovan <dumol@go.ro>\n"
 "Language-Team:  <gnomero-list@lists.sourceforge.net>\n"
@@ -60,11 +60,11 @@ msgstr "Tastatură _virtuală"
 msgid "_Screenreader"
 msgstr "Cititor _ecran"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Suport pentru tehnologii de asistenţă"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 "Activează la autentificare suportul pentru tehnologiile de asistenţă GNOME"
@@ -119,13 +119,13 @@ msgstr "Importă setările din fişier"
 msgid "_Import"
 msgstr "_Importă"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tastatură"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Setaţi opţiunile de accesibilitate ale tastaturii"
 
@@ -340,11 +340,11 @@ msgstr "pixeli/secundă"
 msgid "seconds"
 msgstr "secunde"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Personalizaţi fundalul desktopului"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Fundal desktop"
 
@@ -423,6 +423,13 @@ msgstr "Adăugare imagine de fundal"
 msgid "No Wallpaper"
 msgstr "Fără imagine de fundal"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -629,105 +636,15 @@ msgstr "Selectaţi o imagine."
 msgid "_Select"
 msgstr "_Selectaţi"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Aplicaţii preferate"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Selectaţi aplicaţiile implicite"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/Firefox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Navigatorul text W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Navigatorul text Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Navigatorul text Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Terminal Gnome"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Terminal X standard"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Specificaţi un nume şi o comandă pentru acest editor."
@@ -737,20 +654,23 @@ msgid "Add..."
 msgstr "Adaugă..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Editor personali_zat"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Personalizată"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Program de poştă electronică personali_zat:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Personalizată"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terminal personali_zat:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Navigator web personali_zat:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Această aplicaţie poate deschide _fişiere multiple"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -797,6 +717,16 @@ msgid "Mail Reader"
 msgstr "Poştă electronică"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Porneşte în _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Porneşte în _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -805,94 +735,170 @@ msgstr ""
 "să fluturaţi bagheta magică şi să executaţi un dans ritual pentru a-l face "
 "să funcţioneze."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Porneşte în _terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Editor de text"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Această aplicaţie poate deschide _URI-uri"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Această aplicaţie poate deschide _fişiere multiple"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Această aplicaţie trebuie pornită într-un _terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Ş_tie „Netscape Remote Control”"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Utilizează acest _editor pentru a deschide fişierele text în administratorul "
 "de fişiere"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Navigator web"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Administrator de ferestre"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Co_mandă:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Nume:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Proprietăţi..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Selectaţi o aplicaţie de poştă electronică:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Selectaţi"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Navigator web implicit"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/Firefox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Navigatorul text W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Navigatorul text Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Navigatorul text Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Selectaţi un terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Selectaţi un navigator web:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Selectaţi un editor:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Accesibilitate"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Setări accesibilitate"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Avansate"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Terminal implicit"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Setări avansate"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Terminal X standard"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Schimbaţi rezoluţia ecranului"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Rezoluţie ecran"
 
@@ -983,7 +989,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent această intrare?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Descriere"
 
@@ -991,17 +997,27 @@ msgstr "Descriere"
 msgid "Extensions"
 msgstr "Extensii"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Tipuri de fişiere şi programe"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Specificaţi ce programe vor fi utilizate pentru a deschide sau afişa orice "
 "tip de fişier"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Tipuri de fişiere şi programe"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Specificaţi programele utilizate pentru a deschide sau afişa orice tip de "
+"fişier"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Acţiuni"
@@ -1092,6 +1108,7 @@ msgid "_Protocol:"
 msgstr "_Protocol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "Şter_ge"
 
@@ -1099,16 +1116,6 @@ msgstr "Şter_ge"
 msgid "_Viewer component:"
 msgstr "Componentă _vizualizare:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Tipuri de fişiere şi programe"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Specificaţi programele utilizate pentru a deschide sau afişa orice tip de "
-"fişier"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Editare categorie de fişiere"
@@ -1290,14 +1297,15 @@ msgid "Electronic mail transmission"
 msgstr "Transmitere prin poştă electronică"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Documentaţie Gnome"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Fonturi"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Selectaţi fonturile desktopului"
 
@@ -1500,29 +1508,29 @@ msgid "The type of accelerator."
 msgstr "Tipul de accelerator."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Dezactivat"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Acţiune necunoscută>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Desktop"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Sunet"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Administrare ferestre"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1531,26 +1539,26 @@ msgstr ""
 "Combinaţia „%s” este deja utilizată pentru:\n"
 " „%s”\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Eroare la setarea noului accelerator în baza de date cu setări: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Eroare la setarea noului accelerator în baza de date cu setări: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Acţiune"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Scurtătură"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Combinaţii de taste"
 
@@ -1562,23 +1570,10 @@ msgstr ""
 "Pentru a edita o combinaţie, alegeţi pe rândul corespunzător şi tastaţi un "
 "nou accelerator (sau Backspace pentru a şterge)"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Asociaţi combinaţii comenzilor des utilizate"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Necunoscut"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modele"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Previzualizare aranjament de taste"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1746,10 +1741,32 @@ msgstr "_Perioada de lucru durează:"
 msgid "minutes"
 msgstr "minute"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Necunoscut"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modele"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Previzualizare aranjament de taste"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Schimbaţi opţiunile de tastare"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Schimbaţi setările pentru mouse"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Cursor necunoscut"
@@ -1914,20 +1931,21 @@ msgstr "_Prag:"
 msgid "_Timeout:"
 msgstr "_Timp expirare:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Mouse"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Schimbaţi setările pentru mouse"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Proxy reţea"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Opţiuni proxy reţea"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1971,8 +1989,9 @@ msgid "H_TTP proxy:"
 msgstr "Proxy _HTTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Configurare proxy reţea"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Opţiuni proxy reţea"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2010,7 +2029,7 @@ msgstr "_Parolă:"
 msgid "_Secure HTTP proxy:"
 msgstr "Proxy HTTP_S:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Activaţi serverul de sunet şi asociaţi sunete anumitor evenimente"
 
@@ -2068,15 +2087,26 @@ msgstr ""
 "înseamnă că modulul „Preferinţe teme” a fost instalat greşit, sau nu aţi "
 "instalat pachetul „gnome-themes”."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Nu s-a specificat nici o locaţie a fişierului temei pentru instalare"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Locaţia fişierelui temei specifică pentru instalare este invalidă"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2110,12 +2140,12 @@ msgstr "Numele temei trebuie specificat"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Această temă există deja. Doriţi să o înlocuiţi?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Selectaţi teme pentru diferite aspecte ale desktopului"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Teme"
 
@@ -2229,11 +2259,11 @@ msgstr "Nume _temă:"
 msgid "theme selection tree"
 msgstr "arborele de selectare a temei"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Personalizaţi barele de meniu şi barele cu unelte ale aplicaţiilor"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Meniuri şi bare cu unelte"
 
@@ -2302,7 +2332,6 @@ msgid "_Edit"
 msgstr "_Editare"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fişier"
 
@@ -2330,6 +2359,14 @@ msgstr "_Ieşire"
 msgid "_Save"
 msgstr "_Salvează"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2341,23 +2378,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (sau „Logo Windows”)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2399,14 +2436,34 @@ msgstr "_Ridică ferestrele selectate după un interval de timp"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Selectează ferestrele când ajung sub mouse"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Proprietăţi ferestre"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Ferestre"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Centrul de control GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Preferinţe fundal desktop"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Altele"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Unealta de configurare GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Centru de control"
@@ -2435,87 +2492,6 @@ msgstr "Fabrica de vizualizare a centrului de control"
 msgid "View as Control Center"
 msgstr "Arată ca centru de control"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Centrul de control GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Machetă"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Machetă utilizată pentru această afişare a capplet-urilor"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Director de obiecte capplet"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Director capplet afişat curent"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Mugurel Tudor <mugurelu@go.ro>\n"
-"Mişu Moldovan <dumol@go.ro>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Centrul de control GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Administrator al proprietăţilor desktopului."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Centrul de control GNOME: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Altele"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Centrul de control GNOME"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Utilizează Nautilus dacă este pornit."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Despre această aplicaţie"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Privire de ansamblu asupra centrului de control"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Despre"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Conţinut"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Ajutor"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Unealta de configurare GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Utilizează shell-ul chiar dacă nautilus este pornit."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volum"
@@ -2622,7 +2598,7 @@ msgstr ""
 "Eroare la pornirea (%s)\n"
 "care este mapat cheii (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2646,7 +2622,7 @@ msgstr ""
 "- şi al comenzii: <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</"
 "b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2658,7 +2634,7 @@ msgstr ""
 "Încercaţi să utilizaţi o configuraţie mai simplă sau o altă versiune de "
 "XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2666,15 +2642,15 @@ msgstr ""
 "Setările X pentru tastatură diferă de cele din GNOME. Care dintre ele doriţi "
 "să le utilizaţi?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Setările X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Setările GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2739,8 +2715,8 @@ msgstr "_Nu mai arăta acest mesaj în viitor"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nu am putut încărca fişierul de sunet %s ca eşantion %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Nu pot determina directorul „Acasă” al utilizatorului"
 
@@ -2789,11 +2765,11 @@ msgstr "Ecran"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Ecranul utilizat de BGApplier pentru afişare"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Fişierul de sunet pentru acest eveniment nu există."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2803,32 +2779,32 @@ msgstr ""
 "Puteţi instala pachetul gnome-audio pentru un\n"
 "set implicit de sunete."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Fişierul %s nu este un fişier wave valid"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Eveniment"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Fişier sunet"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "S_unete:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Fişier sunet:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Selectează fişierul de sunet"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Redă"
 
@@ -3090,29 +3066,77 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Foarte curând setările XKB din GConf vor fi suprascrie de cele ale sistemului"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Aranjament de taste XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Model de tastatură XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Opţiuni XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Model tastatură:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Aranjament de taste XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Model tastatură:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Combinaţii de taste"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "Setarile XKB din GConf vor fi suprascrie de cele ale sistemul cât de curând "
 "posibil"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Foarte curând setările XKB din GConf vor fi suprascrie de cele ale sistemului"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Aranjament de taste XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Model de tastatură XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "A_mână pauza"
@@ -3190,46 +3214,14 @@ msgstr ""
 "adăuga cu un click dreapta pe panou alegând „Adaugă la panou” -> „Utilitare” "
 "-> „Zonă de notificare”."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Vulpiţa înceată sare peste câinele leneş. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Nume:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stil:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tip:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Mărime:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versiune:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Drepturi de autor:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Descriere:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "utilizare: %s fişier tip font\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Setează ca font pentru aplicaţii"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Elemente în meniul de context al fonturilor"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Selectaţi aplicaţiile implicite"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3305,33 +3297,47 @@ msgstr "Specifică dacă fonturile TrueType vor avea miniaturi."
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Specifică dacă fonturile Type1 vor fi previzualizate."
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fabrică pentru meniul contextual fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Vulpiţa înceată sare peste câinele leneş. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Meniu contextual fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Nume:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fabrică meniu contextual fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stil:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Intrări pentru fonturi în meniul contextual Nautilus"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tip:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Setează ca font pentru aplicaţii"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Mărime:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versiune:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Drepturi de autor:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Componentă vizualizare conţinut pentru proprietăţile temelor."
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Descriere:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Vizualizare proprietăţi temă Themus"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "utilizare: %s fişier tip font\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Centrul de control GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3361,27 +3367,18 @@ msgstr "Aplică _fontul"
 msgid "Themes"
 msgstr "Teme"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Control temă"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Teme de margini de fereastre"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Temă iconiţe"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI afişat curent"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "AĂÂBCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "La activare, se vor crea miniaturi pentru temele instalate."
@@ -3419,6 +3416,152 @@ msgstr "Specifică dacă să se creeze miniaturi pentru temele instalate"
 msgid "Whether to thumbnail themes"
 msgstr "Specifică dacă să se creeze miniaturi pentru teme"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "AĂÂBCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Aplică _fontul"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Restaurea_ză setările implicite"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminal Gnome"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Editor personali_zat"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Program de poştă electronică personali_zat:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terminal personali_zat:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Navigator web personali_zat:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Porneşte în _terminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Această aplicaţie poate deschide _URI-uri"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Această aplicaţie trebuie pornită într-un _terminal"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Selectaţi o aplicaţie de poştă electronică:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Selectaţi un terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Selectaţi un navigator web:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Selectaţi un editor:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Accesibilitate"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Setări accesibilitate"
+
+#~ msgid "Advanced"
+#~ msgstr "Avansate"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Setări avansate"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Configurare proxy reţea"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Centrul de control GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Machetă"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Machetă utilizată pentru această afişare a capplet-urilor"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Director de obiecte capplet"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Director capplet afişat curent"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Mugurel Tudor <mugurelu@go.ro>\n"
+#~ "Mişu Moldovan <dumol@go.ro>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Administrator al proprietăţilor desktopului."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Centrul de control GNOME: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Centrul de control GNOME"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Utilizează Nautilus dacă este pornit."
+
+#~ msgid "About this application"
+#~ msgstr "Despre această aplicaţie"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Privire de ansamblu asupra centrului de control"
+
+#~ msgid "_About"
+#~ msgstr "_Despre"
+
+#~ msgid "_Contents"
+#~ msgstr "_Conţinut"
+
+#~ msgid "_Help"
+#~ msgstr "_Ajutor"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Utilizează shell-ul chiar dacă nautilus este pornit."
+
+#~ msgid "XKB options"
+#~ msgstr "Opţiuni XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Elemente în meniul de context al fonturilor"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fabrică pentru meniul contextual fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Meniu contextual fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fabrică meniu contextual fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Intrări pentru fonturi în meniul contextual Nautilus"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Componentă vizualizare conţinut pentru proprietăţile temelor."
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Vizualizare proprietăţi temă Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI afişat curent"
+
 #~ msgid "GNOME Default"
 #~ msgstr "Set implicit GNOME"
 
diff --git a/po/ru.po b/po/ru.po
index 353812811..c31c23826 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-16 12:16+0100\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-16 19:38+0200\n"
 "Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
 "Language-Team:  <gnome-cyr@gnome-org>\n"
@@ -46,7 +46,8 @@ msgstr "Закрыть и _выйти из системы"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:6
 msgid "Start these assistive technologies every time you log in:"
-msgstr "Запускать следующие вспомогательные технологии при каждом входе в систему:"
+msgstr ""
+"Запускать следующие вспомогательные технологии при каждом входе в систему:"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:7
 msgid "_Enable assistive technologies"
@@ -557,7 +558,8 @@ msgid "Change set"
 msgstr "Изменить набор"
 
 #: capplets/common/gconf-property-editor.c:184
-msgid "GConf change set containing data to be forwarded to the gconf client on apply"
+msgid ""
+"GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr ""
 "Набор изменений системы GConf содержит данные, которые будут направлены "
 "клиенту по применении"
@@ -567,7 +569,8 @@ msgid "Conversion to widget callback"
 msgstr "Обратный вызов передачи к виджету"
 
 #: capplets/common/gconf-property-editor.c:190
-msgid "Callback to be issued when data are to be converted from GConf to the widget"
+msgid ""
+"Callback to be issued when data are to be converted from GConf to the widget"
 msgstr ""
 "Обратный вызов, котрый будет произведён, когда данные передаются от системы "
 "GConf к клиенту"
@@ -577,7 +580,8 @@ msgid "Conversion from widget callback"
 msgstr "Обратный вызов передачи от виджета"
 
 #: capplets/common/gconf-property-editor.c:196
-msgid "Callback to be issued when data are to be converted to GConf from the widget"
+msgid ""
+"Callback to be issued when data are to be converted to GConf from the widget"
 msgstr ""
 "Обратный вызов, котрый будет произведён, когда данные переданы от клиента к "
 "системе GConf"
@@ -749,7 +753,8 @@ msgstr "По_нимает устройство Netscape Remote Control"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
-msgstr "Использовать этот _редактор для открытия текстовых файлов в менеджере файлов"
+msgstr ""
+"Использовать этот _редактор для открытия текстовых файлов в менеджере файлов"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
@@ -1146,7 +1151,8 @@ msgstr "Расширение"
 
 #: capplets/file-types/mime-edit-dialog.c:256
 msgid "Underlying model to notify when Ok is clicked"
-msgstr "Нижележащая модель, которая будет уведомлена, когда кнопка OK будет нажата"
+msgstr ""
+"Нижележащая модель, которая будет уведомлена, когда кнопка OK будет нажата"
 
 #: capplets/file-types/mime-edit-dialog.c:263
 msgid "MIME type information"
@@ -1587,7 +1593,8 @@ msgstr "_Специальные возможности"
 #: capplets/keyboard/gnome-keyboard-properties.c:222
 #: capplets/sound/sound-properties-capplet.c:240
 #: capplets/sound/sound-properties-capplet.c:242
-msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
+msgid ""
+"Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr ""
 "Просто применить установки и выйти (только для совместимости; теперь "
 "обрабатывается демоном)"
@@ -2408,7 +2415,8 @@ msgstr "<b>Выбор окна</b>:"
 
 #: capplets/windows/gnome-window-properties.glade.h:4
 msgid "To _move a window, press-and-hold this key then grab the window:"
-msgstr "Для пере_мещения окна нажать и держать эту клавишу, затем захватить окно:"
+msgstr ""
+"Для пере_мещения окна нажать и держать эту клавишу, затем захватить окно:"
 
 #: capplets/windows/gnome-window-properties.glade.h:5
 msgid "Window Preferences"
@@ -2717,7 +2725,8 @@ msgstr "Не удалось определить домашний каталог
 #: gnome-settings-daemon/gnome-settings-xsettings.c:208
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
-msgstr "Ключ \"%s\" системы GConf установлен в тип %s, а ожидаемый тип был %s\n"
+msgstr ""
+"Ключ \"%s\" системы GConf установлен в тип %s, а ожидаемый тип был %s\n"
 
 #: gnome-settings-daemon/reaper.c:103
 msgid "Error creating signal pipe."
@@ -2816,7 +2825,8 @@ msgid "Roll up"
 msgstr "скручивание"
 
 #: schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:1
-msgid "If true, the mime handlers for text/plain and text/* will be kept in sync"
+msgid ""
+"If true, the mime handlers for text/plain and text/* will be kept in sync"
 msgstr ""
 "Если истинно, обработчики для типов MIME text/plain и text/* будут "
 "синхронизироваться"
@@ -2987,7 +2997,8 @@ msgstr "Комбинация клавиш увеличения громкост�
 
 #: schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:1
 msgid "Display a dialog when there are errors running XScreenSaver"
-msgstr "Отображать диалог, когда происходят ошибки при запуске хранителя экрана"
+msgstr ""
+"Отображать диалог, когда происходят ошибки при запуске хранителя экрана"
 
 #: schemas/apps_gnome_settings_daemon_screensaver.schemas.in.h:2
 msgid "Run XScreenSaver at login"
@@ -3018,7 +3029,8 @@ msgid "RGBA Order"
 msgstr "Порядок RGBA"
 
 #: schemas/desktop_gnome_font_rendering.schemas.in.h:5
-msgid "Resolution used for converting font sizes to pixel sizes, in dots per inch"
+msgid ""
+"Resolution used for converting font sizes to pixel sizes, in dots per inch"
 msgstr ""
 "Разрешение, используемое для преобразования размеров шрифта в размеры "
 "пикселей, в точках на дюйм"
@@ -3056,28 +3068,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Очень скоро параметры XKB в gconf будут перезаписаны (из системной "
-"конфигурации)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Раскладка клавиатуры XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Модель клавиатуры XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Параметры XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Модель клавиатуры:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Раскладка клавиатуры XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Модель клавиатуры:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Комбинации клавиш клавиатуры"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Параметры XKB будут переписаны из gconf, как только это будет возможно"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Очень скоро параметры XKB в gconf будут перезаписаны (из системной "
+"конфигурации)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Раскладка клавиатуры XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Модель клавиатуры XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Отложить перерыв"
@@ -3187,7 +3247,8 @@ msgstr ""
 "формата Type1."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:5
-msgid "Set this key to the command used to create thumbnails for OpenType fonts."
+msgid ""
+"Set this key to the command used to create thumbnails for OpenType fonts."
 msgstr ""
 "Этот ключ соответствует команде, используемой для создания образцов шрифтов "
 "формата OpenType."
@@ -3199,7 +3260,8 @@ msgstr ""
 "формата PCF."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:7
-msgid "Set this key to the command used to create thumbnails for TrueType fonts."
+msgid ""
+"Set this key to the command used to create thumbnails for TrueType fonts."
 msgstr ""
 "Этот ключ соответствует команде, используемой для создания образцов шрифтов "
 "формата TrueType."
@@ -3299,7 +3361,8 @@ msgstr "_Не применять новый шрифт"
 msgid ""
 "The theme you have selected suggests a new font. A preview of the font is "
 "shown below."
-msgstr "Выбранная вами тема подразумевает новый шрифт. Образец шрифта показан ниже."
+msgstr ""
+"Выбранная вами тема подразумевает новый шрифт. Образец шрифта показан ниже."
 
 #: vfs-methods/themus/apply-font.glade.h:5
 msgid "_Apply font"
@@ -3334,7 +3397,8 @@ msgstr ""
 "предпросмотра."
 
 #: vfs-methods/themus/themus.schemas.in.h:3
-msgid "Set this key to the command used to create thumbnails for installed themes."
+msgid ""
+"Set this key to the command used to create thumbnails for installed themes."
 msgstr ""
 "Команда, используемая для создания миниатюр предпросмотра для установленных "
 "тем."
@@ -3372,3 +3436,5 @@ msgstr "Применить тему"
 msgid "Sets the default theme"
 msgstr "Устанавливает тему по умолчанию"
 
+#~ msgid "XKB options"
+#~ msgstr "Параметры XKB"
diff --git a/po/sk.po b/po/sk.po
index d2b34b000..822ee1ec9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-03-23 18:18+0100\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -68,11 +68,11 @@ msgstr "K_lávesnica na obrazovke"
 msgid "_Screenreader"
 msgstr "Čí_tanie obrazovky"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Podpora pomocných technológií"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Povoliť podporuje pre GNOME pomocných technológií pri prihlásení"
 
@@ -123,13 +123,13 @@ msgstr "Importovať nastavenie funkcií zo súboru"
 msgid "_Import"
 msgstr "_Importovať"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Klávesnica"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Nastavenie sprístupnenia klávesnice"
 
@@ -340,11 +340,11 @@ msgstr "bodov/sekundu"
 msgid "seconds"
 msgstr "sekúnd"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Nastavenie pozadia plochy"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Pozadie plochy"
 
@@ -424,6 +424,13 @@ msgstr "Pridať tapety"
 msgid "No Wallpaper"
 msgstr "Bez tapety"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -627,105 +634,15 @@ msgstr "Prosím, vyberte obrázok."
 msgid "_Select"
 msgstr "_Vybrať"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Štandardné aplikácie"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Nastavenie štandardných aplikácií"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Textový prehliadač W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx textový prehliadač"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links textový prehliadač"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "GNOME terminál"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Štandardný XTerminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Prosím, zadajte meno a príkaz pre tento editor."
@@ -735,20 +652,23 @@ msgid "Add..."
 msgstr "Pridať..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "V_lastný editor"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Vlastný"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "V_lastný poštový klient:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Vlastný"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "V_lastný terminál:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "_Vlastný prehliadač WWW:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Táto aplikácia dokáže otvoriť _viac súborov"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -795,6 +715,16 @@ msgid "Mail Reader"
 msgstr "Poštový klient"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Spustiť v t_ermináli"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Spustiť v t_ermináli"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -802,93 +732,169 @@ msgstr ""
 "Vyberte správcu okien, ktorého chcete používať. Aby to fungovalo, musíte "
 "stlačiť Použiť, zamávať čarovnou paličkou a zatancovať čarovný tanec."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Spustiť v t_ermináli"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminál"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Textový editor"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Táto aplikácia podporuje _URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Táto aplikácia dokáže otvoriť _viac súborov"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Táto aplikácia vyžaduje spustenie v _termináli"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Podporuje _Netscape Remote Control"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Použiť tento _editor pre otvorenie textových súborov v správcovi súborov"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "WWW prehliadač"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Správca okien"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_Príkaz:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Vyberte poštového klienta:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Vybrať"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "Výber _terminálu:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Štandardný prehliadač WWW"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "Výber _prehliadač WWW:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Vybrať editor:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Prístupnosť"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Nastavenie prístupnosti"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Pokročilé"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Pokročilé nastavenia"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Textový prehliadač W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx textový prehliadač"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links textový prehliadač"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Štandardný terminál"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminál"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Štandardný XTerminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Zmeniť rozlíšenie obrazovky"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Rozlíšenie obrazovky"
 
@@ -984,7 +990,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Naozaj chcete odstrániť túto položku?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Popis"
 
@@ -992,17 +998,27 @@ msgstr "Popis"
 msgid "Extensions"
 msgstr "Rozšírenia"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Typy súborov a programy"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Zadajte, ktorý program sa má použiť pre otvorenie alebo prezeranie daného "
 "typu súborov."
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Typy súborov a programy"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Zadajte, ktoré programy sa majú použiť pre otvorenie alebo prezeranie daného "
+"typu súborov"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Akcie"
@@ -1093,6 +1109,7 @@ msgid "_Protocol:"
 msgstr "_Protokol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Odstrániť"
 
@@ -1100,16 +1117,6 @@ msgstr "_Odstrániť"
 msgid "_Viewer component:"
 msgstr "Komponent pre _zobrazenie:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Typy súborov a programy"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Zadajte, ktoré programy sa majú použiť pre otvorenie alebo prezeranie daného "
-"typu súborov"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Upraviť kategóriu súboru"
@@ -1291,14 +1298,15 @@ msgid "Electronic mail transmission"
 msgstr "Prenos elektronickej pošty"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Dokumentácia GNOME"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Písmo"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Vyberte písma pre prostredie"
 
@@ -1510,29 +1518,29 @@ msgid "The type of accelerator."
 msgstr "Stlačte novú skratku."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Neznáma akcia>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Prostredie"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Zvuk"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Správa okien"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1541,28 +1549,28 @@ msgstr ""
 "Klávesová skratka \"%s\" sa už používa pre:\n"
 "\"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Chyba pri nastavovaní nového akcelerátoru v konfiguračnej databázi: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Chyba pri rušení nastavenia akcelerátora v konfiguračnej databázi: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Akcie"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Klávesová skratka"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové skratky"
 
@@ -1573,26 +1581,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "Zadajte nový akcelerátor alebo ho vyčistite stlačením Backspace"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Priradiť klávesové skratky príkazom"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Neznámy kurzor"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Model"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "Rozloženie kláves XKB"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1763,10 +1755,35 @@ msgstr "_Pracovný interval trvá:"
 msgid "minutes"
 msgstr "minút"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Neznámy kurzor"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Model"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "Rozloženie kláves XKB"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Nastavenie klávesnice"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Nastavenie myši"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Neznámy kurzor"
@@ -1931,20 +1948,21 @@ msgstr "_Hranica:"
 msgid "_Timeout:"
 msgstr "Ča_kanie:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Myš"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Nastavenie myši"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Sieťové proxy"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Nastavenie sieťových proxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1990,7 +2008,8 @@ msgid "H_TTP proxy:"
 msgstr "_HTTP proxy:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
+#, fuzzy
+msgid "Network Proxy Preferences"
 msgstr "Nastavenie sieťových proxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
@@ -2032,7 +2051,7 @@ msgstr "_Heslo:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Secure HTTP proxy:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Povoliť zvuky a asociovať ich s udalosťami"
 
@@ -2090,15 +2109,26 @@ msgstr ""
 "správne nainštalované \"Nastavenie tém\" alebo nemáte nainštalovaný balík "
 "\"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Nezadané umiestnenie súboru, ktorý sa má nainštalovať"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Umiestnenie súboru s témou nie je platné"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2132,12 +2162,12 @@ msgstr "Musíte zadať meno témy"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Vyberte témy pre rôzne časti prostredia"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Téma"
 
@@ -2250,11 +2280,11 @@ msgstr "Meno _témy:"
 msgid "theme selection tree"
 msgstr "strom výberu témy"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Prispôsobenie vzhľadu panelov nástrojov a menu v aplikáciách"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menu a panely nástrojov"
 
@@ -2323,7 +2353,6 @@ msgid "_Edit"
 msgstr "_Upraviť"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Súbor"
 
@@ -2351,6 +2380,14 @@ msgstr "_Koniec"
 msgid "_Save"
 msgstr "_Uložiť"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2362,23 +2399,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (alebo \"Windows logo\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2421,14 +2458,35 @@ msgstr "_Presunúť vybrané okno dopredu po danej dobe"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Vybrať okno pod kurzorom myši"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Vlastnosti okna"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Okná"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME Ovládacie centrum"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Nastavenie pozadia plochy"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Filtre"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Nástroj pre nastavenie GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2463,88 +2521,6 @@ msgstr "Menu ovládacieho centra"
 msgid "View as Control Center"
 msgstr "GNOME Ovládacie centrum: %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME Ovládacie centrum: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Rozloženie"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Rozloženie pre tento pohľad modulu"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Objekt priečinku modulov"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Priečinok modulov, ktorý tento pohľad zobrazuje."
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Stanislav Višňovský"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME Ovládacie centrum"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Správca nastavenia."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME Ovládacie centrum: %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Filtre"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "GNOME Ovládacie centrum: %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Použiť shell aj keď nautilus beží."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "O tejto aplikácii"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Prehľad Ovládacieho centra"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_O programe"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Obsah"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Pomocník"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Nástroj pre nastavenie GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Použiť shell aj keď nautilus beží."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Hlasitosť"
@@ -2650,7 +2626,7 @@ msgstr ""
 "Chyba pri pokuse o spustenie (%s),\n"
 "ktorý je spojený s klávesom (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2675,7 +2651,7 @@ msgstr ""
 "- Výsledok <b>xprop -root | grep XKB</b>\n"
 "- Výsledok <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2686,22 +2662,22 @@ msgstr ""
 "Sú známe problémy so zložitým nastavením XKB.\n"
 "Pokúste sa použiť jednoduchšie alebo použite novšiu verziu XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Nastavenie obrazovky %d\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, fuzzy, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2766,8 +2742,8 @@ msgstr "_Túto správu už nezobrazovať"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nepodarilo sa načítať zvukový súbor %s ako zvuk %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Nepodarilo sa určiť domovský priečinok používateľa"
 
@@ -2816,11 +2792,11 @@ msgstr "Obrazovka"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Obrazovka, na ktorú má BGApplier kresliť"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Zvukový súbor pre túto udalosť neexistuje."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2830,32 +2806,32 @@ msgstr ""
 "Môžno budete chcieť nainštalovať balík gnome-audio,\n"
 "ktorý obsahuje štandardné zvuky."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Súbor %s nie je platný súbor wav"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Udalosť"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Zvukový súbor"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Zvuky:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Zvukový _súbor:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Vybrať súbor so zvukom"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Zahrať"
 
@@ -3129,26 +3105,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "Veľmi skoro sa nastavenie XKB v gconf prepíše podľa systému"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Rozloženie kláves XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Model klávesnice XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Možnosti XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Model klávesnice:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Rozloženie kláves XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Model klávesnice:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Klávesové skratky"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Nastavenie XKB v gconf sa prepíše okamžite podľa systému"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "Veľmi skoro sa nastavenie XKB v gconf prepíše podľa systému"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Rozloženie kláves XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Model klávesnice XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Odložiť prestávku"
@@ -3226,46 +3250,14 @@ msgstr ""
 "panel túto oblasť neobsahuje. Môžete je pridať v kontextovom menu panelu, "
 "kde vyberte 'Pridať do panelu -> Nástroj -> Oblasť upozornení'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Rýchla hnedá líška skáče cez lenivého psa. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Meno:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Štýl:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Typ:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Veľkosť:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Verzia:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Popis:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Použiť ako písmo aplikácií"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Položky kontextového menu pre písma"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Nastavenie štandardných aplikácií"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3339,33 +3331,47 @@ msgstr "Či vytvárať náhľady písiem TrueType"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Či vytvárať náhľady písiem Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Vytváracie rozhranie pre kontextové menu fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Rýchla hnedá líška skáče cez lenivého psa. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Kontextové menu Fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Meno:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Vytváracie rozhranie pre kontextové menu Fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Štýl:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Kontextové menu pre písma v Nautiluse"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Typ:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Použiť ako písmo aplikácií"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Veľkosť:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Verzia:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponent pohľadu Vlastnosti tém"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Popis:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Pohľad Vlastnosti tém"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME Ovládacie centrum"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3395,27 +3401,18 @@ msgstr "Použiť pí_smo"
 msgid "Themes"
 msgstr "Témy"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Téma ovládania"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Téma okrajov okien"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikonová téma"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Momentálne zobrazené URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "AÁÄBCČDĎEÉFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Ak je toto true, pre nainštalované témy sa budú vytvárať náhľady."
@@ -3450,6 +3447,152 @@ msgstr "Či vytvárať náhľady nainštalovaných tém"
 msgid "Whether to thumbnail themes"
 msgstr "Či vytvárať náhľady tém"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "AÁÄBCČDĎEÉFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Použiť pí_smo"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Použiť š_tandardné nastavenie"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "GNOME terminál"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "V_lastný editor"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "V_lastný poštový klient:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "V_lastný terminál:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "_Vlastný prehliadač WWW:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Spustiť v t_ermináli"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Táto aplikácia podporuje _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Táto aplikácia vyžaduje spustenie v _termináli"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Vyberte poštového klienta:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "Výber _terminálu:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "Výber _prehliadač WWW:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Vybrať editor:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Prístupnosť"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Nastavenie prístupnosti"
+
+#~ msgid "Advanced"
+#~ msgstr "Pokročilé"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Pokročilé nastavenia"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Nastavenie sieťových proxy"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME Ovládacie centrum: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Rozloženie"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Rozloženie pre tento pohľad modulu"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Objekt priečinku modulov"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Priečinok modulov, ktorý tento pohľad zobrazuje."
+
+#~ msgid "translator_credits"
+#~ msgstr "Stanislav Višňovský"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Správca nastavenia."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME Ovládacie centrum: %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "GNOME Ovládacie centrum: %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Použiť shell aj keď nautilus beží."
+
+#~ msgid "About this application"
+#~ msgstr "O tejto aplikácii"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Prehľad Ovládacieho centra"
+
+#~ msgid "_About"
+#~ msgstr "_O programe"
+
+#~ msgid "_Contents"
+#~ msgstr "_Obsah"
+
+#~ msgid "_Help"
+#~ msgstr "_Pomocník"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Použiť shell aj keď nautilus beží."
+
+#~ msgid "XKB options"
+#~ msgstr "Možnosti XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Položky kontextového menu pre písma"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Vytváracie rozhranie pre kontextové menu fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Kontextové menu Fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Vytváracie rozhranie pre kontextové menu Fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Kontextové menu pre písma v Nautiluse"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponent pohľadu Vlastnosti tém"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Pohľad Vlastnosti tém"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "Momentálne zobrazené URI"
+
 #~ msgid "GNOME Default"
 #~ msgstr "Štandardné GNOME"
 
diff --git a/po/sl.po b/po/sl.po
index af6683870..40b5de7d0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2002-06-09 20:17+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -57,11 +57,11 @@ msgstr "_Zaslonska tipkovnica"
 msgid "_Screenreader"
 msgstr "_Bralnik zaslona"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Podpora pomožnim tehnologijam"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Ob prijavi vključi podporo pomožnim tehnologijam GNOME"
 
@@ -112,13 +112,13 @@ msgstr "_Uvozi datoteko nastavitev možnosti"
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tipkovnica"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Nastavitve dostopnosti tipkovnice"
 
@@ -331,12 +331,12 @@ msgstr "pikslov/sekundo"
 msgid "seconds"
 msgstr "sekund"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 #, fuzzy
 msgid "Change your Desktop Background settings"
 msgstr "Prilagodite ozadje vašega namizja"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 #, fuzzy
 msgid "Desktop Background"
 msgstr "Ozadje"
@@ -427,6 +427,13 @@ msgstr "_Tapeta"
 msgid "No Wallpaper"
 msgstr "_Tapeta"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -635,106 +642,15 @@ msgstr "Prosim, izberite sliko."
 msgid "_Select"
 msgstr "_Zbriši"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Zaželeni programi"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Izberi vaše privzete programe"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-#, fuzzy
-msgid "W3M Text Browser"
-msgstr "Besedilni brskalnik Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Besedilni brskalnik Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Besedilni brskalnik Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Bralnik pošte Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Terminal Gnome"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Običajni terminal X (xterm)"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Prosim, navedite ime in ukaz za ta urejevalnik."
@@ -744,20 +660,22 @@ msgid "Add..."
 msgstr "Dodaj..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_Poljuben urejevalnik"
+#, fuzzy
+msgid "C_ustom"
+msgstr "P_rikrojeno:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "_Poljuben bralnik pošte:"
+msgid "C_ustom:"
+msgstr "P_rikrojeno:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "_Poljuben terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "_Poljuben brskalnik:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Ta program lahko odpre _več datotek"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -804,6 +722,16 @@ msgid "Mail Reader"
 msgstr "Bralnik pošte"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Poženi v _terminalu"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Poženi v _terminalu"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -812,94 +740,170 @@ msgstr ""
 "uveljavi, zamahniti z čarobno palico in opraviti čarovniški ples, da bi "
 "stvar delovala."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Poženi v t_erminalu"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Urejevalnik besedil"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Ta program lahko odpre _URIje"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Ta program lahko odpre _več datotek"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Ta program se mora pognati v _lupini"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Razume oddaljeno kontrolo _Netscape"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Uporabi ta _urejevalnik za odpiranje datotek z besedilom v upravljalniku "
 "datotek"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Spletni brskalnik"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Upravljalnik oken"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Ukaz:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Lastnosti..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Izberite bralnik pošte:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Zbriši"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Privzet spletni brskalnik"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Izberite terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Izberite spletni brskalnik:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Izberite urejevalnik:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+#, fuzzy
+msgid "W3M Text Browser"
+msgstr "Besedilni brskalnik Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Besedilni brskalnik Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Besedilni brskalnik Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Bralnik pošte Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Dostopnost"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Privzet terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Običajni terminal X (xterm)"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Nastavitve dostopnosti"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Napredno"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Napredne nastavitve"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Spremeni ločljivost zaslona"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Ločljivost zaslona"
 
@@ -992,7 +996,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Opis"
 
@@ -1000,17 +1004,27 @@ msgstr "Opis"
 msgid "Extensions"
 msgstr "Razširitve"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Vrste datotek in programi"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Določi kateri programi se uporabljajo za odpiranje ali pogled katerih tipov "
 "datotek"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Vrste datotek in programi"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Določi kateri programi se uporabljajo za odpiranje ali pogled katerih vrst "
+"datotek"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Dejanja"
@@ -1102,6 +1116,7 @@ msgid "_Protocol:"
 msgstr "_Protokol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -1109,16 +1124,6 @@ msgstr "_Odstrani"
 msgid "_Viewer component:"
 msgstr "Komponenta po_gleda:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Vrste datotek in programi"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Določi kateri programi se uporabljajo za odpiranje ali pogled katerih vrst "
-"datotek"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Uredi kategorijo datoteke"
@@ -1301,14 +1306,15 @@ msgid "Electronic mail transmission"
 msgstr "Prenos elektronske pošte"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Dokumentacija Gnome"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Pisava"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Izberi pisave za namizje"
 
@@ -1513,29 +1519,29 @@ msgid "The type of accelerator."
 msgstr "Vrsta pospečevalnika"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Izključeno"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Neznano dejanje>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Namizje"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Zvok"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Upravljanje oken"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1544,30 +1550,30 @@ msgstr ""
 "Bližnjica \"%s\" je že v uporabi za:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 "Napaka ob nastavljanju novega pospeševalnika v nastavitveni zbirki podatkov: "
 "%s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, fuzzy, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 "Napaka ob nastavljanju novega pospeševalnika v nastavitveni zbirki podatkov: "
 "%s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Dejanje"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Bližnjica"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Tipkovnične bližnjice"
 
@@ -1578,26 +1584,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "Vpišite nov pospeševalnik ali pritisnite povratnico za izbris"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Ukazom določi tipkovne bližnjice"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "Neznan kazalec"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Model"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "Tipkovnične bližnjice"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1777,10 +1767,35 @@ msgstr "Trajanje _dela:"
 msgid "minutes"
 msgstr "minut"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "Neznan kazalec"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Model"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "Tipkovnične bližnjice"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Nastavitve tipkovnice"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Nastavi lastnosti miške"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Neznan kazalec"
@@ -1945,20 +1960,21 @@ msgstr "_Prag:"
 msgid "_Timeout:"
 msgstr "_Časovna omejitev:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Miška"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Nastavi lastnosti miške"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Omrežni posrednik"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Nastavitve posrednika omrežja"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2004,8 +2020,9 @@ msgid "H_TTP proxy:"
 msgstr "Posrednik _HTTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Nastavitev mrežnega posrednika"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Nastavitve posrednika omrežja"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2046,7 +2063,7 @@ msgstr "_Geslo:"
 msgid "_Secure HTTP proxy:"
 msgstr "Posrednik varnega HTTP (HTTPS):"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Vklopi zvoke in poveži zvoke z dogodki"
 
@@ -2104,15 +2121,26 @@ msgstr ""
 "vaš dialog \"Nastavitve teme\" nepravilno nameščen ali pa niste namestili "
 "paketa \"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2145,12 +2173,12 @@ msgstr "Tema mora biti prisotna"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Izberi teme za različne dele namizja"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2265,11 +2293,11 @@ msgstr "Ime _teme:"
 msgid "theme selection tree"
 msgstr "Izbirnik tem Gtk+"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Prikroji izgled orodjarn in menujskih vrstic v programih"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menuji in orodjarne"
 
@@ -2338,7 +2366,6 @@ msgid "_Edit"
 msgstr "_Uredi"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -2366,6 +2393,14 @@ msgstr "_Izhod"
 msgid "_Save"
 msgstr "_Shrani"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr "Nastavi kateri programi so uporabljeni za prikaz URLjev"
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr "Obravnavalniki URLjev"
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2377,23 +2412,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Nadzor"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hiper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (ali \"logotip Oken\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Alt"
 
@@ -2437,14 +2472,35 @@ msgstr "Po premoru _dvigni izbrana okna"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Izberi okna, ko gre miška nad njimi"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
-msgstr "Lastnosti oken"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
+msgstr "Nastavi lastnosti oken"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Okna"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Kontrolni center GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Nastavitve ozadja"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Filtri"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Nastavitveno orodje GNOME-a."
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2479,88 +2535,6 @@ msgstr "Menu kontrolnega centra"
 msgid "View as Control Center"
 msgstr "Kontrolni center Gnome : %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Kontrolni center GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Postavitev"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Postavitev, ki naj se uporabi za pogled cappletov"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Imenik predmeta capplet"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Imenik capplet, ki ga gleda ta pogled"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Andraž Tori <andraz.tori1@guest.arnes.si>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Kontrolni center GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Upravljalnik lastnosti namizja."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Kontrolni center Gnome : %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Filtri"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "Kontrolni center Gnome : %s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "Uporabi lupino tudi kadar nautilus teče."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "O tem programu"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Pregled kontrolnega centra"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_O programu"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Vsebina"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Pomoč"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Nastavitveno orodje GNOME-a."
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Uporabi lupino tudi kadar nautilus teče."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 #, fuzzy
 msgid "Volume"
@@ -2665,7 +2639,7 @@ msgstr ""
 "Napaka ob poskusu zagona (%s),\n"
 "ki je povezan s tipko (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2680,7 +2654,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2688,22 +2662,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Nastavitve zaslona %d\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2759,8 +2733,8 @@ msgstr "_Ne kaži več tega sporočila"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Nisem mogel naložiti zvočne datoteke %s kot vzorca %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Ne morem ugotoviti uporabnikovega domačega imenika"
 
@@ -2810,11 +2784,11 @@ msgstr "Zaslon"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Zaslon na katerem naj se riše BGApplier"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Zvočna datoteka za ta dogodek ne obstaja."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2824,32 +2798,32 @@ msgstr ""
 "Morda bi želeli namestiti gnome-audio paket\n"
 "za zbirko privzetih zvokov."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Datoteka %s ni veljavna datoteka wav"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Dogodek"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Zvočna datoteka"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Zvoki:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Zvočna _datoteka:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Izberi zvočno datoteko"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Predvajaj"
 
@@ -3134,29 +3108,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
 #, fuzzy
-msgid "XKB keyboard layout"
+msgid "Keyboard Update Handlers"
+msgstr "_Vključen zvonec tipkovnice"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
+#, fuzzy
+msgid "Keyboard layout"
 msgstr "Tipkovnične bližnjice"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
 #, fuzzy
-msgid "XKB keyboard model"
+msgid "Keyboard model"
 msgstr "Tipkovničin zvonec"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
 #, fuzzy
-msgid "XKB options"
-msgstr "Možnosti"
+msgid "Keyboard options"
+msgstr "Nastavitve tipkovnice"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Tipkovnične bližnjice"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Tipkovničin zvonec"
+
 #: typing-break/drw-break-window.c:209
 #, fuzzy
 msgid "_Postpone break"
@@ -3233,46 +3250,14 @@ msgstr ""
 "da na vašem pultu nimate področja opozoril. Lahko ga dodate z desnim klikom "
 "na vaš pult in 'Dodaj pultu -> Pripomočki -> Področje opozoril'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Piškur molče grabi fižol iz dna cezijeve hoste. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Ime:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Slog:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Vrsta:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Velikost:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Različica:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Avtorske pravice:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Opis:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Nastavi za pisavo programa"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Predmeti kontekstnega menuja pisave"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Izberi vaše privzete programe"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3342,33 +3327,47 @@ msgstr "Ali naj se naredijo sličice pisav TrueType"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Ali naj se naredijo sličice pisav Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Tovarna fontilusovih kontekstnih menujev"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Piškur molče grabi fižol iz dna cezijeve hoste. 0123456789"
+
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Ime:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilusov kontekstni menu"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Slog:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Tovarna fontilusovih kontekstnih menujev"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Vrsta:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Vnosi za nautilusov kontekstni menu za pisave"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Velikost:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Nastavi za pisavo programa"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Različica:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Pogled komponetne lastnosti teme"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Avtorske pravice:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Pogled lastnosti teme Themus"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Opis:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Kontrolni center GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3398,27 +3397,18 @@ msgstr "_Uveljavi pisavo"
 msgid "Themes"
 msgstr "Teme"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Prikroji temo"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Tema robu okna"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Tema ikon"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Trenutno prikazan URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCČDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Če je nastalvjeno, bodo nameščene teme predstavljene kot sličice"
@@ -3452,6 +3442,156 @@ msgstr "Ali naj se prikažejo sličice nameščenih tem"
 msgid "Whether to thumbnail themes"
 msgstr "Ali naj se prikažejo sličice tem"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCČDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Uveljavi pisavo"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Uporabi _privzete nastavitve kategorije"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminal Gnome"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_Poljuben urejevalnik"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "_Poljuben bralnik pošte:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "_Poljuben terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "_Poljuben brskalnik:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Poženi v t_erminalu"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Ta program lahko odpre _URIje"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Ta program se mora pognati v _lupini"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Izberite bralnik pošte:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Izberite terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Izberite spletni brskalnik:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Izberite urejevalnik:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Dostopnost"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Nastavitve dostopnosti"
+
+#~ msgid "Advanced"
+#~ msgstr "Napredno"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Napredne nastavitve"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Nastavitev mrežnega posrednika"
+
+#~ msgid "Window Properties"
+#~ msgstr "Lastnosti oken"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Kontrolni center GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Postavitev"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Postavitev, ki naj se uporabi za pogled cappletov"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Imenik predmeta capplet"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Imenik capplet, ki ga gleda ta pogled"
+
+#~ msgid "translator_credits"
+#~ msgstr "Andraž Tori <andraz.tori1@guest.arnes.si>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Upravljalnik lastnosti namizja."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Kontrolni center Gnome : %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "Kontrolni center Gnome : %s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Uporabi lupino tudi kadar nautilus teče."
+
+#~ msgid "About this application"
+#~ msgstr "O tem programu"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Pregled kontrolnega centra"
+
+#~ msgid "_About"
+#~ msgstr "_O programu"
+
+#~ msgid "_Contents"
+#~ msgstr "_Vsebina"
+
+#~ msgid "_Help"
+#~ msgstr "_Pomoč"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Uporabi lupino tudi kadar nautilus teče."
+
+#, fuzzy
+#~ msgid "XKB options"
+#~ msgstr "Možnosti"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Predmeti kontekstnega menuja pisave"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Tovarna fontilusovih kontekstnih menujev"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilusov kontekstni menu"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Tovarna fontilusovih kontekstnih menujev"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Vnosi za nautilusov kontekstni menu za pisave"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Pogled komponetne lastnosti teme"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Pogled lastnosti teme Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "Trenutno prikazan URI"
+
 #~ msgid "De_tails..."
 #~ msgstr "_Podrobnosti..."
 
@@ -3702,9 +3842,6 @@ msgstr "Ali naj se prikažejo sličice tem"
 #~ msgid "Bee_p"
 #~ msgstr "_Pisk"
 
-#~ msgid "C_ustom:"
-#~ msgstr "P_rikrojeno:"
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "_Klik ob pritisku tipke"
 
@@ -3872,9 +4009,6 @@ msgstr "Ali naj se prikažejo sličice tem"
 #~ msgid "Configure window appearance"
 #~ msgstr "Nastavi videz oken"
 
-#~ msgid "Configure window properties"
-#~ msgstr "Nastavi lastnosti oken"
-
 #~ msgid "Configure window manager configuration properties"
 #~ msgstr "Nastavi možnosti upravljalnika oken"
 
@@ -3978,9 +4112,6 @@ msgstr "Ali naj se prikažejo sličice tem"
 #~ msgid "Key_press makes sound"
 #~ msgstr "_Pritisk tipke sproži zvok"
 
-#~ msgid "Keyboard bell _enabled"
-#~ msgstr "_Vključen zvonec tipkovnice"
-
 #~ msgid "Keyboard bell _off"
 #~ msgstr "Tipkovnični zvonec je _izključen"
 
@@ -4032,9 +4163,6 @@ msgstr "Ali naj se prikažejo sličice tem"
 #~ msgid "_Custom keyboard bell:"
 #~ msgstr "_Poljuben tipkovničin zvonec:"
 
-#~ msgid "Keyboard Properties"
-#~ msgstr "Nastavitve tipkovnice"
-
 #~ msgid "Pro_xy requires a username and password"
 #~ msgstr "Pos_rednik zahteva uporabniško ime in geslo"
 
@@ -4495,12 +4623,6 @@ msgstr "Ali naj se prikažejo sličice tem"
 #~ msgid "Wherever the Window Manager places them"
 #~ msgstr "kjer jih postavi upravljalnik oken"
 
-#~ msgid "Configure which programs are used to display URLs"
-#~ msgstr "Nastavi kateri programi so uporabljeni za prikaz URLjev"
-
-#~ msgid "URL Handlers"
-#~ msgstr "Obravnavalniki URLjev"
-
 #~ msgid "Command"
 #~ msgstr "Ukaz"
 
@@ -4585,9 +4707,6 @@ msgstr "Ali naj se prikažejo sličice tem"
 #~ msgid "Cancel"
 #~ msgstr "Prekliči"
 
-#~ msgid "Command:"
-#~ msgstr "Ukaz:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Upravljalnik oken je upravljan s sejo"
 
diff --git a/po/sq.po b/po/sq.po
index 4f6bffeb7..22d81520d 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -9,15 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.HEAD.sq\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-17 19:58+0100\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-11-18 02:40+0100\n"
 "Last-Translator: Elian Myftiu <elian@lycos.com>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
-"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.9.1\n"
 
 #: capplets/accessibility/at-properties/at-enable-dialog.glade.h:1
 msgid "<b>Applications</b>"
@@ -63,11 +62,11 @@ msgstr "_Tastierë në monitor"
 msgid "_Screenreader"
 msgstr "_Lexuesi i ekranit"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Suporti i teknologjisë asistuese"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Aktivo suportin për teknologjitë asistuese të GNOME kur futesh"
 
@@ -123,13 +122,13 @@ msgstr "_Importo Karakteristikat"
 msgid "_Import"
 msgstr "_Importo"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tastiera"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Rregullo preferimet e tastierës"
 
@@ -205,7 +204,8 @@ msgstr "Njofto kur _shkëmbyesi është i shtypur"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Njofto kur një LED është e ndezur, njofto dy herë kur është e shuajtur."
+msgstr ""
+"Njofto kur një LED është e ndezur, njofto dy herë kur është e shuajtur."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Beep when key is:"
@@ -263,7 +263,8 @@ msgstr "Preferimet e Miut..."
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
-msgstr "Prano tastat vetëm pasi të jenë mbajtur shtypur për një kohë të caktuar."
+msgstr ""
+"Prano tastat vetëm pasi të jenë mbajtur shtypur për një kohë të caktuar."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
 msgid ""
@@ -340,11 +341,11 @@ msgstr "pixel/sekondë"
 msgid "seconds"
 msgstr "sekonda"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Ndrysho rregullimet e Sfondit të Hapësirës së Punës"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Sfondi i Hapësirës së Punës"
 
@@ -423,6 +424,13 @@ msgstr "Shto Imazh Sfondi"
 msgid "No Wallpaper"
 msgstr "Pa Imazh Sfondi"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -544,7 +552,8 @@ msgid "Change set"
 msgstr "Ndrysho rregullimet"
 
 #: capplets/common/gconf-property-editor.c:184
-msgid "GConf change set containing data to be forwarded to the gconf client on apply"
+msgid ""
+"GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr ""
 "Rregullimet e GConf që përmbajnë të dhëna për t'ju çuar klientit gconf kur "
 "aplikohen"
@@ -554,16 +563,20 @@ msgid "Conversion to widget callback"
 msgstr "Shndërrimi tek thirrja widget"
 
 #: capplets/common/gconf-property-editor.c:190
-msgid "Callback to be issued when data are to be converted from GConf to the widget"
-msgstr "Callback për t'u lëshuar kur të dhënat duhen shndërruar nga GConf tek widget"
+msgid ""
+"Callback to be issued when data are to be converted from GConf to the widget"
+msgstr ""
+"Callback për t'u lëshuar kur të dhënat duhen shndërruar nga GConf tek widget"
 
 #: capplets/common/gconf-property-editor.c:195
 msgid "Conversion from widget callback"
 msgstr "Shndërrim nga thirrja e widget callback"
 
 #: capplets/common/gconf-property-editor.c:196
-msgid "Callback to be issued when data are to be converted to GConf from the widget"
-msgstr "Callback për t'u lëshuar kur të dhënat duhen shndërruar në GConf nga widget"
+msgid ""
+"Callback to be issued when data are to be converted to GConf from the widget"
+msgstr ""
+"Callback për t'u lëshuar kur të dhënat duhen shndërruar në GConf nga widget"
 
 #: capplets/common/gconf-property-editor.c:201
 msgid "UI Control"
@@ -587,7 +600,8 @@ msgstr "Callback i lirimit të të dhënave të editorit të pronësisë"
 
 #: capplets/common/gconf-property-editor.c:225
 msgid "Callback to be issued when property editor object data is to be freed"
-msgstr "Callback për t'u lëshuar kur e dhëna e editorit të pronësisë duhet liruar"
+msgstr ""
+"Callback për t'u lëshuar kur e dhëna e editorit të pronësisë duhet liruar"
 
 #: capplets/common/gconf-property-editor.c:1543
 #, c-format
@@ -623,15 +637,147 @@ msgstr "Të lutem zgjidh një figurë."
 msgid "_Select"
 msgstr "_Zgjidh"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Programet e Preferuar"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Zgjidh programet e zakonshëm"
 
+#: capplets/default-applications/gnome-default-applications-properties.c:123
+msgid "Please specify a name and a command for this editor."
+msgstr "Të lutem zgjidh një emër dhe një komandë për këtë editor."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:2
+msgid "Add..."
+msgstr "Shto..."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:3
+#, fuzzy
+msgid "C_ustom"
+msgstr "E personalizuar"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:4
+#, fuzzy
+msgid "C_ustom:"
+msgstr "E personalizuar"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:5
+msgid "Can open _URIs"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:6
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Ky program mund të hapë më shumë se një file"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:7
+msgid "Co_mmand:"
+msgstr "Ko_manda:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:8
+msgid "Custom Editor Properties"
+msgstr "Preferecat e Editorit të Përzgjedhur"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:9
+msgid "Default Mail Reader"
+msgstr "Lexuesi Email i Zakonshëm"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:10
+msgid "Default Terminal"
+msgstr "Terminali i Zakonshëm"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:11
+msgid "Default Text Editor"
+msgstr "Editori i Teskstit i Zakonshëm"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:12
+msgid "Default Web Browser"
+msgstr "Shfletues-i Web i Zakonshëm"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:13
+msgid "Default Window Manager"
+msgstr "Menazheri i Zakonshëm i Dritareve"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:14
+msgid "Delete"
+msgstr "Elemino"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:15
+msgid "E_xec Flag:"
+msgstr "E_kzekuto Flag:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:16
+msgid "Edit..."
+msgstr "Ndrysho..."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:17
+msgid "Mail Reader"
+msgstr "Lexues Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Ekzekuto në _Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Ekzekuto në _Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+msgid ""
+"Select the window manager you want.  You will need to hit apply, wave the "
+"magic wand, and do a magic dance for it to work."
+msgstr ""
+"Zgjidh menazherin e dritareve që dëshiron.  Duhet të shtypësh vepro,të "
+"tundësh shkopin magjik dhe të hedhësh një valle magjike që të punojë."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+msgid "Terminal"
+msgstr "Terminali"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
+msgid "Text Editor"
+msgstr "Editues teksti"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:24
+msgid "Understands _Netscape Remote Control"
+msgstr "Kupton Kontrollin e Jashtëm të _Netscape"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
+msgid "Use this _editor to open text files in the file manager"
+msgstr "Përdor këtë _editor për të hapur file teksti në menazhuesin e file-ve"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
+msgid "Web Browser"
+msgstr "Shfletuesi Web"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+msgid "Window Manager"
+msgstr "Organizuesi i dritareve"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Ko_manda:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/file-types/file-types-properties.glade.h:23
+msgid "_Name:"
+msgstr "_Emri:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+msgid "_Properties..."
+msgstr "_Pronësitë...."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Zgjidh"
+
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:9
 msgid "Debian Sensible Browser"
 msgstr "Shfletuesi Kryesor Debian"
@@ -649,7 +795,8 @@ msgid "Encompass"
 msgstr "Encompass"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-msgid "Firebird/FireFox"
+#, fuzzy
+msgid "Firebird"
 msgstr "Firebird/FireFox"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:14
@@ -658,8 +805,9 @@ msgstr "Firefox"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:15
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
 
 #: capplets/default-applications/gnome-default-applications-properties-structs.c:17
 msgid "Netscape Communicator"
@@ -740,152 +888,11 @@ msgstr "aterm"
 msgid "ETerm"
 msgstr "ETerm"
 
-#: capplets/default-applications/gnome-default-applications-properties.c:123
-msgid "Please specify a name and a command for this editor."
-msgstr "Të lutem zgjidh një emër dhe një komandë për këtë editor."
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:2
-msgid "Add..."
-msgstr "Shto..."
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Editori i Pë_rzgjedhur"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Lexuesi email personal:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terminali i Pë_rzgjedhur:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Shfletues-i Web i Pë_rzgjedhur:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:7
-msgid "Co_mmand:"
-msgstr "Ko_manda:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:8
-msgid "Custom Editor Properties"
-msgstr "Preferecat e Editorit të Përzgjedhur"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:9
-msgid "Default Mail Reader"
-msgstr "Lexuesi Email i Zakonshëm"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:10
-msgid "Default Terminal"
-msgstr "Terminali i Zakonshëm"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:11
-msgid "Default Text Editor"
-msgstr "Editori i Teskstit i Zakonshëm"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:12
-msgid "Default Web Browser"
-msgstr "Shfletues-i Web i Zakonshëm"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:13
-msgid "Default Window Manager"
-msgstr "Menazheri i Zakonshëm i Dritareve"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:14
-msgid "Delete"
-msgstr "Elemino"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:15
-msgid "E_xec Flag:"
-msgstr "E_kzekuto Flag:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:16
-msgid "Edit..."
-msgstr "Ndrysho..."
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:17
-msgid "Mail Reader"
-msgstr "Lexues Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:19
-msgid ""
-"Select the window manager you want.  You will need to hit apply, wave the "
-"magic wand, and do a magic dance for it to work."
-msgstr ""
-"Zgjidh menazherin e dritareve që dëshiron.  Duhet të shtypësh vepro,të "
-"tundësh shkopin magjik dhe të hedhësh një valle magjike që të punojë."
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Nise në T_erminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
-msgid "Terminal"
-msgstr "Terminali"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
-msgid "Text Editor"
-msgstr "Editues teksti"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Ky program mund të hapë _URL"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Ky program mund të hapë më shumë se një file"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Ky program duhet të ekzekutohet në një _shell"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
-msgid "Understands _Netscape Remote Control"
-msgstr "Kupton Kontrollin e Jashtëm të _Netscape"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
-msgid "Use this _editor to open text files in the file manager"
-msgstr "Përdor këtë _editor për të hapur file teksti në menazhuesin e file-ve"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
-msgid "Web Browser"
-msgstr "Shfletuesi Web"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
-msgid "Window Manager"
-msgstr "Organizuesi i dritareve"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
-#: capplets/file-types/file-types-properties.glade.h:23
-msgid "_Name:"
-msgstr "_Emri:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
-msgid "_Properties..."
-msgstr "_Pronësitë...."
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Zgjidh një lexues email:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Zgjidh një Terminal:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Zgjidh një Shfletues Web:"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Zgjidh një Editor:"
-
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Ndrysho përmasat e ekranit"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Përmasat e ekranit"
 
@@ -925,17 +932,23 @@ msgid "Options"
 msgstr "Mundësitë"
 
 #: capplets/display/main.c:580
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Testing the new settings. If you don't respond in %d second the previous "
 "settings will be restored."
+msgid_plural ""
 "Testing the new settings. If you don't respond in %d seconds the previous "
 "settings will be restored."
-msgstr ""
-"Duke provuar rregullimet e reja. Nëse nuk përgjigjesh brenda %d sekonde "
-"do të rikthehem tek rregullimet e mëparshme."
-"Duke provuar rregullimet e reja. Nëse nuk përgjigjesh brenda %d sekondash "
-"do të rikthehem tek rregullimet e mëparshme."
+msgstr[0] ""
+"Duke provuar rregullimet e reja. Nëse nuk përgjigjesh brenda %d sekonde do "
+"të rikthehem tek rregullimet e mëparshme.Duke provuar rregullimet e reja. "
+"Nëse nuk përgjigjesh brenda %d sekondash do të rikthehem tek rregullimet e "
+"mëparshme."
+msgstr[1] ""
+"Duke provuar rregullimet e reja. Nëse nuk përgjigjesh brenda %d sekonde do "
+"të rikthehem tek rregullimet e mëparshme.Duke provuar rregullimet e reja. "
+"Nëse nuk përgjigjesh brenda %d sekondash do të rikthehem tek rregullimet e "
+"mëparshme."
 
 #: capplets/display/main.c:626
 msgid "Keep Resolution"
@@ -974,7 +987,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Jeni i sigurt që dëshironi të fshini përgjithmonë këtë zë?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Përshkrimi"
 
@@ -982,15 +995,25 @@ msgstr "Përshkrimi"
 msgid "Extensions"
 msgstr "Shtesat"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Llojet e File dhe Programet"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "Zgjidh programin për të hapur ose parë çdo lloj file"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Lloje file dhe programet"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Përcakto se çfarë programesh duhen përdorur për të hapur ose parë një lloj "
+"të dhënë file"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Veprime"
@@ -1089,16 +1112,6 @@ msgstr "_Hiq"
 msgid "_Viewer component:"
 msgstr "_Komponenti Shikues:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Lloje file dhe programet"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Përcakto se çfarë programesh duhen përdorur për të hapur ose parë një lloj "
-"të dhënë file"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Ndrysho kategorinë e file"
@@ -1283,11 +1296,11 @@ msgstr "Transmetim i postës elektronike"
 msgid "GNOME documentation"
 msgstr "Dokumentat e GNOME-s"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Gërmat"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Zgjidh shkronjat për hapësirën e punës"
 
@@ -1429,32 +1442,44 @@ msgid "Font may be too large"
 msgstr "Gërmat mund të jenë shumë të gjëra"
 
 #: capplets/font/main.c:507
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The font selected is %d point large, and may make it difficult to "
 "effectively use the computer.  It is recommended that you select a size "
 "smaller than %d."
+msgid_plural ""
 "The font selected is %d points large, and may make it difficult to "
 "effectively use the computer.  It is recommended that you select a size "
 "smaller than %d."
-msgstr ""
-"Gërma e zgjedhur është %d pikë e gjerë, dhe mund ta vështirësojë "
-"përdorimin efikas të kompjuterit.  Këshillohet zgjedhja e një madhësie "
-"më të vogël se %d. "
-"Gërma e zgjedhur është %d pika e gjerë, dhe mund ta vështirësojë "
-"përdorimin efikas të kompjuterit.  Këshillohet zgjedhja e një madhësie "
-"më të vogël se %d."
+msgstr[0] ""
+"Gërma e zgjedhur është %d pikë e gjerë, dhe mund ta vështirësojë përdorimin "
+"efikas të kompjuterit.  Këshillohet zgjedhja e një madhësie më të vogël se %"
+"d. Gërma e zgjedhur është %d pika e gjerë, dhe mund ta vështirësojë "
+"përdorimin efikas të kompjuterit.  Këshillohet zgjedhja e një madhësie më të "
+"vogël se %d."
+msgstr[1] ""
+"Gërma e zgjedhur është %d pikë e gjerë, dhe mund ta vështirësojë përdorimin "
+"efikas të kompjuterit.  Këshillohet zgjedhja e një madhësie më të vogël se %"
+"d. Gërma e zgjedhur është %d pika e gjerë, dhe mund ta vështirësojë "
+"përdorimin efikas të kompjuterit.  Këshillohet zgjedhja e një madhësie më të "
+"vogël se %d."
 
 #: capplets/font/main.c:514
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The font selected is %d point large, and may make it difficult to "
 "effectively use the computer.  It is recommended that you select a smaller "
 "sized font."
+msgid_plural ""
 "The font selected is %d points large, and may make it difficult to "
 "effectively use the computer.  It is recommended that you select a smaller "
 "sized font."
-msgstr ""
+msgstr[0] ""
+"Gërma e zgjedhur është %d pikë e gjerë,dhe mund t'a vështirësojë përdorimin "
+"efikas të kompjuterit.  Këshillohet zgjedhja e një madhësie më të të vogël."
+"Gërma e zgjedhur është %d pika e gjerë,dhe mund t'a vështirësojë përdorimin "
+"efikas të kompjuterit.  Këshillohet zgjedhja e një madhësie më të vogël."
+msgstr[1] ""
 "Gërma e zgjedhur është %d pikë e gjerë,dhe mund t'a vështirësojë përdorimin "
 "efikas të kompjuterit.  Këshillohet zgjedhja e një madhësie më të të vogël."
 "Gërma e zgjedhur është %d pika e gjerë,dhe mund t'a vështirësojë përdorimin "
@@ -1502,7 +1527,7 @@ msgid "Desktop"
 msgstr "Hapësira e Punës"
 
 #: capplets/keybindings/gnome-keybinding-properties.c:559
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Zëri"
 
@@ -1540,7 +1565,7 @@ msgid "Shortcut"
 msgstr "Kombinimi përshpejtues"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Kombinacione Përshpejtuese nga Tastiera"
 
@@ -1552,23 +1577,10 @@ msgstr ""
 "Për të ndryshuar një kombinim tastesh, kliko tek rreshti korrispondues dhe "
 "shkruaj një shpejtues të ri, ose shtyp backspace për ta fshirë."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Caktoi taste shpejtues komandave"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Nuk njihet"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modele"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
-msgid "Keyboard layout preview"
-msgstr "Pamja e parë e modelit të tastierës"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1582,7 +1594,8 @@ msgstr "_Përdorshmëria"
 #: capplets/keyboard/gnome-keyboard-properties.c:222
 #: capplets/sound/sound-properties-capplet.c:240
 #: capplets/sound/sound-properties-capplet.c:242
-msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
+msgid ""
+"Just apply settings and quit (compatibility only; now handled by daemon)"
 msgstr "Apliko preferimet dhe largohu (të përpuethshmërisë; me anë të daemon)"
 
 #: capplets/keyboard/gnome-keyboard-properties.c:226
@@ -1733,10 +1746,32 @@ msgstr "Intervali i _punës:"
 msgid "minutes"
 msgstr "minuta"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Nuk njihet"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modele"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Pamja e parë e modelit të tastierës"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Cakto preferimet e tastierës"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Zgjidh preferimet e miut"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Kursor i panjohur"
@@ -1901,20 +1936,21 @@ msgstr "_Pragu:"
 msgid "_Timeout:"
 msgstr "_Kohëzgjatja:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Miu"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Zgjidh preferimet e miut"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Proxy i Rrjetit"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Preferimet e proxy-t të rrjetit"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1958,8 +1994,9 @@ msgid "H_TTP proxy:"
 msgstr "Proxy H_TTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Konfigurimi i Proxy-t të Rrjetit"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Preferimet e proxy-t të rrjetit"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -1997,7 +2034,7 @@ msgstr "_Fjalëkalimi:"
 msgid "_Secure HTTP proxy:"
 msgstr "Proxy HTTP i _Sigurtë:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Aktivo tinguj dhe bashkëngjitja efekteve"
 
@@ -2065,7 +2102,8 @@ msgstr "Nuk u gjend file për temën e përcaktuar për instalim"
 
 #: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
-msgstr "Vendndodhja e file të temës, përcaktuar për instalim, nuk është e vlefshme"
+msgstr ""
+"Vendndodhja e file të temës, përcaktuar për instalim, nuk është e vlefshme"
 
 #: capplets/theme-switcher/gnome-theme-installer.c:177
 #, c-format
@@ -2111,12 +2149,12 @@ msgstr "Emri i temës duhet të jetë i pranishëm"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Tema ekziston. Dëshironi t'a zëvendësoni?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Zgjidh tema për pjesë të ndryshme të hapësirës së punës"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2228,11 +2266,11 @@ msgstr "_Emri i temës:"
 msgid "theme selection tree"
 msgstr "pema e zgjedhjes së temës"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Përshtat paraqitjen e veglave dhe menuve tek programet"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menutë & Veglat"
 
@@ -2328,6 +2366,14 @@ msgstr "_Dalja"
 msgid "_Save"
 msgstr "_Ruaj"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2374,7 +2420,8 @@ msgstr "<b>Zgjedhja e Dritares</b>"
 
 #: capplets/windows/gnome-window-properties.glade.h:4
 msgid "To _move a window, press-and-hold this key then grab the window:"
-msgstr "Për të lëvizur një dritare, shtyp dhe mbaj këtë tast pastaj kap dritaren:"
+msgstr ""
+"Për të lëvizur një dritare, shtyp dhe mbaj këtë tast pastaj kap dritaren:"
 
 #: capplets/windows/gnome-window-properties.glade.h:5
 msgid "Window Preferences"
@@ -2396,14 +2443,33 @@ msgstr "_Nxirr në plan të parë dritaren e zgjedhur pas njëfarë kohe"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Zgjidh dritaret kur miu kalon sipër tyre"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Pronësitë e Dritares"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Dritaret"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Qendra e Kontrollit të GNOME"
+
+#: control-center/control-center.c:1121
+msgid "Desktop Preferences"
+msgstr "Preferimet e Hapësirës së Punës"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Të tjerë"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Veglat e konfigurimit të GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Qendra e Kontrollit"
@@ -2432,23 +2498,6 @@ msgstr "Fabrika e paraqitjes së Qendrës së Kontrollit"
 msgid "View as Control Center"
 msgstr "Paraqite si Qendër Kontrolli"
 
-#: control-center/control-center-categories.c:248
-msgid "Others"
-msgstr "Të tjerë"
-
-#: control-center/control-center.c:1005 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Qendra e Kontrollit të GNOME"
-
-#: control-center/control-center.c:1121
-msgid "Desktop Preferences"
-msgstr "Preferimet e Hapësirës së Punës"
-
-#: control-center/gnomecc.desktop.in.h:2
-#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Veglat e konfigurimit të GNOME"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volumi"
@@ -2518,12 +2567,14 @@ msgstr ""
 #: gnome-settings-daemon/gnome-settings-keybindings.c:207
 #, c-format
 msgid "Key Binding (%s) has its action defined multiple times\n"
-msgstr "Lidhja e Tasteve (%s) e ka veprimin të përcaktuar për kohë të shumëfishta\n"
+msgstr ""
+"Lidhja e Tasteve (%s) e ka veprimin të përcaktuar për kohë të shumëfishta\n"
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:220
 #, c-format
 msgid "Key Binding (%s) has its binding defined multiple times\n"
-msgstr "Lidhja e Tasteve (%s) e ka lidhjen të përcaktuar për kohë të shumëfishta\n"
+msgstr ""
+"Lidhja e Tasteve (%s) e ka lidhjen të përcaktuar për kohë të shumëfishta\n"
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:226
 #, c-format
@@ -2554,7 +2605,7 @@ msgstr ""
 "Gabim në ekzekutimin e (%s)\n"
 "që është lidhur me çelsin (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2579,7 +2630,7 @@ msgstr ""
 "- Rezultatin e <b>xprop -root | grep XKB</b>\n"
 "- Rezultatin e <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2591,7 +2642,7 @@ msgstr ""
 "përdorësh një konfigurim më të thjeshtë, apo një version më të ri të "
 "programit XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2599,15 +2650,15 @@ msgstr ""
 "Rregullimet e tastierës së sistemit X ndryshojnë nga ato të rregullimeve nga "
 "ana e GNOME-s.  Cilin nga të dy dëshiron të përdorësh?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Përdor rregullimet e X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Përdor rregullimet e GNOME-s"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2781,7 +2832,8 @@ msgid "Roll up"
 msgstr "Mblidh"
 
 #: schemas/apps_gnome_settings_daemon_default_editor.schemas.in.h:1
-msgid "If true, the mime handlers for text/plain and text/* will be kept in sync"
+msgid ""
+"If true, the mime handlers for text/plain and text/* will be kept in sync"
 msgstr ""
 "Nëse e vërtetë,ndihmësit mime për tekst/i qartë dhe tekst/* do mbahen në "
 "sinkronizim"
@@ -2983,7 +3035,8 @@ msgid "RGBA Order"
 msgstr "Renditja RGBA"
 
 #: schemas/desktop_gnome_font_rendering.schemas.in.h:5
-msgid "Resolution used for converting font sizes to pixel sizes, in dots per inch"
+msgid ""
+"Resolution used for converting font sizes to pixel sizes, in dots per inch"
 msgstr ""
 "Dallueshmëria e përdorur për shndërrimin e shkronjave në pixel, në pika për "
 "inç"
@@ -3021,30 +3074,78 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Shumë shpejt, të dhënat e XKB-së në gconf do anashkalohen (prej konfigurimit "
-"të sistemit)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Modeli i tastierës XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Modeli i tastierës XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Mundësitë e XKB-së"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Modeli i Tastierës"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Modeli i tastierës XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Modeli i Tastierës"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Kombinacione Përshpejtuese nga Tastiera"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "Të·dhënat·e·XKB-së·në·gconf·do·anashkalohen·prej ASAP·"
 "(konfigurimit·të·sistemit)"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Shumë shpejt, të dhënat e XKB-së në gconf do anashkalohen (prej konfigurimit "
+"të sistemit)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Modeli i tastierës XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Modeli i tastierës XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Shtyje pushimin"
@@ -3122,46 +3223,14 @@ msgstr ""
 "paneli juaj. Mund të shtoni një zonë lajmërimi me një klikim të djathtë tek "
 "paneli juaj dhe zgjidhni 'Shtoi panelit -> Utility -> Zona e njoftimit'."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Ai budalaala rrot pengon përpara. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Emri:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stili:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Lloji:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Madhësia:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Versioni:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Përshkrimi:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "përdorimi: %s fontfile\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Zgjidh Shkronjat e Programeve"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Elementët e menu-së së shkronjave "
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Zgjidh programet e zakonshëm"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3180,7 +3249,8 @@ msgid "If set to true, then Type1 fonts will be thumbnailed."
 msgstr "Nëse e vendosur në \"true\", shkronjat Type1 do të minjaturizohen."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:5
-msgid "Set this key to the command used to create thumbnails for OpenType fonts."
+msgid ""
+"Set this key to the command used to create thumbnails for OpenType fonts."
 msgstr ""
 "Vendos këtë tast tek komanda e përdorur për të krijuar minjaturizime për "
 "shkronjat OpenType."
@@ -3192,7 +3262,8 @@ msgstr ""
 "shkronjat PCF."
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:7
-msgid "Set this key to the command used to create thumbnails for TrueType fonts."
+msgid ""
+"Set this key to the command used to create thumbnails for TrueType fonts."
 msgstr ""
 "Vendos këtë tast tek komanda e përdorur për të krijuar minjaturizime për "
 "shkronjat TrueType."
@@ -3235,37 +3306,46 @@ msgstr "Whether to thumbnail TrueType fonts"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Whether to thumbnail Type1 fonts"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fabrikë për menu e fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Ai budalaala rrot pengon përpara. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Menu-ja kontekstuale e Fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Emri:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fabrika e Fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stili:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Zërat e menu-së kontekstuale të Nautilus për gërmat"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Lloji:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Zgjidh Shkronjat e Programeve"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Madhësia:"
 
-#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.h:1
-msgid "GNOME Font Viewer"
-msgstr "Shikuesi i Gërmave GNOME"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Versioni:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponenti shikues i përmbajtjes së pronësive të temës"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus Shikuesi i Pronësive të Temës"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Përshkrimi:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "përdorimi: %s fontfile\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+msgid "GNOME Font Viewer"
+msgstr "Shikuesi i Gërmave GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3295,27 +3375,18 @@ msgstr "_Përdor shkronjat"
 msgid "Themes"
 msgstr "Temat"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Kontrolli i temës"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Bordi i dritares së temës"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikona e temës"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URl e shfaqur aktualisht"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Nëse e vendosur në \"true\", temat e instaluar do të minjaturizohen."
@@ -3325,7 +3396,8 @@ msgid "If set to true, then themes will be thumbnailed."
 msgstr "Nëse e vendosur në \"true\", temat do të minjaturizohen."
 
 #: vfs-methods/themus/themus.schemas.in.h:3
-msgid "Set this key to the command used to create thumbnails for installed themes."
+msgid ""
+"Set this key to the command used to create thumbnails for installed themes."
 msgstr ""
 "Vendos këtë tast tek komanda e përdorur për të krijuar minjaturizime për "
 "temat e instaluara."
@@ -3352,3 +3424,83 @@ msgstr "Tregon nëse duhen gjeneruar miniaturat e temave të instaluara"
 msgid "Whether to thumbnail themes"
 msgstr "Tregon nëse duhen gjeneruar miniaturat e temave"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Përdor shkronjat"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Përdor vlerat e pre_zgjedhura"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Editori i Pë_rzgjedhur"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Lexuesi email personal:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terminali i Pë_rzgjedhur:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Shfletues-i Web i Pë_rzgjedhur:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Nise në T_erminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Ky program mund të hapë _URL"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Ky program duhet të ekzekutohet në një _shell"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Zgjidh një lexues email:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Zgjidh një Terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Zgjidh një Shfletues Web:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Zgjidh një Editor:"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Konfigurimi i Proxy-t të Rrjetit"
+
+#~ msgid "XKB options"
+#~ msgstr "Mundësitë e XKB-së"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Elementët e menu-së së shkronjave "
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fabrikë për menu e fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menu-ja kontekstuale e Fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fabrika e Fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Zërat e menu-së kontekstuale të Nautilus për gërmat"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponenti shikues i përmbajtjes së pronësive të temës"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus Shikuesi i Pronësive të Temës"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URl e shfaqur aktualisht"
diff --git a/po/sr.po b/po/sr.po
index 823da4770..f36698582 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-10-14 01:11+0200\n"
 "Last-Translator: Veljko M. Stanojevic <veljko@vms.homelinux.net>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
@@ -63,11 +63,11 @@ msgstr "_Тастатура на екрану"
 msgid "_Screenreader"
 msgstr "_Читач екрана"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Подршка технологијама за испомоћ"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Укључи при пријави подршку за Гномове технологије за испомоћ"
 
@@ -119,13 +119,13 @@ msgstr "Увези датотеку са подешавањима могућно
 msgid "_Import"
 msgstr "У_вези"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Тастатура"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Подесите приступачност тастатуре"
 
@@ -338,11 +338,11 @@ msgstr "пиксела у секунди"
 msgid "seconds"
 msgstr "секунди"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Измените изглед позадине ваше радне површи"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Позадина радне површи"
 
@@ -421,6 +421,13 @@ msgstr "Додај позадину"
 msgid "No Wallpaper"
 msgstr "Без позадине"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -632,105 +639,15 @@ msgstr "Одаберите слику."
 msgid "_Select"
 msgstr "_Изабери"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Омиљени програми"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Одаберите ваше основне програме"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Спознаја"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Галија"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Мозила/Нетскејп 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Нетскејп Комуникатор"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Конкверор"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M текстуални читач веба"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx текстуални читач веба"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Линкс текстуални читач веба"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Програм за пошту Еволуција"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Балса"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "КМејл"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Мозила Пошта"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Гномов терминал"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Стандардни X терминал"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Наведите име и наредбу за овај уређивач."
@@ -740,20 +657,22 @@ msgid "Add..."
 msgstr "Додај..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Уређивач текста по _избору:"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Прилагођено:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Читач поште по _избору:"
+msgid "C_ustom:"
+msgstr "Прилагођено:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Терминал по _избору:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Веб читач по _избору:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Овај програм може да отвара вишеструке датотеке"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -800,98 +719,183 @@ msgid "Mail Reader"
 msgstr "Читач поште"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
-msgid ""
-"Select the window manager you want.  You will need to hit apply, wave the "
-"magic wand, and do a magic dance for it to work."
-msgstr "Одаберите управника прозора."
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Покрени у терминалу"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
+#, fuzzy
+msgid "Run in a t_erminal"
 msgstr "Покрени у терминалу"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+msgid ""
+"Select the window manager you want.  You will need to hit apply, wave the "
+"magic wand, and do a magic dance for it to work."
+msgstr "Одаберите управника прозора."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Терминал"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Уређивач текста"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Овај програм може да отвара URI-е"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Овај програм може да отвара вишеструке датотеке"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Овај програм се мора изнова покренути из љуске"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Разуме Netscape-ове даљинске контроле"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Користти овај уређивач текста за отварање текст датотека у управнику датотека"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Веб читач"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Управник прозора"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Наредба:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Име:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "Осо_бине..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Одаберите читача поште:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Изабери"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+msgid "Debian Sensible Browser"
+msgstr "Разумни читач Дебијана"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Спознаја"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Галија"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+#, fuzzy
+msgid "Firefox"
+msgstr "FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Мозила Пошта"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Нетскејп Комуникатор"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Конкверор"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M текстуални читач веба"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx текстуални читач веба"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Линкс текстуални читач веба"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Програм за пошту Еволуција"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Балса"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Одаберите терминал:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "КМејл"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Одаберите веб читач:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Одаберите уређивач:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Мозила Пошта"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Приступачност"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Подешења приступачности"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+msgid "Debian Terminal Emulator"
+msgstr "Емулатор терминала из Дебијана"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Напредно"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Терминал"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Напредна подешења"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Стандардни X терминал"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Промена резолуције екрана"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Резолуција екрана"
 
@@ -985,7 +989,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Сигурно желите да уклоните овај унос за стално?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Опис"
 
@@ -993,17 +997,27 @@ msgstr "Опис"
 msgid "Extensions"
 msgstr "Наставци"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Врсте датотека и програми"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Одредите који програми се користе за отварање или прегледање којих врста "
 "датотека"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Врсте датотека и програми"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Одредите који програми се користе за отварање или прегледање којих врста "
+"датотека"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Акције"
@@ -1094,6 +1108,7 @@ msgid "_Protocol:"
 msgstr "Протокол:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "Уклони"
 
@@ -1101,16 +1116,6 @@ msgstr "Уклони"
 msgid "_Viewer component:"
 msgstr "Прегледач:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Врсте датотека и програми"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Одредите који програми се користе за отварање или прегледање којих врста "
-"датотека"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Уредите категорију датотеке"
@@ -1292,14 +1297,15 @@ msgid "Electronic mail transmission"
 msgstr "Пренос електронске поште"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Гном документација"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Фонт"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Одаберите фонтове за радну површину"
 
@@ -1508,29 +1514,29 @@ msgid "The type of accelerator."
 msgstr "Врста пречице."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Онемогућено"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Непозната радња>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Радна површина"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Звук"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Управљање прозорима"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1539,26 +1545,26 @@ msgstr ""
 "Пречица „%s“ се већ користи за:\n"
 " „%s“\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Грешка при смештању нове пречице у базу подешавања: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Грешка при искључивању нове пречице из базе подешавања: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Акција"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Пречица"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Пречице на тастатури"
 
@@ -1570,23 +1576,10 @@ msgstr ""
 "Да измените пречицу, кликните на одговарајући ред и укуцајте нову пречицу "
 "или притисните Backspace да очистите."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Доделите преке тастере наредбама"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Непознато"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Модели"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Преглед распореда тастатуре"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1753,10 +1746,31 @@ msgstr "Период _рада траје:"
 msgid "minutes"
 msgstr "минута"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Непознато"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Модели"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Преглед распореда тастатуре"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Подесите вашу тастатуру"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr "Језик и поднебље"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+msgid "Set your language and culture preferences"
+msgstr "Подесите ваш језик и поднебље"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Непознат курсор"
@@ -1921,20 +1935,21 @@ msgstr "_Праг:"
 msgid "_Timeout:"
 msgstr "Истек _времена:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Миш"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Подесите вашег миша"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Мрежни посредник"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Поставке мрежног посредника"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1978,8 +1993,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP посредник:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Подешавање мрежног посредника"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Поставке мрежног посредника"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2017,7 +2033,7 @@ msgstr "_Лозинка:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Безбедни HTTP посредник:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Омогући звук и повежи звуке са догађајима"
 
@@ -2075,15 +2091,26 @@ msgstr ""
 "дијалог \"Подешења теме\" није правилно инсталиран, или да нисте инсталирали "
 "пакет \"гном теме\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Није наведена путања датотеке теме за постављање"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Наведена путања датотеке теме за постављање је неисправна"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2115,12 +2142,12 @@ msgstr "Морате дати назив теме"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Ова тема већ постоји. Желите ли да је замените?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Одаберите теме за разне делове радне површине"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Теме"
 
@@ -2232,11 +2259,11 @@ msgstr "Назив _теме:"
 msgid "theme selection tree"
 msgstr "стабло избора теме"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Прилагодите изглед линија са алатима и менијама у програмима"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Менији и линије са алатима"
 
@@ -2305,7 +2332,6 @@ msgid "_Edit"
 msgstr "_Уређивање"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Датотека"
 
@@ -2333,6 +2359,14 @@ msgstr "_Изађи"
 msgid "_Save"
 msgstr "_Сачувај"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2344,23 +2378,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Хипер"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Супер (или „Виндоуз знак“)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Мета"
 
@@ -2401,14 +2435,34 @@ msgstr "Издигни одабране прозоре после одређен
 msgid "_Select windows when the mouse moves over them"
 msgstr "Ода_бери прозоре када се миш креће преко њих"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Поставке прозора"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Прозори"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Гномов управљачки центар"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Поставке позадине радне површи"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Остали"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Гномов алат за подешавање"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Управљачки центар"
@@ -2437,89 +2491,6 @@ msgstr "Творница прегледа управљачког центра"
 msgid "View as Control Center"
 msgstr "Гледај као управљачки центар"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Гномов управљачки центар: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Изглед"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Изглед који ће се користити за овај преглед контролних програмчета"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Објект директоријума програмчета"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Директоријум програмчета који се види из овог прегледа"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Вељко М. Станојевић <veljko@vms.homelinux.net>\n"
-"Данило Шеган <danilo@prevod.org>\n"
-"\n"
-"Prevod.org — превод на српски језик"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Гномов управљачки центар"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Управник особина радне површине."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Гномов управљачки центар: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Остали"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Гномов управљачки центар"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Користи Наутилус ако је покренут."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "О овом програму"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Преглед управљачког центра"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_О програму"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Садржај"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Помоћ"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Гномов алат за подешавање"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Користи љуску чак и када је наутилус покренут."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Јачина"
@@ -2626,7 +2597,7 @@ msgstr ""
 "Грешка при покретању (%s)\n"
 "које је повезано са тастером (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2652,7 +2623,7 @@ msgstr ""
 "— Излаз <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
 # bug: XFree should be XFree86, AFAIK
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2664,7 +2635,7 @@ msgstr ""
 "Покушајте да користите једноставнија подешавања или да преузмете новије "
 "издање XFree програма."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2672,15 +2643,15 @@ msgstr ""
 "Подешавања тастатуре из Икса се разликују од текућих подешавања тастатуре у "
 "Гному.  Која подешавања желите да користите?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Користи подешавања Икса"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Користи подешавања Гнома"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2745,8 +2716,8 @@ msgstr "_Немој више да приказујеш ову поруку"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Не могу да учитам датотеку %s као пробни %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Не могу да одредим корисников лични директоријум"
 
@@ -2795,11 +2766,11 @@ msgstr "Екран"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Екран на којем ће примењивач позадине цртати"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Звучна датотека за овај догађај не постоји."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2809,32 +2780,32 @@ msgstr ""
 "Можда би требали инсталирати гномов пакет са звуковима\n"
 "да бисте имали основне звукове."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Датотека %s не представља исправну WAV датотеку"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Догађај"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Датотека са звуком"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Звуци:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Датотека са звуком:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Одаберите датотеку са звуком"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Покрени"
 
@@ -3094,28 +3065,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Веома ускоро, подешавања XKB-а у ГКонфу ће бити превазиђена (из подешавања "
-"система)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Распоред XKB тастатуре"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Модел XKB тастатуре"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB опције"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Модел тастатуре:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Распоред XKB тастатуре"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Модел тастатуре:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Пречице на тастатури"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Подешавања XKB-а у ГКонфу ће убрзо бити превазиђена од стране система"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Веома ускоро, подешавања XKB-а у ГКонфу ће бити превазиђена (из подешавања "
+"система)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Распоред XKB тастатуре"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Модел XKB тастатуре"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "Од_ложи одмор"
@@ -3193,47 +3212,14 @@ msgstr ""
 "да ви немате обавештајну зону на вашем панелу. Можете је додати десним-"
 "кликом на панел и избором „Додај на панел > Алати > Обавештајна зона“."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-"Ајшо, лепото и чежњо, за љубав срца мога дођи у Хаџиће на кафу. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Име:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Стил:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Тип:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Величина:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Верзија:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Ауторска права:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Опис:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "употреба: %s фонт\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Намести као фонт апликације"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Ставке у приручном менију фонтова"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Одаберите ваше основне програме"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3312,33 +3298,48 @@ msgstr "Да ли да укључим умањени приказ ТруТајп
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Да ли да укључим умањени приказ Тајп1 фонтова"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Фабрика за фонтилусове приручне меније"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr ""
+"Ајшо, лепото и чежњо, за љубав срца мога дођи у Хаџиће на кафу. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Фонтилус приручни мени"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Име:"
+
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Стил:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Фонтилус фабрика приручних менија"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Тип:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Наутилусови уноси у приручном менију за фонтове"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Величина:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Намести као фонт апликације"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Верзија:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Ауторска права:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Опис:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Компонента помоћног прегледа особина тема"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "употреба: %s фонт\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Темус преглед особина тема"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Гномов управљачки центар"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3367,27 +3368,18 @@ msgstr "_Примени фонт"
 msgid "Themes"
 msgstr "Теме"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Управљаче темом"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Тема за оквире прозора"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Тема за иконе"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI који је тренутно приказан"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "АБВГДЂЕЖЗ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3426,14 +3418,153 @@ msgstr "Да ли да користим умањени приказ инстал
 msgid "Whether to thumbnail themes"
 msgstr "Да ли да користим умањени приказ тема"
 
-#~ msgid "Debian Sensible Browser"
-#~ msgstr "Разумни читач Дебијана"
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "АБВГДЂЕЖЗ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Примени тему..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "_Врати на подразумевано"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Мозила/Нетскејп 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Гномов терминал"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Уређивач текста по _избору:"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Читач поште по _избору:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Терминал по _избору:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Веб читач по _избору:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Покрени у терминалу"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Овај програм може да отвара URI-е"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Овај програм се мора изнова покренути из љуске"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Одаберите читача поште:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Одаберите терминал:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Одаберите веб читач:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Одаберите уређивач:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Приступачност"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Подешења приступачности"
+
+#~ msgid "Advanced"
+#~ msgstr "Напредно"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Напредна подешења"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Подешавање мрежног посредника"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Гномов управљачки центар: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Изглед"
 
-#~ msgid "FireFox"
-#~ msgstr "FireFox"
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Изглед који ће се користити за овај преглед контролних програмчета"
 
-#~ msgid "Debian Terminal Emulator"
-#~ msgstr "Емулатор терминала из Дебијана"
+#~ msgid "Capplet directory object"
+#~ msgstr "Објект директоријума програмчета"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Директоријум програмчета који се види из овог прегледа"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Вељко М. Станојевић <veljko@vms.homelinux.net>\n"
+#~ "Данило Шеган <danilo@prevod.org>\n"
+#~ "\n"
+#~ "Prevod.org — превод на српски језик"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Управник особина радне површине."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Гномов управљачки центар: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Гномов управљачки центар"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Користи Наутилус ако је покренут."
+
+#~ msgid "About this application"
+#~ msgstr "О овом програму"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Преглед управљачког центра"
+
+#~ msgid "_About"
+#~ msgstr "_О програму"
+
+#~ msgid "_Contents"
+#~ msgstr "_Садржај"
+
+#~ msgid "_Help"
+#~ msgstr "_Помоћ"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Користи љуску чак и када је наутилус покренут."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB опције"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Ставке у приручном менију фонтова"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Фабрика за фонтилусове приручне меније"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Фонтилус приручни мени"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Фонтилус фабрика приручних менија"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Наутилусови уноси у приручном менију за фонтове"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Компонента помоћног прегледа особина тема"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Темус преглед особина тема"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI који је тренутно приказан"
 
 #~ msgid ""
 #~ "You have a keyboard remapping file (%s) in your home directory whose "
@@ -3662,9 +3793,6 @@ msgstr "Да ли да користим умањени приказ тема"
 #~ msgid "Desktop Wallpaper"
 #~ msgstr "Позадина радне површи"
 
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Поставке позадине радне површи"
-
 #~ msgid "Show"
 #~ msgstr "Прикажи"
 
@@ -3768,12 +3896,6 @@ msgstr "Да ли да користим умањени приказ тема"
 #~ msgid "_Region:"
 #~ msgstr "_Област:"
 
-#~ msgid "Language and Culture"
-#~ msgstr "Језик и поднебље"
-
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Подесите ваш језик и поднебље"
-
 #~ msgid "Layout _options:"
 #~ msgstr "_Опције распореда:"
 
@@ -3902,9 +4024,6 @@ msgstr "Да ли да користим умањени приказ тема"
 #~ msgid "Toolbars can be _detached and moved around"
 #~ msgstr "Линије са алатима се могу одвајити и премештати"
 
-#~ msgid "Apply theme..."
-#~ msgstr "Примени тему..."
-
 #~ msgid "Themus component"
 #~ msgstr "Компонента темуса"
 
@@ -3914,9 +4033,6 @@ msgstr "Да ли да користим умањени приказ тема"
 #~ msgid "Bee_p"
 #~ msgstr "Запишти"
 
-#~ msgid "C_ustom:"
-#~ msgstr "Прилагођено:"
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "Кликни при притисаку на тастер"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 074af6bf0..b4be2fc3d 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-10-14 01:11+0200\n"
 "Last-Translator: Veljko M. Stanojevic <veljko@vms.homelinux.net>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
@@ -63,11 +63,11 @@ msgstr "_Tastatura na ekranu"
 msgid "_Screenreader"
 msgstr "_Čitač ekrana"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Podrška tehnologijama za ispomoć"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Uključi pri prijavi podršku za Gnomove tehnologije za ispomoć"
 
@@ -119,13 +119,13 @@ msgstr "Uvezi datoteku sa podešavanjima mogućnosti"
 msgid "_Import"
 msgstr "U_vezi"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tastatura"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Podesite pristupačnost tastature"
 
@@ -338,11 +338,11 @@ msgstr "piksela u sekundi"
 msgid "seconds"
 msgstr "sekundi"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Izmenite izgled pozadine vaše radne površi"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Pozadina radne površi"
 
@@ -421,6 +421,13 @@ msgstr "Dodaj pozadinu"
 msgid "No Wallpaper"
 msgstr "Bez pozadine"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -632,105 +639,15 @@ msgstr "Odaberite sliku."
 msgid "_Select"
 msgstr "_Izaberi"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Omiljeni programi"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Odaberite vaše osnovne programe"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Spoznaja"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galija"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozila/Netskejp 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netskejp Komunikator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konkveror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M tekstualni čitač veba"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx tekstualni čitač veba"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links tekstualni čitač veba"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Program za poštu Evolucija"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMejl"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozila Pošta"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnomov terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Standardni X terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Navedite ime i naredbu za ovaj uređivač."
@@ -740,20 +657,22 @@ msgid "Add..."
 msgstr "Dodaj..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Uređivač teksta po _izboru:"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Prilagođeno:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Čitač pošte po _izboru:"
+msgid "C_ustom:"
+msgstr "Prilagođeno:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terminal po _izboru:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Veb čitač po _izboru:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Ovaj program može da otvara višestruke datoteke"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -800,99 +719,184 @@ msgid "Mail Reader"
 msgstr "Čitač pošte"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
-msgid ""
-"Select the window manager you want.  You will need to hit apply, wave the "
-"magic wand, and do a magic dance for it to work."
-msgstr "Odaberite upravnika prozora."
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Pokreni u terminalu"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
+#, fuzzy
+msgid "Run in a t_erminal"
 msgstr "Pokreni u terminalu"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+msgid ""
+"Select the window manager you want.  You will need to hit apply, wave the "
+"magic wand, and do a magic dance for it to work."
+msgstr "Odaberite upravnika prozora."
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Uređivač teksta"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Ovaj program može da otvara URI-e"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Ovaj program može da otvara višestruke datoteke"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Ovaj program se mora iznova pokrenuti iz ljuske"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Razume Netscape-ove daljinske kontrole"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Koristti ovaj uređivač teksta za otvaranje tekst datoteka u upravniku "
 "datoteka"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Veb čitač"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Upravnik prozora"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Naredba:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "Oso_bine..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Odaberite čitača pošte:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Izaberi"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+msgid "Debian Sensible Browser"
+msgstr "Razumni čitač Debijana"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Spoznaja"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galija"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+#, fuzzy
+msgid "Firefox"
+msgstr "FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozila Pošta"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netskejp Komunikator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konkveror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M tekstualni čitač veba"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx tekstualni čitač veba"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links tekstualni čitač veba"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Program za poštu Evolucija"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Odaberite terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMejl"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Odaberite veb čitač:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Odaberite uređivač:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozila Pošta"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Pristupačnost"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Podešenja pristupačnosti"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+msgid "Debian Terminal Emulator"
+msgstr "Emulator terminala iz Debijana"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Napredno"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Napredna podešenja"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Standardni X terminal"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Promena rezolucije ekrana"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Rezolucija ekrana"
 
@@ -986,7 +990,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Sigurno želite da uklonite ovaj unos za stalno?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Opis"
 
@@ -994,17 +998,27 @@ msgstr "Opis"
 msgid "Extensions"
 msgstr "Nastavci"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Vrste datoteka i programi"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Odredite koji programi se koriste za otvaranje ili pregledanje kojih vrsta "
 "datoteka"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Vrste datoteka i programi"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Odredite koji programi se koriste za otvaranje ili pregledanje kojih vrsta "
+"datoteka"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Akcije"
@@ -1095,6 +1109,7 @@ msgid "_Protocol:"
 msgstr "Protokol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "Ukloni"
 
@@ -1102,16 +1117,6 @@ msgstr "Ukloni"
 msgid "_Viewer component:"
 msgstr "Pregledač:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Vrste datoteka i programi"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Odredite koji programi se koriste za otvaranje ili pregledanje kojih vrsta "
-"datoteka"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Uredite kategoriju datoteke"
@@ -1293,14 +1298,15 @@ msgid "Electronic mail transmission"
 msgstr "Prenos elektronske pošte"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnom dokumentacija"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Font"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Odaberite fontove za radnu površinu"
 
@@ -1509,29 +1515,29 @@ msgid "The type of accelerator."
 msgstr "Vrsta prečice."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Nepoznata radnja>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Radna površina"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Zvuk"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Upravljanje prozorima"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1540,26 +1546,26 @@ msgstr ""
 "Prečica „%s“ se već koristi za:\n"
 " „%s“\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Greška pri smeštanju nove prečice u bazu podešavanja: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Greška pri isključivanju nove prečice iz baze podešavanja: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Akcija"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Prečica"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Prečice na tastaturi"
 
@@ -1571,23 +1577,10 @@ msgstr ""
 "Da izmenite prečicu, kliknite na odgovarajući red i ukucajte novu prečicu "
 "ili pritisnite Backspace da očistite."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Dodelite preke tastere naredbama"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modeli"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Pregled rasporeda tastature"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1754,10 +1747,31 @@ msgstr "Period _rada traje:"
 msgid "minutes"
 msgstr "minuta"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modeli"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Pregled rasporeda tastature"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Podesite vašu tastaturu"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr "Jezik i podneblje"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+msgid "Set your language and culture preferences"
+msgstr "Podesite vaš jezik i podneblje"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Nepoznat kursor"
@@ -1922,20 +1936,21 @@ msgstr "_Prag:"
 msgid "_Timeout:"
 msgstr "Istek _vremena:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Miš"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Podesite vašeg miša"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Mrežni posrednik"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Postavke mrežnog posrednika"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1979,8 +1994,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP posrednik:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Podešavanje mrežnog posrednika"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Postavke mrežnog posrednika"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2018,7 +2034,7 @@ msgstr "_Lozinka:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Bezbedni HTTP posrednik:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Omogući zvuk i poveži zvuke sa događajima"
 
@@ -2076,15 +2092,26 @@ msgstr ""
 "dijalog \"Podešenja teme\" nije pravilno instaliran, ili da niste "
 "instalirali paket \"gnom teme\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Nije navedena putanja datoteke teme za postavljanje"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Navedena putanja datoteke teme za postavljanje je neispravna"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2116,12 +2143,12 @@ msgstr "Morate dati naziv teme"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Ova tema već postoji. Želite li da je zamenite?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Odaberite teme za razne delove radne površine"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Teme"
 
@@ -2233,11 +2260,11 @@ msgstr "Naziv _teme:"
 msgid "theme selection tree"
 msgstr "stablo izbora teme"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Prilagodite izgled linija sa alatima i menijama u programima"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Meniji i linije sa alatima"
 
@@ -2306,7 +2333,6 @@ msgid "_Edit"
 msgstr "_Uređivanje"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -2334,6 +2360,14 @@ msgstr "_Izađi"
 msgid "_Save"
 msgstr "_Sačuvaj"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2345,23 +2379,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hiper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (ili „Vindouz znak“)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2402,14 +2436,34 @@ msgstr "Izdigni odabrane prozore posle određenog roka"
 msgid "_Select windows when the mouse moves over them"
 msgstr "Oda_beri prozore kada se miš kreće preko njih"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Postavke prozora"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Prozori"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Gnomov upravljački centar"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Postavke pozadine radne površi"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Ostali"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Gnomov alat za podešavanje"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Upravljački centar"
@@ -2438,89 +2492,6 @@ msgstr "Tvornica pregleda upravljačkog centra"
 msgid "View as Control Center"
 msgstr "Gledaj kao upravljački centar"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Gnomov upravljački centar: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Izgled"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Izgled koji će se koristiti za ovaj pregled kontrolnih programčeta"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Objekt direktorijuma programčeta"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Direktorijum programčeta koji se vidi iz ovog pregleda"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Veljko M. Stanojević <veljko@vms.homelinux.net>\n"
-"Danilo Šegan <danilo@prevod.org>\n"
-"\n"
-"Prevod.org — prevod na srpski jezik"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Gnomov upravljački centar"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Upravnik osobina radne površine."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Gnomov upravljački centar: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Ostali"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Gnomov upravljački centar"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Koristi Nautilus ako je pokrenut."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "O ovom programu"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Pregled upravljačkog centra"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_O programu"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Sadržaj"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Gnomov alat za podešavanje"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Koristi ljusku čak i kada je nautilus pokrenut."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Jačina"
@@ -2627,7 +2598,7 @@ msgstr ""
 "Greška pri pokretanju (%s)\n"
 "koje je povezano sa tasterom (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2653,7 +2624,7 @@ msgstr ""
 "— Izlaz <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
 # bug: XFree should be XFree86, AFAIK
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2665,7 +2636,7 @@ msgstr ""
 "Pokušajte da koristite jednostavnija podešavanja ili da preuzmete novije "
 "izdanje XFree programa."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2673,15 +2644,15 @@ msgstr ""
 "Podešavanja tastature iz Iksa se razlikuju od tekućih podešavanja tastature "
 "u Gnomu.  Koja podešavanja želite da koristite?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Koristi podešavanja Iksa"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Koristi podešavanja Gnoma"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2746,8 +2717,8 @@ msgstr "_Nemoj više da prikazuješ ovu poruku"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Ne mogu da učitam datoteku %s kao probni %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Ne mogu da odredim korisnikov lični direktorijum"
 
@@ -2796,11 +2767,11 @@ msgstr "Ekran"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Ekran na kojem će primenjivač pozadine crtati"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Zvučna datoteka za ovaj događaj ne postoji."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2810,32 +2781,32 @@ msgstr ""
 "Možda bi trebali instalirati gnomov paket sa zvukovima\n"
 "da biste imali osnovne zvukove."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Datoteka %s ne predstavlja ispravnu WAV datoteku"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Događaj"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Datoteka sa zvukom"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Zvuci:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Datoteka sa zvukom:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Odaberite datoteku sa zvukom"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Pokreni"
 
@@ -3095,28 +3066,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Veoma uskoro, podešavanja XKB-a u GKonfu će biti prevaziđena (iz podešavanja "
-"sistema)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Raspored XKB tastature"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Model XKB tastature"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB opcije"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Model tastature:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Raspored XKB tastature"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Model tastature:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Prečice na tastaturi"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Podešavanja XKB-a u GKonfu će ubrzo biti prevaziđena od strane sistema"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Veoma uskoro, podešavanja XKB-a u GKonfu će biti prevaziđena (iz podešavanja "
+"sistema)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Raspored XKB tastature"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Model XKB tastature"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "Od_loži odmor"
@@ -3194,47 +3213,14 @@ msgstr ""
 "da vi nemate obaveštajnu zonu na vašem panelu. Možete je dodati desnim-"
 "klikom na panel i izborom „Dodaj na panel > Alati > Obaveštajna zona“."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-"Ajšo, lepoto i čežnjo, za ljubav srca moga dođi u Hadžiće na kafu. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Ime:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stil:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tip:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Veličina:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Verzija:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Autorska prava:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Opis:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "upotreba: %s font\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Namesti kao font aplikacije"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Stavke u priručnom meniju fontova"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Odaberite vaše osnovne programe"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3314,33 +3300,48 @@ msgstr "Da li da uključim umanjeni prikaz TruTajp fontova"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Da li da uključim umanjeni prikaz Tajp1 fontova"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fabrika za fontilusove priručne menije"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr ""
+"Ajšo, lepoto i čežnjo, za ljubav srca moga dođi u Hadžiće na kafu. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus priručni meni"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Ime:"
+
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stil:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus fabrika priručnih menija"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tip:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Nautilusovi unosi u priručnom meniju za fontove"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Veličina:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Namesti kao font aplikacije"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Verzija:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Autorska prava:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Opis:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Komponenta pomoćnog pregleda osobina tema"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "upotreba: %s font\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Temus pregled osobina tema"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Gnomov upravljački centar"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3369,27 +3370,18 @@ msgstr "_Primeni font"
 msgid "Themes"
 msgstr "Teme"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Upravljače temom"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Tema za okvire prozora"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Tema za ikone"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI koji je trenutno prikazan"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABVGDĐEŽZ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3428,14 +3420,153 @@ msgstr "Da li da koristim umanjeni prikaz instaliranih tema"
 msgid "Whether to thumbnail themes"
 msgstr "Da li da koristim umanjeni prikaz tema"
 
-#~ msgid "Debian Sensible Browser"
-#~ msgstr "Razumni čitač Debijana"
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABVGDĐEŽZ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Primeni temu..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "_Vrati na podrazumevano"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozila/Netskejp 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnomov terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Uređivač teksta po _izboru:"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Čitač pošte po _izboru:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terminal po _izboru:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Veb čitač po _izboru:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Pokreni u terminalu"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Ovaj program može da otvara URI-e"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Ovaj program se mora iznova pokrenuti iz ljuske"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Odaberite čitača pošte:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Odaberite terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Odaberite veb čitač:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Odaberite uređivač:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Pristupačnost"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Podešenja pristupačnosti"
+
+#~ msgid "Advanced"
+#~ msgstr "Napredno"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Napredna podešenja"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Podešavanje mrežnog posrednika"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Gnomov upravljački centar: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Izgled"
 
-#~ msgid "FireFox"
-#~ msgstr "FireFox"
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Izgled koji će se koristiti za ovaj pregled kontrolnih programčeta"
 
-#~ msgid "Debian Terminal Emulator"
-#~ msgstr "Emulator terminala iz Debijana"
+#~ msgid "Capplet directory object"
+#~ msgstr "Objekt direktorijuma programčeta"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Direktorijum programčeta koji se vidi iz ovog pregleda"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Veljko M. Stanojević <veljko@vms.homelinux.net>\n"
+#~ "Danilo Šegan <danilo@prevod.org>\n"
+#~ "\n"
+#~ "Prevod.org — prevod na srpski jezik"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Upravnik osobina radne površine."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Gnomov upravljački centar: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Gnomov upravljački centar"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Koristi Nautilus ako je pokrenut."
+
+#~ msgid "About this application"
+#~ msgstr "O ovom programu"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Pregled upravljačkog centra"
+
+#~ msgid "_About"
+#~ msgstr "_O programu"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sadržaj"
+
+#~ msgid "_Help"
+#~ msgstr "_Pomoć"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Koristi ljusku čak i kada je nautilus pokrenut."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB opcije"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Stavke u priručnom meniju fontova"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fabrika za fontilusove priručne menije"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus priručni meni"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus fabrika priručnih menija"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Nautilusovi unosi u priručnom meniju za fontove"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Komponenta pomoćnog pregleda osobina tema"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Temus pregled osobina tema"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI koji je trenutno prikazan"
 
 #~ msgid ""
 #~ "You have a keyboard remapping file (%s) in your home directory whose "
@@ -3664,9 +3795,6 @@ msgstr "Da li da koristim umanjeni prikaz tema"
 #~ msgid "Desktop Wallpaper"
 #~ msgstr "Pozadina radne površi"
 
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Postavke pozadine radne površi"
-
 #~ msgid "Show"
 #~ msgstr "Prikaži"
 
@@ -3770,12 +3898,6 @@ msgstr "Da li da koristim umanjeni prikaz tema"
 #~ msgid "_Region:"
 #~ msgstr "_Oblast:"
 
-#~ msgid "Language and Culture"
-#~ msgstr "Jezik i podneblje"
-
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Podesite vaš jezik i podneblje"
-
 #~ msgid "Layout _options:"
 #~ msgstr "_Opcije rasporeda:"
 
@@ -3904,9 +4026,6 @@ msgstr "Da li da koristim umanjeni prikaz tema"
 #~ msgid "Toolbars can be _detached and moved around"
 #~ msgstr "Linije sa alatima se mogu odvajiti i premeštati"
 
-#~ msgid "Apply theme..."
-#~ msgstr "Primeni temu..."
-
 #~ msgid "Themus component"
 #~ msgstr "Komponenta temusa"
 
@@ -3916,9 +4035,6 @@ msgstr "Da li da koristim umanjeni prikaz tema"
 #~ msgid "Bee_p"
 #~ msgstr "Zapišti"
 
-#~ msgid "C_ustom:"
-#~ msgstr "Prilagođeno:"
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "Klikni pri pritisaku na taster"
 
diff --git a/po/sv.po b/po/sv.po
index 1cee23acd..cf37d84ff 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-04 17:23+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -62,11 +62,11 @@ msgstr "Skärm_tangentbord"
 msgid "_Screenreader"
 msgstr "_Skärmläsare"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Stöd för hjälpmedelsfunktioner"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Aktivera stöd för GNOME-hjälpmedelsfunktioner vid inloggning"
 
@@ -119,13 +119,13 @@ msgstr "Importera funktionsinställningsfil"
 msgid "_Import"
 msgstr "_Importera"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Ställ in dina inställningar för tangentbordstillgänglighet"
 
@@ -340,11 +340,11 @@ msgstr "bildpunkter/sekund"
 msgid "seconds"
 msgstr "sekunder"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Ändra dina inställningar för skrivbordsbakgrund"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Skrivbordsbakgrund"
 
@@ -423,6 +423,13 @@ msgstr "Lägg till bakgrundsbild"
 msgid "No Wallpaper"
 msgstr "Ingen bakgrundsbild"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -628,105 +635,15 @@ msgstr "Välj en bild."
 msgid "_Select"
 msgstr "_Välj"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Föredragna program"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Välj dina standardprogram"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Textläsaren W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Textläsaren Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Textläsaren Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "E-postläsaren Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome-terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "X-standardterminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Ange ett namn och ett kommando för att denna textredigerare."
@@ -736,20 +653,22 @@ msgid "Add..."
 msgstr "Lägg till..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "_Anpassad textredigerare:"
+#, fuzzy
+msgid "C_ustom"
+msgstr "A_npassad:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "_Anpassad e-postläsare:"
+msgid "C_ustom:"
+msgstr "A_npassad:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "_Anpassad terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "_Anpassad webbläsare:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Detta program kan öppna _flera filer"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -796,6 +715,16 @@ msgid "Mail Reader"
 msgstr "E-postläsare"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Kör i _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Kör i _terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -804,92 +733,167 @@ msgstr ""
 "verkställ, vifta med trollstaven, och göra en magisk dans för att det ska "
 "fungera."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Starta i t_erminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Textredigerare"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Detta program kan öppna _URI:er"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Detta program kan öppna _flera filer"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Detta program måste köras i ett _skal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Förstår _Netscape-fjärrstyrning"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Använd denna _textredigerare för att öppna textfiler i filhanteraren"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Webbläsare"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Fönsterhanterare"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Kommando:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Välj en e-postläsare:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Välj"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Standardwebbläsare"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
+msgstr "Firebird"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+#, fuzzy
+msgid "Firefox"
+msgstr "FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Textläsaren W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Textläsaren Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Textläsaren Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "E-postläsaren Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Välj en terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Välj en webbläsare:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Välj en textredigerare:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Tillgänglighet"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Tillgänglighetsinställningar"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Standardterminal"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Avancerat"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+msgid "GNOME Terminal"
+msgstr "GNOME-terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "X-standardterminal"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Avancerade inställningar"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Ändra skärmupplösning"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Skärmupplösning"
 
@@ -980,7 +984,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Är du säker på att du vill ta bort denna post permanent?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -988,15 +992,23 @@ msgstr "Beskrivning"
 msgid "Extensions"
 msgstr "Tillägg"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Filtyper och program"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "Ange vilka program som används för att öppna eller visa varje filtyp"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Filtyper och program"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "Ange vilka program som används för att öppna eller visa varje filtyp"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Åtgärder"
@@ -1087,6 +1099,7 @@ msgid "_Protocol:"
 msgstr "_Protokoll:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -1094,14 +1107,6 @@ msgstr "_Ta bort"
 msgid "_Viewer component:"
 msgstr "_Visarkomponent:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Filtyper och program"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "Ange vilka program som används för att öppna eller visa varje filtyp"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Redigera filkategori"
@@ -1288,14 +1293,15 @@ msgid "Electronic mail transmission"
 msgstr "Elektronisk e-postöverföring"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome-dokumentation"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Typsnitt"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Välj typsnitt för skrivbordet"
 
@@ -1504,29 +1510,29 @@ msgid "The type of accelerator."
 msgstr "Typen av snabbtangent."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Okänd åtgärd>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Skrivbord"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Ljud"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Fönsterhantering"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1535,26 +1541,26 @@ msgstr ""
 "Genvägen \"%s\" används redan för:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Fel vid inställning av ny snabbtangent i konfigurationsdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Fel vid borttagning av snabbtangent i konfigurationsdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Åtgärd"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Genväg"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Tangentbordsgenvägar"
 
@@ -1566,23 +1572,10 @@ msgstr ""
 "För att redigera en genväg klickar du på motsvarande rad och trycker en ny "
 "snabbtangent, eller trycker backsteg för att tömma."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Associera snabbtangenter med kommandon"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Okänd"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modeller"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Förhandsvisning av tangentbordslayout"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1753,10 +1746,32 @@ msgstr "_Arbetsintervallet varar:"
 msgid "minutes"
 msgstr "minuter"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Okänd"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modeller"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Förhandsvisning av tangentbordslayout"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Ställ in dina tangentbordsinställningar"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "Inställningar för språk och kultur"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+msgid "Set your language and culture preferences"
+msgstr "Ställ in dina inställningar för språk och kultur"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Okänd muspekare"
@@ -1921,20 +1936,21 @@ msgstr "_Tröskel:"
 msgid "_Timeout:"
 msgstr "_Tidsgräns:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Mus"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Ställ in dina musinställningar"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Nätverksproxyserver"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Inställningar för nätverksproxyserver"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1978,8 +1994,9 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP-proxyserver:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Konfiguration av nätverksproxyserver"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Inställningar för nätverksproxyserver"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2017,7 +2034,7 @@ msgstr "_Lösenord:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Proxyserver för säker HTTP:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Aktivera ljud och associera ljud med händelser"
 
@@ -2075,15 +2092,26 @@ msgstr ""
 "\"Temainställningar\"-dialog inte installerades korrekt, eller att du inte "
 "har installerat paketet \"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Ingen temafilplats angiven för installation"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Temafilplatsen som är angiven för installation är ogiltig"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2118,12 +2146,12 @@ msgstr "Det måste finnas ett temanamn"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Temat finns redan. Vill du ersätta det?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Välj teman för diverse delar av skrivbordet"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2235,11 +2263,11 @@ msgstr "_Temanamn:"
 msgid "theme selection tree"
 msgstr "temaväljarträd"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Anpassa utseendet på verktygsrader och menyrader i program"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menyer och verktygsrader"
 
@@ -2308,7 +2336,6 @@ msgid "_Edit"
 msgstr "_Redigera"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Arkiv"
 
@@ -2336,6 +2363,15 @@ msgstr "_Avsluta"
 msgid "_Save"
 msgstr "_Spara"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr "Konfigurera vilka program som används för att visa URL:er"
+
+# SUN NEW TRANSLATION
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr "URL-hanterare"
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2347,23 +2383,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (eller \"Windows-logotypen\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2405,14 +2441,34 @@ msgstr "_Höj markerade fönster efter en fördröjning"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Markera fönster när muspekaren rör sig över dem"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
-msgstr "Fönsteregenskaper"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
+msgstr "Konfigurera fönsteregenskaper"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Fönster"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME-kontrollpanelen"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Inställningar för skrivbordsbakgrund"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Andra"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Konfigurationsverktyget för GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Kontrollpanel"
@@ -2441,88 +2497,6 @@ msgstr "Fabrik för kontrollpanelsvyer"
 msgid "View as Control Center"
 msgstr "Visa som kontrollpanel"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME-kontrollpanelen: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Layout"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Layout att använda för denna vy av kontrollpanelprogrammen"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Objekt i kontrollpanelprogramkatalog"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Kontrollpanelprogramkatalog som denna vy visar"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Christian Rose\n"
-"Martin Wahlén\n"
-"Skicka synpunkter på översättningen till sv@li.org"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME-kontrollpanelen"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Hanteraren av skrivbordsegenskaper."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Gnome-kontrollpanelen: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Andra"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Gnome-kontrollpanelen"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Använd nautilus om det är igång."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Om detta program"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Översikt av kontrollpanelen"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Om"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Innehåll"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Konfigurationsverktyget för GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Använd skal även om nautilus kör."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Volym"
@@ -2630,7 +2604,7 @@ msgstr ""
 "Fel vid försök att köra (%s)\n"
 "som är länkad till tangenten (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2655,7 +2629,7 @@ msgstr ""
 "- Resultatet av <b>xprop -root | grep XKB</b>\n"
 "- Resultatet av <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2667,7 +2641,7 @@ msgstr ""
 "Försök att använda en enklare konfiguration eller använd en färskare version "
 "av XFree-programvara."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2675,15 +2649,15 @@ msgstr ""
 "Systemtangentbordsinställningarna i X skiljer sig från dina nuvarande GNOME-"
 "tangentbordsinställningar. Vilka inställningar vill du använda?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Använd X-inställningar"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Använd GNOME-inställningar"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2748,8 +2722,8 @@ msgstr "_Visa inte detta meddelande igen"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Kunde inte läsa in ljudfilen %s som prov %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Kan inte avgöra användarens hemkatalog"
 
@@ -2799,11 +2773,11 @@ msgstr "Skärm"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Skärm som BGApplier ska rita på"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Ljudfilen för denna händelse finns inte."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2813,32 +2787,32 @@ msgstr ""
 "Du kanske vill installera paketet gnome-audio\n"
 "för att få en samling med standardljud."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Filen %s är inte en giltig wav-fil"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Händelse"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Ljudfil"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Ljud:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Ljud_fil:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Välj ljudfil"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Spela"
 
@@ -3101,30 +3075,78 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Snart kommer XKB-inställningar i gconf att åsidosättas (utav "
-"systemkonfigurationen)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB-tangentbordslayout"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB-tangentbordsmodell"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB-alternativ"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Tangentbordsmodell:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB-tangentbordslayout"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Tangentbordsmodell:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Tangentbordsinställningar"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "XKB-inställningar i gconf kommer att åsidosättas utav systemet så snart som "
 "möjligt"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Snart kommer XKB-inställningar i gconf att åsidosättas (utav "
+"systemkonfigurationen)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB-tangentbordslayout"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Tangentbordsmodell:"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Skjut upp pausen"
@@ -3204,46 +3226,14 @@ msgstr ""
 "högerklicka på panelen och välja \"Lägg till i panelen -> Verktyg -> "
 "Notifieringsyta\"."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Flygande bäckasiner söka strax hwila på mjuka tuvor. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Namn:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stil:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Typ:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Storlek:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Version:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Beskrivning:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "användning: %s typsnittsfil\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Ställ in som programtypsnitt"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Poster i typsnittssammanhangsmeny"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Välj dina standardprogram"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3321,33 +3311,47 @@ msgstr "Huruvida miniatyrbilder ska skapas för TrueType-typsnitt"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Huruvida miniatyrbilder ska skapas för Type1-typsnitt"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fabrik för fontilus-sammanhangsmenyn"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Flygande bäckasiner söka strax hwila på mjuka tuvor. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus-sammanhangsmeny"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Namn:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fabrik för fontilus-sammanhangsmeny"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stil:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Poster i Nautilus-sammanhangsmeny för typsnitt"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Typ:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Ställ in som programtypsnitt"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Storlek:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Innehållsvykomponent för temaegenskaper"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Version:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Temaegenskapsvy för Themus"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Copyright:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Beskrivning:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "användning: %s typsnittsfil\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME-kontrollpanelen"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3377,27 +3381,18 @@ msgstr "_Använd typsnitt"
 msgid "Themes"
 msgstr "Teman"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Kontrolltema"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Fönsterkantstema"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Ikontema"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI som visas för tillfället"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFGÅÄÖ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Om detta är sant kommer installerade teman att få miniatyrbilder."
@@ -3435,6 +3430,162 @@ msgstr "Huruvida det ska skapas miniatyrbilder för installerade teman"
 msgid "Whether to thumbnail themes"
 msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFGÅÄÖ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Använd tema..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Återställ till standardvärdena"
+
+#~ msgid "Firebird/FireFox"
+#~ msgstr "Firebird/FireFox"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome-terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "_Anpassad textredigerare:"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "_Anpassad e-postläsare:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "_Anpassad terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "_Anpassad webbläsare:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Starta i t_erminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Detta program kan öppna _URI:er"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Detta program måste köras i ett _skal"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Välj en e-postläsare:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Välj en terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Välj en webbläsare:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Välj en textredigerare:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Tillgänglighet"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Tillgänglighetsinställningar"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancerat"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Avancerade inställningar"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Konfiguration av nätverksproxyserver"
+
+#~ msgid "Window Properties"
+#~ msgstr "Fönsteregenskaper"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME-kontrollpanelen: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Layout"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Layout att använda för denna vy av kontrollpanelprogrammen"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Objekt i kontrollpanelprogramkatalog"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Kontrollpanelprogramkatalog som denna vy visar"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Christian Rose\n"
+#~ "Martin Wahlén\n"
+#~ "Skicka synpunkter på översättningen till sv@li.org"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Hanteraren av skrivbordsegenskaper."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Gnome-kontrollpanelen: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Gnome-kontrollpanelen"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Använd nautilus om det är igång."
+
+#~ msgid "About this application"
+#~ msgstr "Om detta program"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Översikt av kontrollpanelen"
+
+#~ msgid "_About"
+#~ msgstr "_Om"
+
+#~ msgid "_Contents"
+#~ msgstr "_Innehåll"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjälp"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Använd skal även om nautilus kör."
+
+#~ msgid "XKB keyboard model"
+#~ msgstr "XKB-tangentbordsmodell"
+
+#~ msgid "XKB options"
+#~ msgstr "XKB-alternativ"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Poster i typsnittssammanhangsmeny"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fabrik för fontilus-sammanhangsmenyn"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus-sammanhangsmeny"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fabrik för fontilus-sammanhangsmeny"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Poster i Nautilus-sammanhangsmeny för typsnitt"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Innehållsvykomponent för temaegenskaper"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Temaegenskapsvy för Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI som visas för tillfället"
+
 #~ msgid "_Keep Resolution"
 #~ msgstr "_Behåll upplösning"
 
@@ -3699,12 +3850,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgid "Can't find an hbox, using a normal file selection"
 #~ msgstr "Kan inte hitta en hbox, använder normal filmarkering"
 
-#~ msgid "FireFox"
-#~ msgstr "FireFox"
-
-#~ msgid "Firebird"
-#~ msgstr "Firebird"
-
 #~ msgid "Postpone break"
 #~ msgstr "Skjut upp pausen"
 
@@ -3765,15 +3910,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgid "Available options:"
 #~ msgstr "Tillgängliga alternativ:"
 
-#~ msgid "Keyboard model:"
-#~ msgstr "Tangentbordsmodell:"
-
-#~ msgid "Reset to defaults"
-#~ msgstr "Återställ till standardvärdena"
-
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Inställningar för skrivbordsbakgrund"
-
 #~ msgid "A MIME type with that name already exists, overwrite ?."
 #~ msgstr "En MIME-typ med det namnet finns redan, skriva över?"
 
@@ -3828,12 +3964,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgid "Customize _times..."
 #~ msgstr "Anpassa _tider..."
 
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "Inställningar för språk och kultur"
-
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Ställ in dina inställningar för språk och kultur"
-
 #~ msgid "_Ignore system configuration"
 #~ msgstr "_Ignorera systemkonfigurationen"
 
@@ -3874,9 +4004,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgid "Use Font"
 #~ msgstr "Använd typsnitt"
 
-#~ msgid "GNOME Terminal"
-#~ msgstr "GNOME-terminal"
-
 #~ msgid "Small"
 #~ msgstr "Liten"
 
@@ -3996,9 +4123,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgid "The background picture's file name."
 #~ msgstr "Bakgrundsbildens filnamn."
 
-#~ msgid "Apply theme..."
-#~ msgstr "Använd tema..."
-
 #~ msgid "Themus component"
 #~ msgstr "Themus-komponent"
 
@@ -4070,9 +4194,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgid "Bee_p"
 #~ msgstr "_Pip"
 
-#~ msgid "C_ustom:"
-#~ msgstr "A_npassad:"
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "_Klicka vid tangenttryckning"
 
@@ -4666,9 +4787,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgid "Configure window appearance"
 #~ msgstr "Konfigurera fönsterutseende"
 
-#~ msgid "Configure window properties"
-#~ msgstr "Konfigurera fönsteregenskaper"
-
 #~ msgid "Configure window manager configuration properties"
 #~ msgstr "Konfigurera fönsterhanterarens konfigurationsegenskaper"
 
@@ -4706,9 +4824,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgid "Associate keyboard shortcuts with panel actions"
 #~ msgstr "Associera tangentborsgenvägar med panelåtgärder"
 
-#~ msgid "Keyboard Properties"
-#~ msgstr "Tangentbordsinställningar"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Konfigurera GNOME:s användning av ljud"
 
@@ -4874,10 +4989,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgstr "Kommando"
 
 # SUN NEW TRANSLATION
-#~ msgid "URL Handlers"
-#~ msgstr "URL-hanterare"
-
-# SUN NEW TRANSLATION
 #~ msgid "handler:"
 #~ msgstr "hanterare:"
 
@@ -4895,9 +5006,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgid "Set"
 #~ msgstr "Ange"
 
-#~ msgid "Configure which programs are used to display URLs"
-#~ msgstr "Konfigurera vilka program som används för att visa URL:er"
-
 # SUN NEW TRANSLATION
 #
 # Sun vill ha "Upplysning"
@@ -5017,9 +5125,6 @@ msgstr "Huruvida det ska skapas miniatyrbilder för teman"
 #~ msgid "Cancel"
 #~ msgstr "Avbryt"
 
-#~ msgid "Command:"
-#~ msgstr "Kommando:"
-
 # SUN NEW TRANSLATION
 #
 # Sun vill ha "Fönsterhanterare är sessionshanterade"
diff --git a/po/ta.po b/po/ta.po
index 7e53b6252..577514bad 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-06 17:59+0530\n"
 "Last-Translator: Jayaradha N <jaya@pune.redhat.com>\n"
 "Language-Team: Tamil <zhakanini@yahoogroups.com>\n"
@@ -68,11 +68,11 @@ msgstr "திரை விசைப்பலகை"
 msgid "_Screenreader"
 msgstr "திரைபடிப்பான்"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "உதவி தொழில்நுட்பம் ஆதரவு"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "நுழையும்போது க்னோம் உதவி தொழில் நுட்பங்களை செயல்படுத்தவும்"
 
@@ -123,13 +123,13 @@ msgstr "பயன்பாடு அமைப்புகள் கோப்ப�
 msgid "_Import"
 msgstr "இறக்குமதி செய்"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "விசைப்பலகை"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "விசைப்பலகை அணுகல்-முறை விருப்பங்களை அமைக்கவும்"
 
@@ -336,11 +336,11 @@ msgstr "பிக்சல்/நொடி"
 msgid "seconds"
 msgstr "நொடிகள்"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "உங்கள் கணிமேசை பின்னணியை தனிப்பயனாக்கு"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "மேசைச்சூழல் பின்னணி"
 
@@ -419,6 +419,13 @@ msgstr "சுவர்-காகிதங்கள் சேர்."
 msgid "No Wallpaper"
 msgstr "சுவர்-காகிதம் இல்லை"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -625,105 +632,15 @@ msgstr "ஓர் படத்தை தெரிவு செய்யவும
 msgid "_Select"
 msgstr "தேர்ந்தெடு"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "விருப்பமான நிரல்கள்"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "உங்களின் கொடாநிலை நிரலைத் தெரிவுசெய்யவும்"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "எபிஃபனி"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "காலியன்"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "என்காம்பஸ்துகொள்"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "ஃபைர்பேர்ட்/ஃபைர்ஃபாக்ஸ்"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "மொசில்லா/நெட்ஸ்கேப் 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "நெட்ஸ்கேப்"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "கான்கொரர்"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M உரை உலாவிி"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "லின்க்சு உரை உலாவிோடி"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "லிங்க்சு உரை உலாவிோடி"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "எவலுயூசன்பஅஞ்சல் கருவி்பான் மேலோடி."
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "பல்சா"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "Kஅஞ்சல்"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "மொசில்லா அஞ்சல்"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "மட்"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "க்னோம் முனையம்"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "வழக்கமான Xமுனையம்ல் தொடங்கு"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXமுனையம்"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "Eமுனையம்"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "இப்பதிப்பானின் பெயரையும் கட்டளையையும் குறிப்பிடவும்."
@@ -733,20 +650,23 @@ msgid "Add..."
 msgstr "சேர்..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "தனிப்பயன் பதிப்பான்"
+#, fuzzy
+msgid "C_ustom"
+msgstr "தனிப்பயன்"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "தனிப்பயன் அஞ்சல் கருவி:ோடி."
+#, fuzzy
+msgid "C_ustom:"
+msgstr "தனிப்பயன்"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "தனிப்பயன் முனையம்:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "தனிப்பயன் வலை மேலோடி:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "இன்நிரலால் பல கோப்புகளைத் திறக்கமுடியும்"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -793,6 +713,16 @@ msgid "Mail Reader"
 msgstr "அஞ்சல் கருவி"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "முனையத்தில் இயக்கு"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "முனையத்தில் இயக்கு"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -800,92 +730,168 @@ msgstr ""
 "உங்களுக்கு தேவையான சாளரம் மேலாளர் தெர்ந்தெடுக்கவும். நீங்கள் செயலாக்கு செய்ய வேண்டும், "
 "மற்றும் அது வேலைசெய்ய மந்திர நடனம் செய்யவும்."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "முனையத்தில் தொடங்கு"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "முனையம்"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "உரை பதிப்பான்"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "இன்நிரலால் URIகளை திறக்கமுடியும்"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "இன்நிரலால் பல கோப்புகளைத் திறக்கமுடியும்"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "இன்நிரல் ஓர் முனையத்தில் இயக்கப்பட வேண்டும்"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "நெட்ஸ்கேப் தொலைவு கட்டுப்பாடுடன் வேலைசெய்யும்"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "உரை கோப்புகளை கோப்பு மேலாளரில் திறப்பதட்கு இப்பதிப்பானை புழங்கவும்"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "வலை மேலோடி"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "சாளரமேலாளர்"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_கட்டளை:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "பெயர்:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "பண்புகள்..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "அஞ்சல் கருவியைத்டியைத் தெரிவுசெய்:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "தேர்ந்தெடு"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "முனையத்தை தெரிவுசெய்:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "கொடாநிலை வலை மேலோடி"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "வலை மேலோடியைத் தெரிவுசெய்:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "எபிஃபனி"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "பதிப்பானை தெரிவுசெய்:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "காலியன்"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "அணுகல் முறை"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "என்காம்பஸ்துகொள்"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "அணுகல் முறை அமைவுகள்"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "ஃபைர்பேர்ட்/ஃபைர்ஃபாக்ஸ்"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "உயர்நிலை"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "உயர்நிலை அமைவுகள்"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "மொசில்லா அஞ்சல்"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "நெட்ஸ்கேப்"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "கான்கொரர்"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M உரை உலாவிி"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "லின்க்சு உரை உலாவிோடி"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "லிங்க்சு உரை உலாவிோடி"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "எவலுயூசன்பஅஞ்சல் கருவி்பான் மேலோடி."
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "பல்சா"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "Kஅஞ்சல்"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "மொசில்லா அஞ்சல்"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "மட்"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "கொடாநிலை முனையம்"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "முனையம்"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "வழக்கமான Xமுனையம்ல் தொடங்கு"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXமுனையம்"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXமுனையம்"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "Eமுனையம்"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "திரை நுணுக்கத்தை மாற்றவும்"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "திரை நுணுக்கம்"
 
@@ -976,7 +982,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "இந்த உள்ளீடுகளை நிரந்திரமாக நீக்க வேண்டுமா?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "விவரணம்"
 
@@ -984,15 +990,23 @@ msgstr "விவரணம்"
 msgid "Extensions"
 msgstr "நீட்டிப்புகள்"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "கோப்பு வகைகளும் நிரல்களும்"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "எந்த நிரல்களைக் கொண்டு கோப்புகளை திறப்பது, பார்ப்பது எனக் குறிப்பிடவும்"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "கோப்பு வகைகளும் நிரல்களும்"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "எந்த நிரல்களைக் கொண்டு கோப்புகளை திறப்பது, பார்ப்பது எனக் குறிப்பிடவும்"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "செயல்கள்"
@@ -1083,6 +1097,7 @@ msgid "_Protocol:"
 msgstr "_நெறிமுறை:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_நீக்கு"
 
@@ -1090,14 +1105,6 @@ msgstr "_நீக்கு"
 msgid "_Viewer component:"
 msgstr "காட்டி கூறு;"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "கோப்பு வகைகளும் நிரல்களும்"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "எந்த நிரல்களைக் கொண்டு கோப்புகளை திறப்பது, பார்ப்பது எனக் குறிப்பிடவும்"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "கோப்பு இனத்தைத் தொகு"
@@ -1280,14 +1287,15 @@ msgid "Electronic mail transmission"
 msgstr "மின் அஞ்சல் செலுத்தம்"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "கனோம் ஆவணமாக்கல்"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "எழுத்துரு"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "கணிமேசைக்கான எழுத்துருகளை தெரிவுசெய்"
 
@@ -1490,29 +1498,29 @@ msgid "The type of accelerator."
 msgstr "ஆர்முடுகல் வகையினம்:"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "முடக்கப்பட்டது"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<தெரியாத செயல்>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "மேசைச்சூழல்"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "ஒலி"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "சாளரம் மேலாண்மை"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1521,26 +1529,26 @@ msgstr ""
 "\"%s\" என்ற குறுக்குவழி இதற்காக ஏற்கனவே பயன்படுகிறது:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "தகவல்தளத்தை உள்ளமைப்பதில் புதிய முடக்கியை அமைப்பதில் பிழை: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "தகவல்தளத்தை உள்ளமைப்பதில் புதிய முடக்கியை அமைக்காமல் இருப்பதில் பிழை: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "செயல்"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "குறுக்கு வழி"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "விசைப்பலகை குறுக்கு வழிகள்"
 
@@ -1550,23 +1558,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "புதிய முடுக்கி ஒன்றை கொடுக்கவும், பின்விசையை அழுத்தி அழிக்கவும்."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "கட்டளைகளுக்கான குறுக்கு வழி விசைகளை ஒப்படை"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "மாதிரி"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "விசைப்பலகை உருவரை காட்சி"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1732,10 +1727,32 @@ msgstr "இடைவெளி நீளம்ஜ்"
 msgid "minutes"
 msgstr "நிமிடங்கள்"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "தெரியாத"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "மாதிரி"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "விசைப்பலகை உருவரை காட்சி"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "உங்கள் விசைப்பலகை விருப்பங்களை அமைக்கவும்"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "உங்கள் சுட்டியின் பண்புகளை அமைக்கவும்"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "தெரியாத சுட்டி"
@@ -1902,20 +1919,21 @@ msgstr "அளவு"
 msgid "_Timeout:"
 msgstr "வெளியேற்ற நேரம்:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "சுட்டி"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "உங்கள் சுட்டியின் பண்புகளை அமைக்கவும்"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "வலையமைப்பு பிரதிநிதி."
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "வலையமைப்பு பிரதிநிதி பண்புகள்"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1959,8 +1977,9 @@ msgid "H_TTP proxy:"
 msgstr "HTTP பிரதிநிதி ."
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "வலையமைப்பு பிரதிநிதி பண்புகள்."
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "வலையமைப்பு பிரதிநிதி பண்புகள்"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -1998,7 +2017,7 @@ msgstr "கடவுச் சொல்:."
 msgid "_Secure HTTP proxy:"
 msgstr "HTTP பிரதிநிதி பழங்கவும்."
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "ஒலிகளை இயலுமைப்படுத்தி அவைகளை நிகழ்வுகளுடன் இணைக்கவும்"
 
@@ -2056,15 +2075,26 @@ msgstr ""
 "\" தவறாக நிறுவப்பட்டிருக்கலாம், அல்லது \"க்னோம்-கருப்பொருள்கள்\" தவறாக "
 "நிறுவப்பட்டிருக்கலாம்."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "நிறுவும் போது பொருள் குறிப்பிடபடாத கோப்பின் இடத்தை குறிப்பிடவும்"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "நிறுவுவதற்க்கு குறிப்பிடபட்ட பொருள் கோப்பின் இடம் செல்லுபடியாகாது"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2097,12 +2127,12 @@ msgstr "பொருள் பெயர் இருக்க வேண்டு
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "கருப்பெயர் ஏற்கெனவே உள்ளது. மாற்ற விருப்பமா?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "கணிமேசையின் பகுதிகளுக்கு உருகாறுகளை தெரிவுசெய்யவும்"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "உருகாறு"
 
@@ -2214,11 +2244,11 @@ msgstr "பொருள் பெயர்கள்"
 msgid "theme selection tree"
 msgstr "மரப்பொருள்களை தேர்ந்தெடு"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "நிரல்களிலுள்ள கருவிப்பட்டைகளின், பட்டிப்பட்டைகளின் தோற்றத்தை தனிப்பயனாக்கவும்"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "கருவிப்பட்டைகளும் பட்டிப்பட்டைகளும்"
 
@@ -2287,7 +2317,6 @@ msgid "_Edit"
 msgstr "_தொகு"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_கோப்பு"
 
@@ -2315,6 +2344,14 @@ msgstr "_வெளிச்செல்"
 msgid "_Save"
 msgstr "_சேமி"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2326,23 +2363,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "கட்டுப்பாடு"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "இனம்."
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "சிறப்பான (or \"Windows logo\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "மீ"
 
@@ -2382,14 +2419,34 @@ msgstr "இடைவேளைக்கு பிறகு _உயரும் �
 msgid "_Select windows when the mouse moves over them"
 msgstr "எலிசுட்டி சாளரங்கள்மேல் நகர்த்தும்போது அவைகளை தெரிவுசெய்க."
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "சாளரத்தின் பண்புகள்"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "சாளரங்கள்"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "கனோம் கட்டுப்பாட்டு மையம்"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "மேசைச்சூழல் பின்னணி விருப்பங்கள்"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "மற்றவைகள்"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "கனோம் அமைவடிவு கருவி"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "கட்டுப்பாட்டு மையம்"
@@ -2418,85 +2475,6 @@ msgstr "கட்டுப்பாட்டு மையம் கட்சி
 msgid "View as Control Center"
 msgstr "கட்டுப்பாட்டு மையமாக பார்"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "கனோம் கட்டுப்பாட்டு மையம்: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "இட அமைவு"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "இக்குறும்பயன் காட்சிக்கு பயன்படுத்த வேண்டிய இட அமைவு"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "குறும்பயன் அடைவு இலக்கு"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "இக்காட்சி காட்டும் Capplet அடைவு"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "மொழிபெயர்ப்பர் பற்று"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "கனோம் கட்டுப்பாட்டு மையம்"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "கணிமேசை பண்புகள் மேலாளர்."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "கனோம் கட்டுப்பாட்டு மையம் : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "மற்றவைகள்"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "கனோம் கட்டுப்பாட்டு மையம்"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "நாடிலஸ் இயங்கிக்கொண்டிருந்தாலும் முனையத்தை புழங்கவும்.."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "இந்த நிரலைப் பற்றி"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "கட்டுப்பாட்டு மையத்தின் "
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "பற்றி"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "உள்ளடக்கங்கள்"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_உதவி"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "கனோம் அமைவடிவு கருவி"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "நாடிலஸ் இயங்கிக்கொண்டிருந்தாலும் முனையத்தை புழங்கவும்."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "அளவு"
@@ -2602,7 +2580,7 @@ msgstr ""
 "(%s) இயக்க முயனற்றபோது பிழை\n"
 "(%s) விசையுடன் தொடர்பு கொண்டது"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2627,7 +2605,7 @@ msgstr ""
 "-  <b>xprop -root | grep XKBயின் முடிவு</b>\n"
 "- f <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkbயின் முடிவு</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2639,7 +2617,7 @@ msgstr ""
 "எளிய அமைப்பு முறையை பயன்படுத்தவும் அல்லது XFree மென்பொருளின் புதிய பதிப்பை "
 "பயன்படுத்தவும்."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2647,15 +2625,15 @@ msgstr ""
 "X விசைப்பலகை அமைப்பு உங்கள் தற்போதைய க்னோம் விசைப்பலகை அமைப்பிலிருந்து மாறுபட்டது, எந்த "
 "அமைப்பை பயன்படுத்த விரும்புகிறீர்கள்?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "xயை உபயோகப்படுத்து"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr " GNOME அமைப்புகளை உபயோகிக்கவும்"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2719,8 +2697,8 @@ msgstr "_இத்தகவலை இனிமேல் காண்பிக்
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "ஒலி கோப்பு %s ஐ ஓர் மாதிரி %s ஆக ஏற்ற முடியவில்லை"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "பயனர் இல்ல அடைவை குறிப்பிட முடியாது"
 
@@ -2769,11 +2747,11 @@ msgstr "திரை"
 msgid "Screen on which BGApplier is to draw"
 msgstr "திரையில் வரையுவதற்க்கான BGஅமைப்பு"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "இன்த நிகழ்வுக்கான ஒலி கோப்பு இல்லை."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2783,32 +2761,32 @@ msgstr ""
 "கொடா நிலை ஒலிகளுக்கு gnome-audio\n"
 "பொதியை நிறுவிக்க வேண்டும்."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "%s கோப்பு செல்லுபடியாகாத wav கோப்பு"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "நிகழ்வு"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "ஒலியின் கோப்பு"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "ஒலிகள்"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "ஒலி கோப்பு "
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "ஒலி கோப்புயை தேர்ந்தெடுக்கவும் "
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_விளையாடு"
 
@@ -3067,28 +3045,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"கூடிய சீக்கிரம், gconf விலுள்ள XKB அமைப்புகள் அதிகமாக ஓட்டப்படும்(முறைமை "
-"உள்ளமைவிலிருந்து)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB விசைப்பலகை உருவரை"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB விசைப்பலகை உருவரை"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB  தேர்வுகள்"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "விசைப்பலகை வகை"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB விசைப்பலகை உருவரை"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "விசைப்பலகை வகை"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "விசைப்பலகை குறுக்கு வழிகள்"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "gconf விலுள்ள XKB அமைப்புகள் ASAP முறைமையிலிருந்து அதிகமாக ஓட்டப்பட்டது"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"கூடிய சீக்கிரம், gconf விலுள்ள XKB அமைப்புகள் அதிகமாக ஓட்டப்படும்(முறைமை "
+"உள்ளமைவிலிருந்து)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB விசைப்பலகை உருவரை"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB விசைப்பலகை உருவரை"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_ஒத்திவத்தல் முறிப்பு"
@@ -3163,46 +3189,14 @@ msgstr ""
 "இருக்க வேண்டிய அவசியம் இல்லை. உங்கள் பலகத்தின் மேல் வலது க்ளிக் செய்து பலகத்திற்குள் சேர் -> "
 "பயன்பாடுகள் -> தகவல் பரப்பு பயன்படுத்தி சேர்க்கலாம்."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "The quick brown fox jumps over the lazy dog. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "பெயர்:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "பாணிகள்:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "வகை:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "அளவு:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "பதிப்பு"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "உரிமைகள்:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "விவரணம்"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "உபயோகிப்பு: %s எழுத்துக்கோப்பு\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "நிரல் எழுத்துரு:"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "எழுத்து சூழல் பட்டியல் உருப்படிகள்"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "உங்களின் கொடாநிலை நிரலைத் தெரிவுசெய்யவும்"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3272,33 +3266,47 @@ msgstr "உண்மை வகை எழுத்துக்களை  சி�
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "உண்மை வகை 1 எழுத்துக்களை  சிறுப்படமாக்க வேண்டுமா"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "ஃகாண்டிலஸ் சூழல் பட்டியலுக்கான தொழிற்சாலை"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "The quick brown fox jumps over the lazy dog. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "கட்டுப்பாடு நிலையம் பட்டி."
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "பெயர்:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "ஃகாண்டிலஸ் சூழல் பட்டியல் தொழிற்சாலை"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "பாணிகள்:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "நாட்டிலஸ் சூழல் பட்டியல் விவரங்களுக்கான எழுத்துக்கள் "
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "வகை:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "நிரல் எழுத்துரு:"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "அளவு:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "பதிப்பு"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "உரிமைகள்:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "குழுத்தன்மையின் சூழல் பார்வை பகுதி"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "விவரணம்"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "குழு தன்மை ஒரு பார்வை"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "உபயோகிப்பு: %s எழுத்துக்கோப்பு\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "கனோம் கட்டுப்பாட்டு மையம்"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3329,27 +3337,18 @@ msgstr "_மாற்றங்களை பயன்படுத்து"
 msgid "Themes"
 msgstr "உருகாறுகள்"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "கட்டுப்பாட்டு தோற்றம்"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "சாளர எல்லையின் தோற்றம்."
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "சட்டி தோற்றம்."
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "இதனைத அனுப்பும் URI முகவரி."
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "இது உண்மையாக அமைக்கப்பட்டால்,  நிறுவப்பட்ட குழுக்கள் சிறுபடமாக்கப்பட்டும்."
@@ -3383,3 +3382,147 @@ msgstr "நிறுவப்பட்ட குழுக்களை சிற�
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "குழுக்களை சிறுப்படமாக்கபடவேண்டுமா"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_மாற்றங்களை பயன்படுத்து"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "இயல்பானவற்றிற்கு மீள்அமைக்கவும்"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "மொசில்லா/நெட்ஸ்கேப் 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "க்னோம் முனையம்"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "தனிப்பயன் பதிப்பான்"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "தனிப்பயன் அஞ்சல் கருவி:ோடி."
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "தனிப்பயன் முனையம்:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "தனிப்பயன் வலை மேலோடி:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "முனையத்தில் தொடங்கு"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "இன்நிரலால் URIகளை திறக்கமுடியும்"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "இன்நிரல் ஓர் முனையத்தில் இயக்கப்பட வேண்டும்"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "அஞ்சல் கருவியைத்டியைத் தெரிவுசெய்:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "முனையத்தை தெரிவுசெய்:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "வலை மேலோடியைத் தெரிவுசெய்:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "பதிப்பானை தெரிவுசெய்:"
+
+#~ msgid "Accessibility"
+#~ msgstr "அணுகல் முறை"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "அணுகல் முறை அமைவுகள்"
+
+#~ msgid "Advanced"
+#~ msgstr "உயர்நிலை"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "உயர்நிலை அமைவுகள்"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "வலையமைப்பு பிரதிநிதி பண்புகள்."
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "கனோம் கட்டுப்பாட்டு மையம்: %s"
+
+#~ msgid "Layout"
+#~ msgstr "இட அமைவு"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "இக்குறும்பயன் காட்சிக்கு பயன்படுத்த வேண்டிய இட அமைவு"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "குறும்பயன் அடைவு இலக்கு"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "இக்காட்சி காட்டும் Capplet அடைவு"
+
+#~ msgid "translator_credits"
+#~ msgstr "மொழிபெயர்ப்பர் பற்று"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "கணிமேசை பண்புகள் மேலாளர்."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "கனோம் கட்டுப்பாட்டு மையம் : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "கனோம் கட்டுப்பாட்டு மையம்"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "நாடிலஸ் இயங்கிக்கொண்டிருந்தாலும் முனையத்தை புழங்கவும்.."
+
+#~ msgid "About this application"
+#~ msgstr "இந்த நிரலைப் பற்றி"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "கட்டுப்பாட்டு மையத்தின் "
+
+#~ msgid "_About"
+#~ msgstr "பற்றி"
+
+#~ msgid "_Contents"
+#~ msgstr "உள்ளடக்கங்கள்"
+
+#~ msgid "_Help"
+#~ msgstr "_உதவி"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "நாடிலஸ் இயங்கிக்கொண்டிருந்தாலும் முனையத்தை புழங்கவும்."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB  தேர்வுகள்"
+
+#~ msgid "Font context menu items"
+#~ msgstr "எழுத்து சூழல் பட்டியல் உருப்படிகள்"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "ஃகாண்டிலஸ் சூழல் பட்டியலுக்கான தொழிற்சாலை"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "கட்டுப்பாடு நிலையம் பட்டி."
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "ஃகாண்டிலஸ் சூழல் பட்டியல் தொழிற்சாலை"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "நாட்டிலஸ் சூழல் பட்டியல் விவரங்களுக்கான எழுத்துக்கள் "
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "குழுத்தன்மையின் சூழல் பார்வை பகுதி"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "குழு தன்மை ஒரு பார்வை"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "இதனைத அனுப்பும் URI முகவரி."
diff --git a/po/th.po b/po/th.po
index 98f7ac78e..cf574736e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-12 15:55-0500\n"
 "Last-Translator: Paisa Seeluangsawat <paisa@users.sf.net>\n"
 "Language-Team: Thai <L10n@opentle.org>\n"
@@ -64,11 +64,11 @@ msgstr "แ_ป้นพิมพ์บนจอ"
 msgid "_Screenreader"
 msgstr "อ่_านข้อความจากจอ"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "ระบบอำนวยการใช้งาน (ATS)"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "ใช้ระบบอำนวยการใช้งานเมื่อเข้าระบบ"
 
@@ -116,13 +116,13 @@ msgstr "นำเข้าค่าตั้งจากแฟ้ม"
 msgid "_Import"
 msgstr "_นำเข้า"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "แป้นพิมพ์"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "ปรับแต่งระบบอำนวยการใช้งานสำหรับแป้นพิมพ์"
 
@@ -329,11 +329,11 @@ msgstr "พิกเซล/วินาที"
 msgid "seconds"
 msgstr "วินาที"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "ปรับเปลี่ยนพื้นหลัง ของพื้นโต๊ะ"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "พื้นหลังพื้นโต๊ะ"
 
@@ -412,6 +412,13 @@ msgstr "เพิ่มวอลล์เปเปอร์"
 msgid "No Wallpaper"
 msgstr "ไม่ใช้วอลล์เปเปอร์"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -608,105 +615,15 @@ msgstr "โปรดเลือกภาพที่จะใช้"
 msgid "_Select"
 msgstr "เ_ลือก"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "โปรแกรมที่ชอบ"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "เลือกโปรแกรมที่จะถูกใช้โดยปรกติ"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M Text Browser"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx Text Browser"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links Text Browser"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution Mail Reader"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "เทอร์มินอลของ Gnome"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "เทอร์มินอลปกติของ X"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "โปรดระบุชื่อและคำสั่งสำหรับโปรแกรมแก้ไข"
@@ -716,20 +633,23 @@ msgid "Add..."
 msgstr "เพิ่ม..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "ตัวแก้ไขที่_กำหนดเอง"
+#, fuzzy
+msgid "C_ustom"
+msgstr "กำหนดเอง"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "ตัวอ่านอีเมลที่_กำหนดเอง:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "กำหนดเอง"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "เทอร์มินอลที่_กำหนดเอง:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "เว็บบราวเซอร์ที่_กำหนดเอง:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "โปรแกรมนี้เปิด_หลายแฟ้มพร้อมกันได้"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -776,6 +696,16 @@ msgid "Mail Reader"
 msgstr "ตัวอ่านอีเมล"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "เรียกใช้ในเ_ทอร์มินอล"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "เรียกใช้ในเ_ทอร์มินอล"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -783,92 +713,168 @@ msgstr ""
 "เลือกตัวจัดการหน้าต่างที่อยากใช้  หลังจากกด \"ตกลงใช้\" แล้ว "
 "จะสำเร็จหรือไม่ก็ขึ้นอยู่กับดวงคุณ :-)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "เรียกใช้ในเ_ทอรมินอล"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "เทอร์มินอล"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "ตัวแก้ไขแฟ้มข้อความ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "โปรแกรมนี้เปิด _URI ได้"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "โปรแกรมนี้เปิด_หลายแฟ้มพร้อมกันได้"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "โปรแกรมนี้ต้องถูกเรียกใช้ในเ_ชลล์"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "รู้จัก _Netscape Remote Control"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "ใ_ช้โปรแกรมนี้เปิดแฟ้มข้อความจากตัวจัดการแฟ้ม"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "เว็บบราวเซอร์"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "ตัวจัดการหน้าต่าง"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_คำสั่ง:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "ชื่อ:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "คุณ_สมบัติ..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "เ_ลือกตัวอ่านอีเมล:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "เ_ลือก"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "เว็บบราวเซอร์ปริยาย"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M Text Browser"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx Text Browser"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links Text Browser"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution Mail Reader"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "เ_ลือกเทอร์มินอล:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "เ_ลือกเว็บบราวเซอร์:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "เ_ลือกตัวแก้ไข:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "ระบบอำนวยการใช้งาน"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "ตั้งค่าระบบอำนวยการใช้งาน"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "เทอร์มินอลปริยาย"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "เพิ่มเติม"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "เทอร์มินอล"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "ค่าตั้งเพิ่มเติม"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "เทอร์มินอลปกติของ X"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "เปลี่ยนความละเอียดของจอ"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "ความละเอียดของจอ"
 
@@ -950,7 +956,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "แน่ใจนะว่าจะลบรายการนี้ทิ้งอย่างถาวร?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "คำอธิบาย:"
 
@@ -958,15 +964,23 @@ msgstr "คำอธิบาย:"
 msgid "Extensions"
 msgstr "นามสกุล"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "ชนิดแฟ้มและโปรแกรมที่ใช้"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "เลือกว่าจะใช้โปรแกรมไหนเปิดแฟ้มแต่ละชนิด"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "ชนิดแฟ้มและโปรแกรมที่ใช้"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "เลือกว่าใช้โปรแกรมไหนสำหรับแฟ้มแต่ละชนิด"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "ปฏิบัติการ"
@@ -1057,6 +1071,7 @@ msgid "_Protocol:"
 msgstr "โปรโตคอ_ล:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "เ_อาออก"
 
@@ -1064,14 +1079,6 @@ msgstr "เ_อาออก"
 msgid "_Viewer component:"
 msgstr "_ตัวแสดง:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "ชนิดแฟ้มและโปรแกรมที่ใช้"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "เลือกว่าใช้โปรแกรมไหนสำหรับแฟ้มแต่ละชนิด"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "แก้ไขหมวดหมู่ชนิดแฟ้ม"
@@ -1250,14 +1257,15 @@ msgid "Electronic mail transmission"
 msgstr "การส่งรับอีเมล"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "คู่มือการใช้ Gnome"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "แบบอักษร"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "เลือกแบบอักษรสำหรับพื้นที่ทำงาน"
 
@@ -1461,31 +1469,31 @@ msgid "The type of accelerator."
 msgstr "แบบของตัวเร่ง"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "ไม่ใช้"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<ปฏิบัติการที่ไม่รู้จัก>"
 
 # This contains shortcuts for "volume up/down", e-mail, move windows, etc.,.
 # "misclenous" is more suitable than "desktop"
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "เบ็ดเตล็ด"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "เสียง"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "จัดการหน้าต่าง"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1494,26 +1502,26 @@ msgstr ""
 "ปุ่มลัด \"%s\" ถูกใช้อยู่แล้วสำหรับ:\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "เกิดข้อผิดพลาดขณะจัดเก็บปุ่มลัดใหม่ลงในฐานข้อมูลค่าปรับแต่ง: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "เกิดข้อผิดพลาด ขณะลบปุ่มลัดออกจาก ฐานข้อมูลค่าปรับแต่ง: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "ปฏิบัติการ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "ปุ่มลัด"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "ชุดปุ่มลัด"
 
@@ -1525,23 +1533,10 @@ msgstr ""
 "ถ้าต้องการเปลี่ยนปุ่มลัด คลิกบนแถวที่ต้องการแล้วกดปุ่มลัดตัวใหม่ หรือกดปุ่ม Backspace "
 "ถ้าไม่ต้องการใช้"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "ตั้งปุ่มลัดสำหรับเรียกใช้คำสั่งต่างๆ"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "ไม่รู้จัก"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "โมเดล"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "ตัวอย่างผังแป้นพิมพ์"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1708,10 +1703,33 @@ msgstr "ร_ะยะเวลาทำงานก่อนจะพัก:"
 msgid "minutes"
 msgstr "นาที"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "ไม่รู้จัก"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "โมเดล"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "ตัวอย่างผังแป้นพิมพ์"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "ตั้งค่าสำหรับแป้นพิมพ์"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "ค่าตั้งของเมนูและแถบเครื่องมือ"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "ตั้งค่าของเมาส์"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "ตัวชี้ที่ไม่รู้จัก"
@@ -1875,20 +1893,21 @@ msgstr "_ระยะเริ่มลาก:"
 msgid "_Timeout:"
 msgstr "_ภายใน:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "เมาส์"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "ปรับแต่งค่าตั้งสำหรับเมาส์"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "พร็อกซี"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "ตั้งค่าพร็อกซี"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1932,7 +1951,8 @@ msgid "H_TTP proxy:"
 msgstr "พร็อกซี H_TTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
+#, fuzzy
+msgid "Network Proxy Preferences"
 msgstr "ตั้งค่าพร็อกซี"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
@@ -1971,7 +1991,7 @@ msgstr "_รหัสผ่าน:"
 msgid "_Secure HTTP proxy:"
 msgstr "พร็อกซี _Secure HTTP:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "ใช้เสียงสำหรับเหตุการณ์ต่าง ๆ"
 
@@ -2028,15 +2048,26 @@ msgstr ""
 "หาชุดตกแต่งไม่เจอ.  นี่คงเป็นเพราะว่าหน้าต่าง \"ปรับแต่งชุดตกแต่ง\" ถูกติดตั้งไม่ดี  "
 "หรือว่าคุณยังไม่ได้ติดตั้งแพ็กเกจ \"gnome-themes\""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "ไม่ได้กำหนดตำแหน่งของแฟ้มชุดตกแต่งที่จะติดตั้ง"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "ตำแหน่งแฟ้มชุดตกแต่งที่ให้ใช้ไม่ได้"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2066,12 +2097,12 @@ msgstr "ชุดตกแต่งต้องมีชื่อ"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "มีชุดตกแต่งนี้อยู่แล้ว จะเขียนทับไหม?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "เลือกชุดตกแต่งสำหรับส่วนต่าง ๆ ของพื้นที่ทำงาน"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "ชุดตกแต่ง"
 
@@ -2183,11 +2214,11 @@ msgstr "_ชื่อชุดตกแต่ง:"
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "ปรับแต่งรูปโฉมแถบเครื่องมือและแถบเมนูในโปรแกรม"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "เมนู & แถบเครื่องมือ"
 
@@ -2256,7 +2287,6 @@ msgid "_Edit"
 msgstr "แ_ก้ไข"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "แ_ฟ้ม"
 
@@ -2284,6 +2314,14 @@ msgstr "_ออก"
 msgid "_Save"
 msgstr "_บันทึก"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2295,23 +2333,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (หรือ ปุ่มโลโก้วินโดวส์)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2351,14 +2389,34 @@ msgstr "_ยกหน้าต่างที่เลือกขึ้นม�
 msgid "_Select windows when the mouse moves over them"
 msgstr "เ_ลือกหน้าต่างที่เมาส์อยู่"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "คุณสมบัติหน้าต่าง"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "หน้าต่าง"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "ศูนย์ควบคุม GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "ปรับแต่งรูปพื้นโต๊ะ"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "อื่นๆ"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "ตัวปรับแต่งระบบของ GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "ศูนย์ควบคุม"
@@ -2387,93 +2445,6 @@ msgstr ""
 msgid "View as Control Center"
 msgstr "มองเป็นศูนย์ควบคุม GNOME"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "ศูนย์ควบคุม GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "เลย์เอาต์"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "เลย์เอาต์ที่ใช้ในมุมมองของ capplets"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "วัตถุของโฟลเดอร์ของ capplet"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "โฟลเดอร์ของ capplet ปัจจุบัน"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"ไพศาข์ สีเหลืองสวัสดิ์\n"
-"ศุภกร สิทธิไชย\n"
-"สุปราณี ธีระวัฒนสุข\n"
-"สุริชาติ สัมฤทธิ์\n"
-"ชาญชัย จันฤาชัย\n"
-"\n"
-"ถ้ามีเวลาโปรดมาช่วยกันแปล\n"
-"http://gnome-th.sf.net"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "ศูนย์ควบคุม GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "ตัวจัดการคุณสมบัติพื้นที่ทำงาน"
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "ศูนย์ควบคุม GNOME : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "อื่นๆ"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "ศูนย์ควบคุม GNOME"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "ใช้ Nautilus ถ้ามันทำงานอยู่"
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "เกี่ยวกับโปรแกรมนี้"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "ภาพรวมของศูนย์ควบคุม"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "เ_กี่ยวกับ"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "เ_นื้อหา"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_วิธีใช้"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "ตัวปรับแต่งระบบของ GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "ใช้เชลล์แม้ว่า Nautilus จะทำงานอยู่"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "ระดับเสียง"
@@ -2577,7 +2548,7 @@ msgstr ""
 "เกิดความผิดพลาดตอนเรียก (%s) ทำงาน\n"
 "ซึ่งเชื่อมโยงกับคีย์ (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2592,7 +2563,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2600,21 +2571,21 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr "ค่าตั้งแป้นพิมพ์ของ X ต่างจากค่าตั้งแป้นพิมพ์ของ GNOME  คุณต้องการใช้อันไหน?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "ค่าตั้งตั้งของ X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "ใช้ค่าตั้งของ GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2676,8 +2647,8 @@ msgstr "ไ_ม่ต้องแสดงข้อความนี้อี�
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "ไม่สามารถเรียกแฟ้มเสียง %s เป็นตัวอย่างเสียง %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "ไม่รู้ว่าโฟลเดอร์บ้านของผู้ใช้อยู่ตรงไหน"
 
@@ -2724,11 +2695,11 @@ msgstr "จอ"
 msgid "Screen on which BGApplier is to draw"
 msgstr "จอที่จะให้ BGApplier เขียน"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "หาแฟ้มเสียงสำหรับเหตุการณ์นี้ไม่เจอ"
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2737,32 +2708,32 @@ msgstr ""
 "หาแฟ้มเสียงสำหรับเหตุการณ์นี้ไม่เจอ\n"
 "ถ้าคุณต้องการชุดเสียงปริยาย โปรดติดตั้ง gnome-audio"
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "แฟ้ม %s ไม่ใช่แฟ้ม wav ที่ใช้ได้"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "เหตุการณ์"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "แฟ้มเสียง"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "เ_สียง:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "แ_ฟ้มเสียง:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "เลือกแฟ้มเสียง"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "เ_ล่น"
 
@@ -3021,26 +2992,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "อีกไม่นาน ค่าตั้ง XKB ใน gconf จะถูกเขียนทับ โดยค่าตั้งของระบบ"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "ผังแป้นพิมพ์ XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "รุ่นแป้นพิมพ์ XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "ตัวเลือก XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "รุ่_นแป้นพิมพ์"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "ผังแป้นพิมพ์ XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "รุ่_นแป้นพิมพ์"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "ชุดปุ่มลัด"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "ค่าตั้ง XKB ใน gconf จะถูกบดบังโดยระบบ โดยเร็วที่สุดเท่าที่เป็นไปได้"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "อีกไม่นาน ค่าตั้ง XKB ใน gconf จะถูกเขียนทับ โดยค่าตั้งของระบบ"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "ผังแป้นพิมพ์ XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "รุ่นแป้นพิมพ์ XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_ผัดเวลาพัก"
@@ -3115,46 +3134,14 @@ msgstr ""
 "คุณสามารถเพิ่มมันได้ โดยคลิกขวาบนพาเนล แล้วเลือก 'เพิ่มเข้าในพาเนล -> อรรถประโยชน์ -> "
 "พื้นที่รายงานแจ้งเตือน'"
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "ถ้ารู้ประโยคดีๆเป็นตัวอย่างอักษร กรุณาแจ้ง L10N@opentle.org"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "ชื่อ:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "ลักษณะ:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "ชนิด:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "ขนาด:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "รุ่น:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "สงวนลิขสิทธิ์:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "คำอธิบาย:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "วิธีใช้: %s แฟ้มอักษร\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "ตั้งเป็นแบบอักษรสำหรับโปรแกรม"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "ส่วนต่างๆ ของเมนูบริบทของตัวอักษร"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "เลือกโปรแกรมที่จะถูกใช้โดยปรกติ"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3222,33 +3209,47 @@ msgstr "สร้างรูปย่อสำหรับแบบอักษ
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "สร้างรูปย่อสำหรับแบบอักษร Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "เครื่องมือสำหรับเมนูบริบทของ Fontilus"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "ถ้ารู้ประโยคดีๆเป็นตัวอย่างอักษร กรุณาแจ้ง L10N@opentle.org"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "เมนูบริบทของ Fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "ชื่อ:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "เครื่องมือสำหรับเมนูบริบทของ Fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "ลักษณะ:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "เมนูบริบทของ Nautilus สำหรับแบบอักษร"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "ชนิด:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "ตั้งเป็นแบบอักษรสำหรับโปรแกรม"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "ขนาด:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "รุ่น:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "สงวนลิขสิทธิ์:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "คำอธิบาย:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "วิธีใช้: %s แฟ้มอักษร\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "ศูนย์ควบคุม GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3276,27 +3277,18 @@ msgstr "_ตกลงใช้แบบอักษรใหม่"
 msgid "Themes"
 msgstr "ชุดตกแต่ง"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "ชุดรูปแบบการควบคุม"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "ชุดรูปแบบขอบหน้าต่าง"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "ชุดรูปแบบไอคอน"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI ที่แสดงอยู่"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG นั้นชุติ์ฐาณๆ๑๒๓"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "ตั้งแล้วจะเห็นรูปตัวอย่างของชุดตกแต่งที่มี"
@@ -3330,6 +3322,152 @@ msgstr "ว่าจะสร้างรูปย่อสำหรับชุ
 msgid "Whether to thumbnail themes"
 msgstr "ว่าจะสร้างรูปย่อสำหรับชุดตกแต่ง หรือไม่"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG นั้นชุติ์ฐาณๆ๑๒๓"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_ตกลงใช้แบบอักษรใหม่"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "_กลับไปใช้ค่าปริยาย"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "เทอร์มินอลของ Gnome"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "ตัวแก้ไขที่_กำหนดเอง"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "ตัวอ่านอีเมลที่_กำหนดเอง:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "เทอร์มินอลที่_กำหนดเอง:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "เว็บบราวเซอร์ที่_กำหนดเอง:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "เรียกใช้ในเ_ทอรมินอล"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "โปรแกรมนี้เปิด _URI ได้"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "โปรแกรมนี้ต้องถูกเรียกใช้ในเ_ชลล์"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "เ_ลือกตัวอ่านอีเมล:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "เ_ลือกเทอร์มินอล:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "เ_ลือกเว็บบราวเซอร์:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "เ_ลือกตัวแก้ไข:"
+
+#~ msgid "Accessibility"
+#~ msgstr "ระบบอำนวยการใช้งาน"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "ตั้งค่าระบบอำนวยการใช้งาน"
+
+#~ msgid "Advanced"
+#~ msgstr "เพิ่มเติม"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "ค่าตั้งเพิ่มเติม"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "ตั้งค่าพร็อกซี"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "ศูนย์ควบคุม GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "เลย์เอาต์"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "เลย์เอาต์ที่ใช้ในมุมมองของ capplets"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "วัตถุของโฟลเดอร์ของ capplet"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "โฟลเดอร์ของ capplet ปัจจุบัน"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "ไพศาข์ สีเหลืองสวัสดิ์\n"
+#~ "ศุภกร สิทธิไชย\n"
+#~ "สุปราณี ธีระวัฒนสุข\n"
+#~ "สุริชาติ สัมฤทธิ์\n"
+#~ "ชาญชัย จันฤาชัย\n"
+#~ "\n"
+#~ "ถ้ามีเวลาโปรดมาช่วยกันแปล\n"
+#~ "http://gnome-th.sf.net"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "ตัวจัดการคุณสมบัติพื้นที่ทำงาน"
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "ศูนย์ควบคุม GNOME : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "ศูนย์ควบคุม GNOME"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "ใช้ Nautilus ถ้ามันทำงานอยู่"
+
+#~ msgid "About this application"
+#~ msgstr "เกี่ยวกับโปรแกรมนี้"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "ภาพรวมของศูนย์ควบคุม"
+
+#~ msgid "_About"
+#~ msgstr "เ_กี่ยวกับ"
+
+#~ msgid "_Contents"
+#~ msgstr "เ_นื้อหา"
+
+#~ msgid "_Help"
+#~ msgstr "_วิธีใช้"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "ใช้เชลล์แม้ว่า Nautilus จะทำงานอยู่"
+
+#~ msgid "XKB options"
+#~ msgstr "ตัวเลือก XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "ส่วนต่างๆ ของเมนูบริบทของตัวอักษร"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "เครื่องมือสำหรับเมนูบริบทของ Fontilus"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "เมนูบริบทของ Fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "เครื่องมือสำหรับเมนูบริบทของ Fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "เมนูบริบทของ Nautilus สำหรับแบบอักษร"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI ที่แสดงอยู่"
+
 #~ msgid "GNOME Default"
 #~ msgstr "ค่าปริยายของ GNOME"
 
@@ -3528,9 +3666,6 @@ msgstr "ว่าจะสร้างรูปย่อสำหรับชุ
 #~ msgid "There was an error displaying help:"
 #~ msgstr "เกิดข้อผิดพลาดขณะแสดงวิธีใช้: %s"
 
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "ปรับแต่งรูปพื้นโต๊ะ"
-
 #, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "ค่าตั้งเพิ่มเติม"
@@ -3560,18 +3695,10 @@ msgstr "ว่าจะสร้างรูปย่อสำหรับชุ
 #~ msgstr "ชุดตกแต่งกำหนดเอง"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "ค่าตั้งของเมนูและแถบเครื่องมือ"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "ความละเอียด (_R):"
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "ตั้งค่าของเมาส์"
-
-#, fuzzy
 #~ msgid "_Ignore system configuration"
 #~ msgstr "ตั้งค่าพร็อกซี"
 
diff --git a/po/tr.po b/po/tr.po
index dcb45f31d..5265d6291 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-03 18:52+0300\n"
 "Last-Translator: Baris Cicek <baris@teamforce.name.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -61,11 +61,11 @@ msgstr "_Ekran klavyesi"
 msgid "_Screenreader"
 msgstr "_Ekran okuyucu"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Yardımcı Teknoloji Desteği"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "GNOME yardımcı teknolojilerini girişte etkin hale getir"
 
@@ -117,13 +117,13 @@ msgstr "Özellik Ayarları Dosyasını Al"
 msgid "_Import"
 msgstr "_Aktar"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Klavye"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Klavye erişilebilirlik tercihlerini ayarlayın"
 
@@ -336,11 +336,11 @@ msgstr "piksel/saniye"
 msgid "seconds"
 msgstr "saniye"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Masaüstü Arkaplan özelliklerini değiştirin"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Masaüstü Arkaplanı"
 
@@ -419,6 +419,13 @@ msgstr "Duvar Kağıdı Ekle"
 msgid "No Wallpaper"
 msgstr "Duvar Kağıdı Yok"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -623,105 +630,15 @@ msgstr "Lütfen bir resim seçin."
 msgid "_Select"
 msgstr "_Seç"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Tercih Edilen Uygulamalar"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Öntanımlı uygulamalarınızı seçin"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M Metin Web Tarayıcı"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx Metin Web Tarayıcı"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links Metin Web Tarayıcı"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution E-posta Okuyucu"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome Terminali"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Standart X Terminali"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Lütfen bu düzenleyici için bir isim ve bir komut girin."
@@ -731,20 +648,23 @@ msgid "Add..."
 msgstr "Ekle..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Ö_zel Düzenleyici"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Özel"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Ö_zel E-posta Okuyucu:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Özel"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Ö_zel Terminal:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Ö_zel Web Tarayıcı:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Bu uygulama birden fazla _dosya açabilir"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -791,6 +711,16 @@ msgid "Mail Reader"
 msgstr "E-posta Okuyucu"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "_Terminalde Çalıştır"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "_Terminalde Çalıştır"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -798,93 +728,169 @@ msgstr ""
 "İstediğiniz bir pencere yöneticisini seçiniz.  Çalıştırmak için uygulaya "
 "basıp büyülü çubuğunuzu sallayıp, büyülü dansı yapmanız gerekiyor."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "_Terminalde Başlat"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Metin Düzenleyici"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Bu uygulama _URI'leri açabilir"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Bu uygulama birden fazla _dosya açabilir"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Bu uygulamanın bir _kabukta çalıştırılması gereklidir"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "_Netscape Uzaktan Kontrolünü Kullanır"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Dosya _yöneticisi içinde metin dosyalarını açmak için bu düzenleyiciyi kullan"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Web Tarayıcı"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Pencere Yöneticisi"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Kom_ut:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "İ_sim:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "Ö_zellikler..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Bir E-posta Okuyucusu Seçin:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Seç"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Öntanımlı Web Tarayıcı"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M Metin Web Tarayıcı"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx Metin Web Tarayıcı"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links Metin Web Tarayıcı"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution E-posta Okuyucu"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Bir Terminal Seçin:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Bir Web Tarayıcı Seçin:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Bir Düzenleyici Seçin:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Erişilebilirlik"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Erişilebilirlik Seçenekleri"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Gelişmiş"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Öntanımlı Terminal"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Gelişmiş Ayarlar"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Standart X Terminali"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Ekran çözünürlüğünü değiştir"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Ekran Çözünürlüğü"
 
@@ -975,7 +981,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Bu girişi kalıcı olarak silmek istiyor musun?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Açıklama"
 
@@ -983,15 +989,25 @@ msgstr "Açıklama"
 msgid "Extensions"
 msgstr "Uzantılar"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Dosya Türleri ve Programlar"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "Hangi programların hangi tür dosyaları açabileceğini belirleyin"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Dosya türleri ve programlar"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Hangi programların hangi tür dosyaları açabileceğini ya da "
+"görüntüleyebileceğini belirler"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Eylemler"
@@ -1082,6 +1098,7 @@ msgid "_Protocol:"
 msgstr "_Protokol:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Sil"
 
@@ -1089,16 +1106,6 @@ msgstr "_Sil"
 msgid "_Viewer component:"
 msgstr "Görünteliyic, _bileşeni:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Dosya türleri ve programlar"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Hangi programların hangi tür dosyaları açabileceğini ya da "
-"görüntüleyebileceğini belirler"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Dosya kategorisini düzenle"
@@ -1280,14 +1287,15 @@ msgid "Electronic mail transmission"
 msgstr "Elektronik posta aktarımı"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Gnome belgelendirmesi"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Yazıtipi"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Masaüstü için yazıtipi seçin"
 
@@ -1494,29 +1502,29 @@ msgid "The type of accelerator."
 msgstr "Hızlandırıcı türü."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Kapalı"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Bilinmeyen Eylem>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Masaüstü"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Ses"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Pencere Yönetimi"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1525,26 +1533,26 @@ msgstr ""
 "\"%s\" kısayolu bu işlem için kullanılıyor:\n"
 "\"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Yeni hızlandırıcıyı yapılandırma veritabanına eklerken hata oldu: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Hızlandırıcıyı yapılandırma veritabanından silerken hata oluştu: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Eylem"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Kısayol"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Klavye Kısayolları"
 
@@ -1556,23 +1564,10 @@ msgstr ""
 "Yeni bir hızlandırıcı gimek için, ilgili satıra tıklayın, yeni bir "
 "hızlandırıcı girin, ya da temizlemek için Backspace tuşunu kullanın."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Komutlara kısayol ata"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Bilinmeyen"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Modeller"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Klavye düzeni önizlemesi"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1740,10 +1735,32 @@ msgstr "_Çalışma aralıkları sonlanması:"
 msgid "minutes"
 msgstr "dakika"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Modeller"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Klavye düzeni önizlemesi"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Klavye tercihlerini yapın"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Fare tercihlerini yapın"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Bilinmeyen İmleç"
@@ -1908,20 +1925,21 @@ msgstr "_Alınacak yol:"
 msgid "_Timeout:"
 msgstr "_Zaman aşımı:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Fare"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Fare tercihlerini yapın"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Ağ Vekili"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Ağ vekil tercihleri"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1965,8 +1983,9 @@ msgid "H_TTP proxy:"
 msgstr "_HTTP vekili:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Ağ Vekil Yapılandırması"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Ağ vekil tercihleri"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2004,7 +2023,7 @@ msgstr "_Parola:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Güvenli HTTP vekili:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Sesi etkinleştir ve seslerle eylemleri ilişkilendir"
 
@@ -2061,15 +2080,26 @@ msgstr ""
 "Sistemde hiç tema bulunamadı.  Bu \"gnome-themes\" paketi kurulmamış, ya da "
 "\"Tema Tercihleri\" penceresi hatalı yüklenmiş anlamına gelebilir."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Yüklemek için bir tema dosyası belirtilmedi"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Yüklemek için belirtilen tema dosyası konumu geçerli değil"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2103,12 +2133,12 @@ msgstr "Bir tema adı bulunmalıdır"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Tema zaten mevcut. Onun yerin koymak ister misinz?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Masaüstü farklı noktaları için tema seçin"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tema"
 
@@ -2222,11 +2252,11 @@ msgstr "_Tema adı:"
 msgid "theme selection tree"
 msgstr "tema seçim ağacı"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Uygulamalardaki araç ve menü çubuğunun görünümünü yapılandırın"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menüler ve Araç Çubuğu"
 
@@ -2295,7 +2325,6 @@ msgid "_Edit"
 msgstr "_Düzenle"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Dosya"
 
@@ -2323,6 +2352,14 @@ msgstr "Çı_k"
 msgid "_Save"
 msgstr "_Kaydet"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2334,23 +2371,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Kontrol"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hiper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Süper (ya da \"Windows logosu\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2391,14 +2428,34 @@ msgstr "_Belirli bir süre sonra seçilen pencereleri yükselt"
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Fare bir pencerenin üzerine geldiğinde onu yükselt"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Pencere Özellikleri"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Pencereler"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME Kontrol Merkezi"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Masaüstü Arkaplan Tercihleri"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Diğerleri"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "GNOME yapılandırma aracı"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Kontrol Merkezi"
@@ -2427,85 +2484,6 @@ msgstr "Kontrol Merkezi görünümü üreticisi"
 msgid "View as Control Center"
 msgstr "Kontrol Merkezi Olarak Görüntüle"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME Kontrol Merkezi: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Düzen"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Bu programcıkların görünümünde kullanılacak düzen"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Programcık dizin nesnesi"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Bu görünümde görüntülenen programcık dizini"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Barış_Çiçek"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME Kontrol Merkezi"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Masaüstü özellikleri yöneticisi."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Gnome Kontrol Merkezi : %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Diğerleri"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Gnome Kontrol Merkezi"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Eğer çalışıyorsa nautilus kullan."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Bu uygulama hakkında"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Kontrol merkezine bakış"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Hakkında"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "İç_indekiler"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Yardım"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "GNOME yapılandırma aracı"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Nautilus çalışsa bile kabuk kullan."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Ses"
@@ -2611,7 +2589,7 @@ msgstr ""
 "(%s) çalıştırırken hata\n"
 "(%s) tuşu ile bağlı"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2636,7 +2614,7 @@ msgstr ""
 "- <b>xpop -root | grep XKB</b> çıktısı\n"
 "- <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b> çıktısı"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2648,7 +2626,7 @@ msgstr ""
 "Daha basit bir yapılandırma deneyin ya da daha yeni bir XFree yazılım sürümü "
 "edinin."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2656,15 +2634,15 @@ msgstr ""
 "X sistemi klavye ayarları sizin mevcut GNOME klavye ayarlarınızdan farklı. "
 "Hangi ayarı kullanmak istersiniz?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "X ayarlarını kullan"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "GNOME ayarlarını kullan"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2729,8 +2707,8 @@ msgstr "_Bu mesajı bir daha gösterme"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "%s dosyasını %s örneği olarak yükleyemedi"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Kullanıcı'nın ana dizini belirlenemedi"
 
@@ -2779,11 +2757,11 @@ msgstr "Ekran"
 msgid "Screen on which BGApplier is to draw"
 msgstr "BGApplier'ın çizileceği ekran"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Bu olay için ses dosyası bulunamadı."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2793,32 +2771,32 @@ msgstr ""
 "Öntanımlı bir dizi ses için gnome-audio package\n"
 "kurabilirsiniz."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "%s dosyası geçerli bir wav dosyası değil"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Olay"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Ses Dosyası"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Sesler:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Ses dosyası:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Ses Dosyasını Seçin"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "Ç_al"
 
@@ -3077,28 +3055,76 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Çok yakında, gconf içindeki XKB ayarları yerine sistem yapılandırması "
-"ayarları kullanılacak"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB klavye düzeni"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB klavye modeli"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB seçenekleri"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Klavye _modeli:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB klavye düzeni"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Klavye _modeli:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Klavye Kısayolları"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "gconf XKB seçenekleri yerine sistem seçenekleri kullanılacak ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Çok yakında, gconf içindeki XKB ayarları yerine sistem yapılandırması "
+"ayarları kullanılacak"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB klavye düzeni"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB klavye modeli"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Molayı ertele"
@@ -3174,47 +3200,14 @@ msgstr ""
 "Panelinizde uyarı alanı yok gibi görülüyor. Panele sağ tıklayıp 'Panele ekle "
 "-> Araçlar -> Uyarı alanı' seçenekleri ile ekleyebilirsiniz."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-"Muş sefahat pasajı önündeki borçlu yorgun bir ağızla cevapladı. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "İsim:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Stil:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Tür:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Boyut:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Sürüm:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Telif:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Açıklama:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "kullanım: %s yazıtipi-dosyası\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Uygulama Yazıtipi Olarak Tanımla"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Yazıtipi içeriği menü öğeleri"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Öntanımlı uygulamalarınızı seçin"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3284,33 +3277,48 @@ msgstr "TrueType yazıtiplerinin örneklendirilip yada örneklendirilmeyeceği"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Type1 yazıtiplerinin örneklendirilip yada örneklendirilmeyeceği"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Fontilus içerik menüsü için fabrika"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr ""
+"Muş sefahat pasajı önündeki borçlu yorgun bir ağızla cevapladı. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontiuls içerik menüsü"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "İsim:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus içerik menü fabrikası"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Stil:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Nautilus yazıtipleri için içerik menü girdileri"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Tür:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Uygulama Yazıtipi Olarak Tanımla"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Boyut:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Sürüm:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Telif:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Açıklama:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Tema Özellikleri içerik görüntüleme bileşeni"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "kullanım: %s yazıtipi-dosyası\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus Tema Özellikleri görüntüsü"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME Kontrol Merkezi"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3341,27 +3349,18 @@ msgstr "_Yazıtipini uygula"
 msgid "Themes"
 msgstr "Temalar"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Kontrol teması"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Pencera kenar teması"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Simge teması"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Şu anda gösterilen URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCÇDEFGĞŞİÜÖ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Eğer doğruya ayarlıysa, yüklenmiş temalar örneklendirilecek."
@@ -3394,3 +3393,147 @@ msgstr "Yüklenmiş temaların örneklendirilip yada örneklendirilmeyeceği"
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "Temaların örneklendirilip yada örneklendirilmeyeceği"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCÇDEFGĞŞİÜÖ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Yazıtipini uygula"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Öntanımlılara _dön"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome Terminali"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Ö_zel Düzenleyici"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Ö_zel E-posta Okuyucu:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Ö_zel Terminal:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Ö_zel Web Tarayıcı:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "_Terminalde Başlat"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Bu uygulama _URI'leri açabilir"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Bu uygulamanın bir _kabukta çalıştırılması gereklidir"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Bir E-posta Okuyucusu Seçin:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Bir Terminal Seçin:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Bir Web Tarayıcı Seçin:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Bir Düzenleyici Seçin:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Erişilebilirlik"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Erişilebilirlik Seçenekleri"
+
+#~ msgid "Advanced"
+#~ msgstr "Gelişmiş"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Gelişmiş Ayarlar"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Ağ Vekil Yapılandırması"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME Kontrol Merkezi: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Düzen"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Bu programcıkların görünümünde kullanılacak düzen"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Programcık dizin nesnesi"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Bu görünümde görüntülenen programcık dizini"
+
+#~ msgid "translator_credits"
+#~ msgstr "Barış_Çiçek"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Masaüstü özellikleri yöneticisi."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Gnome Kontrol Merkezi : %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Gnome Kontrol Merkezi"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Eğer çalışıyorsa nautilus kullan."
+
+#~ msgid "About this application"
+#~ msgstr "Bu uygulama hakkında"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Kontrol merkezine bakış"
+
+#~ msgid "_About"
+#~ msgstr "_Hakkında"
+
+#~ msgid "_Contents"
+#~ msgstr "İç_indekiler"
+
+#~ msgid "_Help"
+#~ msgstr "_Yardım"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Nautilus çalışsa bile kabuk kullan."
+
+#~ msgid "XKB options"
+#~ msgstr "XKB seçenekleri"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Yazıtipi içeriği menü öğeleri"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Fontilus içerik menüsü için fabrika"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontiuls içerik menüsü"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus içerik menü fabrikası"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Nautilus yazıtipleri için içerik menü girdileri"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Tema Özellikleri içerik görüntüleme bileşeni"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus Tema Özellikleri görüntüsü"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "Şu anda gösterilen URI"
diff --git a/po/uk.po b/po/uk.po
index 21519f39d..67bf75c16 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: control-center 2.0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-10 12:41+0300\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -61,11 +61,11 @@ msgstr "_Екранна клавіатура"
 msgid "_Screenreader"
 msgstr "_Читання з екрану"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Підтримка допоміжних технологій"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Ввімкнення допоміжних технологій GNOME при вході у систему"
 
@@ -117,13 +117,13 @@ msgstr "Імпортувати файлу параметрів"
 msgid "_Import"
 msgstr "_Імпорт"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Клавіатура"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Параметри спеціальних можливостей клавіатури"
 
@@ -338,11 +338,11 @@ msgstr "точок на секунду"
 msgid "seconds"
 msgstr "с"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Змінює малюнок на тлі стільниці"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Фоновий малюнок"
 
@@ -421,6 +421,13 @@ msgstr "Додавання фонового малюнка"
 msgid "No Wallpaper"
 msgstr "Без малюнка"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -628,105 +635,15 @@ msgstr "Виберіть зображення."
 msgid "_Select"
 msgstr "_Вибрати"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Вподобані програми"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Обрання типових програм"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Текстовий переглядач WWW W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Текстовий переглядач WWW Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Текстовий переглядач WWW Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Поштова програма Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Термінал середовища Gnome"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "Стандартний X-термінал"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Вкажіть назву та команду цього редактора."
@@ -736,20 +653,23 @@ msgid "Add..."
 msgstr "Додати..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "В_ласний редактор"
+#, fuzzy
+msgid "C_ustom"
+msgstr "Власне"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "В_ласна поштова програма:"
+#, fuzzy
+msgid "C_ustom:"
+msgstr "Власне"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "В_ласний термінал:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "В_ласний переглядач Інтернету:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Цей додаток може відкривати _декілька файлів"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -796,6 +716,16 @@ msgid "Mail Reader"
 msgstr "Поштова програма"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Запустити у т_ерміналі"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Запустити у т_ерміналі"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -803,94 +733,170 @@ msgstr ""
 "Оберіть бажаний менеджер вікон.  Щоб це спрацювало, вам слід натиснути "
 "\"вжити\", та виконати магічний танок."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Запустити в т_ерміналі"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Термінал"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Текстовий редактор"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Цей додаток може відкривати _URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Цей додаток може відкривати _декілька файлів"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Цей додаток потрібно запускати в _оболонці"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Підтримує _Netscape Remote Control"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 "Використовувати цей _редактор для відкривання текстових файлів у файловому "
 "менеджері"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Переглядач Інтернет"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Віконний менеджер"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "_Команда:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "В_ластивості..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "Ви_брати поштову програму:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Вибрати"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "Ви_брати термінал:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Типовий переглядач Інтернету"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "Ви_брати переглядач Інтернету:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "Ви_брати редактор:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Спеціальні можливості"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Параметри спеціальних можливостей"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Текстовий переглядач WWW W3M"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Додатково"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Текстовий переглядач WWW Lynx"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Додаткові параметри"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Текстовий переглядач WWW Links"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Поштова програма Evolution"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Типовий термінал"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Термінал"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "Стандартний X-термінал"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Зміна параметрів екрану"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Параметри екрану"
 
@@ -983,7 +989,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Ви дійсно бажаєте остаточно видалити цей елемент?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Опис"
 
@@ -991,17 +997,27 @@ msgstr "Опис"
 msgid "Extensions"
 msgstr "Розширення"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Типи файлів і програми"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Вказати, які програми використовуються для відкривання чи перегляду файлів "
 "кожного типу"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Типи файлів і програми"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Налаштовування відповідностей між типом файлів та програмами, які "
+"використовуються для їх відкривання чи перегляду"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Дії"
@@ -1092,6 +1108,7 @@ msgid "_Protocol:"
 msgstr "_Протокол:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "В_идалити"
 
@@ -1099,16 +1116,6 @@ msgstr "В_идалити"
 msgid "_Viewer component:"
 msgstr "Компонент _перегляду:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Типи файлів і програми"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Налаштовування відповідностей між типом файлів та програмами, які "
-"використовуються для їх відкривання чи перегляду"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Виправити категорію файлів"
@@ -1290,14 +1297,15 @@ msgid "Electronic mail transmission"
 msgstr "Передача електронної пошти"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Документація GNOME"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Шрифт"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Обрання шрифту для стільниці"
 
@@ -1509,29 +1517,29 @@ msgid "The type of accelerator."
 msgstr "Тип прискорювача."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Немає"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Невідома дія>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Стільниця"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Звук"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Керування вікнами"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1540,26 +1548,26 @@ msgstr ""
 "Комбінація клавіш \"%s\" вже використовується для\n"
 " \"%s\"\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Помилка встановлення нового прискорювача у базі даних параметрів: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Помилка звільнення прискорювача у базі даних параметрів: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Дія"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Комбінація клавіш"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Комбінації клавіш"
 
@@ -1571,23 +1579,10 @@ msgstr ""
 "Щоб змінити прискорювач, клацніть у відповідному рядку та введіть новий "
 "прискорювач, або натисніть Backspace для очищення."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Пов'язати комбінації клавіш з командами"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Невідома"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Моделі"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Попередній перегляд розкладки клавіатури"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1755,10 +1750,32 @@ msgstr "Тривалість _роботи:"
 msgid "minutes"
 msgstr "хвилин"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Невідома"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Моделі"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Попередній перегляд розкладки клавіатури"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Встановити параметри клавіатури"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+msgid "Language and Culture"
+msgstr ""
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Встановлення параметрів миші"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Невідомий вказівник"
@@ -1923,20 +1940,21 @@ msgstr "_Поріг:"
 msgid "_Timeout:"
 msgstr "_Затримка"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Миша"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Встановлення параметрів миші"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Служба проксі"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Параметри проксі-сервера"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1980,8 +1998,9 @@ msgid "H_TTP proxy:"
 msgstr "Проксі _HTTP"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Параметри проксі"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Параметри проксі-сервера"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2019,7 +2038,7 @@ msgstr "_Пароль:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Безпечний проксі HTTP"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Увімкнути озвучення подій менеджера вікон"
 
@@ -2076,15 +2095,26 @@ msgstr ""
 "Жодної теми не знайдено у системі. Швидше за все, це означає, що діалог тем "
 "було неправильно встановлено чи не було встановлено пакет \"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Не вказаний файл теми для встановлення"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Вказаний шлях розташування файлу теми неправильний"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2118,12 +2148,12 @@ msgstr "Назва теми повинна бути вказана"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Тема вже існує. Бажаєте її замінити?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Обрання тем різних частин стільниці"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Тема"
 
@@ -2235,11 +2265,11 @@ msgstr "Назва _теми:"
 msgid "theme selection tree"
 msgstr "дерево вибору тем"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Налаштовування вигляду пеналів та меню у додатках"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Меню та пенали"
 
@@ -2308,7 +2338,6 @@ msgid "_Edit"
 msgstr "_Правка"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Файл"
 
@@ -2336,6 +2365,14 @@ msgstr "Ви_йти"
 msgid "_Save"
 msgstr "З_берегти"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2347,23 +2384,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (чи \"Логотип системи Windows\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Мета"
 
@@ -2405,14 +2442,34 @@ msgstr "_Піднімати вибране вікно після певної з
 msgid "_Select windows when the mouse moves over them"
 msgstr "Пере_микатись на вікна, коли над ними проходить курсор"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Параметри вікон"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Вікна"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Центр керування GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Параметри тла стільниці"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Інші"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Засіб настроювання GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Центр керування"
@@ -2441,87 +2498,6 @@ msgstr "Фабрика переглядачів центру керування"
 msgid "View as Control Center"
 msgstr "Показати як центр керування"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Центр керування GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Розташування"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Тип розташування для цього вигляду каплетів"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Об'єкт каталогу каплету"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Каталог каплету, що показує цей вигляд"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Юрій Сирота\n"
-"Максим Дзюманенко <mvd@mylinux.com.ua>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Центр керування GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Менеджер властивостей стільниці."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Центр керування GNOME: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Інші"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Центр керування GNOME"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Використовувати nautilus, якщо він запущений."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Про цей додаток"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Огляд центру керування"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Про програму"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Зміст"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Довідка"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Засіб настроювання GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Використовувати командну оболонку, навіть, якщо запущено Наутілус"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Гучність"
@@ -2629,7 +2605,7 @@ msgstr ""
 "Помилка при спробі запуску (%s)\n"
 "що пов'язаний з клавішею (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2655,7 +2631,7 @@ msgstr ""
 "- результат виконання <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/"
 "xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2666,7 +2642,7 @@ msgstr ""
 "Вона має відому помилку з складними конфігураціями XKB.\n"
 "Спробуйте використовувати простішу конфігурацію або поновіть систему XFree."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2674,15 +2650,15 @@ msgstr ""
 "Системна клавіатура X відрізняється від ваших параметрів клавіатури GNOME. "
 "Які з параметрів ви бажаєте використовувати?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Використовувати параметри X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Використовувати параметри GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2747,8 +2723,8 @@ msgstr "Більше _не показувати цього повідомлен�
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Не вдається завантажити звуковий файл %s як фрагмент %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Не вдається визначити домашній каталог користувача"
 
@@ -2797,11 +2773,11 @@ msgstr "Екран"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Екран, на якому BGApplier буде малювати"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Звукового файлу для цієї події не існує."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2811,32 +2787,32 @@ msgstr ""
 "Можна встановити пакет gnome-audio\n"
 "з набором типових звуків."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Файл %s не є правильним wav-файлом"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Подія"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Звуковий файл"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "_Звуки:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "Звуковий _файл:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "Виберіть звуковий файл"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Відтворити"
 
@@ -3097,30 +3073,78 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Дуже скоро, параметри XKB у gconf будуть перевизначені (з системних "
-"параметрів)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB розкладка клавіатури"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB модуль клавіатури"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB параметри"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Модель клавіатури:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB розкладка клавіатури"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Модель клавіатури:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Комбінації клавіш"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "Параметри XKB у gconf будуть перезаписуватись з системних параметрів якомога "
 "швидше"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Дуже скоро, параметри XKB у gconf будуть перевизначені (з системних "
+"параметрів)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB розкладка клавіатури"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB модуль клавіатури"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Відкласти перерву"
@@ -3199,48 +3223,14 @@ msgstr ""
 "натиснути правою кнопкою на панелі та вибрати \"Додати до панелі -> Утиліта -"
 "> Область сповіщення\"."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-"Жебракують філософи при ґанку церкви в Гадячі; ще й шатро їхнє знаємо. "
-"0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Назва:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Стиль:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Тип:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Розмір:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Версія:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Авторські права:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Опис:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "використання: %s файл шрифту\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Зробити шрифтом програм"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Елементи контекстного меню шрифту"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Обрання типових програм"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3322,33 +3312,49 @@ msgstr "Чи створювати мініатюри шрифтам у форм�
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Чи створювати мініатюри шрифтам у форматі Type1"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Фабрика для контекстного меню \"Шрифтілуса\""
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr ""
+"Жебракують філософи при ґанку церкви в Гадячі; ще й шатро їхнє знаємо. "
+"0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Контекстне меню Fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Назва:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Фабрика контекстного меню Fontilus"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Стиль:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "Елементи контекстного меню шрифтів Fontilus"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Тип:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Зробити шрифтом програм"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Розмір:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Версія:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Авторські права:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Компонент перегляду властивостей теми"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Опис:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Вигляд параметрів теми Themus"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "використання: %s файл шрифту\n"
+
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Центр керування GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3376,27 +3382,18 @@ msgstr "Застосувати _шрифт"
 msgid "Themes"
 msgstr "Теми"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Тема для елементів керування"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Тема рамки вікна"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Тема значків"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "Поточний URI, що відображається"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "АБВГҐДЕЄ"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3431,3 +3428,149 @@ msgstr "Чи створювати мініатюри для встановлен
 #: vfs-methods/themus/themus.schemas.in.h:8
 msgid "Whether to thumbnail themes"
 msgstr "Чи створювати мініатюри тем"
+
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "АБВГҐДЕЄ"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Застосувати _шрифт"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Скинути на _типові значення"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Термінал середовища Gnome"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "В_ласний редактор"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "В_ласна поштова програма:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "В_ласний термінал:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "В_ласний переглядач Інтернету:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Запустити в т_ерміналі"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Цей додаток може відкривати _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Цей додаток потрібно запускати в _оболонці"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "Ви_брати поштову програму:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "Ви_брати термінал:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "Ви_брати переглядач Інтернету:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "Ви_брати редактор:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Спеціальні можливості"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Параметри спеціальних можливостей"
+
+#~ msgid "Advanced"
+#~ msgstr "Додатково"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Додаткові параметри"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Параметри проксі"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Центр керування GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Розташування"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Тип розташування для цього вигляду каплетів"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Об'єкт каталогу каплету"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Каталог каплету, що показує цей вигляд"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Юрій Сирота\n"
+#~ "Максим Дзюманенко <mvd@mylinux.com.ua>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Менеджер властивостей стільниці."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Центр керування GNOME: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Центр керування GNOME"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Використовувати nautilus, якщо він запущений."
+
+#~ msgid "About this application"
+#~ msgstr "Про цей додаток"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Огляд центру керування"
+
+#~ msgid "_About"
+#~ msgstr "_Про програму"
+
+#~ msgid "_Contents"
+#~ msgstr "_Зміст"
+
+#~ msgid "_Help"
+#~ msgstr "_Довідка"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Використовувати командну оболонку, навіть, якщо запущено Наутілус"
+
+#~ msgid "XKB options"
+#~ msgstr "XKB параметри"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Елементи контекстного меню шрифту"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Фабрика для контекстного меню \"Шрифтілуса\""
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Контекстне меню Fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Фабрика контекстного меню Fontilus"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "Елементи контекстного меню шрифтів Fontilus"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Компонент перегляду властивостей теми"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Вигляд параметрів теми Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "Поточний URI, що відображається"
diff --git a/po/vi.po b/po/vi.po
index 12428412d..933a7733d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center for Gnome v-2.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-09-07 12:59+0700\n"
 "Last-Translator: pclouds <pclouds@vnlinux.org>\n"
 "Language-Team: Gnome-Vi <gnomevi-list@lists.sourceforge.net>\n"
@@ -55,11 +55,11 @@ msgstr "_Bàn phím ảo"
 msgid "_Screenreader"
 msgstr "_Trình đọc màn hình"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "Hỗ trợ Công nghệ Trợ giúp"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "Bật hỗ trợ cho Công nghệ Trợ giúp GNOME lúc đăng nhập"
 
@@ -110,13 +110,13 @@ msgstr "Nhập tập tin các thiết lập tính năng"
 msgid "_Import"
 msgstr "_Nhập"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Bàn phím"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "Lập tùy thích cho hỗ trợ bàn phím của bạn"
 
@@ -328,11 +328,11 @@ msgstr "pixels/giây"
 msgid "seconds"
 msgstr "giây"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "Thay đổi Thiết lập Nền Desktop"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "Nền Desktop"
 
@@ -411,6 +411,13 @@ msgstr "Thêm Ảnh nền"
 msgid "No Wallpaper"
 msgstr "Không Ảnh nền"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -613,105 +620,15 @@ msgstr "Vui lòng chọn ảnh."
 msgid "_Select"
 msgstr "_Chọn"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "Ứng dụng ưa thích"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Chọn các ứng dụng mặc định của bạn"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "Trình duyệt Web văn bản W3M"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Trình duyệt Web văn bản Lynx"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Trình duyệt Web văn bản Links"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Trình đọc thư Evolution"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "Gnome Terminal"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "XTerminal chuẩn"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "Vui lòng đặt tên và ghi lệnh cho bộ soạn thảo văn bản này."
@@ -721,20 +638,22 @@ msgid "Add..."
 msgstr "Thêm..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Bộ soạn thảo văn bản _riêng:"
+#, fuzzy
+msgid "C_ustom"
+msgstr "_Tự chọn:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "Trình đọc thư _riêng:"
+msgid "C_ustom:"
+msgstr "_Tự chọn:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terminal riêng:"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Trình duyệt web riêng:"
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "Ứng dụng này có thể mở _nhiều tập tin"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -781,6 +700,16 @@ msgid "Mail Reader"
 msgstr "Trình đọc thư"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Chạy trong _Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Chạy trong _Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
@@ -788,92 +717,168 @@ msgstr ""
 "Chọn trình quản lý cửa sổ bạn muốn. Bạn cần nhấn nút \"Áp dụng\", vung đũa "
 "thần, và ếm bùa để nó hoạt động."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Chạy trong t_erminal"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Bộ soạn thảo văn bản"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "Ứng dụng này có thể mở _URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "Ứng dụng này có thể mở _nhiều tập tin"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "Ứng dụng này cần chạy trong _shell"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "Hiểu điều khiển từ xa _Netscape"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "Dùng _bộ soạn thảo này để mở tập tin văn bản trong bộ quản lý tập tin"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Trình duyệt Web"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Bộ quản lý cửa sổ"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Lệnh:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_Tên:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Thuộc tính..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "_Chọn trình đọc thư:"
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "_Chọn"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Chọn terminal:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Trình duyệt Web mặc định"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Chọn trình duyệt Web:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Chọn trình xử lý văn bản:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Tính năng Hỗ trợ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Thiết lập Tính năng Hỗ trợ"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Nâng cao"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Thiết lập Nâng cao"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "Trình duyệt Web văn bản W3M"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Trình duyệt Web văn bản Lynx"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Trình duyệt Web văn bản Links"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Trình đọc thư Evolution"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Terminal mặc định"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminal"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "XTerminal chuẩn"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "Thay đổi độ phân giải màn hình"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "Độ phân giải màn hình"
 
@@ -960,7 +965,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "Bạn có chắc chắn muốn xoá vĩnh viễn mục này không?"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Mô tả"
 
@@ -968,15 +973,23 @@ msgstr "Mô tả"
 msgid "Extensions"
 msgstr "Phần mở rộng"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Loại tập tin và chương trình"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "Xác định chương trình được dùng để mở hoặc xem loại tập tin này"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Loại tập tin và chương trình"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "Xác định chương trình được dùng để mở hoặc xem từng loại tập tin"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Hành động"
@@ -1067,6 +1080,7 @@ msgid "_Protocol:"
 msgstr "_Giao thức:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Loại bỏ"
 
@@ -1074,14 +1088,6 @@ msgstr "_Loại bỏ"
 msgid "_Viewer component:"
 msgstr "Thành phần _khung xem:"
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Loại tập tin và chương trình"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "Xác định chương trình được dùng để mở hoặc xem từng loại tập tin"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Sửa phân loại tập tin"
@@ -1262,14 +1268,15 @@ msgid "Electronic mail transmission"
 msgstr "Gửi email"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Tài liệu GNOME"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Phông chữ"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Chọn phông chữ cho desktop"
 
@@ -1464,29 +1471,29 @@ msgid "The type of accelerator."
 msgstr "Kiểu phím tắt."
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Tắt"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Hành động lạ>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Desktop"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Âm thanh"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Bộ quản lý cửa sổ"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1495,26 +1502,26 @@ msgstr ""
 "Lối tắt \"%s\" đã được dùng cho:\n"
 " \"%s\" rồi\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Lỗi thiết lập phím tắt mới trong cơ sở dữ liệu cấu hình: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "Lỗi hủy thiết lập phím tắt trong cơ sở dữ liệu cấu hình: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Hành động"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Phím tắt"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Phím tắt"
 
@@ -1526,23 +1533,10 @@ msgstr ""
 "Để sửa phím tắt, nhấn vào hàng tương ứng rồi gõ phím tắt mới, hoặc nhấn "
 "backspace để xoá."
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "Cấp phát các phím nóng cho các lệnh"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-msgid "Unknown"
-msgstr "Không biết"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-msgid "Models"
-msgstr "Kiểu"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-msgid "Keyboard layout preview"
-msgstr "Xem trước bố cục bàn phím"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1710,10 +1704,32 @@ msgstr "Khoảng làm _việc dài:"
 msgid "minutes"
 msgstr "phút"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+msgid "Unknown"
+msgstr "Không biết"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+msgid "Models"
+msgstr "Kiểu"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+msgid "Keyboard layout preview"
+msgstr "Xem trước bố cục bàn phím"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Lập các tùy thích cho bàn phím của bạn"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "Tùy thích Ngôn ngữ và Văn hoá"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+msgid "Set your language and culture preferences"
+msgstr "Thiết lập tùy thích ngôn ngữ và văn hoá"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "Con trỏ lạ"
@@ -1878,20 +1894,21 @@ msgstr "_Ngưỡng:"
 msgid "_Timeout:"
 msgstr "_Thời hạn:"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Chuột"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Lập các tùy thích cho chuột"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "Proxy mạng"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Tùy thích cho proxy mạng"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1935,8 +1952,9 @@ msgid "H_TTP proxy:"
 msgstr "_HTTP proxy:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Cấu hình proxy mạng"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Tùy thích cho proxy mạng"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -1974,7 +1992,7 @@ msgstr "_Mật khẩu:"
 msgid "_Secure HTTP proxy:"
 msgstr "_Bảo mật HTTP proxy:"
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Bật âm thanh và các âm thanh liên quan đến sự kiện"
 
@@ -2031,15 +2049,26 @@ msgstr ""
 "Không tìm thấy sắc thái nào trên hệ thống. Có lẽ hộp thoại \"Tùy chọn Sắc "
 "thái\" không được cài đặt đúng, hoặc bạn chưa cài đặt gói \"gnome-themes\"."
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "Chưa xác định địa chỉ tập tin Sắc thái cần cài đặt"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "Địa chỉ tập tin sắc thái cần cài đặt không hợp lệ"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2073,12 +2102,12 @@ msgstr "Sắc thái phải có tên"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr "Sắc thái đã có rồi. Bạn có muốn thay thế nó không?"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Chọn sắc thái cho các phần khác nhau của desktop"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Sắc thái"
 
@@ -2190,11 +2219,11 @@ msgstr "_Tên Sắc thái:"
 msgid "theme selection tree"
 msgstr "cây chọn sắc thái"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "Tùy biến diện mạo thanh công cụ và thanh menu trong ứng dụng"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menu & Thanh công cụ"
 
@@ -2263,7 +2292,6 @@ msgid "_Edit"
 msgstr "_Hiệu chỉnh"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Tập tin"
 
@@ -2291,6 +2319,14 @@ msgstr "T_hoát"
 msgid "_Save"
 msgstr "_Lưu"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr "Cấu hình chương trình nào được dùng để hiển thị URL"
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr "Bộ xử lý URL"
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2303,23 +2339,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (hay \"Biểu tượng Windows\")"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2359,14 +2395,34 @@ msgstr "_Hiện cửa sổ được chọn sau một khoảng thời gian"
 msgid "_Select windows when the mouse moves over them"
 msgstr "Chọn _cửa sổ khi chuột di chuyển trên chúng"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
-msgstr "Thuộc tính cửa sổ"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
+msgstr "Cấu hình Thuộc tính cửa sổ"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Cửa sổ"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Trung tâm Điều khiển GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Thông số nền Desktop"
+
+#: control-center/control-center-categories.c:248
+msgid "Others"
+msgstr "Khác"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "Công cụ cấu hình GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 msgid "Control Center"
 msgstr "Trung tâm Điều khiển"
@@ -2395,85 +2451,6 @@ msgstr "Factory View Trung tâm Điều khiển"
 msgid "View as Control Center"
 msgstr "Xem kiểu Trung tâm Điều khiển"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Trung tâm Điều khiển GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Bố cục"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "Bố trí được dùng cho cửa sổ capplet"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Thư mục capplet"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "Thư mục capplet mà cửa sổ này đang hiển thị"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr "Nhóm Việt hoá GNOME (http://gnomevi.sourceforge.net)"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Trung tâm Điều khiển GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Trình quản lý thuộc tính desktop."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Trung tâm Điều khiển GNOME: %s"
-
-#: control-center/control-center-categories.c:333
-msgid "Others"
-msgstr "Khác"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-msgid "Gnome Control Center"
-msgstr "Trung tâm Điều khiển GNOME"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr "Dùng nautilus nếu đang chạy."
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Giới thiệu về ứng dụng này"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "Tổng quan về trung tâm điều khiển"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "_Giới thiệu"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "_Nội dung"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "Trợ _giúp"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "Công cụ cấu hình GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "Dùng shell kể cả khi Nautilus đang chạy."
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "Âm lượng"
@@ -2580,7 +2557,7 @@ msgstr ""
 "Lỗi khi thử chạy (%s)\n"
 "cái được liên kết tới phím (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2605,7 +2582,7 @@ msgstr ""
 "- Kết quả của <b>xprop -root | grep XKB</b>\n"
 "- Kết quả của <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2616,7 +2593,7 @@ msgstr ""
 "có một số vấn đề đã biết với các cấu hình XKB phức tạp.\n"
 "Hãy thử dùng cấu hình đơn giản hơn hoặc sử dụng một phiên bản XFree mới."
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
@@ -2624,15 +2601,15 @@ msgstr ""
 "Thiết lập bàn phím của X khác với thiết lập hiện thời của GNOME. Bạn muốn "
 "dùng cái nào?"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 msgid "Use X settings"
 msgstr "Dùng thiết lập X"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr "Dùng thiết lập GNOME"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, fuzzy, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2697,8 +2674,8 @@ msgstr "Đừn_g hiện thông điệp này lần nữa"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Không thể nạp tập tin âm thanh %s làm mẫu %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "Không thể xác định thư mục home của người dùng"
 
@@ -2747,11 +2724,11 @@ msgstr "Màn hình"
 msgid "Screen on which BGApplier is to draw"
 msgstr "Màn hình để vẽ BGApplier"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "Tập tin âm thanh cho sự kiện này không tồn tại."
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2761,32 +2738,32 @@ msgstr ""
 "Bạn có thể muốn cài đặt gói phần mềm gnome-audio\n"
 "chứa các file âm thanh mặc định."
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "Tập tin %s không phải là tập tin wav hợp lệ"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Sự kiện"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "Tập tin Âm thanh"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "Âm _thanh:"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "_Tập tin âm thanh:"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "_Chọn tập tin âm thanh"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Chơi"
 
@@ -3045,27 +3022,75 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Thiết lập XKB trong GConf sẽ bị ghi đè trong chốc nữa (từ cấu hình hệ thống)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Bố cục bàn phím XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Kiểu bàn phím XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Tùy chọn XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Chuông bàn phím đã bật"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Bố cục bàn phím XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Kiểu bàn phím:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Thông số bàn phím"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "Thiết lập XKB trong GConf sẽ bị ghi đè từ hệ thống ngay khi có thể"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Thiết lập XKB trong GConf sẽ bị ghi đè trong chốc nữa (từ cấu hình hệ thống)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Bố cục bàn phím XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Kiểu bàn phím XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Hoãn thư giãn"
@@ -3141,46 +3166,14 @@ msgstr ""
 "thêm vào bằng cách nhấp chuột phải trên bảng điều khiển và chọn \"Thêm vào "
 "bảng điều khiển -> Tiện ích -> Vùng thông báo\"."
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "Con cáo nâu nhanh nhẹn nhảy qua con chó già. 0123456789"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "Tên:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "Kiểu:"
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "Loại:"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "Kích thước:"
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "Phiên bản:"
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "Bản quyền:"
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "Mô tả:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr "cách dùng: %s tên-tập-tin\n"
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "Đặt làm Phông ứng dụng"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "Menu ngữ cảnh phông"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "Chọn các ứng dụng mặc định của bạn"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3248,33 +3241,47 @@ msgstr "Có tạo ảnh mẫu cho phông TrueType không"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "Có tạo ảnh mẫu cho phông Type1 không"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "Factory cho Menu ngữ cảnh phông"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "Con cáo nâu nhanh nhẹn nhảy qua con chó già. 0123456789"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Menu ngữ cảnh Fontilus"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "Tên:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Menu ngữ cảnh phông"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "Kiểu:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr ""
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "Loại:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "Đặt làm Phông ứng dụng"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "Kích thước:"
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "Phiên bản:"
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "Bản quyền:"
+
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "Mô tả:"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Thành phần khung xem nội dung thuộc tính sắc thái"
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr "cách dùng: %s tên-tập-tin\n"
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Khung xem thuộc tính sắc thái Themus"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Trung tâm Điều khiển GNOME"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3303,27 +3310,18 @@ msgstr "Á_p dụng"
 msgid "Themes"
 msgstr "Sắc thái"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "Sắc thái Ô điều khiển"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "Sắc thái Viền cửa sổ"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "Sắc thái Biểu tượng"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "URI đang hiển thị"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABCDEFG"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "Nếu đặt là true thì các sắc thái đã cài đặt sẽ được tạo ảnh mẫu."
@@ -3359,6 +3357,150 @@ msgstr "Có tạo ảnh mẫu các sắc thái được cài đặt hay không"
 msgid "Whether to thumbnail themes"
 msgstr "Có tạo ảnh mẫu các sắc thái hay không"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABCDEFG"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "Áp dụng sắc thái..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "Đặt về _mặc định"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "Gnome Terminal"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Bộ soạn thảo văn bản _riêng:"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Trình đọc thư _riêng:"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terminal riêng:"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Trình duyệt web riêng:"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Chạy trong t_erminal"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "Ứng dụng này có thể mở _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "Ứng dụng này cần chạy trong _shell"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Chọn trình đọc thư:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Chọn terminal:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Chọn trình duyệt Web:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Chọn trình xử lý văn bản:"
+
+#~ msgid "Accessibility"
+#~ msgstr "Tính năng Hỗ trợ"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "Thiết lập Tính năng Hỗ trợ"
+
+#~ msgid "Advanced"
+#~ msgstr "Nâng cao"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Thiết lập Nâng cao"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Cấu hình proxy mạng"
+
+#~ msgid "Window Properties"
+#~ msgstr "Thuộc tính cửa sổ"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Trung tâm Điều khiển GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Bố cục"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "Bố trí được dùng cho cửa sổ capplet"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Thư mục capplet"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "Thư mục capplet mà cửa sổ này đang hiển thị"
+
+#~ msgid "translator_credits"
+#~ msgstr "Nhóm Việt hoá GNOME (http://gnomevi.sourceforge.net)"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Trình quản lý thuộc tính desktop."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Trung tâm Điều khiển GNOME: %s"
+
+#~ msgid "Gnome Control Center"
+#~ msgstr "Trung tâm Điều khiển GNOME"
+
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "Dùng nautilus nếu đang chạy."
+
+#~ msgid "About this application"
+#~ msgstr "Giới thiệu về ứng dụng này"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "Tổng quan về trung tâm điều khiển"
+
+#~ msgid "_About"
+#~ msgstr "_Giới thiệu"
+
+#~ msgid "_Contents"
+#~ msgstr "_Nội dung"
+
+#~ msgid "_Help"
+#~ msgstr "Trợ _giúp"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "Dùng shell kể cả khi Nautilus đang chạy."
+
+#~ msgid "XKB options"
+#~ msgstr "Tùy chọn XKB"
+
+#~ msgid "Font context menu items"
+#~ msgstr "Menu ngữ cảnh phông"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "Factory cho Menu ngữ cảnh phông"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menu ngữ cảnh Fontilus"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Menu ngữ cảnh phông"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Thành phần khung xem nội dung thuộc tính sắc thái"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Khung xem thuộc tính sắc thái Themus"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "URI đang hiển thị"
+
 #~ msgid "De_tails..."
 #~ msgstr "_Chi tiết..."
 
@@ -3559,9 +3701,6 @@ msgstr "Có tạo ảnh mẫu các sắc thái hay không"
 #~ msgid "Desktop Wallpaper"
 #~ msgstr "Ảnh nền Desktop"
 
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Thông số nền Desktop"
-
 #~ msgid "Advanced Layout Options"
 #~ msgstr "Tùy chọn bố cục nâng cao"
 
@@ -3592,15 +3731,9 @@ msgstr "Có tạo ảnh mẫu các sắc thái hay không"
 #~ msgid "Customize _times..."
 #~ msgstr "Tùy biến _thời gian..."
 
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "Tùy thích Ngôn ngữ và Văn hoá"
-
 #~ msgid "_Region:"
 #~ msgstr "_Vùng:"
 
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Thiết lập tùy thích ngôn ngữ và văn hoá"
-
 #~ msgid "Background"
 #~ msgstr "Nền"
 
@@ -3703,18 +3836,12 @@ msgstr "Có tạo ảnh mẫu các sắc thái hay không"
 #~ msgid "Quit"
 #~ msgstr "Thoát"
 
-#~ msgid "Apply theme..."
-#~ msgstr "Áp dụng sắc thái..."
-
 #~ msgid "Themus component"
 #~ msgstr "Thành phần sắc thái"
 
 #~ msgid "Bee_p"
 #~ msgstr "_Bíp"
 
-#~ msgid "C_ustom:"
-#~ msgstr "_Tự chọn:"
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "Nhấn chuột lên nhấn phím"
 
@@ -3892,9 +4019,6 @@ msgstr "Có tạo ảnh mẫu các sắc thái hay không"
 #~ msgid "Configure window appearance"
 #~ msgstr "Cấu hình diện mạo cửa sổ"
 
-#~ msgid "Configure window properties"
-#~ msgstr "Cấu hình Thuộc tính cửa sổ"
-
 #~ msgid "Configure window manager configuration properties"
 #~ msgstr "Cấu hình thuộc tính trình cấu hình quản lý cửa sổ"
 
@@ -4002,9 +4126,6 @@ msgstr "Có tạo ảnh mẫu các sắc thái hay không"
 #~ msgid "Key_press makes sound"
 #~ msgstr "Phát âm thanh khi nhấn phím"
 
-#~ msgid "Keyboard bell _enabled"
-#~ msgstr "_Chuông bàn phím đã bật"
-
 #~ msgid "Keyboard bell _off"
 #~ msgstr "Chuông bàn phím đã _tắt"
 
@@ -4045,9 +4166,6 @@ msgstr "Có tạo ảnh mẫu các sắc thái hay không"
 #~ msgid "_Custom keyboard bell:"
 #~ msgstr "_Chuông bàn phím tự chọn."
 
-#~ msgid "Keyboard Properties"
-#~ msgstr "Thông số bàn phím"
-
 #~ msgid "Mouse Properties"
 #~ msgstr "Thông số chuột"
 
@@ -4253,9 +4371,6 @@ msgstr "Có tạo ảnh mẫu các sắc thái hay không"
 #~ msgid "Command"
 #~ msgstr "Lệnh"
 
-#~ msgid "URL Handlers"
-#~ msgstr "Bộ xử lý URL"
-
 #~ msgid "handler:"
 #~ msgstr "Bộ xử lý:"
 
@@ -4271,9 +4386,6 @@ msgstr "Có tạo ảnh mẫu các sắc thái hay không"
 #~ msgid "Set"
 #~ msgstr "Đặt"
 
-#~ msgid "Configure which programs are used to display URLs"
-#~ msgstr "Cấu hình chương trình nào được dùng để hiển thị URL"
-
 #~ msgid "Enlightenment"
 #~ msgstr "Enlightenment"
 
@@ -4343,9 +4455,6 @@ msgstr "Có tạo ảnh mẫu các sắc thái hay không"
 #~ msgid "Cancel"
 #~ msgstr "Hủy bỏ"
 
-#~ msgid "Command:"
-#~ msgstr "Lệnh:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Bộ quản lý của sổ được session quản lý"
 
diff --git a/po/wa.po b/po/wa.po
index 129a0514b..0f508dcd4 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2003-01-02 12:26+0100\n"
 "Last-Translator: Pablo Saratxaga <pablo@mandrakesoft.com>\n"
 "Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -67,11 +67,11 @@ msgstr ""
 msgid "_Screenreader"
 msgstr "Waitroûle"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr ""
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr ""
 
@@ -115,13 +115,13 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Taprece"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr ""
 
@@ -334,12 +334,12 @@ msgstr "picsels/segonde"
 msgid "seconds"
 msgstr "segondes"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 #, fuzzy
 msgid "Change your Desktop Background settings"
 msgstr "Apontiaedje da vosse do fond do scribanne"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 #, fuzzy
 msgid "Desktop Background"
 msgstr "Fond"
@@ -432,6 +432,13 @@ msgstr "_Tapisreye"
 msgid "No Wallpaper"
 msgstr "_Tapisreye"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -626,112 +633,15 @@ msgstr "Tchoezixhoz ene imådje s' i vs plait."
 msgid "_Select"
 msgstr "Disfacer"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr ""
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "Tchoezixhoz vos prémetous programes"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-#, fuzzy
-msgid "W3M Text Browser"
-msgstr "Betchteu waibe"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-#, fuzzy
-msgid "Lynx Text Browser"
-msgstr "Betchteu waibe"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-#, fuzzy
-msgid "Links Text Browser"
-msgstr "Betchteu waibe"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-#, fuzzy
-msgid "Evolution Mail Reader"
-msgstr "Foyteuse di l' aidance da _vosse"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-#, fuzzy
-msgid "Gnome Terminal"
-msgstr "Terminå"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-#, fuzzy
-msgid "Standard XTerminal"
-msgstr "Enonder dins on t_erminå"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-#, fuzzy
-msgid "ETerm"
-msgstr "Terminå"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr ""
@@ -741,21 +651,21 @@ msgid "Add..."
 msgstr "Radjouter..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "Aspougneu di tecse da _vosse"
+#, fuzzy
+msgid "C_ustom"
+msgstr "A _vosse môde:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-#, fuzzy
-msgid "C_ustom Mail Reader:"
-msgstr "Foyteuse di l' aidance da _vosse"
+msgid "C_ustom:"
+msgstr "A _vosse môde:"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "Terminå da _vosse"
+msgid "Can open _URIs"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "Betchteu waibe da _vosse"
+msgid "Can open multiple _files"
+msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -803,98 +713,187 @@ msgid "Mail Reader"
 msgstr ""
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "Enonder dins on _terminå"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "Enonder dins on _terminå"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "Enonder dins on t_erminå"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "Terminå"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "Aspougneu di tecse"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr ""
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr ""
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "Betchteu waibe"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "Manaedjeu di purneas"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "Co_mande:"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "_No:"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "_Prôpietés..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
 #, fuzzy
-msgid "_Select a Mail Reader:"
-msgstr "_Tchoezi ene foyteuse po l' aidance:"
+msgid "_Select:"
+msgstr "Disfacer"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "_Tchoezi on terminå:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "Prémetou betchteu waibe"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "_Tchoezi on betchteu waibe:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr ""
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "_Tchoezi on aspougneu di tecse:"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+msgid "Firebird"
 msgstr ""
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
 msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "Sipepieus"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+msgid "Mozilla"
+msgstr ""
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "Sipepieus apontiaedjes"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+#, fuzzy
+msgid "W3M Text Browser"
+msgstr "Betchteu waibe"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+#, fuzzy
+msgid "Lynx Text Browser"
+msgstr "Betchteu waibe"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+#, fuzzy
+msgid "Links Text Browser"
+msgstr "Betchteu waibe"
+
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+#, fuzzy
+msgid "Evolution Mail Reader"
+msgstr "Foyteuse di l' aidance da _vosse"
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "Prémetou terminå"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "Terminå"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+#, fuzzy
+msgid "Standard XTerminal"
+msgstr "Enonder dins on t_erminå"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "Categoreye"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+#, fuzzy
+msgid "ETerm"
+msgstr "Terminå"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr ""
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr ""
 
@@ -982,7 +981,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr ""
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "Discrijhaedje"
 
@@ -990,17 +989,27 @@ msgstr "Discrijhaedje"
 msgid "Extensions"
 msgstr "Egztensions"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "Sôres di fitchîs et programes"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr ""
 "Specifyî les programes ki sront eployîs po drovi ou vey tchaeke sôre di "
 "fitchî"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "Sôres di fitchîs et programes"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr ""
+"Specifyî les programes ki sront eployîs po drovi ou vey tchaeke sôre di "
+"fitchî"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Accions"
@@ -1092,6 +1101,7 @@ msgid "_Protocol:"
 msgstr "_Protocole:"
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "_Bodjî"
 
@@ -1099,16 +1109,6 @@ msgstr "_Bodjî"
 msgid "_Viewer component:"
 msgstr ""
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "Sôres di fitchîs et programes"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr ""
-"Specifyî les programes ki sront eployîs po drovi ou vey tchaeke sôre di "
-"fitchî"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Candjî categoreye do fitchî"
@@ -1287,14 +1287,15 @@ msgid "Electronic mail transmission"
 msgstr ""
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "Documintåcion di Gnome"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "Fonte"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "Tchoezi les fontes pol sicribanne"
 
@@ -1501,55 +1502,55 @@ msgid "The type of accelerator."
 msgstr ""
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "Dismetou"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<Accion nén cnoxhowe>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "Sicribanne"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "Son"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "Manaedjmint des purneas"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
 " \"%s\"\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr ""
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "Accion"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "Rascourti"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "Rascourtis del taprece"
 
@@ -1559,28 +1560,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr ""
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr ""
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr ""
-"<b>Cursoe nén cnoxhou</b>\n"
-"%s"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "Modele"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "Rascourtis del taprece"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1756,10 +1739,38 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr ""
+"<b>Cursoe nén cnoxhou</b>\n"
+"%s"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "Modele"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "Rascourtis del taprece"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "Defini vos preferinces pol taprece"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "Preferinces pol menu eyet l' bår ås usteyes"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "Defini vos preferinces pol sori"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 #, fuzzy
 msgid "Unknown Cursor"
@@ -1948,21 +1959,22 @@ msgstr ""
 msgid "_Timeout:"
 msgstr ""
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "Sori"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Defini vos preferinces pol sori"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 #, fuzzy
 msgid "Network Proxy"
 msgstr "Proxy pol rantoele"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Preferinces pol proxy del rantoele"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2009,8 +2021,9 @@ msgid "H_TTP proxy:"
 msgstr "Proxy _HTTP:"
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
-msgstr "Apontiaedje do proxy pol rantoele"
+#, fuzzy
+msgid "Network Proxy Preferences"
+msgstr "Preferinces pol proxy del rantoele"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
 msgid "Port:"
@@ -2050,7 +2063,7 @@ msgstr "_Sicrete:"
 msgid "_Secure HTTP proxy:"
 msgstr ""
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "Mete en alaedje les sons eyet ls assocyî avou des evenmints"
 
@@ -2105,15 +2118,26 @@ msgid ""
 "installed the \"gnome-themes\" package."
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr ""
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2144,12 +2168,12 @@ msgstr ""
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "Tchoezi les tinmes po sacwantès pårteyes do scribanne"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "Tinme"
 
@@ -2277,11 +2301,11 @@ msgstr "No d' _uzeu:"
 msgid "theme selection tree"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr ""
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "Menus & Bårs ås usteyes"
 
@@ -2356,7 +2380,6 @@ msgid "_Edit"
 msgstr "_Candjî"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "_Fitchî"
 
@@ -2384,6 +2407,14 @@ msgstr "Moussî _foû"
 msgid "_Save"
 msgstr "_Schaper"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr ""
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2392,23 +2423,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr ""
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "Meta"
 
@@ -2452,14 +2483,35 @@ msgstr ""
 msgid "_Select windows when the mouse moves over them"
 msgstr "_Tchoezi les purneas cwand l' sori passe å dzeur"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Propietés pol purnea"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "Purneas"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "Cinte di Contrôle di GNOME"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "Preferinces del taprece"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "Passetes"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "L' usteye d' apontiaedje di GNOME"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2494,90 +2546,6 @@ msgstr "Menu do cinte di contrôle"
 msgid "View as Control Center"
 msgstr "Cinte di Contrôle di GNOME: %s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "Cinte di contrôle di GNOME: %s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "Adjinçmint"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr ""
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"Pablo Saratxaga <pablo@mandrakesoft.com>\n"
-"Lorint Hendschel <LorintHendschel@skynet.be>\n"
-"Lucyin Mahin <lucyin@walon.org>"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "Cinte di Contrôle di GNOME"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "Manaedjeu des prôpietés do scribanne."
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "Cinte di Contrôle di GNOME: %s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "Passetes"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "Cinte di Contrôle di GNOME: %s"
-
-#: control-center/control-center.c:78
-msgid "Use nautilus if it is running."
-msgstr ""
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "Å dfait di ç' programe chal"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr ""
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "Å _dfait"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "Å d_vins"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "_Aidance"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "L' usteye d' apontiaedje di GNOME"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr ""
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 #, fuzzy
 msgid "Volume"
@@ -2676,7 +2644,7 @@ msgid ""
 "which is linked to the key (%s)"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2691,7 +2659,7 @@ msgid ""
 "- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/xkb</b>"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2699,22 +2667,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "Sipepieus apontiaedjes"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2765,8 +2733,8 @@ msgstr ""
 msgid "Couldn't load sound file %s as sample %s"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr ""
 
@@ -2813,47 +2781,47 @@ msgstr "Waitroûle"
 msgid "Screen on which BGApplier is to draw"
 msgstr ""
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr ""
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
 "for a set of default sounds."
 msgstr ""
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr ""
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "Evenmint"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 #, fuzzy
 msgid "Sound File"
 msgstr "Son"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 #, fuzzy
 msgid "_Sounds:"
 msgstr "_Sons"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 #, fuzzy
 msgid "Sound _file:"
 msgstr "Tchoezi on fitchî di son"
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 #, fuzzy
 msgid "Select Sound File"
 msgstr "Tchoezi on fitchî di son"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "_Djower"
 
@@ -3120,29 +3088,72 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "Xhuflet del taprece"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
 #, fuzzy
-msgid "XKB keyboard layout"
+msgid "Keyboard layout"
 msgstr "Rascourtis del taprece"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
 #, fuzzy
-msgid "XKB keyboard model"
+msgid "Keyboard model"
 msgstr "Xhuflet del taprece"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
 #, fuzzy
-msgid "XKB options"
-msgstr "Accions"
+msgid "Keyboard options"
+msgstr "Rascourtis del taprece"
 
-#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
 msgstr ""
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Rascourtis del taprece"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Xhuflet del taprece"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr ""
@@ -3216,49 +3227,15 @@ msgid ""
 "Notification area'."
 msgstr ""
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:253
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
 #, fuzzy
-msgid "Name:"
-msgstr "_No:"
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:265
-#, fuzzy
-msgid "Type:"
-msgstr "Sôre"
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr ""
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr ""
+msgid "Set as Application Font"
+msgstr "Fonte po les _programes:"
 
-#: vfs-methods/fontilus/font-view.c:324
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
 #, fuzzy
-msgid "Description:"
-msgstr "_Discrijhaedje:"
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
-
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr ""
+msgid "Sets the default application font"
+msgstr "Tchoezixhoz vos prémetous programes"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3326,36 +3303,51 @@ msgstr ""
 msgid "Whether to thumbnail Type1 fonts"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
+#: vfs-methods/fontilus/font-view.c:285
 #, fuzzy
-msgid "Fontilus context menu"
-msgstr "Menu do cinte di contrôle"
+msgid "Name:"
+msgstr "_No:"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
+#: vfs-methods/fontilus/font-view.c:297
+#, fuzzy
+msgid "Type:"
+msgstr "Sôre"
+
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
 msgstr ""
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-#, fuzzy
-msgid "Set as Application Font"
-msgstr "Fonte po les _programes:"
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
 msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
+#: vfs-methods/fontilus/font-view.c:356
+#, fuzzy
+msgid "Description:"
+msgstr "_Discrijhaedje:"
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
 msgstr ""
 
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "Cinte di Contrôle di GNOME"
+
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
 msgstr ""
@@ -3384,30 +3376,21 @@ msgstr "Fonte po les _programes:"
 msgid "Themes"
 msgstr "Tinme"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 #, fuzzy
 msgid "Control theme"
 msgstr "Tinme do cursoe"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 #, fuzzy
 msgid "Window border theme"
 msgstr "Boird do purnea"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 #, fuzzy
 msgid "Icon theme"
 msgstr "Tinme do cursoe"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr ""
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr ""
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr ""
@@ -3441,6 +3424,104 @@ msgstr ""
 msgid "Whether to thumbnail themes"
 msgstr ""
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr ""
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "_Astaler novea tinme..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+msgid "Sets the default theme"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Gnome Terminal"
+#~ msgstr "Terminå"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "Aspougneu di tecse da _vosse"
+
+#, fuzzy
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "Foyteuse di l' aidance da _vosse"
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "Terminå da _vosse"
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "Betchteu waibe da _vosse"
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "Enonder dins on t_erminå"
+
+#, fuzzy
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "_Tchoezi ene foyteuse po l' aidance:"
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "_Tchoezi on terminå:"
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "_Tchoezi on betchteu waibe:"
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "_Tchoezi on aspougneu di tecse:"
+
+#~ msgid "Advanced"
+#~ msgstr "Sipepieus"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Sipepieus apontiaedjes"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "Apontiaedje do proxy pol rantoele"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "Cinte di contrôle di GNOME: %s"
+
+#~ msgid "Layout"
+#~ msgstr "Adjinçmint"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "Pablo Saratxaga <pablo@mandrakesoft.com>\n"
+#~ "Lorint Hendschel <LorintHendschel@skynet.be>\n"
+#~ "Lucyin Mahin <lucyin@walon.org>"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "Manaedjeu des prôpietés do scribanne."
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "Cinte di Contrôle di GNOME: %s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "Cinte di Contrôle di GNOME: %s"
+
+#~ msgid "About this application"
+#~ msgstr "Å dfait di ç' programe chal"
+
+#~ msgid "_About"
+#~ msgstr "Å _dfait"
+
+#~ msgid "_Contents"
+#~ msgstr "Å d_vins"
+
+#~ msgid "_Help"
+#~ msgstr "_Aidance"
+
+#, fuzzy
+#~ msgid "XKB options"
+#~ msgstr "Accions"
+
+#, fuzzy
+#~ msgid "Fontilus context menu"
+#~ msgstr "Menu do cinte di contrôle"
+
 #~ msgid "De_tails..."
 #~ msgstr "De_tays..."
 
@@ -3582,10 +3663,6 @@ msgstr ""
 #~ msgstr "_Tapisreye"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "Preferinces del taprece"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "Sipepieus apontiaedjes"
 
@@ -3618,18 +3695,10 @@ msgstr ""
 #~ msgstr "Tinme do cursoe"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "Preferinces pol menu eyet l' bår ås usteyes"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "_Discrijhaedje:"
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "Defini vos preferinces pol sori"
-
-#, fuzzy
 #~ msgid "_Ignore system configuration"
 #~ msgstr "Apontiaedje do proxy pol rantoele"
 
@@ -3698,13 +3767,6 @@ msgstr ""
 #~ msgid "Quit"
 #~ msgstr "Moussî _foû"
 
-#, fuzzy
-#~ msgid "Apply theme..."
-#~ msgstr "_Astaler novea tinme..."
-
-#~ msgid "C_ustom:"
-#~ msgstr "A _vosse môde:"
-
 #~ msgid "Repeat Keys"
 #~ msgstr "Ripeter les tapes"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6688e5d53..1706e5e84 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-11 12:18+0100\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-11 20:32+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -411,11 +411,11 @@ msgstr "添加壁纸"
 msgid "No Wallpaper"
 msgstr "无壁纸"
 
-#: capplets/background/gnome-wp-item.c:286
 #: capplets/background/gnome-wp-item.c:287
-#, c-format
-msgid "%d pixel"
-msgid_plural "%d pixels"
+#: capplets/background/gnome-wp-item.c:289
+#, fuzzy
+msgid "pixel"
+msgid_plural "pixels"
 msgstr[0] "%d 像素"
 
 #: capplets/common/activate-settings-daemon.c:18
@@ -1876,7 +1876,8 @@ msgid "Network Proxy"
 msgstr "网络代理"
 
 #: capplets/network/gnome-network-preferences.desktop.in.in.h:2
-msgid "Network proxy preferences"
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "网络代理首选项"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2033,7 +2034,9 @@ msgstr "所指定要安装的主题文件的位置无效"
 msgid ""
 "Insufficient permissions to install the theme in:\n"
 "%s"
-msgstr "没有足够的权限将主题安装到：\n%s"
+msgstr ""
+"没有足够的权限将主题安装到：\n"
+"%s"
 
 #: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
@@ -2360,7 +2363,8 @@ msgid "_Select windows when the mouse moves over them"
 msgstr "鼠标移动到窗口之上时选中该窗口(_S)"
 
 #: capplets/windows/window-properties.desktop.in.in.h:1
-msgid "Window Properties"
+#, fuzzy
+msgid "Set your window properties"
 msgstr "窗口属性"
 
 #: capplets/windows/window-properties.desktop.in.in.h:2
@@ -2973,26 +2977,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "gconf 中的 XKB 设置将会被立即覆盖(来自系统配置)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB 键盘布局"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB 键盘型号"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB 选项"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "键盘型号(_M)："
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB 键盘布局"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "键盘型号(_M)："
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "键盘快捷键"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "gconf 中的 XKB 设置将会被系统立即覆盖"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "gconf 中的 XKB 设置将会被立即覆盖(来自系统配置)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB 键盘布局"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB 键盘型号"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "推迟间隔(_P)"
@@ -3264,3 +3316,5 @@ msgstr "应用主题"
 msgid "Sets the default theme"
 msgstr "设定默认主题"
 
+#~ msgid "XKB options"
+#~ msgstr "XKB 选项"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2108eef10..5bb8ba739 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 14:59-0400\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-03-20 12:39+0800\n"
 "Last-Translator: Woodman Tuen <woodnman@culturecom.com.hk>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -65,11 +65,11 @@ msgstr "畫面鍵盤(_O)"
 msgid "_Screenreader"
 msgstr "螢幕閱讀器(_S)"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:1
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:1
 msgid "Assistive Technology Support"
 msgstr "輔助技術支援"
 
-#: capplets/accessibility/at-properties/at-properties.desktop.in.h:2
+#: capplets/accessibility/at-properties/at-properties.desktop.in.in.h:2
 msgid "Enable support for GNOME assistive technologies at login"
 msgstr "登入時啟用 GNOME 輔助技術支援"
 
@@ -118,13 +118,13 @@ msgstr "匯入無障礙環境組態"
 msgid "_Import"
 msgstr "匯入(_I)"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-#: capplets/keyboard/keyboard.desktop.in.h:1
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "鍵盤"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
+#: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in.h:2
 msgid "Set your keyboard accessibility preferences"
 msgstr "修改無障礙鍵盤功能設定"
 
@@ -330,11 +330,11 @@ msgstr "像素(每秒)"
 msgid "seconds"
 msgstr "秒"
 
-#: capplets/background/background.desktop.in.h:1
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Change your Desktop Background settings"
 msgstr "更改您的桌面背景設定"
 
-#: capplets/background/background.desktop.in.h:2
+#: capplets/background/background.desktop.in.in.h:2
 msgid "Desktop Background"
 msgstr "桌面背景圖案"
 
@@ -414,6 +414,13 @@ msgstr "加入桌布"
 msgid "No Wallpaper"
 msgstr "沒有桌布"
 
+#: capplets/background/gnome-wp-item.c:287
+#: capplets/background/gnome-wp-item.c:289
+msgid "pixel"
+msgid_plural "pixels"
+msgstr[0] ""
+msgstr[1] ""
+
 #: capplets/common/activate-settings-daemon.c:18
 msgid ""
 "Unable to start the settings manager 'gnome-settings-daemon'.\n"
@@ -614,105 +621,15 @@ msgstr "請選取圖像。"
 msgid "_Select"
 msgstr "選取(_S)"
 
-#: capplets/default-applications/default-applications.desktop.in.h:1
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:18
 msgid "Preferred Applications"
 msgstr "首選應用程式"
 
-#: capplets/default-applications/default-applications.desktop.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:2
 msgid "Select your default applications"
 msgstr "選取預設使用的應用程式"
 
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
-msgid "Galeon"
-msgstr "Galeon"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
-msgid "Encompass"
-msgstr "Encompass"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
-msgid "Firebird/FireFox"
-msgstr "Firebird/FireFox"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
-msgid "Mozilla/Netscape 6"
-msgstr "Mozilla/Netscape 6"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
-msgid "Netscape Communicator"
-msgstr "Netscape Communicator"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
-msgid "W3M Text Browser"
-msgstr "W3M 文字模式網頁瀏覽器"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
-msgid "Lynx Text Browser"
-msgstr "Lynx 文字模式網頁瀏覽器"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
-msgid "Links Text Browser"
-msgstr "Links 文字模式網頁瀏覽器"
-
-#. The code in gnome-default-applications-properties.c makes sure
-#. * there is only one (the first entry in this list) Evolution entry
-#. * in the list shown to the user
-#.
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
-msgid "Evolution Mail Reader"
-msgstr "Evolution 郵件處理程式"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
-msgid "Balsa"
-msgstr "Balsa"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
-msgid "KMail"
-msgstr "KMail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
-msgid "Mozilla Mail"
-msgstr "Mozilla Mail"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
-msgid "Mutt"
-msgstr "Mutt"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:54
-msgid "Gnome Terminal"
-msgstr "GNOME 終端機"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
-msgid "Standard XTerminal"
-msgstr "標準的 X 終端機"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
-msgid "NXterm"
-msgstr "NXterm"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
-msgid "RXVT"
-msgstr "RXVT"
-
-#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
-msgid "ETerm"
-msgstr "ETerm"
-
 #: capplets/default-applications/gnome-default-applications-properties.c:123
 msgid "Please specify a name and a command for this editor."
 msgstr "請指定該編輯器的名稱及執行時的指令。"
@@ -722,20 +639,23 @@ msgid "Add..."
 msgstr "新增..."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:3
-msgid "C_ustom Editor"
-msgstr "自選編輯器(_U)"
+#, fuzzy
+msgid "C_ustom"
+msgstr "自選(_U)："
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:4
-msgid "C_ustom Mail Reader:"
-msgstr "自選電子郵件處理程式(_U)："
+msgid "C_ustom:"
+msgstr "自選(_U)："
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:5
-msgid "C_ustom Terminal:"
-msgstr "自選終端機(_U)："
+#, fuzzy
+msgid "Can open _URIs"
+msgstr "可由 URI 開啟"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:6
-msgid "C_ustom Web Browser:"
-msgstr "自選網頁瀏覽器(_U)："
+#, fuzzy
+msgid "Can open multiple _files"
+msgstr "本程式可同時開啟多個檔案(_M)"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:7
 msgid "Co_mmand:"
@@ -782,98 +702,184 @@ msgid "Mail Reader"
 msgstr "電子郵件處理程式"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
+#, fuzzy
+msgid "Run in a _terminal"
+msgstr "在終端機中執行(_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
+#, fuzzy
+msgid "Run in a t_erminal"
+msgstr "在終端機中執行(_T)"
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid ""
 "Select the window manager you want.  You will need to hit apply, wave the "
 "magic wand, and do a magic dance for it to work."
 msgstr ""
 "請選取希望使用的視窗總管。然後按「套用」，稍等一下，希望途中不會出現問題。"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-msgid "Start in T_erminal"
-msgstr "在終端機中執行(_E)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:21
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
 msgid "Terminal"
 msgstr "終端機"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:22
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
 msgid "Text Editor"
 msgstr "文字編輯器"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:23
-msgid "This application can open _URIs"
-msgstr "本程式可開啟 _URI"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:24
-msgid "This application can open _multiple files"
-msgstr "本程式可同時開啟多個檔案(_M)"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
-msgid "This application needs to be run in a _shell"
-msgstr "本程式需要指令解譯器 (_shell) 方可運行"
-
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Understands _Netscape Remote Control"
 msgstr "支援 _Netscape/Mozilla 的遠端控制"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:25
 msgid "Use this _editor to open text files in the file manager"
 msgstr "使用該編輯器開啟檔案總管中的文字檔(_E)"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:26
 msgid "Web Browser"
 msgstr "網頁瀏覽器"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:27
 msgid "Window Manager"
 msgstr "視窗總管"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:28
+#, fuzzy
+msgid "_Command:"
+msgstr "指令："
+
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:29
 #: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Name:"
 msgstr "名稱(_N)："
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:30
 msgid "_Properties..."
 msgstr "屬性(_P)..."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:32
-msgid "_Select a Mail Reader:"
-msgstr "請選取電子郵件處理程式(_S)："
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:31
+#, fuzzy
+msgid "_Select:"
+msgstr "選取(_S)"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:9
+#, fuzzy
+msgid "Debian Sensible Browser"
+msgstr "預設的網頁瀏覽器"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:10
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:11
+msgid "Galeon"
+msgstr "Galeon"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:12
+msgid "Encompass"
+msgstr "Encompass"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:13
+#, fuzzy
+msgid "Firebird"
+msgstr "Firebird/FireFox"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:14
+msgid "Firefox"
+msgstr ""
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:15
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:16
+#, fuzzy
+msgid "Mozilla"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:17
+msgid "Netscape Communicator"
+msgstr "Netscape Communicator"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:18
+msgid "Konqueror"
+msgstr "Konqueror"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:33
-msgid "_Select a Terminal:"
-msgstr "請選取終端機(_S)："
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:19
+msgid "W3M Text Browser"
+msgstr "W3M 文字模式網頁瀏覽器"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:34
-msgid "_Select a Web Browser:"
-msgstr "請選取網頁瀏覽器(_S)："
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:20
+msgid "Lynx Text Browser"
+msgstr "Lynx 文字模式網頁瀏覽器"
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:35
-msgid "_Select an Editor:"
-msgstr "請選取編輯器(_S)："
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:21
+msgid "Links Text Browser"
+msgstr "Links 文字模式網頁瀏覽器"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "無障礙環境"
+#. The code in gnome-default-applications-properties.c makes sure
+#. * there is only one (the first entry in this list) Evolution entry
+#. * in the list shown to the user
+#.
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:36
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:37
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:38
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:39
+msgid "Evolution Mail Reader"
+msgstr "Evolution 郵件處理程式"
 
-#: capplets/desktop-links/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "無障礙環境設定"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:40
+msgid "Balsa"
+msgstr "Balsa"
 
-#: capplets/desktop-links/Advanced.directory.in.h:1
-msgid "Advanced"
-msgstr "進階"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:41
+msgid "KMail"
+msgstr "KMail"
 
-#: capplets/desktop-links/Advanced.directory.in.h:2
-msgid "Advanced Settings"
-msgstr "進階設定"
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:42
+msgid "Thunderbird"
+msgstr ""
 
-#: capplets/display/display-properties.desktop.in.h:1
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:43
+msgid "Mozilla Mail"
+msgstr "Mozilla Mail"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:44
+msgid "Mutt"
+msgstr "Mutt"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:55
+#, fuzzy
+msgid "Debian Terminal Emulator"
+msgstr "預設的終端機"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:56
+#, fuzzy
+msgid "GNOME Terminal"
+msgstr "終端機"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:57
+msgid "Standard XTerminal"
+msgstr "標準的 X 終端機"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:58
+msgid "NXterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:59
+msgid "RXVT"
+msgstr "RXVT"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:60
+#, fuzzy
+msgid "aterm"
+msgstr "NXterm"
+
+#: capplets/default-applications/gnome-default-applications-properties-structs.c:61
+msgid "ETerm"
+msgstr "ETerm"
+
+#: capplets/display/display-properties.desktop.in.in.h:1
 msgid "Change screen resolution"
 msgstr "更改螢幕解析度"
 
-#: capplets/display/display-properties.desktop.in.h:2
+#: capplets/display/display-properties.desktop.in.in.h:2
 msgid "Screen Resolution"
 msgstr "螢幕解析度"
 
@@ -957,7 +963,7 @@ msgid "Are you sure you want to permanently delete this entry?"
 msgstr "您確定要永久地刪除這項記錄嗎？"
 
 #: capplets/file-types/file-types-capplet.c:210
-#: vfs-methods/themus/themus-properties-view.c:167
+#: vfs-methods/themus/themus-properties-view.c:126
 msgid "Description"
 msgstr "說明"
 
@@ -965,15 +971,23 @@ msgstr "說明"
 msgid "Extensions"
 msgstr "延伸檔名"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:1
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:1
 #: capplets/file-types/file-types-properties.glade.h:11
 msgid "File Types and Programs"
 msgstr "檔案類型及程式"
 
-#: capplets/file-types/file-types-capplet.desktop.in.h:2
+#: capplets/file-types/file-types-capplet.desktop.in.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "指定開啟或觀看每種檔案類型所用的程式"
 
+#: capplets/file-types/file-types.desktop.in.in.h:1
+msgid "File types and programs"
+msgstr "檔案類型及程式"
+
+#: capplets/file-types/file-types.desktop.in.in.h:2
+msgid "Specify which programs are used to open or view each type of file"
+msgstr "指定開啟或觀看每種檔案類型所用的程式"
+
 #: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "處理方式"
@@ -1064,6 +1078,7 @@ msgid "_Protocol:"
 msgstr "協定(_P)："
 
 #: capplets/file-types/file-types-properties.glade.h:26
+#: libsounds/sound-view.c:366
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -1071,14 +1086,6 @@ msgstr "移除(_R)"
 msgid "_Viewer component:"
 msgstr "瀏覽方式(_V)："
 
-#: capplets/file-types/file-types.desktop.in.h:1
-msgid "File types and programs"
-msgstr "檔案類型及程式"
-
-#: capplets/file-types/file-types.desktop.in.h:2
-msgid "Specify which programs are used to open or view each type of file"
-msgstr "指定開啟或觀看每種檔案類型所用的程式"
-
 #: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "修改檔案類別"
@@ -1257,14 +1264,15 @@ msgid "Electronic mail transmission"
 msgstr "電子郵件傳送"
 
 #: capplets/file-types/service-info.c:50
-msgid "Gnome documentation"
+#, fuzzy
+msgid "GNOME documentation"
 msgstr "GNOME 說明文件"
 
-#: capplets/font/font-properties.desktop.in.h:1
+#: capplets/font/font-properties.desktop.in.in.h:1
 msgid "Font"
 msgstr "字型"
 
-#: capplets/font/font-properties.desktop.in.h:2
+#: capplets/font/font-properties.desktop.in.in.h:2
 msgid "Select fonts for the desktop"
 msgstr "指定桌面所使用的字型"
 
@@ -1463,29 +1471,29 @@ msgid "The type of accelerator."
 msgstr "捷徑鍵的類型。"
 
 #: capplets/keybindings/eggcellrendererkeys.c:242
-#: capplets/keybindings/gnome-keybinding-properties.c:196
+#: capplets/keybindings/gnome-keybinding-properties.c:197
 #: libbackground/applier.c:757 typing-break/drwright.c:473
 msgid "Disabled"
 msgstr "暫停使用"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:538
+#: capplets/keybindings/gnome-keybinding-properties.c:539
 msgid "<Unknown Action>"
 msgstr "<行動設定不詳>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:557
+#: capplets/keybindings/gnome-keybinding-properties.c:558
 msgid "Desktop"
 msgstr "桌面"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:558
-#: capplets/sound/gnome-settings-sound.desktop.in.h:2
+#: capplets/keybindings/gnome-keybinding-properties.c:559
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:2
 msgid "Sound"
 msgstr "音效"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:562
+#: capplets/keybindings/gnome-keybinding-properties.c:563
 msgid "Window Management"
 msgstr "視窗管理"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:659
+#: capplets/keybindings/gnome-keybinding-properties.c:660
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for:\n"
@@ -1494,26 +1502,26 @@ msgstr ""
 "捷徑鍵“%s”己經使用於：\n"
 "“%s”\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:691
+#: capplets/keybindings/gnome-keybinding-properties.c:692
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "在組態資料庫中設定新的捷徑鍵時出現錯誤：%s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:742
 #, c-format
 msgid "Error unsetting accelerator in configuration database: %s\n"
 msgstr "在組態資料庫中取消設定捷徑鍵時出現錯誤：%s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:830
+#: capplets/keybindings/gnome-keybinding-properties.c:831
 msgid "Action"
 msgstr "行動"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:854
+#: capplets/keybindings/gnome-keybinding-properties.c:855
 msgid "Shortcut"
 msgstr "捷徑鍵"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:1
-#: capplets/keybindings/keybinding.desktop.in.h:2
+#: capplets/keybindings/keybinding.desktop.in.in.h:2
 msgid "Keyboard Shortcuts"
 msgstr "捷徑鍵"
 
@@ -1524,26 +1532,10 @@ msgid ""
 "accelerator, or press backspace to clear."
 msgstr "請輸入新的捷徑鍵，或是按後退鍵清除原有的按鍵"
 
-#: capplets/keybindings/keybinding.desktop.in.h:1
+#: capplets/keybindings/keybinding.desktop.in.in.h:1
 msgid "Assign shortcut keys to commands"
 msgstr "為不同的指令分配捷徑鍵"
 
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
-#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
-#, fuzzy
-msgid "Unknown"
-msgstr "不明的鼠標"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
-#, fuzzy
-msgid "Models"
-msgstr "模式"
-
-#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:59
-#, fuzzy
-msgid "Keyboard layout preview"
-msgstr "XKB 鍵盤配置"
-
 #: capplets/keyboard/gnome-keyboard-properties.c:106
 #, c-format
 msgid "There was an error launching the keyboard capplet : %s"
@@ -1711,10 +1703,36 @@ msgstr "工作時間為(_W)："
 msgid "minutes"
 msgstr "分鐘"
 
-#: capplets/keyboard/keyboard.desktop.in.h:2
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:69
+#: capplets/keyboard/gnome-keyboard-properties-xkb.c:95
+#, fuzzy
+msgid "Unknown"
+msgstr "不明的鼠標"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbmc.c:80
+#, fuzzy
+msgid "Models"
+msgstr "模式"
+
+#: capplets/keyboard/gnome-keyboard-properties-xkbpv.c:66
+#, fuzzy
+msgid "Keyboard layout preview"
+msgstr "XKB 鍵盤配置"
+
+#: capplets/keyboard/keyboard.desktop.in.in.h:2
 msgid "Set your keyboard preferences"
 msgstr "修改鍵盤偏好設定"
 
+#: capplets/localization/localization.desktop.in.in.h:1
+#, fuzzy
+msgid "Language and Culture"
+msgstr "選單及工具列偏好設定"
+
+#: capplets/localization/localization.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your language and culture preferences"
+msgstr "修改滑鼠偏好設定"
+
 #: capplets/mouse/gnome-mouse-properties.c:496
 msgid "Unknown Cursor"
 msgstr "不明的鼠標"
@@ -1878,20 +1896,21 @@ msgstr "分辨距離(_T)："
 msgid "_Timeout:"
 msgstr "時限(_T)："
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:1
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:1
 msgid "Mouse"
 msgstr "滑鼠"
 
-#: capplets/mouse/gnome-settings-mouse.desktop.in.h:2
+#: capplets/mouse/gnome-settings-mouse.desktop.in.in.h:2
 msgid "Set your mouse preferences"
 msgstr "修改滑鼠偏好設定"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:1
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:1
 msgid "Network Proxy"
 msgstr "網路代理伺服器"
 
-#: capplets/network/gnome-network-preferences.desktop.in.h:2
-msgid "Network proxy preferences"
+#: capplets/network/gnome-network-preferences.desktop.in.in.h:2
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "網路代理伺服器偏好設定"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -1937,7 +1956,8 @@ msgid "H_TTP proxy:"
 msgstr "H_TTP 代理伺服器："
 
 #: capplets/network/gnome-network-preferences.glade.h:12
-msgid "Network Proxy Configuration"
+#, fuzzy
+msgid "Network Proxy Preferences"
 msgstr "網路代理伺服器偏好設定"
 
 #: capplets/network/gnome-network-preferences.glade.h:13
@@ -1979,7 +1999,7 @@ msgstr "密碼(_P)："
 msgid "_Secure HTTP proxy:"
 msgstr "安全 HTTP 代理伺服器(_S)："
 
-#: capplets/sound/gnome-settings-sound.desktop.in.h:1
+#: capplets/sound/gnome-settings-sound.desktop.in.in.h:1
 msgid "Enable sound and associate sounds with events"
 msgstr "啟用音效並將音效及不同的事件建立聯繫"
 
@@ -2036,15 +2056,26 @@ msgstr ""
 "系統中找不到任何佈景主題。這可能表示「佈景主題偏好設定」並未完全安裝好，或是"
 "您並未安裝“gnome-themes”套件。"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:127
+#: capplets/theme-switcher/gnome-theme-installer.c:104
+msgid "This theme is not in a supported format."
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:140
 msgid "No theme file location specified to install"
 msgstr "沒有指定安裝佈景主題檔案的位置"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:146
+#: capplets/theme-switcher/gnome-theme-installer.c:157
 msgid "The theme file location specified to install is invalid"
 msgstr "所指定的佈景主題安裝路徑無效"
 
-#: capplets/theme-switcher/gnome-theme-installer.c:173
+#: capplets/theme-switcher/gnome-theme-installer.c:177
+#, c-format
+msgid ""
+"Insufficient permissions to install the theme in:\n"
+"%s"
+msgstr ""
+
+#: capplets/theme-switcher/gnome-theme-installer.c:196
 #, c-format
 msgid ""
 "%s is the path where the theme files will be installed. This can not be "
@@ -2076,12 +2107,12 @@ msgstr "必須指定佈景主題名稱"
 msgid "The theme already exists. Would you like to replace it?"
 msgstr ""
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:1
 msgid "Select themes for various parts of the desktop"
 msgstr "選取佈景主題，供桌面不同的部份使用"
 
-#: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:1
+#: capplets/theme-switcher/gtk-theme-selector.desktop.in.in.h:2
+#: vfs-methods/themus/themus-properties-main.c:92
 msgid "Theme"
 msgstr "佈景主題"
 
@@ -2194,11 +2225,11 @@ msgstr "儲存佈景名稱(_T)："
 msgid "theme selection tree"
 msgstr "佈景主題選擇樹"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:1
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:1
 msgid "Customize the appearance of toolbars and menubars in applications"
 msgstr "自行指定應用程式中工具列及選單列的外觀"
 
-#: capplets/ui-properties/gnome-ui-properties.desktop.in.h:2
+#: capplets/ui-properties/gnome-ui-properties.desktop.in.in.h:2
 msgid "Menus & Toolbars"
 msgstr "選單及工具列"
 
@@ -2267,7 +2298,6 @@ msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-#: control-center/gnomecc-ui.xml.h:5
 msgid "_File"
 msgstr "檔案(_F)"
 
@@ -2295,6 +2325,14 @@ msgstr "離開(_Q)"
 msgid "_Save"
 msgstr "儲存(_S)"
 
+#: capplets/url-properties/url-properties.desktop.in.in.h:1
+msgid "Configure which programs are used to display URLs"
+msgstr "設定顯示 URL 所用的程式"
+
+#: capplets/url-properties/url-properties.desktop.in.in.h:2
+msgid "URL Handlers"
+msgstr ""
+
 #: capplets/windows/gnome-window-properties.c:388
 #, c-format
 msgid ""
@@ -2306,23 +2344,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: capplets/windows/gnome-window-properties.c:637
+#: capplets/windows/gnome-window-properties.c:648
 msgid "Control"
 msgstr "Control"
 
-#: capplets/windows/gnome-window-properties.c:642
+#: capplets/windows/gnome-window-properties.c:653
 msgid "Alt"
 msgstr "Alt"
 
-#: capplets/windows/gnome-window-properties.c:648
+#: capplets/windows/gnome-window-properties.c:659
 msgid "Hyper"
 msgstr "Hyper"
 
-#: capplets/windows/gnome-window-properties.c:655
+#: capplets/windows/gnome-window-properties.c:666
 msgid "Super (or \"Windows logo\")"
 msgstr "Super (或者「視窗標誌」)"
 
-#: capplets/windows/gnome-window-properties.c:662
+#: capplets/windows/gnome-window-properties.c:673
 msgid "Meta"
 msgstr "總體"
 
@@ -2365,14 +2403,35 @@ msgstr "相隔某段時間後將已選取的視窗提升至最表面來顯示(_R
 msgid "_Select windows when the mouse moves over them"
 msgstr "當滑鼠移動至視窗時選取該視窗(_S)"
 
-#: capplets/windows/window-properties.desktop.in.h:1
-msgid "Window Properties"
-msgstr "視窗屬性"
+#: capplets/windows/window-properties.desktop.in.in.h:1
+#, fuzzy
+msgid "Set your window properties"
+msgstr "設定視窗屬性"
 
-#: capplets/windows/window-properties.desktop.in.h:2
+#: capplets/windows/window-properties.desktop.in.in.h:2
 msgid "Windows"
 msgstr "視窗"
 
+#: control-center/control-center.c:1005
+#: control-center/gnomecc.desktop.in.in.h:1
+msgid "GNOME Control Center"
+msgstr "GNOME 控制中心"
+
+#: control-center/control-center.c:1121
+#, fuzzy
+msgid "Desktop Preferences"
+msgstr "鍵盤偏好設定"
+
+#: control-center/control-center-categories.c:248
+#, fuzzy
+msgid "Others"
+msgstr "過濾按鍵"
+
+#: control-center/gnomecc.desktop.in.in.h:2
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:2
+msgid "The GNOME configuration tool"
+msgstr "GNOME 設定工具"
+
 #: control-center/GNOME_ControlCenter.server.in.h:1
 #, fuzzy
 msgid "Control Center"
@@ -2407,94 +2466,6 @@ msgstr "控制中心選單"
 msgid "View as Control Center"
 msgstr "GNOME 控制中心：%s"
 
-#: control-center/capplet-dir-view-list.c:319
-#, c-format
-msgid "GNOME Control Center: %s"
-msgstr "GNOME 控制中心：%s"
-
-#: control-center/capplet-dir-view.c:158
-msgid "Layout"
-msgstr "配置"
-
-#: control-center/capplet-dir-view.c:159
-msgid "Layout to use for this view of the capplets"
-msgstr "這個 capplet 顯示模式使用的配置方式"
-
-#: control-center/capplet-dir-view.c:165
-msgid "Capplet directory object"
-msgstr "Capplet 目錄物件"
-
-#: control-center/capplet-dir-view.c:166
-msgid "Capplet directory that this view is viewing"
-msgstr "這個顯示模式正在顯示的 capplet 目錄"
-
-#: control-center/capplet-dir-view.c:348
-msgid "translator_credits"
-msgstr ""
-"i18n 程式中文化計劃\n"
-"http://i18n.linux.org.tw/\n"
-"\n"
-"Woodman Tuen <woodman@culturecom.com.hk>, 2004\n"
-"Abel Cheung <maddog@linux.org.hk>, 2001-2003\n"
-"S.J. Luo <crystal@mickey.ee.nctu.edu.tw>, 1999"
-
-#: control-center/capplet-dir-view.c:357 control-center/gnomecc.desktop.in.h:1
-msgid "GNOME Control Center"
-msgstr "GNOME 控制中心"
-
-#: control-center/capplet-dir-view.c:360
-msgid "Desktop properties manager."
-msgstr "桌面屬性總管。"
-
-#: control-center/capplet-dir-view.c:498
-#, c-format
-msgid "Gnome Control Center : %s"
-msgstr "GNOME 控制中心：%s"
-
-#: control-center/control-center-categories.c:333
-#, fuzzy
-msgid "Others"
-msgstr "過濾按鍵"
-
-#: control-center/control-center-categories.c:424
-#: control-center/control-center.c:1091
-#, fuzzy
-msgid "Gnome Control Center"
-msgstr "GNOME 控制中心：%s"
-
-#: control-center/control-center.c:78
-#, fuzzy
-msgid "Use nautilus if it is running."
-msgstr "即使 nautilus 正在運行仍然使用舊式介面。"
-
-#: control-center/gnomecc-ui.xml.h:1
-msgid "About this application"
-msgstr "關於本應用程式"
-
-#: control-center/gnomecc-ui.xml.h:2
-msgid "Overview of the control center"
-msgstr "控制中心總覽"
-
-#: control-center/gnomecc-ui.xml.h:3
-msgid "_About"
-msgstr "關於(_A)"
-
-#: control-center/gnomecc-ui.xml.h:4
-msgid "_Contents"
-msgstr "內容(_C)"
-
-#: control-center/gnomecc-ui.xml.h:6
-msgid "_Help"
-msgstr "求助(_H)"
-
-#: control-center/gnomecc.desktop.in.h:2
-msgid "The GNOME configuration tool"
-msgstr "GNOME 設定工具"
-
-#: control-center/main.c:43
-msgid "Use shell even if nautilus is running."
-msgstr "即使 nautilus 正在運行仍然使用舊式介面。"
-
 #: gnome-settings-daemon/actions/acme.glade.h:1
 msgid "Volume"
 msgstr "音量"
@@ -2600,7 +2571,7 @@ msgstr ""
 "執行 (%s) 時發生錯誤；\n"
 "有關的按鍵組合是 (%s)"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:73
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:91
 #, c-format
 msgid ""
 "Error activating XKB configuration.\n"
@@ -2625,7 +2596,7 @@ msgstr ""
 "-·<b>xprop·-root·|·grep·XKB</b> 的結果\n"
 "-·<b>gconftool-2·-R·/desktop/gnome/peripherals/keyboard/xkb</b> 的結果"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:83
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:101
 msgid ""
 "You are using XFree 4.3.0.\n"
 "There are known problems with complex XKB configurations.\n"
@@ -2636,22 +2607,22 @@ msgstr ""
 "已知在 XFree 4.3.0 使用複雜的 XKB 設定時會發生問題。\n"
 "嘗試用較簡單的設定，或是取得新版的 XFree 軟體。"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:172
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:190
 msgid ""
 "The X system keyboard settings differ from your current GNOME keyboard "
 "settings.  Which set would you like to use?"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:175
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:193
 #, fuzzy
 msgid "Use X settings"
 msgstr "第 %d 個畫面的設定\n"
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:177
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:195
 msgid "Use GNOME settings"
 msgstr ""
 
-#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:231
+#: gnome-settings-daemon/gnome-settings-keyboard-xkb.c:249
 #, fuzzy, c-format
 msgid ""
 "You have a keyboard remapping file (%s) in your home directory whose "
@@ -2713,8 +2684,8 @@ msgstr "不再顯示此訊息(_D)"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "無法載入音效檔 %s 作為音效樣本 %s"
 
-#: gnome-settings-daemon/gnome-settings-xrdb.c:212
-#: gnome-settings-daemon/gnome-settings-xrdb.c:260
+#: gnome-settings-daemon/gnome-settings-xrdb.c:213
+#: gnome-settings-daemon/gnome-settings-xrdb.c:261
 msgid "Cannot determine user's home directory"
 msgstr "無法決定用戶的個人目錄所在"
 
@@ -2763,11 +2734,11 @@ msgstr "畫面"
 msgid "Screen on which BGApplier is to draw"
 msgstr "BGApplier 準備繪畫的畫面"
 
-#: libsounds/sound-view.c:121 libsounds/sound-view.c:146
+#: libsounds/sound-view.c:122 libsounds/sound-view.c:147
 msgid "The sound file for this event does not exist."
 msgstr "代表該事件的音效檔不存在。"
 
-#: libsounds/sound-view.c:148
+#: libsounds/sound-view.c:149
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
@@ -2777,32 +2748,32 @@ msgstr ""
 "安裝 gnome-audio 套件可\n"
 "獲得一套預設的音效。"
 
-#: libsounds/sound-view.c:192
+#: libsounds/sound-view.c:224
 #, c-format
 msgid "The file %s is not a valid wav file"
 msgstr "檔案 %s 不是有效的 wav 檔案"
 
-#: libsounds/sound-view.c:257
+#: libsounds/sound-view.c:289
 msgid "Event"
 msgstr "事件"
 
-#: libsounds/sound-view.c:266
+#: libsounds/sound-view.c:298
 msgid "Sound File"
 msgstr "音效檔"
 
-#: libsounds/sound-view.c:282
+#: libsounds/sound-view.c:314
 msgid "_Sounds:"
 msgstr "音效(_S)"
 
-#: libsounds/sound-view.c:296
+#: libsounds/sound-view.c:328
 msgid "Sound _file:"
 msgstr "音效檔(_F)："
 
-#: libsounds/sound-view.c:300
+#: libsounds/sound-view.c:332
 msgid "Select Sound File"
 msgstr "選取音效檔"
 
-#: libsounds/sound-view.c:324
+#: libsounds/sound-view.c:356
 msgid "_Play"
 msgstr "播放(_P)"
 
@@ -3075,26 +3046,74 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
-msgstr "XKB 設定將會立即被取締（由系統設定所取締）"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "XKB 鍵盤配置"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "XKB 鍵盤模式"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "XKB 選項"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "啟用鍵盤聲響(_E)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "XKB 鍵盤配置"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "鍵盤模式(_M)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "鍵盤屬性"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr "在 gconf 中的 XKB 設定，將會立即被系統取締"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr "XKB 設定將會立即被取締（由系統設定所取締）"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "XKB 鍵盤配置"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "XKB 鍵盤模式"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "放棄休息(_P)"
@@ -3167,46 +3186,14 @@ msgstr ""
 "休息提示小程式需要透過程式狀態通知區來顯示資訊，可是面板中並沒有該區域。您可"
 "以在面板上按滑鼠右邊按鈕，然後選取「加入至面板→公用程式→程式狀態通知區」。"
 
-#: vfs-methods/fontilus/font-view.c:102
-msgid "The quick brown fox jumps over the lazy dog. 0123456789"
-msgstr "0123456789 The following is Chinese: '中文測試'"
-
-#: vfs-methods/fontilus/font-view.c:253
-msgid "Name:"
-msgstr "名稱："
-
-#: vfs-methods/fontilus/font-view.c:256
-msgid "Style:"
-msgstr "字款："
-
-#: vfs-methods/fontilus/font-view.c:265
-msgid "Type:"
-msgstr "類型："
-
-#: vfs-methods/fontilus/font-view.c:272
-msgid "Size:"
-msgstr "大小："
-
-#: vfs-methods/fontilus/font-view.c:316 vfs-methods/fontilus/font-view.c:329
-msgid "Version:"
-msgstr "版本："
-
-#: vfs-methods/fontilus/font-view.c:320 vfs-methods/fontilus/font-view.c:331
-msgid "Copyright:"
-msgstr "版權："
-
-#: vfs-methods/fontilus/font-view.c:324
-msgid "Description:"
-msgstr "說明："
-
-#: vfs-methods/fontilus/font-view.c:394
-#, c-format
-msgid "usage: %s fontfile\n"
-msgstr ""
+#: vfs-methods/fontilus/fontilus-context-menu.c:132
+msgid "Set as Application Font"
+msgstr "指定為應用程式字型"
 
-#: vfs-methods/fontilus/fontilus-context-menu.c:131
-msgid "Font context menu items"
-msgstr "字型快顯選單項目"
+#: vfs-methods/fontilus/fontilus-context-menu.c:133
+#, fuzzy
+msgid "Sets the default application font"
+msgstr "選取預設使用的應用程式"
 
 #: vfs-methods/fontilus/fontilus.schemas.in.h:1
 msgid "If set to true, then OpenType fonts will be thumbnailed."
@@ -3274,33 +3261,47 @@ msgstr "是否為 TrueType 字型製作縮圖"
 msgid "Whether to thumbnail Type1 fonts"
 msgstr "是否為 Type1 字型製作縮圖"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:1
-msgid "Factory for the fontilus context menu"
-msgstr "產生 Fontilus 快顯選單的工廠"
+#: vfs-methods/fontilus/font-view.c:125
+msgid "The quick brown fox jumps over the lazy dog. 0123456789"
+msgstr "0123456789 The following is Chinese: '中文測試'"
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:2
-msgid "Fontilus context menu"
-msgstr "Fontilus 快顯選單"
+#: vfs-methods/fontilus/font-view.c:285
+msgid "Name:"
+msgstr "名稱："
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:3
-msgid "Fontilus context menu factory"
-msgstr "Fontilus 快顯選單工廠"
+#: vfs-methods/fontilus/font-view.c:288
+msgid "Style:"
+msgstr "字款："
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:4
-msgid "Nautilus context menu entries for fonts"
-msgstr "每個字型在 Nautilus 中的快顯選單項目"
+#: vfs-methods/fontilus/font-view.c:297
+msgid "Type:"
+msgstr "類型："
 
-#: vfs-methods/fontilus/fontilus.server.in.in.h:5
-msgid "Set as Application Font"
-msgstr "指定為應用程式字型"
+#: vfs-methods/fontilus/font-view.c:304
+msgid "Size:"
+msgstr "大小："
+
+#: vfs-methods/fontilus/font-view.c:348 vfs-methods/fontilus/font-view.c:361
+msgid "Version:"
+msgstr "版本："
+
+#: vfs-methods/fontilus/font-view.c:352 vfs-methods/fontilus/font-view.c:363
+msgid "Copyright:"
+msgstr "版權："
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:2
-msgid "Theme Properties content view component"
-msgstr "Themus 屬性內容顯示模式元件"
+#: vfs-methods/fontilus/font-view.c:356
+msgid "Description:"
+msgstr "說明："
+
+#: vfs-methods/fontilus/font-view.c:417
+#, c-format
+msgid "usage: %s fontfile\n"
+msgstr ""
 
-#: vfs-methods/themus/Themus_Properties_View.server.in.in.h:3
-msgid "Themus Theme Properties view"
-msgstr "Themus 佈景屬性顯示模式"
+#: vfs-methods/fontilus/gnome-font-viewer.desktop.in.in.h:1
+#, fuzzy
+msgid "GNOME Font Viewer"
+msgstr "GNOME 控制中心"
 
 #: vfs-methods/themus/apply-font.glade.h:1
 msgid " "
@@ -3328,27 +3329,18 @@ msgstr "套用字型(_A)"
 msgid "Themes"
 msgstr "佈景主題"
 
-#: vfs-methods/themus/themus-properties-view.c:172
+#: vfs-methods/themus/themus-properties-view.c:133
 msgid "Control theme"
 msgstr "界面主題"
 
-#: vfs-methods/themus/themus-properties-view.c:176
+#: vfs-methods/themus/themus-properties-view.c:139
 msgid "Window border theme"
 msgstr "視窗邊框主題"
 
-#: vfs-methods/themus/themus-properties-view.c:180
+#: vfs-methods/themus/themus-properties-view.c:145
 msgid "Icon theme"
 msgstr "圖示主題"
 
-#: vfs-methods/themus/themus-properties-view.c:219
-msgid "URI currently displayed"
-msgstr "目前顯示的 URI"
-
-#. translators: you may want to include non-western chars here
-#: vfs-methods/themus/themus-theme-applier.c:83
-msgid "ABCDEFG"
-msgstr "ABC 中文測試"
-
 #: vfs-methods/themus/themus.schemas.in.h:1
 msgid "If set to true, then installed themes will be thumbnailed."
 msgstr "如選用本選項，則會為已安裝的佈景主題製作縮圖。"
@@ -3382,6 +3374,161 @@ msgstr "是否為已安裝的佈景主題製作縮圖"
 msgid "Whether to thumbnail themes"
 msgstr "是否為佈景主題製作縮圖"
 
+#. translators: you may want to include non-western chars here
+#: vfs-methods/themus/themus-theme-applier.c:78
+msgid "ABCDEFG"
+msgstr "ABC 中文測試"
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:1
+#, fuzzy
+msgid "Apply theme"
+msgstr "套用佈景主題..."
+
+#: vfs-methods/themus/themus-theme-applier.desktop.in.in.h:2
+#, fuzzy
+msgid "Sets the default theme"
+msgstr "重置為預設值(_F)"
+
+#~ msgid "Mozilla/Netscape 6"
+#~ msgstr "Mozilla/Netscape 6"
+
+#~ msgid "Gnome Terminal"
+#~ msgstr "GNOME 終端機"
+
+#~ msgid "C_ustom Editor"
+#~ msgstr "自選編輯器(_U)"
+
+#~ msgid "C_ustom Mail Reader:"
+#~ msgstr "自選電子郵件處理程式(_U)："
+
+#~ msgid "C_ustom Terminal:"
+#~ msgstr "自選終端機(_U)："
+
+#~ msgid "C_ustom Web Browser:"
+#~ msgstr "自選網頁瀏覽器(_U)："
+
+#~ msgid "Start in T_erminal"
+#~ msgstr "在終端機中執行(_E)"
+
+#~ msgid "This application can open _URIs"
+#~ msgstr "本程式可開啟 _URI"
+
+#~ msgid "This application needs to be run in a _shell"
+#~ msgstr "本程式需要指令解譯器 (_shell) 方可運行"
+
+#~ msgid "_Select a Mail Reader:"
+#~ msgstr "請選取電子郵件處理程式(_S)："
+
+#~ msgid "_Select a Terminal:"
+#~ msgstr "請選取終端機(_S)："
+
+#~ msgid "_Select a Web Browser:"
+#~ msgstr "請選取網頁瀏覽器(_S)："
+
+#~ msgid "_Select an Editor:"
+#~ msgstr "請選取編輯器(_S)："
+
+#~ msgid "Accessibility"
+#~ msgstr "無障礙環境"
+
+#~ msgid "Accessibility Settings"
+#~ msgstr "無障礙環境設定"
+
+#~ msgid "Advanced"
+#~ msgstr "進階"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "進階設定"
+
+#~ msgid "Network Proxy Configuration"
+#~ msgstr "網路代理伺服器偏好設定"
+
+#~ msgid "Window Properties"
+#~ msgstr "視窗屬性"
+
+#~ msgid "GNOME Control Center: %s"
+#~ msgstr "GNOME 控制中心：%s"
+
+#~ msgid "Layout"
+#~ msgstr "配置"
+
+#~ msgid "Layout to use for this view of the capplets"
+#~ msgstr "這個 capplet 顯示模式使用的配置方式"
+
+#~ msgid "Capplet directory object"
+#~ msgstr "Capplet 目錄物件"
+
+#~ msgid "Capplet directory that this view is viewing"
+#~ msgstr "這個顯示模式正在顯示的 capplet 目錄"
+
+#~ msgid "translator_credits"
+#~ msgstr ""
+#~ "i18n 程式中文化計劃\n"
+#~ "http://i18n.linux.org.tw/\n"
+#~ "\n"
+#~ "Woodman Tuen <woodman@culturecom.com.hk>, 2004\n"
+#~ "Abel Cheung <maddog@linux.org.hk>, 2001-2003\n"
+#~ "S.J. Luo <crystal@mickey.ee.nctu.edu.tw>, 1999"
+
+#~ msgid "Desktop properties manager."
+#~ msgstr "桌面屬性總管。"
+
+#~ msgid "Gnome Control Center : %s"
+#~ msgstr "GNOME 控制中心：%s"
+
+#, fuzzy
+#~ msgid "Gnome Control Center"
+#~ msgstr "GNOME 控制中心：%s"
+
+#, fuzzy
+#~ msgid "Use nautilus if it is running."
+#~ msgstr "即使 nautilus 正在運行仍然使用舊式介面。"
+
+#~ msgid "About this application"
+#~ msgstr "關於本應用程式"
+
+#~ msgid "Overview of the control center"
+#~ msgstr "控制中心總覽"
+
+#~ msgid "_About"
+#~ msgstr "關於(_A)"
+
+#~ msgid "_Contents"
+#~ msgstr "內容(_C)"
+
+#~ msgid "_Help"
+#~ msgstr "求助(_H)"
+
+#~ msgid "Use shell even if nautilus is running."
+#~ msgstr "即使 nautilus 正在運行仍然使用舊式介面。"
+
+#~ msgid "XKB options"
+#~ msgstr "XKB 選項"
+
+#~ msgid "Font context menu items"
+#~ msgstr "字型快顯選單項目"
+
+#~ msgid "Factory for the fontilus context menu"
+#~ msgstr "產生 Fontilus 快顯選單的工廠"
+
+#~ msgid "Fontilus context menu"
+#~ msgstr "Fontilus 快顯選單"
+
+#~ msgid "Fontilus context menu factory"
+#~ msgstr "Fontilus 快顯選單工廠"
+
+#~ msgid "Nautilus context menu entries for fonts"
+#~ msgstr "每個字型在 Nautilus 中的快顯選單項目"
+
+#~ msgid "Theme Properties content view component"
+#~ msgstr "Themus 屬性內容顯示模式元件"
+
+#~ msgid "Themus Theme Properties view"
+#~ msgstr "Themus 佈景屬性顯示模式"
+
+#~ msgid "URI currently displayed"
+#~ msgstr "目前顯示的 URI"
+
 #~ msgid "GNOME Default"
 #~ msgstr "GNOME 預設設定"
 
@@ -3583,10 +3730,6 @@ msgstr "是否為佈景主題製作縮圖"
 #~ msgstr "桌布方式鋪排(_W)"
 
 #, fuzzy
-#~ msgid "Desktop Wallpaper Preferences"
-#~ msgstr "鍵盤偏好設定"
-
-#, fuzzy
 #~ msgid "Advanced Layout Options"
 #~ msgstr "進階設定"
 
@@ -3627,18 +3770,10 @@ msgstr "是否為佈景主題製作縮圖"
 #~ msgstr "一般"
 
 #, fuzzy
-#~ msgid "Language and Culture Preferences"
-#~ msgstr "選單及工具列偏好設定"
-
-#, fuzzy
 #~ msgid "_Region:"
 #~ msgstr "解析度(_R)："
 
 #, fuzzy
-#~ msgid "Set your language and culture preferences"
-#~ msgstr "修改滑鼠偏好設定"
-
-#, fuzzy
 #~ msgid "_Ignore system configuration"
 #~ msgstr "網路代理伺服器偏好設定"
 
@@ -3714,9 +3849,6 @@ msgstr "是否為佈景主題製作縮圖"
 #~ msgid "Quit"
 #~ msgstr "結束"
 
-#~ msgid "Apply theme..."
-#~ msgstr "套用佈景主題..."
-
 #~ msgid "Themus component"
 #~ msgstr "Themus 元件"
 
@@ -3762,9 +3894,6 @@ msgstr "是否為佈景主題製作縮圖"
 #~ msgid "Bee_p"
 #~ msgstr "發出響聲(_P)"
 
-#~ msgid "C_ustom:"
-#~ msgstr "自選(_U)："
-
 #~ msgid "Clic_k on keypress"
 #~ msgstr "按鍵時發出響聲(_K)"
 
@@ -3861,9 +3990,6 @@ msgstr "是否為佈景主題製作縮圖"
 #~ msgid "Configure window appearance"
 #~ msgstr "設定視窗外觀"
 
-#~ msgid "Configure window properties"
-#~ msgstr "設定視窗屬性"
-
 #~ msgid "Configure window manager configuration properties"
 #~ msgstr "設定視窗總管屬性"
 
@@ -3888,9 +4014,6 @@ msgstr "是否為佈景主題製作縮圖"
 #~ msgid "Key_press makes sound"
 #~ msgstr "按鍵時會發出聲響(_P)"
 
-#~ msgid "Keyboard bell _enabled"
-#~ msgstr "啟用鍵盤聲響(_E)"
-
 #~ msgid "Keyboard bell _off"
 #~ msgstr "停用鍵盤聲響(_O)"
 
@@ -3915,9 +4038,6 @@ msgstr "是否為佈景主題製作縮圖"
 #~ msgid "_Custom keyboard bell:"
 #~ msgstr "自訂鍵盤聲響(_C)："
 
-#~ msgid "Keyboard Properties"
-#~ msgstr "鍵盤屬性"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "設定 GNOME 使用的音效"
 
@@ -3972,9 +4092,6 @@ msgstr "是否為佈景主題製作縮圖"
 #~ msgid "Help browser (new window)"
 #~ msgstr "說明文件瀏覽器 (新視窗)"
 
-#~ msgid "Configure which programs are used to display URLs"
-#~ msgstr "設定顯示 URL 所用的程式"
-
 #~ msgid "Initialize session settings"
 #~ msgstr "初始化作業階段設定"
 
@@ -3987,9 +4104,6 @@ msgstr "是否為佈景主題製作縮圖"
 #~ msgid "Cancel"
 #~ msgstr "取消"
 
-#~ msgid "Command:"
-#~ msgstr "指令："
-
 #~ msgid "Name cannot be empty"
 #~ msgstr "名稱欄不能留空"
 
@@ -4155,9 +4269,6 @@ msgstr "是否為佈景主題製作縮圖"
 #~ msgid "Open Behavior"
 #~ msgstr "開啟方式"
 
-#~ msgid "Can open from URI"
-#~ msgstr "可由 URI 開啟"
-
 #~ msgid "Add New MIME Type..."
 #~ msgstr "新增 MIME 類型..."
 
diff --git a/po/zu.po b/po/zu.po
index 32c552845..5521b7ec3 100644
--- a/po/zu.po
+++ b/po/zu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-13 20:22+0200\n"
+"POT-Creation-Date: 2004-12-20 23:11+0100\n"
 "PO-Revision-Date: 2004-12-13 19:02+0200\n"
 "Last-Translator: Zuza Software Foundation <info@translate.org.za>\n"
 "Language-Team: Zulu <translate-discuss-zu@lists.sourceforge.net>\n"
@@ -1948,7 +1948,8 @@ msgid "Network Proxy"
 msgstr "Proxy yokuxhumana"
 
 #: capplets/network/gnome-network-preferences.desktop.in.in.h:2
-msgid "Network proxy preferences"
+#, fuzzy
+msgid "Set your network proxy preferences"
 msgstr "Okuthandekayo kwe-proxy yokuxhumana"
 
 #: capplets/network/gnome-network-preferences.glade.h:1
@@ -2441,7 +2442,8 @@ msgid "_Select windows when the mouse moves over them"
 msgstr "_Khetha amafasitela uma isingoso sihamba phezu kwawo"
 
 #: capplets/windows/window-properties.desktop.in.in.h:1
-msgid "Window Properties"
+#, fuzzy
+msgid "Set your window properties"
 msgstr "Izakhi Windows"
 
 #: capplets/windows/window-properties.desktop.in.in.h:2
@@ -3073,29 +3075,77 @@ msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:1
 msgid ""
-"Very soon, XKB settings in gconf will be overridden (from the system "
-"configuration)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
-"Masinyane, uhlelo lwe-XKB phakathi kwe gconf lizawunyathelwa (kuvela kumumo "
-"womshini)"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "XKB keyboard layout"
-msgstr "Umphandle wendawo yokushaya uma ubhala XKB"
+msgid "Default group, assigned on window creation"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "XKB keyboard model"
-msgstr "Isifanekiso sendawo yokushaya uma ubhala XKB"
+msgid "Keep and manage separate group per window"
+msgstr ""
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "XKB options"
-msgstr "Ukhetho XKB"
+#, fuzzy
+msgid "Keyboard Update Handlers"
+msgstr "_Isifanekiso sendawo yokushaya uma ubhala:"
 
 #: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "XKB settings in gconf will be overridden from the system ASAP"
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Umphandle wendawo yokushaya uma ubhala XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:6
+#, fuzzy
+msgid "Keyboard model"
+msgstr "_Isifanekiso sendawo yokushaya uma ubhala:"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:7
+#, fuzzy
+msgid "Keyboard options"
+msgstr "Izinqamulo zendawo yokushaya uma ubhala"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:8
+#, fuzzy
+msgid "Keyboard settings in gconf will be overridden from the system ASAP"
 msgstr ""
 "Uhlelo lwe-XKB phakathi kwe-gconf lizonyatheliswa emshinini masinya ASAP"
 
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10
+msgid "Show layout names instead of group names"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12
+#, fuzzy
+msgid ""
+"Very soon, keyboard settings in gconf will be overridden (from the system "
+"configuration)"
+msgstr ""
+"Masinyane, uhlelo lwe-XKB phakathi kwe gconf lizawunyathelwa (kuvela kumumo "
+"womshini)"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13
+#, fuzzy
+msgid "keyboard layout"
+msgstr "Umphandle wendawo yokushaya uma ubhala XKB"
+
+#: schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14
+#, fuzzy
+msgid "keyboard model"
+msgstr "Isifanekiso sendawo yokushaya uma ubhala XKB"
+
 #: typing-break/drw-break-window.c:209
 msgid "_Postpone break"
 msgstr "_Buyisela ukunqamuka emuva"
@@ -3391,6 +3441,9 @@ msgstr "_Sebenzisa isiqwema"
 msgid "Sets the default theme"
 msgstr "Hlela kabusha emaphu_theni"
 
+#~ msgid "XKB options"
+#~ msgstr "Ukhetho XKB"
+
 #~ msgid "Mozilla/Netscape 6"
 #~ msgstr "Mozilla/Netscape 6"