Updated Finnish translation.

2002-07-19  Pauli Virtanen <pauli.virtanen@hut.fi>

	* fi.po: Updated Finnish translation.

2 files changed, 402 insertions, 557 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 88d5e0e2b..0cbf562e1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-19  Pauli Virtanen <pauli.virtanen@hut.fi>
+
+	* fi.po: Updated Finnish translation.
+
 2002-07-18  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
 
 	* ru.po: updated Russian translation.
diff --git a/po/fi.po b/po/fi.po
index 5e92dc6c4..6cdcc9ae9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -21,203 +21,195 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center 1.99.0\n"
-"POT-Creation-Date: 2002-06-17 18:03-0400\n"
-"PO-Revision-Date: 2002-06-10 12:47+0200\n"
+"POT-Creation-Date: 2002-07-17 13:09+0200\n"
+"PO-Revision-Date: 2002-07-19 19:55+0200\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:262
-msgid "_Enable keyboard accessibility"
-msgstr "_Käytä esteetöntä näppäimistöä"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:225
+#: capplets/keyboard/gnome-keyboard-properties.c:143
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Näppäimistön hallintasovelman käynnistys epäonnistui: %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:329
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:291
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Ei voinut tuoda AccessX-asetuksia tiedostosta \"%s\""
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:441
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:403
 msgid "Select CDE AccessX file"
 msgstr "Valitse CDE AccessX -tiedosto"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:11
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:6
 #: capplets/keyboard/keyboard.desktop.in.h:1
 msgid "Keyboard"
 msgstr "Näppäimistö"
 
 #: capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.h:2
-msgid "Keyboard Accessibility Properties"
-msgstr "Näppäimistön esteettömyysominaisuudet"
+msgid "Set your keyboard accessibility preferences"
+msgstr "Muuta näppäimistön esteettömyysasetuksia"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:1
-msgid "<b>Test</b>"
-msgstr "<b>Testi</b>"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:2
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
 msgid "B_eep when modifier is pressed"
 msgstr "P_iippaa, kun muunnosnäppäin painetaan"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:3
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
 msgid "Beep when an LED is turned on and two beeps when one is turned off."
 msgstr "Piippaa kerran kun näppäimistön valo syttyy ja kahdesti kun sammuu."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:4
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
+msgid "Beep when key is re_jected"
+msgstr "Piippaa kun painallus h_ylätään"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
 msgid "Beep when:"
 msgstr "Piippaa kun:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:5
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
 msgid "Enable Slo_w Keys"
 msgstr "Käytä _hitaita näppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
 msgid "Enable _Bounce Keys"
 msgstr "Käytä _kimmonäppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
 msgid "Enable _Mouse Keys"
 msgstr "Käytä _hiirinäppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
 msgid "Enable _Sticky Keys"
 msgstr "Käytä _tarttuvia näppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
 msgid "Enable _Toggle Keys"
 msgstr "Käytä _vipunäppäimiä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:10
-msgid ""
-"Ignore all subsequent presses of the SAME key if they happen within a user "
-"selectable period of time."
-msgstr ""
-"Sivuuta kaikki peräkkäiset saman näppäimen painallukset, jotka tapahtuvat "
-"säädettävän ajan kuluessa."
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "General"
+msgstr "Yleistä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:11
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
+msgid "Ignore all subsequent presses of the SAME key if they happen within a user selectable period of time."
+msgstr "Sivuuta kaikki peräkkäiset saman näppäimen painallukset, jotka tapahtuvat säädettävän ajan kuluessa."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 msgid "Keyboard Accessibility Configuration (AccessX)"
 msgstr "Näppäimistön esteettömyysasetukset (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Ma_ximum pointer speed :"
 msgstr "S_uurin osoittimen nopeus:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:13
-msgid ""
-"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:14
+msgid "Only accept keys after they have been pressed and held for a user adjustable amount of time."
 msgstr "Hyväksy vain määritellyn ajan pohjassa olleet näppäinten painallukset"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:14
-msgid ""
-"Perform multiple simultaneous key press operations by pressing modifier keys "
-"in sequence."
-msgstr ""
-"Jäljittele monen näppäimen painamista samaan aikaan näppäilemällä "
-"muunnosnäppäimiä peräkkäin."
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+msgid "Perform multiple simultaneous key press operations by pressing modifier keys in sequence."
+msgstr "Jäljittele monen näppäimen painamista samaan aikaan näppäilemällä muunnosnäppäimiä peräkkäin."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Repeat Key Preferences"
+msgstr "Näppäimistön toistoasetukset"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
 msgid "Start mo_ving this long after keypress :"
 msgstr "Aloita _liike, kun painalluksesta on kulunut:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+msgid "Testing Area"
+msgstr "Koealue"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid "Time to _accelerate to max speed :"
 msgstr "_Suurimpaan nopeuteen kiihtymisaika:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:17
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
+msgid "Toggle and Repeat Keys"
+msgstr "Toisto ja vipunäppäimet"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Tee numeronäppäimistöstä hiiren ohjauspainikkeet."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:18
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
 msgid "_Beep when enabling/disabling keyboard accessibility features"
-msgstr ""
-"_Piippaa, kun näppäimistön esteettömyysominaisuudet otetaan tai poistetaan "
-"käytöstä"
+msgstr "_Piippaa, kun näppäimistön esteettömyysominaisuudet otetaan tai poistetaan käytöstä"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:19
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
 msgid "_Disable if unused for "
 msgstr "_Poista käytöstä jos käyttämättömänä "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:20
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid "_Ignore keypresses within  :"
 msgstr "_Sivuuta näppäilyt aikana:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:21
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid "_Import CDE AccessX file"
 msgstr "_Tuo CDE AccessX -tiedosto"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:22
-msgid "_Keyboard"
-msgstr "_Näppäimistö"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:23
-msgid "_Misc"
-msgstr "_Sekalaista"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:24
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
 msgid "_Only accept keypress after :"
-msgstr "Hyväksy näppäimen painallus vasta kun on kulunut:"
+msgstr "_Hyväksy näppäimen painallus vasta kun on kulunut:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:25
-msgid ""
-"_Turn off Sticky Keys when\n"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+msgid "_Turn off Sticky Keys when\n"
 "two keys pressed simultaneously"
-msgstr ""
-"Poista tarttuvat näppäimet käytöstä\n"
+msgstr "_Poista tarttuvat näppäimet käytöstä\n"
 "kun kahta näppäintä painetaan samalla"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:27
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "key is _accepted"
 msgstr "näppäin on _hyväksytty"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:28
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
 msgid "key is _pressed"
 msgstr "näppäin on _painettu"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:29
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
 msgid "key is _rejected"
 msgstr "näppäin on h_ylätty"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:30
-msgid "key is re_jected"
-msgstr "näppäin on h_ylätty"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:31
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
 msgid "msecs"
 msgstr "ms"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:32
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
 msgid "pixels/sec"
 msgstr "kuvapistettä/s"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2.h:33
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
 msgid "seconds"
 msgstr "sekuntia"
 
 #. solid
 #: capplets/background/background-properties-capplet.c:228
-msgid "C_olor"
-msgstr "V_äri"
+msgid "C_olor:"
+msgstr "V_äri:"
 
 #. horiz
 #: capplets/background/background-properties-capplet.c:232
-msgid "_Left Color"
-msgstr "_Vasen väri"
+msgid "_Left Color:"
+msgstr "_Vasen väri:"
 
 #: capplets/background/background-properties-capplet.c:233
-msgid "_Right Color"
-msgstr "_Oikea väri"
+msgid "_Right Color:"
+msgstr "_Oikea väri:"
 
 #. vert
 #: capplets/background/background-properties-capplet.c:236
-msgid "_Top Color"
-msgstr "_Yläväri"
+msgid "_Top Color:"
+msgstr "_Yläväri:"
 
 #: capplets/background/background-properties-capplet.c:237
-msgid "_Bottom Color"
-msgstr "_Alaväri"
+msgid "_Bottom Color:"
+msgstr "_Alaväri:"
 
 #: capplets/background/background-properties-capplet.c:398
 msgid "_Wallpaper"
@@ -240,19 +232,19 @@ msgid "_No Picture"
 msgstr "_Ei kuvaa"
 
 #: capplets/background/background-properties-capplet.c:433
-msgid "_Picture"
-msgstr "_Kuva"
+msgid "Select _picture:"
+msgstr "Valitse _kuva:"
 
-#: capplets/background/background-properties-capplet.c:558
+#: capplets/background/background-properties-capplet.c:561
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
-#: capplets/keyboard/gnome-keyboard-properties.c:359
-#: capplets/mouse/gnome-mouse-properties.c:727
+#: capplets/keyboard/gnome-keyboard-properties.c:277
+#: capplets/mouse/gnome-mouse-properties.c:752
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Hae ja tallenna aikaisempien versioiden asetukset"
 
-#: capplets/background/background-properties-capplet.c:584
+#: capplets/background/background-properties-capplet.c:587
 #: capplets/background/background-properties.glade.h:2
 msgid "Background Preferences"
 msgstr "Taustan asetukset"
@@ -266,8 +258,8 @@ msgid "Background Preview"
 msgstr "Taustan esikatselu"
 
 #: capplets/background/background-properties.glade.h:4
-msgid "Bor_der the picture with a:"
-msgstr "Kuvan _reunus:"
+msgid "Background _Style:"
+msgstr "Taustan _tyyli:"
 
 #: capplets/background/background-properties.glade.h:5
 msgid "Horizontal gradient"
@@ -304,8 +296,7 @@ msgstr "Taustan kuvatiedoston nimi."
 
 #: capplets/background/background-properties.glade.h:13
 msgid "To set the background picture, drop an image or click to browse."
-msgstr ""
-"Aseta taustakuva pudottamalla kuvatiedosto tai napsauta selataksesi niitä."
+msgstr "Aseta taustakuva pudottamalla kuvatiedosto tai napsauta selataksesi niitä."
 
 #: capplets/background/background-properties.glade.h:14
 msgid "Vertical gradient"
@@ -326,28 +317,21 @@ msgid "Background"
 msgstr "Tausta"
 
 #: capplets/background/background.desktop.in.h:2
-msgid "Change the desktop background"
+msgid "Customize your desktop background"
 msgstr "Muuta työpöydän taustaa"
 
 #: 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."
-msgstr ""
-"Ei voinut käynnistää asetushallintaa \"gnome2-settings-daemon\".\n"
-"Kun se ei ole käynnissä, jotkin asetukset eivät välttämättä tule voimaan. "
-"Tämä voi merkitä ongelmaa Bonobossa, tai että jokin muu kuin Gnomen (esim. "
-"KDE:n) asetushallinta voi olla käynnissä ja häiritä Gnomen asetushallinnan "
-"toimintaa."
+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."
+msgstr "Ei voinut käynnistää asetushallintaa \"gnome2-settings-daemon\".\n"
+"Kun se ei ole käynnissä, jotkin asetukset eivät välttämättä tule voimaan. Tämä voi merkitä ongelmaa Bonobossa, tai että jokin muu kuin Gnomen (esim. KDE:n) asetushallinta voi olla käynnissä ja häiritä Gnomen asetushallinnan toimintaa."
 
-#: 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 "Ota asetukset käyttöön ja lopeta"
 
-#: capplets/common/capplet-util.c:315
+#: capplets/common/capplet-util.c:340
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "Virhe näyttäessä ohjetta: %s"
@@ -443,19 +427,15 @@ msgid "Change set"
 msgstr "Muutosjoukko"
 
 #: capplets/common/gconf-property-editor.c:186
-msgid ""
-"GConf change set containing data to be forwarded to the gconf client on apply"
-msgstr ""
-"GConf-muutosjoukko, joka sisältää datan, joka lähtee asetukset "
-"toteutettaessa gconf-asiakkaalle"
+msgid "GConf change set containing data to be forwarded to the gconf client on apply"
+msgstr "GConf-muutosjoukko, joka sisältää datan, joka lähtee asetukset toteutettaessa gconf-asiakkaalle"
 
 #: capplets/common/gconf-property-editor.c:191
 msgid "Conversion to widget callback"
 msgstr "Säätimeenmuunnoksen paluukutsu"
 
 #: capplets/common/gconf-property-editor.c:192
-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 "Funktio, joka saa kutsun, kun data muuntuu GConfista säätimeen"
 
 #: capplets/common/gconf-property-editor.c:197
@@ -463,8 +443,7 @@ msgid "Conversion from widget callback"
 msgstr "Säätimestämuunnoksen paluukutsu"
 
 #: capplets/common/gconf-property-editor.c:198
-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 "Funktio, joka saa kutsun, kun data muuntuu säätimestä GConfiin"
 
 #: capplets/common/gconf-property-editor.c:203
@@ -489,22 +468,18 @@ msgstr "Ominaisuusmuokkaimen datan vapauttamisen paluukutsu"
 
 #: capplets/common/gconf-property-editor.c:227
 msgid "Callback to be issued when property editor object data is to be freed"
-msgstr ""
-"Funktio, joka saa kutsun kun ominaisuusmuokkainolion dataa ollaan "
-"vapauttamassa"
+msgstr "Funktio, joka saa kutsun kun ominaisuusmuokkainolion dataa ollaan vapauttamassa"
 
 #: capplets/common/gconf-property-editor.c:1484
 #, c-format
 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 ""
 "Ei löytänyt tiedostoa \"%s\".\n"
 "\n"
-"Varmista, että se on olemassa ja yritä uudelleen tai valitse toinen "
-"taustakuva."
+"Varmista, että se on olemassa ja yritä uudelleen tai valitse toinen taustakuva."
 
 #: capplets/common/gconf-property-editor.c:1492
 #, c-format
@@ -524,22 +499,23 @@ msgid "Please select an image."
 msgstr "Valitse jokin kuva"
 
 #: capplets/default-applications/default-applications.desktop.in.h:1
-msgid "Choose the applications used by default"
-msgstr "Valitse oletuksena käytettävät sovellukset"
-
-#: capplets/default-applications/default-applications.desktop.in.h:2
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:19
 msgid "Preferred Applications"
 msgstr "Suositut sovellukset"
 
+#: capplets/default-applications/default-applications.desktop.in.h:2
+msgid "Select your default applications"
+msgstr "Valitse oletusohjelmasi"
+
 #: capplets/default-applications/gnome-default-applications-properties.c:105
 msgid "Please specify a name and a command for this editor."
 msgstr "Anna tämän editorin nimi ja komento."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:1
 #: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-properties.glade.h:1
+#: capplets/theme-switcher/theme-install.glade.h:1
 msgid "*"
 msgstr "*"
 
@@ -612,12 +588,8 @@ msgid "Help Browser"
 msgstr "Ohjeselain"
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:20
-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 ""
-"Valitse haluamasi ikkunointiohjelma. Lisäksi täytyy napsauttaa toteuta-"
-"painiketta, heiluttaa taikasauvaa ja tanssia sadetanssi, jotta se toimisi."
+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 "Valitse haluamasi ikkunointiohjelma. Lisäksi täytyy napsauttaa toteuta-painiketta, heiluttaa taikasauvaa ja tanssia sadetanssi, jotta se toimisi."
 
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:21
 msgid "Start in T_erminal"
@@ -684,7 +656,6 @@ msgid "_Select an Editor:"
 msgstr "_Valitse editori:"
 
 #: capplets/desktop-links/Accessibility.directory.in.in.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:6
 msgid "Accessibility"
 msgstr "Esteettömyys"
 
@@ -713,19 +684,19 @@ msgid "Appearance"
 msgstr "Ulkonäkö"
 
 #: capplets/desktop-links/Sawfish/appearance-properties.desktop.in.h:2
-msgid "Configure window appearance"
-msgstr "Muuta ikkunoiden ulkonäköä"
+msgid "Select themes and fonts for your windows"
+msgstr "Valitse ikkunoidesi teemat ja kirjasimet"
 
 #: capplets/desktop-links/Sawfish/bindings-properties.desktop.in.h:1
-msgid "Configure key shortcuts"
-msgstr "Muuta pikanäppäimiä"
+msgid "Customize shortcut keys for your windows"
+msgstr "Muokkaa ikkunoiden pikanäppäimiä"
 
 #: capplets/desktop-links/Sawfish/bindings-properties.desktop.in.h:2
 msgid "Shortcuts"
 msgstr "Oikotiet"
 
 #: capplets/desktop-links/Sawfish/focus-properties.desktop.in.h:1
-msgid "Configure window focusing"
+msgid "Configure how to give focus to windows"
 msgstr "Muuta ikkunoiden kohdistamista"
 
 #: capplets/desktop-links/Sawfish/focus-properties.desktop.in.h:2
@@ -733,15 +704,15 @@ msgid "Focus behavior"
 msgstr "Kohdistaminen"
 
 #: capplets/desktop-links/Sawfish/match-properties.desktop.in.h:1
-msgid "Configure window properties"
-msgstr "Muuta ikkunan ominaisuuksia"
+msgid "Configure matched windows to have particular characteristics"
+msgstr "Muuta tiettyjen ikkunoiden ominaisuuksia"
 
 #: capplets/desktop-links/Sawfish/match-properties.desktop.in.h:2
 msgid "Matched Windows"
 msgstr "Erikoiskäsittely"
 
 #: capplets/desktop-links/Sawfish/maximize-properties.desktop.in.h:1
-msgid "Configure window minimization and maximization"
+msgid "Configure how to minimize, maximize, and restore windows"
 msgstr "Muuta ikkunoiden pienennystä ja suurennosta"
 
 #: capplets/desktop-links/Sawfish/maximize-properties.desktop.in.h:2
@@ -749,23 +720,23 @@ msgid "Minimizing and Maximizing"
 msgstr "Pienennys ja suurennus"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
-msgid "Configure window manager configuration properties"
-msgstr "Muuta ikkunanointiohjelman asetusohjelman ominaisuuksia"
-
-#: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:2
 msgid "Meta"
 msgstr "Asetusohjelma"
 
-#: capplets/desktop-links/Sawfish/misc-properties.desktop.in.h:1
-msgid "Configure miscellaneous window features"
-msgstr "Muuta sekalaisia ikkunaominaisuuksia"
+#: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:2
+msgid "Select your Sawfish user level"
+msgstr "Valitse Sawfishin käyttäjän taitotaso"
 
-#: capplets/desktop-links/Sawfish/misc-properties.desktop.in.h:2
+#: capplets/desktop-links/Sawfish/misc-properties.desktop.in.h:1
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
+#: capplets/desktop-links/Sawfish/misc-properties.desktop.in.h:2
+msgid "Select miscellaneous window options"
+msgstr "Muuta sekalaisia ikkunaominaisuuksia"
+
 #: capplets/desktop-links/Sawfish/move-properties.desktop.in.h:1
-msgid "Configure window move/resize"
+msgid "Configure how windows move and resize"
 msgstr "Muuta ikkunoiden siirron ja koon muutoksen asetuksia"
 
 #: capplets/desktop-links/Sawfish/move-properties.desktop.in.h:2
@@ -773,26 +744,26 @@ msgid "Moving and Resizing"
 msgstr "Siirto ja koko"
 
 #: capplets/desktop-links/Sawfish/placement-properties.desktop.in.h:1
-msgid "Configure window placement"
-msgstr "Muuta ikkunoiden sijoittelua"
+msgid "Configure positioning of windows on the desktop"
+msgstr "Muuta ikkunoiden työpöydälle asettelua"
 
 #: capplets/desktop-links/Sawfish/placement-properties.desktop.in.h:2
 msgid "Placement"
 msgstr "Sijoittelu"
 
 #: capplets/desktop-links/Sawfish/sound-properties.desktop.in.h:1
-msgid "Enable window manager sound events"
-msgstr "Käytä ääniä ikkunointiohjelmassa"
+msgid "Associate sounds with window manager events"
+msgstr "Kytke ääniä ikkunointiohjelman toimintaan"
 
 #: capplets/desktop-links/Sawfish/sound-properties.desktop.in.h:2
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:13
 #: capplets/sound/sound.desktop.in.h:2
 msgid "Sound"
 msgstr "Ääni"
 
 #: capplets/desktop-links/Sawfish/workspace-properties.desktop.in.h:1
-msgid "Configure workspaces"
-msgstr "Muuta työtiloja"
+msgid "Configure your workspaces and viewports"
+msgstr "Muuta työtiloja ja näkymiä"
 
 #: capplets/desktop-links/Sawfish/workspace-properties.desktop.in.h:2
 msgid "Workspaces"
@@ -884,98 +855,90 @@ msgid "Source Code"
 msgstr "Lähdekoodi"
 
 #: capplets/file-types/category-names.h:25
-#: capplets/file-types/mime-type-info.c:727
+#: capplets/file-types/mime-type-info.c:673
 msgid "Audio"
 msgstr "Ääni"
 
 #: capplets/file-types/category-names.h:26
-#: capplets/file-types/mime-type-info.c:723
+#: capplets/file-types/mime-type-info.c:669
 msgid "Images"
 msgstr "Kuvat"
 
 #: capplets/file-types/category-names.h:27
-#: capplets/file-types/mime-type-info.c:725
+#: capplets/file-types/mime-type-info.c:671
 msgid "Video"
 msgstr "Video"
 
-#: capplets/file-types/file-types-capplet.c:223
+#: capplets/file-types/file-types-capplet.c:215
 msgid "Description"
 msgstr "Kuvaus"
 
-#: capplets/file-types/file-types-capplet.c:230
+#: capplets/file-types/file-types-capplet.c:237
 msgid "Extensions"
 msgstr "Tiedostopäätteet"
 
 #: capplets/file-types/file-types-capplet.desktop.in.h:1
-#: capplets/file-types/file-types.desktop.in.h:1
+#: capplets/file-types/file-types-properties.glade.h:8
+#: capplets/file-types/file-types.desktop.in.h:2
 msgid "File Types and Programs"
 msgstr "Tiedostotyypit ja ohjelmat"
 
 #: capplets/file-types/file-types-capplet.desktop.in.h:2
-#: capplets/file-types/file-types.desktop.in.h:2
 msgid "Specify which programs are used to open or view each file type"
 msgstr "Määritä, millä ohjelmilla tiedostoja käsitellään"
 
-#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:2
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: capplets/file-types/file-types-properties.glade.h:2
+#: capplets/file-types/file-types-properties.glade.h:3
 msgid "Add _file type..."
 msgstr "Lisää _tiedostotyyppi..."
 
-#: capplets/file-types/file-types-properties.glade.h:3
+#: capplets/file-types/file-types-properties.glade.h:4
 msgid "Add _service..."
 msgstr "Lisää _palvelu..."
 
-#: capplets/file-types/file-types-properties.glade.h:4
+#: capplets/file-types/file-types-properties.glade.h:5
+msgid "Add:"
+msgstr "Lisää:"
+
+#: capplets/file-types/file-types-properties.glade.h:6
 msgid "Default action"
 msgstr "Oletustoiminto"
 
-#: capplets/file-types/file-types-properties.glade.h:5
-#: capplets/file-types/mime-edit-dialog.c:192
+#: capplets/file-types/file-types-properties.glade.h:7
+#: capplets/file-types/mime-edit-dialog.c:209
 msgid "Edit file type"
 msgstr "Muokkaa tiedostotyyppiä"
 
-#: capplets/file-types/file-types-properties.glade.h:6
-msgid "File types and Internet Services"
-msgstr "Tiedostotyypit ja Internet-palvelut"
-
-#: capplets/file-types/file-types-properties.glade.h:7
-msgid "Filename extensions"
+#: capplets/file-types/file-types-properties.glade.h:9
+msgid "Filename Extensions"
 msgstr "Tiedostopäätteet"
 
-#: capplets/file-types/file-types-properties.glade.h:8
+#: capplets/file-types/file-types-properties.glade.h:10
 msgid "Look at content"
 msgstr "Katsele sisältöä"
 
-#: capplets/file-types/file-types-properties.glade.h:9
-msgid "Needs _terminal"
-msgstr "_Vaatii päätteen"
-
-#: capplets/file-types/file-types-properties.glade.h:10
-msgid "Program to run"
+#: capplets/file-types/file-types-properties.glade.h:11
+msgid "Program to Run"
 msgstr "Käynnistettävä ohjelma"
 
-#: capplets/file-types/file-types-properties.glade.h:11
+#: capplets/file-types/file-types-properties.glade.h:12
 msgid "Run a program"
 msgstr "Suorita ohjelma"
 
-#: capplets/file-types/file-types-properties.glade.h:12
-msgid "Use category _defaults"
-msgstr "Käytä luokan _oletuksia"
-
 #: capplets/file-types/file-types-properties.glade.h:13
-msgid "Use parent category _defaults"
-msgstr "Käytä yläluokan _oletuksia"
+msgid "Run in _Terminal"
+msgstr "Käynnistä _päätteessä"
 
 #: capplets/file-types/file-types-properties.glade.h:14
-msgid "Viewing component"
-msgstr "Katselukomponentti"
+msgid "Use parent category _defaults"
+msgstr "Käytä yläluokan _oletuksia"
 
 #: capplets/file-types/file-types-properties.glade.h:15
-msgid "_Add"
-msgstr "_Lisää"
+msgid "Viewer Component"
+msgstr "Katselukomponentti"
 
 #: capplets/file-types/file-types-properties.glade.h:16
 msgid "_Category"
@@ -986,125 +949,126 @@ msgid "_Choose..."
 msgstr "_Valitse..."
 
 #: capplets/file-types/file-types-properties.glade.h:18
+msgid "_Delete"
+msgstr "_Poista"
+
+#: capplets/file-types/file-types-properties.glade.h:19
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: capplets/file-types/file-types-properties.glade.h:19
+#: capplets/file-types/file-types-properties.glade.h:20
 msgid "_Edit..."
 msgstr "_Muokkaa..."
 
-#: capplets/file-types/file-types-properties.glade.h:20
+#: capplets/file-types/file-types-properties.glade.h:21
 msgid "_MIME Type"
 msgstr "_MIME-tyyppi"
 
-#: capplets/file-types/file-types-properties.glade.h:21
+#: capplets/file-types/file-types-properties.glade.h:22
 msgid "_Name"
 msgstr "_Nimi"
 
-#: capplets/file-types/file-types-properties.glade.h:22
+#: capplets/file-types/file-types-properties.glade.h:23
 msgid "_Program"
 msgstr "_Ohjelma"
 
-#: capplets/file-types/file-types-properties.glade.h:23
-msgid "_Program to run"
-msgstr "_Käynnistettävä ohjelma"
-
 #: capplets/file-types/file-types-properties.glade.h:24
-msgid "_Protocol name"
-msgstr "P_rotokollan nimi"
+msgid "_Program to Run"
+msgstr "_Käynnistettävä ohjelma"
 
 #: capplets/file-types/file-types-properties.glade.h:25
-msgid "_Remove"
-msgstr "_Poista"
+msgid "_Protocol"
+msgstr "P_rotokolla"
+
+#: capplets/file-types/file-types.desktop.in.h:1
+msgid "Associate applications with file types"
+msgstr "Kytke sovelluksia tiedostotyyppeihin"
 
-#: capplets/file-types/mime-category-edit-dialog.c:137
+#: capplets/file-types/mime-category-edit-dialog.c:138
 msgid "Edit file category"
 msgstr "Muokkaa tiedostoluokkaa"
 
-#: capplets/file-types/mime-category-edit-dialog.c:171
-#: capplets/file-types/mime-edit-dialog.c:230
+#: capplets/file-types/mime-category-edit-dialog.c:172
+#: capplets/file-types/mime-edit-dialog.c:256
 #: capplets/file-types/service-edit-dialog.c:170
 #: capplets/file-types/service-edit-dialog.c:171
 msgid "Model"
 msgstr "Malli"
 
-#: capplets/file-types/mime-category-edit-dialog.c:172
+#: capplets/file-types/mime-category-edit-dialog.c:173
 msgid "GtkTreeModel that contains the category data"
 msgstr "GtkTreeModel, joka sisältää luokan tiedot"
 
-#: capplets/file-types/mime-category-edit-dialog.c:177
+#: capplets/file-types/mime-category-edit-dialog.c:178
 msgid "MIME category info"
 msgstr "MIME-luokan tiedot"
 
-#: capplets/file-types/mime-category-edit-dialog.c:178
+#: capplets/file-types/mime-category-edit-dialog.c:179
 msgid "Structure containing information on the MIME category"
 msgstr "Tietorakenne, joka sisältää MIME-luokan tiedot"
 
-#: capplets/file-types/mime-category-edit-dialog.c:343
-#: capplets/file-types/mime-edit-dialog.c:442
-#: capplets/file-types/mime-edit-dialog.c:546
-#: capplets/file-types/service-edit-dialog.c:358
-#: capplets/file-types/service-edit-dialog.c:407
+#: capplets/file-types/mime-category-edit-dialog.c:344
+#: capplets/file-types/mime-edit-dialog.c:490
+#: capplets/file-types/mime-edit-dialog.c:594
+#: capplets/file-types/service-edit-dialog.c:359
+#: capplets/file-types/service-edit-dialog.c:408
 msgid "Custom"
 msgstr "Muu"
 
-#: capplets/file-types/mime-edit-dialog.c:189
+#: capplets/file-types/mime-edit-dialog.c:206
 msgid "Extension"
 msgstr "Pääte"
 
-#: capplets/file-types/mime-edit-dialog.c:231
+#: capplets/file-types/mime-edit-dialog.c:257
 msgid "Underlying model to notify when Ok is clicked"
 msgstr "Alla oleva malli, jolle ilmoitetaan OK:n napsauttamisesta"
 
-#: capplets/file-types/mime-edit-dialog.c:238
+#: capplets/file-types/mime-edit-dialog.c:264
 msgid "MIME type information"
 msgstr "MIME-tyypin tiedot"
 
-#: capplets/file-types/mime-edit-dialog.c:239
+#: capplets/file-types/mime-edit-dialog.c:265
 msgid "Structure with data on the MIME type"
 msgstr "Tietorakenne, joka sisältää MIME-tyypin tiedot"
 
-#: capplets/file-types/mime-edit-dialog.c:245
+#: capplets/file-types/mime-edit-dialog.c:271
 msgid "Is add dialog"
 msgstr "On lisäysikkuna"
 
-#: capplets/file-types/mime-edit-dialog.c:246
+#: capplets/file-types/mime-edit-dialog.c:272
 msgid "True if this dialog is for adding a MIME type"
 msgstr "Tosi, jos tämä ikkuna on MIME-tyypin lisäämistä varten"
 
-#: capplets/file-types/mime-edit-dialog.c:295
-msgid "Add file type"
+#: capplets/file-types/mime-edit-dialog.c:321
+msgid "Add File Type"
 msgstr "Lisää tiedostotyyppi"
 
-#: capplets/file-types/mime-edit-dialog.c:437
-#: capplets/file-types/mime-edit-dialog.c:496
+#: capplets/file-types/mime-edit-dialog.c:435
+#: capplets/file-types/mime-type-info.c:675
+msgid "Misc"
+msgstr "Sekalaista"
+
+#: capplets/file-types/mime-edit-dialog.c:485
+#: capplets/file-types/mime-edit-dialog.c:544
 msgid "None"
 msgstr "Ei mikään"
 
-#: capplets/file-types/mime-edit-dialog.c:726
-msgid ""
-"Invalid MIME type. Please enter a valid MIME type, or leave the field blank "
-"to have one generated for you."
-msgstr ""
-"Virheellinen MIME-tyyppi. Syötä kelvollinen MIME-tyyppi, tai jätä kenttä "
-"tyhjäksi, niin sellainen syntyy."
+#: capplets/file-types/mime-edit-dialog.c:847
+msgid "Please enter a valid MIME type.  It should be of the form class/type and may not contain any spaces."
+msgstr "Anna kelvollinen MIME-tyyppi. Sen pitäisi olla muotoa luokka/tyyppi, ja se ei saa sisältää välejä."
 
-#: capplets/file-types/mime-edit-dialog.c:730
-msgid "There already exists a MIME type of that name."
-msgstr "Samanniminen MIME-tyyppi on jo olemassa."
+#: capplets/file-types/mime-edit-dialog.c:854
+msgid "A MIME type with that name already exists, overwrite ?."
+msgstr "Tämän niminen MIME-tyyppi on jo olemassa. Haluatko korvata sen?"
 
-#: capplets/file-types/mime-edit-dialog.c:800
+#: capplets/file-types/mime-edit-dialog.c:919
 msgid "Category"
 msgstr "Luokka"
 
-#: capplets/file-types/mime-edit-dialog.c:805
+#: capplets/file-types/mime-edit-dialog.c:924
 msgid "Choose a file category"
 msgstr "Valitse tiedostoluokka"
 
-#: capplets/file-types/mime-type-info.c:729
-msgid "Misc"
-msgstr "Sekalaista"
-
 #: capplets/file-types/mime-types-model.c:167
 #: capplets/file-types/mime-types-model.c:168
 msgid "Model for categories only"
@@ -1135,22 +1099,18 @@ msgid "TRUE if this is an add service dialog"
 msgstr "TOSI, jos tämä on palvelujen lisäysikkuna"
 
 #: capplets/file-types/service-edit-dialog.c:225
-msgid "Add service"
+msgid "Add Service"
 msgstr "Lisää palvelu"
 
-#: capplets/file-types/service-edit-dialog.c:497
+#: capplets/file-types/service-edit-dialog.c:498
 msgid "Please enter a protocol name."
 msgstr "Kirjoita protokollan nimi."
 
-#: capplets/file-types/service-edit-dialog.c:509
-msgid ""
-"Invalid protocol name. Please enter a protocol name without any spaces or "
-"punctuation."
-msgstr ""
-"Virheellinen protokollan nimi. Anna protokollan nimi ilman välilyöntejä tai -"
-"merkkejä."
+#: capplets/file-types/service-edit-dialog.c:510
+msgid "Invalid protocol name. Please enter a protocol name without any spaces or punctuation."
+msgstr "Virheellinen protokollan nimi. Anna protokollan nimi ilman välilyöntejä tai -merkkejä."
 
-#: capplets/file-types/service-edit-dialog.c:523
+#: capplets/file-types/service-edit-dialog.c:524
 msgid "There is already a protocol by that name."
 msgstr "Samanniminen protokolla on jo olemassa."
 
@@ -1183,13 +1143,13 @@ msgid "Gnome documentation"
 msgstr "Gnomen ohjeet"
 
 #: capplets/font/font-properties.desktop.in.h:1
-msgid "Change the default fonts used by the desktop and applications"
-msgstr "Muuta työpöydän ja sovellusten käyttämiä oletuskirjasimia"
-
-#: capplets/font/font-properties.desktop.in.h:2
 msgid "Font"
 msgstr "Kirjasin"
 
+#: capplets/font/font-properties.desktop.in.h:2
+msgid "Select fonts for the desktop"
+msgstr "Valitse työpöydän kirjasin"
+
 #: capplets/font/font-properties.glade.h:1
 msgid "Font Preferences"
 msgstr "Kirjasinasetukset"
@@ -1203,8 +1163,8 @@ msgid "Set the font for the icons on the desktop"
 msgstr "Aseta työpöydän kuvakkeiden kirjasin"
 
 #: capplets/font/font-properties.glade.h:4
-msgid "Standard _application font:"
-msgstr "_Sovelluksien peruskirjasin:"
+msgid "_Application font:"
+msgstr "_Sovelluksien kirjasin:"
 
 #: capplets/font/font-properties.glade.h:5
 msgid "_Desktop font:"
@@ -1221,50 +1181,43 @@ msgid "Accelerator key"
 msgstr "Pikanäppäin"
 
 #: capplets/keybindings/eggcellrendererkeys.c:206
-#: capplets/keybindings/gnome-keybinding-properties.c:306
+#: capplets/keybindings/gnome-keybinding-properties.c:173
 #: libbackground/applier.c:521
 msgid "Disabled"
 msgstr "Pois käytöstä"
 
 #: capplets/keybindings/eggcellrendererkeys.c:309
 #: capplets/keybindings/eggcellrendererkeys.c:506
-msgid "Type a new accelerator, or press Backspace to clear"
-msgstr "Näppäile uusi pikanäppäin, tai paina askelpalautinta tyhjentääksesi"
-
 #: capplets/keybindings/eggcellrendererkeys.c:509
-msgid "Type a new accelerator"
+msgid "Type a new shortcut"
 msgstr "Näppäile uusi pikanäppäin"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:573
+#: capplets/keybindings/gnome-keybinding-properties.c:440
 msgid "<Unknown Action>"
 msgstr "<Tuntematon toiminto>"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:598
+#: capplets/keybindings/gnome-keybinding-properties.c:459
 msgid "Desktop"
 msgstr "Työpöytä"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:602
+#: capplets/keybindings/gnome-keybinding-properties.c:463
 msgid "Window Management"
 msgstr "Ikkunointi"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:699
+#: capplets/keybindings/gnome-keybinding-properties.c:560
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Virhe asettaessa uutta pikanäppäintä asetustietokantaan: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:851
-msgid ""
-"Unable to find any keyboard themes.  This means your GTK+ installation has "
-"been incompletely installed."
-msgstr ""
-"Ei löytänyt näppäimistöteemoja. Tämä merkitsee, että GTK+ on asennettu "
-"puutteellisesti."
+#: capplets/keybindings/gnome-keybinding-properties.c:711
+msgid "Unable to find any keyboard themes.  This means your GTK+ installation has been incompletely installed."
+msgstr "Ei löytänyt näppäimistöteemoja. Tämä merkitsee, että GTK+ on asennettu puutteellisesti."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:876
+#: capplets/keybindings/gnome-keybinding-properties.c:733
 msgid "Action"
 msgstr "Toiminto"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:888
+#: capplets/keybindings/gnome-keybinding-properties.c:749
 msgid "Shortcut"
 msgstr "Pikanäppäin"
 
@@ -1278,256 +1231,166 @@ msgid "Keyboard Shortcuts"
 msgstr "Pikanäppäimet"
 
 #: capplets/keybindings/gnome-keybinding-properties.glade.h:3
-msgid "Keyboard _Navigation scheme for use in applications:"
-msgstr "Ohjelmien näppäimistö_navigointityyli:"
-
-#: capplets/keybindings/gnome-keybinding-properties.glade.h:4
-msgid ""
-"To assign a shortcut to an action, click in the shortcut column and press "
-"the key combination you want to associate with it."
-msgstr ""
-"Liittääksesi pikanäppäimen toimintoon napsauta kohtaa pikanäppäinsarakkeessa "
-"ja näppäile haluamasi näppäinyhdistelmä."
-
-#: capplets/keybindings/gnome-keybinding-properties.glade.h:5
 msgid "_Desktop shortcuts:"
 msgstr "_Työpöydän pikanäppäimet:"
 
+#: capplets/keybindings/gnome-keybinding-properties.glade.h:4
+msgid "_Text editing shortcuts:"
+msgstr "Pikanäppäimet _tekstin muokkaamiseksi"
+
 #: capplets/keybindings/keybinding.desktop.in.h:1
-msgid "Associate keyboard shortcuts with panel actions"
-msgstr "Liitä pikanäppäimiä paneelitoimintoihin"
+msgid "Assign shortcut keys to commands"
+msgstr "Liitä pikanäppäimiä komentoihin"
 
-#: capplets/keyboard/gnome-keyboard-properties.c:338
+#: capplets/keyboard/gnome-keyboard-properties.c:256
 msgid "_Accessibility"
 msgstr "_Esteettömyys"
 
-#: capplets/keyboard/gnome-keyboard-properties.c:355
-#: capplets/keyboard/gnome-keyboard-properties.c:357
+#: capplets/keyboard/gnome-keyboard-properties.c:273
+#: capplets/keyboard/gnome-keyboard-properties.c:275
 #: capplets/sound/sound-properties-capplet.c:145
 #: capplets/sound/sound-properties-capplet.c:147
-msgid ""
-"Just apply settings and quit (compatibility only; now handled by daemon)"
-msgstr ""
-"Pelkästään ota muutokset käyttöön ja lopeta (vain yhteensopivuuden vuoksi; "
-"nyt tämän tekee daemon)"
+msgid "Just apply settings and quit (compatibility only; now handled by daemon)"
+msgstr "Pelkästään ota muutokset käyttöön ja lopeta (vain yhteensopivuuden vuoksi; nyt tämän tekee daemon)"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:2
-msgid "<i>fast</i>"
-msgstr "<i>nopea</i>"
+msgid "Bee_p"
+msgstr "_Piippaa"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:3
-msgid "<i>loud</i>"
-msgstr "<i>äänekäs</i>"
+msgid "C_ustom:"
+msgstr "M_uu:"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:4
-msgid "<i>quiet</i>"
-msgstr "<i>hiljainen</i>"
+msgid "Clic_k on keypress"
+msgstr "_Näppäinääni"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:5
-msgid "<i>slow</i>"
-msgstr "<i>hidas</i>"
+msgid "Cursor Blinks"
+msgstr "Vilkkuva kohdistin"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:7
-msgid "Cursor"
-msgstr "Osoitin"
+msgid "Keyboard Bell"
+msgstr "Näppäinääni"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:8
-msgid "Cursor _blinks in text fields"
-msgstr "_Kohdistin vilkkuu tekstikentissä"
+msgid "Keyboard Preferences"
+msgstr "Näppäimistöasetukset"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:9
-msgid "Fast"
-msgstr "Nopea"
+msgid "Keyboard _repeats when key is held down"
+msgstr "Painallus _toistuu kun näppäintä pidetään painettuna"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:10
-msgid "Key_press makes sound"
-msgstr "_Näppäimen painallus päästää äänen"
+msgid "Keypress Click"
+msgstr "Ääni näppäintä painettaessa"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:12
-msgid "Keyboard Bell"
-msgstr "Näppäinääni"
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:11
+msgid "Repeat Keys"
+msgstr "Näppäinten toisto"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:13
-msgid "Keyboard Preferences"
-msgstr "Näppäimistöasetukset"
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:12
+msgid "S_peed:"
+msgstr "_Nopeus:"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:14
-msgid "Keyboard _repeats when key is held down"
-msgstr "Painallus _toistuu kun näppäintä pidetään painettuna"
+msgid "_Accessibility..."
+msgstr "_Esteettömyys..."
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:15
-msgid "Keyboard bell _enabled"
-msgstr "Näppäinääni _käytössä"
+msgid "_Blinks in text boxes and fields"
+msgstr "_Kohdistin vilkkuu tekstilaatikoissa"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "Keyboard bell _off"
-msgstr "Näppäinääni _ei käytössä"
+msgid "_Delay:"
+msgstr "_Viive:"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:17
-msgid "Keyclick Volume"
-msgstr "Naksauksen voimakkuus"
+msgid "_Off"
+msgstr "_Ei käytössä"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
-msgid "Long"
-msgstr "Pitkä"
+msgid "_Speed:"
+msgstr "_Nopeus:"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:19
-msgid "Medium"
-msgstr "Keski"
+msgid "_Volume:"
+msgstr "_Äänenvoimakkuus:"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:20
-msgid "Repeat Rate"
-msgstr "Toistonopeus"
+msgid "faster"
+msgstr "nopea"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:21
-msgid "Repeat s_peed:"
-msgstr "Toisto_nopeus:"
+msgid "loud"
+msgstr "äänekäs"
 
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:22
-msgid "Set the speed the cursor blinks in text fields."
-msgstr "Kohdistimen vilkkumisnopeus tekstikentissä."
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:23
-msgid "Set the volume of the clicking sound made when pressing a key"
-msgstr "Aseta näppäimen painalluksen päästämän äänen voimakkuus."
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:24
-msgid "Short"
-msgstr "Lyhyt"
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:25
-msgid "Slow"
-msgstr "Hidas"
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:27
-msgid ""
-"The keyboard bell is the <i>beep</i> sound heard when the system wants to "
-"get your attention."
-msgstr ""
-"Näppäinääni on <i>piippaus</i>, joka kuuluu kun järjestelmä vaatii "
-"huomiotasi."
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:28
-msgid "Very Fast"
-msgstr "Hyvin nopea"
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:29
-msgid "Very Short"
-msgstr "Hyvin lyhyt"
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:30
-msgid ""
-"You can configure the keyboards accessibility features by bringing up the "
-"'Accessibility Settings' property dialog, or pressing the button on the "
-"right."
-msgstr ""
-"Voit muuttaa näppäimistön esteettömyysominaisuuksia avaamalla "
-"esteettömyysasetukset-ikkunan tai napsauttamalla oikealla olevaa painiketta."
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:31
-msgid "_Accessibility..."
-msgstr "_Esteettömyys..."
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:32
-msgid "_Blink speed:"
-msgstr "_Vilkkumisnopeus:"
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:33
-msgid "_Custom keyboard bell:"
-msgstr "_Muu näppäinääni:"
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:34
-msgid "_Delay before repeating:"
-msgstr "_Viive ennen toistoa:"
-
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:35
-msgid "_Volume:"
-msgstr "_Äänenvoimakkuus:"
+msgid "quiet"
+msgstr "hiljainen"
 
 #: capplets/keyboard/keyboard.desktop.in.h:2
-msgid "Keyboard Properties"
-msgstr "Näppäimistöasetukset"
+msgid "Set your keyboard preferences"
+msgstr "Muuta näppäimistöasetuksia"
 
-#: capplets/mouse/gnome-mouse-properties.c:455
+#: capplets/mouse/gnome-mouse-properties.c:477
 #, c-format
-msgid ""
-"<b>Unknown Cursor</b>\n"
+msgid "<b>Unknown Cursor</b>\n"
 "%s"
-msgstr ""
-"<b>Tuntematon osoitin</b>\n"
+msgstr "<b>Tuntematon osoitin</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:556
-msgid ""
-"<b>Default Cursor - Current</b>\n"
+#: capplets/mouse/gnome-mouse-properties.c:578
+msgid "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
-msgstr ""
-"<b>Oletusosoitin - nykyinen</b>\n"
+msgstr "<b>Oletusosoitin - nykyinen</b>\n"
 "X:n mukana tuleva oletusosoitin"
 
-#: capplets/mouse/gnome-mouse-properties.c:559
-msgid ""
-"<b>Default Cursor</b>\n"
+#: capplets/mouse/gnome-mouse-properties.c:581
+msgid "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
-msgstr ""
-"<b>Oletusosoitin</b>\n"
+msgstr "<b>Oletusosoitin</b>\n"
 "X:n mukana tuleva oletusosoitin"
 
-#: capplets/mouse/gnome-mouse-properties.c:577
-msgid ""
-"<b>White Cursor - Current</b>\n"
+#: capplets/mouse/gnome-mouse-properties.c:599
+msgid "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
-msgstr ""
-"<b>Valkoinen osoitin - nykyinen</b>\n"
+msgstr "<b>Valkoinen osoitin - nykyinen</b>\n"
 "Oletusosoitin käänteisin värein"
 
-#: capplets/mouse/gnome-mouse-properties.c:580
-msgid ""
-"<b>White Cursor</b>\n"
+#: capplets/mouse/gnome-mouse-properties.c:602
+msgid "<b>White Cursor</b>\n"
 "The default cursor inverted"
-msgstr ""
-"<b>Valkoinen osoitin</b>\n"
+msgstr "<b>Valkoinen osoitin</b>\n"
 "Oletusosoitin käänteisin värein"
 
-#: capplets/mouse/gnome-mouse-properties.c:598
-msgid ""
-"<b>Large Cursor - Current</b>\n"
+#: capplets/mouse/gnome-mouse-properties.c:620
+msgid "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
-msgstr ""
-"<b>Suuri osoitin - nykyinen</b>\n"
+msgstr "<b>Suuri osoitin - nykyinen</b>\n"
 "Suuri versio tavallisesta osoittimesta"
 
-#: capplets/mouse/gnome-mouse-properties.c:601
-msgid ""
-"<b>Large Cursor</b>\n"
+#: capplets/mouse/gnome-mouse-properties.c:623
+msgid "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
-msgstr ""
-"<b>Suuri osoitin</b>\n"
+msgstr "<b>Suuri osoitin</b>\n"
 "Suuri versio tavallisesta osoittimesta"
 
-#: capplets/mouse/gnome-mouse-properties.c:619
-msgid ""
-"<b>Large White Cursor - Current</b>\n"
+#: capplets/mouse/gnome-mouse-properties.c:641
+msgid "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
-msgstr ""
-"<b>Suuri valkoinen osoitin - nykyinen</b>\n"
+msgstr "<b>Suuri valkoinen osoitin - nykyinen</b>\n"
 "Suuri versio valkoisesta osoittimesta"
 
-#: capplets/mouse/gnome-mouse-properties.c:622
-msgid ""
-"<b>Large White Cursor</b>\n"
+#: capplets/mouse/gnome-mouse-properties.c:644
+msgid "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
-msgstr ""
-"<b>Suuri valkoinen osoitin</b>\n"
+msgstr "<b>Suuri valkoinen osoitin</b>\n"
 "Suuri versio valkoisesta osoittimesta"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:1
-msgid ""
-"<b>Note:</b> You will need to logout and log back in for this setting to "
-"take effect."
-msgstr ""
-"<b>Huomautus:</b> Tämä asetus tulee voimaan vasta kun kirjaudut seuraavan "
-"kerran sisään."
+msgid "<b>Note:</b> You will need to logout and log back in for this setting to take effect."
+msgstr "<b>Huomautus:</b> Tämä asetus tulee voimaan vasta kun kirjaudut seuraavan kerran sisään."
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:2
 msgid "<i>Fast</i>"
@@ -1554,12 +1417,8 @@ msgid "<i>Small</i>"
 msgstr "<i>Pieni</i>"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:8
-msgid ""
-"Animates a quick marker around the cursor when the Control key has been "
-"pressed and released."
-msgstr ""
-"Piirtää pikaisesti merkin kohdistimen ympärille, kun control-näppäin "
-"painetaan ja päästetään ylös."
+msgid "Animates a quick marker around the cursor when the Control key has been pressed and released."
+msgstr "Piirtää pikaisesti merkin kohdistimen ympärille, kun control-näppäin painetaan ja päästetään ylös."
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:9
 msgid "Buttons"
@@ -1582,8 +1441,7 @@ msgid "Drag and Drop"
 msgstr "Veto ja pudotus"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:14
-msgid ""
-"Left-handed mouse mode switches the left and right buttons on the mouse."
+msgid "Left-handed mouse mode switches the left and right buttons on the mouse."
 msgstr "Vasenkätinen hiiritila vaihtaa hiiren vasemman ja oikean painikkeen."
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:15
@@ -1591,12 +1449,8 @@ msgid "Locate Pointer"
 msgstr "Paikanna kohdistin"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:16
-msgid ""
-"Maximum time allowed between clicks when double-clicking.   Use the box on "
-"the right to test."
-msgstr ""
-"Suurin aika kaksoisnapsautuksen napsautusten välillä. Kokeile toimintaa "
-"oikealla olevalla laatikolla."
+msgid "Maximum time allowed between clicks when double-clicking.   Use the box on the right to test."
+msgstr "Suurin aika kaksoisnapsautuksen napsautusten välillä. Kokeile toimintaa oikealla olevalla laatikolla."
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:17
 msgid "Motion"
@@ -1612,9 +1466,7 @@ msgstr "Hiiriasetukset"
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:20
 msgid "Set the distance you need to move your cursor before dragging an item."
-msgstr ""
-"Asettaa etäisyyden, jonka verran kohdistinta pitää liikuttaa vetämisen "
-"aloittamiseksi."
+msgstr "Asettaa etäisyyden, jonka verran kohdistinta pitää liikuttaa vetämisen aloittamiseksi."
 
 #: capplets/mouse/gnome-mouse-properties.glade.h:21
 msgid "Set the speed of your pointing device."
@@ -1653,21 +1505,21 @@ msgid "Mouse"
 msgstr "Hiiri"
 
 #: capplets/mouse/mouse.desktop.in.h:2
-msgid "Mouse Properties"
-msgstr "Hiiriasetukset"
+msgid "Set your mouse preferences"
+msgstr "Muuta hiiriasetuksia"
 
 #: capplets/network/gnome-network-preferences.desktop.in.h:1
-msgid "Network"
-msgstr "Verkko"
+msgid "Network Proxy"
+msgstr "Välipalvelin"
 
 #: capplets/network/gnome-network-preferences.desktop.in.h:2
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Preferences"
-msgstr "Verkkoasetukset"
+msgid "Network Proxy Preferences"
+msgstr "Välipalvelinasetukset"
 
 #: capplets/network/gnome-network-preferences.glade.h:2
-msgid "HTTP Proxy Settings"
-msgstr "HTTP-välipalvelinasetukset"
+msgid "Network Preferences"
+msgstr "Verkkoasetukset"
 
 #: capplets/network/gnome-network-preferences.glade.h:4
 msgid "P_ort:"
@@ -1678,7 +1530,7 @@ msgid "Pass_word:"
 msgstr "_Salasana:"
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires a username and password"
+msgid "Pro_xy requires username and password"
 msgstr "_Välipalvelin vaatii tunnuksen ja salasanan"
 
 #: capplets/network/gnome-network-preferences.glade.h:7
@@ -1702,20 +1554,24 @@ msgid "E_nable sound server startup"
 msgstr "_Ota äänipalvelin käyttöön käynnistyessä"
 
 #: capplets/sound/sound-properties.glade.h:2
+msgid "Sound Preferences"
+msgstr "Ääniasetukset"
+
+#: capplets/sound/sound-properties.glade.h:3
 msgid "Sound _Events"
 msgstr "_Äänitapahtumat"
 
-#: capplets/sound/sound-properties.glade.h:3
+#: capplets/sound/sound-properties.glade.h:4
 msgid "_General"
 msgstr "_Yleistä"
 
-#: capplets/sound/sound-properties.glade.h:4
+#: capplets/sound/sound-properties.glade.h:5
 msgid "_Sounds for events"
 msgstr "_Tapahtumien äänet"
 
 #: capplets/sound/sound.desktop.in.h:1
-msgid "Configure GNOME's use of sound"
-msgstr "Muokkaa Gnomen ääniasetuksia"
+msgid "Enable sound and associate sounds with events"
+msgstr "Ota äänet käyttöön ja kytke niitä tapahtumiin"
 
 #: capplets/theme-switcher/control/control.c:18
 msgid "Eenie Meenie Mynie Moe Catcha Tiger By Its Toe"
@@ -1768,56 +1624,56 @@ msgid "Two"
 msgstr "Kaksi"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:1
-msgid "Change the appearance of buttons, scrollbars, etc"
-msgstr "Muuta painikkeiden, palkkien, yms. ulkonäköä"
+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
 msgid "Theme"
 msgstr "Teema"
 
-#: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Gtk+ Theme Preferences"
-msgstr "Gtk+:n teeman valinta"
-
-#: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Install new theme"
-msgstr "Asenna uusi teema"
-
-#: capplets/theme-switcher/theme-properties.glade.h:4
+#: capplets/theme-switcher/theme-properties.glade.h:1
 msgid "Installed Themes"
 msgstr "Asennetut teemat"
 
-#: capplets/theme-switcher/theme-properties.glade.h:5
+#: capplets/theme-switcher/theme-properties.glade.h:2
 msgid "List of available GTK+ themes"
 msgstr "Luettelo saatavilla olevista GTK+:n teemoista"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:3
 msgid "New themes can also be installed by dragging them into the window."
 msgstr "Uusia teemoja voi asentaa myös pudottamalla ne tähän ikkunaan."
 
-#: capplets/theme-switcher/theme-properties.glade.h:7
+#: capplets/theme-switcher/theme-properties.glade.h:4
+msgid "Theme Preferences"
+msgstr "Teema-asetukset"
+
+#: capplets/theme-switcher/theme-properties.glade.h:5
 msgid "_Go to theme folder"
 msgstr "_Siirry teemahakemistoon"
 
-#: capplets/theme-switcher/theme-properties.glade.h:8
+#: capplets/theme-switcher/theme-properties.glade.h:6
+msgid "_Install New Theme..."
+msgstr "_Asenna uusi teema..."
+
+#: capplets/theme-switcher/theme-install.glade.h:2
+msgid "Install new theme"
+msgstr "Asenna uusi teema"
+
+#: capplets/theme-switcher/theme-install.glade.h:3
 msgid "_Install"
 msgstr "_Asenna"
 
-#: capplets/theme-switcher/theme-properties.glade.h:9
-msgid "_Install new theme..."
-msgstr "_Asenna uusi teema..."
-
-#: capplets/theme-switcher/theme-properties.glade.h:10
+#: capplets/theme-switcher/theme-install.glade.h:4
 msgid "_Location of new theme:"
 msgstr "Uuden teeman si_jainti:"
 
 #: capplets/ui-properties/behavior.desktop.in.h:1
-msgid "Change how toolbars and menus are displayed"
-msgstr "Muuta työkalupalkkien ja valikkojen ulkonäköä"
+msgid "Customize the appearance of toolbars and menubars in applications"
+msgstr "Muokkaa sovelmien työkalupalkkien ja valikkojen ulkoasua"
 
 #: capplets/ui-properties/behavior.desktop.in.h:2
-msgid "Toolbars & Menus"
-msgstr "Työkalupalkit ja valikot"
+msgid "Menus & Toolbars"
+msgstr "Valikko- ja työkalupalkit"
 
 #: capplets/ui-properties/behavior.desktop.in.in.h:1
 msgid "Behavior"
@@ -1868,8 +1724,8 @@ msgid "Menu Item 5"
 msgstr "Valikon kohta 5"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:12
-msgid "Menu items can have _icons"
-msgstr "Valikon kohdissa voi olla _kuvakkeita"
+msgid "Menu and Toolbar Preferences"
+msgstr "Valikko- ja työkalupalkkien asetukset"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:13
 msgid "Menus"
@@ -1888,11 +1744,11 @@ msgid "Priority Text Beside Icons"
 msgstr "Oleellinen teksti kuvakkeiden vierellä"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:17
-msgid "Sample Menubar"
+msgid "Sample menubar:"
 msgstr "Valikkopalkkiesimerkki"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:18
-msgid "Sample Toolbar"
+msgid "Sample toolbar:"
 msgstr "Esimerkkityökalupalkki"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:19
@@ -1916,22 +1772,23 @@ msgid "Toolbar"
 msgstr "Työkalupalkki"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:24
-msgid "Toolbar and Menu Preferences"
-msgstr "Työkalupalkki- ja valikkoasetukset"
-
-#: capplets/ui-properties/gnome-ui-properties.glade.h:25
 msgid "Toolbars can be _detached and moved around"
 msgstr "Työkalupalkkeja voi _irrottaa ja liikuttaa"
 
+#: capplets/ui-properties/gnome-ui-properties.glade.h:25
+msgid "_Button Labels: "
+msgstr "_Painikkeiden nimiöt:"
+
 #: capplets/ui-properties/gnome-ui-properties.glade.h:26
 msgid "_Menu"
 msgstr "_Valikko"
 
 #: capplets/ui-properties/gnome-ui-properties.glade.h:27
-msgid "_Toolbars have: "
-msgstr "_Työkalupalkeissa on: "
+msgid "_Show icons in menus"
+msgstr "_Näytä kuvakkeet valikoissa"
 
 #: capplets/windows/gnome-window-properties.c:282
+#: capplets/windows/gnome-window-properties.glade.h:6
 msgid "Window Preferences"
 msgstr "Ikkuna-asetukset"
 
@@ -1955,7 +1812,6 @@ msgstr "Ikkunan reunan ulkonäkö"
 msgid "Window Manager:"
 msgstr "Ikkunointiohjelma:"
 
-#: capplets/windows/gnome-window-properties.glade.h:6
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
 msgstr "Ikkunan ominaisuudet"
@@ -1985,19 +1841,20 @@ msgstr "Hallintasovelmien hakemisto-olio"
 msgid "Capplet directory that this view is viewing"
 msgstr "Tämän näkymän näyttämä hallintasovelmien hakemisto"
 
-#: control-center/capplet-dir-view.c:335
+#: control-center/capplet-dir-view.c:348
 msgid "translator_credits"
 msgstr "Suomennos: http://gnome-fi.sourceforge.net/"
 
-#: control-center/capplet-dir-view.c:344 control-center/gnomecc.desktop.in.h:1
+#: 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:347
+#: control-center/capplet-dir-view.c:360
 msgid "Desktop properties manager."
 msgstr "Työpöydän asetusten hallinta."
 
-#: control-center/capplet-dir-view.c:485
+#: control-center/capplet-dir-view.c:498
 #, c-format
 msgid "Gnome Control Center : %s"
 msgstr "Gnomen hallintakeskus : %s"
@@ -2040,11 +1897,9 @@ msgstr "Ei voinut alustaa Bonoboa"
 
 #: gnome-settings-daemon/gnome-settings-font.c:74
 #, c-format
-msgid ""
-"Cannot create the directory \"%s\".\n"
+msgid "Cannot create the directory \"%s\".\n"
 "This is needed to allow changing cursors."
-msgstr ""
-"Ei voi luoda hakemistoa \"%s\".\n"
+msgstr "Ei voi luoda hakemistoa \"%s\".\n"
 "Tätä tarvittaisiin osoittimien vaihtamiseksi."
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:106
@@ -2074,11 +1929,9 @@ msgstr "Näppäinsidonta (%s) on jo käytössä\n"
 
 #: gnome-settings-daemon/gnome-settings-keybindings.c:292
 #, c-format
-msgid ""
-"Error while trying to run (%s)\n"
+msgid "Error while trying to run (%s)\n"
 "which is linked to the key (%s)"
-msgstr ""
-"Virhe suorittaessa (%s),\n"
+msgstr "Virhe suorittaessa (%s),\n"
 "joka on kytketty näppäimeen (%s)"
 
 #: gnome-settings-daemon/gnome-settings-screensaver.c:92
@@ -2115,12 +1968,8 @@ msgid "Type"
 msgstr "Tyyppi"
 
 #: libbackground/applier.c:240
-msgid ""
-"Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW "
-"for preview"
-msgstr ""
-"bg_applierin tyyppi: BG_APPLIER_ROOT juuri-ikkunalle ja BG_APPLIER_PREVIEW "
-"esikatselulle"
+msgid "Type of bg_applier: BG_APPLIER_ROOT for root window or BG_APPLIER_PREVIEW for preview"
+msgstr "bg_applierin tyyppi: BG_APPLIER_ROOT juuri-ikkunalle ja BG_APPLIER_PREVIEW esikatselulle"
 
 #: libbackground/applier.c:247
 msgid "Preview Width"
@@ -2140,8 +1989,7 @@ msgstr "Korkeus jos käyttöönotin on esikatselin: oletus 48"
 
 #: libbackground/preview-file-selection.c:193
 msgid "Can't find an hbox, using a normal file selection"
-msgstr ""
-"Ei löytänyt vaakalaatikkoa (hboxia): käyttää tavallista tiedostovalitsinta"
+msgstr "Ei löytänyt vaakalaatikkoa (hboxia): käyttää tavallista tiedostovalitsinta"
 
 #: libsounds/sound-view.c:122
 msgid "The sound file for this event does not exist."
@@ -2179,28 +2027,22 @@ msgstr "Valitse äänitiedosto"
 
 #: libwindow-settings/gnome-wm-manager.c:168
 #, c-format
-msgid ""
-"Starting %s\n"
+msgid "Starting %s\n"
 "(%d seconds left before operation times out)"
-msgstr ""
-"%s käynnistyy\n"
+msgstr "%s käynnistyy\n"
 "(%d sekuntia jäljellä ennen aikarajaa)"
 
 #: libwindow-settings/gnome-wm-manager.c:322
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
+msgid "wm-properties-capplet: Unable to initialize window manager.\n"
 "\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Ei voinut käynnistää ikkunointiohjelmaa.\n"
+msgstr "wm-properties-capplet: Ei voinut käynnistää ikkunointiohjelmaa.\n"
 "\tToinen ikkunointiohjelma on jo käynnissä eikä sitä voinut sulkea.\n"
 
 #: libwindow-settings/gnome-wm-manager.c:326
 #, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
+msgid "wm-properties-capplet: Unable to initialize window manager.\n"
 "\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Ei voinut käynnistää ikkunointiohjelmaa \"%s\".\n"
+msgstr "wm-properties-capplet: Ei voinut käynnistää ikkunointiohjelmaa \"%s\".\n"
 
 #: libwindow-settings/gnome-wm-manager.c:375
 msgid "Previous window manager did not die\n"
@@ -2208,11 +2050,9 @@ msgstr "Edellinen ikkunointiohjelma ei sulkeutunut.\n"
 
 #: libwindow-settings/gnome-wm-manager.c:408
 #, c-format
-msgid ""
-"Could not start '%s'.\n"
+msgid "Could not start '%s'.\n"
 "Falling back to previous window manager '%s'\n"
-msgstr ""
-"Ei voinut käynnistää ohjelmaa \"%s\".\n"
+msgstr "Ei voinut käynnistää ohjelmaa \"%s\".\n"
 "Palaa edelliseen ikkunointiohjelmaan \"%s\".\n"
 
 #: libwindow-settings/gnome-wm-manager.c:439
@@ -2229,3 +2069,4 @@ msgstr ""
 #: libwindow-settings/gnome-wm-manager.c:464
 msgid "OK"
 msgstr "OK"
+